Studio-42 / elFinder

php/chars-test.php

Spacing +2 added lines, -2 removed lines

@@ -24,10 +24,10 @@
 
 //                     й                 ё              Й               Ё              Ø         Å
 $patterns = array("\u0438\u0306", "\u0435\u0308", "\u0418\u0306", "\u0415\u0308", "\u00d8A", "\u030a");
-$replace  = array("\u0439",        "\u0451",       "\u0419",       "\u0401",       "\u00d8", "\u00c5");
+$replace  = array("\u0439", "\u0451", "\u0419", "\u0401", "\u00d8", "\u00c5");
 
 
-foreach(scandir($path) as $f) {
+foreach (scandir($path) as $f) {
 	if ($f != '.' && $f != '..' && substr($f, 0, 1) != '.') {
 		
 		// echo mb_detect_encoding($f);

php/elFinderConnector.class.php

Spacing +6 added lines, -6 removed lines

@@ -34,7 +34,7 @@ 
 	 * @return void
 	 * @author Dmitry (dio) Levashov
 	 **/
-	public function __construct($elFinder, $debug=false) {
+	public function __construct($elFinder, $debug = false) {
 		
 		$this->elFinder = $elFinder;
 		if ($debug) {
@@ -54,7 +54,7 @@ 
 		if ($isPost && !$src && $rawPostData = @file_get_contents('php://input')) {
 			// for support IE XDomainRequest()
 			$parts = explode('&', $rawPostData);
-			foreach($parts as $part) {
+			foreach ($parts as $part) {
 				list($key, $value) = array_pad(explode('=', $part), 2, '');
 				$key = rawurldecode($key);
 				if (substr($key, -2) === '[]') {
@@ -121,7 +121,7 @@ 
 	 **/
 	protected function output(array $data) {
 		// clear output buffer
-		while(@ob_get_level()){ @ob_end_clean(); }
+		while (@ob_get_level()) { @ob_end_clean(); }
 		
 		$header = isset($data['header']) ? $data['header'] : $this->header;
 		unset($data['header']);
@@ -162,14 +162,14 @@ 
 							$psize = $end - $start + 1;
 							
 							header('HTTP/1.1 206 Partial Content');
-							header('Content-Length: ' . $psize);
-							header('Content-Range: bytes ' . $start . '-' . $end . '/' . $size);
+							header('Content-Length: '.$psize);
+							header('Content-Range: bytes '.$start.'-'.$end.'/'.$size);
 							
 							fseek($fp, $start);
 						}
 					}
 				}
-				if (is_null($psize)){
+				if (is_null($psize)) {
 					rewind($fp);
 				}
 			} else {

php/elFinderVolumeFTP.class.php

Spacing +52 added lines, -52 removed lines

@@ -103,7 +103,7 @@ 
 		);
 		$this->options = array_merge($this->options, $opts); 
 		$this->options['mimeDetect'] = 'internal';
-		$this->options['maxArcFilesSize'] = 0;     // max allowed archive files size (0 - no limit)
+		$this->options['maxArcFilesSize'] = 0; // max allowed archive files size (0 - no limit)
 	}
 	
 	/**
@@ -163,7 +163,7 @@ 
 		$scheme = parse_url($this->options['host'], PHP_URL_SCHEME);
 
 		if ($scheme) {
-			$this->options['host'] = substr($this->options['host'], strlen($scheme)+3);
+			$this->options['host'] = substr($this->options['host'], strlen($scheme) + 3);
 		}
 
 		// normalize root path
@@ -235,11 +235,11 @@ 
 		if ($this->encoding) {
 			@ftp_exec($this->connect, 'OPTS UTF8 OFF');
 		} else {
-			@ftp_exec($this->connect, 'OPTS UTF8 ON' );
+			@ftp_exec($this->connect, 'OPTS UTF8 ON');
 		}
 		
 		// switch off extended passive mode - may be usefull for some servers
-		@ftp_exec($this->connect, 'epsv4 off' );
+		@ftp_exec($this->connect, 'epsv4 off');
 		// enter passive mode if required
 		ftp_pasv($this->connect, $this->options['mode'] == 'passive');
 
@@ -307,7 +307,7 @@ 
 		$name = $info[8];
 		
 		if (preg_match('|(.+)\-\>(.+)|', $name, $m)) {
-			$name   = trim($m[1]);
+			$name = trim($m[1]);
 			// check recursive processing
 			if ($this->cacheDirTarget && $this->_joinPath($base, $name) !== $this->cacheDirTarget) {
 				return array();
@@ -343,7 +343,7 @@ 
 			$stat['owner'] = $info[2];
 			$stat['group'] = $info[3];
 			$stat['perm']  = substr($info[0], 1);
-			$stat['isowner'] = $stat['owner']? ($stat['owner'] == $this->options['user']) : $this->options['owner'];
+			$stat['isowner'] = $stat['owner'] ? ($stat['owner'] == $this->options['user']) : $this->options['owner'];
 		}
 		
 		$perm = $this->parsePermissions($info[0], $stat['owner']);
@@ -375,7 +375,7 @@ 
 			$info[4] = 0;
 			$info[0] = 'drwxr-xr-x';
 		} else {
-			$info[4] = (int)$size;
+			$info[4] = (int) $size;
 			$info[0] = '-rw-r--r--';
 		}
 		return $info;
@@ -391,7 +391,7 @@ 
 	protected function parsePermissions($perm, $user = '') {
 		$res   = array();
 		$parts = array();
-		$owner = $user? ($user == $this->options['user']) : $this->options['owner'];
+		$owner = $user ? ($user == $this->options['user']) : $this->options['owner'];
 		for ($i = 0, $l = strlen($perm); $i < $l; $i++) {
 			$parts[] = substr($perm, $i, 1);
 		}
@@ -422,10 +422,10 @@ 
 			}
 		}
 		$list = $this->convEncOut($list);
-		$prefix = ($path === $this->separator)? $this->separator : $path . $this->separator;
+		$prefix = ($path === $this->separator) ? $this->separator : $path.$this->separator;
 		$targets = array();
-		foreach($list as $stat) {
-			$p = $prefix . $stat['name'];
+		foreach ($list as $stat) {
+			$p = $prefix.$stat['name'];
 			if (isset($stat['target'])) {
 				// stat later
 				$targets[$stat['name']] = $stat['target'];
@@ -437,10 +437,10 @@ 
 			}
 		}
 		// stat link targets
-		foreach($targets as $name => $target) {
+		foreach ($targets as $name => $target) {
 			$stat = array();
 			$stat['name'] = $name;
-			$p = $prefix . $name;
+			$p = $prefix.$name;
 			$cacheDirTarget = $this->cacheDirTarget;
 			$this->cacheDirTarget = $this->convEncIn($target, true);
 			if ($tstat = $this->stat($target)) {
@@ -449,12 +449,12 @@ 
 				$stat['thash'] = $tstat['hash'];
 				$stat['mime']  = $tstat['mime'];
 				$stat['read']  = $tstat['read'];
-				$stat['write']  = $tstat['write'];
+				$stat['write'] = $tstat['write'];
 				
-				if (isset($tstat['ts']))      { $stat['ts']      = $tstat['ts']; }
-				if (isset($tstat['owner']))   { $stat['owner']   = $tstat['owner']; }
-				if (isset($tstat['group']))   { $stat['group']   = $tstat['group']; }
- 				if (isset($tstat['perm']))    { $stat['perm']    = $tstat['perm']; }
+				if (isset($tstat['ts'])) { $stat['ts']      = $tstat['ts']; }
+				if (isset($tstat['owner'])) { $stat['owner']   = $tstat['owner']; }
+				if (isset($tstat['group'])) { $stat['group']   = $tstat['group']; }
+ 				if (isset($tstat['perm'])) { $stat['perm']    = $tstat['perm']; }
  				if (isset($tstat['isowner'])) { $stat['isowner'] = $tstat['isowner']; }
 			} else {
 				
@@ -567,7 +567,7 @@ 
 		$comps = $new_comps;
 		$path = implode($this->separator, $comps);
 		if ($initial_slashes) {
-			$path = str_repeat($this->separator, $initial_slashes) . $path;
+			$path = str_repeat($this->separator, $initial_slashes).$path;
 		}
 		
 		return $path ? $path : '.';
@@ -633,7 +633,7 @@ 
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _inpath($path, $parent) {
-		return $path == $parent || strpos($path, $parent. $this->separator) === 0;
+		return $path == $parent || strpos($path, $parent.$this->separator) === 0;
 	}
 	
 	/***************** file stat ********************/
@@ -672,9 +672,9 @@ 
 				);
 			}
 			$this->cacheDir($this->convEncOut($this->_dirname($path)));
-			return $this->convEncIn(isset($this->cache[$outPath])? $this->cache[$outPath] : array());
+			return $this->convEncIn(isset($this->cache[$outPath]) ? $this->cache[$outPath] : array());
 		}
-		$raw = ftp_raw($this->connect, 'MLST ' . $path);
+		$raw = ftp_raw($this->connect, 'MLST '.$path);
 		if (is_array($raw) && count($raw) > 1 && substr(trim($raw[0]), 0, 1) == 2) {
 			$parts = explode(';', trim($raw[1]));
 			array_pop($parts);
@@ -704,8 +704,8 @@ 
 
 					case 'perm':
 						$val = strtolower($val);
-						$stat['read']  = (int)preg_match('/e|l|r/', $val);
-						$stat['write'] = (int)preg_match('/w|m|c/', $val);
+						$stat['read']  = (int) preg_match('/e|l|r/', $val);
+						$stat['write'] = (int) preg_match('/w|m|c/', $val);
 						if (!preg_match('/f|d/', $val)) {
 							$stat['locked'] = 1;
 						}
@@ -790,7 +790,7 @@ 
 			if (!$this->ftpOsUnix) {
 				$info = $this->normalizeRawWindows($str);
 			}
-			$name = isset($info[8])? trim($info[8]) : '';
+			$name = isset($info[8]) ? trim($info[8]) : '';
 			if ($name && $name !== '.' && $name !== '..' && substr(strtolower($info[0]), 0, 1) === 'd') {
 				return true;
 			}
@@ -845,7 +845,7 @@ 
 	 * @return resource|false
 	 * @author Dmitry (dio) Levashov
 	 **/
-	protected function _fopen($path, $mode='rb') {
+	protected function _fopen($path, $mode = 'rb') {
 		
 		if ($this->tmp) {
 			$local = $this->getTempFile($path);
@@ -869,7 +869,7 @@ 
 	 * @return bool
 	 * @author Dmitry (dio) Levashov
 	 **/
-	protected function _fclose($fp, $path='') {
+	protected function _fclose($fp, $path = '') {
 		@fclose($fp);
 		if ($path) {
 			@unlink($this->getTempFile($path));
@@ -1044,7 +1044,7 @@ 
 			if (@file_put_contents($local, $content, LOCK_EX) !== false
 			&& ($fp = @fopen($local, 'rb'))) {
 				clearstatcache();
-				$res  = ftp_fput($this->connect, $path, $fp, $this->ftpMode($path));
+				$res = ftp_fput($this->connect, $path, $fp, $this->ftpMode($path));
 				@fclose($fp);
 			}
 			file_exists($local) && @unlink($local);
@@ -1069,7 +1069,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));
 		return @ftp_chmod($this->connect, $modeOct, $path);
 	}
 
@@ -1122,7 +1122,7 @@ 
 		}
 
 		$basename = $this->_basename($path);
-		$localPath = $dir . DIRECTORY_SEPARATOR . $basename;
+		$localPath = $dir.DIRECTORY_SEPARATOR.$basename;
 
 		if (!ftp_get($this->connect, $localPath, $path, FTP_BINARY)) {
 			//cleanup
@@ -1159,7 +1159,7 @@ 
 		
 		// archive contains one item - extract in archive dir
 		$name = '';
-		$src = $dir . DIRECTORY_SEPARATOR . $filesToProcess[0];
+		$src = $dir.DIRECTORY_SEPARATOR.$filesToProcess[0];
 		if (($extractTo === 'auto' || !$extractTo) && count($filesToProcess) === 1 && is_file($src)) {
 			$name = $filesToProcess[0];
 		} else if ($extractTo === 'auto' || $extractTo) {
@@ -1168,7 +1168,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 = $this->_joinPath(dirname($path), $name);
 			if ($this->stat($test)) {
@@ -1179,7 +1179,7 @@ 
 		if ($name !== '' && is_file($src)) {
 			$result = $this->_joinPath(dirname($path), $name);
 
-			if (! ftp_put($this->connect, $result, $src, FTP_BINARY)) {
+			if (!ftp_put($this->connect, $result, $src, FTP_BINARY)) {
 				$this->rmdirRecursive($dir);
 				return false;
 			}
@@ -1193,19 +1193,19 @@ 
 				}
 				$result[] = $dstDir;
 			}
-			foreach($filesToProcess as $name) {
+			foreach ($filesToProcess as $name) {
 				$name = rtrim($name, DIRECTORY_SEPARATOR);
-				$src = $dir . DIRECTORY_SEPARATOR . $name;
+				$src = $dir.DIRECTORY_SEPARATOR.$name;
 				if (is_dir($src)) {
 					$p = dirname($name);
 					$name = basename($name);
-					if (! $target = $this->_mkdir($this->_joinPath($dstDir, $p), $name)) {
+					if (!$target = $this->_mkdir($this->_joinPath($dstDir, $p), $name)) {
 						$this->rmdirRecursive($dir);
 						return false;
 					}
 				} else {
 					$target = $this->_joinPath($dstDir, $name);
-					if (! ftp_put($this->connect, $target, $src, FTP_BINARY)) {
+					if (!ftp_put($this->connect, $target, $src, FTP_BINARY)) {
 						$this->rmdirRecursive($dir);
 						return false;
 					}
@@ -1221,7 +1221,7 @@ 
 		is_dir($dir) && $this->rmdirRecursive($dir);
 		
 		$this->clearcache();
-		return $result? $result : false;
+		return $result ? $result : false;
 	}
 
 	/**
@@ -1261,7 +1261,7 @@ 
 		}
 
 		//cleanup
-		if(!$this->rmdirRecursive($tmpDir)) {
+		if (!$this->rmdirRecursive($tmpDir)) {
 			return false;
 		}
 
@@ -1365,7 +1365,7 @@ 
 		$remoteDirLen = strlen($remote_directory);
 		foreach ($contents as $item) {
 			$relative_path = substr($item['path'], $remoteDirLen);
-			$local_path = $dest_local_directory . DIRECTORY_SEPARATOR . $relative_path;
+			$local_path = $dest_local_directory.DIRECTORY_SEPARATOR.$relative_path;
 			switch ($item['type']) {
 				case 'd':
 					$success = mkdir($local_path);
@@ -1396,8 +1396,8 @@ 
 		} else {
 			$success = true;
 			foreach (array_reverse(elFinderVolumeFTP::listFilesInDirectory($dirPath, false)) as $path) {
-				$path = $dirPath . DIRECTORY_SEPARATOR . $path;
-				if(is_link($path)) {
+				$path = $dirPath.DIRECTORY_SEPARATOR.$path;
+				if (is_link($path)) {
 					unlink($path);
 				} else if (is_dir($path)) {
 					$success = rmdir($path);
@@ -1408,11 +1408,11 @@ 
 					break;
 				}
 			}
-			if($success) {
+			if ($success) {
 				$success = rmdir($dirPath);
 			}
 		}
-		if(!$success) {
+		if (!$success) {
 			$this->setError(elFinder::ERROR_RM, $dirPath);
 			return false;
 		}
@@ -1434,25 +1434,25 @@ 
 		if (!is_dir($dir)) {
 			return false;
 		}
-		$excludes = array(".","..");
+		$excludes = array(".", "..");
 		$result = array();
 		$files = scandir($dir);
-		if(!$files) {
+		if (!$files) {
 			return array();
 		}
-		foreach($files as $file) {
-			if(!in_array($file, $excludes)) {
+		foreach ($files as $file) {
+			if (!in_array($file, $excludes)) {
 				$path = $dir.DIRECTORY_SEPARATOR.$file;
-				if(is_link($path)) {
-					if($omitSymlinks) {
+				if (is_link($path)) {
+					if ($omitSymlinks) {
 						continue;
 					} else {
 						$result[] = $prefix.$file;
 					}
-				} else if(is_dir($path)) {
+				} else if (is_dir($path)) {
 					$result[] = $prefix.$file.DIRECTORY_SEPARATOR;
 					$subs = elFinderVolumeFTP::listFilesInDirectory($path, $omitSymlinks, $prefix.$file.DIRECTORY_SEPARATOR);
-					if($subs) {
+					if ($subs) {
 						$result = array_merge($result, $subs);
 					}
 					

php/elFinderVolumeLocalFileSystem.class.php

Spacing +33 added lines, -33 removed lines

@@ -32,11 +32,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';
 	}
 	
@@ -53,7 +53,7 @@ 
 	protected function init() {
 		// Normalize directory separator for windows
 		if (DIRECTORY_SEPARATOR !== '/') {
-			foreach(array('path', 'tmpPath', 'quarantine') as $key) {
+			foreach (array('path', 'tmpPath', 'quarantine') as $key) {
 				if ($this->options[$key]) {
 					$this->options[$key] = str_replace('/', DIRECTORY_SEPARATOR, $this->options[$key]);
 				}
@@ -99,7 +99,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 .= '/';
 				}
@@ -175,7 +175,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;
 	}
 	
 	/**
@@ -227,7 +227,7 @@ 
 		$comps = $new_comps;
 		$path = implode('/', $comps);
 		if ($initial_slashes) {
-			$path = str_repeat('/', $initial_slashes) . $path;
+			$path = str_repeat('/', $initial_slashes).$path;
 		}
 		
 		if ($changeSep) {
@@ -298,7 +298,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;
@@ -357,7 +357,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']);
@@ -373,7 +373,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));
 		}
 		
@@ -383,8 +383,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;
@@ -453,7 +453,7 @@ 
 	protected function _subdirs($path) {
 
 		if (is_dir($path)) {
-			return (bool)glob(rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . '*', GLOB_ONLYDIR);
+			return (bool) glob(rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.'*', GLOB_ONLYDIR);
 		}
 		return false;
 	}
@@ -534,7 +534,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']);
@@ -559,13 +559,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;
@@ -581,7 +581,7 @@ 
 		
 		if ($cache) {
 			$cache = $this->convEncOut($cache, false);
-			foreach($cache as $d) {
+			foreach ($cache as $d) {
 				$this->updateCache($d[0], $d[1]);
 			}
 		}
@@ -597,7 +597,7 @@ 
 	 * @return resource|false
 	 * @author Dmitry (dio) Levashov
 	 **/
-	protected function _fopen($path, $mode='rb') {
+	protected function _fopen($path, $mode = 'rb') {
 		return @fopen($path, $mode);
 	}
 	
@@ -608,7 +608,7 @@ 
 	 * @return bool
 	 * @author Dmitry (dio) Levashov
 	 **/
-	protected function _fclose($fp, $path='') {
+	protected function _fclose($fp, $path = '') {
 		return @fclose($fp);
 	}
 	
@@ -740,7 +740,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);
 			if (!@rename($uri, $path) && !@copy($uri, $path)) {
@@ -800,7 +800,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;
@@ -918,7 +918,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)) {
@@ -927,9 +927,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;
 				}
@@ -937,7 +937,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);
@@ -1013,14 +1013,14 @@ 
 		$result = array();
 	
 		$path = $this->convEncIn($path);
-		$dirs = glob(rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . '*', GLOB_ONLYDIR);
-		$match = glob(rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . '*'.$q.'*', GLOB_NOSORT);
+		$dirs = glob(rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.'*', GLOB_ONLYDIR);
+		$match = glob(rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.'*'.$q.'*', GLOB_NOSORT);
 		if ($dirs) {
 			$dirs = $this->convEncOut($dirs, false);
 		} 
 		$match = $this->convEncOut($match);
 		if ($match) {
-			foreach($match as $p) {
+			foreach ($match as $p) {
 				$stat = $this->stat($p);
 		
 				if (!$stat) { // invalid links
@@ -1040,7 +1040,7 @@ 
 						if ($this->encoding) {
 							$path = str_replace('%2F', '/', rawurlencode($this->convEncIn($path, true)));
 						}
-						$stat['url'] = $this->URL . $path;
+						$stat['url'] = $this->URL.$path;
 					}
 		
 					$result[] = $stat;
@@ -1048,7 +1048,7 @@ 
 			}
 		}
 		if ($dirs) {
-			foreach($dirs as $dir) {
+			foreach ($dirs as $dir) {
 				$stat = $this->stat($dir);
 				if ($stat['read'] && !isset($stat['alias'])) {
 					@set_time_limit(30);

php/elFinderVolumeMySQL.class.php

Spacing +6 added lines, -6 removed lines

@@ -311,7 +311,7 @@ 
 		$dirs = array();
 		if ($path != $this->root) {
 			$inpath = array(intval($path));
-			while($inpath) {
+			while ($inpath) {
 				$in = '('.join(',', $inpath).')';
 				$inpath = array();
 				$sql = 'SELECT f.id FROM %s AS f WHERE f.parent_id IN '.$in.' AND `mime` = \'directory\'';
@@ -330,7 +330,7 @@ 
 		
 		if ($mimes) {
 			$whrs = array();
-			foreach($mimes as $mime) {
+			foreach ($mimes as $mime) {
 				if (strpos($mime, '/') === false) {
 					$whrs[] = sprintf('f.mime LIKE "%s/%%"', $this->db->real_escape_string($mime));
 				} else {
@@ -342,7 +342,7 @@ 
 			$whr = sprintf('f.name RLIKE "%s"', $this->db->real_escape_string($q));
 		}
 		if ($dirs) {
-			$whr = '(' . $whr . ') AND (`parent_id` IN (' . join(',', $dirs) . '))';
+			$whr = '('.$whr.') AND (`parent_id` IN ('.join(',', $dirs).'))';
 		}
 		
 		$sql = 'SELECT f.id, f.parent_id, f.name, f.size, f.mtime AS ts, f.mime, f.read, f.write, f.locked, f.hidden, f.width, f.height, 0 AS dirs 
@@ -587,7 +587,7 @@ 
 	 * @return resource|false
 	 * @author Dmitry (dio) Levashov
 	 **/
-	protected function _fopen($path, $mode='rb') {
+	protected function _fopen($path, $mode = 'rb') {
 		$fp = $this->tmbPath
 			? @fopen($this->getTempFile($path), 'w+')
 			: @tmpfile();
@@ -614,7 +614,7 @@ 
 	 * @return bool
 	 * @author Dmitry (dio) Levashov
 	 **/
-	protected function _fclose($fp, $path='') {
+	protected function _fclose($fp, $path = '') {
 		@fclose($fp);
 		if ($path) {
 			@unlink($this->getTempFile($path));
@@ -746,7 +746,7 @@ 
 		$this->clearcache();
 		
 		$mime = $stat['mime'];
-		$w = !empty($stat['width'])  ? $stat['width']  : 0;
+		$w = !empty($stat['width']) ? $stat['width'] : 0;
 		$h = !empty($stat['height']) ? $stat['height'] : 0;
 		
 		$id = $this->_joinPath($dir, $name);

php/elFinderVolumeS3.class.php

Spacing +20 added lines, -20 removed lines

@@ -61,8 +61,8 @@ 
 	 **/

 	protected function _dirname($path) {

 	

-		$newpath =  preg_replace("/\/$/", "", $path);

-		$dn = substr($path, 0, strrpos($newpath, '/')) ;

+		$newpath = preg_replace("/\/$/", "", $path);

+		$dn = substr($path, 0, strrpos($newpath, '/'));

 		

 		if (substr($dn, 0, 1) != '/') {

 		 $dn = "/$dn";

@@ -105,9 +105,9 @@ 
 	 * @author Troex Nevelin

 	 **/

 	protected function _normpath($path) {

-		$tmp =  preg_replace("/^\//", "", $path);

-		$tmp =  preg_replace("/\/\//", "/", $tmp);

-		$tmp =  preg_replace("/\/$/", "", $tmp);

+		$tmp = preg_replace("/^\//", "", $path);

+		$tmp = preg_replace("/\/\//", "/", $tmp);

+		$tmp = preg_replace("/\/$/", "", $tmp);

 		return $tmp;

 	}

 

@@ -128,9 +128,9 @@ 
 			$newpath = "/$newpath";

 		}

 		

-		$newpath =  preg_replace("/\/$/", "", $newpath);

+		$newpath = preg_replace("/\/$/", "", $newpath);

 	

-		$ret = ($newpath == $this->root) ? '' : substr($newpath, strlen($this->root)+1);

+		$ret = ($newpath == $this->root) ? '' : substr($newpath, strlen($this->root) + 1);

 		

 		return $ret;

 	}

@@ -231,7 +231,7 @@ 
 		$np = $this->_normpath($path);

 		

 		try {

-			$obj = $this->s3->GetObject(array('Bucket' => $this->options['bucket'], 'Key' => $np , 'GetMetadata' => true, 'InlineData' => false, 'GetData' => false));

+			$obj = $this->s3->GetObject(array('Bucket' => $this->options['bucket'], 'Key' => $np, 'GetMetadata' => true, 'InlineData' => false, 'GetData' => false));

 		} catch (Exception $e) {

 		

 		}

@@ -239,7 +239,7 @@ 
 		if (!isset($obj) || ($obj->GetObjectResponse->Status->Code != 200)) {

 			$np .= '/';

 			try {

-				$obj = $this->s3->GetObject(array('Bucket' => $this->options['bucket'], 'Key' => $np , 'GetMetadata' => true, 'InlineData' => false, 'GetData' => false));

+				$obj = $this->s3->GetObject(array('Bucket' => $this->options['bucket'], 'Key' => $np, 'GetMetadata' => true, 'InlineData' => false, 'GetData' => false));

 			} catch (Exception $e) {

 		

 			}

@@ -341,14 +341,14 @@ 
 	 **/

 	protected function _scandir($path) {

 		

-		$s3path = preg_replace("/^\//", "", $path) . '/';

+		$s3path = preg_replace("/^\//", "", $path).'/';

 		

 		$files = $this->s3->ListBucket(array('Bucket' => $this->options['bucket'], 'delimiter' => '/', 'Prefix' => $s3path))->ListBucketResponse->Contents;

 	

 		$finalfiles = array();

 		

 		foreach ($files as $file) {

-			if (preg_match("|^" . $s3path . "[^/]*/?$|", $file->Key)) {

+			if (preg_match("|^".$s3path."[^/]*/?$|", $file->Key)) {

 				$fname = preg_replace("/\/$/", "", $file->Key);

 				$fname = $file->Key;

 				

@@ -373,7 +373,7 @@ 
 	 * @author Dmitry (dio) Levashov,

 	 * @author Alexey Sukhotin

 	 **/

-	protected function _fopen($path, $mode="rb") {

+	protected function _fopen($path, $mode = "rb") {

 	

 		$tn = $this->getTempFile($path);

 	

@@ -385,8 +385,8 @@ 
 		if ($fp) {

 

 			try {

-				$obj = $this->s3->GetObject(array('Bucket' => $this->options['bucket'], 'Key' => $this->_normpath($path) , 'GetMetadata' => true, 'InlineData' => true, 'GetData' => true));

-			}	catch (Exception $e) {

+				$obj = $this->s3->GetObject(array('Bucket' => $this->options['bucket'], 'Key' => $this->_normpath($path), 'GetMetadata' => true, 'InlineData' => true, 'GetData' => true));

+			} catch (Exception $e) {

 		

 			}

 				

@@ -410,7 +410,7 @@ 
 	 * @return bool

 	 * @author Dmitry (dio) Levashov

 	 **/

-	protected function _fclose($fp, $path='') {

+	protected function _fclose($fp, $path = '') {

 		@fclose($fp);

 		if ($path) {

 			@unlink($this->getTempFile($path));

@@ -435,7 +435,7 @@ 
 		$newkey = "$newkey/$name/";

 

 		try {

-			$obj = $this->s3->PutObjectInline(array('Bucket' => $this->options['bucket'], 'Key' => $newkey , 'ContentLength' => 0, 'Data' => ''));

+			$obj = $this->s3->PutObjectInline(array('Bucket' => $this->options['bucket'], 'Key' => $newkey, 'ContentLength' => 0, 'Data' => ''));

 		} catch (Exception $e) {

 		

 		}

@@ -462,7 +462,7 @@ 
 		$newkey = "$newkey/$name";

 

 		try {

-			$obj = $this->s3->PutObjectInline(array('Bucket' => $this->options['bucket'], 'Key' => $newkey , 'ContentLength' => 0, 'Data' => '', 'Metadata' => array(array('Name' => 'Content-Type', 'Value' => 'text/plain'))));

+			$obj = $this->s3->PutObjectInline(array('Bucket' => $this->options['bucket'], 'Key' => $newkey, 'ContentLength' => 0, 'Data' => '', 'Metadata' => array(array('Name' => 'Content-Type', 'Value' => 'text/plain'))));

 		} catch (Exception $e) {

 		

 		}

@@ -563,7 +563,7 @@ 
 	 * @author Dmitry (dio) Levashov

 	 **/

 	protected function _rmdir($path) {

-		return $this->_unlink($path . '/');

+		return $this->_unlink($path.'/');

 	}

 

 	/**

@@ -682,7 +682,7 @@ 
 		/* Getting list of S3 web service functions which requires signing */

 		$funcs = $this->__getFunctions();

 		

-		$funcnames  = array();

+		$funcnames = array();

 		

 		foreach ($funcs as $func) {

 			preg_match("/\S+\s+([^\)]+)\(/", $func, $m);

@@ -723,7 +723,7 @@ 
 			'Timestamp' => gmdate('Y-m-d\TH:i:s.000\Z'),

 		);

 

-		$sign_str = 'AmazonS3' . $operation . $params['Timestamp'];

+		$sign_str = 'AmazonS3'.$operation.$params['Timestamp'];

 		

 		$params['Signature'] = base64_encode(hash_hmac('sha1', $sign_str, $this->secretkey, TRUE));

 		

php/plugins/AutoResize/plugin.php

Spacing +13 added lines, -13 removed lines

@@ -50,11 +50,11 @@ 
 
 	public function __construct($opts) {
 		$defaults = array(
-			'enable'         => true,       // For control by volume driver
-			'maxWidth'       => 1024,       // Path to Water mark image
-			'maxHeight'      => 1024,       // Margin right pixel
-			'quality'        => 95,         // JPEG image save quality
-			'targetType'     => IMG_GIF|IMG_JPG|IMG_PNG|IMG_WBMP // Target image formats ( bit-field )
+			'enable'         => true, // For control by volume driver
+			'maxWidth'       => 1024, // Path to Water mark image
+			'maxHeight'      => 1024, // Margin right pixel
+			'quality'        => 95, // JPEG image save quality
+			'targetType'     => IMG_GIF | IMG_JPG | IMG_PNG | IMG_WBMP // Target image formats ( bit-field )
 		);
 
 		$this->opts = array_merge($defaults, $opts);
@@ -68,7 +68,7 @@ 
 			$opts = array_merge($this->opts, $volOpts);
 		}
 		
-		if (! $opts['enable']) {
+		if (!$opts['enable']) {
 			return false;
 		}
 		
@@ -84,7 +84,7 @@ 
 				IMAGETYPE_PNG => IMG_PNG,
 				IMAGETYPE_WBMP => IMG_WBMP,
 		);
-		if (! ($opts['targetType'] & $imgTypes[$srcImgInfo[2]])) {
+		if (!($opts['targetType'] & $imgTypes[$srcImgInfo[2]])) {
 			return false;
 		}
 		
@@ -96,9 +96,9 @@ 
 	}
 	
 	private function resize($src, $srcImgInfo, $maxWidth, $maxHeight, $quality) {
-		$zoom = min(($maxWidth/$srcImgInfo[0]),($maxHeight/$srcImgInfo[1]));
-		$width = round($srcImgInfo[0] * $zoom);
-		$height = round($srcImgInfo[1] * $zoom);
+		$zoom = min(($maxWidth/$srcImgInfo[0]), ($maxHeight/$srcImgInfo[1]));
+		$width = round($srcImgInfo[0]*$zoom);
+		$height = round($srcImgInfo[1]*$zoom);
 		
 		if (class_exists('Imagick')) {
 			return $this->resize_imagick($src, $width, $height, $quality);
@@ -118,14 +118,14 @@ 
 				break;
 			case 'image/jpeg':
 				if (@imagetypes() & IMG_JPG) {
-					$oSrcImg = @imagecreatefromjpeg($src) ;
+					$oSrcImg = @imagecreatefromjpeg($src);
 				} else {
 					$ermsg = 'JPEG images are not supported';
 				}
 				break;
 			case 'image/png':
 				if (@imagetypes() & IMG_PNG) {
-					$oSrcImg = @imagecreatefrompng($src) ;
+					$oSrcImg = @imagecreatefrompng($src);
 				} else {
 					$ermsg = 'PNG images are not supported';
 				}
@@ -143,7 +143,7 @@ 
 				break;
 		}
 		
-		if ($oSrcImg &&  false != ($tmp = imagecreatetruecolor($width, $height))) {
+		if ($oSrcImg && false != ($tmp = imagecreatetruecolor($width, $height))) {
 			
 			if (!imagecopyresampled($tmp, $oSrcImg, 0, 0, 0, 0, $width, $height, $srcImgInfo[0], $srcImgInfo[1])) {
 				return false;

php/plugins/Watermark/plugin.php

Spacing +17 added lines, -17 removed lines

@@ -57,13 +57,13 @@ 
 
 	public function __construct($opts) {
 		$defaults = array(
-			'enable'         => true,       // For control by volume driver
+			'enable'         => true, // For control by volume driver
 			'source'         => 'logo.png', // Path to Water mark image
-			'marginRight'    => 5,          // Margin right pixel
-			'marginBottom'   => 5,          // Margin bottom pixel
-			'quality'        => 95,         // JPEG image save quality
-			'transparency'   => 70,         // Water mark image transparency ( other than PNG )
-			'targetType'     => IMG_GIF|IMG_JPG|IMG_PNG|IMG_WBMP, // Target image formats ( bit-field )
+			'marginRight'    => 5, // Margin right pixel
+			'marginBottom'   => 5, // Margin bottom pixel
+			'quality'        => 95, // JPEG image save quality
+			'transparency'   => 70, // Water mark image transparency ( other than PNG )
+			'targetType'     => IMG_GIF | IMG_JPG | IMG_PNG | IMG_WBMP, // Target image formats ( bit-field )
 			'targetMinPixel' => 200         // Target image minimum pixel size
 		);
 
@@ -79,7 +79,7 @@ 
 			$opts = array_merge($this->opts, $volOpts);
 		}
 		
-		if (! $opts['enable']) {
+		if (!$opts['enable']) {
 			return false;
 		}
 		
@@ -94,12 +94,12 @@ 
 		}
 		
 		// check water mark image
-		if (! file_exists($opts['source'])) {
-			$opts['source'] = dirname(__FILE__) . "/" . $opts['source'];
+		if (!file_exists($opts['source'])) {
+			$opts['source'] = dirname(__FILE__)."/".$opts['source'];
 		}
 		if (is_readable($opts['source'])) {
 			$watermarkImgInfo = @getimagesize($opts['source']);
-			if (! $watermarkImgInfo) {
+			if (!$watermarkImgInfo) {
 				return false;
 			}
 		} else {
@@ -119,7 +119,7 @@ 
 			IMAGETYPE_PNG => IMG_PNG,
 			IMAGETYPE_WBMP => IMG_WBMP,
 		);
-		if (! ($opts['targetType'] & $imgTypes[$srcImgInfo[2]])) {
+		if (!($opts['targetType'] & $imgTypes[$srcImgInfo[2]])) {
 			return false;
 		}
 		
@@ -192,14 +192,14 @@ 
 				break;
 			case 'image/jpeg':
 				if (@imagetypes() & IMG_JPG) {
-					$oWatermarkImg = @imagecreatefromjpeg($watermark) ;
+					$oWatermarkImg = @imagecreatefromjpeg($watermark);
 				} else {
 					$ermsg = 'JPEG images are not supported';
 				}
 				break;
 			case 'image/png':
 				if (@imagetypes() & IMG_PNG) {
-					$oWatermarkImg = @imagecreatefrompng($watermark) ;
+					$oWatermarkImg = @imagecreatefrompng($watermark);
 				} else {
 					$ermsg = 'PNG images are not supported';
 				}
@@ -217,7 +217,7 @@ 
 				break;
 		}
 		
-		if (! $ermsg) {
+		if (!$ermsg) {
 			switch ($srcImgInfo['mime']) {
 				case 'image/gif':
 					if (@imagetypes() & IMG_GIF) {
@@ -228,14 +228,14 @@ 
 					break;
 				case 'image/jpeg':
 					if (@imagetypes() & IMG_JPG) {
-						$oSrcImg = @imagecreatefromjpeg($src) ;
+						$oSrcImg = @imagecreatefromjpeg($src);
 					} else {
 						$ermsg = 'JPEG images are not supported';
 					}
 					break;
 				case 'image/png':
 					if (@imagetypes() & IMG_PNG) {
-						$oSrcImg = @imagecreatefrompng($src) ;
+						$oSrcImg = @imagecreatefrompng($src);
 					} else {
 						$ermsg = 'PNG images are not supported';
 					}
@@ -261,7 +261,7 @@ 
 		if ($srcImgInfo['mime'] === 'image/png') {
 			if (function_exists('imagecolorallocatealpha')) {
 				$bg = imagecolorallocatealpha($oSrcImg, 255, 255, 255, 127);
-				imagefill($oSrcImg, 0, 0 , $bg);
+				imagefill($oSrcImg, 0, 0, $bg);
 			}
 		}
 		

php/plugins/Normalizer/plugin.php

Spacing +7 added lines, -7 removed lines

@@ -58,7 +58,7 @@ 
 		$defaults = array(
 			'enable' => true, // For control by volume driver
 			'nfc'    => true, // Canonical Decomposition followed by Canonical Composition
-			'nfkc'   => true,  // Compatibility Decomposition followed by Canonical
+			'nfkc'   => true, // Compatibility Decomposition followed by Canonical
 			'lowercase'   => false  // Make chars lowercase
 		);
 	
@@ -67,13 +67,13 @@ 
 	
 	public function cmdPreprocess($cmd, &$args, $elfinder, $volume) {
 		$opts = $this->getOpts($volume);
-		if (! $opts['enable']) {
+		if (!$opts['enable']) {
 			return false;
 		}
 		
 		if (isset($args['name'])) {
 			if (is_array($args['name'])) {
-				foreach($args['name'] as $i => $name) {
+				foreach ($args['name'] as $i => $name) {
 					$args['name'][$i] = $this->normalize($name, $opts);
 				}
 			} else {
@@ -85,7 +85,7 @@ 
 	
 	public function onUpLoadPreSave(&$path, &$name, $src, $elfinder, $volume) {
 		$opts = $this->getOpts($volume);
-		if (! $opts['enable']) {
+		if (!$opts['enable']) {
 			return false;
 		}
 		
@@ -110,12 +110,12 @@ 
 	private function normalize($str, $opts) {
 		if ($opts['nfc'] || $opts['nfkc']) {
 			if (class_exists('Normalizer')) {
-				if ($opts['nfc'] && ! Normalizer::isNormalized($str, Normalizer::FORM_C))
+				if ($opts['nfc'] && !Normalizer::isNormalized($str, Normalizer::FORM_C))
 					$str = Normalizer::normalize($str, Normalizer::FORM_C);
-				if ($opts['nfkc'] && ! Normalizer::isNormalized($str, Normalizer::FORM_KC))
+				if ($opts['nfkc'] && !Normalizer::isNormalized($str, Normalizer::FORM_KC))
 					$str = Normalizer::normalize($str, Normalizer::FORM_KC);
 			} else {
-				if (! class_exists('I18N_UnicodeNormalizer')) {
+				if (!class_exists('I18N_UnicodeNormalizer')) {
 					@ include_once 'I18N/UnicodeNormalizer.php';
 				}
 				if (class_exists('I18N_UnicodeNormalizer')) {