dwoo-project / dwoo

lib/Dwoo/Plugins/Functions/PluginMailto.php

Indentation +105 added lines, -105 removed lines

@@ -36,109 +36,109 @@
  */
 class PluginMailto extends Plugin
 {
-    /**
-     * @param      $address
-     * @param null $text
-     * @param null $subject
-     * @param null $encode
-     * @param null $cc
-     * @param null $bcc
-     * @param null $newsgroups
-     * @param null $followupto
-     * @param null $extra
-     *
-     * @return string
-     */
-    public function process($address, $text = null, $subject = null, $encode = null, $cc = null, $bcc = null, $newsgroups = null, $followupto = null, $extra = null)
-    {
-        if (empty($address)) {
-            return '';
-        }
-        if (empty($text)) {
-            $text = $address;
-        }
-
-        // build address string
-        $address .= '?';
-
-        if (!empty($subject)) {
-            $address .= 'subject=' . rawurlencode($subject) . '&';
-        }
-        if (!empty($cc)) {
-            $address .= 'cc=' . rawurlencode($cc) . '&';
-        }
-        if (!empty($bcc)) {
-            $address .= 'bcc=' . rawurlencode($bcc) . '&';
-        }
-        if (!empty($newsgroups)) {
-            $address .= 'newsgroups=' . rawurlencode($newsgroups) . '&';
-        }
-        if (!empty($followupto)) {
-            $address .= 'followupto=' . rawurlencode($followupto) . '&';
-        }
-
-        $address = rtrim($address, '?&');
-
-        // output
-        switch ($encode) {
-
-            case 'none':
-            case null:
-                return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
-
-            case 'js':
-            case 'javascript':
-                $str = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
-                $len = strlen($str);
-
-                $out = '';
-                for ($i = 0; $i < $len; ++ $i) {
-                    $out .= '%' . bin2hex($str[$i]);
-                }
-
-                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>';
-                $len = strlen($str);
-
-                $out = '<script type="text/javascript">' . "\n<!--\ndocument.write(Str.fromCharCode(";
-                for ($i = 0; $i < $len; ++ $i) {
-                    $out .= ord($str[$i]) . ',';
-                }
-
-                return rtrim($out, ',') . "));\n-->\n</script>\n";
-
-                break;
-
-            case 'hex':
-                if (strpos($address, '?') !== false) {
-                    $this->core->triggerError('Mailto: Hex encoding is not possible with extra attributes, use one of : <em>js, jscharcode or none</em>.', E_USER_WARNING);
-                }
-
-                $out = '<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;';
-                $len = strlen($address);
-                for ($i = 0; $i < $len; ++ $i) {
-                    if (preg_match('#\w#', $address[$i])) {
-                        $out .= '%' . bin2hex($address[$i]);
-                    } else {
-                        $out .= $address[$i];
-                    }
-                }
-                $out .= '" ' . $extra . '>';
-                $len = strlen($text);
-                for ($i = 0; $i < $len; ++ $i) {
-                    $out .= '&#x' . bin2hex($text[$i]);
-                }
-
-                return $out . '</a>';
-
-            default:
-                $this->core->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);
-        }
-    }
+	/**
+	 * @param      $address
+	 * @param null $text
+	 * @param null $subject
+	 * @param null $encode
+	 * @param null $cc
+	 * @param null $bcc
+	 * @param null $newsgroups
+	 * @param null $followupto
+	 * @param null $extra
+	 *
+	 * @return string
+	 */
+	public function process($address, $text = null, $subject = null, $encode = null, $cc = null, $bcc = null, $newsgroups = null, $followupto = null, $extra = null)
+	{
+		if (empty($address)) {
+			return '';
+		}
+		if (empty($text)) {
+			$text = $address;
+		}
+
+		// build address string
+		$address .= '?';
+
+		if (!empty($subject)) {
+			$address .= 'subject=' . rawurlencode($subject) . '&';
+		}
+		if (!empty($cc)) {
+			$address .= 'cc=' . rawurlencode($cc) . '&';
+		}
+		if (!empty($bcc)) {
+			$address .= 'bcc=' . rawurlencode($bcc) . '&';
+		}
+		if (!empty($newsgroups)) {
+			$address .= 'newsgroups=' . rawurlencode($newsgroups) . '&';
+		}
+		if (!empty($followupto)) {
+			$address .= 'followupto=' . rawurlencode($followupto) . '&';
+		}
+
+		$address = rtrim($address, '?&');
+
+		// output
+		switch ($encode) {
+
+			case 'none':
+			case null:
+				return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
+
+			case 'js':
+			case 'javascript':
+				$str = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
+				$len = strlen($str);
+
+				$out = '';
+				for ($i = 0; $i < $len; ++ $i) {
+					$out .= '%' . bin2hex($str[$i]);
+				}
+
+				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>';
+				$len = strlen($str);
+
+				$out = '<script type="text/javascript">' . "\n<!--\ndocument.write(Str.fromCharCode(";
+				for ($i = 0; $i < $len; ++ $i) {
+					$out .= ord($str[$i]) . ',';
+				}
+
+				return rtrim($out, ',') . "));\n-->\n</script>\n";
+
+				break;
+
+			case 'hex':
+				if (strpos($address, '?') !== false) {
+					$this->core->triggerError('Mailto: Hex encoding is not possible with extra attributes, use one of : <em>js, jscharcode or none</em>.', E_USER_WARNING);
+				}
+
+				$out = '<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;';
+				$len = strlen($address);
+				for ($i = 0; $i < $len; ++ $i) {
+					if (preg_match('#\w#', $address[$i])) {
+						$out .= '%' . bin2hex($address[$i]);
+					} else {
+						$out .= $address[$i];
+					}
+				}
+				$out .= '" ' . $extra . '>';
+				$len = strlen($text);
+				for ($i = 0; $i < $len; ++ $i) {
+					$out .= '&#x' . bin2hex($text[$i]);
+				}
+
+				return $out . '</a>';
+
+			default:
+				$this->core->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);
+		}
+	}
 }
\ No newline at end of file

Switch Indentation +54 added lines, -54 removed lines

@@ -82,63 +82,63 @@
         // output
         switch ($encode) {
 
-            case 'none':
-            case null:
-                return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
-
-            case 'js':
-            case 'javascript':
-                $str = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
-                $len = strlen($str);
-
-                $out = '';
-                for ($i = 0; $i < $len; ++ $i) {
-                    $out .= '%' . bin2hex($str[$i]);
+        case 'none':
+        case null:
+            return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
+
+        case 'js':
+        case 'javascript':
+            $str = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
+            $len = strlen($str);
+
+            $out = '';
+            for ($i = 0; $i < $len; ++ $i) {
+                $out .= '%' . bin2hex($str[$i]);
+            }
+
+            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>';
+            $len = strlen($str);
+
+            $out = '<script type="text/javascript">' . "\n<!--\ndocument.write(Str.fromCharCode(";
+            for ($i = 0; $i < $len; ++ $i) {
+                $out .= ord($str[$i]) . ',';
+            }
+
+            return rtrim($out, ',') . "));\n-->\n</script>\n";
+
+            break;
+
+        case 'hex':
+            if (strpos($address, '?') !== false) {
+                $this->core->triggerError('Mailto: Hex encoding is not possible with extra attributes, use one of : <em>js, jscharcode or none</em>.', E_USER_WARNING);
+            }
+
+            $out = '<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;';
+            $len = strlen($address);
+            for ($i = 0; $i < $len; ++ $i) {
+                if (preg_match('#\w#', $address[$i])) {
+                    $out .= '%' . bin2hex($address[$i]);
+                } else {
+                    $out .= $address[$i];
                 }
+            }
+            $out .= '" ' . $extra . '>';
+            $len = strlen($text);
+            for ($i = 0; $i < $len; ++ $i) {
+                $out .= '&#x' . bin2hex($text[$i]);
+            }
 
-                return '<script type="text/javascript">eval(unescape(\'' . $out . '\'));</script>';
+            return $out . '</a>';
 
-                break;
-            case 'javascript_charcode':
-            case 'js_charcode':
-            case 'jscharcode':
-            case 'jschar':
-                $str = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
-                $len = strlen($str);
-
-                $out = '<script type="text/javascript">' . "\n<!--\ndocument.write(Str.fromCharCode(";
-                for ($i = 0; $i < $len; ++ $i) {
-                    $out .= ord($str[$i]) . ',';
-                }
-
-                return rtrim($out, ',') . "));\n-->\n</script>\n";
-
-                break;
-
-            case 'hex':
-                if (strpos($address, '?') !== false) {
-                    $this->core->triggerError('Mailto: Hex encoding is not possible with extra attributes, use one of : <em>js, jscharcode or none</em>.', E_USER_WARNING);
-                }
-
-                $out = '<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;';
-                $len = strlen($address);
-                for ($i = 0; $i < $len; ++ $i) {
-                    if (preg_match('#\w#', $address[$i])) {
-                        $out .= '%' . bin2hex($address[$i]);
-                    } else {
-                        $out .= $address[$i];
-                    }
-                }
-                $out .= '" ' . $extra . '>';
-                $len = strlen($text);
-                for ($i = 0; $i < $len; ++ $i) {
-                    $out .= '&#x' . bin2hex($text[$i]);
-                }
-
-                return $out . '</a>';
-
-            default:
-                $this->core->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);
+        default:
+            $this->core->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);
         }
     }
 }
\ No newline at end of file

Spacing +17 added lines, -17 removed lines

@@ -62,19 +62,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, '?&');
@@ -84,34 +84,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;
 
@@ -124,18 +124,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:
                 $this->core->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/Plugins/Functions/PluginInclude.php

Indentation +62 added lines, -62 removed lines

@@ -36,75 +36,75 @@
  */
 class PluginInclude extends Plugin
 {
-    /**
-     * @param        $file
-     * @param null   $cache_time
-     * @param null   $cache_id
-     * @param null   $compile_id
-     * @param string $data
-     * @param null   $assign
-     * @param array  $rest
-     *
-     * @return string
-     */
-    public function process($file, $cache_time = null, $cache_id = null, $compile_id = null, $data = '_root', $assign = null, array $rest = array())
-    {
-        $include = null;
-        if ($file === '') {
-            return '';
-        }
+	/**
+	 * @param        $file
+	 * @param null   $cache_time
+	 * @param null   $cache_id
+	 * @param null   $compile_id
+	 * @param string $data
+	 * @param null   $assign
+	 * @param array  $rest
+	 *
+	 * @return string
+	 */
+	public function process($file, $cache_time = null, $cache_id = null, $compile_id = null, $data = '_root', $assign = null, array $rest = array())
+	{
+		$include = null;
+		if ($file === '') {
+			return '';
+		}
 
-        if (preg_match('#^([a-z]{2,}):(.*)$#i', $file, $m)) {
-            // resource:identifier given, extract them
-            $resource   = $m[1];
-            $identifier = $m[2];
-        } else {
-            // get the current template's resource
-            $resource   = $this->core->getTemplate()->getResourceName();
-            $identifier = $file;
-        }
+		if (preg_match('#^([a-z]{2,}):(.*)$#i', $file, $m)) {
+			// resource:identifier given, extract them
+			$resource   = $m[1];
+			$identifier = $m[2];
+		} else {
+			// get the current template's resource
+			$resource   = $this->core->getTemplate()->getResourceName();
+			$identifier = $file;
+		}
 
-        try {
-            $include = $this->core->templateFactory($resource, $identifier, $cache_time, $cache_id, $compile_id);
-        }
-        catch (SecurityException $e) {
-            $this->core->triggerError('Include : Security restriction : ' . $e->getMessage(), E_USER_WARNING);
-        }
-        catch (Exception $e) {
-            $this->core->triggerError('Include : ' . $e->getMessage(), E_USER_WARNING);
-        }
+		try {
+			$include = $this->core->templateFactory($resource, $identifier, $cache_time, $cache_id, $compile_id);
+		}
+		catch (SecurityException $e) {
+			$this->core->triggerError('Include : Security restriction : ' . $e->getMessage(), E_USER_WARNING);
+		}
+		catch (Exception $e) {
+			$this->core->triggerError('Include : ' . $e->getMessage(), E_USER_WARNING);
+		}
 
-        if ($include === null) {
-            $this->core->triggerError('Include : Resource "' . $resource . ':' . $identifier . '" not found.',
-                E_USER_WARNING);
-        } elseif ($include === false) {
-            $this->core->triggerError('Include : Resource "' . $resource . '" does not support includes.',
-                E_USER_WARNING);
-        }
+		if ($include === null) {
+			$this->core->triggerError('Include : Resource "' . $resource . ':' . $identifier . '" not found.',
+				E_USER_WARNING);
+		} elseif ($include === false) {
+			$this->core->triggerError('Include : Resource "' . $resource . '" does not support includes.',
+				E_USER_WARNING);
+		}
 
-        if (is_string($data)) {
-            $vars = $this->core->readVar($data);
-        } else {
-            $vars = $data;
-        }
+		if (is_string($data)) {
+			$vars = $this->core->readVar($data);
+		} else {
+			$vars = $data;
+		}
 
-        if (count($rest)) {
-            $vars = $rest + $vars;
-        }
+		if (count($rest)) {
+			$vars = $rest + $vars;
+		}
 
-        $clone = clone $this->core;
-        $out   = $clone->get($include, $vars);
+		$clone = clone $this->core;
+		$out   = $clone->get($include, $vars);
 
-        if ($assign !== null) {
-            $this->core->assignInScope($out, $assign);
-        }
+		if ($assign !== null) {
+			$this->core->assignInScope($out, $assign);
+		}
 
-        foreach ($clone->getReturnValues() as $name => $value) {
-            $this->core->assignInScope($value, $name);
-        }
+		foreach ($clone->getReturnValues() as $name => $value) {
+			$this->core->assignInScope($value, $name);
+		}
 
-        if ($assign === null) {
-            return $out;
-        }
-    }
+		if ($assign === null) {
+			return $out;
+		}
+	}
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -68,17 +68,17 @@ 
             $include = $this->core->templateFactory($resource, $identifier, $cache_time, $cache_id, $compile_id);
         }
         catch (SecurityException $e) {
-            $this->core->triggerError('Include : Security restriction : ' . $e->getMessage(), E_USER_WARNING);
+            $this->core->triggerError('Include : Security restriction : '.$e->getMessage(), E_USER_WARNING);
         }
         catch (Exception $e) {
-            $this->core->triggerError('Include : ' . $e->getMessage(), E_USER_WARNING);
+            $this->core->triggerError('Include : '.$e->getMessage(), E_USER_WARNING);
         }
 
         if ($include === null) {
-            $this->core->triggerError('Include : Resource "' . $resource . ':' . $identifier . '" not found.',
+            $this->core->triggerError('Include : Resource "'.$resource.':'.$identifier.'" not found.',
                 E_USER_WARNING);
         } elseif ($include === false) {
-            $this->core->triggerError('Include : Resource "' . $resource . '" does not support includes.',
+            $this->core->triggerError('Include : Resource "'.$resource.'" does not support includes.',
                 E_USER_WARNING);
         }
 
@@ -89,7 +89,7 @@ 
         }
 
         if (count($rest)) {
-            $vars = $rest + $vars;
+            $vars = $rest+$vars;
         }
 
         $clone = clone $this->core;

Braces +2 added lines, -4 removed lines

@@ -66,11 +66,9 @@
 
         try {
             $include = $this->core->templateFactory($resource, $identifier, $cache_time, $cache_id, $compile_id);
-        }
-        catch (SecurityException $e) {
+        } catch (SecurityException $e) {
             $this->core->triggerError('Include : Security restriction : ' . $e->getMessage(), E_USER_WARNING);
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->core->triggerError('Include : ' . $e->getMessage(), E_USER_WARNING);
         }
 

lib/Dwoo/Plugins/Functions/PluginEval.php

Indentation +20 added lines, -20 removed lines

@@ -37,26 +37,26 @@
  */
 class PluginEval extends Plugin
 {
-    /**
-     * @param string $var
-     * @param null   $assign
-     *
-     * @return string
-     */
-    public function process($var, $assign = null)
-    {
-        if ($var == '') {
-            return '';
-        }
+	/**
+	 * @param string $var
+	 * @param null   $assign
+	 *
+	 * @return string
+	 */
+	public function process($var, $assign = null)
+	{
+		if ($var == '') {
+			return '';
+		}
 
-        $tpl   = new TemplateString($var);
-        $clone = clone $this->core;
-        $out   = $clone->get($tpl, $this->core->readVar('_parent'));
+		$tpl   = new TemplateString($var);
+		$clone = clone $this->core;
+		$out   = $clone->get($tpl, $this->core->readVar('_parent'));
 
-        if ($assign !== null) {
-            $this->core->assignInScope($out, $assign);
-        } else {
-            return $out;
-        }
-    }
+		if ($assign !== null) {
+			$this->core->assignInScope($out, $assign);
+		} else {
+			return $out;
+		}
+	}
 }
\ No newline at end of file

lib/Dwoo/Plugins/Functions/PluginCycle.php

Indentation +46 added lines, -46 removed lines

@@ -34,58 +34,58 @@
  */
 class PluginCycle extends Plugin
 {
-    protected $cycles = array();
+	protected $cycles = array();
 
-    /**
-     * @param string $name
-     * @param null   $values
-     * @param bool   $print
-     * @param bool   $advance
-     * @param string $delimiter
-     * @param null   $assign
-     * @param bool   $reset
-     *
-     * @return string|null
-     */
-    public function process($name = 'default', $values = null, $print = true, $advance = true, $delimiter = ',', $assign = null, $reset = false)
-    {
-        if ($values !== null) {
-            if (is_string($values)) {
-                $values = explode($delimiter, $values);
-            }
+	/**
+	 * @param string $name
+	 * @param null   $values
+	 * @param bool   $print
+	 * @param bool   $advance
+	 * @param string $delimiter
+	 * @param null   $assign
+	 * @param bool   $reset
+	 *
+	 * @return string|null
+	 */
+	public function process($name = 'default', $values = null, $print = true, $advance = true, $delimiter = ',', $assign = null, $reset = false)
+	{
+		if ($values !== null) {
+			if (is_string($values)) {
+				$values = explode($delimiter, $values);
+			}
 
-            if (!isset($this->cycles[$name]) || $this->cycles[$name]['values'] !== $values) {
-                $this->cycles[$name]['index'] = 0;
-            }
+			if (!isset($this->cycles[$name]) || $this->cycles[$name]['values'] !== $values) {
+				$this->cycles[$name]['index'] = 0;
+			}
 
-            $this->cycles[$name]['values'] = array_values($values);
-        } elseif (isset($this->cycles[$name])) {
-            $values = $this->cycles[$name]['values'];
-        }
+			$this->cycles[$name]['values'] = array_values($values);
+		} elseif (isset($this->cycles[$name])) {
+			$values = $this->cycles[$name]['values'];
+		}
 
-        if ($reset) {
-            $this->cycles[$name]['index'] = 0;
-        }
+		if ($reset) {
+			$this->cycles[$name]['index'] = 0;
+		}
 
-        if ($print) {
-            $out = $values[$this->cycles[$name]['index']];
-        } else {
-            $out = null;
-        }
+		if ($print) {
+			$out = $values[$this->cycles[$name]['index']];
+		} else {
+			$out = null;
+		}
 
-        if ($advance) {
-            if ($this->cycles[$name]['index'] >= count($values) - 1) {
-                $this->cycles[$name]['index'] = 0;
-            } else {
-                ++ $this->cycles[$name]['index'];
-            }
-        }
+		if ($advance) {
+			if ($this->cycles[$name]['index'] >= count($values) - 1) {
+				$this->cycles[$name]['index'] = 0;
+			} else {
+				++ $this->cycles[$name]['index'];
+			}
+		}
 
-        if ($assign === null) {
-            return $out;
-        }
-        $this->core->assignInScope($out, $assign);
+		if ($assign === null) {
+			return $out;
+		}
+		$this->core->assignInScope($out, $assign);
 
-        return null;
-    }
+		return null;
+	}
 }

lib/Dwoo/Plugins/Functions/PluginTif.php

Indentation +58 added lines, -58 removed lines

@@ -36,70 +36,70 @@
  */
 class PluginTif extends Plugin implements ICompilable
 {
-    /**
-     * @param Compiler $compiler
-     * @param array    $rest
-     * @param array    $tokens
-     *
-     * @return mixed|string
-     * @throws CompilationException
-     */
-    public static function compile(Compiler $compiler, array $rest, array $tokens)
-    {
-        // load if plugin
-        if (!class_exists(Core::NAMESPACE_PLUGINS_BLOCKS . 'PluginIf')) {
-            try {
-                $compiler->getDwoo()->getLoader()->loadPlugin('if');
-            }
-            catch (Exception $e) {
-                throw new CompilationException($compiler, 'Tif: the if plugin is required to use Tif');
-            }
-        }
+	/**
+	 * @param Compiler $compiler
+	 * @param array    $rest
+	 * @param array    $tokens
+	 *
+	 * @return mixed|string
+	 * @throws CompilationException
+	 */
+	public static function compile(Compiler $compiler, array $rest, array $tokens)
+	{
+		// load if plugin
+		if (!class_exists(Core::NAMESPACE_PLUGINS_BLOCKS . 'PluginIf')) {
+			try {
+				$compiler->getDwoo()->getLoader()->loadPlugin('if');
+			}
+			catch (Exception $e) {
+				throw new CompilationException($compiler, 'Tif: the if plugin is required to use Tif');
+			}
+		}
 
-        if (count($rest) == 1) {
-            return $rest[0];
-        }
+		if (count($rest) == 1) {
+			return $rest[0];
+		}
 
-        // fetch false result and remove the ":" if it was present
-        $falseResult = array_pop($rest);
+		// fetch false result and remove the ":" if it was present
+		$falseResult = array_pop($rest);
 
-        if (trim(end($rest), '"\'') === ':') {
-            // remove the ':' if present
-            array_pop($rest);
-        } elseif (trim(end($rest), '"\'') === '?' || count($rest) === 1) {
-            if ($falseResult === '?' || $falseResult === ':') {
-                throw new CompilationException($compiler,
-                    'Tif: incomplete tif statement, value missing after ' . $falseResult);
-            }
-            // there was in fact no false result provided, so we move it to be the true result instead
-            $trueResult = $falseResult;
-            $falseResult = "''";
-        }
+		if (trim(end($rest), '"\'') === ':') {
+			// remove the ':' if present
+			array_pop($rest);
+		} elseif (trim(end($rest), '"\'') === '?' || count($rest) === 1) {
+			if ($falseResult === '?' || $falseResult === ':') {
+				throw new CompilationException($compiler,
+					'Tif: incomplete tif statement, value missing after ' . $falseResult);
+			}
+			// there was in fact no false result provided, so we move it to be the true result instead
+			$trueResult = $falseResult;
+			$falseResult = "''";
+		}
 
-        // fetch true result if needed
-        if (!isset($trueResult)) {
-            $trueResult = array_pop($rest);
-            // no true result provided so we use the expression arg
-            if ($trueResult === '?') {
-                $trueResult = true;
-            }
-        }
+		// fetch true result if needed
+		if (!isset($trueResult)) {
+			$trueResult = array_pop($rest);
+			// no true result provided so we use the expression arg
+			if ($trueResult === '?') {
+				$trueResult = true;
+			}
+		}
 
-        // remove the '?' if present
-        if (trim(end($rest), '"\'') === '?') {
-            array_pop($rest);
-        }
+		// remove the '?' if present
+		if (trim(end($rest), '"\'') === '?') {
+			array_pop($rest);
+		}
 
-        // check params were correctly provided
-        if (empty($rest) || $trueResult === null || $falseResult === null) {
-            throw new CompilationException($compiler,
-                'Tif: you must provide three parameters serving as <expression> ? <true value> : <false value>');
-        }
+		// check params were correctly provided
+		if (empty($rest) || $trueResult === null || $falseResult === null) {
+			throw new CompilationException($compiler,
+				'Tif: you must provide three parameters serving as <expression> ? <true value> : <false value>');
+		}
 
-        // parse condition
-        $condition = PluginIf::replaceKeywords($rest, $tokens, $compiler);
+		// parse condition
+		$condition = PluginIf::replaceKeywords($rest, $tokens, $compiler);
 
-        return '((' . implode(' ', $condition) . ') ? ' . ($trueResult === true ? implode(' ',
-                $condition) : $trueResult) . ' : ' . $falseResult . ')';
-    }
+		return '((' . implode(' ', $condition) . ') ? ' . ($trueResult === true ? implode(' ',
+				$condition) : $trueResult) . ' : ' . $falseResult . ')';
+	}
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
     public static function compile(Compiler $compiler, array $rest, array $tokens)
     {
         // load if plugin
-        if (!class_exists(Core::NAMESPACE_PLUGINS_BLOCKS . 'PluginIf')) {
+        if (!class_exists(Core::NAMESPACE_PLUGINS_BLOCKS.'PluginIf')) {
             try {
                 $compiler->getDwoo()->getLoader()->loadPlugin('if');
             }
@@ -69,7 +69,7 @@ 
         } elseif (trim(end($rest), '"\'') === '?' || count($rest) === 1) {
             if ($falseResult === '?' || $falseResult === ':') {
                 throw new CompilationException($compiler,
-                    'Tif: incomplete tif statement, value missing after ' . $falseResult);
+                    'Tif: incomplete tif statement, value missing after '.$falseResult);
             }
             // there was in fact no false result provided, so we move it to be the true result instead
             $trueResult = $falseResult;
@@ -99,7 +99,7 @@ 
         // parse condition
         $condition = PluginIf::replaceKeywords($rest, $tokens, $compiler);
 
-        return '((' . implode(' ', $condition) . ') ? ' . ($trueResult === true ? implode(' ',
-                $condition) : $trueResult) . ' : ' . $falseResult . ')';
+        return '(('.implode(' ', $condition).') ? '.($trueResult === true ? implode(' ',
+                $condition) : $trueResult).' : '.$falseResult.')';
     }
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -50,8 +50,7 @@
         if (!class_exists(Core::NAMESPACE_PLUGINS_BLOCKS . 'PluginIf')) {
             try {
                 $compiler->getDwoo()->getLoader()->loadPlugin('if');
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 throw new CompilationException($compiler, 'Tif: the if plugin is required to use Tif');
             }
         }

lib/Dwoo/Plugins/Functions/PluginStripTags.php

Indentation +18 added lines, -18 removed lines

@@ -32,24 +32,24 @@
  */
 class PluginStripTags extends Plugin implements ICompilable
 {
-    /**
-     * @param Compiler    $compiler
-     * @param string      $value
-     * @param bool        $addspace
-     * @param null|string $allowable_tags
-     *
-     * @return string
-     */
-    public static function compile(Compiler $compiler, $value, $addspace = true, $allowable_tags = null)
-    {
-        if ($addspace === 'true') {
-            if ("null" == $allowable_tags) {
-                return "preg_replace('#<[^>]*>#', ' ', $value)";
-            }
+	/**
+	 * @param Compiler    $compiler
+	 * @param string      $value
+	 * @param bool        $addspace
+	 * @param null|string $allowable_tags
+	 *
+	 * @return string
+	 */
+	public static function compile(Compiler $compiler, $value, $addspace = true, $allowable_tags = null)
+	{
+		if ($addspace === 'true') {
+			if ("null" == $allowable_tags) {
+				return "preg_replace('#<[^>]*>#', ' ', $value)";
+			}
 
-            return "preg_replace('#<\\s*\\/?(" . $allowable_tags . ")\\s*[^>]*?>#im', ' ', $value)";
-        }
+			return "preg_replace('#<\\s*\\/?(" . $allowable_tags . ")\\s*[^>]*?>#im', ' ', $value)";
+		}
 
-        return "strip_tags($value, $allowable_tags)";
-    }
+		return "strip_tags($value, $allowable_tags)";
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
                 return "preg_replace('#<[^>]*>#', ' ', $value)";
             }
 
-            return "preg_replace('#<\\s*\\/?(" . $allowable_tags . ")\\s*[^>]*?>#im', ' ', $value)";
+            return "preg_replace('#<\\s*\\/?(".$allowable_tags.")\\s*[^>]*?>#im', ' ', $value)";
         }
 
         return "strip_tags($value, $allowable_tags)";

lib/Dwoo/Plugins/Functions/PluginDump.php

Indentation +169 added lines, -169 removed lines

@@ -31,180 +31,180 @@
  */
 class PluginDump extends Plugin
 {
-    protected $outputObjects;
-    protected $outputMethods;
-
-    /**
-     * @param string $var
-     * @param bool   $show_methods
-     *
-     * @return string
-     */
-    public function process($var = '$', $show_methods = false)
-    {
-        $this->outputMethods = $show_methods;
-        if ($var === '$') {
-            $var = $this->core->getData();
-            $out = '<div style="background:#aaa; padding:5px; margin:5px; color:#000;">data';
-        } else {
-            $out = '<div style="background:#aaa; padding:5px; margin:5px; color:#000;">dump';
-        }
-
-        $this->outputObjects = array();
-
-        if (!is_array($var)) {
-            if (is_object($var)) {
-                return $this->exportObj('', $var);
-            } else {
-                return $this->exportVar('', $var);
-            }
-        }
-
-        $scope = $this->core->getScope();
-
-        if ($var === $scope) {
-            $out .= ' (current scope): <div style="background:#ccc;">';
-        } else {
-            $out .= ':<div style="padding-left:20px;">';
-        }
-
-        $out .= $this->export($var, $scope);
-
-        return $out . '</div></div>';
-    }
-
-    /**
-     * @param $var
-     * @param $scope
-     *
-     * @return string
-     */
-    protected function export($var, $scope)
-    {
-        $out = '';
-        foreach ($var as $i => $v) {
-            if (is_array($v) || (is_object($v) && $v instanceof Iterator)) {
-                $out .= $i . ' (' . (is_array($v) ? 'array' : 'object: ' . get_class($v)) . ')';
-                if ($v === $scope) {
-                    $out .= ' (current scope):<div style="background:#ccc;padding-left:20px;">' . $this->export($v, $scope) . '</div>';
-                } else {
-                    $out .= ':<div style="padding-left:20px;">' . $this->export($v, $scope) . '</div>';
-                }
-            } elseif (is_object($v)) {
-                $out .= $this->exportObj($i . ' (object: ' . get_class($v) . '):', $v);
-            } else {
-                $out .= $this->exportVar($i . ' = ', $v);
-            }
-        }
-
-        return $out;
-    }
-
-    /**
-     * @param $i
-     * @param $v
-     *
-     * @return string
-     */
-    protected function exportVar($i, $v)
-    {
-        if (is_string($v) || is_bool($v) || is_numeric($v)) {
-            return $i . htmlentities(var_export($v, true)) . '<br />';
-        } elseif (is_null($v)) {
-            return $i . 'null<br />';
-        } elseif (is_resource($v)) {
-            return $i . 'resource(' . get_resource_type($v) . ')<br />';
-        } else {
-            return $i . htmlentities(var_export($v, true)) . '<br />';
-        }
-    }
-
-    /**
-     * @param $i
-     * @param $obj
-     *
-     * @return string
-     */
-    protected function exportObj($i, $obj)
-    {
-        if (array_search($obj, $this->outputObjects, true) !== false) {
-            return $i . ' [recursion, skipped]<br />';
-        }
-
-        $this->outputObjects[] = $obj;
-
-        $list = (array)$obj;
-
-        $protectedLength = strlen(get_class($obj)) + 2;
-
-        $out = array();
-
-        if ($this->outputMethods) {
-            $ref = new ReflectionObject($obj);
-
-            foreach ($ref->getMethods() as $method) {
-                if (!$method->isPublic()) {
-                    continue;
-                }
-
-                if (empty($out['method'])) {
-                    $out['method'] = '';
-                }
-
-                $params = array();
-                foreach ($method->getParameters() as $param) {
-                    $params[] = ($param->isPassedByReference() ? '&' : '') . '$' . $param->getName() . ($param->isOptional() ? ' = ' . var_export($param->getDefaultValue(), true) : '');
-                }
-
-                $out['method'] .= '(method) ' . $method->getName() . '(' . implode(', ', $params) . ')<br />';
-            }
-        }
-
-        foreach ($list as $attributeName => $attributeValue) {
-            if (property_exists($obj, $attributeName)) {
-                $key = 'public';
-            } elseif (substr($attributeName, 0, 3) === "\0*\0") {
-                $key           = 'protected';
-                $attributeName = substr($attributeName, 3);
-            } else {
-                $key           = 'private';
-                $attributeName = substr($attributeName, $protectedLength);
-            }
-
-            if (empty($out[$key])) {
-                $out[$key] = '';
-            }
-
-            $out[$key] .= '(' . $key . ') ';
-
-            if (is_array($attributeValue)) {
-                $out[$key] .= $attributeName . ' (array):<br />
+	protected $outputObjects;
+	protected $outputMethods;
+
+	/**
+	 * @param string $var
+	 * @param bool   $show_methods
+	 *
+	 * @return string
+	 */
+	public function process($var = '$', $show_methods = false)
+	{
+		$this->outputMethods = $show_methods;
+		if ($var === '$') {
+			$var = $this->core->getData();
+			$out = '<div style="background:#aaa; padding:5px; margin:5px; color:#000;">data';
+		} else {
+			$out = '<div style="background:#aaa; padding:5px; margin:5px; color:#000;">dump';
+		}
+
+		$this->outputObjects = array();
+
+		if (!is_array($var)) {
+			if (is_object($var)) {
+				return $this->exportObj('', $var);
+			} else {
+				return $this->exportVar('', $var);
+			}
+		}
+
+		$scope = $this->core->getScope();
+
+		if ($var === $scope) {
+			$out .= ' (current scope): <div style="background:#ccc;">';
+		} else {
+			$out .= ':<div style="padding-left:20px;">';
+		}
+
+		$out .= $this->export($var, $scope);
+
+		return $out . '</div></div>';
+	}
+
+	/**
+	 * @param $var
+	 * @param $scope
+	 *
+	 * @return string
+	 */
+	protected function export($var, $scope)
+	{
+		$out = '';
+		foreach ($var as $i => $v) {
+			if (is_array($v) || (is_object($v) && $v instanceof Iterator)) {
+				$out .= $i . ' (' . (is_array($v) ? 'array' : 'object: ' . get_class($v)) . ')';
+				if ($v === $scope) {
+					$out .= ' (current scope):<div style="background:#ccc;padding-left:20px;">' . $this->export($v, $scope) . '</div>';
+				} else {
+					$out .= ':<div style="padding-left:20px;">' . $this->export($v, $scope) . '</div>';
+				}
+			} elseif (is_object($v)) {
+				$out .= $this->exportObj($i . ' (object: ' . get_class($v) . '):', $v);
+			} else {
+				$out .= $this->exportVar($i . ' = ', $v);
+			}
+		}
+
+		return $out;
+	}
+
+	/**
+	 * @param $i
+	 * @param $v
+	 *
+	 * @return string
+	 */
+	protected function exportVar($i, $v)
+	{
+		if (is_string($v) || is_bool($v) || is_numeric($v)) {
+			return $i . htmlentities(var_export($v, true)) . '<br />';
+		} elseif (is_null($v)) {
+			return $i . 'null<br />';
+		} elseif (is_resource($v)) {
+			return $i . 'resource(' . get_resource_type($v) . ')<br />';
+		} else {
+			return $i . htmlentities(var_export($v, true)) . '<br />';
+		}
+	}
+
+	/**
+	 * @param $i
+	 * @param $obj
+	 *
+	 * @return string
+	 */
+	protected function exportObj($i, $obj)
+	{
+		if (array_search($obj, $this->outputObjects, true) !== false) {
+			return $i . ' [recursion, skipped]<br />';
+		}
+
+		$this->outputObjects[] = $obj;
+
+		$list = (array)$obj;
+
+		$protectedLength = strlen(get_class($obj)) + 2;
+
+		$out = array();
+
+		if ($this->outputMethods) {
+			$ref = new ReflectionObject($obj);
+
+			foreach ($ref->getMethods() as $method) {
+				if (!$method->isPublic()) {
+					continue;
+				}
+
+				if (empty($out['method'])) {
+					$out['method'] = '';
+				}
+
+				$params = array();
+				foreach ($method->getParameters() as $param) {
+					$params[] = ($param->isPassedByReference() ? '&' : '') . '$' . $param->getName() . ($param->isOptional() ? ' = ' . var_export($param->getDefaultValue(), true) : '');
+				}
+
+				$out['method'] .= '(method) ' . $method->getName() . '(' . implode(', ', $params) . ')<br />';
+			}
+		}
+
+		foreach ($list as $attributeName => $attributeValue) {
+			if (property_exists($obj, $attributeName)) {
+				$key = 'public';
+			} elseif (substr($attributeName, 0, 3) === "\0*\0") {
+				$key           = 'protected';
+				$attributeName = substr($attributeName, 3);
+			} else {
+				$key           = 'private';
+				$attributeName = substr($attributeName, $protectedLength);
+			}
+
+			if (empty($out[$key])) {
+				$out[$key] = '';
+			}
+
+			$out[$key] .= '(' . $key . ') ';
+
+			if (is_array($attributeValue)) {
+				$out[$key] .= $attributeName . ' (array):<br />
 							<div style="padding-left:20px;">' . $this->export($attributeValue, false) . '</div>';
-            } elseif (is_object($attributeValue)) {
-                $out[$key] .= $this->exportObj($attributeName . ' (object: ' . get_class($attributeValue) . '):', $attributeValue);
-            } else {
-                $out[$key] .= $this->exportVar($attributeName . ' = ', $attributeValue);
-            }
-        }
+			} elseif (is_object($attributeValue)) {
+				$out[$key] .= $this->exportObj($attributeName . ' (object: ' . get_class($attributeValue) . '):', $attributeValue);
+			} else {
+				$out[$key] .= $this->exportVar($attributeName . ' = ', $attributeValue);
+			}
+		}
 
-        $return = $i . '<br /><div style="padding-left:20px;">';
+		$return = $i . '<br /><div style="padding-left:20px;">';
 
-        if (!empty($out['method'])) {
-            $return .= $out['method'];
-        }
+		if (!empty($out['method'])) {
+			$return .= $out['method'];
+		}
 
-        if (!empty($out['public'])) {
-            $return .= $out['public'];
-        }
+		if (!empty($out['public'])) {
+			$return .= $out['public'];
+		}
 
-        if (!empty($out['protected'])) {
-            $return .= $out['protected'];
-        }
+		if (!empty($out['protected'])) {
+			$return .= $out['protected'];
+		}
 
-        if (!empty($out['private'])) {
-            $return .= $out['private'];
-        }
+		if (!empty($out['private'])) {
+			$return .= $out['private'];
+		}
 
-        return $return . '</div>';
-    }
+		return $return . '</div>';
+	}
 }

lib/Dwoo/Plugins/Functions/PluginCapitalize.php

Indentation +23 added lines, -23 removed lines

@@ -29,28 +29,28 @@
  */
 class PluginCapitalize extends Plugin
 {
-    /**
-     * @param string $value
-     * @param bool   $numwords
-     *
-     * @return string
-     */
-    public function process($value, $numwords = false)
-    {
-        if ($numwords || preg_match('#^[^0-9]+$#', $value)) {
-            return mb_convert_case((string)$value, MB_CASE_TITLE, $this->core->getCharset());
-        } else {
-            $bits = explode(' ', (string)$value);
-            $out  = '';
-            while (list(, $v) = each($bits)) {
-                if (preg_match('#^[^0-9]+$#', $v)) {
-                    $out .= ' ' . mb_convert_case($v, MB_CASE_TITLE, $this->core->getCharset());
-                } else {
-                    $out .= ' ' . $v;
-                }
-            }
+	/**
+	 * @param string $value
+	 * @param bool   $numwords
+	 *
+	 * @return string
+	 */
+	public function process($value, $numwords = false)
+	{
+		if ($numwords || preg_match('#^[^0-9]+$#', $value)) {
+			return mb_convert_case((string)$value, MB_CASE_TITLE, $this->core->getCharset());
+		} else {
+			$bits = explode(' ', (string)$value);
+			$out  = '';
+			while (list(, $v) = each($bits)) {
+				if (preg_match('#^[^0-9]+$#', $v)) {
+					$out .= ' ' . mb_convert_case($v, MB_CASE_TITLE, $this->core->getCharset());
+				} else {
+					$out .= ' ' . $v;
+				}
+			}
 
-            return substr($out, 1);
-        }
-    }
+			return substr($out, 1);
+		}
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -38,15 +38,15 @@
     public function process($value, $numwords = false)
     {
         if ($numwords || preg_match('#^[^0-9]+$#', $value)) {
-            return mb_convert_case((string)$value, MB_CASE_TITLE, $this->core->getCharset());
+            return mb_convert_case((string) $value, MB_CASE_TITLE, $this->core->getCharset());
         } else {
-            $bits = explode(' ', (string)$value);
+            $bits = explode(' ', (string) $value);
             $out  = '';
             while (list(, $v) = each($bits)) {
                 if (preg_match('#^[^0-9]+$#', $v)) {
-                    $out .= ' ' . mb_convert_case($v, MB_CASE_TITLE, $this->core->getCharset());
+                    $out .= ' '.mb_convert_case($v, MB_CASE_TITLE, $this->core->getCharset());
                 } else {
-                    $out .= ' ' . $v;
+                    $out .= ' '.$v;
                 }
             }
 

lib/Dwoo/Plugins/Functions/PluginLoadTemplates.php

Indentation +47 added lines, -47 removed lines

@@ -31,58 +31,58 @@ 
  */
 class PluginLoadTemplates extends Plugin implements ICompilable
 {
-    /**
-     * @param Compiler $compiler
-     * @param string   $file
-     *
-     * @return string
-     * @throws CompilationException
-     */
-    public static function compile(Compiler $compiler, $file)
-    {
-        $file = substr($file, 1, - 1);
+	/**
+	 * @param Compiler $compiler
+	 * @param string   $file
+	 *
+	 * @return string
+	 * @throws CompilationException
+	 */
+	public static function compile(Compiler $compiler, $file)
+	{
+		$file = substr($file, 1, - 1);
 
-        if ($file === '') {
-            return '';
-        }
+		if ($file === '') {
+			return '';
+		}
 
-        if (preg_match('#^([a-z]{2,}):(.*)$#i', $file, $m)) {
-            // resource:identifier given, extract them
-            $resource   = $m[1];
-            $identifier = $m[2];
-        } else {
-            // get the current template's resource
-            $resource   = $compiler->getDwoo()->getTemplate()->getResourceName();
-            $identifier = $file;
-        }
+		if (preg_match('#^([a-z]{2,}):(.*)$#i', $file, $m)) {
+			// resource:identifier given, extract them
+			$resource   = $m[1];
+			$identifier = $m[2];
+		} else {
+			// get the current template's resource
+			$resource   = $compiler->getDwoo()->getTemplate()->getResourceName();
+			$identifier = $file;
+		}
 
-        $tpl = $compiler->getDwoo()->templateFactory($resource, $identifier);
+		$tpl = $compiler->getDwoo()->templateFactory($resource, $identifier);
 
-        if ($tpl === null) {
-            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.');
-        }
+		if ($tpl === null) {
+			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.');
+		}
 
-        $cmp = clone $compiler;
-        $cmp->compile($compiler->getDwoo(), $tpl);
-        foreach ($cmp->getTemplatePlugins() as $template => $args) {
-            $compiler->addTemplatePlugin($template, $args['params'], $args['uuid'], $args['body']);
-        }
-        foreach ($cmp->getUsedPlugins() as $plugin => $type) {
-            $compiler->addUsedPlugin($plugin, $type);
-        }
+		$cmp = clone $compiler;
+		$cmp->compile($compiler->getDwoo(), $tpl);
+		foreach ($cmp->getTemplatePlugins() as $template => $args) {
+			$compiler->addTemplatePlugin($template, $args['params'], $args['uuid'], $args['body']);
+		}
+		foreach ($cmp->getUsedPlugins() as $plugin => $type) {
+			$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();
+		$modCheck = $tpl->getIsModifiedCode();
 
-        if ($modCheck) {
-            $out .= 'if (!(' . $modCheck . ')) { ob_end_clean(); return false; }';
-        } else {
-            $out .= 'try {
+		if ($modCheck) {
+			$out .= 'if (!(' . $modCheck . ')) { ob_end_clean(); return false; }';
+		} else {
+			$out .= 'try {
 	$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);
@@ -92,8 +92,8 @@ 
 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; }';
-        }
+		}
 
-        return $out;
-    }
+		return $out;
+	}
 }
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -60,10 +60,10 @@ 
 
         if ($tpl === null) {
             throw new CompilationException($compiler,
-                'Load Templates : Resource "' . $resource . ':' . $identifier . '" not found.');
+                'Load Templates : Resource "'.$resource.':'.$identifier.'" not found.');
         } elseif ($tpl === false) {
             throw new CompilationException($compiler,
-                'Load Templates : Resource "' . $resource . '" does not support includes.');
+                'Load Templates : Resource "'.$resource.'" does not support includes.');
         }
 
         $cmp = clone $compiler;
@@ -75,23 +75,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;