dwoo-project / dwoo

lib/plugins/builtin/processors/pre.smarty_compat.php

Indentation +45 added lines, -45 removed lines

@@ -20,56 +20,56 @@
  */
 class Dwoo_Processor_smarty_compat extends Dwoo_Processor
 {
-    public function process($input)
-    {
-        list($l, $r) = $this->compiler->getDelimiters();
+	public function process($input)
+	{
+		list($l, $r) = $this->compiler->getDelimiters();
 
-        $rl = preg_quote($l, '/');
-        $rr = preg_quote($r, '/');
-        $sectionParam = '(?:(name|loop|start|step|max|show)\s*=\s*(\S+))?\s*';
-        $input = preg_replace_callback('/'.$rl.'\s*section '.str_repeat($sectionParam, 6).'\s*'.$rr.'(.+?)(?:'.$rl.'\s*sectionelse\s*'.$rr.'(.+?))?'.$rl.'\s*\/section\s*'.$rr.'/is', array($this, 'convertSection'), $input);
-        $input = str_replace('$smarty.section.', '$smarty.for.', $input);
+		$rl = preg_quote($l, '/');
+		$rr = preg_quote($r, '/');
+		$sectionParam = '(?:(name|loop|start|step|max|show)\s*=\s*(\S+))?\s*';
+		$input = preg_replace_callback('/'.$rl.'\s*section '.str_repeat($sectionParam, 6).'\s*'.$rr.'(.+?)(?:'.$rl.'\s*sectionelse\s*'.$rr.'(.+?))?'.$rl.'\s*\/section\s*'.$rr.'/is', array($this, 'convertSection'), $input);
+		$input = str_replace('$smarty.section.', '$smarty.for.', $input);
 
-        $smarty = array(
-            '/'.$rl.'\s*ldelim\s*'.$rr.'/',
-            '/'.$rl.'\s*rdelim\s*'.$rr.'/',
-            '/'.$rl.'\s*\$smarty\.ldelim\s*'.$rr.'/',
-            '/'.$rl.'\s*\$smarty\.rdelim\s*'.$rr.'/',
-            '/\$smarty\./',
-            '/'.$rl.'\s*php\s*'.$rr.'/',
-            '/'.$rl.'\s*\/php\s*'.$rr.'/',
-            '/\|(@?)strip(\||'.$rr.')/',
-            '/'.$rl.'\s*sectionelse\s*'.$rr.'/',
-        );
+		$smarty = array(
+			'/'.$rl.'\s*ldelim\s*'.$rr.'/',
+			'/'.$rl.'\s*rdelim\s*'.$rr.'/',
+			'/'.$rl.'\s*\$smarty\.ldelim\s*'.$rr.'/',
+			'/'.$rl.'\s*\$smarty\.rdelim\s*'.$rr.'/',
+			'/\$smarty\./',
+			'/'.$rl.'\s*php\s*'.$rr.'/',
+			'/'.$rl.'\s*\/php\s*'.$rr.'/',
+			'/\|(@?)strip(\||'.$rr.')/',
+			'/'.$rl.'\s*sectionelse\s*'.$rr.'/',
+		);
 
-        $dwoo = array(
-            '\\'.$l,
-            $r,
-            '\\'.$l,
-            $r,
-            '$dwoo.',
-            '<?php ',
-            ' ?>',
-            '|$1whitespace$2',
-            $l.'else'.$r,
-        );
+		$dwoo = array(
+			'\\'.$l,
+			$r,
+			'\\'.$l,
+			$r,
+			'$dwoo.',
+			'<?php ',
+			' ?>',
+			'|$1whitespace$2',
+			$l.'else'.$r,
+		);
 
-        if (preg_match('{\|@([a-z][a-z0-9_]*)}i', $input, $matches)) {
-            trigger_error('The Smarty Compatibility Module has detected that you use |@'.$matches[1].' in your template, this might lead to problems as Dwoo interprets the @ operator differently than Smarty, see http://wiki.dwoo.org/index.php/Syntax#The_.40_Operator', E_USER_NOTICE);
-        }
+		if (preg_match('{\|@([a-z][a-z0-9_]*)}i', $input, $matches)) {
+			trigger_error('The Smarty Compatibility Module has detected that you use |@'.$matches[1].' in your template, this might lead to problems as Dwoo interprets the @ operator differently than Smarty, see http://wiki.dwoo.org/index.php/Syntax#The_.40_Operator', E_USER_NOTICE);
+		}
 
-        return preg_replace($smarty, $dwoo, $input);
-    }
+		return preg_replace($smarty, $dwoo, $input);
+	}
 
-    protected function convertSection(array $matches)
-    {
-        $params = array();
-        $index = 1;
-        while (!empty($matches[$index]) && $index < 13) {
-            $params[$matches[$index]] = $matches[$index + 1];
-            $index += 2;
-        }
+	protected function convertSection(array $matches)
+	{
+		$params = array();
+		$index = 1;
+		while (!empty($matches[$index]) && $index < 13) {
+			$params[$matches[$index]] = $matches[$index + 1];
+			$index += 2;
+		}
 
-        return str_replace('['.trim($params['name'], '"\'').']', '[$'.trim($params['name'], '"\'').']', $matches[0]);
-    }
+		return str_replace('['.trim($params['name'], '"\'').']', '[$'.trim($params['name'], '"\'').']', $matches[0]);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
         $params = array();
         $index = 1;
         while (!empty($matches[$index]) && $index < 13) {
-            $params[$matches[$index]] = $matches[$index + 1];
+            $params[$matches[$index]] = $matches[$index+1];
             $index += 2;
         }
 

lib/plugins/builtin/blocks/template.php

Indentation +62 added lines, -62 removed lines

@@ -22,72 +22,72 @@
  */
 class Dwoo_Plugin_template extends Dwoo_Block_Plugin implements Dwoo_ICompilable_Block
 {
-    public function init($name, array $rest = array())
-    {
-    }
+	public function init($name, array $rest = array())
+	{
+	}
 
-    public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        $params = $compiler->getCompiledParams($params);
-        $parsedParams = array();
-        if (!isset($params['*'])) {
-            $params['*'] = array();
-        }
-        foreach ($params['*'] as $param => $defValue) {
-            if (is_numeric($param)) {
-                $param = $defValue;
-                $defValue = null;
-            }
-            $param = trim($param, '\'"');
-            if (!preg_match('#^[a-z0-9_]+$#i', $param)) {
-                throw new Dwoo_Compilation_Exception($compiler, 'Function : parameter names must contain only A-Z, 0-9 or _');
-            }
-            $parsedParams[$param] = $defValue;
-        }
-        $params['name'] = substr($params['name'], 1, -1);
-        $params['*'] = $parsedParams;
-        $params['uuid'] = uniqid();
-        $compiler->addTemplatePlugin($params['name'], $parsedParams, $params['uuid']);
-        $currentBlock = &$compiler->getCurrentBlock();
-        $currentBlock['params'] = $params;
+	public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		$params = $compiler->getCompiledParams($params);
+		$parsedParams = array();
+		if (!isset($params['*'])) {
+			$params['*'] = array();
+		}
+		foreach ($params['*'] as $param => $defValue) {
+			if (is_numeric($param)) {
+				$param = $defValue;
+				$defValue = null;
+			}
+			$param = trim($param, '\'"');
+			if (!preg_match('#^[a-z0-9_]+$#i', $param)) {
+				throw new Dwoo_Compilation_Exception($compiler, 'Function : parameter names must contain only A-Z, 0-9 or _');
+			}
+			$parsedParams[$param] = $defValue;
+		}
+		$params['name'] = substr($params['name'], 1, -1);
+		$params['*'] = $parsedParams;
+		$params['uuid'] = uniqid();
+		$compiler->addTemplatePlugin($params['name'], $parsedParams, $params['uuid']);
+		$currentBlock = &$compiler->getCurrentBlock();
+		$currentBlock['params'] = $params;
 
-        return '';
-    }
+		return '';
+	}
 
-    public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        $paramstr = 'Dwoo_Core $dwoo';
-        $init = 'static $_callCnt = 0;'."\n".
-        '$dwoo->scope[\' '.$params['uuid'].'\'.$_callCnt] = array();'."\n".
-        '$_scope = $dwoo->setScope(array(\' '.$params['uuid'].'\'.($_callCnt++)));'."\n";
-        $cleanup = '/* -- template end output */ $dwoo->setScope($_scope, true);';
-        foreach ($params['*'] as $param => $defValue) {
-            if ($defValue === null) {
-                $paramstr .= ', $'.$param;
-            } else {
-                $paramstr .= ', $'.$param.' = '.$defValue;
-            }
-            $init .= '$dwoo->scope[\''.$param.'\'] = $'.$param.";\n";
-        }
-        $init .= '/* -- template start output */';
+	public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		$paramstr = 'Dwoo_Core $dwoo';
+		$init = 'static $_callCnt = 0;'."\n".
+		'$dwoo->scope[\' '.$params['uuid'].'\'.$_callCnt] = array();'."\n".
+		'$_scope = $dwoo->setScope(array(\' '.$params['uuid'].'\'.($_callCnt++)));'."\n";
+		$cleanup = '/* -- template end output */ $dwoo->setScope($_scope, true);';
+		foreach ($params['*'] as $param => $defValue) {
+			if ($defValue === null) {
+				$paramstr .= ', $'.$param;
+			} else {
+				$paramstr .= ', $'.$param.' = '.$defValue;
+			}
+			$init .= '$dwoo->scope[\''.$param.'\'] = $'.$param.";\n";
+		}
+		$init .= '/* -- template start output */';
 
-        $funcName = 'Dwoo_Plugin_'.$params['name'];
+		$funcName = 'Dwoo_Plugin_'.$params['name'];
 
-        $search = array(
-            '$this->charset',
-            '$this->',
-            '$this,',
-        );
-        $replacement = array(
-            '$dwoo->getCharset()',
-            '$dwoo->',
-            '$dwoo,',
-        );
-        $content = str_replace($search, $replacement, $content);
+		$search = array(
+			'$this->charset',
+			'$this->',
+			'$this,',
+		);
+		$replacement = array(
+			'$dwoo->getCharset()',
+			'$dwoo->',
+			'$dwoo,',
+		);
+		$content = str_replace($search, $replacement, $content);
 
-        $body = 'if (!function_exists(\''.$funcName."')) {\nfunction ".$funcName.'('.$paramstr.') {'."\n$init".Dwoo_Compiler::PHP_CLOSE.
-            $prepend.$content.$append.
-            Dwoo_Compiler::PHP_OPEN.$cleanup."\n}\n}";
-        $compiler->addTemplatePlugin($params['name'], $params['*'], $params['uuid'], $body);
-    }
+		$body = 'if (!function_exists(\''.$funcName."')) {\nfunction ".$funcName.'('.$paramstr.') {'."\n$init".Dwoo_Compiler::PHP_CLOSE.
+			$prepend.$content.$append.
+			Dwoo_Compiler::PHP_OPEN.$cleanup."\n}\n}";
+		$compiler->addTemplatePlugin($params['name'], $params['*'], $params['uuid'], $body);
+	}
 }

lib/plugins/builtin/functions/load_templates.php

Indentation +48 added lines, -48 removed lines

@@ -21,61 +21,61 @@ 
  */
 function Dwoo_Plugin_load_templates_compile(Dwoo_Compiler $compiler, $file)
 {
-    $file = substr($file, 1, -1);
+	$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 Dwoo_Compilation_Exception($compiler, 'Load Templates : Resource "'.$resource.':'.$identifier.'" not found.');
-    } elseif ($tpl === false) {
-        throw new Dwoo_Compilation_Exception($compiler, 'Load Templates : Resource "'.$resource.'" does not support includes.');
-    }
+	if ($tpl === null) {
+		throw new Dwoo_Compilation_Exception($compiler, 'Load Templates : Resource "'.$resource.':'.$identifier.'" not found.');
+	} elseif ($tpl === false) {
+		throw new Dwoo_Compilation_Exception($compiler, 'Load Templates : Resource "'.$resource.'" does not support includes.');
+	}
 
-    $cmp = clone $compiler;
-    $cmp->compile($compiler->getDwoo(), $tpl);
-    $usedTemplates = array($tpl);
-    foreach ($cmp->getTemplatePlugins() as $template=>$args) {
-        if (isset($args['sourceTpl'])) {
-            $sourceTpl = $args['sourceTpl'];
-        } else {
-            $sourceTpl = $tpl;
-        }
+	$cmp = clone $compiler;
+	$cmp->compile($compiler->getDwoo(), $tpl);
+	$usedTemplates = array($tpl);
+	foreach ($cmp->getTemplatePlugins() as $template=>$args) {
+		if (isset($args['sourceTpl'])) {
+			$sourceTpl = $args['sourceTpl'];
+		} else {
+			$sourceTpl = $tpl;
+		}
 
-        $compiler->addTemplatePlugin($template, $args['params'], $args['uuid'], $args['body'], $sourceTpl);
+		$compiler->addTemplatePlugin($template, $args['params'], $args['uuid'], $args['body'], $sourceTpl);
 
-        if (!in_array($sourceTpl, $usedTemplates, true)) {
-            $usedTemplates[] = $sourceTpl;
-        }
-    }
-    foreach ($cmp->getUsedPlugins() as $plugin=>$type) {
-        $compiler->addUsedPlugin($plugin, $type);
-    }
+		if (!in_array($sourceTpl, $usedTemplates, true)) {
+			$usedTemplates[] = $sourceTpl;
+		}
+	}
+	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";
 
-    foreach ($usedTemplates AS $usedTemplate) {
-        $modCheck = $usedTemplate->getIsModifiedCode();
+	foreach ($usedTemplates AS $usedTemplate) {
+		$modCheck = $usedTemplate->getIsModifiedCode();
 
-        if ($modCheck) {
-            $out .= 'if (!('.$modCheck.')) { ob_end_clean(); return false; }';
-        } else {
-            $usedTemplateResourceName = $usedTemplate->getResourceName();
-            $usedTemplateResourceIdentifier = $usedTemplate->getResourceIdentifier();
-            $out .= '
+		if ($modCheck) {
+			$out .= 'if (!('.$modCheck.')) { ob_end_clean(); return false; }';
+		} else {
+			$usedTemplateResourceName = $usedTemplate->getResourceName();
+			$usedTemplateResourceIdentifier = $usedTemplate->getResourceIdentifier();
+			$out .= '
 try {
 	$tpl = $this->templateFactory("'.$usedTemplateResourceName.'", "'.$usedTemplateResourceIdentifier.'");
 } catch (Dwoo_Exception $e) {
@@ -86,8 +86,8 @@ 
 elseif ($tpl === false)
 	$this->triggerError(\'Load Templates : Resource "'.$usedTemplateResourceName.'" does not support extends.\', E_USER_WARNING);
 if ($tpl->getUid() != "'.$usedTemplate->getUid().'") { ob_end_clean(); return false; }';
-        }
-    }
+		}
+	}
 
-    return $out;
+	return $out;
 }