← All changes | includes/Core/Integration/ZohoRecruit/FilesApiHelper.php +20 -2 2.10.0 → 3.3.1 View file →

		@@ -6,8 +6,9 @@
6	6	*/
7	7
8	8	namespace BitCode\BitForm\Core\Integration\ZohoRecruit;
9	9
	10	+use BitCode\BitForm\Core\Util\FileHandler;
10	11	use BitCode\BitForm\Core\Util\HttpHelper;
11	12
12	13	/**
13	14	* Provide functionality for Upload files
		@@ -35,9 +36,9 @@
35	36	$this->_payloadBoundary = wp_generate_password(24);
36	37	$this->_defaultHeader['Authorization'] = "Zoho-oauthtoken {$tokenDetails->access_token}";
37	38	$this->_defaultHeader['content-type'] = 'multipart/form; boundary=' . $this->_payloadBoundary;
38	39	$this->_apiDomain = \urldecode($tokenDetails->api_domain);
39		- $this->_basepath = BITFORMS_UPLOAD_DIR . DIRECTORY_SEPARATOR . $formID . DIRECTORY_SEPARATOR . $entryID . DIRECTORY_SEPARATOR;
	40	+ $this->_basepath = FileHandler::getEntriesFileUploadDir($formID, $entryID) . DIRECTORY_SEPARATOR;
40	41	}
41	42
42	43	/**
43	44	* Helps to execute upload files api
		@@ -49,8 +50,9 @@
49	50	* @return array $uploadedFiles ID's of uploaded file in Zoho Recruit
50	51	*/
51	52	public function uploadFiles($files, $recordID, $zohoField)
52	53	{
	54	+ $files = self::normalizeFileNames($files);
53	55	$uploadFileEndpoint = '';
54	56
55	57	if ('Candidate Photo' === $zohoField) {
56	58	$uploadFileEndpoint = "https://recruit.zoho.{$this->_dataCenter}/recruit/private/xml/{$this->_module}/uploadPhoto?Scope=recruitapi&type={$zohoField}&version=2&id={$recordID}";
		@@ -85,5 +87,21 @@
85	87	}
86	88	$payload .= '--' . $this->_payloadBoundary . '--';
87	89	return HttpHelper::post($uploadFileEndpoint, $payload, $this->_defaultHeader);
88	90	}
89		-}
	91	+
	92	+ /**
	93	+ * Field values may arrive as public file URLs (see IntegrationHandler::handleFileUrl),
	94	+ * so reduce each to the stored file name before resolving against the entry directory.
	95	+ *
	96	+ * @param mixed $files file name(s) or URL(s)
	97	+ *
	98	+ * @return mixed
	99	+ */
	100	+ private static function normalizeFileNames($files)
	101	+ {
	102	+ if (is_array($files)) {
	103	+ return array_map([__CLASS__, 'normalizeFileNames'], $files);
	104	+ }
	105	+ return is_string($files) ? basename(wp_parse_url($files, PHP_URL_PATH) ?: $files) : $files;
	106	+ }
	107	+}