nextcloud / server

lib/private/legacy/hook.php

Indentation +103 added lines, -103 removed lines

@@ -29,118 +29,118 @@
  *
  */
 class OC_Hook{
-	public static $thrownExceptions = [];
+    public static $thrownExceptions = [];
 
-	static private $registered = array();
+    static private $registered = array();
 
-	/**
-	 * connects a function to a hook
-	 *
-	 * @param string $signalClass class name of emitter
-	 * @param string $signalName name of signal
-	 * @param string|object $slotClass class name of slot
-	 * @param string $slotName name of slot
-	 * @return bool
-	 *
-	 * This function makes it very easy to connect to use hooks.
-	 *
-	 * TODO: write example
-	 */
-	static public function connect($signalClass, $signalName, $slotClass, $slotName ) {
-		// If we're trying to connect to an emitting class that isn't
-		// yet registered, register it
-		if( !array_key_exists($signalClass, self::$registered )) {
-			self::$registered[$signalClass] = array();
-		}
-		// If we're trying to connect to an emitting method that isn't
-		// yet registered, register it with the emitting class
-		if( !array_key_exists( $signalName, self::$registered[$signalClass] )) {
-			self::$registered[$signalClass][$signalName] = array();
-		}
+    /**
+     * connects a function to a hook
+     *
+     * @param string $signalClass class name of emitter
+     * @param string $signalName name of signal
+     * @param string|object $slotClass class name of slot
+     * @param string $slotName name of slot
+     * @return bool
+     *
+     * This function makes it very easy to connect to use hooks.
+     *
+     * TODO: write example
+     */
+    static public function connect($signalClass, $signalName, $slotClass, $slotName ) {
+        // If we're trying to connect to an emitting class that isn't
+        // yet registered, register it
+        if( !array_key_exists($signalClass, self::$registered )) {
+            self::$registered[$signalClass] = array();
+        }
+        // If we're trying to connect to an emitting method that isn't
+        // yet registered, register it with the emitting class
+        if( !array_key_exists( $signalName, self::$registered[$signalClass] )) {
+            self::$registered[$signalClass][$signalName] = array();
+        }
 
-		// don't connect hooks twice
-		foreach (self::$registered[$signalClass][$signalName] as $hook) {
-			if ($hook['class'] === $slotClass and $hook['name'] === $slotName) {
-				return false;
-			}
-		}
-		// Connect the hook handler to the requested emitter
-		self::$registered[$signalClass][$signalName][] = array(
-				"class" => $slotClass,
-				"name" => $slotName
-		);
+        // don't connect hooks twice
+        foreach (self::$registered[$signalClass][$signalName] as $hook) {
+            if ($hook['class'] === $slotClass and $hook['name'] === $slotName) {
+                return false;
+            }
+        }
+        // Connect the hook handler to the requested emitter
+        self::$registered[$signalClass][$signalName][] = array(
+                "class" => $slotClass,
+                "name" => $slotName
+        );
 
-		// No chance for failure ;-)
-		return true;
-	}
+        // No chance for failure ;-)
+        return true;
+    }
 
-	/**
-	 * emits a signal
-	 *
-	 * @param string $signalClass class name of emitter
-	 * @param string $signalName name of signal
-	 * @param mixed $params default: array() array with additional data
-	 * @return bool true if slots exists or false if not
-	 * @throws \OC\HintException
-	 * @throws \OC\ServerNotAvailableException Emits a signal. To get data from the slot use references!
-	 *
-	 * TODO: write example
-	 */
-	static public function emit($signalClass, $signalName, $params = []) {
+    /**
+     * emits a signal
+     *
+     * @param string $signalClass class name of emitter
+     * @param string $signalName name of signal
+     * @param mixed $params default: array() array with additional data
+     * @return bool true if slots exists or false if not
+     * @throws \OC\HintException
+     * @throws \OC\ServerNotAvailableException Emits a signal. To get data from the slot use references!
+     *
+     * TODO: write example
+     */
+    static public function emit($signalClass, $signalName, $params = []) {
 
-		// Return false if no hook handlers are listening to this
-		// emitting class
-		if( !array_key_exists($signalClass, self::$registered )) {
-			return false;
-		}
+        // Return false if no hook handlers are listening to this
+        // emitting class
+        if( !array_key_exists($signalClass, self::$registered )) {
+            return false;
+        }
 
-		// Return false if no hook handlers are listening to this
-		// emitting method
-		if( !array_key_exists( $signalName, self::$registered[$signalClass] )) {
-			return false;
-		}
+        // Return false if no hook handlers are listening to this
+        // emitting method
+        if( !array_key_exists( $signalName, self::$registered[$signalClass] )) {
+            return false;
+        }
 
-		// Call all slots
-		foreach( self::$registered[$signalClass][$signalName] as $i ) {
-			try {
-				call_user_func( array( $i["class"], $i["name"] ), $params );
-			} catch (Exception $e){
-				self::$thrownExceptions[] = $e;
-				\OC::$server->getLogger()->logException($e);
-				if($e instanceof \OC\HintException) {
-					throw $e;
-				}
-				if($e instanceof \OC\ServerNotAvailableException) {
-					throw $e;
-				}
-			}
-		}
+        // Call all slots
+        foreach( self::$registered[$signalClass][$signalName] as $i ) {
+            try {
+                call_user_func( array( $i["class"], $i["name"] ), $params );
+            } catch (Exception $e){
+                self::$thrownExceptions[] = $e;
+                \OC::$server->getLogger()->logException($e);
+                if($e instanceof \OC\HintException) {
+                    throw $e;
+                }
+                if($e instanceof \OC\ServerNotAvailableException) {
+                    throw $e;
+                }
+            }
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-	/**
-	 * clear hooks
-	 * @param string $signalClass
-	 * @param string $signalName
-	 */
-	static public function clear($signalClass='', $signalName='') {
-		if ($signalClass) {
-			if ($signalName) {
-				self::$registered[$signalClass][$signalName]=array();
-			}else{
-				self::$registered[$signalClass]=array();
-			}
-		}else{
-			self::$registered=array();
-		}
-	}
+    /**
+     * clear hooks
+     * @param string $signalClass
+     * @param string $signalName
+     */
+    static public function clear($signalClass='', $signalName='') {
+        if ($signalClass) {
+            if ($signalName) {
+                self::$registered[$signalClass][$signalName]=array();
+            }else{
+                self::$registered[$signalClass]=array();
+            }
+        }else{
+            self::$registered=array();
+        }
+    }
 
-	/**
-	 * DO NOT USE!
-	 * For unit tests ONLY!
-	 */
-	static public function getHooks() {
-		return self::$registered;
-	}
+    /**
+     * DO NOT USE!
+     * For unit tests ONLY!
+     */
+    static public function getHooks() {
+        return self::$registered;
+    }
 }

Spacing +17 added lines, -17 removed lines

@@ -28,7 +28,7 @@ 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-class OC_Hook{
+class OC_Hook {
 	public static $thrownExceptions = [];
 
 	static private $registered = array();
@@ -46,15 +46,15 @@ 
 	 *
 	 * TODO: write example
 	 */
-	static public function connect($signalClass, $signalName, $slotClass, $slotName ) {
+	static public function connect($signalClass, $signalName, $slotClass, $slotName) {
 		// If we're trying to connect to an emitting class that isn't
 		// yet registered, register it
-		if( !array_key_exists($signalClass, self::$registered )) {
+		if (!array_key_exists($signalClass, self::$registered)) {
 			self::$registered[$signalClass] = array();
 		}
 		// If we're trying to connect to an emitting method that isn't
 		// yet registered, register it with the emitting class
-		if( !array_key_exists( $signalName, self::$registered[$signalClass] )) {
+		if (!array_key_exists($signalName, self::$registered[$signalClass])) {
 			self::$registered[$signalClass][$signalName] = array();
 		}
 
@@ -90,27 +90,27 @@ 
 
 		// Return false if no hook handlers are listening to this
 		// emitting class
-		if( !array_key_exists($signalClass, self::$registered )) {
+		if (!array_key_exists($signalClass, self::$registered)) {
 			return false;
 		}
 
 		// Return false if no hook handlers are listening to this
 		// emitting method
-		if( !array_key_exists( $signalName, self::$registered[$signalClass] )) {
+		if (!array_key_exists($signalName, self::$registered[$signalClass])) {
 			return false;
 		}
 
 		// Call all slots
-		foreach( self::$registered[$signalClass][$signalName] as $i ) {
+		foreach (self::$registered[$signalClass][$signalName] as $i) {
 			try {
-				call_user_func( array( $i["class"], $i["name"] ), $params );
-			} catch (Exception $e){
+				call_user_func(array($i["class"], $i["name"]), $params);
+			} catch (Exception $e) {
 				self::$thrownExceptions[] = $e;
 				\OC::$server->getLogger()->logException($e);
-				if($e instanceof \OC\HintException) {
+				if ($e instanceof \OC\HintException) {
 					throw $e;
 				}
-				if($e instanceof \OC\ServerNotAvailableException) {
+				if ($e instanceof \OC\ServerNotAvailableException) {
 					throw $e;
 				}
 			}
@@ -124,15 +124,15 @@ 
 	 * @param string $signalClass
 	 * @param string $signalName
 	 */
-	static public function clear($signalClass='', $signalName='') {
+	static public function clear($signalClass = '', $signalName = '') {
 		if ($signalClass) {
 			if ($signalName) {
-				self::$registered[$signalClass][$signalName]=array();
-			}else{
-				self::$registered[$signalClass]=array();
+				self::$registered[$signalClass][$signalName] = array();
+			} else {
+				self::$registered[$signalClass] = array();
 			}
-		}else{
-			self::$registered=array();
+		} else {
+			self::$registered = array();
 		}
 	}
 

Braces +2 added lines, -2 removed lines

@@ -128,10 +128,10 @@
 		if ($signalClass) {
 			if ($signalName) {
 				self::$registered[$signalClass][$signalName]=array();
-			}else{
+			} else{
 				self::$registered[$signalClass]=array();
 			}
-		}else{
+		} else{
 			self::$registered=array();
 		}
 	}

lib/private/legacy/helper.php

Braces +3 added lines, -2 removed lines

@@ -271,8 +271,9 @@
 		}
 		foreach ($dirs as $dir) {
 			foreach ($exts as $ext) {
-				if ($check_fn("$dir/$name" . $ext))
-					return true;
+				if ($check_fn("$dir/$name" . $ext)) {
+									return true;
+				}
 			}
 		}
 		return false;

Indentation +573 added lines, -573 removed lines

@@ -49,577 +49,577 @@
  * Collection of useful functions
  */
 class OC_Helper {
-	private static $templateManager;
-
-	/**
-	 * Make a human file size
-	 * @param int $bytes file size in bytes
-	 * @return string a human readable file size
-	 *
-	 * Makes 2048 to 2 kB.
-	 */
-	public static function humanFileSize($bytes) {
-		if ($bytes < 0) {
-			return "?";
-		}
-		if ($bytes < 1024) {
-			return "$bytes B";
-		}
-		$bytes = round($bytes / 1024, 0);
-		if ($bytes < 1024) {
-			return "$bytes KB";
-		}
-		$bytes = round($bytes / 1024, 1);
-		if ($bytes < 1024) {
-			return "$bytes MB";
-		}
-		$bytes = round($bytes / 1024, 1);
-		if ($bytes < 1024) {
-			return "$bytes GB";
-		}
-		$bytes = round($bytes / 1024, 1);
-		if ($bytes < 1024) {
-			return "$bytes TB";
-		}
-
-		$bytes = round($bytes / 1024, 1);
-		return "$bytes PB";
-	}
-
-	/**
-	 * Make a php file size
-	 * @param int $bytes file size in bytes
-	 * @return string a php parseable file size
-	 *
-	 * Makes 2048 to 2k and 2^41 to 2048G
-	 */
-	public static function phpFileSize($bytes) {
-		if ($bytes < 0) {
-			return "?";
-		}
-		if ($bytes < 1024) {
-			return $bytes . "B";
-		}
-		$bytes = round($bytes / 1024, 1);
-		if ($bytes < 1024) {
-			return $bytes . "K";
-		}
-		$bytes = round($bytes / 1024, 1);
-		if ($bytes < 1024) {
-			return $bytes . "M";
-		}
-		$bytes = round($bytes / 1024, 1);
-		return $bytes . "G";
-	}
-
-	/**
-	 * Make a computer file size
-	 * @param string $str file size in human readable format
-	 * @return float|bool a file size in bytes
-	 *
-	 * Makes 2kB to 2048.
-	 *
-	 * Inspired by: http://www.php.net/manual/en/function.filesize.php#92418
-	 */
-	public static function computerFileSize($str) {
-		$str = strtolower($str);
-		if (is_numeric($str)) {
-			return (float)$str;
-		}
-
-		$bytes_array = array(
-			'b' => 1,
-			'k' => 1024,
-			'kb' => 1024,
-			'mb' => 1024 * 1024,
-			'm' => 1024 * 1024,
-			'gb' => 1024 * 1024 * 1024,
-			'g' => 1024 * 1024 * 1024,
-			'tb' => 1024 * 1024 * 1024 * 1024,
-			't' => 1024 * 1024 * 1024 * 1024,
-			'pb' => 1024 * 1024 * 1024 * 1024 * 1024,
-			'p' => 1024 * 1024 * 1024 * 1024 * 1024,
-		);
-
-		$bytes = (float)$str;
-
-		if (preg_match('#([kmgtp]?b?)$#si', $str, $matches) && !empty($bytes_array[$matches[1]])) {
-			$bytes *= $bytes_array[$matches[1]];
-		} else {
-			return false;
-		}
-
-		$bytes = round($bytes);
-
-		return $bytes;
-	}
-
-	/**
-	 * Recursive copying of folders
-	 * @param string $src source folder
-	 * @param string $dest target folder
-	 *
-	 */
-	static function copyr($src, $dest) {
-		if (is_dir($src)) {
-			if (!is_dir($dest)) {
-				mkdir($dest);
-			}
-			$files = scandir($src);
-			foreach ($files as $file) {
-				if ($file != "." && $file != "..") {
-					self::copyr("$src/$file", "$dest/$file");
-				}
-			}
-		} elseif (file_exists($src) && !\OC\Files\Filesystem::isFileBlacklisted($src)) {
-			copy($src, $dest);
-		}
-	}
-
-	/**
-	 * Recursive deletion of folders
-	 * @param string $dir path to the folder
-	 * @param bool $deleteSelf if set to false only the content of the folder will be deleted
-	 * @return bool
-	 */
-	static function rmdirr($dir, $deleteSelf = true) {
-		if (is_dir($dir)) {
-			$files = new RecursiveIteratorIterator(
-				new RecursiveDirectoryIterator($dir, RecursiveDirectoryIterator::SKIP_DOTS),
-				RecursiveIteratorIterator::CHILD_FIRST
-			);
-
-			foreach ($files as $fileInfo) {
-				/** @var SplFileInfo $fileInfo */
-				if ($fileInfo->isLink()) {
-					unlink($fileInfo->getPathname());
-				} else if ($fileInfo->isDir()) {
-					rmdir($fileInfo->getRealPath());
-				} else {
-					unlink($fileInfo->getRealPath());
-				}
-			}
-			if ($deleteSelf) {
-				rmdir($dir);
-			}
-		} elseif (file_exists($dir)) {
-			if ($deleteSelf) {
-				unlink($dir);
-			}
-		}
-		if (!$deleteSelf) {
-			return true;
-		}
-
-		return !file_exists($dir);
-	}
-
-	/**
-	 * @return \OC\Files\Type\TemplateManager
-	 */
-	static public function getFileTemplateManager() {
-		if (!self::$templateManager) {
-			self::$templateManager = new \OC\Files\Type\TemplateManager();
-		}
-		return self::$templateManager;
-	}
-
-	/**
-	 * detect if a given program is found in the search PATH
-	 *
-	 * @param string $name
-	 * @param bool $path
-	 * @internal param string $program name
-	 * @internal param string $optional search path, defaults to $PATH
-	 * @return bool    true if executable program found in path
-	 */
-	public static function canExecute($name, $path = false) {
-		// path defaults to PATH from environment if not set
-		if ($path === false) {
-			$path = getenv("PATH");
-		}
-		// we look for an executable file of that name
-		$exts = [""];
-		$check_fn = "is_executable";
-		// Default check will be done with $path directories :
-		$dirs = explode(PATH_SEPARATOR, $path);
-		// WARNING : We have to check if open_basedir is enabled :
-		$obd = OC::$server->getIniWrapper()->getString('open_basedir');
-		if ($obd != "none") {
-			$obd_values = explode(PATH_SEPARATOR, $obd);
-			if (count($obd_values) > 0 and $obd_values[0]) {
-				// open_basedir is in effect !
-				// We need to check if the program is in one of these dirs :
-				$dirs = $obd_values;
-			}
-		}
-		foreach ($dirs as $dir) {
-			foreach ($exts as $ext) {
-				if ($check_fn("$dir/$name" . $ext))
-					return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * copy the contents of one stream to another
-	 *
-	 * @param resource $source
-	 * @param resource $target
-	 * @return array the number of bytes copied and result
-	 */
-	public static function streamCopy($source, $target) {
-		if (!$source or !$target) {
-			return array(0, false);
-		}
-		$bufSize = 8192;
-		$result = true;
-		$count = 0;
-		while (!feof($source)) {
-			$buf = fread($source, $bufSize);
-			$bytesWritten = fwrite($target, $buf);
-			if ($bytesWritten !== false) {
-				$count += $bytesWritten;
-			}
-			// note: strlen is expensive so only use it when necessary,
-			// on the last block
-			if ($bytesWritten === false
-				|| ($bytesWritten < $bufSize && $bytesWritten < strlen($buf))
-			) {
-				// write error, could be disk full ?
-				$result = false;
-				break;
-			}
-		}
-		return array($count, $result);
-	}
-
-	/**
-	 * Adds a suffix to the name in case the file exists
-	 *
-	 * @param string $path
-	 * @param string $filename
-	 * @return string
-	 */
-	public static function buildNotExistingFileName($path, $filename) {
-		$view = \OC\Files\Filesystem::getView();
-		return self::buildNotExistingFileNameForView($path, $filename, $view);
-	}
-
-	/**
-	 * Adds a suffix to the name in case the file exists
-	 *
-	 * @param string $path
-	 * @param string $filename
-	 * @return string
-	 */
-	public static function buildNotExistingFileNameForView($path, $filename, \OC\Files\View $view) {
-		if ($path === '/') {
-			$path = '';
-		}
-		if ($pos = strrpos($filename, '.')) {
-			$name = substr($filename, 0, $pos);
-			$ext = substr($filename, $pos);
-		} else {
-			$name = $filename;
-			$ext = '';
-		}
-
-		$newpath = $path . '/' . $filename;
-		if ($view->file_exists($newpath)) {
-			if (preg_match_all('/\((\d+)\)/', $name, $matches, PREG_OFFSET_CAPTURE)) {
-				//Replace the last "(number)" with "(number+1)"
-				$last_match = count($matches[0]) - 1;
-				$counter = $matches[1][$last_match][0] + 1;
-				$offset = $matches[0][$last_match][1];
-				$match_length = strlen($matches[0][$last_match][0]);
-			} else {
-				$counter = 2;
-				$match_length = 0;
-				$offset = false;
-			}
-			do {
-				if ($offset) {
-					//Replace the last "(number)" with "(number+1)"
-					$newname = substr_replace($name, '(' . $counter . ')', $offset, $match_length);
-				} else {
-					$newname = $name . ' (' . $counter . ')';
-				}
-				$newpath = $path . '/' . $newname . $ext;
-				$counter++;
-			} while ($view->file_exists($newpath));
-		}
-
-		return $newpath;
-	}
-
-	/**
-	 * Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is.
-	 *
-	 * @param array $input The array to work on
-	 * @param int $case Either MB_CASE_UPPER or MB_CASE_LOWER (default)
-	 * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8
-	 * @return array
-	 *
-	 * Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is.
-	 * based on http://www.php.net/manual/en/function.array-change-key-case.php#107715
-	 *
-	 */
-	public static function mb_array_change_key_case($input, $case = MB_CASE_LOWER, $encoding = 'UTF-8') {
-		$case = ($case != MB_CASE_UPPER) ? MB_CASE_LOWER : MB_CASE_UPPER;
-		$ret = array();
-		foreach ($input as $k => $v) {
-			$ret[mb_convert_case($k, $case, $encoding)] = $v;
-		}
-		return $ret;
-	}
-
-	/**
-	 * performs a search in a nested array
-	 * @param array $haystack the array to be searched
-	 * @param string $needle the search string
-	 * @param mixed $index optional, only search this key name
-	 * @return mixed the key of the matching field, otherwise false
-	 *
-	 * performs a search in a nested array
-	 *
-	 * taken from http://www.php.net/manual/en/function.array-search.php#97645
-	 */
-	public static function recursiveArraySearch($haystack, $needle, $index = null) {
-		$aIt = new RecursiveArrayIterator($haystack);
-		$it = new RecursiveIteratorIterator($aIt);
-
-		while ($it->valid()) {
-			if (((isset($index) AND ($it->key() == $index)) OR !isset($index)) AND ($it->current() == $needle)) {
-				return $aIt->key();
-			}
-
-			$it->next();
-		}
-
-		return false;
-	}
-
-	/**
-	 * calculates the maximum upload size respecting system settings, free space and user quota
-	 *
-	 * @param string $dir the current folder where the user currently operates
-	 * @param int $freeSpace the number of bytes free on the storage holding $dir, if not set this will be received from the storage directly
-	 * @return int number of bytes representing
-	 */
-	public static function maxUploadFilesize($dir, $freeSpace = null) {
-		if (is_null($freeSpace) || $freeSpace < 0){
-			$freeSpace = self::freeSpace($dir);
-		}
-		return min($freeSpace, self::uploadLimit());
-	}
-
-	/**
-	 * Calculate free space left within user quota
-	 *
-	 * @param string $dir the current folder where the user currently operates
-	 * @return int number of bytes representing
-	 */
-	public static function freeSpace($dir) {
-		$freeSpace = \OC\Files\Filesystem::free_space($dir);
-		if ($freeSpace < \OCP\Files\FileInfo::SPACE_UNLIMITED) {
-			$freeSpace = max($freeSpace, 0);
-			return $freeSpace;
-		} else {
-			return (INF > 0)? INF: PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188
-		}
-	}
-
-	/**
-	 * Calculate PHP upload limit
-	 *
-	 * @return int PHP upload file size limit
-	 */
-	public static function uploadLimit() {
-		$ini = \OC::$server->getIniWrapper();
-		$upload_max_filesize = OCP\Util::computerFileSize($ini->get('upload_max_filesize'));
-		$post_max_size = OCP\Util::computerFileSize($ini->get('post_max_size'));
-		if ((int)$upload_max_filesize === 0 and (int)$post_max_size === 0) {
-			return INF;
-		} elseif ((int)$upload_max_filesize === 0 or (int)$post_max_size === 0) {
-			return max($upload_max_filesize, $post_max_size); //only the non 0 value counts
-		} else {
-			return min($upload_max_filesize, $post_max_size);
-		}
-	}
-
-	/**
-	 * Checks if a function is available
-	 *
-	 * @param string $function_name
-	 * @return bool
-	 */
-	public static function is_function_enabled($function_name) {
-		if (!function_exists($function_name)) {
-			return false;
-		}
-		$ini = \OC::$server->getIniWrapper();
-		$disabled = explode(',', $ini->get('disable_functions') ?: '');
-		$disabled = array_map('trim', $disabled);
-		if (in_array($function_name, $disabled)) {
-			return false;
-		}
-		$disabled = explode(',', $ini->get('suhosin.executor.func.blacklist') ?: '');
-		$disabled = array_map('trim', $disabled);
-		if (in_array($function_name, $disabled)) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Try to find a program
-	 *
-	 * @param string $program
-	 * @return null|string
-	 */
-	public static function findBinaryPath($program) {
-		$memcache = \OC::$server->getMemCacheFactory()->createDistributed('findBinaryPath');
-		if ($memcache->hasKey($program)) {
-			return $memcache->get($program);
-		}
-		$result = null;
-		if (self::is_function_enabled('exec')) {
-			$exeSniffer = new ExecutableFinder();
-			// Returns null if nothing is found
-			$result = $exeSniffer->find($program, null, ['/usr/local/sbin', '/usr/local/bin', '/usr/sbin', '/usr/bin', '/sbin', '/bin', '/opt/bin']);
-		}
-		// store the value for 5 minutes
-		$memcache->set($program, $result, 300);
-		return $result;
-	}
-
-	/**
-	 * Calculate the disc space for the given path
-	 *
-	 * @param string $path
-	 * @param \OCP\Files\FileInfo $rootInfo (optional)
-	 * @return array
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public static function getStorageInfo($path, $rootInfo = null) {
-		// return storage info without adding mount points
-		$includeExtStorage = \OC::$server->getSystemConfig()->getValue('quota_include_external_storage', false);
-
-		if (!$rootInfo) {
-			$rootInfo = \OC\Files\Filesystem::getFileInfo($path, $includeExtStorage ? 'ext' : false);
-		}
-		if (!$rootInfo instanceof \OCP\Files\FileInfo) {
-			throw new \OCP\Files\NotFoundException();
-		}
-		$used = $rootInfo->getSize();
-		if ($used < 0) {
-			$used = 0;
-		}
-		$quota = \OCP\Files\FileInfo::SPACE_UNLIMITED;
-		$storage = $rootInfo->getStorage();
-		$sourceStorage = $storage;
-		if ($storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
-			$includeExtStorage = false;
-			$sourceStorage = $storage->getSourceStorage();
-		}
-		if ($includeExtStorage) {
-			if ($storage->instanceOfStorage('\OC\Files\Storage\Home')
-				|| $storage->instanceOfStorage('\OC\Files\ObjectStore\HomeObjectStoreStorage')
-			) {
-				/** @var \OC\Files\Storage\Home $storage */
-				$userInstance = $storage->getUser();
-				$user = ($userInstance === null) ? null : $userInstance->getUID();
-			} else {
-				$user = \OC::$server->getUserSession()->getUser()->getUID();
-			}
-			if ($user) {
-				$quota = OC_Util::getUserQuota($user);
-			} else {
-				$quota = \OCP\Files\FileInfo::SPACE_UNLIMITED;
-			}
-			if ($quota !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
-				// always get free space / total space from root + mount points
-				return self::getGlobalStorageInfo();
-			}
-		}
-
-		// TODO: need a better way to get total space from storage
-		if ($sourceStorage->instanceOfStorage('\OC\Files\Storage\Wrapper\Quota')) {
-			/** @var \OC\Files\Storage\Wrapper\Quota $storage */
-			$quota = $sourceStorage->getQuota();
-		}
-		$free = $sourceStorage->free_space($rootInfo->getInternalPath());
-		if ($free >= 0) {
-			$total = $free + $used;
-		} else {
-			$total = $free; //either unknown or unlimited
-		}
-		if ($total > 0) {
-			if ($quota > 0 && $total > $quota) {
-				$total = $quota;
-			}
-			// prevent division by zero or error codes (negative values)
-			$relative = round(($used / $total) * 10000) / 100;
-		} else {
-			$relative = 0;
-		}
-
-		$ownerId = $storage->getOwner($path);
-		$ownerDisplayName = '';
-		$owner = \OC::$server->getUserManager()->get($ownerId);
-		if($owner) {
-			$ownerDisplayName = $owner->getDisplayName();
-		}
-
-		return [
-			'free' => $free,
-			'used' => $used,
-			'quota' => $quota,
-			'total' => $total,
-			'relative' => $relative,
-			'owner' => $ownerId,
-			'ownerDisplayName' => $ownerDisplayName,
-		];
-	}
-
-	/**
-	 * Get storage info including all mount points and quota
-	 *
-	 * @return array
-	 */
-	private static function getGlobalStorageInfo() {
-		$quota = OC_Util::getUserQuota(\OCP\User::getUser());
-
-		$rootInfo = \OC\Files\Filesystem::getFileInfo('', 'ext');
-		$used = $rootInfo['size'];
-		if ($used < 0) {
-			$used = 0;
-		}
-
-		$total = $quota;
-		$free = $quota - $used;
-
-		if ($total > 0) {
-			if ($quota > 0 && $total > $quota) {
-				$total = $quota;
-			}
-			// prevent division by zero or error codes (negative values)
-			$relative = round(($used / $total) * 10000) / 100;
-		} else {
-			$relative = 0;
-		}
-
-		return array('free' => $free, 'used' => $used, 'total' => $total, 'relative' => $relative);
-
-	}
-
-	/**
-	 * Returns whether the config file is set manually to read-only
-	 * @return bool
-	 */
-	public static function isReadOnlyConfigEnabled() {
-		return \OC::$server->getConfig()->getSystemValue('config_is_read_only', false);
-	}
+    private static $templateManager;
+
+    /**
+     * Make a human file size
+     * @param int $bytes file size in bytes
+     * @return string a human readable file size
+     *
+     * Makes 2048 to 2 kB.
+     */
+    public static function humanFileSize($bytes) {
+        if ($bytes < 0) {
+            return "?";
+        }
+        if ($bytes < 1024) {
+            return "$bytes B";
+        }
+        $bytes = round($bytes / 1024, 0);
+        if ($bytes < 1024) {
+            return "$bytes KB";
+        }
+        $bytes = round($bytes / 1024, 1);
+        if ($bytes < 1024) {
+            return "$bytes MB";
+        }
+        $bytes = round($bytes / 1024, 1);
+        if ($bytes < 1024) {
+            return "$bytes GB";
+        }
+        $bytes = round($bytes / 1024, 1);
+        if ($bytes < 1024) {
+            return "$bytes TB";
+        }
+
+        $bytes = round($bytes / 1024, 1);
+        return "$bytes PB";
+    }
+
+    /**
+     * Make a php file size
+     * @param int $bytes file size in bytes
+     * @return string a php parseable file size
+     *
+     * Makes 2048 to 2k and 2^41 to 2048G
+     */
+    public static function phpFileSize($bytes) {
+        if ($bytes < 0) {
+            return "?";
+        }
+        if ($bytes < 1024) {
+            return $bytes . "B";
+        }
+        $bytes = round($bytes / 1024, 1);
+        if ($bytes < 1024) {
+            return $bytes . "K";
+        }
+        $bytes = round($bytes / 1024, 1);
+        if ($bytes < 1024) {
+            return $bytes . "M";
+        }
+        $bytes = round($bytes / 1024, 1);
+        return $bytes . "G";
+    }
+
+    /**
+     * Make a computer file size
+     * @param string $str file size in human readable format
+     * @return float|bool a file size in bytes
+     *
+     * Makes 2kB to 2048.
+     *
+     * Inspired by: http://www.php.net/manual/en/function.filesize.php#92418
+     */
+    public static function computerFileSize($str) {
+        $str = strtolower($str);
+        if (is_numeric($str)) {
+            return (float)$str;
+        }
+
+        $bytes_array = array(
+            'b' => 1,
+            'k' => 1024,
+            'kb' => 1024,
+            'mb' => 1024 * 1024,
+            'm' => 1024 * 1024,
+            'gb' => 1024 * 1024 * 1024,
+            'g' => 1024 * 1024 * 1024,
+            'tb' => 1024 * 1024 * 1024 * 1024,
+            't' => 1024 * 1024 * 1024 * 1024,
+            'pb' => 1024 * 1024 * 1024 * 1024 * 1024,
+            'p' => 1024 * 1024 * 1024 * 1024 * 1024,
+        );
+
+        $bytes = (float)$str;
+
+        if (preg_match('#([kmgtp]?b?)$#si', $str, $matches) && !empty($bytes_array[$matches[1]])) {
+            $bytes *= $bytes_array[$matches[1]];
+        } else {
+            return false;
+        }
+
+        $bytes = round($bytes);
+
+        return $bytes;
+    }
+
+    /**
+     * Recursive copying of folders
+     * @param string $src source folder
+     * @param string $dest target folder
+     *
+     */
+    static function copyr($src, $dest) {
+        if (is_dir($src)) {
+            if (!is_dir($dest)) {
+                mkdir($dest);
+            }
+            $files = scandir($src);
+            foreach ($files as $file) {
+                if ($file != "." && $file != "..") {
+                    self::copyr("$src/$file", "$dest/$file");
+                }
+            }
+        } elseif (file_exists($src) && !\OC\Files\Filesystem::isFileBlacklisted($src)) {
+            copy($src, $dest);
+        }
+    }
+
+    /**
+     * Recursive deletion of folders
+     * @param string $dir path to the folder
+     * @param bool $deleteSelf if set to false only the content of the folder will be deleted
+     * @return bool
+     */
+    static function rmdirr($dir, $deleteSelf = true) {
+        if (is_dir($dir)) {
+            $files = new RecursiveIteratorIterator(
+                new RecursiveDirectoryIterator($dir, RecursiveDirectoryIterator::SKIP_DOTS),
+                RecursiveIteratorIterator::CHILD_FIRST
+            );
+
+            foreach ($files as $fileInfo) {
+                /** @var SplFileInfo $fileInfo */
+                if ($fileInfo->isLink()) {
+                    unlink($fileInfo->getPathname());
+                } else if ($fileInfo->isDir()) {
+                    rmdir($fileInfo->getRealPath());
+                } else {
+                    unlink($fileInfo->getRealPath());
+                }
+            }
+            if ($deleteSelf) {
+                rmdir($dir);
+            }
+        } elseif (file_exists($dir)) {
+            if ($deleteSelf) {
+                unlink($dir);
+            }
+        }
+        if (!$deleteSelf) {
+            return true;
+        }
+
+        return !file_exists($dir);
+    }
+
+    /**
+     * @return \OC\Files\Type\TemplateManager
+     */
+    static public function getFileTemplateManager() {
+        if (!self::$templateManager) {
+            self::$templateManager = new \OC\Files\Type\TemplateManager();
+        }
+        return self::$templateManager;
+    }
+
+    /**
+     * detect if a given program is found in the search PATH
+     *
+     * @param string $name
+     * @param bool $path
+     * @internal param string $program name
+     * @internal param string $optional search path, defaults to $PATH
+     * @return bool    true if executable program found in path
+     */
+    public static function canExecute($name, $path = false) {
+        // path defaults to PATH from environment if not set
+        if ($path === false) {
+            $path = getenv("PATH");
+        }
+        // we look for an executable file of that name
+        $exts = [""];
+        $check_fn = "is_executable";
+        // Default check will be done with $path directories :
+        $dirs = explode(PATH_SEPARATOR, $path);
+        // WARNING : We have to check if open_basedir is enabled :
+        $obd = OC::$server->getIniWrapper()->getString('open_basedir');
+        if ($obd != "none") {
+            $obd_values = explode(PATH_SEPARATOR, $obd);
+            if (count($obd_values) > 0 and $obd_values[0]) {
+                // open_basedir is in effect !
+                // We need to check if the program is in one of these dirs :
+                $dirs = $obd_values;
+            }
+        }
+        foreach ($dirs as $dir) {
+            foreach ($exts as $ext) {
+                if ($check_fn("$dir/$name" . $ext))
+                    return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * copy the contents of one stream to another
+     *
+     * @param resource $source
+     * @param resource $target
+     * @return array the number of bytes copied and result
+     */
+    public static function streamCopy($source, $target) {
+        if (!$source or !$target) {
+            return array(0, false);
+        }
+        $bufSize = 8192;
+        $result = true;
+        $count = 0;
+        while (!feof($source)) {
+            $buf = fread($source, $bufSize);
+            $bytesWritten = fwrite($target, $buf);
+            if ($bytesWritten !== false) {
+                $count += $bytesWritten;
+            }
+            // note: strlen is expensive so only use it when necessary,
+            // on the last block
+            if ($bytesWritten === false
+                || ($bytesWritten < $bufSize && $bytesWritten < strlen($buf))
+            ) {
+                // write error, could be disk full ?
+                $result = false;
+                break;
+            }
+        }
+        return array($count, $result);
+    }
+
+    /**
+     * Adds a suffix to the name in case the file exists
+     *
+     * @param string $path
+     * @param string $filename
+     * @return string
+     */
+    public static function buildNotExistingFileName($path, $filename) {
+        $view = \OC\Files\Filesystem::getView();
+        return self::buildNotExistingFileNameForView($path, $filename, $view);
+    }
+
+    /**
+     * Adds a suffix to the name in case the file exists
+     *
+     * @param string $path
+     * @param string $filename
+     * @return string
+     */
+    public static function buildNotExistingFileNameForView($path, $filename, \OC\Files\View $view) {
+        if ($path === '/') {
+            $path = '';
+        }
+        if ($pos = strrpos($filename, '.')) {
+            $name = substr($filename, 0, $pos);
+            $ext = substr($filename, $pos);
+        } else {
+            $name = $filename;
+            $ext = '';
+        }
+
+        $newpath = $path . '/' . $filename;
+        if ($view->file_exists($newpath)) {
+            if (preg_match_all('/\((\d+)\)/', $name, $matches, PREG_OFFSET_CAPTURE)) {
+                //Replace the last "(number)" with "(number+1)"
+                $last_match = count($matches[0]) - 1;
+                $counter = $matches[1][$last_match][0] + 1;
+                $offset = $matches[0][$last_match][1];
+                $match_length = strlen($matches[0][$last_match][0]);
+            } else {
+                $counter = 2;
+                $match_length = 0;
+                $offset = false;
+            }
+            do {
+                if ($offset) {
+                    //Replace the last "(number)" with "(number+1)"
+                    $newname = substr_replace($name, '(' . $counter . ')', $offset, $match_length);
+                } else {
+                    $newname = $name . ' (' . $counter . ')';
+                }
+                $newpath = $path . '/' . $newname . $ext;
+                $counter++;
+            } while ($view->file_exists($newpath));
+        }
+
+        return $newpath;
+    }
+
+    /**
+     * Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is.
+     *
+     * @param array $input The array to work on
+     * @param int $case Either MB_CASE_UPPER or MB_CASE_LOWER (default)
+     * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8
+     * @return array
+     *
+     * Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is.
+     * based on http://www.php.net/manual/en/function.array-change-key-case.php#107715
+     *
+     */
+    public static function mb_array_change_key_case($input, $case = MB_CASE_LOWER, $encoding = 'UTF-8') {
+        $case = ($case != MB_CASE_UPPER) ? MB_CASE_LOWER : MB_CASE_UPPER;
+        $ret = array();
+        foreach ($input as $k => $v) {
+            $ret[mb_convert_case($k, $case, $encoding)] = $v;
+        }
+        return $ret;
+    }
+
+    /**
+     * performs a search in a nested array
+     * @param array $haystack the array to be searched
+     * @param string $needle the search string
+     * @param mixed $index optional, only search this key name
+     * @return mixed the key of the matching field, otherwise false
+     *
+     * performs a search in a nested array
+     *
+     * taken from http://www.php.net/manual/en/function.array-search.php#97645
+     */
+    public static function recursiveArraySearch($haystack, $needle, $index = null) {
+        $aIt = new RecursiveArrayIterator($haystack);
+        $it = new RecursiveIteratorIterator($aIt);
+
+        while ($it->valid()) {
+            if (((isset($index) AND ($it->key() == $index)) OR !isset($index)) AND ($it->current() == $needle)) {
+                return $aIt->key();
+            }
+
+            $it->next();
+        }
+
+        return false;
+    }
+
+    /**
+     * calculates the maximum upload size respecting system settings, free space and user quota
+     *
+     * @param string $dir the current folder where the user currently operates
+     * @param int $freeSpace the number of bytes free on the storage holding $dir, if not set this will be received from the storage directly
+     * @return int number of bytes representing
+     */
+    public static function maxUploadFilesize($dir, $freeSpace = null) {
+        if (is_null($freeSpace) || $freeSpace < 0){
+            $freeSpace = self::freeSpace($dir);
+        }
+        return min($freeSpace, self::uploadLimit());
+    }
+
+    /**
+     * Calculate free space left within user quota
+     *
+     * @param string $dir the current folder where the user currently operates
+     * @return int number of bytes representing
+     */
+    public static function freeSpace($dir) {
+        $freeSpace = \OC\Files\Filesystem::free_space($dir);
+        if ($freeSpace < \OCP\Files\FileInfo::SPACE_UNLIMITED) {
+            $freeSpace = max($freeSpace, 0);
+            return $freeSpace;
+        } else {
+            return (INF > 0)? INF: PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188
+        }
+    }
+
+    /**
+     * Calculate PHP upload limit
+     *
+     * @return int PHP upload file size limit
+     */
+    public static function uploadLimit() {
+        $ini = \OC::$server->getIniWrapper();
+        $upload_max_filesize = OCP\Util::computerFileSize($ini->get('upload_max_filesize'));
+        $post_max_size = OCP\Util::computerFileSize($ini->get('post_max_size'));
+        if ((int)$upload_max_filesize === 0 and (int)$post_max_size === 0) {
+            return INF;
+        } elseif ((int)$upload_max_filesize === 0 or (int)$post_max_size === 0) {
+            return max($upload_max_filesize, $post_max_size); //only the non 0 value counts
+        } else {
+            return min($upload_max_filesize, $post_max_size);
+        }
+    }
+
+    /**
+     * Checks if a function is available
+     *
+     * @param string $function_name
+     * @return bool
+     */
+    public static function is_function_enabled($function_name) {
+        if (!function_exists($function_name)) {
+            return false;
+        }
+        $ini = \OC::$server->getIniWrapper();
+        $disabled = explode(',', $ini->get('disable_functions') ?: '');
+        $disabled = array_map('trim', $disabled);
+        if (in_array($function_name, $disabled)) {
+            return false;
+        }
+        $disabled = explode(',', $ini->get('suhosin.executor.func.blacklist') ?: '');
+        $disabled = array_map('trim', $disabled);
+        if (in_array($function_name, $disabled)) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Try to find a program
+     *
+     * @param string $program
+     * @return null|string
+     */
+    public static function findBinaryPath($program) {
+        $memcache = \OC::$server->getMemCacheFactory()->createDistributed('findBinaryPath');
+        if ($memcache->hasKey($program)) {
+            return $memcache->get($program);
+        }
+        $result = null;
+        if (self::is_function_enabled('exec')) {
+            $exeSniffer = new ExecutableFinder();
+            // Returns null if nothing is found
+            $result = $exeSniffer->find($program, null, ['/usr/local/sbin', '/usr/local/bin', '/usr/sbin', '/usr/bin', '/sbin', '/bin', '/opt/bin']);
+        }
+        // store the value for 5 minutes
+        $memcache->set($program, $result, 300);
+        return $result;
+    }
+
+    /**
+     * Calculate the disc space for the given path
+     *
+     * @param string $path
+     * @param \OCP\Files\FileInfo $rootInfo (optional)
+     * @return array
+     * @throws \OCP\Files\NotFoundException
+     */
+    public static function getStorageInfo($path, $rootInfo = null) {
+        // return storage info without adding mount points
+        $includeExtStorage = \OC::$server->getSystemConfig()->getValue('quota_include_external_storage', false);
+
+        if (!$rootInfo) {
+            $rootInfo = \OC\Files\Filesystem::getFileInfo($path, $includeExtStorage ? 'ext' : false);
+        }
+        if (!$rootInfo instanceof \OCP\Files\FileInfo) {
+            throw new \OCP\Files\NotFoundException();
+        }
+        $used = $rootInfo->getSize();
+        if ($used < 0) {
+            $used = 0;
+        }
+        $quota = \OCP\Files\FileInfo::SPACE_UNLIMITED;
+        $storage = $rootInfo->getStorage();
+        $sourceStorage = $storage;
+        if ($storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
+            $includeExtStorage = false;
+            $sourceStorage = $storage->getSourceStorage();
+        }
+        if ($includeExtStorage) {
+            if ($storage->instanceOfStorage('\OC\Files\Storage\Home')
+                || $storage->instanceOfStorage('\OC\Files\ObjectStore\HomeObjectStoreStorage')
+            ) {
+                /** @var \OC\Files\Storage\Home $storage */
+                $userInstance = $storage->getUser();
+                $user = ($userInstance === null) ? null : $userInstance->getUID();
+            } else {
+                $user = \OC::$server->getUserSession()->getUser()->getUID();
+            }
+            if ($user) {
+                $quota = OC_Util::getUserQuota($user);
+            } else {
+                $quota = \OCP\Files\FileInfo::SPACE_UNLIMITED;
+            }
+            if ($quota !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
+                // always get free space / total space from root + mount points
+                return self::getGlobalStorageInfo();
+            }
+        }
+
+        // TODO: need a better way to get total space from storage
+        if ($sourceStorage->instanceOfStorage('\OC\Files\Storage\Wrapper\Quota')) {
+            /** @var \OC\Files\Storage\Wrapper\Quota $storage */
+            $quota = $sourceStorage->getQuota();
+        }
+        $free = $sourceStorage->free_space($rootInfo->getInternalPath());
+        if ($free >= 0) {
+            $total = $free + $used;
+        } else {
+            $total = $free; //either unknown or unlimited
+        }
+        if ($total > 0) {
+            if ($quota > 0 && $total > $quota) {
+                $total = $quota;
+            }
+            // prevent division by zero or error codes (negative values)
+            $relative = round(($used / $total) * 10000) / 100;
+        } else {
+            $relative = 0;
+        }
+
+        $ownerId = $storage->getOwner($path);
+        $ownerDisplayName = '';
+        $owner = \OC::$server->getUserManager()->get($ownerId);
+        if($owner) {
+            $ownerDisplayName = $owner->getDisplayName();
+        }
+
+        return [
+            'free' => $free,
+            'used' => $used,
+            'quota' => $quota,
+            'total' => $total,
+            'relative' => $relative,
+            'owner' => $ownerId,
+            'ownerDisplayName' => $ownerDisplayName,
+        ];
+    }
+
+    /**
+     * Get storage info including all mount points and quota
+     *
+     * @return array
+     */
+    private static function getGlobalStorageInfo() {
+        $quota = OC_Util::getUserQuota(\OCP\User::getUser());
+
+        $rootInfo = \OC\Files\Filesystem::getFileInfo('', 'ext');
+        $used = $rootInfo['size'];
+        if ($used < 0) {
+            $used = 0;
+        }
+
+        $total = $quota;
+        $free = $quota - $used;
+
+        if ($total > 0) {
+            if ($quota > 0 && $total > $quota) {
+                $total = $quota;
+            }
+            // prevent division by zero or error codes (negative values)
+            $relative = round(($used / $total) * 10000) / 100;
+        } else {
+            $relative = 0;
+        }
+
+        return array('free' => $free, 'used' => $used, 'total' => $total, 'relative' => $relative);
+
+    }
+
+    /**
+     * Returns whether the config file is set manually to read-only
+     * @return bool
+     */
+    public static function isReadOnlyConfigEnabled() {
+        return \OC::$server->getConfig()->getSystemValue('config_is_read_only', false);
+    }
 }

Spacing +16 added lines, -16 removed lines

@@ -98,18 +98,18 @@ 
 			return "?";
 		}
 		if ($bytes < 1024) {
-			return $bytes . "B";
+			return $bytes."B";
 		}
 		$bytes = round($bytes / 1024, 1);
 		if ($bytes < 1024) {
-			return $bytes . "K";
+			return $bytes."K";
 		}
 		$bytes = round($bytes / 1024, 1);
 		if ($bytes < 1024) {
-			return $bytes . "M";
+			return $bytes."M";
 		}
 		$bytes = round($bytes / 1024, 1);
-		return $bytes . "G";
+		return $bytes."G";
 	}
 
 	/**
@@ -124,7 +124,7 @@ 
 	public static function computerFileSize($str) {
 		$str = strtolower($str);
 		if (is_numeric($str)) {
-			return (float)$str;
+			return (float) $str;
 		}
 
 		$bytes_array = array(
@@ -141,7 +141,7 @@ 
 			'p' => 1024 * 1024 * 1024 * 1024 * 1024,
 		);
 
-		$bytes = (float)$str;
+		$bytes = (float) $str;
 
 		if (preg_match('#([kmgtp]?b?)$#si', $str, $matches) && !empty($bytes_array[$matches[1]])) {
 			$bytes *= $bytes_array[$matches[1]];
@@ -255,7 +255,7 @@ 
 		}
 		foreach ($dirs as $dir) {
 			foreach ($exts as $ext) {
-				if ($check_fn("$dir/$name" . $ext))
+				if ($check_fn("$dir/$name".$ext))
 					return true;
 			}
 		}
@@ -326,7 +326,7 @@ 
 			$ext = '';
 		}
 
-		$newpath = $path . '/' . $filename;
+		$newpath = $path.'/'.$filename;
 		if ($view->file_exists($newpath)) {
 			if (preg_match_all('/\((\d+)\)/', $name, $matches, PREG_OFFSET_CAPTURE)) {
 				//Replace the last "(number)" with "(number+1)"
@@ -342,11 +342,11 @@ 
 			do {
 				if ($offset) {
 					//Replace the last "(number)" with "(number+1)"
-					$newname = substr_replace($name, '(' . $counter . ')', $offset, $match_length);
+					$newname = substr_replace($name, '('.$counter.')', $offset, $match_length);
 				} else {
-					$newname = $name . ' (' . $counter . ')';
+					$newname = $name.' ('.$counter.')';
 				}
-				$newpath = $path . '/' . $newname . $ext;
+				$newpath = $path.'/'.$newname.$ext;
 				$counter++;
 			} while ($view->file_exists($newpath));
 		}
@@ -409,7 +409,7 @@ 
 	 * @return int number of bytes representing
 	 */
 	public static function maxUploadFilesize($dir, $freeSpace = null) {
-		if (is_null($freeSpace) || $freeSpace < 0){
+		if (is_null($freeSpace) || $freeSpace < 0) {
 			$freeSpace = self::freeSpace($dir);
 		}
 		return min($freeSpace, self::uploadLimit());
@@ -427,7 +427,7 @@ 
 			$freeSpace = max($freeSpace, 0);
 			return $freeSpace;
 		} else {
-			return (INF > 0)? INF: PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188
+			return (INF > 0) ? INF: PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188
 		}
 	}
 
@@ -440,9 +440,9 @@ 
 		$ini = \OC::$server->getIniWrapper();
 		$upload_max_filesize = OCP\Util::computerFileSize($ini->get('upload_max_filesize'));
 		$post_max_size = OCP\Util::computerFileSize($ini->get('post_max_size'));
-		if ((int)$upload_max_filesize === 0 and (int)$post_max_size === 0) {
+		if ((int) $upload_max_filesize === 0 and (int) $post_max_size === 0) {
 			return INF;
-		} elseif ((int)$upload_max_filesize === 0 or (int)$post_max_size === 0) {
+		} elseif ((int) $upload_max_filesize === 0 or (int) $post_max_size === 0) {
 			return max($upload_max_filesize, $post_max_size); //only the non 0 value counts
 		} else {
 			return min($upload_max_filesize, $post_max_size);
@@ -569,7 +569,7 @@ 
 		$ownerId = $storage->getOwner($path);
 		$ownerDisplayName = '';
 		$owner = \OC::$server->getUserManager()->get($ownerId);
-		if($owner) {
+		if ($owner) {
 			$ownerDisplayName = $owner->getDisplayName();
 		}
 

lib/private/BackgroundJob/Legacy/RegularJob.php

Indentation +10 added lines, -10 removed lines

@@ -26,14 +26,14 @@
 use OCP\AutoloadNotAllowedException;
 
 class RegularJob extends \OC\BackgroundJob\Job {
-	public function run($argument) {
-		try {
-			if (is_callable($argument)) {
-				call_user_func($argument);
-			}
-		} catch (AutoloadNotAllowedException $e) {
-			// job is from a disabled app, ignore
-			return null;
-		}
-	}
+    public function run($argument) {
+        try {
+            if (is_callable($argument)) {
+                call_user_func($argument);
+            }
+        } catch (AutoloadNotAllowedException $e) {
+            // job is from a disabled app, ignore
+            return null;
+        }
+    }
 }

lib/private/BackgroundJob/Legacy/QueuedJob.php

Indentation +8 added lines, -8 removed lines

@@ -24,12 +24,12 @@
 namespace OC\BackgroundJob\Legacy;
 
 class QueuedJob extends \OC\BackgroundJob\QueuedJob {
-	public function run($argument) {
-		$class = $argument['klass'];
-		$method = $argument['method'];
-		$parameters = $argument['parameters'];
-		if (is_callable(array($class, $method))) {
-			call_user_func(array($class, $method), $parameters);
-		}
-	}
+    public function run($argument) {
+        $class = $argument['klass'];
+        $method = $argument['method'];
+        $parameters = $argument['parameters'];
+        if (is_callable(array($class, $method))) {
+            call_user_func(array($class, $method), $parameters);
+        }
+    }
 }

lib/private/Settings/Section.php

Indentation +58 added lines, -58 removed lines

@@ -26,67 +26,67 @@
 use OCP\Settings\IIconSection;
 
 class Section implements IIconSection {
-	/** @var string */
-	private $id;
-	/** @var string */
-	private $name;
-	/** @var int */
-	private $priority;
-	/** @var string */
-	private $icon;
+    /** @var string */
+    private $id;
+    /** @var string */
+    private $name;
+    /** @var int */
+    private $priority;
+    /** @var string */
+    private $icon;
 
-	/**
-	 * @param string $id
-	 * @param string $name
-	 * @param int $priority
-	 * @param string $icon
-	 */
-	public function __construct($id, $name, $priority, $icon = '') {
-		$this->id = $id;
-		$this->name = $name;
-		$this->priority = $priority;
-		$this->icon = $icon;
-	}
+    /**
+     * @param string $id
+     * @param string $name
+     * @param int $priority
+     * @param string $icon
+     */
+    public function __construct($id, $name, $priority, $icon = '') {
+        $this->id = $id;
+        $this->name = $name;
+        $this->priority = $priority;
+        $this->icon = $icon;
+    }
 
-	/**
-	 * returns the ID of the section. It is supposed to be a lower case string,
-	 * e.g. 'ldap'
-	 *
-	 * @returns string
-	 */
-	public function getID() {
-		return $this->id;
-	}
+    /**
+     * returns the ID of the section. It is supposed to be a lower case string,
+     * e.g. 'ldap'
+     *
+     * @returns string
+     */
+    public function getID() {
+        return $this->id;
+    }
 
-	/**
-	 * returns the translated name as it should be displayed, e.g. 'LDAP / AD
-	 * integration'. Use the L10N service to translate it.
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return $this->name;
-	}
+    /**
+     * returns the translated name as it should be displayed, e.g. 'LDAP / AD
+     * integration'. Use the L10N service to translate it.
+     *
+     * @return string
+     */
+    public function getName() {
+        return $this->name;
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the settings navigation. The sections are arranged in ascending order of
-	 * the priority values. It is required to return a value between 0 and 99.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return $this->priority;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the settings navigation. The sections are arranged in ascending order of
+     * the priority values. It is required to return a value between 0 and 99.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return $this->priority;
+    }
 
-	/**
-	 * returns the relative path to an 16*16 icon describing the section.
-	 * e.g. '/core/img/places/files.svg'
-	 *
-	 * @returns string
-	 * @since 12
-	 */
-	public function getIcon() {
-		return $this->icon;
-	}
+    /**
+     * returns the relative path to an 16*16 icon describing the section.
+     * e.g. '/core/img/places/files.svg'
+     *
+     * @returns string
+     * @since 12
+     */
+    public function getIcon() {
+        return $this->icon;
+    }
 }

lib/private/Streamer.php

Braces +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 				$fh = \OC\Files\Filesystem::fopen($file, 'r');
 				$this->addFileFromStream($fh, $internalDir . $filename, $filesize, $fileTime);
 				fclose($fh);
-			}elseif(\OC\Files\Filesystem::is_dir($file)) {
+			} elseif(\OC\Files\Filesystem::is_dir($file)) {
 				$this->addDirRecursive($file, $internalDir);
 			}
 		}

Indentation +121 added lines, -121 removed lines

@@ -29,135 +29,135 @@
 use ZipStreamer\ZipStreamer;
 
 class Streamer {
-	// array of regexp. Matching user agents will get tar instead of zip
-	private $preferTarFor = [ '/macintosh|mac os x/i' ];
+    // array of regexp. Matching user agents will get tar instead of zip
+    private $preferTarFor = [ '/macintosh|mac os x/i' ];
 
-	// streamer instance
-	private $streamerInstance;
+    // streamer instance
+    private $streamerInstance;
 
-	/**
-	 * Streamer constructor.
-	 *
-	 * @param IRequest $request
-	 * @param int $size The size of the files in bytes
-	 * @param int $numberOfFiles The number of files (and directories) that will
-	 *        be included in the streamed file
-	 */
-	public function __construct(IRequest $request, int $size, int $numberOfFiles){
+    /**
+     * Streamer constructor.
+     *
+     * @param IRequest $request
+     * @param int $size The size of the files in bytes
+     * @param int $numberOfFiles The number of files (and directories) that will
+     *        be included in the streamed file
+     */
+    public function __construct(IRequest $request, int $size, int $numberOfFiles){
 
-		/**
-		 * zip32 constraints for a basic (without compression, volumes nor
-		 * encryption) zip file according to the Zip specification:
-		 * - No file size is larger than 4 bytes (file size < 4294967296); see
-		 *   4.4.9 uncompressed size
-		 * - The size of all files plus their local headers is not larger than
-		 *   4 bytes; see 4.4.16 relative offset of local header and 4.4.24
-		 *   offset of start of central directory with respect to the starting
-		 *   disk number
-		 * - The total number of entries (files and directories) in the zip file
-		 *   is not larger than 2 bytes (number of entries < 65536); see 4.4.22
-		 *   total number of entries in the central dir
-		 * - The size of the central directory is not larger than 4 bytes; see
-		 *   4.4.23 size of the central directory
-		 *
-		 * Due to all that, zip32 is used if the size is below 4GB and there are
-		 * less than 65536 files; the margin between 4*1000^3 and 4*1024^3
-		 * should give enough room for the extra zip metadata. Technically, it
-		 * would still be possible to create an invalid zip32 file (for example,
-		 * a zip file from files smaller than 4GB with a central directory
-		 * larger than 4GiB), but it should not happen in the real world.
-		 */
-		if ($size < 4 * 1000 * 1000 * 1000 && $numberOfFiles < 65536) {
-			$this->streamerInstance = new ZipStreamer(['zip64' => false]);
-		} else if ($request->isUserAgent($this->preferTarFor)) {
-			$this->streamerInstance = new TarStreamer();
-		} else {
-			$this->streamerInstance = new ZipStreamer(['zip64' => PHP_INT_SIZE !== 4]);
-		}
-	}
+        /**
+         * zip32 constraints for a basic (without compression, volumes nor
+         * encryption) zip file according to the Zip specification:
+         * - No file size is larger than 4 bytes (file size < 4294967296); see
+         *   4.4.9 uncompressed size
+         * - The size of all files plus their local headers is not larger than
+         *   4 bytes; see 4.4.16 relative offset of local header and 4.4.24
+         *   offset of start of central directory with respect to the starting
+         *   disk number
+         * - The total number of entries (files and directories) in the zip file
+         *   is not larger than 2 bytes (number of entries < 65536); see 4.4.22
+         *   total number of entries in the central dir
+         * - The size of the central directory is not larger than 4 bytes; see
+         *   4.4.23 size of the central directory
+         *
+         * Due to all that, zip32 is used if the size is below 4GB and there are
+         * less than 65536 files; the margin between 4*1000^3 and 4*1024^3
+         * should give enough room for the extra zip metadata. Technically, it
+         * would still be possible to create an invalid zip32 file (for example,
+         * a zip file from files smaller than 4GB with a central directory
+         * larger than 4GiB), but it should not happen in the real world.
+         */
+        if ($size < 4 * 1000 * 1000 * 1000 && $numberOfFiles < 65536) {
+            $this->streamerInstance = new ZipStreamer(['zip64' => false]);
+        } else if ($request->isUserAgent($this->preferTarFor)) {
+            $this->streamerInstance = new TarStreamer();
+        } else {
+            $this->streamerInstance = new ZipStreamer(['zip64' => PHP_INT_SIZE !== 4]);
+        }
+    }
 	
-	/**
-	 * Send HTTP headers
-	 * @param string $name 
-	 */
-	public function sendHeaders($name){
-		$extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar';
-		$fullName = $name . $extension;
-		$this->streamerInstance->sendHeaders($fullName);
-	}
+    /**
+     * Send HTTP headers
+     * @param string $name 
+     */
+    public function sendHeaders($name){
+        $extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar';
+        $fullName = $name . $extension;
+        $this->streamerInstance->sendHeaders($fullName);
+    }
 	
-	/**
-	 * Stream directory recursively
-	 * @param string $dir
-	 * @param string $internalDir
-	 */
-	public function addDirRecursive($dir, $internalDir='') {
-		$dirname = basename($dir);
-		$rootDir = $internalDir . $dirname;
-		if (!empty($rootDir)) {
-			$this->streamerInstance->addEmptyDir($rootDir);
-		}
-		$internalDir .= $dirname . '/';
-		// prevent absolute dirs
-		$internalDir = ltrim($internalDir, '/');
+    /**
+     * Stream directory recursively
+     * @param string $dir
+     * @param string $internalDir
+     */
+    public function addDirRecursive($dir, $internalDir='') {
+        $dirname = basename($dir);
+        $rootDir = $internalDir . $dirname;
+        if (!empty($rootDir)) {
+            $this->streamerInstance->addEmptyDir($rootDir);
+        }
+        $internalDir .= $dirname . '/';
+        // prevent absolute dirs
+        $internalDir = ltrim($internalDir, '/');
 
-		$files= \OC\Files\Filesystem::getDirectoryContent($dir);
-		foreach($files as $file) {
-			$filename = $file['name'];
-			$file = $dir . '/' . $filename;
-			if(\OC\Files\Filesystem::is_file($file)) {
-				$filesize = \OC\Files\Filesystem::filesize($file);
-				$fileTime = \OC\Files\Filesystem::filemtime($file);
-				$fh = \OC\Files\Filesystem::fopen($file, 'r');
-				$this->addFileFromStream($fh, $internalDir . $filename, $filesize, $fileTime);
-				fclose($fh);
-			}elseif(\OC\Files\Filesystem::is_dir($file)) {
-				$this->addDirRecursive($file, $internalDir);
-			}
-		}
-	}
+        $files= \OC\Files\Filesystem::getDirectoryContent($dir);
+        foreach($files as $file) {
+            $filename = $file['name'];
+            $file = $dir . '/' . $filename;
+            if(\OC\Files\Filesystem::is_file($file)) {
+                $filesize = \OC\Files\Filesystem::filesize($file);
+                $fileTime = \OC\Files\Filesystem::filemtime($file);
+                $fh = \OC\Files\Filesystem::fopen($file, 'r');
+                $this->addFileFromStream($fh, $internalDir . $filename, $filesize, $fileTime);
+                fclose($fh);
+            }elseif(\OC\Files\Filesystem::is_dir($file)) {
+                $this->addDirRecursive($file, $internalDir);
+            }
+        }
+    }
 	
-	/**
-	 * Add a file to the archive at the specified location and file name.
-	 *
-	 * @param string $stream Stream to read data from
-	 * @param string $internalName Filepath and name to be used in the archive.
-	 * @param int $size Filesize
-	 * @param int|bool $time File mtime as int, or false
-	 * @return bool $success
-	 */
-	public function addFileFromStream($stream, $internalName, $size, $time) {
-		$options = [];
-		if ($time) {
-			$options = [
-				'timestamp' => $time
-			];
-		}
+    /**
+     * Add a file to the archive at the specified location and file name.
+     *
+     * @param string $stream Stream to read data from
+     * @param string $internalName Filepath and name to be used in the archive.
+     * @param int $size Filesize
+     * @param int|bool $time File mtime as int, or false
+     * @return bool $success
+     */
+    public function addFileFromStream($stream, $internalName, $size, $time) {
+        $options = [];
+        if ($time) {
+            $options = [
+                'timestamp' => $time
+            ];
+        }
 
-		if ($this->streamerInstance instanceof ZipStreamer) {
-			return $this->streamerInstance->addFileFromStream($stream, $internalName, $options);
-		} else {
-			return $this->streamerInstance->addFileFromStream($stream, $internalName, $size, $options);
-		}
-	}
+        if ($this->streamerInstance instanceof ZipStreamer) {
+            return $this->streamerInstance->addFileFromStream($stream, $internalName, $options);
+        } else {
+            return $this->streamerInstance->addFileFromStream($stream, $internalName, $size, $options);
+        }
+    }
 
-	/**
-	 * Add an empty directory entry to the archive.
-	 *
-	 * @param string $dirName Directory Path and name to be added to the archive.
-	 * @return bool $success
-	 */
-	public function addEmptyDir($dirName){
-		return $this->streamerInstance->addEmptyDir($dirName);
-	}
+    /**
+     * Add an empty directory entry to the archive.
+     *
+     * @param string $dirName Directory Path and name to be added to the archive.
+     * @return bool $success
+     */
+    public function addEmptyDir($dirName){
+        return $this->streamerInstance->addEmptyDir($dirName);
+    }
 
-	/**
-	 * Close the archive.
-	 * A closed archive can no longer have new files added to it. After
-	 * closing, the file is completely written to the output stream.
-	 * @return bool $success
-	 */
-	public function finalize(){
-		return $this->streamerInstance->finalize();
-	}
+    /**
+     * Close the archive.
+     * A closed archive can no longer have new files added to it. After
+     * closing, the file is completely written to the output stream.
+     * @return bool $success
+     */
+    public function finalize(){
+        return $this->streamerInstance->finalize();
+    }
 }

Spacing +15 added lines, -15 removed lines

@@ -30,7 +30,7 @@ 
 
 class Streamer {
 	// array of regexp. Matching user agents will get tar instead of zip
-	private $preferTarFor = [ '/macintosh|mac os x/i' ];
+	private $preferTarFor = ['/macintosh|mac os x/i'];
 
 	// streamer instance
 	private $streamerInstance;
@@ -43,7 +43,7 @@ 
 	 * @param int $numberOfFiles The number of files (and directories) that will
 	 *        be included in the streamed file
 	 */
-	public function __construct(IRequest $request, int $size, int $numberOfFiles){
+	public function __construct(IRequest $request, int $size, int $numberOfFiles) {
 
 		/**
 		 * zip32 constraints for a basic (without compression, volumes nor
@@ -80,9 +80,9 @@ 
 	 * Send HTTP headers
 	 * @param string $name 
 	 */
-	public function sendHeaders($name){
+	public function sendHeaders($name) {
 		$extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar';
-		$fullName = $name . $extension;
+		$fullName = $name.$extension;
 		$this->streamerInstance->sendHeaders($fullName);
 	}
 	
@@ -91,27 +91,27 @@ 
 	 * @param string $dir
 	 * @param string $internalDir
 	 */
-	public function addDirRecursive($dir, $internalDir='') {
+	public function addDirRecursive($dir, $internalDir = '') {
 		$dirname = basename($dir);
-		$rootDir = $internalDir . $dirname;
+		$rootDir = $internalDir.$dirname;
 		if (!empty($rootDir)) {
 			$this->streamerInstance->addEmptyDir($rootDir);
 		}
-		$internalDir .= $dirname . '/';
+		$internalDir .= $dirname.'/';
 		// prevent absolute dirs
 		$internalDir = ltrim($internalDir, '/');
 
-		$files= \OC\Files\Filesystem::getDirectoryContent($dir);
-		foreach($files as $file) {
+		$files = \OC\Files\Filesystem::getDirectoryContent($dir);
+		foreach ($files as $file) {
 			$filename = $file['name'];
-			$file = $dir . '/' . $filename;
-			if(\OC\Files\Filesystem::is_file($file)) {
+			$file = $dir.'/'.$filename;
+			if (\OC\Files\Filesystem::is_file($file)) {
 				$filesize = \OC\Files\Filesystem::filesize($file);
 				$fileTime = \OC\Files\Filesystem::filemtime($file);
 				$fh = \OC\Files\Filesystem::fopen($file, 'r');
-				$this->addFileFromStream($fh, $internalDir . $filename, $filesize, $fileTime);
+				$this->addFileFromStream($fh, $internalDir.$filename, $filesize, $fileTime);
 				fclose($fh);
-			}elseif(\OC\Files\Filesystem::is_dir($file)) {
+			}elseif (\OC\Files\Filesystem::is_dir($file)) {
 				$this->addDirRecursive($file, $internalDir);
 			}
 		}
@@ -147,7 +147,7 @@ 
 	 * @param string $dirName Directory Path and name to be added to the archive.
 	 * @return bool $success
 	 */
-	public function addEmptyDir($dirName){
+	public function addEmptyDir($dirName) {
 		return $this->streamerInstance->addEmptyDir($dirName);
 	}
 
@@ -157,7 +157,7 @@ 
 	 * closing, the file is completely written to the output stream.
 	 * @return bool $success
 	 */
-	public function finalize(){
+	public function finalize() {
 		return $this->streamerInstance->finalize();
 	}
 }

lib/private/Memcache/CASTrait.php

Indentation +27 added lines, -27 removed lines

@@ -23,35 +23,35 @@
 namespace OC\Memcache;
 
 trait CASTrait {
-	abstract public function get($key);
+    abstract public function get($key);
 
-	abstract public function set($key, $value, $ttl = 0);
+    abstract public function set($key, $value, $ttl = 0);
 
-	abstract public function remove($key);
+    abstract public function remove($key);
 
-	abstract public function add($key, $value, $ttl = 0);
+    abstract public function add($key, $value, $ttl = 0);
 
-	/**
-	 * Compare and set
-	 *
-	 * @param string $key
-	 * @param mixed $old
-	 * @param mixed $new
-	 * @return bool
-	 */
-	public function cas($key, $old, $new) {
-		//no native cas, emulate with locking
-		if ($this->add($key . '_lock', true)) {
-			if ($this->get($key) === $old) {
-				$this->set($key, $new);
-				$this->remove($key . '_lock');
-				return true;
-			} else {
-				$this->remove($key . '_lock');
-				return false;
-			}
-		} else {
-			return false;
-		}
-	}
+    /**
+     * Compare and set
+     *
+     * @param string $key
+     * @param mixed $old
+     * @param mixed $new
+     * @return bool
+     */
+    public function cas($key, $old, $new) {
+        //no native cas, emulate with locking
+        if ($this->add($key . '_lock', true)) {
+            if ($this->get($key) === $old) {
+                $this->set($key, $new);
+                $this->remove($key . '_lock');
+                return true;
+            } else {
+                $this->remove($key . '_lock');
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -41,13 +41,13 @@
 	 */
 	public function cas($key, $old, $new) {
 		//no native cas, emulate with locking
-		if ($this->add($key . '_lock', true)) {
+		if ($this->add($key.'_lock', true)) {
 			if ($this->get($key) === $old) {
 				$this->set($key, $new);
-				$this->remove($key . '_lock');
+				$this->remove($key.'_lock');
 				return true;
 			} else {
-				$this->remove($key . '_lock');
+				$this->remove($key.'_lock');
 				return false;
 			}
 		} else {

lib/private/Memcache/Cache.php

Indentation +56 added lines, -56 removed lines

@@ -26,72 +26,72 @@
 namespace OC\Memcache;
 
 abstract class Cache implements \ArrayAccess, \OCP\ICache {
-	/**
-	 * @var string $prefix
-	 */
-	protected $prefix;
+    /**
+     * @var string $prefix
+     */
+    protected $prefix;
 
-	/**
-	 * @param string $prefix
-	 */
-	public function __construct($prefix = '') {
-		$this->prefix = $prefix;
-	}
+    /**
+     * @param string $prefix
+     */
+    public function __construct($prefix = '') {
+        $this->prefix = $prefix;
+    }
 
-	/**
-	 * @return string Prefix used for caching purposes
-	 */
-	public function getPrefix() {
-		return $this->prefix;
-	}
+    /**
+     * @return string Prefix used for caching purposes
+     */
+    public function getPrefix() {
+        return $this->prefix;
+    }
 
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	abstract public function get($key);
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    abstract public function get($key);
 
-	/**
-	 * @param string $key
-	 * @param mixed $value
-	 * @param int $ttl
-	 * @return mixed
-	 */
-	abstract public function set($key, $value, $ttl = 0);
+    /**
+     * @param string $key
+     * @param mixed $value
+     * @param int $ttl
+     * @return mixed
+     */
+    abstract public function set($key, $value, $ttl = 0);
 
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	abstract public function hasKey($key);
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    abstract public function hasKey($key);
 
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	abstract public function remove($key);
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    abstract public function remove($key);
 
-	/**
-	 * @param string $prefix
-	 * @return mixed
-	 */
-	abstract public function clear($prefix = '');
+    /**
+     * @param string $prefix
+     * @return mixed
+     */
+    abstract public function clear($prefix = '');
 
-	//implement the ArrayAccess interface
+    //implement the ArrayAccess interface
 
-	public function offsetExists($offset) {
-		return $this->hasKey($offset);
-	}
+    public function offsetExists($offset) {
+        return $this->hasKey($offset);
+    }
 
-	public function offsetSet($offset, $value) {
-		$this->set($offset, $value);
-	}
+    public function offsetSet($offset, $value) {
+        $this->set($offset, $value);
+    }
 
-	public function offsetGet($offset) {
-		return $this->get($offset);
-	}
+    public function offsetGet($offset) {
+        return $this->get($offset);
+    }
 
-	public function offsetUnset($offset) {
-		$this->remove($offset);
-	}
+    public function offsetUnset($offset) {
+        $this->remove($offset);
+    }
 }

lib/private/Memcache/APCu.php

Spacing +14 added lines, -14 removed lines

@@ -37,7 +37,7 @@ 
 	use CADTrait;
 
 	public function get($key) {
-		$result = apcu_fetch($this->getPrefix() . $key, $success);
+		$result = apcu_fetch($this->getPrefix().$key, $success);
 		if (!$success) {
 			return null;
 		}
@@ -45,24 +45,24 @@ 
 	}
 
 	public function set($key, $value, $ttl = 0) {
-		return apcu_store($this->getPrefix() . $key, $value, $ttl);
+		return apcu_store($this->getPrefix().$key, $value, $ttl);
 	}
 
 	public function hasKey($key) {
-		return apcu_exists($this->getPrefix() . $key);
+		return apcu_exists($this->getPrefix().$key);
 	}
 
 	public function remove($key) {
-		return apcu_delete($this->getPrefix() . $key);
+		return apcu_delete($this->getPrefix().$key);
 	}
 
 	public function clear($prefix = '') {
-		$ns = $this->getPrefix() . $prefix;
+		$ns = $this->getPrefix().$prefix;
 		$ns = preg_quote($ns, '/');
-		if(class_exists('\APCIterator')) {
-			$iter = new \APCIterator('user', '/^' . $ns . '/', APC_ITER_KEY);
+		if (class_exists('\APCIterator')) {
+			$iter = new \APCIterator('user', '/^'.$ns.'/', APC_ITER_KEY);
 		} else {
-			$iter = new \APCUIterator('/^' . $ns . '/', APC_ITER_KEY);
+			$iter = new \APCUIterator('/^'.$ns.'/', APC_ITER_KEY);
 		}
 		return apcu_delete($iter);
 	}
@@ -76,7 +76,7 @@ 
 	 * @return bool
 	 */
 	public function add($key, $value, $ttl = 0) {
-		return apcu_add($this->getPrefix() . $key, $value, $ttl);
+		return apcu_add($this->getPrefix().$key, $value, $ttl);
 	}
 
 	/**
@@ -100,8 +100,8 @@ 
 		 * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
 		 * for details
 		 */
-		return apcu_exists($this->getPrefix() . $key)
-			? apcu_inc($this->getPrefix() . $key, $step)
+		return apcu_exists($this->getPrefix().$key)
+			? apcu_inc($this->getPrefix().$key, $step)
 			: false;
 	}
 
@@ -125,8 +125,8 @@ 
 		 * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
 		 * for details
 		 */
-		return apcu_exists($this->getPrefix() . $key)
-			? apcu_dec($this->getPrefix() . $key, $step)
+		return apcu_exists($this->getPrefix().$key)
+			? apcu_dec($this->getPrefix().$key, $step)
 			: false;
 	}
 
@@ -141,7 +141,7 @@ 
 	public function cas($key, $old, $new) {
 		// apc only does cas for ints
 		if (is_int($old) and is_int($new)) {
-			return apcu_cas($this->getPrefix() . $key, $old, $new);
+			return apcu_cas($this->getPrefix().$key, $old, $new);
 		} else {
 			return $this->casEmulated($key, $old, $new);
 		}

Indentation +125 added lines, -125 removed lines

@@ -30,140 +30,140 @@
 use OCP\IMemcache;
 
 class APCu extends Cache implements IMemcache {
-	use CASTrait {
-		cas as casEmulated;
-	}
+    use CASTrait {
+        cas as casEmulated;
+    }
 
-	use CADTrait;
+    use CADTrait;
 
-	public function get($key) {
-		$result = apcu_fetch($this->getPrefix() . $key, $success);
-		if (!$success) {
-			return null;
-		}
-		return $result;
-	}
+    public function get($key) {
+        $result = apcu_fetch($this->getPrefix() . $key, $success);
+        if (!$success) {
+            return null;
+        }
+        return $result;
+    }
 
-	public function set($key, $value, $ttl = 0) {
-		return apcu_store($this->getPrefix() . $key, $value, $ttl);
-	}
+    public function set($key, $value, $ttl = 0) {
+        return apcu_store($this->getPrefix() . $key, $value, $ttl);
+    }
 
-	public function hasKey($key) {
-		return apcu_exists($this->getPrefix() . $key);
-	}
+    public function hasKey($key) {
+        return apcu_exists($this->getPrefix() . $key);
+    }
 
-	public function remove($key) {
-		return apcu_delete($this->getPrefix() . $key);
-	}
+    public function remove($key) {
+        return apcu_delete($this->getPrefix() . $key);
+    }
 
-	public function clear($prefix = '') {
-		$ns = $this->getPrefix() . $prefix;
-		$ns = preg_quote($ns, '/');
-		if(class_exists('\APCIterator')) {
-			$iter = new \APCIterator('user', '/^' . $ns . '/', APC_ITER_KEY);
-		} else {
-			$iter = new \APCUIterator('/^' . $ns . '/', APC_ITER_KEY);
-		}
-		return apcu_delete($iter);
-	}
+    public function clear($prefix = '') {
+        $ns = $this->getPrefix() . $prefix;
+        $ns = preg_quote($ns, '/');
+        if(class_exists('\APCIterator')) {
+            $iter = new \APCIterator('user', '/^' . $ns . '/', APC_ITER_KEY);
+        } else {
+            $iter = new \APCUIterator('/^' . $ns . '/', APC_ITER_KEY);
+        }
+        return apcu_delete($iter);
+    }
 
-	/**
-	 * Set a value in the cache if it's not already stored
-	 *
-	 * @param string $key
-	 * @param mixed $value
-	 * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
-	 * @return bool
-	 */
-	public function add($key, $value, $ttl = 0) {
-		return apcu_add($this->getPrefix() . $key, $value, $ttl);
-	}
+    /**
+     * Set a value in the cache if it's not already stored
+     *
+     * @param string $key
+     * @param mixed $value
+     * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
+     * @return bool
+     */
+    public function add($key, $value, $ttl = 0) {
+        return apcu_add($this->getPrefix() . $key, $value, $ttl);
+    }
 
-	/**
-	 * Increase a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function inc($key, $step = 1) {
-		$this->add($key, 0);
-		/**
-		 * TODO - hack around a PHP 7 specific issue in APCu
-		 *
-		 * on PHP 7 the apcu_inc method on a non-existing object will increment
-		 * "0" and result in "1" as value - therefore we check for existence
-		 * first
-		 *
-		 * on PHP 5.6 this is not the case
-		 *
-		 * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
-		 * for details
-		 */
-		return apcu_exists($this->getPrefix() . $key)
-			? apcu_inc($this->getPrefix() . $key, $step)
-			: false;
-	}
+    /**
+     * Increase a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function inc($key, $step = 1) {
+        $this->add($key, 0);
+        /**
+         * TODO - hack around a PHP 7 specific issue in APCu
+         *
+         * on PHP 7 the apcu_inc method on a non-existing object will increment
+         * "0" and result in "1" as value - therefore we check for existence
+         * first
+         *
+         * on PHP 5.6 this is not the case
+         *
+         * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
+         * for details
+         */
+        return apcu_exists($this->getPrefix() . $key)
+            ? apcu_inc($this->getPrefix() . $key, $step)
+            : false;
+    }
 
-	/**
-	 * Decrease a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function dec($key, $step = 1) {
-		/**
-		 * TODO - hack around a PHP 7 specific issue in APCu
-		 *
-		 * on PHP 7 the apcu_dec method on a non-existing object will decrement
-		 * "0" and result in "-1" as value - therefore we check for existence
-		 * first
-		 *
-		 * on PHP 5.6 this is not the case
-		 *
-		 * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
-		 * for details
-		 */
-		return apcu_exists($this->getPrefix() . $key)
-			? apcu_dec($this->getPrefix() . $key, $step)
-			: false;
-	}
+    /**
+     * Decrease a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function dec($key, $step = 1) {
+        /**
+         * TODO - hack around a PHP 7 specific issue in APCu
+         *
+         * on PHP 7 the apcu_dec method on a non-existing object will decrement
+         * "0" and result in "-1" as value - therefore we check for existence
+         * first
+         *
+         * on PHP 5.6 this is not the case
+         *
+         * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
+         * for details
+         */
+        return apcu_exists($this->getPrefix() . $key)
+            ? apcu_dec($this->getPrefix() . $key, $step)
+            : false;
+    }
 
-	/**
-	 * Compare and set
-	 *
-	 * @param string $key
-	 * @param mixed $old
-	 * @param mixed $new
-	 * @return bool
-	 */
-	public function cas($key, $old, $new) {
-		// apc only does cas for ints
-		if (is_int($old) and is_int($new)) {
-			return apcu_cas($this->getPrefix() . $key, $old, $new);
-		} else {
-			return $this->casEmulated($key, $old, $new);
-		}
-	}
+    /**
+     * Compare and set
+     *
+     * @param string $key
+     * @param mixed $old
+     * @param mixed $new
+     * @return bool
+     */
+    public function cas($key, $old, $new) {
+        // apc only does cas for ints
+        if (is_int($old) and is_int($new)) {
+            return apcu_cas($this->getPrefix() . $key, $old, $new);
+        } else {
+            return $this->casEmulated($key, $old, $new);
+        }
+    }
 
-	/**
-	 * @return bool
-	 */
-	static public function isAvailable() {
-		if (!extension_loaded('apcu')) {
-			return false;
-		} elseif (!\OC::$server->getIniWrapper()->getBool('apc.enabled')) {
-			return false;
-		} elseif (!\OC::$server->getIniWrapper()->getBool('apc.enable_cli') && \OC::$CLI) {
-			return false;
-		} elseif (
-				version_compare(phpversion('apc') ?: '0.0.0', '4.0.6') === -1 &&
-				version_compare(phpversion('apcu') ?: '0.0.0', '5.1.0') === -1
-		) {
-			return false;
-		} else {
-			return true;
-		}
-	}
+    /**
+     * @return bool
+     */
+    static public function isAvailable() {
+        if (!extension_loaded('apcu')) {
+            return false;
+        } elseif (!\OC::$server->getIniWrapper()->getBool('apc.enabled')) {
+            return false;
+        } elseif (!\OC::$server->getIniWrapper()->getBool('apc.enable_cli') && \OC::$CLI) {
+            return false;
+        } elseif (
+                version_compare(phpversion('apc') ?: '0.0.0', '4.0.6') === -1 &&
+                version_compare(phpversion('apcu') ?: '0.0.0', '5.1.0') === -1
+        ) {
+            return false;
+        } else {
+            return true;
+        }
+    }
 }