nextcloud / server

lib/private/Tagging/TagMapper.php

Spacing +4 added lines, -4 removed lines

@@ -50,12 +50,12 @@ 
 	* @return array An array of Tag objects.
 	*/
 	public function loadTags($owners, $type) {
-		if(!is_array($owners)) {
+		if (!is_array($owners)) {
 			$owners = array($owners);
 		}
 
-		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
-			. 'WHERE `uid` IN (' . str_repeat('?,', count($owners)-1) . '?) AND `type` = ? ORDER BY `category`';
+		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `'.$this->getTableName().'` '
+			. 'WHERE `uid` IN ('.str_repeat('?,', count($owners) - 1).'?) AND `type` = ? ORDER BY `category`';
 		return $this->findEntities($sql, array_merge($owners, array($type)));
 	}
 
@@ -66,7 +66,7 @@ 
 	* @return bool
 	*/
 	public function tagExists($tag) {
-		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
+		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `'.$this->getTableName().'` '
 			. 'WHERE `uid` = ? AND `type` = ? AND `category` = ?';
 		try {
 			$this->findEntity($sql, array($tag->getOwner(), $tag->getType(), $tag->getName()));

lib/private/Tagging/Tag.php

Spacing +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
 	 * @todo migrate existing database columns to the correct names
 	 * to be able to drop this direct mapping
 	 */
-	public function columnToProperty($columnName){
+	public function columnToProperty($columnName) {
 		if ($columnName === 'category') {
 		    return 'name';
 		} elseif ($columnName === 'uid') {
@@ -78,7 +78,7 @@ 
 	 * @param string $property the name of the property
 	 * @return string the column name
 	 */
-	public function propertyToColumn($property){
+	public function propertyToColumn($property) {
 		if ($property === 'name') {
 		    return 'category';
 		} elseif ($property === 'owner') {

lib/private/Route/CachingRouter.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 	 */
 	public function generate($name, $parameters = array(), $absolute = false) {
 		asort($parameters);
-		$key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . $name . sha1(json_encode($parameters)) . intval($absolute);
+		$key = $this->context->getHost().'#'.$this->context->getBaseUrl().$name.sha1(json_encode($parameters)).intval($absolute);
 		$cachedKey = $this->cache->get($key);
 		if ($cachedKey) {
 			return $cachedKey;

lib/private/ContactsManager.php

Spacing +4 added lines, -4 removed lines

@@ -41,10 +41,10 @@ 
 		public function search($pattern, $searchProperties = array(), $options = array()) {
 			$this->loadAddressBooks();
 			$result = array();
-			foreach($this->addressBooks as $addressBook) {
+			foreach ($this->addressBooks as $addressBook) {
 				$r = $addressBook->search($pattern, $searchProperties, $options);
 				$contacts = array();
-				foreach($r as $c){
+				foreach ($r as $c) {
 					$c['addressbook-key'] = $addressBook->getKey();
 					$contacts[] = $c;
 				}
@@ -124,7 +124,7 @@ 
 		public function getAddressBooks() {
 			$this->loadAddressBooks();
 			$result = array();
-			foreach($this->addressBooks as $addressBook) {
+			foreach ($this->addressBooks as $addressBook) {
 				$result[$addressBook->getKey()] = $addressBook->getDisplayName();
 			}
 
@@ -181,7 +181,7 @@ 
 		 */
 		protected function loadAddressBooks()
 		{
-			foreach($this->addressBookLoaders as $callable) {
+			foreach ($this->addressBookLoaders as $callable) {
 				$callable($this);
 			}
 			$this->addressBookLoaders = array();

lib/private/Archive/TAR.php

Spacing +15 added lines, -15 removed lines

@@ -101,13 +101,13 @@ 
 		$parts = explode('/', $path);
 		$folder = $tmpBase;
 		foreach ($parts as $part) {
-			$folder .= '/' . $part;
+			$folder .= '/'.$part;
 			if (!is_dir($folder)) {
 				mkdir($folder);
 			}
 		}
-		$result = $this->tar->addModify(array($tmpBase . $path), '', $tmpBase);
-		rmdir($tmpBase . $path);
+		$result = $this->tar->addModify(array($tmpBase.$path), '', $tmpBase);
+		rmdir($tmpBase.$path);
 		$this->fileList = false;
 		$this->cachedHeaders = false;
 		return $result;
@@ -144,12 +144,12 @@ 
 		//no proper way to delete, rename entire archive, rename file and remake archive
 		$tmp = \OCP\Files::tmpFolder();
 		$this->tar->extract($tmp);
-		rename($tmp . $source, $tmp . $dest);
+		rename($tmp.$source, $tmp.$dest);
 		$this->tar = null;
 		unlink($this->path);
 		$types = array(null, 'gz', 'bz');
 		$this->tar = new \Archive_Tar($this->path, $types[self::getTarType($this->path)]);
-		$this->tar->createModify(array($tmp), '', $tmp . '/');
+		$this->tar->createModify(array($tmp), '', $tmp.'/');
 		$this->fileList = false;
 		$this->cachedHeaders = false;
 		return true;
@@ -164,9 +164,9 @@ 
 		}
 		foreach ($this->cachedHeaders as $header) {
 			if ($file == $header['filename']
-				or $file . '/' == $header['filename']
-				or '/' . $file . '/' == $header['filename']
-				or '/' . $file == $header['filename']
+				or $file.'/' == $header['filename']
+				or '/'.$file.'/' == $header['filename']
+				or '/'.$file == $header['filename']
 			) {
 				return $header;
 			}
@@ -265,13 +265,13 @@ 
 		if (!$this->fileExists($path)) {
 			return false;
 		}
-		if ($this->fileExists('/' . $path)) {
-			$success = $this->tar->extractList(array('/' . $path), $tmp);
+		if ($this->fileExists('/'.$path)) {
+			$success = $this->tar->extractList(array('/'.$path), $tmp);
 		} else {
 			$success = $this->tar->extractList(array($path), $tmp);
 		}
 		if ($success) {
-			rename($tmp . $path, $dest);
+			rename($tmp.$path, $dest);
 		}
 		\OCP\Files::rmdirr($tmp);
 		return $success;
@@ -295,7 +295,7 @@ 
 	 */
 	function fileExists($path) {
 		$files = $this->getFiles();
-		if ((array_search($path, $files) !== false) or (array_search($path . '/', $files) !== false)) {
+		if ((array_search($path, $files) !== false) or (array_search($path.'/', $files) !== false)) {
 			return true;
 		} else {
 			$folderPath = $path;
@@ -310,7 +310,7 @@ 
 			}
 		}
 		if ($path[0] != '/') { //not all programs agree on the use of a leading /
-			return $this->fileExists('/' . $path);
+			return $this->fileExists('/'.$path);
 		} else {
 			return false;
 		}
@@ -331,7 +331,7 @@ 
 		//no proper way to delete, extract entire archive, delete file and remake archive
 		$tmp = \OCP\Files::tmpFolder();
 		$this->tar->extract($tmp);
-		\OCP\Files::rmdirr($tmp . $path);
+		\OCP\Files::rmdirr($tmp.$path);
 		$this->tar = null;
 		unlink($this->path);
 		$this->reopen();
@@ -362,7 +362,7 @@ 
 			return fopen($tmpFile, $mode);
 		} else {
 			$handle = fopen($tmpFile, $mode);
-			return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+			return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) {
 				$this->writeBack($tmpFile, $path);
 			});
 		}

lib/private/Archive/ZIP.php

Spacing +40 added lines, -40 removed lines

@@ -33,21 +33,21 @@ 
 
 use Icewind\Streams\CallbackWrapper;
 
-class ZIP extends Archive{
+class ZIP extends Archive {
 	/**
 	 * @var \ZipArchive zip
 	 */
-	private $zip=null;
+	private $zip = null;
 	private $path;
 
 	/**
 	 * @param string $source
 	 */
 	function __construct($source) {
-		$this->path=$source;
-		$this->zip=new \ZipArchive();
-		if($this->zip->open($source, \ZipArchive::CREATE)) {
-		}else{
+		$this->path = $source;
+		$this->zip = new \ZipArchive();
+		if ($this->zip->open($source, \ZipArchive::CREATE)) {
+		} else {
 			\OCP\Util::writeLog('files_archive', 'Error while opening archive '.$source, \OCP\Util::WARN);
 		}
 	}
@@ -65,14 +65,14 @@ 
 	 * @param string $source either a local file or string data
 	 * @return bool
 	 */
-	function addFile($path, $source='') {
-		if($source and $source[0]=='/' and file_exists($source)) {
-			$result=$this->zip->addFile($source, $path);
-		}else{
-			$result=$this->zip->addFromString($path, $source);
+	function addFile($path, $source = '') {
+		if ($source and $source[0] == '/' and file_exists($source)) {
+			$result = $this->zip->addFile($source, $path);
+		} else {
+			$result = $this->zip->addFromString($path, $source);
 		}
-		if($result) {
-			$this->zip->close();//close and reopen to save the zip
+		if ($result) {
+			$this->zip->close(); //close and reopen to save the zip
 			$this->zip->open($this->path);
 		}
 		return $result;
@@ -84,8 +84,8 @@ 
 	 * @return boolean|null
 	 */
 	function rename($source, $dest) {
-		$source=$this->stripPath($source);
-		$dest=$this->stripPath($dest);
+		$source = $this->stripPath($source);
+		$dest = $this->stripPath($dest);
 		$this->zip->renameName($source, $dest);
 	}
 	/**
@@ -94,7 +94,7 @@ 
 	 * @return int
 	 */
 	function filesize($path) {
-		$stat=$this->zip->statName($path);
+		$stat = $this->zip->statName($path);
 		return $stat['size'];
 	}
 	/**
@@ -111,13 +111,13 @@ 
 	 * @return array
 	 */
 	function getFolder($path) {
-		$files=$this->getFiles();
-		$folderContent=array();
-		$pathLength=strlen($path);
-		foreach($files as $file) {
-			if(substr($file, 0, $pathLength)==$path and $file!=$path) {
-				if(strrpos(substr($file, 0, -1), '/')<=$pathLength) {
-					$folderContent[]=substr($file, $pathLength);
+		$files = $this->getFiles();
+		$folderContent = array();
+		$pathLength = strlen($path);
+		foreach ($files as $file) {
+			if (substr($file, 0, $pathLength) == $path and $file != $path) {
+				if (strrpos(substr($file, 0, -1), '/') <= $pathLength) {
+					$folderContent[] = substr($file, $pathLength);
 				}
 			}
 		}
@@ -128,10 +128,10 @@ 
 	 * @return array
 	 */
 	function getFiles() {
-		$fileCount=$this->zip->numFiles;
-		$files=array();
-		for($i=0;$i<$fileCount;$i++) {
-			$files[]=$this->zip->getNameIndex($i);
+		$fileCount = $this->zip->numFiles;
+		$files = array();
+		for ($i = 0; $i < $fileCount; $i++) {
+			$files[] = $this->zip->getNameIndex($i);
 		}
 		return $files;
 	}
@@ -167,7 +167,7 @@ 
 	 * @return bool
 	 */
 	function fileExists($path) {
-		return ($this->zip->locateName($path)!==false) or ($this->zip->locateName($path.'/')!==false);
+		return ($this->zip->locateName($path) !== false) or ($this->zip->locateName($path.'/') !== false);
 	}
 	/**
 	 * remove a file or folder from the archive
@@ -175,9 +175,9 @@ 
 	 * @return bool
 	 */
 	function remove($path) {
-		if($this->fileExists($path.'/')) {
+		if ($this->fileExists($path.'/')) {
 			return $this->zip->deleteName($path.'/');
-		}else{
+		} else {
 			return $this->zip->deleteName($path);
 		}
 	}
@@ -188,23 +188,23 @@ 
 	 * @return resource
 	 */
 	function getStream($path, $mode) {
-		if($mode=='r' or $mode=='rb') {
+		if ($mode == 'r' or $mode == 'rb') {
 			return $this->zip->getStream($path);
 		} else {
 			//since we can't directly get a writable stream,
 			//make a temp copy of the file and put it back
 			//in the archive when the stream is closed
-			if(strrpos($path, '.')!==false) {
-				$ext=substr($path, strrpos($path, '.'));
-			}else{
-				$ext='';
+			if (strrpos($path, '.') !== false) {
+				$ext = substr($path, strrpos($path, '.'));
+			} else {
+				$ext = '';
 			}
-			$tmpFile=\OCP\Files::tmpFile($ext);
-			if($this->fileExists($path)) {
+			$tmpFile = \OCP\Files::tmpFile($ext);
+			if ($this->fileExists($path)) {
 				$this->extractFile($path, $tmpFile);
 			}
 			$handle = fopen($tmpFile, $mode);
-			return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+			return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) {
 				$this->writeBack($tmpFile, $path);
 			});
 		}
@@ -223,9 +223,9 @@ 
 	 * @return string
 	 */
 	private function stripPath($path) {
-		if(!$path || $path[0]=='/') {
+		if (!$path || $path[0] == '/') {
 			return substr($path, 1);
-		}else{
+		} else {
 			return $path;
 		}
 	}

lib/private/Archive/Archive.php

Spacing +5 added lines, -5 removed lines

@@ -49,7 +49,7 @@ 
 	 * @param string $source either a local file or string data
 	 * @return bool
 	 */
-	abstract function addFile($path, $source='');
+	abstract function addFile($path, $source = '');
 	/**
 	 * rename a file or folder in the archive
 	 * @param string $source
@@ -126,15 +126,15 @@ 
 	 */
 	function addRecursive($path, $source) {
 		$dh = opendir($source);
-		if(is_resource($dh)) {
+		if (is_resource($dh)) {
 			$this->addFolder($path);
 			while (($file = readdir($dh)) !== false) {
-				if($file=='.' or $file=='..') {
+				if ($file == '.' or $file == '..') {
 					continue;
 				}
-				if(is_dir($source.'/'.$file)) {
+				if (is_dir($source.'/'.$file)) {
 					$this->addRecursive($path.'/'.$file, $source.'/'.$file);
-				}else{
+				} else {
 					$this->addFile($path.'/'.$file, $source.'/'.$file);
 				}
 			}

lib/private/Migration/BackgroundRepair.php

Spacing +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
 	 */
 	public function execute($jobList, ILogger $logger = null) {
 		// add an interval of 15 mins
-		$this->setInterval(15*60);
+		$this->setInterval(15 * 60);
 
 		$this->jobList = $jobList;
 		$this->logger = $logger;
@@ -90,7 +90,7 @@ 
 		try {
 			$repair->addStep($step);
 		} catch (\Exception $ex) {
-			$this->logger->logException($ex,[
+			$this->logger->logException($ex, [
 				'app' => 'migration'
 			]);
 

lib/private/Command/QueueBus.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 		if ($command instanceof ICommand) {
 			// ensure the command can be serialized
 			$serialized = serialize($command);
-			if(strlen($serialized) > 4000) {
+			if (strlen($serialized) > 4000) {
 				throw new \InvalidArgumentException('Trying to push a command which serialized form can not be stored in the database (>4000 character)');
 			}
 			$unserialized = unserialize($serialized);