Studio-42 / elFinder

php/elFinder.class.php

Indentation +18 added lines, -18 removed lines

@@ -1149,18 +1149,18 @@ 
 	}
 
 	/**
-	* Get remote contents
-	*
-	* @param  string   $url     target url
-	* @param  int      $timeout timeout (sec)
-	* @param  int      $redirect_max redirect max count
-	* @param  string   $ua
-	* @param  resource $fp
-	* @return string or bool(false)
-	* @retval string contents
-	* @retval false  error
-	* @author Naoki Sawada
-	**/
+	 * Get remote contents
+	 *
+	 * @param  string   $url     target url
+	 * @param  int      $timeout timeout (sec)
+	 * @param  int      $redirect_max redirect max count
+	 * @param  string   $ua
+	 * @param  resource $fp
+	 * @return string or bool(false)
+	 * @retval string contents
+	 * @retval false  error
+	 * @author Naoki Sawada
+	 **/
 	protected function get_remote_contents( &$url, $timeout = 30, $redirect_max = 5, $ua = 'Mozilla/5.0', $fp = null ) {
 		$method = (function_exists('curl_exec') && !ini_get('safe_mode'))? 'curl_get_contents' : 'fsock_get_contents'; 
 		return $this->$method( $url, $timeout, $redirect_max, $ua, $fp );
@@ -2090,12 +2090,12 @@ 
 	}
 	
 	/**
-	* Return content URL
-	*
-	* @param  array  $args  command arguments
-	* @return array
-	* @author Naoki Sawada
-	**/
+	 * Return content URL
+	 *
+	 * @param  array  $args  command arguments
+	 * @return array
+	 * @author Naoki Sawada
+	 **/
 	protected function url($args) {
 		$target = $args['target'];
 		$options = isset($args['options'])? $args['options'] : array();

Braces +19 added lines, -6 removed lines

@@ -1241,8 +1241,12 @@ 
 		
 		$query = $method.' '.$uri." HTTP/1.0\r\n";
 		$query .= "Host: ".$arr['host']."\r\n";
-		if (!empty($ua)) $query .= "User-Agent: ".$ua."\r\n";
-		if (!is_null($getSize)) $query .= 'Range: bytes=0-' . ($getSize - 1) . "\r\n";
+		if (!empty($ua)) {
+			$query .= "User-Agent: ".$ua."\r\n";
+		}
+		if (!is_null($getSize)) {
+			$query .= 'Range: bytes=0-' . ($getSize - 1) . "\r\n";
+		}
 		
 		$query .= $headers;
 
@@ -1257,7 +1261,9 @@ 
 			$arr['https'].$arr['host'],
 			$arr['port'],
 			$errno,$errstr,$connect_timeout);
-			if ($fp) break;
+			if ($fp) {
+				break;
+			}
 			$connect_try_count++;
 			if (connection_aborted()) {
 				exit();
@@ -1574,7 +1580,9 @@ 
 		$tempDir = '';
 		$test = DIRECTORY_SEPARATOR . microtime(true);
 		foreach($testDirs as $testDir) {
-			if (!$testDir || !is_dir($testDir)) continue;
+			if (!$testDir || !is_dir($testDir)) {
+				continue;
+			}
 			$testFile = $testDir.$test;
 			if (touch($testFile)) {
 				unlink($testFile);
@@ -1810,7 +1818,9 @@ 
 				$result['warning'] = $this->error(self::ERROR_UPLOAD_FILE, $name, self::ERROR_UPLOAD_TRANSFER);
 				$this->uploadDebug = 'Upload error: unable open tmp file';
 				if (! is_uploaded_file($tmpname)) {
-					if (@ unlink($tmpname)) unset($GLOBALS['elFinderTempFiles'][$tmpfname]);
+					if (@ unlink($tmpname)) {
+						unset($GLOBALS['elFinderTempFiles'][$tmpfname]);
+					}
 					continue;
 				}
 				break;
@@ -1824,7 +1834,10 @@ 
 				$result['warning'] = $this->error(self::ERROR_UPLOAD_FILE, $name, $volume->error());
 				fclose($fp);
 				if (! is_uploaded_file($tmpname)) {
-					if (@ unlink($tmpname)) unset($GLOBALS['elFinderTempFiles'][$tmpname]);;
+					if (@ unlink($tmpname)) {
+						unset($GLOBALS['elFinderTempFiles'][$tmpname]);
+					}
+					;
 					continue;
 				}
 				break;

php/elFinderConnector.class.php

Braces +3 added lines, -2 removed lines

@@ -212,8 +212,9 @@
 	protected function input_filter($args) {
 		static $magic_quotes_gpc = NULL;
 		
-		if ($magic_quotes_gpc === NULL)
-			$magic_quotes_gpc = (version_compare(PHP_VERSION, '5.4', '<') && get_magic_quotes_gpc());
+		if ($magic_quotes_gpc === NULL) {
+					$magic_quotes_gpc = (version_compare(PHP_VERSION, '5.4', '<') && get_magic_quotes_gpc());
+		}
 		
 		if (is_array($args)) {
 			return array_map(array(& $this, 'input_filter'), $args);

php/elFinderVolumeDriver.class.php

Indentation +24 added lines, -24 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 /**
- * Base class for elFinder volume.
- * Provide 2 layers:
- *  1. Public API (commands)
- *  2. abstract fs API
- *
- * All abstract methods begin with "_"
- *
- * @author Dmitry (dio) Levashov
- * @author Troex Nevelin
- * @author Alexey Sukhotin
- **/
+	 * Base class for elFinder volume.
+	 * Provide 2 layers:
+	 *  1. Public API (commands)
+	 *  2. abstract fs API
+	 *
+	 * All abstract methods begin with "_"
+	 *
+	 * @author Dmitry (dio) Levashov
+	 * @author Troex Nevelin
+	 * @author Alexey Sukhotin
+	 **/
 abstract class elFinderVolumeDriver {
 	
 	/**
@@ -192,11 +192,11 @@ 
 		'mimefile'        => '',
 		// mime type normalize map : Array '[ext]:[detected mime type]' => '[normalized mime]'
 		'mimeMap'         => array(
-		                     'md:application/x-genesis-rom' => 'text/x-markdown',
-		                     'md:text/plain'                => 'text/x-markdown',
-		                     'markdown:text/plain'          => 'text/x-markdown',
-		                     'css:text/x-asm'               => 'text/css'
-		                    ),
+							 'md:application/x-genesis-rom' => 'text/x-markdown',
+							 'md:text/plain'                => 'text/x-markdown',
+							 'markdown:text/plain'          => 'text/x-markdown',
+							 'css:text/x-asm'               => 'text/css'
+							),
 		// directory for thumbnails
 		'tmbPath'         => '.tmb',
 		// mode to create thumbnails dir
@@ -4043,14 +4043,14 @@ 
 	// }
 
 	/**
-	* Find position of first occurrence of string in a string with multibyte support
-	*
-	* @param  string  $haystack  The string being checked.
-	* @param  string  $needle    The string to find in haystack.
-	* @param  int     $offset    The search offset. If it is not specified, 0 is used.
-	* @return int|bool
-	* @author Alexey Sukhotin
-	**/
+	 * Find position of first occurrence of string in a string with multibyte support
+	 *
+	 * @param  string  $haystack  The string being checked.
+	 * @param  string  $needle    The string to find in haystack.
+	 * @param  int     $offset    The search offset. If it is not specified, 0 is used.
+	 * @return int|bool
+	 * @author Alexey Sukhotin
+	 **/
 	protected function stripos($haystack , $needle , $offset = 0) {
 		if (function_exists('mb_stripos')) {
 			return mb_stripos($haystack , $needle , $offset);

Braces +10 added lines, -4 removed lines

@@ -859,7 +859,9 @@ 
 
 		// This get's triggered if $this->root == '/' and alias is empty.
 		// Maybe modify _basename instead?
-		if ($this->rootName === '') $this->rootName = $this->separator;
+		if ($this->rootName === '') {
+			$this->rootName = $this->separator;
+		}
 
 		$root = $this->stat($this->root);
 		
@@ -2938,7 +2940,9 @@ 
 		if ($this->mimeDetect == 'finfo') {
 			if ($type = @finfo_file($this->finfo, $path)) {
 				if ($ext && preg_match('~^application/(?:octet-stream|(?:x-)?zip)~', $type)) {
-					if (isset(elFinderVolumeDriver::$mimetypes[$ext])) $type = elFinderVolumeDriver::$mimetypes[$ext];
+					if (isset(elFinderVolumeDriver::$mimetypes[$ext])) {
+						$type = elFinderVolumeDriver::$mimetypes[$ext];
+					}
 				} else if ($ext === 'js' && preg_match('~^text/~', $type)) {
 					$type = 'text/javascript';
 				}
@@ -4013,7 +4017,7 @@ 
 			imagesavealpha($image,true);
 			$bgcolor1 = imagecolorallocatealpha($image, 255, 255, 255, 127);
 
-		}else{
+		} else{
 			list($r, $g, $b) = sscanf($bgcolor, "#%02x%02x%02x");
 			$bgcolor1 = imagecolorallocate($image, $r, $g, $b);
 		}
@@ -4203,7 +4207,9 @@ 
 		}
 		
 		// 'Here'
-		if ($path === '' || $path === '.' . $separator) return $base;
+		if ($path === '' || $path === '.' . $separator) {
+			return $base;
+		}
 		
 		// Absolute path
 		if ($path[0] === $separator || strpos($path, $systemroot) === 0) {

php/elFinderVolumeDropbox.class.php

Indentation +49 added lines, -49 removed lines

@@ -192,7 +192,7 @@ 
 						$options['url'] = $this->getConnectorUrl();
 					}
 					$callback  = $options['url']
-					           . '?cmd=netmount&protocol=dropbox&host=dropbox.com&user=init&pass=return&node='.$options['id'].$cdata;
+							   . '?cmd=netmount&protocol=dropbox&host=dropbox.com&user=init&pass=return&node='.$options['id'].$cdata;
 					
 					try {
 						$tokens = $this->oauth->getRequestToken();
@@ -265,9 +265,9 @@ 
 	 */
 	private function getConnectorUrl() {
 		$url  = ((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off')? 'https://' : 'http://')
-		       . $_SERVER['SERVER_NAME']                                              // host
-		      . ($_SERVER['SERVER_PORT'] == 80 ? '' : ':' . $_SERVER['SERVER_PORT'])  // port
-		       . $_SERVER['REQUEST_URI'];                                             // path & query
+			   . $_SERVER['SERVER_NAME']                                              // host
+			  . ($_SERVER['SERVER_PORT'] == 80 ? '' : ':' . $_SERVER['SERVER_PORT'])  // port
+			   . $_SERVER['REQUEST_URI'];                                             // path & query
 		list($url) = explode('?', $url);
 		return $url;
 	}
@@ -605,7 +605,7 @@ 
 		$stat['mime']  = $raw['is_dir']? 'directory' : $raw['mime_type'];
 		$stat['size']  = $stat['mime'] == 'directory' ? 0 : $raw['bytes'];
 		$stat['ts']    = isset($raw['client_mtime'])? strtotime($raw['client_mtime']) :
-		                (isset($raw['modified'])? strtotime($raw['modified']) : $_SERVER['REQUEST_TIME']);
+						(isset($raw['modified'])? strtotime($raw['modified']) : $_SERVER['REQUEST_TIME']);
 		$stat['dirs'] = 0;
 		if ($raw['is_dir']) {
 			$stat['dirs'] = (int)(bool)$this->query('select path from '.$this->DB_TableName.' where isdir=1 and path='.$this->DB->quote(strtolower($raw['path'])));
@@ -648,14 +648,14 @@ 
 	}
 
 	/**
-	* Recursive files search
-	*
-	* @param  string  $path   dir path
-	* @param  string  $q      search string
-	* @param  array   $mimes
-	* @return array
-	* @author Naoki Sawada
-	**/
+	 * Recursive files search
+	 *
+	 * @param  string  $path   dir path
+	 * @param  string  $q      search string
+	 * @param  array   $mimes
+	 * @return array
+	 * @author Naoki Sawada
+	 **/
 	protected function doSearch($path, $q, $mimes) {
 		$result = array();
 		$sth = $this->DB->prepare('select dat from '.$this->DB_TableName.' WHERE path LIKE ? AND fname LIKE ?');
@@ -679,16 +679,16 @@ 
 	}
 	
 	/**
-	* Copy file/recursive copy dir only in current volume.
-	* Return new file path or false.
-	*
-	* @param  string  $src   source path
-	* @param  string  $dst   destination dir path
-	* @param  string  $name  new file name (optionaly)
-	* @return string|false
-	* @author Dmitry (dio) Levashov
-	* @author Naoki Sawada
-	**/
+	 * Copy file/recursive copy dir only in current volume.
+	 * Return new file path or false.
+	 *
+	 * @param  string  $src   source path
+	 * @param  string  $dst   destination dir path
+	 * @param  string  $name  new file name (optionaly)
+	 * @return string|false
+	 * @author Dmitry (dio) Levashov
+	 * @author Naoki Sawada
+	 **/
 	protected function copy($src, $dst, $name) {
 
 		$this->clearcache();
@@ -699,14 +699,14 @@ 
 	}
 	
 	/**
-	* Remove file/ recursive remove dir
-	*
-	* @param  string  $path   file path
-	* @param  bool    $force  try to remove even if file locked
-	* @return bool
-	* @author Dmitry (dio) Levashov
-	* @author Naoki Sawada
-	**/
+	 * Remove file/ recursive remove dir
+	 *
+	 * @param  string  $path   file path
+	 * @param  bool    $force  try to remove even if file locked
+	 * @return bool
+	 * @author Dmitry (dio) Levashov
+	 * @author Naoki Sawada
+	 **/
 	protected function remove($path, $force = false, $recursive = false) {
 		$stat = $this->stat($path);
 		$stat['realpath'] = $path;
@@ -736,14 +736,14 @@ 
 	}
 	
 	/**
-	* Create thumnbnail and return it's URL on success
-	*
-	* @param  string  $path  file path
-	* @param  string  $mime  file mime type
-	* @return string|false
-	* @author Dmitry (dio) Levashov
-	* @author Naoki Sawada
-	**/
+	 * Create thumnbnail and return it's URL on success
+	 *
+	 * @param  string  $path  file path
+	 * @param  string  $mime  file mime type
+	 * @return string|false
+	 * @author Dmitry (dio) Levashov
+	 * @author Naoki Sawada
+	 **/
 	protected function createTmb($path, $stat) {
 		if (!$stat || !$this->canCreateTmb($path, $stat)) {
 			return false;
@@ -828,13 +828,13 @@ 
 	}
 	
 	/**
-	* Return content URL
-	*
-	* @param string  $hash  file hash
-	* @param array $options options
-	* @return array
-	* @author Naoki Sawada
-	**/
+	 * Return content URL
+	 *
+	 * @param string  $hash  file hash
+	 * @param array $options options
+	 * @return array
+	 * @author Naoki Sawada
+	 **/
 	public function getContentUrl($hash, $options = array()) {
 		if (($file = $this->file($hash)) == false || !$file['url'] || $file['url'] == 1) {
 			$path = $this->decode($hash);
@@ -897,9 +897,9 @@ 
 			try {
 				$request2 = new HTTP_Request2();
 				$request2->setConfig(array(
-                    'ssl_verify_peer' => false,
-                    'ssl_verify_host' => false
-                ));
+					'ssl_verify_peer' => false,
+					'ssl_verify_host' => false
+				));
 				$request2->setUrl($url);
 				$request2->setMethod(HTTP_Request2::METHOD_HEAD);
 				$result = $request2->send();

Braces +24 added lines, -8 removed lines

@@ -132,8 +132,12 @@ 
 	 * @author Naoki Sawada
 	 **/
 	public function netmountPrepare($options) {
-		if (empty($options['consumerKey']) && defined('ELFINDER_DROPBOX_CONSUMERKEY')) $options['consumerKey'] = ELFINDER_DROPBOX_CONSUMERKEY;
-		if (empty($options['consumerSecret']) && defined('ELFINDER_DROPBOX_CONSUMERSECRET')) $options['consumerSecret'] = ELFINDER_DROPBOX_CONSUMERSECRET;
+		if (empty($options['consumerKey']) && defined('ELFINDER_DROPBOX_CONSUMERKEY')) {
+			$options['consumerKey'] = ELFINDER_DROPBOX_CONSUMERKEY;
+		}
+		if (empty($options['consumerSecret']) && defined('ELFINDER_DROPBOX_CONSUMERSECRET')) {
+			$options['consumerSecret'] = ELFINDER_DROPBOX_CONSUMERSECRET;
+		}
 		
 		if ($options['user'] === 'init') {
 
@@ -616,8 +620,12 @@ 
 		} else {
 			$stat['url'] = '1';
 		}
-		if (isset($raw['width'])) $stat['width'] = $raw['width'];
-		if (isset($raw['height'])) $stat['height'] = $raw['height'];
+		if (isset($raw['width'])) {
+			$stat['width'] = $raw['width'];
+		}
+		if (isset($raw['height'])) {
+			$stat['height'] = $raw['height'];
+		}
 		
 		return $stat;
 	}
@@ -1061,7 +1069,9 @@ 
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _dimensions($path, $mime) {
-		if (strpos($mime, 'image') !== 0) return '';
+		if (strpos($mime, 'image') !== 0) {
+			return '';
+		}
 		$cache = $this->getDBdat($path);
 		if (isset($cache['width']) && isset($cache['height'])) {
 			return $cache['width'].'x'.$cache['height'];
@@ -1281,7 +1291,9 @@ 
 	 * @author Dmitry (dio) Levashov
 	 **/
 	protected function _save($fp, $path, $name, $stat) {
-		if ($name) $path .= '/'.$name;
+		if ($name) {
+			$path .= '/'.$name;
+		}
 		$path = $this->_normpath($path);
 		try {
 			$this->dropbox->putFile($path, $fp);
@@ -1291,8 +1303,12 @@ 
 		$this->deltaCheck();
 		if (is_array($stat)) {
 			$raw = $this->getDBdat($path);
-			if (isset($stat['width'])) $raw['width'] = $stat['width'];
-			if (isset($stat['height'])) $raw['height'] = $stat['height'];
+			if (isset($stat['width'])) {
+				$raw['width'] = $stat['width'];
+			}
+			if (isset($stat['height'])) {
+				$raw['height'] = $stat['height'];
+			}
 			$this->updateDBdat($path, $raw);
 		}
 		return $path;

php/elFinderVolumeS3.class.php

Braces +1 added lines, -1 removed lines

@@ -386,7 +386,7 @@
 

 			try {

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

-			}	catch (Exception $e) {

+			} catch (Exception $e) {

 		

 			}

 				

php/plugins/Normalizer/plugin.php

Braces +12 added lines, -8 removed lines

@@ -104,20 +104,24 @@
 	private function normalize($str, $opts) {
 		if ($opts['nfc'] || $opts['nfkc']) {
 			if (class_exists('Normalizer')) {
-				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))
-					$str = Normalizer::normalize($str, Normalizer::FORM_KC);
+				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)) {
+									$str = Normalizer::normalize($str, Normalizer::FORM_KC);
+				}
 			} else {
 				if (! class_exists('I18N_UnicodeNormalizer')) {
 					@ include_once 'I18N/UnicodeNormalizer.php';
 				}
 				if (class_exists('I18N_UnicodeNormalizer')) {
 					$normalizer = new I18N_UnicodeNormalizer();
-					if ($opts['nfc'])
-						$str = $normalizer->normalize($str, 'NFC');
-					if ($opts['nfkc'])
-						$str = $normalizer->normalize($str, 'NFKC');
+					if ($opts['nfc']) {
+											$str = $normalizer->normalize($str, 'NFC');
+					}
+					if ($opts['nfkc']) {
+											$str = $normalizer->normalize($str, 'NFKC');
+					}
 				}
 			}
 		}

Indentation +50 added lines, -50 removed lines

@@ -1,55 +1,55 @@
 <?php
 /**
- * elFinder Plugin Normalizer
- * 
- * UTF-8 Normalizer of file-name and file-path etc.
- * nfc(NFC): Canonical Decomposition followed by Canonical Composition
- * nfkc(NFKC): Compatibility Decomposition followed by Canonical
- * 
- * This plugin require Class "Normalizer" (PHP 5 >= 5.3.0, PECL intl >= 1.0.0)
- * or PEAR package "I18N_UnicodeNormalizer"
- * 
- * ex. binding, configure on connector options
- *	$opts = array(
- *		'bind' => array(
- *			'upload.pre mkdir.pre mkfile.pre rename.pre archive.pre' => array(
- *				'Plugin.Normalizer.cmdPreprocess'
- *			),
- *			'upload.presave' => array(
- *				'Plugin.Normalizer.onUpLoadPreSave'
- *			)
- *		),
- *		// global configure (optional)
- *		'plugin' => array(
- *			'Normalizer' => array(
- *				'enable' => true,
- *				'nfc'    => true,
- *				'nfkc'   => true,
- *				'lowercase'   => false
- *			)
- *		),
- *		// each volume configure (optional)
- *		'roots' => array(
- *			array(
- *				'driver' => 'LocalFileSystem',
- *				'path'   => '/path/to/files/',
- *				'URL'    => 'http://localhost/to/files/'
- *				'plugin' => array(
- *					'Normalizer' => array(
- *						'enable' => true,
- *						'nfc'    => true,
- *						'nfkc'   => true,
- * 						'lowercase'   => false
- *					)
- *				)
- *			)
- *		)
- *	);
- *
- * @package elfinder
- * @author Naoki Sawada
- * @license New BSD
- */
+  	 * elFinder Plugin Normalizer
+  	 * 
+  	 * UTF-8 Normalizer of file-name and file-path etc.
+  	 * nfc(NFC): Canonical Decomposition followed by Canonical Composition
+  	 * nfkc(NFKC): Compatibility Decomposition followed by Canonical
+  	 * 
+  	 * This plugin require Class "Normalizer" (PHP 5 >= 5.3.0, PECL intl >= 1.0.0)
+  	 * or PEAR package "I18N_UnicodeNormalizer"
+  	 * 
+  	 * ex. binding, configure on connector options
+  	 *	$opts = array(
+  	 *		'bind' => array(
+  	 *			'upload.pre mkdir.pre mkfile.pre rename.pre archive.pre' => array(
+  	 *				'Plugin.Normalizer.cmdPreprocess'
+  	 *			),
+  	 *			'upload.presave' => array(
+  	 *				'Plugin.Normalizer.onUpLoadPreSave'
+  	 *			)
+  	 *		),
+  	 *		// global configure (optional)
+  	 *		'plugin' => array(
+  	 *			'Normalizer' => array(
+  	 *				'enable' => true,
+  	 *				'nfc'    => true,
+  	 *				'nfkc'   => true,
+  	 *				'lowercase'   => false
+  	 *			)
+  	 *		),
+  	 *		// each volume configure (optional)
+  	 *		'roots' => array(
+  	 *			array(
+  	 *				'driver' => 'LocalFileSystem',
+  	 *				'path'   => '/path/to/files/',
+  	 *				'URL'    => 'http://localhost/to/files/'
+  	 *				'plugin' => array(
+  	 *					'Normalizer' => array(
+  	 *						'enable' => true,
+  	 *						'nfc'    => true,
+  	 *						'nfkc'   => true,
+  	 * 						'lowercase'   => false
+  	 *					)
+  	 *				)
+  	 *			)
+  	 *		)
+  	 *	);
+  	 *
+  	 * @package elfinder
+  	 * @author Naoki Sawada
+  	 * @license New BSD
+  	 */
 class elFinderPluginNormalizer
 {
 	private $opts = array();

php/plugins/AutoResize/plugin.php

Indentation +44 added lines, -44 removed lines

@@ -1,49 +1,49 @@
 <?php
 /**
- * elFinder Plugin AutoResize
- *
- * Auto resize on file upload.
- *
- * ex. binding, configure on connector options
- *	$opts = array(
- *		'bind' => array(
- *			'upload.presave' => array(
- *				'Plugin.AutoResize.onUpLoadPreSave'
- *			)
- *		),
- *		// global configure (optional)
- *		'plugin' => array(
- *			'PluginAutoResize' => 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 )
- *			)
- *		),
- *		// each volume configure (optional)
- *		'roots' => array(
- *			array(
- *				'driver' => 'LocalFileSystem',
- *				'path'   => '/path/to/files/',
- *				'URL'    => 'http://localhost/to/files/'
- *				'plugin' => array(
- *					'PluginAutoResize' => 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 )
- *					)
- *				)
- *			)
- *		)
- *	);
- *
- * @package elfinder
- * @author Naoki Sawada
- * @license New BSD
- */
+	 * elFinder Plugin AutoResize
+	 *
+	 * Auto resize on file upload.
+	 *
+	 * ex. binding, configure on connector options
+	 *	$opts = array(
+	 *		'bind' => array(
+	 *			'upload.presave' => array(
+	 *				'Plugin.AutoResize.onUpLoadPreSave'
+	 *			)
+	 *		),
+	 *		// global configure (optional)
+	 *		'plugin' => array(
+	 *			'PluginAutoResize' => 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 )
+	 *			)
+	 *		),
+	 *		// each volume configure (optional)
+	 *		'roots' => array(
+	 *			array(
+	 *				'driver' => 'LocalFileSystem',
+	 *				'path'   => '/path/to/files/',
+	 *				'URL'    => 'http://localhost/to/files/'
+	 *				'plugin' => array(
+	 *					'PluginAutoResize' => 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 )
+	 *					)
+	 *				)
+	 *			)
+	 *		)
+	 *	);
+	 *
+	 * @package elfinder
+	 * @author Naoki Sawada
+	 * @license New BSD
+	 */
 class elFinderPluginAutoResize {
 
 	private $opts = array();

php/plugins/Watermark/plugin.php

Indentation +50 added lines, -50 removed lines

@@ -1,55 +1,55 @@
 <?php
 /**
- * elFinder Plugin Watermark
- *
- * Print watermark on file upload.
- *
- * ex. binding, configure on connector options
- *	$opts = array(
- *		'bind' => array(
- *			'upload.presave' => array(
- *				'Plugin.Watermark.onUpLoadPreSave'
- *			)
- *		),
- *		// global configure (optional)
- *		'plugin' => array(
- *			'Watermark' => array(
- *				'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 )
- *				'targetMinPixel' => 200         // Target image minimum pixel size
- *			)
- *		),
- *		// each volume configure (optional)
- *		'roots' => array(
- *			array(
- *				'driver' => 'LocalFileSystem',
- *				'path'   => '/path/to/files/',
- *				'URL'    => 'http://localhost/to/files/'
- *				'plugin' => array(
- *					'Watermark' => array(
- *			 			'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 )
- *						'targetMinPixel' => 200         // Target image minimum pixel size
- *					)
- *				)
- *			)
- *		)
- *	);
- *
- * @package elfinder
- * @author Naoki Sawada
- * @license New BSD
- */
+	 * elFinder Plugin Watermark
+	 *
+	 * Print watermark on file upload.
+	 *
+	 * ex. binding, configure on connector options
+	 *	$opts = array(
+	 *		'bind' => array(
+	 *			'upload.presave' => array(
+	 *				'Plugin.Watermark.onUpLoadPreSave'
+	 *			)
+	 *		),
+	 *		// global configure (optional)
+	 *		'plugin' => array(
+	 *			'Watermark' => array(
+	 *				'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 )
+	 *				'targetMinPixel' => 200         // Target image minimum pixel size
+	 *			)
+	 *		),
+	 *		// each volume configure (optional)
+	 *		'roots' => array(
+	 *			array(
+	 *				'driver' => 'LocalFileSystem',
+	 *				'path'   => '/path/to/files/',
+	 *				'URL'    => 'http://localhost/to/files/'
+	 *				'plugin' => array(
+	 *					'Watermark' => array(
+	 *			 			'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 )
+	 *						'targetMinPixel' => 200         // Target image minimum pixel size
+	 *					)
+	 *				)
+	 *			)
+	 *		)
+	 *	);
+	 *
+	 * @package elfinder
+	 * @author Naoki Sawada
+	 * @license New BSD
+	 */
 class elFinderPluginWatermark {
 
 	private $opts = array();