dwoo-project / dwoo

lib/Dwoo/Plugins/Blocks/PluginWithelse.php

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
         }
 
         $block                      = &$compiler->getCurrentBlock();
-        $block['params']['hasElse'] = Compiler::PHP_OPEN . "else {\n" . Compiler::PHP_CLOSE . $content . Compiler::PHP_OPEN . "\n}" . Compiler::PHP_CLOSE;
+        $block['params']['hasElse'] = Compiler::PHP_OPEN."else {\n".Compiler::PHP_CLOSE.$content.Compiler::PHP_OPEN."\n}".Compiler::PHP_CLOSE;
 
         return '';
     }

lib/Dwoo/Plugins/Blocks/PluginForelse.php

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
         }
 
         $block                      = &$compiler->getCurrentBlock();
-        $block['params']['hasElse'] = Compiler::PHP_OPEN . "else {\n" . Compiler::PHP_CLOSE . $content . Compiler::PHP_OPEN . "\n}" . Compiler::PHP_CLOSE;
+        $block['params']['hasElse'] = Compiler::PHP_OPEN."else {\n".Compiler::PHP_CLOSE.$content.Compiler::PHP_OPEN."\n}".Compiler::PHP_CLOSE;
 
         return '';
     }

lib/Dwoo/Plugins/Blocks/PluginForeachelse.php

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
         }
 
         $block                      = &$compiler->getCurrentBlock();
-        $block['params']['hasElse'] = Compiler::PHP_OPEN . "else {\n" . Compiler::PHP_CLOSE . $content . Compiler::PHP_OPEN . "\n}" . Compiler::PHP_CLOSE;
+        $block['params']['hasElse'] = Compiler::PHP_OPEN."else {\n".Compiler::PHP_CLOSE.$content.Compiler::PHP_OPEN."\n}".Compiler::PHP_CLOSE;
 
         return '';
     }

lib/Dwoo/Plugins/Functions/PluginExtendsCheckCompile.php

Spacing +9 added lines, -9 removed lines

@@ -48,9 +48,9 @@ 
     $tpl = $compiler->getDwoo()->templateFactory($resource, $identifier);
 
     if ($tpl === null) {
-        throw new CompilationException($compiler, 'Load Templates : Resource "' . $resource . ':' . $identifier . '" not found.');
+        throw new CompilationException($compiler, 'Load Templates : Resource "'.$resource.':'.$identifier.'" not found.');
     } elseif ($tpl === false) {
-        throw new CompilationException($compiler, 'Load Templates : Resource "' . $resource . '" does not support includes.');
+        throw new CompilationException($compiler, 'Load Templates : Resource "'.$resource.'" does not support includes.');
     }
 
     $cmp = clone $compiler;
@@ -62,23 +62,23 @@ 
         $compiler->addUsedPlugin($plugin, $type);
     }
 
-    $out = '\'\';// checking for modification in ' . $resource . ':' . $identifier . "\r\n";
+    $out = '\'\';// checking for modification in '.$resource.':'.$identifier."\r\n";
 
     $modCheck = $tpl->getIsModifiedCode();
 
     if ($modCheck) {
-        $out .= 'if (!(' . $modCheck . ')) { ob_end_clean(); return false; }';
+        $out .= 'if (!('.$modCheck.')) { ob_end_clean(); return false; }';
     } else {
         $out .= 'try {
-	$tpl = $this->templateFactory("' . $resource . '", "' . $identifier . '");
+	$tpl = $this->templateFactory("' . $resource.'", "'.$identifier.'");
 } catch (Dwoo\Exception $e) {
-	$this->triggerError(\'Load Templates : Resource <em>' . $resource . '</em> was not added to Dwoo, can not extend <em>' . $identifier . '</em>\', E_USER_WARNING);
+	$this->triggerError(\'Load Templates : Resource <em>' . $resource.'</em> was not added to Dwoo, can not extend <em>'.$identifier.'</em>\', E_USER_WARNING);
 }
 if ($tpl === null)
-	$this->triggerError(\'Load Templates : Resource "' . $resource . ':' . $identifier . '" was not found.\', E_USER_WARNING);
+	$this->triggerError(\'Load Templates : Resource "' . $resource.':'.$identifier.'" was not found.\', E_USER_WARNING);
 elseif ($tpl === false)
-	$this->triggerError(\'Load Templates : Resource "' . $resource . '" does not support extends.\', E_USER_WARNING);
-if ($tpl->getUid() != "' . $tpl->getUid() . '") { ob_end_clean(); return false; }';
+	$this->triggerError(\'Load Templates : Resource "' . $resource.'" does not support extends.\', E_USER_WARNING);
+if ($tpl->getUid() != "' . $tpl->getUid().'") { ob_end_clean(); return false; }';
     }
 
     return $out;

lib/Dwoo/Plugins/Functions/PluginMailto.php

Spacing +17 added lines, -17 removed lines

@@ -47,19 +47,19 @@ 
     $address .= '?';
 
     if (!empty($subject)) {
-        $address .= 'subject=' . rawurlencode($subject) . '&';
+        $address .= 'subject='.rawurlencode($subject).'&';
     }
     if (!empty($cc)) {
-        $address .= 'cc=' . rawurlencode($cc) . '&';
+        $address .= 'cc='.rawurlencode($cc).'&';
     }
     if (!empty($bcc)) {
-        $address .= 'bcc=' . rawurlencode($bcc) . '&';
+        $address .= 'bcc='.rawurlencode($bcc).'&';
     }
     if (!empty($newsgroups)) {
-        $address .= 'newsgroups=' . rawurlencode($newsgroups) . '&';
+        $address .= 'newsgroups='.rawurlencode($newsgroups).'&';
     }
     if (!empty($followupto)) {
-        $address .= 'followupto=' . rawurlencode($followupto) . '&';
+        $address .= 'followupto='.rawurlencode($followupto).'&';
     }
 
     $address = rtrim($address, '?&');
@@ -69,34 +69,34 @@ 
 
         case 'none':
         case null:
-            return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
+            return '<a href="mailto:'.$address.'" '.$extra.'>'.$text.'</a>';
 
         case 'js':
         case 'javascript':
-            $str = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
+            $str = 'document.write(\'<a href="mailto:'.$address.'" '.$extra.'>'.$text.'</a>\');';
             $len = strlen($str);
 
             $out = '';
             for ($i = 0; $i < $len; ++ $i) {
-                $out .= '%' . bin2hex($str[$i]);
+                $out .= '%'.bin2hex($str[$i]);
             }
 
-            return '<script type="text/javascript">eval(unescape(\'' . $out . '\'));</script>';
+            return '<script type="text/javascript">eval(unescape(\''.$out.'\'));</script>';
 
             break;
         case 'javascript_charcode':
         case 'js_charcode':
         case 'jscharcode':
         case 'jschar':
-            $str = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
+            $str = '<a href="mailto:'.$address.'" '.$extra.'>'.$text.'</a>';
             $len = strlen($str);
 
-            $out = '<script type="text/javascript">' . "\n<!--\ndocument.write(Str.fromCharCode(";
+            $out = '<script type="text/javascript">'."\n<!--\ndocument.write(Str.fromCharCode(";
             for ($i = 0; $i < $len; ++ $i) {
-                $out .= ord($str[$i]) . ',';
+                $out .= ord($str[$i]).',';
             }
 
-            return rtrim($out, ',') . "));\n-->\n</script>\n";
+            return rtrim($out, ',')."));\n-->\n</script>\n";
 
             break;
 
@@ -109,18 +109,18 @@ 
             $len = strlen($address);
             for ($i = 0; $i < $len; ++ $i) {
                 if (preg_match('#\w#', $address[$i])) {
-                    $out .= '%' . bin2hex($address[$i]);
+                    $out .= '%'.bin2hex($address[$i]);
                 } else {
                     $out .= $address[$i];
                 }
             }
-            $out .= '" ' . $extra . '>';
+            $out .= '" '.$extra.'>';
             $len = strlen($text);
             for ($i = 0; $i < $len; ++ $i) {
-                $out .= '&#x' . bin2hex($text[$i]);
+                $out .= '&#x'.bin2hex($text[$i]);
             }
 
-            return $out . '</a>';
+            return $out.'</a>';
 
         default:
             $dwoo->triggerError('Mailto: <em>encode</em> argument is invalid, it must be one of : <em>none (= no value), js, js_charcode or hex</em>', E_USER_WARNING);

lib/Dwoo/Template/Str.php

Spacing +13 added lines, -13 removed lines

@@ -124,11 +124,11 @@ 
         $this->cacheTime = $cacheTime;
 
         if ($compileId !== null) {
-            $this->compileId = str_replace('../', '__', strtr($compileId, '\\%?=!:;' . PATH_SEPARATOR, '/-------'));
+            $this->compileId = str_replace('../', '__', strtr($compileId, '\\%?=!:;'.PATH_SEPARATOR, '/-------'));
         }
 
         if ($cacheId !== null) {
-            $this->cacheId = str_replace('../', '__', strtr($cacheId, '\\%?=!:;' . PATH_SEPARATOR, '/-------'));
+            $this->cacheId = str_replace('../', '__', strtr($cacheId, '\\%?=!:;'.PATH_SEPARATOR, '/-------'));
         }
     }
 
@@ -276,7 +276,7 @@ 
         if (isset(self::$cache['cached'][$this->cacheId]) === true && file_exists($cachedFile)) {
             // already checked, return cache file
             return $cachedFile;
-        } elseif ($this->compilationEnforced !== true && file_exists($cachedFile) && ($cacheLength === - 1 || filemtime($cachedFile) > ($_SERVER['REQUEST_TIME'] - $cacheLength)) && $this->isValidCompiledFile($this->getCompiledFilename($core))) {
+        } elseif ($this->compilationEnforced !== true && file_exists($cachedFile) && ($cacheLength === - 1 || filemtime($cachedFile) > ($_SERVER['REQUEST_TIME']-$cacheLength)) && $this->isValidCompiledFile($this->getCompiledFilename($core))) {
             // cache is still valid and can be loaded
             self::$cache['cached'][$this->cacheId] = true;
 
@@ -304,9 +304,9 @@ 
         // thanks for his help on avoiding concurency issues
         $temp = tempnam($cacheDir, 'temp');
         if (!($file = @fopen($temp, 'wb'))) {
-            $temp = $cacheDir . uniqid('temp');
+            $temp = $cacheDir.uniqid('temp');
             if (!($file = @fopen($temp, 'wb'))) {
-                trigger_error('Error writing temporary file \'' . $temp . '\'', E_USER_WARNING);
+                trigger_error('Error writing temporary file \''.$temp.'\'', E_USER_WARNING);
 
                 return false;
             }
@@ -342,7 +342,7 @@ 
     {
         $cachedFile = $this->getCacheFilename($core);
 
-        return !file_exists($cachedFile) || (filectime($cachedFile) < (time() - $olderThan) && unlink($cachedFile));
+        return !file_exists($cachedFile) || (filectime($cachedFile) < (time()-$olderThan) && unlink($cachedFile));
     }
 
     /**
@@ -449,7 +449,7 @@ 
             $this->compileId = $this->name;
         }
 
-        return $core->getCompileDir() . $this->compileId . '.d' . Core::RELEASE_TAG . '.php';
+        return $core->getCompileDir().$this->compileId.'.d'.Core::RELEASE_TAG.'.php';
     }
 
     /**
@@ -467,17 +467,17 @@ 
             if (isset($_SERVER['REQUEST_URI']) === true) {
                 $cacheId = $_SERVER['REQUEST_URI'];
             } elseif (isset($_SERVER['SCRIPT_FILENAME']) && isset($_SERVER['argv'])) {
-                $cacheId = $_SERVER['SCRIPT_FILENAME'] . '-' . implode('-', $_SERVER['argv']);
+                $cacheId = $_SERVER['SCRIPT_FILENAME'].'-'.implode('-', $_SERVER['argv']);
             } else {
                 $cacheId = '';
             }
             // force compiled id generation
             $this->getCompiledFilename($core);
 
-            $this->cacheId = str_replace('../', '__', $this->compileId . strtr($cacheId, '\\%?=!:;' . PATH_SEPARATOR, '/-------'));
+            $this->cacheId = str_replace('../', '__', $this->compileId.strtr($cacheId, '\\%?=!:;'.PATH_SEPARATOR, '/-------'));
         }
 
-        return $core->getCacheDir() . $this->cacheId . '.html';
+        return $core->getCacheDir().$this->cacheId.'.html';
     }
 
     /**
@@ -514,7 +514,7 @@ 
         }
 
         $retries = 3;
-        while ($retries --) {
+        while ($retries--) {
             @mkdir($path, $chmod, true);
             if (is_dir($path)) {
                 break;
@@ -527,9 +527,9 @@ 
             $path    = strtr(str_replace($baseDir, '', $path), '\\', '/');
             $folders = explode('/', trim($path, '/'));
             foreach ($folders as $folder) {
-                $baseDir .= $folder . DIRECTORY_SEPARATOR;
+                $baseDir .= $folder.DIRECTORY_SEPARATOR;
                 if (!chmod($baseDir, $chmod)) {
-                    throw new Exception('Unable to chmod ' . "$baseDir to $chmod: " . print_r(error_get_last(), true));
+                    throw new Exception('Unable to chmod '."$baseDir to $chmod: ".print_r(error_get_last(), true));
                 }
             }
         }