nextcloud / server

lib/public/idb.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
      * @return \OC_DB_StatementWrapper prepared SQL query
 	 * @since 7.0.0
      */
-    public function prepareQuery($sql, $limit=null, $offset=null);
+    public function prepareQuery($sql, $limit = null, $offset = null);
 
 
     /**

lib/public/activity/iextension.php

Spacing +5 added lines, -5 removed lines

@@ -42,11 +42,11 @@
 	const METHOD_STREAM = 'stream';
 	const METHOD_MAIL = 'email';
 
-	const PRIORITY_VERYLOW 	= 10;
-	const PRIORITY_LOW	= 20;
-	const PRIORITY_MEDIUM	= 30;
-	const PRIORITY_HIGH	= 40;
-	const PRIORITY_VERYHIGH	= 50;
+	const PRIORITY_VERYLOW = 10;
+	const PRIORITY_LOW = 20;
+	const PRIORITY_MEDIUM = 30;
+	const PRIORITY_HIGH = 40;
+	const PRIORITY_VERYHIGH = 50;
 
 	/**
 	 * The extension can return an array of additional notification types.

lib/autoloader.php

Spacing +13 added lines, -13 removed lines

@@ -98,12 +98,12 @@ 
 			 * Remove "apps/" from inclusion path for smooth migration to mutli app dir
 			 */
 			if (strpos(\OC::$CLASSPATH[$class], 'apps/') === 0) {
-				\OCP\Util::writeLog('core', 'include path for class "' . $class . '" starts with "apps/"', \OCP\Util::DEBUG);
+				\OCP\Util::writeLog('core', 'include path for class "'.$class.'" starts with "apps/"', \OCP\Util::DEBUG);
 				$paths[] = str_replace('apps/', '', \OC::$CLASSPATH[$class]);
 			}
 		} elseif (strpos($class, 'OC_') === 0) {
-			$paths[] = \OC::$SERVERROOT . '/lib/private/legacy/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
-			$paths[] = \OC::$SERVERROOT . '/lib/private/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
+			$paths[] = \OC::$SERVERROOT.'/lib/private/legacy/'.strtolower(str_replace('_', '/', substr($class, 3)).'.php');
+			$paths[] = \OC::$SERVERROOT.'/lib/private/'.strtolower(str_replace('_', '/', substr($class, 3)).'.php');
 		} elseif (strpos($class, 'OC\\') === 0) {
 			$split = explode('\\', $class, 3);
 
@@ -111,31 +111,31 @@ 
 				$split[1] = strtolower($split[1]);
 
 				if ($split[1] === 'core') {
-					$paths[] = \OC::$SERVERROOT . '/core/' . strtolower(str_replace('\\', '/', $split[2])) . '.php';
+					$paths[] = \OC::$SERVERROOT.'/core/'.strtolower(str_replace('\\', '/', $split[2])).'.php';
 				} else if ($split[1] === 'settings') {
-					$paths[] = \OC::$SERVERROOT . '/settings/' . strtolower(str_replace('\\', '/', $split[2])) . '.php';
+					$paths[] = \OC::$SERVERROOT.'/settings/'.strtolower(str_replace('\\', '/', $split[2])).'.php';
 				} else {
-					$paths[] = \OC::$SERVERROOT . '/lib/private/' . $split[1] . '/' . strtolower(str_replace('\\', '/', $split[2])) . '.php';
+					$paths[] = \OC::$SERVERROOT.'/lib/private/'.$split[1].'/'.strtolower(str_replace('\\', '/', $split[2])).'.php';
 				}
 
 			} else {
-				$paths[] = \OC::$SERVERROOT . '/lib/private/' . strtolower(str_replace('\\', '/', $split[1])) . '.php';
+				$paths[] = \OC::$SERVERROOT.'/lib/private/'.strtolower(str_replace('\\', '/', $split[1])).'.php';
 			}
 		} elseif (strpos($class, 'OCP\\') === 0) {
-			$paths[] = \OC::$SERVERROOT . '/lib/public/' . strtolower(str_replace('\\', '/', substr($class, 4)) . '.php');
+			$paths[] = \OC::$SERVERROOT.'/lib/public/'.strtolower(str_replace('\\', '/', substr($class, 4)).'.php');
 		} elseif (strpos($class, 'OCA\\') === 0) {
 			list(, $app, $rest) = explode('\\', $class, 3);
 			$app = strtolower($app);
 			$appPath = \OC_App::getAppPath($app);
 			if ($appPath && stream_resolve_include_path($appPath)) {
-				$paths[] = $appPath . '/' . strtolower(str_replace('\\', '/', $rest) . '.php');
+				$paths[] = $appPath.'/'.strtolower(str_replace('\\', '/', $rest).'.php');
 				// If not found in the root of the app directory, insert '/lib' after app id and try again.
-				$paths[] = $appPath . '/lib/' . strtolower(str_replace('\\', '/', $rest) . '.php');
+				$paths[] = $appPath.'/lib/'.strtolower(str_replace('\\', '/', $rest).'.php');
 			}
 		} elseif (strpos($class, 'Test_') === 0) {
-			$paths[] = \OC::$SERVERROOT . '/tests/lib/' . strtolower(str_replace('_', '/', substr($class, 5)) . '.php');
+			$paths[] = \OC::$SERVERROOT.'/tests/lib/'.strtolower(str_replace('_', '/', substr($class, 5)).'.php');
 		} elseif (strpos($class, 'Test\\') === 0) {
-			$paths[] = \OC::$SERVERROOT . '/tests/lib/' . strtolower(str_replace('\\', '/', substr($class, 5)) . '.php');
+			$paths[] = \OC::$SERVERROOT.'/tests/lib/'.strtolower(str_replace('\\', '/', substr($class, 5)).'.php');
 		}
 		return $paths;
 	}
@@ -146,7 +146,7 @@ 
 	 */
 	protected function isValidPath($fullPath) {
 		foreach ($this->validRoots as $root => $true) {
-			if (substr($fullPath, 0, strlen($root) + 1) === $root . '/') {
+			if (substr($fullPath, 0, strlen($root) + 1) === $root.'/') {
 				return true;
 			}
 		}

lib/private/archive/zip.php

Spacing +42 added lines, -42 removed lines

@@ -28,21 +28,21 @@ 
  *
  */
 
-class OC_Archive_ZIP extends OC_Archive{
+class OC_Archive_ZIP extends OC_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);
 		}
 	}
@@ -60,14 +60,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;
@@ -79,8 +79,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);
 	}
 	/**
@@ -89,7 +89,7 @@ 
 	 * @return int
 	 */
 	function filesize($path) {
-		$stat=$this->zip->statName($path);
+		$stat = $this->zip->statName($path);
 		return $stat['size'];
 	}
 	/**
@@ -106,13 +106,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);
 				}
 			}
 		}
@@ -123,10 +123,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;
 	}
@@ -162,7 +162,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
@@ -170,9 +170,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);
 		}
 	}
@@ -183,33 +183,33 @@ 
 	 * @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 cant 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);
+			$tmpFile = OCP\Files::tmpFile($ext);
 			\OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
-			if($this->fileExists($path)) {
+			if ($this->fileExists($path)) {
 				$this->extractFile($path, $tmpFile);
 			}
-			self::$tempFiles[$tmpFile]=$path;
+			self::$tempFiles[$tmpFile] = $path;
 			return fopen('close://'.$tmpFile, $mode);
 		}
 	}
 
-	private static $tempFiles=array();
+	private static $tempFiles = array();
 	/**
 	 * write back temporary files
 	 */
 	function writeBack($tmpFile) {
-		if(isset(self::$tempFiles[$tmpFile])) {
+		if (isset(self::$tempFiles[$tmpFile])) {
 			$this->addFile(self::$tempFiles[$tmpFile], $tmpFile);
 			unlink($tmpFile);
 		}
@@ -220,9 +220,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/tar.php

Spacing +15 added lines, -15 removed lines

@@ -97,13 +97,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;
@@ -140,12 +140,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;
@@ -160,9 +160,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;
 			}
@@ -261,13 +261,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;
@@ -291,7 +291,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;
@@ -306,7 +306,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;
 		}
@@ -327,7 +327,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();
@@ -359,7 +359,7 @@ 
 		} else {
 			\OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
 			self::$tempFiles[$tmpFile] = $path;
-			return fopen('close://' . $tmpFile, $mode);
+			return fopen('close://'.$tmpFile, $mode);
 		}
 	}
 

lib/private/l10n/factory.php

Spacing +24 added lines, -24 removed lines

@@ -128,9 +128,9 @@ 
 		 *
 		 * @link https://github.com/owncloud/core/issues/21955
 		 */
-		if($this->config->getSystemValue('installed', false)) {
-			$userId = !is_null($this->userSession->getUser()) ? $this->userSession->getUser()->getUID() :  null;
-			if(!is_null($userId)) {
+		if ($this->config->getSystemValue('installed', false)) {
+			$userId = !is_null($this->userSession->getUser()) ? $this->userSession->getUser()->getUID() : null;
+			if (!is_null($userId)) {
 				$userLang = $this->config->getUserValue($userId, 'core', 'lang', null);
 			} else {
 				$userLang = null;
@@ -194,7 +194,7 @@ 
 		// merge with translations from theme
 		$theme = $this->config->getSystemValue('theme');
 		if (!empty($theme)) {
-			$themeDir = $this->serverRoot . '/themes/' . $theme . substr($dir, strlen($this->serverRoot));
+			$themeDir = $this->serverRoot.'/themes/'.$theme.substr($dir, strlen($this->serverRoot));
 
 			if (is_dir($themeDir)) {
 				$files = scandir($themeDir);
@@ -283,12 +283,12 @@ 
 		$languageFiles = [];
 
 		$i18nDir = $this->findL10nDir($app);
-		$transFile = strip_tags($i18nDir) . strip_tags($lang) . '.json';
+		$transFile = strip_tags($i18nDir).strip_tags($lang).'.json';
 
-		if ((\OC_Helper::isSubDirectory($transFile, $this->serverRoot . '/core/l10n/')
-				|| \OC_Helper::isSubDirectory($transFile, $this->serverRoot . '/lib/l10n/')
-				|| \OC_Helper::isSubDirectory($transFile, $this->serverRoot . '/settings/l10n/')
-				|| \OC_Helper::isSubDirectory($transFile, \OC_App::getAppPath($app) . '/l10n/')
+		if ((\OC_Helper::isSubDirectory($transFile, $this->serverRoot.'/core/l10n/')
+				|| \OC_Helper::isSubDirectory($transFile, $this->serverRoot.'/lib/l10n/')
+				|| \OC_Helper::isSubDirectory($transFile, $this->serverRoot.'/settings/l10n/')
+				|| \OC_Helper::isSubDirectory($transFile, \OC_App::getAppPath($app).'/l10n/')
 			)
 			&& file_exists($transFile)) {
 			// load the translations file
@@ -298,7 +298,7 @@ 
 		// merge with translations from theme
 		$theme = $this->config->getSystemValue('theme');
 		if (!empty($theme)) {
-			$transFile = $this->serverRoot . '/themes/' . $theme . substr($transFile, strlen($this->serverRoot));
+			$transFile = $this->serverRoot.'/themes/'.$theme.substr($transFile, strlen($this->serverRoot));
 			if (file_exists($transFile)) {
 				$languageFiles[] = $transFile;
 			}
@@ -315,14 +315,14 @@ 
 	 */
 	protected function findL10nDir($app = null) {
 		if (in_array($app, ['core', 'lib', 'settings'])) {
-			if (file_exists($this->serverRoot . '/' . $app . '/l10n/')) {
-				return $this->serverRoot . '/' . $app . '/l10n/';
+			if (file_exists($this->serverRoot.'/'.$app.'/l10n/')) {
+				return $this->serverRoot.'/'.$app.'/l10n/';
 			}
 		} else if ($app && \OC_App::getAppPath($app) !== false) {
 			// Check if the app is in the app folder
-			return \OC_App::getAppPath($app) . '/l10n/';
+			return \OC_App::getAppPath($app).'/l10n/';
 		}
-		return $this->serverRoot . '/core/l10n/';
+		return $this->serverRoot.'/core/l10n/';
 	}
 
 
@@ -339,15 +339,15 @@ 
 			return $this->pluralFunctions[$string];
 		}
 
-		if (preg_match( '/^\s*nplurals\s*=\s*(\d+)\s*;\s*plural=(.*)$/u', $string, $matches)) {
+		if (preg_match('/^\s*nplurals\s*=\s*(\d+)\s*;\s*plural=(.*)$/u', $string, $matches)) {
 			// sanitize
-			$nplurals = preg_replace( '/[^0-9]/', '', $matches[1] );
-			$plural = preg_replace( '#[^n0-9:\(\)\?\|\&=!<>+*/\%-]#', '', $matches[2] );
+			$nplurals = preg_replace('/[^0-9]/', '', $matches[1]);
+			$plural = preg_replace('#[^n0-9:\(\)\?\|\&=!<>+*/\%-]#', '', $matches[2]);
 
 			$body = str_replace(
-				array( 'plural', 'n', '$n$plurals', ),
-				array( '$plural', '$n', '$nplurals', ),
-				'nplurals='. $nplurals . '; plural=' . $plural
+				array('plural', 'n', '$n$plurals',),
+				array('$plural', '$n', '$nplurals',),
+				'nplurals='.$nplurals.'; plural='.$plural
 			);
 
 			// add parents
@@ -355,9 +355,9 @@ 
 			$body .= ';';
 			$res = '';
 			$p = 0;
-			for($i = 0; $i < strlen($body); $i++) {
+			for ($i = 0; $i < strlen($body); $i++) {
 				$ch = $body[$i];
-				switch ( $ch ) {
+				switch ($ch) {
 					case '?':
 						$res .= ' ? (';
 						$p++;
@@ -366,7 +366,7 @@ 
 						$res .= ') : (';
 						break;
 					case ';':
-						$res .= str_repeat( ')', $p ) . ';';
+						$res .= str_repeat(')', $p).';';
 						$p = 0;
 						break;
 					default:
@@ -374,7 +374,7 @@ 
 				}
 			}
 
-			$body = $res . 'return ($plural>=$nplurals?$nplurals-1:$plural);';
+			$body = $res.'return ($plural>=$nplurals?$nplurals-1:$plural);';
 			$function = create_function('$n', $body);
 			$this->pluralFunctions[$string] = $function;
 			return $function;

lib/private/l10n/string.php

Spacing +3 added lines, -3 removed lines

@@ -56,13 +56,13 @@
 		$translations = $this->l10n->getTranslations();
 
 		$text = $this->text;
-		if(array_key_exists($this->text, $translations)) {
-			if(is_array($translations[$this->text])) {
+		if (array_key_exists($this->text, $translations)) {
+			if (is_array($translations[$this->text])) {
 				$fn = $this->l10n->getPluralFormFunction();
 				$id = $fn($this->count);
 				$text = $translations[$this->text][$id];
 			}
-			else{
+			else {
 				$text = $translations[$this->text];
 			}
 		}

lib/private/lock/dblockingprovider.php

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
 		}
 		$query = $this->connection->prepare('SELECT `lock` from `*PREFIX*file_locks` WHERE `key` = ?');
 		$query->execute([$path]);
-		$lockValue = (int)$query->fetchColumn();
+		$lockValue = (int) $query->fetchColumn();
 		if ($type === self::LOCK_SHARED) {
 			if ($this->isLocallyLocked($path)) {
 				// if we have a shared lock we kept open locally but it's released we always have at least 1 shared lock in the db

lib/private/session/cryptosessiondata.php

Spacing +2 added lines, -2 removed lines

@@ -97,7 +97,7 @@ 
 	 * @return string|null Either the value or null
 	 */
 	public function get($key) {
-		if(isset($this->sessionValues[$key])) {
+		if (isset($this->sessionValues[$key])) {
 			return $this->sessionValues[$key];
 		}
 
@@ -159,7 +159,7 @@ 
 	 * Close the session and release the lock, also writes all changed data in batch
 	 */
 	public function close() {
-		if($this->isModified) {
+		if ($this->isModified) {
 			$encryptedValue = $this->crypto->encrypt(json_encode($this->sessionValues), $this->passphrase);
 			$this->session->set(self::encryptedSessionName, $encryptedValue);
 			$this->isModified = false;