JuKu / JuKuCMS

css.php

Spacing +5 added lines, -5 removed lines

@@ -99,7 +99,7 @@ 
 
 //http://blog.franky.ws/php-und-das-caching-via-http-header-etag/
 
-$cache_strategy = Settings::get("css_cache_strategy", "expires_header");//etag / expires
+$cache_strategy = Settings::get("css_cache_strategy", "expires_header"); //etag / expires
 
 //intelligent caching
 if (file_exists($css_cache_path)) {
@@ -114,19 +114,19 @@ 
 		header("Cache-Control: max-age=" . $seconds_to_cache);
 	} else if ($cache_strategy === "etag_header") {
 		//get the last-modified-date of this very file
-		$lastModified=filemtime($css_cache_path);
+		$lastModified = filemtime($css_cache_path);
 
 		//get a unique hash of this file (etag)
 		$etagFile = md5_file($css_cache_path);
 
 		//get the HTTP_IF_MODIFIED_SINCE header if set
-		$ifModifiedSince=(isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? $_SERVER['HTTP_IF_MODIFIED_SINCE'] : false);
+		$ifModifiedSince = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? $_SERVER['HTTP_IF_MODIFIED_SINCE'] : false);
 
 		//get the HTTP_IF_NONE_MATCH header if set (etag: unique file hash)
-		$etagHeader=(isset($_SERVER['HTTP_IF_NONE_MATCH']) ? trim($_SERVER['HTTP_IF_NONE_MATCH']) : false);
+		$etagHeader = (isset($_SERVER['HTTP_IF_NONE_MATCH']) ? trim($_SERVER['HTTP_IF_NONE_MATCH']) : false);
 
 		//set last-modified header
-		header("Last-Modified: ".gmdate("D, d M Y H:i:s", $lastModified)." GMT");
+		header("Last-Modified: " . gmdate("D, d M Y H:i:s", $lastModified) . " GMT");
 
 		//set etag-header
 		header("Etag: $etagFile");

index.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 		header("HTTP/1.1 302 Found");
 	}
 
-	header("Location: " + $domain->getRedirectUrl());
+	header("Location: " +$domain->getRedirectUrl());
 	header("Connection: close");
 
 	exit;

js.php

Spacing +5 added lines, -5 removed lines

@@ -106,7 +106,7 @@ 
 	$js_builder->generateJS($style, $media, $position);
 }
 
-$cache_strategy = Settings::get("js_cache_strategy", "expires_header");//etag / expires
+$cache_strategy = Settings::get("js_cache_strategy", "expires_header"); //etag / expires
 
 //intelligent caching
 if (file_exists($js_cache_path)) {
@@ -121,19 +121,19 @@ 
 		header("Cache-Control: max-age=" . $seconds_to_cache);
 	} else if ($cache_strategy === "etag_header") {
 		//get the last-modified-date of this very file
-		$lastModified=filemtime($js_cache_path);
+		$lastModified = filemtime($js_cache_path);
 
 		//get a unique hash of this file (etag)
 		$etagFile = md5_file($js_cache_path);
 
 		//get the HTTP_IF_MODIFIED_SINCE header if set
-		$ifModifiedSince=(isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? $_SERVER['HTTP_IF_MODIFIED_SINCE'] : false);
+		$ifModifiedSince = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? $_SERVER['HTTP_IF_MODIFIED_SINCE'] : false);
 
 		//get the HTTP_IF_NONE_MATCH header if set (etag: unique file hash)
-		$etagHeader=(isset($_SERVER['HTTP_IF_NONE_MATCH']) ? trim($_SERVER['HTTP_IF_NONE_MATCH']) : false);
+		$etagHeader = (isset($_SERVER['HTTP_IF_NONE_MATCH']) ? trim($_SERVER['HTTP_IF_NONE_MATCH']) : false);
 
 		//set last-modified header
-		header("Last-Modified: ".gmdate("D, d M Y H:i:s", $lastModified)." GMT");
+		header("Last-Modified: " . gmdate("D, d M Y H:i:s", $lastModified) . " GMT");
 
 		//set etag-header
 		header("Etag: $etagFile");

system/packages/com.jukusoft.cms.dwoo/dwoo/lib/Dwoo/Compiler.php

Spacing +116 added lines, -118 removed lines

@@ -294,7 +294,7 @@ 
      */
     public function setNestedCommentsHandling($allow = true)
     {
-        $this->allowNestedComments = (bool)$allow;
+        $this->allowNestedComments = (bool) $allow;
     }
 
     /**
@@ -319,7 +319,7 @@ 
      */
     public function setLooseOpeningHandling($allow = false)
     {
-        $this->allowLooseOpenings = (bool)$allow;
+        $this->allowLooseOpenings = (bool) $allow;
     }
 
     /**
@@ -344,7 +344,7 @@ 
      */
     public function setAutoEscape($enabled)
     {
-        $this->autoEscape = (bool)$enabled;
+        $this->autoEscape = (bool) $enabled;
     }
 
     /**
@@ -759,7 +759,7 @@ 
 
                 // show template source if debug
                 if ($this->debug) {
-                    echo '<pre>'.print_r(htmlentities($tpl), true).'</pre>'."\n";
+                    echo '<pre>' . print_r(htmlentities($tpl), true) . '</pre>' . "\n";
                 }
 
                 // strips php tags if required by the security policy
@@ -870,7 +870,7 @@ 
 
         // build plugin preloader
         foreach ($this->getUsedPlugins() as $plugin => $type) {
-            if ($type & Core::CUSTOM_PLUGIN) {
+            if ($type&Core::CUSTOM_PLUGIN) {
                 continue;
             }
 
@@ -878,41 +878,41 @@ 
                 case Core::CLASS_PLUGIN:
                 case Core::CLASS_PLUGIN + Core::BLOCK_PLUGIN:
                     if (class_exists('Plugin' . $plugin) !== false) {
-                        $output .= "if (class_exists('" . "Plugin" . $plugin . "')===false)".
+                        $output .= "if (class_exists('" . "Plugin" . $plugin . "')===false)" .
                         "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
                     } else {
-                        $output .= "if (class_exists('" . Core::NAMESPACE_PLUGINS_BLOCKS . "Plugin" . $plugin . "')===false)".
+                        $output .= "if (class_exists('" . Core::NAMESPACE_PLUGINS_BLOCKS . "Plugin" . $plugin . "')===false)" .
                         "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
                     }
                     break;
                 case Core::CLASS_PLUGIN + Core::FUNC_PLUGIN:
                     if (class_exists('Plugin' . $plugin) !== false) {
-                        $output .= "if (class_exists('" . "Plugin" . $plugin . "')===false)".
+                        $output .= "if (class_exists('" . "Plugin" . $plugin . "')===false)" .
                             "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
                     } else {
-                        $output .= "if (class_exists('" . Core::NAMESPACE_PLUGINS_FUNCTIONS . "Plugin" . $plugin . "')===false)".
+                        $output .= "if (class_exists('" . Core::NAMESPACE_PLUGINS_FUNCTIONS . "Plugin" . $plugin . "')===false)" .
                             "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
                     }
                     break;
                 case Core::FUNC_PLUGIN:
                     if (function_exists('Plugin' . $plugin) !== false) {
-                        $output .= "if (function_exists('" . "Plugin" . $plugin . "')===false)".
+                        $output .= "if (function_exists('" . "Plugin" . $plugin . "')===false)" .
                         "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
                     } else {
-                        $output .= "if (function_exists('" . Core::NAMESPACE_PLUGINS_FUNCTIONS . "Plugin" . $plugin . "')===false)".
+                        $output .= "if (function_exists('" . Core::NAMESPACE_PLUGINS_FUNCTIONS . "Plugin" . $plugin . "')===false)" .
                         "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
                     }
                     break;
                 case Core::SMARTY_MODIFIER:
-                    $output .= "if (function_exists('smarty_modifier_$plugin')===false)".
+                    $output .= "if (function_exists('smarty_modifier_$plugin')===false)" .
                     "\n\t\$this->getLoader()->loadPlugin('$plugin');\n";
                     break;
                 case Core::SMARTY_FUNCTION:
-                    $output .= "if (function_exists('smarty_function_$plugin')===false)".
+                    $output .= "if (function_exists('smarty_function_$plugin')===false)" .
                     "\n\t\$this->getLoader()->loadPlugin('$plugin');\n";
                     break;
                 case Core::SMARTY_BLOCK:
-                    $output .= "if (function_exists('smarty_block_$plugin')===false)".
+                    $output .= "if (function_exists('smarty_block_$plugin')===false)" .
                     "\n\t\$this->getLoader()->loadPlugin('$plugin');\n";
                     break;
                 case Core::PROXY_PLUGIN:
@@ -1000,14 +1000,14 @@ 
 
         if ($this->curBlock['buffer'] === null && count($this->stack) > 1) {
             // buffer is not initialized yet (the block has just been created)
-            $this->stack[count($this->stack) - 2]['buffer'] .= (string)$content;
+            $this->stack[count($this->stack) - 2]['buffer'] .= (string) $content;
             $this->curBlock['buffer'] = '';
         } else {
             if (!isset($this->curBlock['buffer'])) {
                 throw new CompilationException($this, 'The template has been closed too early, you probably have an extra block-closing tag somewhere');
             }
             // append current content to current block's buffer
-            $this->curBlock['buffer'] .= (string)$content;
+            $this->curBlock['buffer'] .= (string) $content;
         }
         $this->line += $lineCount;
     }
@@ -1086,7 +1086,7 @@ 
         }
         $params = $this->mapParams($params, array($class, 'init'), $paramtype);
 
-        $this->stack[]  = array(
+        $this->stack[] = array(
             'type'   => $type,
             'params' => $params,
             'custom' => false,
@@ -1118,7 +1118,7 @@ 
 
         $params = $this->mapParams($params, array($class, 'init'), $paramtype);
 
-        $this->stack[]  = array(
+        $this->stack[] = array(
             'type'   => $type,
             'params' => $params,
             'custom' => true,
@@ -1147,7 +1147,7 @@ 
         if (class_exists($class) === false) {
             $this->getCore()->getLoader()->loadPlugin($type);
         }
-        $this->stack[]  = array(
+        $this->stack[] = array(
             'type'   => $type,
             'params' => $params,
             'custom' => false,
@@ -1175,7 +1175,7 @@ 
         $output = '';
 
         $pluginType = $this->getPluginType($type);
-        if ($pluginType & Core::SMARTY_BLOCK) {
+        if ($pluginType&Core::SMARTY_BLOCK) {
             $type = 'Smartyinterface';
         }
         while (true) {
@@ -1382,9 +1382,9 @@ 
 
                 return false;
             }
-            ++ $from;
+            ++$from;
             if ($pointer !== null) {
-                ++ $pointer;
+                ++$pointer;
             }
             if ($from >= $to) {
                 if (is_array($parsingParams)) {
@@ -1411,7 +1411,7 @@ 
                     do {
                         $char = substr($src, -- $startpos, 1);
                         if ($char == "\n") {
-                            ++ $startpos;
+                            ++$startpos;
                             $whitespaceStart = true;
                             break;
                         }
@@ -1438,17 +1438,17 @@ 
                         if ($open !== false && $close !== false) {
                             if ($open < $close) {
                                 $ptr = $open + strlen($comOpen);
-                                ++ $level;
+                                ++$level;
                             } else {
                                 $ptr = $close + strlen($comClose);
-                                -- $level;
+                                --$level;
                             }
                         } elseif ($open !== false) {
                             $ptr = $open + strlen($comOpen);
-                            ++ $level;
+                            ++$level;
                         } elseif ($close !== false) {
                             $ptr = $close + strlen($comClose);
-                            -- $level;
+                            --$level;
                         } else {
                             $ptr = strlen($src);
                         }
@@ -1490,7 +1490,7 @@ 
                 echo 'END OF INSTRUCTION' . "\n";
             }
             if ($pointer !== null) {
-                ++ $pointer;
+                ++$pointer;
             }
 
             return $this->parse($in, $from + 1, $to, false, 'root', $pointer);
@@ -1536,7 +1536,7 @@ 
             }
             $len = strlen($match[1]);
             while (substr($in, $from + $len, 1) === ' ') {
-                ++ $len;
+                ++$len;
             }
             if ($pointer !== null) {
                 $pointer += $len;
@@ -1673,7 +1673,7 @@ 
             // parse modifier on funcs or vars
             $srcPointer = $pointer;
             if (is_array($parsingParams)) {
-                $tmp                     = $this->replaceModifiers(
+                $tmp = $this->replaceModifiers(
                     array(
                     null,
                     null,
@@ -1762,7 +1762,7 @@ 
                 if (substr($cmdstr, 0, 2) === 'if' || substr($cmdstr, 0, 6) === 'elseif') {
                     $paramsep = '';
                     if (strlen($match[1][0][0]) > 1) {
-                        -- $paramspos;
+                        --$paramspos;
                     }
                 }
             }
@@ -1814,7 +1814,7 @@ 
                                 }
                                 break 2;
                             } elseif ($paramstr[$ptr] === ';') {
-                                ++ $ptr;
+                                ++$ptr;
                                 if ($this->debug) {
                                     echo 'PARAM PARSING ENDED, ";" FOUND, POINTER AT ' . $ptr . "\n";
                                 }
@@ -1832,7 +1832,7 @@ 
                             }
 
                             if ($paramstr[$ptr] === ' ' || $paramstr[$ptr] === ',' || $paramstr[$ptr] === "\r" || $paramstr[$ptr] === "\n" || $paramstr[$ptr] === "\t") {
-                                ++ $ptr;
+                                ++$ptr;
                             } else {
                                 break;
                             }
@@ -1861,10 +1861,10 @@ 
                     if (is_array($p) && is_array($p[1])) {
                         $state |= 2;
                     } else {
-                        if (($state & 2) && preg_match('#^(["\'])(.+?)\1$#', $p[0], $m) && $func !== 'array') {
+                        if (($state&2) && preg_match('#^(["\'])(.+?)\1$#', $p[0], $m) && $func !== 'array') {
                             $params[$k] = array($m[2], array('true', 'true'));
                         } else {
-                            if ($state & 2 && $func !== 'array') {
+                            if ($state&2 && $func !== 'array') {
                                 throw new CompilationException($this, 'You can not use an unnamed parameter after a named one');
                             }
                             $state |= 1;
@@ -1892,21 +1892,21 @@ 
         }
 
         // Blocks plugin
-        if ($pluginType & Core::BLOCK_PLUGIN) {
+        if ($pluginType&Core::BLOCK_PLUGIN) {
             if ($curBlock !== 'root' || is_array($parsingParams)) {
                 throw new CompilationException($this, 'Block plugins can not be used as other plugin\'s arguments');
             }
-            if ($pluginType & Core::CUSTOM_PLUGIN) {
+            if ($pluginType&Core::CUSTOM_PLUGIN) {
                 return $this->addCustomBlock($func, $params, $state);
             } else {
                 return $this->addBlock($func, $params, $state);
             }
-        } elseif ($pluginType & Core::SMARTY_BLOCK) {
+        } elseif ($pluginType&Core::SMARTY_BLOCK) {
             if ($curBlock !== 'root' || is_array($parsingParams)) {
                 throw new CompilationException($this, 'Block plugins can not be used as other plugin\'s arguments');
             }
 
-            if ($state & 2) {
+            if ($state&2) {
                 array_unshift($params, array('__functype', array($pluginType, $pluginType)));
                 array_unshift($params, array('__funcname', array($func, $func)));
             } else {
@@ -1918,11 +1918,11 @@ 
         }
 
         // Native & Smarty plugins
-        if ($pluginType & Core::NATIVE_PLUGIN || $pluginType & Core::SMARTY_FUNCTION || $pluginType & Core::SMARTY_BLOCK) {
+        if ($pluginType&Core::NATIVE_PLUGIN || $pluginType&Core::SMARTY_FUNCTION || $pluginType&Core::SMARTY_BLOCK) {
             $params = $this->mapParams($params, null, $state);
         } // PHP class plugin
-        elseif ($pluginType & Core::CLASS_PLUGIN) {
-            if ($pluginType & Core::CUSTOM_PLUGIN) {
+        elseif ($pluginType&Core::CLASS_PLUGIN) {
+            if ($pluginType&Core::CUSTOM_PLUGIN) {
                 $params = $this->mapParams(
                     $params, array(
                     $this->customPlugins[$func]['class'],
@@ -1932,49 +1932,47 @@ 
                 if (class_exists('Plugin' . Core::toCamelCase($func)) !== false) {
                     $params = $this->mapParams($params, array(
                         'Plugin' . Core::toCamelCase($func),
-                        ($pluginType & Core::COMPILABLE_PLUGIN) ? 'compile' : 'process'
+                        ($pluginType&Core::COMPILABLE_PLUGIN) ? 'compile' : 'process'
                     ), $state);
                 } elseif (class_exists(Core::NAMESPACE_PLUGINS_HELPERS . 'Plugin' . Core::toCamelCase($func)) !== false) {
                     $params = $this->mapParams($params, array(
                         Core::NAMESPACE_PLUGINS_HELPERS . 'Plugin' . Core::toCamelCase($func),
-                        ($pluginType & Core::COMPILABLE_PLUGIN) ? 'compile' : 'process'
+                        ($pluginType&Core::COMPILABLE_PLUGIN) ? 'compile' : 'process'
                     ), $state);
                 } else {
                     $params = $this->mapParams($params, array(
                         Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin' . Core::toCamelCase($func),
-                        ($pluginType & Core::COMPILABLE_PLUGIN) ? 'compile' : 'process'
+                        ($pluginType&Core::COMPILABLE_PLUGIN) ? 'compile' : 'process'
                     ), $state);
                 }
             }
         } // PHP function plugin
-        elseif ($pluginType & Core::FUNC_PLUGIN) {
-            if ($pluginType & Core::CUSTOM_PLUGIN) {
+        elseif ($pluginType&Core::FUNC_PLUGIN) {
+            if ($pluginType&Core::CUSTOM_PLUGIN) {
                 $params = $this->mapParams($params, $this->customPlugins[$func]['callback'], $state);
             } else {
                 // Custom plugin
-                if (function_exists('Plugin' . Core::toCamelCase($func) . (($pluginType & Core::COMPILABLE_PLUGIN) ?
+                if (function_exists('Plugin' . Core::toCamelCase($func) . (($pluginType&Core::COMPILABLE_PLUGIN) ?
                         'Compile' : '')) !== false) {
-                    $params = $this->mapParams($params, 'Plugin' . Core::toCamelCase($func) . (($pluginType &
+                    $params = $this->mapParams($params, 'Plugin' . Core::toCamelCase($func) . (($pluginType&
                             Core::COMPILABLE_PLUGIN) ? 'Compile' : ''), $state);
                 } // Builtin helper plugin
                 elseif (function_exists(Core::NAMESPACE_PLUGINS_HELPERS . 'Plugin' . Core::toCamelCase($func) . (
-                    ($pluginType & Core::COMPILABLE_PLUGIN) ? 'Compile' : '')) !== false) {
-                    $params = $this->mapParams($params, Core::NAMESPACE_PLUGINS_HELPERS . 'Plugin' . Core::toCamelCase
-                        ($func) . (($pluginType & Core::COMPILABLE_PLUGIN) ? 'Compile' : ''), $state);
+                    ($pluginType&Core::COMPILABLE_PLUGIN) ? 'Compile' : '')) !== false) {
+                    $params = $this->mapParams($params, Core::NAMESPACE_PLUGINS_HELPERS . 'Plugin' . Core::toCamelCase($func) . (($pluginType&Core::COMPILABLE_PLUGIN) ? 'Compile' : ''), $state);
                 } // Builtin function plugin
                 else {
-                    $params = $this->mapParams($params, Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin' . Core::toCamelCase
-                        ($func) . (($pluginType & Core::COMPILABLE_PLUGIN) ? 'Compile' : ''), $state);
+                    $params = $this->mapParams($params, Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin' . Core::toCamelCase($func) . (($pluginType&Core::COMPILABLE_PLUGIN) ? 'Compile' : ''), $state);
                 }
             }
         } // Smarty modifier
-        elseif ($pluginType & Core::SMARTY_MODIFIER) {
+        elseif ($pluginType&Core::SMARTY_MODIFIER) {
             $output = 'smarty_modifier_' . $func . '(' . implode(', ', $params) . ')';
         } // Proxy plugin
-        elseif ($pluginType & Core::PROXY_PLUGIN) {
+        elseif ($pluginType&Core::PROXY_PLUGIN) {
             $params = $this->mapParams($params, $this->getCore()->getPluginProxy()->getCallback($func), $state);
         } // Template plugin
-        elseif ($pluginType & Core::TEMPLATE_PLUGIN) {
+        elseif ($pluginType&Core::TEMPLATE_PLUGIN) {
             // transforms the parameter array from (x=>array('paramname'=>array(values))) to (paramname=>array(values))
             $map = array();
             foreach ($this->templatePlugins[$func]['params'] as $param => $defValue) {
@@ -2005,7 +2003,7 @@ 
         }
 
         // Native plugin
-        if ($pluginType & Core::NATIVE_PLUGIN) {
+        if ($pluginType&Core::NATIVE_PLUGIN) {
             if ($func === 'do') {
                 $output = '';
                 if (isset($params['*'])) {
@@ -2025,9 +2023,9 @@ 
                 }
             }
         } // Block class OR Function class
-        elseif ($pluginType & Core::CLASS_PLUGIN || ($pluginType & Core::FUNC_PLUGIN && $pluginType & Core::CLASS_PLUGIN)) {
-            if ($pluginType & Core::COMPILABLE_PLUGIN) {
-                if ($pluginType & Core::CUSTOM_PLUGIN) {
+        elseif ($pluginType&Core::CLASS_PLUGIN || ($pluginType&Core::FUNC_PLUGIN && $pluginType&Core::CLASS_PLUGIN)) {
+            if ($pluginType&Core::COMPILABLE_PLUGIN) {
+                if ($pluginType&Core::CUSTOM_PLUGIN) {
                     $callback = $this->customPlugins[$func]['callback'];
                     if (!is_array($callback)) {
                         if (!method_exists($callback, 'compile')) {
@@ -2061,7 +2059,7 @@ 
                 $output = call_user_func_array($funcCompiler, $params);
             } else {
                 $params = self::implode_r($params);
-                if ($pluginType & Core::CUSTOM_PLUGIN) {
+                if ($pluginType&Core::CUSTOM_PLUGIN) {
                     $callback = $this->customPlugins[$func]['callback'];
                     if (!is_array($callback)) {
                         if (!method_exists($callback, 'process')) {
@@ -2097,9 +2095,9 @@ 
                 }
             }
         } // Function plugin only (cannot be a class)
-        elseif ($pluginType & Core::FUNC_PLUGIN) {
-            if ($pluginType & Core::COMPILABLE_PLUGIN) {
-                if ($pluginType & Core::CUSTOM_PLUGIN) {
+        elseif ($pluginType&Core::FUNC_PLUGIN) {
+            if ($pluginType&Core::COMPILABLE_PLUGIN) {
+                if ($pluginType&Core::CUSTOM_PLUGIN) {
                     $funcCompiler = $this->customPlugins[$func]['callback'];
                 } else {
                     // Custom plugin
@@ -2124,7 +2122,7 @@ 
             } else {
                 array_unshift($params, '$this');
                 $params = self::implode_r($params);
-                if ($pluginType & Core::CUSTOM_PLUGIN) {
+                if ($pluginType&Core::CUSTOM_PLUGIN) {
                     $callback = $this->customPlugins[$func]['callback'];
                     if ($callback instanceof Closure) {
                         $output = 'call_user_func($this->getCustomPlugin(\'' . $func . '\'), ' . $params . ')';
@@ -2137,7 +2135,7 @@ 
                         $output = 'Plugin' . Core::toCamelCase($func) . '(' . $params .
                             ')';
                     } // Builtin helper plugin
-                    elseif(function_exists(Core::NAMESPACE_PLUGINS_HELPERS . 'Plugin' . Core::toCamelCase($func)) !==
+                    elseif (function_exists(Core::NAMESPACE_PLUGINS_HELPERS . 'Plugin' . Core::toCamelCase($func)) !==
                         false) {
                         $output = Core::NAMESPACE_PLUGINS_HELPERS . 'Plugin' . Core::toCamelCase($func) . '(' .
                             $params . ')';
@@ -2149,16 +2147,16 @@ 
                 }
             }
         } // Proxy plugin
-        elseif ($pluginType & Core::PROXY_PLUGIN) {
+        elseif ($pluginType&Core::PROXY_PLUGIN) {
             $output = call_user_func(array($this->getCore()->getPluginProxy(), 'getCode'), $func, $params);
         } // Smarty function (@deprecated)
-        elseif ($pluginType & Core::SMARTY_FUNCTION) {
+        elseif ($pluginType&Core::SMARTY_FUNCTION) {
             $params = '';
             if (isset($params['*'])) {
                 $params = self::implode_r($params['*'], true);
             }
 
-            if ($pluginType & Core::CUSTOM_PLUGIN) {
+            if ($pluginType&Core::CUSTOM_PLUGIN) {
                 $callback = $this->customPlugins[$func]['callback'];
                 if (is_array($callback)) {
                     if (is_object($callback[0])) {
@@ -2173,7 +2171,7 @@ 
                 $output = 'smarty_function_' . $func . '(array(' . $params . '), $this)';
             }
         } // Template plugin
-        elseif ($pluginType & Core::TEMPLATE_PLUGIN) {
+        elseif ($pluginType&Core::TEMPLATE_PLUGIN) {
             array_unshift($params, '$this');
             $params                                 = self::implode_r($params);
             $output                                 = 'Plugin' . Core::toCamelCase($func) .
@@ -2380,7 +2378,7 @@ 
 
             if (substr($key, - 1) == '.') {
                 $key = substr($key, 0, - 1);
-                -- $matchedLength;
+                --$matchedLength;
             }
 
             if ($hasMethodCall) {
@@ -2415,7 +2413,7 @@ 
                 $uid           = 0;
                 $parsed        = array($uid => '');
                 $current       = &$parsed;
-                $curTxt        = &$parsed[$uid ++];
+                $curTxt        = &$parsed[$uid++];
                 $tree          = array();
                 $chars         = str_split($key, 1);
                 $inSplittedVar = false;
@@ -2424,33 +2422,33 @@ 
                 while (($char = array_shift($chars)) !== null) {
                     if ($char === '[') {
                         if (count($tree) > 0) {
-                            ++ $bracketCount;
+                            ++$bracketCount;
                         } else {
                             $tree[]        = &$current;
                             $current[$uid] = array($uid + 1 => '');
-                            $current       = &$current[$uid ++];
-                            $curTxt        = &$current[$uid ++];
+                            $current       = &$current[$uid++];
+                            $curTxt        = &$current[$uid++];
                             continue;
                         }
                     } elseif ($char === ']') {
                         if ($bracketCount > 0) {
-                            -- $bracketCount;
+                            --$bracketCount;
                         } else {
                             $current = &$tree[count($tree) - 1];
                             array_pop($tree);
                             if (current($chars) !== '[' && current($chars) !== false && current($chars) !== ']') {
                                 $current[$uid] = '';
-                                $curTxt        = &$current[$uid ++];
+                                $curTxt        = &$current[$uid++];
                             }
                             continue;
                         }
                     } elseif ($char === '$') {
                         if (count($tree) == 0) {
-                            $curTxt        = &$current[$uid ++];
+                            $curTxt        = &$current[$uid++];
                             $inSplittedVar = true;
                         }
                     } elseif (($char === '.' || $char === '-') && count($tree) == 0 && $inSplittedVar) {
-                        $curTxt        = &$current[$uid ++];
+                        $curTxt        = &$current[$uid++];
                         $inSplittedVar = false;
                     }
 
@@ -2703,7 +2701,7 @@ 
                     $parentCnt = 0;
 
                     while (true) {
-                        ++ $parentCnt;
+                        ++$parentCnt;
                         array_shift($m[2]);
                         array_shift($m[1]);
                         if (current($m[2]) === '_parent') {
@@ -2785,7 +2783,7 @@ 
                         echo 'PARSING SUBVARS IN : ' . $key . "\n";
                     }
                     if ($cnt > 0) {
-                        while (-- $cnt >= 0) {
+                        while (--$cnt >= 0) {
                             if (isset($last)) {
                                 $last = strrpos($key, '$', - (strlen($key) - $last + 1));
                             } else {
@@ -2940,9 +2938,9 @@ 
             $substr = 'null';
             $type   = self::T_NULL;
         } elseif (is_numeric($substr)) {
-            $substr = (float)$substr;
-            if ((int)$substr == $substr) {
-                $substr = (int)$substr;
+            $substr = (float) $substr;
+            if ((int) $substr == $substr) {
+                $substr = (int) $substr;
             }
             $type = self::T_NUMERIC;
             if ($this->debug) {
@@ -3000,7 +2998,7 @@ 
         while (($pos = strpos($string, '$', $pos)) !== false) {
             $prev = substr($string, $pos - 1, 1);
             if ($prev === '\\') {
-                ++ $pos;
+                ++$pos;
                 continue;
             }
 
@@ -3135,11 +3133,11 @@ 
                                 $pointer -= strlen($paramstr) - $ptr;
                             }
                         }
-                        ++ $ptr;
+                        ++$ptr;
                         break;
                     }
                     if ($ptr < strlen($paramstr) && $paramstr[$ptr] === ':') {
-                        ++ $ptr;
+                        ++$ptr;
                     }
                 }
                 $cmdstrsrc = substr($cmdstrsrc, strlen($func) + 1 + $ptr);
@@ -3147,10 +3145,10 @@ 
                     if (is_array($p) && is_array($p[1])) {
                         $state |= 2;
                     } else {
-                        if (($state & 2) && preg_match('#^(["\'])(.+?)\1$#', $p[0], $m)) {
+                        if (($state&2) && preg_match('#^(["\'])(.+?)\1$#', $p[0], $m)) {
                             $params[$k] = array($m[2], array('true', 'true'));
                         } else {
-                            if ($state & 2) {
+                            if ($state&2) {
                                 throw new CompilationException($this, 'You can not use an unnamed parameter after a named one');
                             }
                             $state |= 1;
@@ -3168,13 +3166,13 @@ 
 
             $pluginType = $this->getPluginType($func);
 
-            if ($state & 2) {
+            if ($state&2) {
                 array_unshift($params, array('value', is_array($output) ? $output : array($output, $output)));
             } else {
                 array_unshift($params, is_array($output) ? $output : array($output, $output));
             }
 
-            if ($pluginType & Core::NATIVE_PLUGIN) {
+            if ($pluginType&Core::NATIVE_PLUGIN) {
                 $params = $this->mapParams($params, null, $state);
 
                 $params = $params['*'][0];
@@ -3186,19 +3184,19 @@ 
                 } else {
                     $output = $func . '(' . $params . ')';
                 }
-            } elseif ($pluginType & Core::PROXY_PLUGIN) {
+            } elseif ($pluginType&Core::PROXY_PLUGIN) {
                 $params = $this->mapParams($params, $this->getCore()->getPluginProxy()->getCallback($func), $state);
                 foreach ($params as &$p) {
                     $p = $p[0];
                 }
                 $output = call_user_func(array($this->getCore()->getPluginProxy(), 'getCode'), $func, $params);
-            } elseif ($pluginType & Core::SMARTY_MODIFIER) {
+            } elseif ($pluginType&Core::SMARTY_MODIFIER) {
                 $params = $this->mapParams($params, null, $state);
                 $params = $params['*'][0];
 
                 $params = self::implode_r($params);
 
-                if ($pluginType & Core::CUSTOM_PLUGIN) {
+                if ($pluginType&Core::CUSTOM_PLUGIN) {
                     $callback = $this->customPlugins[$func]['callback'];
                     if (is_array($callback)) {
                         if (is_object($callback[0])) {
@@ -3217,24 +3215,24 @@ 
                     $output = 'smarty_modifier_' . $func . '(' . $params . ')';
                 }
             } else {
-                if ($pluginType & Core::CUSTOM_PLUGIN) {
+                if ($pluginType&Core::CUSTOM_PLUGIN) {
                     $pluginName = $callback = $this->customPlugins[$func]['callback'];
-                    if (($pluginType & Core::CLASS_PLUGIN) && !is_array($callback)) {
+                    if (($pluginType&Core::CLASS_PLUGIN) && !is_array($callback)) {
                         $pluginName = $this->customPlugins[$func]['callback'];
-                        $callback   = array($pluginName, ($pluginType & Core::COMPILABLE_PLUGIN) ? 'compile' : 'process');
+                        $callback   = array($pluginName, ($pluginType&Core::COMPILABLE_PLUGIN) ? 'compile' : 'process');
                     }
                 } else {
                     if (class_exists('Plugin' . Core::toCamelCase($func)) !== false || function_exists('Plugin' .
-                            Core::toCamelCase($func) . (($pluginType & Core::COMPILABLE_PLUGIN) ? 'Compile' : ''))
+                            Core::toCamelCase($func) . (($pluginType&Core::COMPILABLE_PLUGIN) ? 'Compile' : ''))
                         !== false) {
                         $pluginName = 'Plugin' . Core::toCamelCase($func);
                     } else {
                         $pluginName = Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin' . Core::toCamelCase($func);
                     }
-                    if ($pluginType & Core::CLASS_PLUGIN) {
-                        $callback = array($pluginName, ($pluginType & Core::COMPILABLE_PLUGIN) ? 'compile' : 'process');
+                    if ($pluginType&Core::CLASS_PLUGIN) {
+                        $callback = array($pluginName, ($pluginType&Core::COMPILABLE_PLUGIN) ? 'compile' : 'process');
                     } else {
-                        $callback = $pluginName . (($pluginType & Core::COMPILABLE_PLUGIN) ? 'Compile' : '');
+                        $callback = $pluginName . (($pluginType&Core::COMPILABLE_PLUGIN) ? 'Compile' : '');
                     }
                 }
                 $params = $this->mapParams($params, $callback, $state);
@@ -3244,12 +3242,12 @@ 
                 }
 
                 // Only for PHP function, who is not a PHP class
-                if ($pluginType & Core::FUNC_PLUGIN && !($pluginType & Core::CLASS_PLUGIN)) {
-                    if ($pluginType & Core::COMPILABLE_PLUGIN) {
+                if ($pluginType&Core::FUNC_PLUGIN && !($pluginType&Core::CLASS_PLUGIN)) {
+                    if ($pluginType&Core::COMPILABLE_PLUGIN) {
                         if ($mapped) {
                             throw new CompilationException($this, 'The @ operator can not be used on compiled plugins.');
                         }
-                        if ($pluginType & Core::CUSTOM_PLUGIN) {
+                        if ($pluginType&Core::CUSTOM_PLUGIN) {
                             $funcCompiler = $this->customPlugins[$func]['callback'];
                         } else {
                             if (function_exists('Plugin' . Core::toCamelCase($func) . 'Compile') !== false) {
@@ -3272,11 +3270,11 @@ 
                         }
                     }
                 } else {
-                    if ($pluginType & Core::COMPILABLE_PLUGIN) {
+                    if ($pluginType&Core::COMPILABLE_PLUGIN) {
                         if ($mapped) {
                             throw new CompilationException($this, 'The @ operator can not be used on compiled plugins.');
                         }
-                        if ($pluginType & Core::CUSTOM_PLUGIN) {
+                        if ($pluginType&Core::CUSTOM_PLUGIN) {
                             $callback = $this->customPlugins[$func]['callback'];
                             if (!is_array($callback)) {
                                 if (!method_exists($callback, 'compile')) {
@@ -3302,7 +3300,7 @@ 
                     } else {
                         $params = self::implode_r($params);
 
-                        if ($pluginType & Core::CUSTOM_PLUGIN) {
+                        if ($pluginType&Core::CUSTOM_PLUGIN) {
                             if (is_object($callback[0])) {
                                 if (is_array($this->getCore()->getCustomPlugin($func))) {
                                     $output = ($mapped ? '$this->arrayMap' : 'call_user_func_array') . '(array($this->plugins[\'' . $func . '\'][\'callback\'][0], \'' . $callback[1] . '\'), array(' . $params . '))';
@@ -3313,7 +3311,7 @@ 
                                 $output = ($mapped ? '$this->arrayMap' : 'call_user_func_array') . '(array(\'' . $callback[0] . '\', \'' . $callback[1] . '\'), array(' . $params . '))';
                             }
                         } elseif ($mapped) {
-                            $output = '$this->arrayMap(array($this->getObjectPlugin(\''.
+                            $output = '$this->arrayMap(array($this->getObjectPlugin(\'' .
                                 Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin' . Core::toCamelCase($func) . '\'), 
                             \'process\'), array(' . $params . '))';
                         } else {
@@ -3397,10 +3395,10 @@ 
         while ($pluginType <= 0) {
             // Template plugin compilable
             if (isset($this->templatePlugins[$name])) {
-                $pluginType = Core::TEMPLATE_PLUGIN | Core::COMPILABLE_PLUGIN;
+                $pluginType = Core::TEMPLATE_PLUGIN|Core::COMPILABLE_PLUGIN;
             } // Custom plugin
             elseif (isset($this->customPlugins[$name])) {
-                $pluginType = $this->customPlugins[$name]['type'] | Core::CUSTOM_PLUGIN;
+                $pluginType = $this->customPlugins[$name]['type']|Core::CUSTOM_PLUGIN;
             } // Class blocks plugin
             elseif (class_exists(Core::NAMESPACE_PLUGINS_BLOCKS . 'Plugin' . Core::toCamelCase($name)) !== false) {
                 $pluginType = Core::CLASS_PLUGIN;
@@ -3426,20 +3424,20 @@ 
                     $pluginType |= Core::COMPILABLE_PLUGIN;
                 }
             } // Function plugin (with/without namespaces)
-            elseif (function_exists(Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin' . Core::toCamelCase ($name)) !==
+            elseif (function_exists(Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin' . Core::toCamelCase($name)) !==
                 false || function_exists('Plugin' . Core::toCamelCase($name)) !== false) {
                 $pluginType = Core::FUNC_PLUGIN;
             } // Function plugin compile (with/without namespaces)
             elseif (function_exists(Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin' . Core::toCamelCase($name) .
                     'Compile') !== false || function_exists('Plugin' . Core::toCamelCase($name) . 'Compile') !==
                 false) {
-                $pluginType = Core::FUNC_PLUGIN | Core::COMPILABLE_PLUGIN;
+                $pluginType = Core::FUNC_PLUGIN|Core::COMPILABLE_PLUGIN;
             } // Helper plugin class compile
             elseif (class_exists(Core::NAMESPACE_PLUGINS_HELPERS . 'Plugin' . Core::toCamelCase($name)) !== false) {
-                $pluginType = Core::CLASS_PLUGIN | Core::COMPILABLE_PLUGIN;
+                $pluginType = Core::CLASS_PLUGIN|Core::COMPILABLE_PLUGIN;
             } // Helper plugin function compile
             elseif (function_exists(Core::NAMESPACE_PLUGINS_HELPERS . 'Plugin' . Core::toCamelCase($name) . 'Compile') !== false) {
-                $pluginType = Core::FUNC_PLUGIN | Core::COMPILABLE_PLUGIN;
+                $pluginType = Core::FUNC_PLUGIN|Core::COMPILABLE_PLUGIN;
             } // Smarty modifier
             elseif (function_exists('smarty_modifier_' . $name) !== false) {
                 $pluginType = Core::SMARTY_MODIFIER;
@@ -3468,11 +3466,11 @@ 
                 } else {
                     throw new Exception('Plugin "' . $name . '" could not be found, type:' . $pluginType);
                 }
-                ++ $pluginType;
+                ++$pluginType;
             }
         }
 
-        if (($pluginType & Core::COMPILABLE_PLUGIN) === 0 && ($pluginType & Core::NATIVE_PLUGIN) === 0 && ($pluginType & Core::PROXY_PLUGIN) === 0) {
+        if (($pluginType&Core::COMPILABLE_PLUGIN) === 0 && ($pluginType&Core::NATIVE_PLUGIN) === 0 && ($pluginType&Core::PROXY_PLUGIN) === 0) {
             $this->addUsedPlugin(Core::toCamelCase($name), $pluginType);
         }
 
@@ -3537,7 +3535,7 @@ 
         }
 
         // loops over the param map and assigns values from the template or default value for unset optional params
-        foreach ($map as $k => $v){
+        foreach ($map as $k => $v) {
             if ($v[0] === '*') {
                 // "rest" array parameter, fill every remaining params in it and then break
                 if (count($ps) === 0) {

system/packages/com.jukusoft.cms.dwoo/dwoo/lib/Dwoo/Data.php

Spacing +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
     {
         if (is_array($name)) {
             reset($name);
-            foreach ($name as $k => $v){
+            foreach ($name as $k => $v) {
                 $this->data[$k] = $v;
             }
         } else {

system/packages/com.jukusoft.cms.dwoo/dwoo/lib/Dwoo/Template/Str.php

Spacing +1 added lines, -1 removed lines

@@ -512,7 +512,7 @@
         }
 
         $retries = 3;
-        while ($retries --) {
+        while ($retries--) {
             @mkdir($path, $chmod, true);
             if (is_dir($path)) {
                 break;

system/packages/com.jukusoft.cms.dwoo/dwoo/lib/Dwoo/Template/File.php

Spacing +2 added lines, -2 removed lines

@@ -111,7 +111,7 @@ 
      */
     protected function isValidCompiledFile($file)
     {
-        return parent::isValidCompiledFile($file) && (int)$this->getUid() <= filemtime($file);
+        return parent::isValidCompiledFile($file) && (int) $this->getUid() <= filemtime($file);
     }
 
     /**
@@ -166,7 +166,7 @@ 
      */
     public function getUid()
     {
-        return (string)filemtime($this->getResourceIdentifier());
+        return (string) filemtime($this->getResourceIdentifier());
     }
 
     /**

system/packages/com.jukusoft.cms.dwoo/dwoo/lib/Dwoo/Loader.php

Spacing +1 added lines, -1 removed lines

@@ -169,7 +169,7 @@
             throw new Exception('Plugin directory does not exist or can not be read : ' . $pluginDirectory);
         }
         $cacheFile = $this->cacheDir . 'classpath-' . substr(strtr($pluginDir, '/\\:' . PATH_SEPARATOR, '----'),
-                strlen($pluginDir) > 80 ? - 80 : 0) . '.d' . Core::RELEASE_TAG . '.php';
+                strlen($pluginDir) > 80 ? -80 : 0) . '.d' . Core::RELEASE_TAG . '.php';
         $this->paths[$pluginDir] = $cacheFile;
         if (file_exists($cacheFile)) {
             $classpath       = file_get_contents($cacheFile);

system/packages/com.jukusoft.cms.dwoo/dwoo/lib/Dwoo/Core.php

Spacing +14 added lines, -14 removed lines

@@ -500,13 +500,13 @@ 
         if (is_array($callback)) {
             if (is_subclass_of(is_object($callback[0]) ? get_class($callback[0]) : $callback[0], 'Dwoo\Block\Plugin')) {
                 $this->plugins[$name] = array(
-                    'type'     => self::BLOCK_PLUGIN | $compilable,
+                    'type'     => self::BLOCK_PLUGIN|$compilable,
                     'callback' => $callback,
                     'class'    => (is_object($callback[0]) ? get_class($callback[0]) : $callback[0])
                 );
             } else {
                 $this->plugins[$name] = array(
-                    'type'     => self::CLASS_PLUGIN | $compilable,
+                    'type'     => self::CLASS_PLUGIN|$compilable,
                     'callback' => $callback,
                     'class'    => (is_object($callback[0]) ? get_class($callback[0]) : $callback[0]),
                     'function' => $callback[1]
@@ -516,13 +516,13 @@ 
             if (class_exists($callback)) {
                 if (is_subclass_of($callback, 'Dwoo\Block\Plugin')) {
                     $this->plugins[$name] = array(
-                        'type'     => self::BLOCK_PLUGIN | $compilable,
+                        'type'     => self::BLOCK_PLUGIN|$compilable,
                         'callback' => $callback,
                         'class'    => $callback
                     );
                 } else {
                     $this->plugins[$name] = array(
-                        'type'     => self::CLASS_PLUGIN | $compilable,
+                        'type'     => self::CLASS_PLUGIN|$compilable,
                         'callback' => $callback,
                         'class'    => $callback,
                         'function' => ($compilable ? 'compile' : 'process')
@@ -530,7 +530,7 @@ 
                 }
             } elseif (function_exists($callback)) {
                 $this->plugins[$name] = array(
-                    'type'     => self::FUNC_PLUGIN | $compilable,
+                    'type'     => self::FUNC_PLUGIN|$compilable,
                     'callback' => $callback
                 );
             } else {
@@ -538,19 +538,19 @@ 
             }
         } elseif ($callback instanceof Closure) {
             $this->plugins[$name] = array(
-                'type'     => self::FUNC_PLUGIN | $compilable,
+                'type'     => self::FUNC_PLUGIN|$compilable,
                 'callback' => $callback
             );
         } elseif (is_object($callback)) {
             if (is_subclass_of($callback, 'Dwoo\Block\Plugin')) {
                 $this->plugins[$name] = array(
-                    'type'     => self::BLOCK_PLUGIN | $compilable,
+                    'type'     => self::BLOCK_PLUGIN|$compilable,
                     'callback' => get_class($callback),
                     'class'    => $callback
                 );
             } else {
                 $this->plugins[$name] = array(
-                    'type'     => self::CLASS_PLUGIN | $compilable,
+                    'type'     => self::CLASS_PLUGIN|$compilable,
                     'callback' => $callback,
                     'class'    => $callback,
                     'function' => ($compilable ? 'compile' : 'process')
@@ -625,7 +625,7 @@ 
      */
     public function removeFilter($callback)
     {
-        if (($index = array_search(self::NAMESPACE_PLUGINS_FILTERS. 'Filter' . self::toCamelCase($callback), $this->filters,
+        if (($index = array_search(self::NAMESPACE_PLUGINS_FILTERS . 'Filter' . self::toCamelCase($callback), $this->filters,
                 true)) !==
             false) {
             unset($this->filters[$index]);
@@ -859,7 +859,7 @@ 
      */
     public function setCacheTime($seconds)
     {
-        $this->cacheTime = (int)$seconds;
+        $this->cacheTime = (int) $seconds;
     }
 
     /**
@@ -883,7 +883,7 @@ 
      */
     public function setCharset($charset)
     {
-        $this->charset = strtolower((string)$charset);
+        $this->charset = strtolower((string) $charset);
     }
 
     /**
@@ -1024,7 +1024,7 @@ 
         $count    = 0;
         foreach ($iterator as $file) {
             if ($file->isFile() && $file->getCTime() < $expired) {
-                $count += unlink((string)$file) ? 1 : 0;
+                $count += unlink((string) $file) ? 1 : 0;
             }
         }
 
@@ -1254,7 +1254,7 @@ 
         if (isset($this->plugins[$type])) {
             $type = $this->plugins[$type]['class'];
         } else {
-            $type = self::NAMESPACE_PLUGINS_BLOCKS . 'Plugin_' . str_replace(self::NAMESPACE_PLUGINS_BLOCKS.'Plugin',
+            $type = self::NAMESPACE_PLUGINS_BLOCKS . 'Plugin_' . str_replace(self::NAMESPACE_PLUGINS_BLOCKS . 'Plugin',
                     '', $type);
         }
 
@@ -1447,7 +1447,7 @@ 
         $tree = $this->scopeTree;
         $cur  = $this->data;
 
-        while ($parentLevels -- !== 0) {
+        while ($parentLevels-- !== 0) {
             array_pop($tree);
         }