nextcloud / server

apps/files_external/lib/Lib/Storage/SharePoint.php

Spacing +29 added lines, -29 removed lines

@@ -71,14 +71,14 @@ 
 		$this->server = $parameters['host'];
 		$this->documentLibrary = $parameters['documentLibrary'];
 
-		if(strpos($this->documentLibrary, '"') !== false) {
+		if (strpos($this->documentLibrary, '"') !== false) {
 			// they are, amongst others, not allowed and we use it in the filter
 			// cf. https://support.microsoft.com/en-us/kb/2933738
 			// TODO: verify, it talks about files and folders mostly
 			throw new \InvalidArgumentException('Illegal character in Document Library Name');
 		}
 
-		if(!isset($parameters['user']) || !isset($parameters['password'])) {
+		if (!isset($parameters['user']) || !isset($parameters['password'])) {
 			throw new \UnexpectedValueException('No user or password given');
 		}
 		$this->authUser = $parameters['user'];
@@ -96,7 +96,7 @@ 
 	 * @since 6.0.0
 	 */
 	public function getId() {
-		return 'SharePoint::' . $this->server . '::' . $this->documentLibrary . '::' . $this->authUser;
+		return 'SharePoint::'.$this->server.'::'.$this->documentLibrary.'::'.$this->authUser;
 	}
 
 	/**
@@ -164,7 +164,7 @@ 
 				$items = $collection->getData();
 				foreach ($items as $item) {
 					/** @var ListItem $fields */
-					if(!$this->spClient->isHidden($item)) {
+					if (!$this->spClient->isHidden($item)) {
 						$files[] = $item->getProperty('Name');
 					}
 				}
@@ -204,7 +204,7 @@ 
 			'atime' => time(),
 		];
 
-		if(!is_null($stat['mtime'])) {
+		if (!is_null($stat['mtime'])) {
 			return $stat;
 		}
 
@@ -228,9 +228,9 @@ 
 		} catch (NotFoundException $e) {
 			return false;
 		}
-		if($object instanceof File) {
+		if ($object instanceof File) {
 			return 'file';
-		} else if($object instanceof Folder) {
+		} else if ($object instanceof Folder) {
 			return 'dir';
 		} else {
 			return false;
@@ -267,7 +267,7 @@ 
 	 */
 	public function unlink($path) {
 		// file methods get called twice at least, returning true
-		if(!$this->file_exists($path)) {
+		if (!$this->file_exists($path)) {
 			return true;
 		}
 		try {
@@ -288,16 +288,16 @@ 
 			$item = $this->getFileOrFolder($newPath);
 			$this->spClient->delete($item);
 			$this->fileCache->remove($newPath);
-		} catch(NotFoundException $e) {
+		} catch (NotFoundException $e) {
 			// noop
 		}
 
 		try {
 			$isRenamed = $this->spClient->rename($oldPath, $newPath);
-			if($isRenamed) {
+			if ($isRenamed) {
 				$entry = $this->fileCache->get($oldPath);
 				$this->fileCache->remove($newPath);
-				if($entry !== false) {
+				if ($entry !== false) {
 					$this->fileCache->set($newPath, $entry);
 				}
 				$this->fileCache->remove($oldPath);
@@ -330,7 +330,7 @@ 
 				$tmpFile = $this->tempManager->getTemporaryFile();
 
 				$fp = fopen($tmpFile, 'w+');
-				if(!$this->spClient->getFileViaStream($serverUrl, $fp)) {
+				if (!$this->spClient->getFileViaStream($serverUrl, $fp)) {
 					fclose($fp);
 					return false;
 				}
@@ -360,20 +360,20 @@ 
 			case 'cb+':
 			case 'c+b':
 				//fseek 0
-				if($mode[0] === 'x' && $this->file_exists($path)) {
+				if ($mode[0] === 'x' && $this->file_exists($path)) {
 					return false;
 				}
 				$tmpFile = $this->tempManager->getTemporaryFile();
-				if($mode[0] !== 'w' && $this->file_exists($path)) {
+				if ($mode[0] !== 'w' && $this->file_exists($path)) {
 					$content = $this->fopen($path, 'r');
-					if($content === false) {
+					if ($content === false) {
 						// should not happen, but let's be safe
 						return false;
 					}
 					$this->file_put_contents($tmpFile, $content);
 				}
 				$fp = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($fp, null, null, function () use ($path, $tmpFile) {
+				return CallbackWrapper::wrap($fp, null, null, function() use ($path, $tmpFile) {
 					$this->writeBack($tmpFile, $path);
 				});
 
@@ -421,7 +421,7 @@ 
 	 * @param array $parameters
 	 */
 	private function fixDI(array $parameters) {
-		if(isset($parameters['contextFactory'])
+		if (isset($parameters['contextFactory'])
 			&& $parameters['contextFactory'] instanceof ContextsFactory)
 		{
 			$this->contextsFactory = $parameters['contextFactory'];
@@ -429,7 +429,7 @@ 
 			$this->contextsFactory = new ContextsFactory();
 		}
 
-		if(isset($parameters['sharePointClientFactory'])
+		if (isset($parameters['sharePointClientFactory'])
 			&& $parameters['sharePointClientFactory'] instanceof SharePointClientFactory)
 		{
 			$spcFactory = $parameters['sharePointClientFactory'];
@@ -439,18 +439,18 @@ 
 		$this->spClient = $spcFactory->getClient(
 			$this->contextsFactory,
 			$this->server,
-			[ 'user' => $this->authUser, 'password' => $this->authPwd],
+			['user' => $this->authUser, 'password' => $this->authPwd],
 			$this->documentLibrary
 		);
 
-		if(isset($parameters['cappedMemoryCache'])) {
+		if (isset($parameters['cappedMemoryCache'])) {
 			$this->fileCache = $parameters['cappedMemoryCache'];
 		} else {
 			// there's no API to get such
 			$this->fileCache = new CappedMemoryCache();
 		}
 
-		if(isset($parameters['tempManager'])) {
+		if (isset($parameters['tempManager'])) {
 			$this->tempManager = $parameters['tempManager'];
 		} else {
 			$this->tempManager = \OC::$server->getTempManager();
@@ -463,7 +463,7 @@ 
 	 */
 	private function getFolderContents($serverUrl) {
 		$entry = $this->fileCache->get($serverUrl);
-		if($entry === null || !isset($entry['children'])) {
+		if ($entry === null || !isset($entry['children'])) {
 			$folder = isset($entry['instance']) ? $entry['instance'] : null;
 			$contents = $this->spClient->fetchFolderContents($serverUrl, null, $folder);
 			$cacheItem = $entry ?: [];
@@ -477,7 +477,7 @@ 
 					$url = $item->getProperty(self::SP_PROPERTY_URL);
 					$itemEntry = $this->fileCache->get($url);
 					$itemEntry = $itemEntry ?: [];
-					if(!isset($itemEntry['instance'])) {
+					if (!isset($itemEntry['instance'])) {
 						$itemEntry['instance'] = $item;
 						$this->fileCache->set($url, $itemEntry);
 					}
@@ -496,9 +496,9 @@ 
 	 */
 	private function getFileOrFolder($serverUrl) {
 		$entry = $this->fileCache->get($serverUrl);
-		if($entry === false) {
+		if ($entry === false) {
 			throw new NotFoundException('File or Folder not found');
-		} else if($entry === null || !isset($entry['instance'])) {
+		} else if ($entry === null || !isset($entry['instance'])) {
 			try {
 				$file = $this->spClient->fetchFileOrFolder($serverUrl, [self::SP_PROPERTY_SIZE, self::SP_PROPERTY_MTIME]);
 			} catch (NotFoundException $e) {
@@ -522,14 +522,14 @@ 
 	 */
 	private function formatPath($path) {
 		$path = trim($path, '/');
-		$serverUrl = '/' . $this->documentLibrary;
-		if($path !== '') {
-			$serverUrl .= '/' . $path;
+		$serverUrl = '/'.$this->documentLibrary;
+		if ($path !== '') {
+			$serverUrl .= '/'.$path;
 		}
 
 		$pathParts = explode('/', $serverUrl);
 		$filename = array_pop($pathParts);
-		if($filename === '.') {
+		if ($filename === '.') {
 			// remove /. from the end of the path
 			$serverUrl = mb_substr($serverUrl, 0, mb_strlen($serverUrl) - 2);
 		}

apps/files_external/lib/Lib/SharePoint/SharePointClient.php

Spacing +26 added lines, -26 removed lines

@@ -70,10 +70,10 @@ 
 	 * @throws \Exception
 	 */
 	public function fetchFileOrFolder($path, array $properties = null) {
-		$fetchFileFunc = function ($path, $props) { return $this->fetchFile($path, $props);};
-		$fetchFolderFunc = function ($path, $props) { return $this->fetchFolder($path, $props);};
-		$fetchers = [ $fetchFileFunc, $fetchFolderFunc ];
-		if(strpos($path, '.') === false) {
+		$fetchFileFunc = function($path, $props) { return $this->fetchFile($path, $props); };
+		$fetchFolderFunc = function($path, $props) { return $this->fetchFolder($path, $props); };
+		$fetchers = [$fetchFileFunc, $fetchFolderFunc];
+		if (strpos($path, '.') === false) {
 			$fetchers = array_reverse($fetchers);
 		}
 
@@ -82,7 +82,7 @@ 
 				$instance = call_user_func_array($fetchFunction, [$path, $properties]);
 				return $instance;
 			} catch (\Exception $e) {
-				if(preg_match('/^The file \/.* does not exist\.$/', $e->getMessage()) !== 1
+				if (preg_match('/^The file \/.* does not exist\.$/', $e->getMessage()) !== 1
 					&& $e->getMessage() !== 'Unknown Error'
 					&& $e->getMessage() !== 'File Not Found.'
 				) {
@@ -143,18 +143,18 @@ 
 	 * @throws \Exception
 	 */
 	public function getFileViaStream($relativeServerPath, $fp) {
-		if(!is_resource($fp)) {
+		if (!is_resource($fp)) {
 			throw new \InvalidArgumentException('file resource expected');
 		}
 		$relativeServerPath = rawurlencode($relativeServerPath);
-		$url = $this->context->getServiceRootUrl() .
+		$url = $this->context->getServiceRootUrl().
 			"web/getfilebyserverrelativeurl('$relativeServerPath')/\$value";
 		$options = new RequestOptions($url);
 		$options->StreamHandle = $fp;
 
 		try {
 			$ok = $this->context->executeQueryDirect($options);
-		} catch(\Exception $e) {
+		} catch (\Exception $e) {
 			$this->resetClientContext();
 			throw $e;
 		}
@@ -180,10 +180,10 @@ 
 	 */
 	public function overwriteFileViaStream($relativeServerPath, $fp, $localPath) {
 		$serverRelativeUrl = rawurlencode($relativeServerPath);
-		$url = $this->context->getServiceRootUrl() . "web/getfilebyserverrelativeurl('$serverRelativeUrl')/\$value";
+		$url = $this->context->getServiceRootUrl()."web/getfilebyserverrelativeurl('$serverRelativeUrl')/\$value";
 		$request = new RequestOptions($url);
 		$request->Method = 'POST'; // yes, POST
-		$request->addCustomHeader('X-HTTP-Method','PUT'); // yes, PUT
+		$request->addCustomHeader('X-HTTP-Method', 'PUT'); // yes, PUT
 		$this->context->ensureFormDigest($request);
 		//FIXME: Proper StreamHandle handling is not upstream, yet
 		$request->StreamHandle = $fp;
@@ -191,7 +191,7 @@ 
 
 		try {
 			$ok = $this->context->executeQueryDirect($request);
-		} catch(\Exception $e) {
+		} catch (\Exception $e) {
 			$this->resetClientContext();
 			throw $e;
 		}
@@ -219,7 +219,7 @@ 
 		try {
 			$this->context->executeQuery();
 			return $file;
-		} catch(\Exception $e) {
+		} catch (\Exception $e) {
 			$this->resetClientContext();
 			throw $e;
 		}
@@ -238,9 +238,9 @@ 
 
 		try {
 			$item = $this->fetchFileOrFolder($oldPath);
-			if($item instanceof File) {
+			if ($item instanceof File) {
 				$this->renameFile($item, $newPath);
-			} else if($item instanceof Folder) {
+			} else if ($item instanceof Folder) {
 				$this->renameFolder($item, $newPath);
 			} else {
 				return false;
@@ -290,7 +290,7 @@ 
 			} else if ($item instanceof Folder) {
 				$this->deleteFolder($item);
 			}
-		} catch(\Exception $e) {
+		} catch (\Exception $e) {
 			$this->resetClientContext();
 			throw $e;
 		}
@@ -320,7 +320,7 @@ 
 	 */
 	public function fetchFolderContents($relativeServerPath, $properties = null, Folder $folder = null) {
 		$this->ensureConnection();
-		if($folder === null) {
+		if ($folder === null) {
 			$folder = $this->context->getWeb()->getFolderByServerRelativeUrl($relativeServerPath);
 		}
 
@@ -338,20 +338,20 @@ 
 	public function isHidden(ClientObject $file) {
 		// ClientObject itself does not have getListItemAllFields but is
 		// the common denominator of File and Folder
-		if(!$file instanceof File && !$file instanceof Folder) {
+		if (!$file instanceof File && !$file instanceof Folder) {
 			throw new \InvalidArgumentException('File or Folder expected');
 		}
-		if($file instanceof File) {
+		if ($file instanceof File) {
 			// it's expensive, we only check folders
 			return false;
 		}
 		$fields = $file->getListItemAllFields();
-		if($fields->getProperties() === []) {
+		if ($fields->getProperties() === []) {
 			$this->loadAndExecute($fields, ['Id', 'Hidden']);
 		}
 		$id = $fields->getProperty('Id');
 		$hidden = $fields->getProperty('Hidden'); // TODO: get someone to test this in SP 2013
-		if($hidden === false || $id !== null) {
+		if ($hidden === false || $id !== null) {
 			// avoids listing hidden "Forms" folder (and its contents).
 			// Have not found a different mechanism to detect whether
 			// a file or folder is hidden. There used to be a Hidden
@@ -371,11 +371,11 @@ 
 	 * @throws NotFoundException
 	 */
 	private function getDocumentLibrary() {
-		if(!is_null($this->documentLibrary)) {
+		if (!is_null($this->documentLibrary)) {
 			return $this->documentLibrary;
 		}
 
-		$lists = $this->context->getWeb()->getLists()->filter('Title eq \'' . $this->documentLibraryTitle . '\'')->top(1);
+		$lists = $this->context->getWeb()->getLists()->filter('Title eq \''.$this->documentLibraryTitle.'\'')->top(1);
 		$this->context->load($lists)->executeQuery();
 		if ($lists->getCount() === 1 && $lists->getData()[0] instanceof SPList) {
 			$this->documentLibrary = $lists->getData()[0];
@@ -391,18 +391,18 @@ 
 	 * @throws \InvalidArgumentException
 	 */
 	private function ensureConnection() {
-		if($this->context instanceof ClientContext) {
+		if ($this->context instanceof ClientContext) {
 			return;
 		}
 
-		if(!is_string($this->credentials['user']) || empty($this->credentials['user'])) {
+		if (!is_string($this->credentials['user']) || empty($this->credentials['user'])) {
 			throw new \InvalidArgumentException('No user given');
 		}
-		if(!is_string($this->credentials['password']) || empty($this->credentials['password'])) {
+		if (!is_string($this->credentials['password']) || empty($this->credentials['password'])) {
 			throw new \InvalidArgumentException('No password given');
 		}
 		$this->authContext = $this->contextsFactory->getAuthContext($this->credentials['user'], $this->credentials['password']);
-		$this->authContext->AuthType = CURLAUTH_NTLM;		# Basic auth does not work somehow…
+		$this->authContext->AuthType = CURLAUTH_NTLM; # Basic auth does not work somehow…
 		$this->context = $this->contextsFactory->getClientContext($this->sharePointUrl, $this->authContext);
 		# Auth is not triggered yet. This will happen when something is requested from SharePoint (on demand), e.g.:
 	}