Studio-42 / elFinder

php/elFinderVolumeLocalFileSystem.class.php

Doc Comments +8 added lines, -9 removed lines

@@ -542,7 +542,7 @@ 
 	 * Return true if path is dir and has at least one childs directory
 	 *
 	 * @param  string  $path  dir path
-	 * @return bool
+	 * @return null|false
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _subdirs($path) {
@@ -696,7 +696,6 @@ 
 	 * Open file and return file pointer
 	 *
 	 * @param  string  $path  file path
-	 * @param  bool    $write open file for writing
 	 * @return resource|false
 	 * @author Dmitry (dio) Levashov
 	 **/
@@ -722,7 +721,7 @@ 
 	 *
 	 * @param  string  $path  parent dir path
 	 * @param string  $name  new directory name
-	 * @return string|bool
+	 * @return string|false
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _mkdir($path, $name) {
@@ -742,7 +741,7 @@ 
 	 *
 	 * @param  string  $path  parent dir path
 	 * @param string  $name  new file name
-	 * @return string|bool
+	 * @return string|false
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _mkfile($path, $name) {
@@ -790,9 +789,9 @@ 
 	 * Return new file path or false.
 	 *
 	 * @param  string  $source  source file path
-	 * @param  string  $target  target dir path
+	 * @param  string  $targetDir  target dir path
 	 * @param  string  $name    file name
-	 * @return string|bool
+	 * @return string|false
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _move($source, $targetDir, $name) {
@@ -836,7 +835,7 @@ 
 	 * @param  string    $dir  target dir path
 	 * @param  string    $name file name
 	 * @param  array     $stat file stat (required by some virtual fs)
-	 * @return bool|string
+	 * @return false|string
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _save($fp, $dir, $name, $stat) {
@@ -868,7 +867,7 @@ 
 	 * Get file contents
 	 *
 	 * @param  string  $path  file path
-	 * @return string|false
+	 * @return string
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _getContents($path) {
@@ -1072,7 +1071,7 @@ 
 	 * @param  array   $files  files names list
 	 * @param  string  $name   archive name
 	 * @param  array   $arc    archiver options
-	 * @return string|bool
+	 * @return string|false
 	 * @author Dmitry (dio) Levashov, 
 	 * @author Alexey Sukhotin
 	 **/

Spacing +40 added lines, -40 removed lines

@@ -2,20 +2,20 @@ 
 
 // Implement similar functionality in PHP 5.2 or 5.3
 // http://php.net/manual/class.recursivecallbackfilteriterator.php#110974
-if (! class_exists('RecursiveCallbackFilterIterator', false)) {
+if (!class_exists('RecursiveCallbackFilterIterator', false)) {
 	class RecursiveCallbackFilterIterator extends RecursiveFilterIterator {
 	   
-	    public function __construct ( RecursiveIterator $iterator, $callback ) {
+	    public function __construct(RecursiveIterator $iterator, $callback) {
 	        $this->callback = $callback;
 	        parent::__construct($iterator);
 	    }
 	   
-	    public function accept () {
+	    public function accept() {
 	        $callback = $this->callback;
 	        return $callback(parent::current(), parent::key(), parent::getInnerIterator());
 	    }
 	   
-	    public function getChildren () {
+	    public function getChildren() {
 	        return new self($this->getInnerIterator()->getChildren(), $this->callback);
 	    }
 	}
@@ -60,11 +60,11 @@ 
 	 * @author Dmitry (dio) Levashov
 	 **/
 	public function __construct() {
-		$this->options['alias']    = '';              // alias to replace root dir name
-		$this->options['dirMode']  = 0755;            // new dirs mode
-		$this->options['fileMode'] = 0644;            // new files mode
-		$this->options['quarantine'] = '.quarantine';  // quarantine folder name - required to check archive (must be hidden)
-		$this->options['maxArcFilesSize'] = 0;        // max allowed archive files size (0 - no limit)
+		$this->options['alias']    = ''; // alias to replace root dir name
+		$this->options['dirMode']  = 0755; // new dirs mode
+		$this->options['fileMode'] = 0644; // new files mode
+		$this->options['quarantine'] = '.quarantine'; // quarantine folder name - required to check archive (must be hidden)
+		$this->options['maxArcFilesSize'] = 0; // max allowed archive files size (0 - no limit)
 		$this->options['rootCssClass'] = 'elfinder-navbar-root-local';
 	}
 	
@@ -81,7 +81,7 @@ 
 	protected function init() {
 		// Normalize directory separator for windows
 		if (DIRECTORY_SEPARATOR !== '/') {
-			foreach(array('path', 'tmbPath', 'tmpPath', 'quarantine') as $key) {
+			foreach (array('path', 'tmbPath', 'tmpPath', 'quarantine') as $key) {
 				if (!empty($this->options[$key])) {
 					$this->options[$key] = str_replace('/', DIRECTORY_SEPARATOR, $this->options[$key]);
 				}
@@ -145,7 +145,7 @@ 
 		// if no thumbnails url - try detect it
 		if ($root['read'] && !$this->tmbURL && $this->URL) {
 			if (strpos($this->tmbPath, $this->root) === 0) {
-				$this->tmbURL = $this->URL.str_replace(DIRECTORY_SEPARATOR, '/', substr($this->tmbPath, strlen($this->root)+1));
+				$this->tmbURL = $this->URL.str_replace(DIRECTORY_SEPARATOR, '/', substr($this->tmbPath, strlen($this->root) + 1));
 				if (preg_match("|[^/?&=]$|", $this->tmbURL)) {
 					$this->tmbURL .= '/';
 				}
@@ -203,11 +203,11 @@ 
 		if ($mtime != $compare) {
 			return $mtime;
 		}
-		$inotifywait = defined('ELFINER_INOTIFYWAIT_PATH')? ELFINER_INOTIFYWAIT_PATH : 'inotifywait';
+		$inotifywait = defined('ELFINER_INOTIFYWAIT_PATH') ? ELFINER_INOTIFYWAIT_PATH : 'inotifywait';
 		$path = escapeshellarg($path);
 		$standby = max(1, intval($standby));
 		$cmd = $inotifywait.' '.$path.' -t '.$standby.' -e moved_to,moved_from,move,create,delete,delete_self';
-		$this->procExec($cmd , $o, $r);
+		$this->procExec($cmd, $o, $r);
 		if ($r === 0) {
 			// changed
 			clearstatcache();
@@ -218,7 +218,7 @@ 
 		}
 		// error
 		// cache to $_SESSION
-		$sessionClose = true;;
+		$sessionClose = true; ;
 		try {
 			$sessionStart = session_start();
 		} catch (Exception $e) {
@@ -270,7 +270,7 @@ 
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _joinPath($dir, $name) {
-		return rtrim($dir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $name;
+		return rtrim($dir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.$name;
 	}
 	
 	/**
@@ -322,7 +322,7 @@ 
 		$comps = $new_comps;
 		$path = implode('/', $comps);
 		if ($initial_slashes) {
-			$path = str_repeat('/', $initial_slashes) . $path;
+			$path = str_repeat('/', $initial_slashes).$path;
 		}
 		
 		if ($changeSep) {
@@ -393,7 +393,7 @@ 
 	 **/
 	protected function _inpath($path, $parent) {
 		$cwd = getcwd();
-		$real_path   = $this->getFullPath($path,   $cwd);
+		$real_path   = $this->getFullPath($path, $cwd);
 		$real_parent = $this->getFullPath($parent, $cwd);
 		if ($real_path && $real_parent) {
 			return $real_path === $real_parent || strpos($real_path, rtrim($real_parent, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR) === 0;
@@ -452,7 +452,7 @@ 
 					$stat = array();
 					return $stat;
 				} else {
-					$stat['mime']  = 'symlink-broken';
+					$stat['mime'] = 'symlink-broken';
 					$target = readlink($path);
 					$lstat = lstat($path);
 					$ostat = $this->getOwnerStat($lstat['uid'], $lstat['gid']);
@@ -468,7 +468,7 @@ 
 			$fstat = stat($path);
 			$uid = $fstat['uid'];
 			$gid = $fstat['gid'];
-			$stat['perm'] = substr((string)decoct($fstat['mode']), -4);
+			$stat['perm'] = substr((string) decoct($fstat['mode']), -4);
 			$stat = array_merge($stat, $this->getOwnerStat($uid, $gid));
 		}
 		
@@ -478,8 +478,8 @@ 
 			$stat['mime'] = $dir ? 'directory' : $this->mimetype($path);
 		}
 		//logical rights first
-		$stat['read'] = ($linkreadable || is_readable($path))? null : false;
-		$stat['write'] = is_writable($path)? null : false;
+		$stat['read'] = ($linkreadable || is_readable($path)) ? null : false;
+		$stat['write'] = is_writable($path) ? null : false;
 
 		if (is_null($stat['read'])) {
 			$stat['size'] = $dir ? 0 : $size;
@@ -551,7 +551,7 @@ 
 			$dirItr = new ParentIterator(
 				new RecursiveDirectoryIterator($path,
 					FilesystemIterator::SKIP_DOTS |
-					(defined('RecursiveDirectoryIterator::FOLLOW_SYMLINKS')?
+					(defined('RecursiveDirectoryIterator::FOLLOW_SYMLINKS') ?
 						RecursiveDirectoryIterator::FOLLOW_SYMLINKS : 0)
 				)
 			);
@@ -637,7 +637,7 @@ 
 							$br = true;
 						} else {
 							$_path = $fpath;
-							$stat['mime']  = 'symlink-broken';
+							$stat['mime'] = 'symlink-broken';
 							$target = readlink($_path);
 							$lstat = lstat($_path);
 							$ostat = $this->getOwnerStat($lstat['uid'], $lstat['gid']);
@@ -662,13 +662,13 @@ 
 					if ($statOwner && !$linkreadable) {
 						$uid = $file->getOwner();
 						$gid = $file->getGroup();
-						$stat['perm'] = substr((string)decoct($file->getPerms()), -4);
+						$stat['perm'] = substr((string) decoct($file->getPerms()), -4);
 						$stat = array_merge($stat, $this->getOwnerStat($uid, $gid));
 					}
 					
 					//logical rights first
-					$stat['read'] = ($linkreadable || $file->isReadable())? null : false;
-					$stat['write'] = $file->isWritable()? null : false;
+					$stat['read'] = ($linkreadable || $file->isReadable()) ? null : false;
+					$stat['write'] = $file->isWritable() ? null : false;
 					
 					if (is_null($stat['read'])) {
 						$stat['size'] = $dir ? 0 : $size;
@@ -684,7 +684,7 @@ 
 		
 		if ($cache) {
 			$cache = $this->convEncOut($cache, false);
-			foreach($cache as $d) {
+			foreach ($cache as $d) {
 				$this->updateCache($d[0], $d[1]);
 			}
 		}
@@ -700,7 +700,7 @@ 
 	 * @return resource|false
 	 * @author Dmitry (dio) Levashov
 	 **/
-	protected function _fopen($path, $mode='rb') {
+	protected function _fopen($path, $mode = 'rb') {
 		return @fopen($path, $mode);
 	}
 	
@@ -711,7 +711,7 @@ 
 	 * @return bool
 	 * @author Dmitry (dio) Levashov
 	 **/
-	protected function _fclose($fp, $path='') {
+	protected function _fclose($fp, $path = '') {
 		return @fclose($fp);
 	}
 	
@@ -843,7 +843,7 @@ 
 		$path = $this->_joinPath($dir, $name);
 
 		$meta = stream_get_meta_data($fp);
-		$uri = isset($meta['uri'])? $meta['uri'] : '';
+		$uri = isset($meta['uri']) ? $meta['uri'] : '';
 		if ($uri && @is_file($uri)) {
 			fclose($fp);
 			$isCmdPaste = ($this->ARGS['cmd'] === 'paste');
@@ -907,7 +907,7 @@ 
 	 * @return bool
 	 **/
 	protected function _chmod($path, $mode) {
-		$modeOct = is_string($mode) ? octdec($mode) : octdec(sprintf("%04o",$mode));
+		$modeOct = is_string($mode) ? octdec($mode) : octdec(sprintf("%04o", $mode));
 		$ret = @chmod($path, $modeOct);
 		$ret && clearstatcache();
 		return  $ret;
@@ -1025,7 +1025,7 @@ 
 				$src = $dir;
 				$name = basename($path);
 				if (preg_match('/\.((tar\.(gz|bz|bz2|z|lzo))|cpio\.gz|ps\.gz|xcf\.(gz|bz2)|[a-z0-9]{1,4})$/i', $name, $m)) {
-					$name = substr($name, 0,  strlen($name)-strlen($m[0]));
+					$name = substr($name, 0, strlen($name) - strlen($m[0]));
 				}
 				$test = dirname($path).DIRECTORY_SEPARATOR.$name;
 				if (file_exists($test) || is_link($test)) {
@@ -1034,9 +1034,9 @@ 
 			}
 			
 			if ($name !== '') {
-				$result  = dirname($path).DIRECTORY_SEPARATOR.$name;
+				$result = dirname($path).DIRECTORY_SEPARATOR.$name;
 
-				if (! @rename($src, $result)) {
+				if (!@rename($src, $result)) {
 					$this->delTree($dir);
 					return false;
 				}
@@ -1044,7 +1044,7 @@ 
 				$dstDir = dirname($path);
 				$res = false;
 				$result = array();
-				foreach($ls as $name) {
+				foreach ($ls as $name) {
 					$target = $dstDir.DIRECTORY_SEPARATOR.$name;
 					if (is_dir($target)) {
 						$this->delTree($target);
@@ -1130,7 +1130,7 @@ 
 					new RecursiveDirectoryIterator($path,
 						FilesystemIterator::KEY_AS_PATHNAME |
 						FilesystemIterator::SKIP_DOTS |
-						(defined('RecursiveDirectoryIterator::FOLLOW_SYMLINKS')?
+						(defined('RecursiveDirectoryIterator::FOLLOW_SYMLINKS') ?
 							RecursiveDirectoryIterator::FOLLOW_SYMLINKS : 0)
 					),
 					array($this, 'localFileSystemSearchIteratorFilter')
@@ -1152,7 +1152,7 @@ 
 		$result = array();
 		
 		if ($match) {
-			foreach($match as $p) {
+			foreach ($match as $p) {
 				$stat = $this->stat($p);
 		
 				if (!$stat) { // invalid links
@@ -1169,7 +1169,7 @@ 
 					$stat['path'] = $this->path($stat['hash']);
 					if ($this->URL && !isset($stat['url'])) {
 						$path = str_replace(DIRECTORY_SEPARATOR, '/', substr($p, strlen($this->root) + 1));
-						$stat['url'] = $this->URL . $path;
+						$stat['url'] = $this->URL.$path;
 					}
 		
 					$result[] = $stat;
@@ -1184,9 +1184,9 @@ 
 
 	public function localFileSystemSearchIteratorFilter($file, $key, $iterator) {
 		if ($iterator->hasChildren()) {
-			return (bool)$this->attr($key, 'read', null, true);
+			return (bool) $this->attr($key, 'read', null, true);
 		}
-		return ($this->stripos($file->getFilename(), $this->doSearchCurrentQuery) === false)? false : true;
+		return ($this->stripos($file->getFilename(), $this->doSearchCurrentQuery) === false) ? false : true;
 	}
 	
 } // END class