Studio-42 / elFinder

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();

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

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');
+					}
 				}
 			}
 		}

Spacing +9 added lines, -9 removed lines

@@ -58,9 +58,9 @@ 
 	
 	public function __construct($opts) {
 		$defaults = array(
-			'enable'    => true,  // For control by volume driver
-			'nfc'       => true,  // Canonical Decomposition followed by Canonical Composition
-			'nfkc'      => true,  // Compatibility Decomposition followed by Canonical
+			'enable'    => true, // For control by volume driver
+			'nfc'       => true, // Canonical Decomposition followed by Canonical Composition
+			'nfkc'      => true, // Compatibility Decomposition followed by Canonical
 			'lowercase' => false, // Make chars lowercase
 			'convmap'   => array()// Convert map ('FROM' => 'TO') array
 		);
@@ -70,13 +70,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 {
@@ -88,7 +88,7 @@ 
 	
 	public function onUpLoadPreSave(&$path, &$name, $src, $elfinder, $volume) {
 		$opts = $this->getOpts($volume);
-		if (! $opts['enable']) {
+		if (!$opts['enable']) {
 			return false;
 		}
 		
@@ -113,12 +113,12 @@ 
 	private function normalize($str, $opts) {
 		if ($opts['nfc'] || $opts['nfkc']) {
 			if (class_exists('Normalizer', false)) {
-				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', false)) {
+				if (!class_exists('I18N_UnicodeNormalizer', false)) {
 					@ include_once 'I18N/UnicodeNormalizer.php';
 				}
 				if (class_exists('I18N_UnicodeNormalizer', false)) {

Indentation +52 added lines, -52 removed lines

@@ -1,57 +1,57 @@
 <?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,
- * 				'convmap'   => array()
- *			)
- *		),
- *		// 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,
- * 						'convmap'   => array()
- *					)
- *				)
- *			)
- *		)
- *	);
- *
- * @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,
+	 * 				'convmap'   => array()
+	 *			)
+	 *		),
+	 *		// 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,
+	 * 						'convmap'   => array()
+	 *					)
+	 *				)
+	 *			)
+	 *		)
+	 *	);
+	 *
+	 * @package elfinder
+	 * @author Naoki Sawada
+	 * @license New BSD
+	 */
 class elFinderPluginNormalizer
 {
 	private $opts = array();

php/plugins/Sanitizer/plugin.php

Indentation +43 added lines, -43 removed lines

@@ -1,48 +1,48 @@
 <?php
 /**
- * elFinder Plugin Sanitizer
- *
- * Sanitizer of file-name and file-path etc.
- *
- * ex. binding, configure on connector options
- *	$opts = array(
- *		'bind' => array(
- *			'upload.pre mkdir.pre mkfile.pre rename.pre archive.pre' => array(
- *				'Plugin.Sanitizer.cmdPreprocess'
- *			),
- *			'upload.presave' => array(
- *				'Plugin.Sanitizer.onUpLoadPreSave'
- *			)
- *		),
- *		// global configure (optional)
- *		'plugin' => array(
- *			'Sanitizer' => array(
- *				'enable' => true,
- *				'targets'  => array('\\','/',':','*','?','"','<','>','|'), // target chars
- *				'replace'  => '_'    // replace to this
- *			)
- *		),
- *		// each volume configure (optional)
- *		'roots' => array(
- *			array(
- *				'driver' => 'LocalFileSystem',
- *				'path'   => '/path/to/files/',
- *				'URL'    => 'http://localhost/to/files/'
- *				'plugin' => array(
- *					'Sanitizer' => array(
- *						'enable' => true,
- *						'targets'  => array('\\','/',':','*','?','"','<','>','|'), // target chars
- *						'replace'  => '_'    // replace to this
- *					)
- *				)
- *			)
- *		)
- *	);
- *
- * @package elfinder
- * @author Naoki Sawada
- * @license New BSD
- */
+	 * elFinder Plugin Sanitizer
+	 *
+	 * Sanitizer of file-name and file-path etc.
+	 *
+	 * ex. binding, configure on connector options
+	 *	$opts = array(
+	 *		'bind' => array(
+	 *			'upload.pre mkdir.pre mkfile.pre rename.pre archive.pre' => array(
+	 *				'Plugin.Sanitizer.cmdPreprocess'
+	 *			),
+	 *			'upload.presave' => array(
+	 *				'Plugin.Sanitizer.onUpLoadPreSave'
+	 *			)
+	 *		),
+	 *		// global configure (optional)
+	 *		'plugin' => array(
+	 *			'Sanitizer' => array(
+	 *				'enable' => true,
+	 *				'targets'  => array('\\','/',':','*','?','"','<','>','|'), // target chars
+	 *				'replace'  => '_'    // replace to this
+	 *			)
+	 *		),
+	 *		// each volume configure (optional)
+	 *		'roots' => array(
+	 *			array(
+	 *				'driver' => 'LocalFileSystem',
+	 *				'path'   => '/path/to/files/',
+	 *				'URL'    => 'http://localhost/to/files/'
+	 *				'plugin' => array(
+	 *					'Sanitizer' => array(
+	 *						'enable' => true,
+	 *						'targets'  => array('\\','/',':','*','?','"','<','>','|'), // target chars
+	 *						'replace'  => '_'    // replace to this
+	 *					)
+	 *				)
+	 *			)
+	 *		)
+	 *	);
+	 *
+	 * @package elfinder
+	 * @author Naoki Sawada
+	 * @license New BSD
+	 */
 class elFinderPluginSanitizer
 {
 	private $opts = array();

Spacing +6 added lines, -6 removed lines

@@ -49,8 +49,8 @@ 
 	
 	public function __construct($opts) {
 		$defaults = array(
-			'enable'   => true,  // For control by volume driver
-			'targets'  => array('\\','/',':','*','?','"','<','>','|'), // target chars
+			'enable'   => true, // For control by volume driver
+			'targets'  => array('\\', '/', ':', '*', '?', '"', '<', '>', '|'), // target chars
 			'replace'  => '_'    // replace to this
 		);
 	
@@ -59,13 +59,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->sanitizeFileName($name, $opts);
 				}
 			} else {
@@ -77,7 +77,7 @@ 
 
 	public function onUpLoadPreSave(&$path, &$name, $src, $elfinder, $volume) {
 		$opts = $this->getOpts($volume);
-		if (! $opts['enable']) {
+		if (!$opts['enable']) {
 			return false;
 		}
 	
@@ -100,7 +100,7 @@ 
 	}
 	
 	private function sanitizeFileName($filename, $opts, $allows = array()) {
-		$targets = $allows? array_diff($opts['targets'], $allows) : $opts['targets'];
+		$targets = $allows ? array_diff($opts['targets'], $allows) : $opts['targets'];
 		return str_replace($targets, $opts['replace'], $filename);
   	}
 }