Studio-42 / elFinder

php/plugins/Normalizer/plugin.php

Spacing +6 added lines, -6 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,7 +67,7 @@ 
 	
 	public function cmdPreprocess($cmd, &$args, $elfinder, $volume) {
 		$opts = $this->getOpts($volume);
-		if (! $opts['enable']) {
+		if (!$opts['enable']) {
 			return false;
 		}
 		
@@ -79,7 +79,7 @@ 
 	
 	public function onUpLoadPreSave(&$path, &$name, $src, $elfinder, $volume) {
 		$opts = $this->getOpts($volume);
-		if (! $opts['enable']) {
+		if (!$opts['enable']) {
 			return false;
 		}
 		
@@ -104,12 +104,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')) {

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