xpressengine / xe-core

classes/template/TemplateHandler.class.php

Spacing +153 added lines, -153 removed lines

@@ -16,7 +16,7 @@ 
 	private $path = NULL; ///< target directory
 	private $filename = NULL; ///< target filename
 	private $file = NULL; ///< target file (fullpath)
-	private $xe_path = NULL;  ///< XpressEngine base path
+	private $xe_path = NULL; ///< XpressEngine base path
 	private $web_path = NULL; ///< tpl file web path
 	private $compiled_file = NULL; ///< tpl file web path
 	private $config = NULL;
@@ -33,11 +33,11 @@ 
 	{
 		ini_set('pcre.jit', "0");
 		$this->xe_path = rtrim(getScriptPath(), '/');
-		$this->compiled_path = _XE_PATH_ . $this->compiled_path;
+		$this->compiled_path = _XE_PATH_.$this->compiled_path;
 		$this->config = new stdClass();
 
 		$this->ignoreEscape = array(
-			'html_content' => function ($m) {
+			'html_content' => function($m) {
 				$list = array(
 					'$content', // 레이아웃 등
 					'$editor', // 에디터 출력
@@ -54,7 +54,7 @@ 
 				);
 				return in_array($m[1], $list);
 			},
-			'url' => function ($m) {
+			'url' => function($m) {
 				$list = array(
 					'getUrl',
 					'getNotEncodedUrl',
@@ -69,7 +69,7 @@ 
 				);
 				return in_array(array_shift(explode('(', $m[1])), $list);
 			},
-			'methods' => function ($m) {
+			'methods' => function($m) {
 				$list = array(
 					'getEditor',
 					'getCommentEditor',
@@ -82,16 +82,16 @@ 
 					'getSignature', // 회원 서명
 					'printExtraImages', // new, file 아이콘 등
 				);
-				return preg_match('/\-\>(' . implode('|', $list) . ')\(/', $m[1]);
+				return preg_match('/\-\>('.implode('|', $list).')\(/', $m[1]);
 			},
-			'functions' => function ($m) {
+			'functions' => function($m) {
 				$list = array(
 					'htmlspecialchars',
 					'nl2br',
 				);
-				return preg_match('/^(' . implode('|', $list) . ')\(/', $m[1]);
+				return preg_match('/^('.implode('|', $list).')\(/', $m[1]);
 			},
-			'lang' => function ($m) {
+			'lang' => function($m) {
 				// 다국어
 				return preg_match('/^\$lang\-\>/', trim($m[1]));
 			}
@@ -108,9 +108,9 @@ 
 	{
 		static $oTemplate = NULL;
 
-		if(__DEBUG__ == 3)
+		if (__DEBUG__ == 3)
 		{
-			if(!isset($GLOBALS['__TemplateHandlerCalled__']))
+			if (!isset($GLOBALS['__TemplateHandlerCalled__']))
 			{
 				$GLOBALS['__TemplateHandlerCalled__'] = 1;
 			}
@@ -120,7 +120,7 @@ 
 			}
 		}
 
-		if(!$oTemplate)
+		if (!$oTemplate)
 		{
 			$oTemplate = new TemplateHandler();
 		}
@@ -138,23 +138,23 @@ 
 	protected function init($tpl_path, $tpl_filename, $tpl_file = '')
 	{
 		// verify arguments
-		if(substr($tpl_path, -1) != '/')
+		if (substr($tpl_path, -1) != '/')
 		{
 			$tpl_path .= '/';
 		}
-		if(!is_dir($tpl_path))
+		if (!is_dir($tpl_path))
 		{
 			return;
 		}
-		if(!file_exists($tpl_path . $tpl_filename) && file_exists($tpl_path . $tpl_filename . '.html'))
+		if (!file_exists($tpl_path.$tpl_filename) && file_exists($tpl_path.$tpl_filename.'.html'))
 		{
 			$tpl_filename .= '.html';
 		}
 
 		// create tpl_file variable
-		if(!$tpl_file)
+		if (!$tpl_file)
 		{
-			$tpl_file = $tpl_path . $tpl_filename;
+			$tpl_file = $tpl_path.$tpl_filename;
 		}
 
 		// set template file infos.
@@ -162,10 +162,10 @@ 
 		$this->filename = $tpl_filename;
 		$this->file = $tpl_file;
 
-		$this->web_path = $this->xe_path . '/' . ltrim(preg_replace('@^' . preg_quote(_XE_PATH_, '@') . '|\./@', '', $this->path), '/');
+		$this->web_path = $this->xe_path.'/'.ltrim(preg_replace('@^'.preg_quote(_XE_PATH_, '@').'|\./@', '', $this->path), '/');
 
 		// get compiled file name
-		$hash = md5($this->file . __XE_VERSION__);
+		$hash = md5($this->file.__XE_VERSION__);
 		$this->compiled_file = "{$this->compiled_path}{$hash}.compiled.php";
 
 		$this->safeguard = $this->isSafeguard();
@@ -188,7 +188,7 @@ 
 		$buff = false;
 
 		// store the starting time for debug information
-		if(__DEBUG__ == 3)
+		if (__DEBUG__ == 3)
 		{
 			$start = getMicroTime();
 		}
@@ -197,13 +197,13 @@ 
 		$this->init($tpl_path, $tpl_filename, $tpl_file);
 
 		// if target file does not exist exit
-		if(!$this->file || !file_exists($this->file))
+		if (!$this->file || !file_exists($this->file))
 		{
 			return "Err : '{$this->file}' template file does not exists.";
 		}
 
 		// for backward compatibility
-		if(is_null(self::$rootTpl))
+		if (is_null(self::$rootTpl))
 		{
 			self::$rootTpl = $this->file;
 		}
@@ -215,23 +215,23 @@ 
 		$oCacheHandler = CacheHandler::getInstance('template');
 
 		// get cached buff
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$cache_key = 'template:' . $this->file;
+			$cache_key = 'template:'.$this->file;
 			$buff = $oCacheHandler->get($cache_key, $latest_mtime);
 		}
 		else
 		{
-			if(is_readable($this->compiled_file) && filemtime($this->compiled_file) > $latest_mtime && filesize($this->compiled_file))
+			if (is_readable($this->compiled_file) && filemtime($this->compiled_file) > $latest_mtime && filesize($this->compiled_file))
 			{
-				$buff = 'file://' . $this->compiled_file;
+				$buff = 'file://'.$this->compiled_file;
 			}
 		}
 
-		if($buff === FALSE)
+		if ($buff === FALSE)
 		{
 			$buff = $this->parse();
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$oCacheHandler->put($cache_key, $buff);
 			}
@@ -243,13 +243,13 @@ 
 
 		$output = $this->_fetch($buff);
 
-		if($__templatehandler_root_tpl == $this->file)
+		if ($__templatehandler_root_tpl == $this->file)
 		{
 			$__templatehandler_root_tpl = null;
 		}
 
 		// store the ending time for debug information
-		if(__DEBUG__ == 3)
+		if (__DEBUG__ == 3)
 		{
 			$GLOBALS['__template_elapsed__'] += getMicroTime() - $start;
 		}
@@ -268,7 +268,7 @@ 
 		$this->init($tpl_path, $tpl_filename, null);
 
 		// if target file does not exist exit
-		if(!$this->file || !file_exists($this->file))
+		if (!$this->file || !file_exists($this->file))
 		{
 			Context::close();
 			exit("Cannot find the template file: '{$this->file}'");
@@ -284,9 +284,9 @@ 
 	 */
 	protected function parse($buff = null)
 	{
-		if(is_null($buff))
+		if (is_null($buff))
 		{
-			if(!is_readable($this->file))
+			if (!is_readable($this->file))
 			{
 				return;
 			}
@@ -296,7 +296,7 @@ 
 		}
 
 		// HTML tags to skip
-		if(is_null($this->skipTags))
+		if (is_null($this->skipTags))
 		{
 			$this->skipTags = array('marquee');
 		}
@@ -306,13 +306,13 @@ 
 		$this->config = new stdClass();
 		$this->config->autoescape = null;
 
-		if(preg_match('/\<config( [^\>\/]+)/', $buff, $config_match))
+		if (preg_match('/\<config( [^\>\/]+)/', $buff, $config_match))
 		{
-			if(preg_match_all('@ (?<name>\w+)="(?<value>[^"]+)"@', $config_match[1], $config_matches, PREG_SET_ORDER))
+			if (preg_match_all('@ (?<name>\w+)="(?<value>[^"]+)"@', $config_match[1], $config_matches, PREG_SET_ORDER))
 			{
-				foreach($config_matches as $config_match)
+				foreach ($config_matches as $config_match)
 				{
-					if($config_match['name'] === 'autoescape')
+					if ($config_match['name'] === 'autoescape')
 					{
 						$this->config->autoescape = $config_match['value'];
 					}
@@ -320,7 +320,7 @@ 
 			}
 		}
 
-		if($this->config->autoescape === 'on') $this->safeguard = true;
+		if ($this->config->autoescape === 'on') $this->safeguard = true;
 
 		// replace comments
 		$buff = preg_replace('@<!--//.*?-->@s', '', $buff);
@@ -339,13 +339,13 @@ 
 
 		// form auto generation
 		$temp = preg_replace_callback('/(<form(?:<\?php.+?\?>|[^<>]+)*?>)(.*?)(<\/form>)/is', array($this, '_compileFormAuthGeneration'), $buff);
-		if($temp)
+		if ($temp)
 		{
 			$buff = $temp;
 		}
 
 		// prevent from calling directly before writing into file
-		$buff = '<?php if(!defined("__XE__"))exit;?>' . $buff;
+		$buff = '<?php if(!defined("__XE__"))exit;?>'.$buff;
 
 		// remove php script reopening
 		$buff = preg_replace(array('/(\n|\r\n)+/', '/(;)?( )*\?\>\<\?php([\n\t ]+)?/'), array("\n", ";\n"), $buff);
@@ -368,40 +368,40 @@ 
 	private function _compileFormAuthGeneration($matches)
 	{
 		// form ruleset attribute move to hidden tag
-		if($matches[1])
+		if ($matches[1])
 		{
 			preg_match('/ruleset="([^"]*?)"/is', $matches[1], $m);
-			if($m[0])
+			if ($m[0])
 			{
-				$matches[1] = preg_replace('/' . addcslashes($m[0], '?$') . '/i', '', $matches[1]);
+				$matches[1] = preg_replace('/'.addcslashes($m[0], '?$').'/i', '', $matches[1]);
 
-				if(strpos($m[1], '@') !== FALSE)
+				if (strpos($m[1], '@') !== FALSE)
 				{
 					$path = str_replace('@', '', $m[1]);
-					$path = './files/ruleset/' . $path . '.xml';
+					$path = './files/ruleset/'.$path.'.xml';
 				}
-				else if(strpos($m[1], '#') !== FALSE)
+				else if (strpos($m[1], '#') !== FALSE)
 				{
 					$fileName = str_replace('#', '', $m[1]);
 					$fileName = str_replace('<?php echo ', '', $fileName);
 					$fileName = str_replace(' ?>', '', $fileName);
-					$path = '#./files/ruleset/' . $fileName . '.xml';
+					$path = '#./files/ruleset/'.$fileName.'.xml';
 
 					preg_match('@(?:^|\.?/)(modules/[\w-]+)@', $this->path, $mm);
 					$module_path = $mm[1];
 					list($rulsetFile) = explode('.', $fileName);
-					$autoPath = $module_path . '/ruleset/' . $rulsetFile . '.xml';
+					$autoPath = $module_path.'/ruleset/'.$rulsetFile.'.xml';
 					$m[1] = $rulsetFile;
 				}
-				else if(preg_match('@(?:^|\.?/)(modules/[\w-]+)@', $this->path, $mm))
+				else if (preg_match('@(?:^|\.?/)(modules/[\w-]+)@', $this->path, $mm))
 				{
 					$module_path = $mm[1];
-					$path = $module_path . '/ruleset/' . $m[1] . '.xml';
+					$path = $module_path.'/ruleset/'.$m[1].'.xml';
 				}
 
-				$matches[2] = '<input type="hidden" name="ruleset" value="' . $m[1] . '" />' . $matches[2];
+				$matches[2] = '<input type="hidden" name="ruleset" value="'.$m[1].'" />'.$matches[2];
 				//assign to addJsFile method for js dynamic recache
-				$matches[1] = '<?php Context::addJsFile("' . $path . '", FALSE, "", 0, "body", TRUE, "' . $autoPath . '") ?' . '>' . $matches[1];
+				$matches[1] = '<?php Context::addJsFile("'.$path.'", FALSE, "", 0, "body", TRUE, "'.$autoPath.'") ?'.'>'.$matches[1];
 			}
 		}
 
@@ -409,22 +409,22 @@ 
 		preg_match_all('/<input[^>]* name="(act|mid|vid)"/is', $matches[2], $m2);
 		$checkVar = array('act', 'mid', 'vid');
 		$resultArray = array_diff($checkVar, $m2[1]);
-		if(is_array($resultArray))
+		if (is_array($resultArray))
 		{
 			$generatedHidden = '';
-			foreach($resultArray AS $key => $value)
+			foreach ($resultArray AS $key => $value)
 			{
-				$generatedHidden .= '<input type="hidden" name="' . $value . '" value="<?php echo $__Context->' . $value . ' ?>" />';
+				$generatedHidden .= '<input type="hidden" name="'.$value.'" value="<?php echo $__Context->'.$value.' ?>" />';
 			}
-			$matches[2] = $generatedHidden . $matches[2];
+			$matches[2] = $generatedHidden.$matches[2];
 		}
 
 		// return url generate
-		if(!preg_match('/no-error-return-url="true"/i', $matches[1]))
+		if (!preg_match('/no-error-return-url="true"/i', $matches[1]))
 		{
 			preg_match('/<input[^>]*name="error_return_url"[^>]*>/is', $matches[2], $m3);
-			if(!$m3[0])
-				$matches[2] = '<input type="hidden" name="error_return_url" value="<?php echo htmlspecialchars(getRequestUriByServerEnviroment(), ENT_COMPAT | ENT_HTML401, \'UTF-8\', false) ?>" />' . $matches[2];
+			if (!$m3[0])
+				$matches[2] = '<input type="hidden" name="error_return_url" value="<?php echo htmlspecialchars(getRequestUriByServerEnviroment(), ENT_COMPAT | ENT_HTML401, \'UTF-8\', false) ?>" />'.$matches[2];
 		}
 		else
 		{
@@ -442,7 +442,7 @@ 
 	 */
 	private function _fetch($buff)
 	{
-		if(!$buff)
+		if (!$buff)
 		{
 			return;
 		}
@@ -450,20 +450,20 @@ 
 		$__Context = &$GLOBALS['__Context__'];
 		$__Context->tpl_path = $this->path;
 
-		if($_SESSION['is_logged'])
+		if ($_SESSION['is_logged'])
 		{
 			$__Context->logged_info = Context::get('logged_info');
 		}
 
 		$level = ob_get_level();
 		ob_start();
-		if(substr($buff, 0, 7) == 'file://')
+		if (substr($buff, 0, 7) == 'file://')
 		{
-			if(__DEBUG__)
+			if (__DEBUG__)
 			{
 				//load cache file from disk
 				$eval_str = FileHandler::readFile(substr($buff, 7));
-				$eval_str_buffed = "?>" . $eval_str;
+				$eval_str_buffed = "?>".$eval_str;
 				@eval($eval_str_buffed);
 				$error_info = error_get_last();
 				//parse error
@@ -479,7 +479,7 @@ 
 		}
 		else
 		{
-			$eval_str = "?>" . $buff;
+			$eval_str = "?>".$buff;
 			@eval($eval_str);
 			$error_info = error_get_last();
 			//parse error
@@ -508,31 +508,31 @@ 
 	private function _replacePath($match)
 	{
 		//return origin conde when src value started '${'.
-		if(preg_match('@^\${@', $match[1]))
+		if (preg_match('@^\${@', $match[1]))
 		{
 			return $match[0];
 		}
 
 		//return origin code when src value include variable.
-		if(preg_match('@^[\'|"]\s*\.\s*\$@', $match[1]))
+		if (preg_match('@^[\'|"]\s*\.\s*\$@', $match[1]))
 		{
 			return $match[0];
 		}
 
 		$src = preg_replace('@^(\./)+@', '', trim($match[1]));
 
-		$src = $this->web_path . $src;
+		$src = $this->web_path.$src;
 		$src = str_replace('/./', '/', $src);
 
 		// for backward compatibility
 		$src = preg_replace('@/((?:[\w-]+/)+)\1@', '/\1', $src);
 
-		while(($tmp = preg_replace('@[^/]+/\.\./@', '', $src, 1)) !== $src)
+		while (($tmp = preg_replace('@[^/]+/\.\./@', '', $src, 1)) !== $src)
 		{
 			$src = $tmp;
 		}
 
-		return substr($match[0], 0, -strlen($match[1]) - 6) . "src=\"{$src}\"";
+		return substr($match[0], 0, -strlen($match[1]) - 6)."src=\"{$src}\"";
 	}
 
 	/**
@@ -542,19 +542,19 @@ 
 	 */
 	private function _parseInline($buff)
 	{
-		if(!preg_match_all('/<([a-zA-Z]+\d?)(?:\s)/', $buff, $match))
+		if (!preg_match_all('/<([a-zA-Z]+\d?)(?:\s)/', $buff, $match))
 		{
 			return $buff;
 		}
 
 		$tags = array_diff(array_unique($match[1]), $this->skipTags);
 
-		if(!count($tags))
+		if (!count($tags))
 		{
 			return $buff;
 		}
 
-		$tags = '(?:' . implode('|', $tags) . ')';
+		$tags = '(?:'.implode('|', $tags).')';
 		$split_regex = "@(<(?>/?{$tags})(?>[^<>\{\}\"']+|<!--.*?-->|{[^}]+}|\".*?\"|'.*?'|.)*?>)@s";
 
 		$nodes = preg_split($split_regex, $buff, -1, PREG_SPLIT_DELIM_CAPTURE);
@@ -562,14 +562,14 @@ 
 		// list of self closing tags
 		$self_closing = array('area' => 1, 'base' => 1, 'basefont' => 1, 'br' => 1, 'hr' => 1, 'input' => 1, 'img' => 1, 'link' => 1, 'meta' => 1, 'param' => 1, 'frame' => 1, 'col' => 1);
 
-		for($idx = 1, $node_len = count($nodes); $idx < $node_len; $idx+=2)
+		for ($idx = 1, $node_len = count($nodes); $idx < $node_len; $idx += 2)
 		{
-			if(!($node = $nodes[$idx]))
+			if (!($node = $nodes[$idx]))
 			{
 				continue;
 			}
 
-			if(preg_match_all('@\s(loop|cond)="([^"]+)"@', $node, $matches))
+			if (preg_match_all('@\s(loop|cond)="([^"]+)"@', $node, $matches))
 			{
 				// this tag
 				$tag = substr($node, 1, strpos($node, ' ') - 1);
@@ -578,37 +578,37 @@ 
 				$closing = 0;
 
 				// process opening tag
-				foreach($matches[1] as $n => $stmt)
+				foreach ($matches[1] as $n => $stmt)
 				{
 					$expr = $matches[2][$n];
 					$expr = $this->_replaceVar($expr);
 					$closing++;
 
-					switch($stmt)
+					switch ($stmt)
 					{
 						case 'cond':
 							$nodes[$idx - 1] .= "<?php if({$expr}){ ?>";
 							break;
 						case 'loop':
-							if(!preg_match('@^(?:(.+?)=>(.+?)(?:,(.+?))?|(.*?;.*?;.*?)|(.+?)\s*=\s*(.+?))$@', $expr, $expr_m))
+							if (!preg_match('@^(?:(.+?)=>(.+?)(?:,(.+?))?|(.*?;.*?;.*?)|(.+?)\s*=\s*(.+?))$@', $expr, $expr_m))
 							{
 								break;
 							}
-							if($expr_m[1])
+							if ($expr_m[1])
 							{
 								$expr_m[1] = trim($expr_m[1]);
 								$expr_m[2] = trim($expr_m[2]);
-								if($expr_m[3])
+								if ($expr_m[3])
 								{
-									$expr_m[2] .= '=>' . trim($expr_m[3]);
+									$expr_m[2] .= '=>'.trim($expr_m[3]);
 								}
 								$nodes[$idx - 1] .= "<?php if({$expr_m[1]}&&count({$expr_m[1]}))foreach({$expr_m[1]} as {$expr_m[2]}){ ?>";
 							}
-							elseif($expr_m[4])
+							elseif ($expr_m[4])
 							{
 								$nodes[$idx - 1] .= "<?php for({$expr_m[4]}){ ?>";
 							}
-							elseif($expr_m[5])
+							elseif ($expr_m[5])
 							{
 								$nodes[$idx - 1] .= "<?php while({$expr_m[5]}={$expr_m[6]}){ ?>";
 							}
@@ -618,28 +618,28 @@ 
 				$node = preg_replace('@\s(loop|cond)="([^"]+)"@', '', $node);
 
 				// find closing tag
-				$close_php = '<?php ' . str_repeat('}', $closing) . ' ?>';
+				$close_php = '<?php '.str_repeat('}', $closing).' ?>';
 				//  self closing tag
-				if($node{1} == '!' || substr($node, -2, 1) == '/' || isset($self_closing[$tag]))
+				if ($node{1} == '!' || substr($node, -2, 1) == '/' || isset($self_closing[$tag]))
 				{
-					$nodes[$idx + 1] = $close_php . $nodes[$idx + 1];
+					$nodes[$idx + 1] = $close_php.$nodes[$idx + 1];
 				}
 				else
 				{
 					$depth = 1;
-					for($i = $idx + 2; $i < $node_len; $i+=2)
+					for ($i = $idx + 2; $i < $node_len; $i += 2)
 					{
 						$nd = $nodes[$i];
-						if(strpos($nd, $tag) === 1)
+						if (strpos($nd, $tag) === 1)
 						{
 							$depth++;
 						}
-						elseif(strpos($nd, '/' . $tag) === 1)
+						elseif (strpos($nd, '/'.$tag) === 1)
 						{
 							$depth--;
-							if(!$depth)
+							if (!$depth)
 							{
-								$nodes[$i - 1] .= $nodes[$i] . $close_php;
+								$nodes[$i - 1] .= $nodes[$i].$close_php;
 								$nodes[$i] = '';
 								break;
 							}
@@ -648,13 +648,13 @@ 
 				}
 			}
 
-			if(strpos($node, '|cond="') !== false)
+			if (strpos($node, '|cond="') !== false)
 			{
 				$node = preg_replace('@(\s[-\w:]+(?:="[^"]+?")?)\|cond="(.+?)"@s', '<?php if($2){ ?>$1<?php } ?>', $node);
 				$node = $this->_replaceVar($node);
 			}
 
-			if($nodes[$idx] != $node)
+			if ($nodes[$idx] != $node)
 			{
 				$nodes[$idx] = $node;
 			}
@@ -675,7 +675,7 @@ 
 	{
 		$escape_option = 'noescape';
 
-		if($this->safeguard)
+		if ($this->safeguard)
 		{
 			$escape_option = 'autoescape';
 		}
@@ -686,14 +686,14 @@ 
 		}
 
 		// {@ ... } or {$var} or {func(...)}
-		if($m[1])
+		if ($m[1])
 		{
-			if(preg_match('@^(\w+)\(@', $m[1], $mm) && !function_exists($mm[1]))
+			if (preg_match('@^(\w+)\(@', $m[1], $mm) && !function_exists($mm[1]))
 			{
 				return $m[0];
 			}
 			
-			if($m[1]{0} == '@')
+			if ($m[1]{0} == '@')
 			{
 				$m[1] = $this->_replaceVar(substr($m[1], 1));
 				return "<?php {$m[1]} ?>";
@@ -703,7 +703,7 @@ 
 				// Get escape options.
 				foreach ($this->ignoreEscape as $key => $value)
 				{
-					if($this->ignoreEscape[$key]($m))
+					if ($this->ignoreEscape[$key]($m))
 					{
 						$escape_option = 'noescape';
 						break;
@@ -734,7 +734,7 @@ 
 						$filter_option = $matches[2];
 						if (!self::_isVar($filter_option) && !preg_match("/^'.*'$/", $filter_option) && !preg_match('/^".*"$/', $filter_option))
 						{
-							$filter_option = "'" . escape_sqstr($filter_option) . "'";
+							$filter_option = "'".escape_sqstr($filter_option)."'";
 						}
 						else
 						{
@@ -833,18 +833,18 @@ 
 				}
 
 				// Apply the escape option and return.
-				return '<?php echo ' . $this->_applyEscapeOption($var, $escape_option) . ' ?>';
+				return '<?php echo '.$this->_applyEscapeOption($var, $escape_option).' ?>';
 			}
 		}
 
-		if($m[3])
+		if ($m[3])
 		{
 			$attr = array();
-			if($m[5])
+			if ($m[5])
 			{
-				if(preg_match_all('@,(\w+)="([^"]+)"@', $m[6], $mm))
+				if (preg_match_all('@,(\w+)="([^"]+)"@', $m[6], $mm))
 				{
-					foreach($mm[1] as $idx => $name)
+					foreach ($mm[1] as $idx => $name)
 					{
 						$attr[$name] = $mm[2][$idx];
 					}
@@ -853,21 +853,21 @@ 
 			}
 			else
 			{
-				if(!preg_match_all('@ (\w+)="([^"]+)"@', $m[6], $mm))
+				if (!preg_match_all('@ (\w+)="([^"]+)"@', $m[6], $mm))
 				{
 					return $m[0];
 				}
-				foreach($mm[1] as $idx => $name)
+				foreach ($mm[1] as $idx => $name)
 				{
 					$attr[$name] = $mm[2][$idx];
 				}
 			}
 
-			switch($m[3])
+			switch ($m[3])
 			{
 				// <!--#include--> or <include ..>
 				case 'include':
-					if(!$this->file || !$attr['target'])
+					if (!$this->file || !$attr['target'])
 					{
 						return '';
 					}
@@ -875,7 +875,7 @@ 
 					$pathinfo = pathinfo($attr['target']);
 					$fileDir = $this->_getRelativeDir($pathinfo['dirname']);
 
-					if(!$fileDir)
+					if (!$fileDir)
 					{
 						return '';
 					}
@@ -885,7 +885,7 @@ 
 				case 'load_js_plugin':
 					$plugin = $this->_replaceVar($m[5]);
 					$s = "<!--#JSPLUGIN:{$plugin}-->";
-					if(strpos($plugin, '$__Context') === false)
+					if (strpos($plugin, '$__Context') === false)
 					{
 						$plugin = "'{$plugin}'";
 					}
@@ -901,13 +901,13 @@ 
 					$doUnload = ($m[3] === 'unload');
 					$isRemote = !!preg_match('@^(https?:)?//@i', $attr['target']);
 
-					if(!$isRemote)
+					if (!$isRemote)
 					{
-						if(!preg_match('@^\.?/@', $attr['target']))
+						if (!preg_match('@^\.?/@', $attr['target']))
 						{
-							$attr['target'] = './' . $attr['target'];
+							$attr['target'] = './'.$attr['target'];
 						}
-						if(substr($attr['target'], -5) == '/lang')
+						if (substr($attr['target'], -5) == '/lang')
 						{
 							$pathinfo['dirname'] .= '/lang';
 							$pathinfo['basename'] = '';
@@ -916,18 +916,18 @@ 
 
 						$relativeDir = $this->_getRelativeDir($pathinfo['dirname']);
 
-						$attr['target'] = $relativeDir . '/' . $pathinfo['basename'];
+						$attr['target'] = $relativeDir.'/'.$pathinfo['basename'];
 					}
 
-					switch($pathinfo['extension'])
+					switch ($pathinfo['extension'])
 					{
 						case 'xml':
-							if($isRemote || $doUnload)
+							if ($isRemote || $doUnload)
 							{
 								return '';
 							}
 							// language file?
-							if($pathinfo['basename'] == 'lang.xml' || substr($pathinfo['dirname'], -5) == '/lang')
+							if ($pathinfo['basename'] == 'lang.xml' || substr($pathinfo['dirname'], -5) == '/lang')
 							{
 								$result = "Context::loadLang('{$relativeDir}');";
 							}
@@ -937,7 +937,7 @@ 
 							}
 							break;
 						case 'js':
-							if($doUnload)
+							if ($doUnload)
 							{
 								$result = "Context::unloadFile('{$attr['target']}','{$attr['targetie']}');";
 							}
@@ -948,7 +948,7 @@ 
 							}
 							break;
 						case 'css':
-							if($doUnload)
+							if ($doUnload)
 							{
 								$result = "Context::unloadFile('{$attr['target']}','{$attr['targetie']}','{$attr['media']}');";
 							}
@@ -961,20 +961,20 @@ 
 					}
 
 					$result = "<?php {$result} ?>";
-					if($metafile)
+					if ($metafile)
 					{
-						$result = "<!--#Meta:{$metafile}-->" . $result;
+						$result = "<!--#Meta:{$metafile}-->".$result;
 					}
 
 					return $result;
 				// <config ...>
 				case 'config':
 					$result = '';
-					if(preg_match_all('@ (\w+)="([^"]+)"@', $m[6], $config_matches, PREG_SET_ORDER))
+					if (preg_match_all('@ (\w+)="([^"]+)"@', $m[6], $config_matches, PREG_SET_ORDER))
 					{
-						foreach($config_matches as $config_match)
+						foreach ($config_matches as $config_match)
 						{
-							$result .= "\$this->config->{$config_match[1]} = '" . trim(strtolower($config_match[2])) . "';";
+							$result .= "\$this->config->{$config_match[1]} = '".trim(strtolower($config_match[2]))."';";
 						}
 					}
 					return "<?php {$result} ?>";
@@ -982,45 +982,45 @@ 
 		}
 
 		// <!--@..--> such as <!--@if($cond)-->, <!--@else-->, <!--@end-->
-		if($m[7])
+		if ($m[7])
 		{
 			$m[7] = substr($m[7], 1);
-			if(!$m[7])
+			if (!$m[7])
 			{
-				return '<?php ' . $this->_replaceVar($m[8]) . '{ ?>' . $m[9];
+				return '<?php '.$this->_replaceVar($m[8]).'{ ?>'.$m[9];
 			}
-			if(!preg_match('/^(?:((?:end)?(?:if|switch|for(?:each)?|while)|end)|(else(?:if)?)|(break@)?(case|default)|(break))$/', $m[7], $mm))
+			if (!preg_match('/^(?:((?:end)?(?:if|switch|for(?:each)?|while)|end)|(else(?:if)?)|(break@)?(case|default)|(break))$/', $m[7], $mm))
 			{
 				return '';
 			}
-			if($mm[1])
+			if ($mm[1])
 			{
-				if($mm[1]{0} == 'e')
+				if ($mm[1]{0} == 'e')
 				{
-					return '<?php } ?>' . $m[9];
+					return '<?php } ?>'.$m[9];
 				}
 
 				$precheck = '';
-				if($mm[1] == 'switch')
+				if ($mm[1] == 'switch')
 				{
 					$m[9] = '';
 				}
-				elseif($mm[1] == 'foreach')
+				elseif ($mm[1] == 'foreach')
 				{
 					$var = preg_replace('/^\s*\(\s*(.+?) .*$/', '$1', $m[8]);
 					$precheck = "if({$var}&&count({$var}))";
 				}
-				return '<?php ' . $this->_replaceVar($precheck . $m[7] . $m[8]) . '{ ?>' . $m[9];
+				return '<?php '.$this->_replaceVar($precheck.$m[7].$m[8]).'{ ?>'.$m[9];
 			}
-			if($mm[2])
+			if ($mm[2])
 			{
-				return "<?php }{$m[7]}" . $this->_replaceVar($m[8]) . "{ ?>" . $m[9];
+				return "<?php }{$m[7]}".$this->_replaceVar($m[8])."{ ?>".$m[9];
 			}
-			if($mm[4])
+			if ($mm[4])
 			{
-				return "<?php " . ($mm[3] ? 'break;' : '') . "{$m[7]} " . trim($m[8], '()') . ": ?>" . $m[9];
+				return "<?php ".($mm[3] ? 'break;' : '')."{$m[7]} ".trim($m[8], '()').": ?>".$m[9];
 			}
-			if($mm[5])
+			if ($mm[5])
 			{
 				return "<?php break; ?>";
 			}
@@ -1034,7 +1034,7 @@ 
  	 */
  	private function _applyEscapeOption($str, $escape_option = 'noescape')
  	{
- 		switch($escape_option)
+ 		switch ($escape_option)
  		{
  			case 'escape':
  				return "escape({$str}, true)";
@@ -1058,30 +1058,30 @@ 
 		$_path = $path;
 
 		$fileDir = strtr(realpath($this->path), '\\', '/');
-		if($path{0} != '/')
+		if ($path{0} != '/')
 		{
-			$path = strtr(realpath($fileDir . '/' . $path), '\\', '/');
+			$path = strtr(realpath($fileDir.'/'.$path), '\\', '/');
 		}
 
 		// for backward compatibility
-		if(!$path)
+		if (!$path)
 		{
 			$dirs = explode('/', $fileDir);
 			$paths = explode('/', $_path);
 			$idx = array_search($paths[0], $dirs);
 
-			if($idx !== false)
+			if ($idx !== false)
 			{
-				while($dirs[$idx] && $dirs[$idx] === $paths[0])
+				while ($dirs[$idx] && $dirs[$idx] === $paths[0])
 				{
 					array_splice($dirs, $idx, 1);
 					array_shift($paths);
 				}
-				$path = strtr(realpath($fileDir . '/' . implode('/', $paths)), '\\', '/');
+				$path = strtr(realpath($fileDir.'/'.implode('/', $paths)), '\\', '/');
 			}
 		}
 
-		$path = preg_replace('/^' . preg_quote(_XE_PATH_, '/') . '/', '', $path);
+		$path = preg_replace('/^'.preg_quote(_XE_PATH_, '/').'/', '', $path);
 
 		return $path;
 	}
@@ -1104,7 +1104,7 @@ 
 	 */
 	function _replaceVar($php)
 	{
-		if(!strlen($php))
+		if (!strlen($php))
 		{
 			return '';
 		}
@@ -1120,13 +1120,13 @@ 
 		$dirSkins = '(layouts\/default|layouts\/user_layout|layouts\/xedition|layouts\/xedition\/demo|m\.layouts\/colorCode|m\.layouts\/default|m\.layouts\/simpleGray|modules\/board\/m\.skins\/default|modules\/board\/m\.skins\/simpleGray|modules\/board\/skins\/default|modules\/board\/skins\/xedition|modules\/communication\/m\.skins\/default|modules\/communication\/skins\/default|modules\/editor\/skins\/ckeditor|modules\/editor\/skins\/xpresseditor|modules\/integration_search\/skins\/default|modules\/layout\/faceoff|modules\/member\/m\.skins\/default|modules\/member\/skins\/default|modules\/message\/m\.skins\/default|modules\/message\/skins\/default|modules\/message\/skins\/xedition|modules\/page\/m\.skins\/default|modules\/page\/skins\/default|modules\/poll\/skins\/default|modules\/poll\/skins\/simple|widgets\/content\/skins\/default|widgets\/counter_status\/skins\/default|widgets\/language_select\/skins\/default|widgets\/login_info\/skins\/default|widgets\/mcontent\/skins\/default|widgetstyles\/simple)';
 
 		// 'tpl'
-		if(preg_match('/^(\.\/)?(modules\/' . $dirTpl . '|common)\/tpl\//', $absPath))
+		if (preg_match('/^(\.\/)?(modules\/'.$dirTpl.'|common)\/tpl\//', $absPath))
 		{
 			return true;
 		}
 
 		// skin, layout
-		if(preg_match('/^(\.\/)?(' . $dirSkin . '\//', $absPath))
+		if (preg_match('/^(\.\/)?('.$dirSkin.'\//', $absPath))
 		{
 			return true;
 		}

Braces +31 added lines, -48 removed lines

@@ -113,8 +113,7 @@ 
 			if(!isset($GLOBALS['__TemplateHandlerCalled__']))
 			{
 				$GLOBALS['__TemplateHandlerCalled__'] = 1;
-			}
-			else
+			} else
 			{
 				$GLOBALS['__TemplateHandlerCalled__']++;
 			}
@@ -219,8 +218,7 @@ 
 		{
 			$cache_key = 'template:' . $this->file;
 			$buff = $oCacheHandler->get($cache_key, $latest_mtime);
-		}
-		else
+		} else
 		{
 			if(is_readable($this->compiled_file) && filemtime($this->compiled_file) > $latest_mtime && filesize($this->compiled_file))
 			{
@@ -234,8 +232,7 @@ 
 			if($oCacheHandler->isSupport())
 			{
 				$oCacheHandler->put($cache_key, $buff);
-			}
-			else
+			} else
 			{
 				FileHandler::writeFile($this->compiled_file, $buff);
 			}
@@ -320,7 +317,9 @@ 
 			}
 		}
 
-		if($this->config->autoescape === 'on') $this->safeguard = true;
+		if($this->config->autoescape === 'on') {
+			$this->safeguard = true;
+		}
 
 		// replace comments
 		$buff = preg_replace('@<!--//.*?-->@s', '', $buff);
@@ -379,8 +378,7 @@ 
 				{
 					$path = str_replace('@', '', $m[1]);
 					$path = './files/ruleset/' . $path . '.xml';
-				}
-				else if(strpos($m[1], '#') !== FALSE)
+				} else if(strpos($m[1], '#') !== FALSE)
 				{
 					$fileName = str_replace('#', '', $m[1]);
 					$fileName = str_replace('<?php echo ', '', $fileName);
@@ -392,8 +390,7 @@ 
 					list($rulsetFile) = explode('.', $fileName);
 					$autoPath = $module_path . '/ruleset/' . $rulsetFile . '.xml';
 					$m[1] = $rulsetFile;
-				}
-				else if(preg_match('@(?:^|\.?/)(modules/[\w-]+)@', $this->path, $mm))
+				} else if(preg_match('@(?:^|\.?/)(modules/[\w-]+)@', $this->path, $mm))
 				{
 					$module_path = $mm[1];
 					$path = $module_path . '/ruleset/' . $m[1] . '.xml';
@@ -423,10 +420,10 @@ 
 		if(!preg_match('/no-error-return-url="true"/i', $matches[1]))
 		{
 			preg_match('/<input[^>]*name="error_return_url"[^>]*>/is', $matches[2], $m3);
-			if(!$m3[0])
-				$matches[2] = '<input type="hidden" name="error_return_url" value="<?php echo htmlspecialchars(getRequestUriByServerEnviroment(), ENT_COMPAT | ENT_HTML401, \'UTF-8\', false) ?>" />' . $matches[2];
-		}
-		else
+			if(!$m3[0]) {
+							$matches[2] = '<input type="hidden" name="error_return_url" value="<?php echo htmlspecialchars(getRequestUriByServerEnviroment(), ENT_COMPAT | ENT_HTML401, \'UTF-8\', false) ?>" />' . $matches[2];
+			}
+		} else
 		{
 			$matches[1] = preg_replace('/no-error-return-url="true"/i', '', $matches[1]);
 		}
@@ -471,13 +468,11 @@ 
 				{
 				    throw new Exception("Error Parsing Template - {$error_info['message']} in template file {$this->file}");
 				}
-			}
-			else
+			} else
 			{
 				include(substr($buff, 7));
 			}
-		}
-		else
+		} else
 		{
 			$eval_str = "?>" . $buff;
 			@eval($eval_str);
@@ -603,12 +598,10 @@ 
 									$expr_m[2] .= '=>' . trim($expr_m[3]);
 								}
 								$nodes[$idx - 1] .= "<?php if({$expr_m[1]}&&count({$expr_m[1]}))foreach({$expr_m[1]} as {$expr_m[2]}){ ?>";
-							}
-							elseif($expr_m[4])
+							} elseif($expr_m[4])
 							{
 								$nodes[$idx - 1] .= "<?php for({$expr_m[4]}){ ?>";
-							}
-							elseif($expr_m[5])
+							} elseif($expr_m[5])
 							{
 								$nodes[$idx - 1] .= "<?php while({$expr_m[5]}={$expr_m[6]}){ ?>";
 							}
@@ -623,8 +616,7 @@ 
 				if($node{1} == '!' || substr($node, -2, 1) == '/' || isset($self_closing[$tag]))
 				{
 					$nodes[$idx + 1] = $close_php . $nodes[$idx + 1];
-				}
-				else
+				} else
 				{
 					$depth = 1;
 					for($i = $idx + 2; $i < $node_len; $i+=2)
@@ -633,8 +625,7 @@ 
 						if(strpos($nd, $tag) === 1)
 						{
 							$depth++;
-						}
-						elseif(strpos($nd, '/' . $tag) === 1)
+						} elseif(strpos($nd, '/' . $tag) === 1)
 						{
 							$depth--;
 							if(!$depth)
@@ -697,8 +688,7 @@ 
 			{
 				$m[1] = $this->_replaceVar(substr($m[1], 1));
 				return "<?php {$m[1]} ?>";
-			}
-			else
+			} else
 			{
 				// Get escape options.
 				foreach ($this->ignoreEscape as $key => $value)
@@ -715,8 +705,7 @@ 
 				{
 					$m[1] = $mm[1];
 					$filters = array_map('trim', explode_with_escape('|', substr($mm[2], 1)));
-				}
-				else
+				} else
 				{
 					$filters = array();
 				}
@@ -735,13 +724,11 @@ 
 						if (!self::_isVar($filter_option) && !preg_match("/^'.*'$/", $filter_option) && !preg_match('/^".*"$/', $filter_option))
 						{
 							$filter_option = "'" . escape_sqstr($filter_option) . "'";
-						}
-						else
+						} else
 						{
 							$filter_option = self::_replaceVar($filter_option);
 						}
-					}
-					else
+					} else
 					{
 						$filter_option = null;
 					}
@@ -817,8 +804,7 @@ 
 							{
 								$filter_option = $this->_applyEscapeOption($filter_option, 'autoescape');
 								$var = "'<a href=\"' . {$filter_option} . '\">' . {$var} . '</a>'";
-							}
-							else
+							} else
 							{
 								$var = "'<a href=\"' . {$var} . '\">' . {$var} . '</a>'";
 							}
@@ -850,8 +836,7 @@ 
 					}
 				}
 				$attr['target'] = $m[5];
-			}
-			else
+			} else
 			{
 				if(!preg_match_all('@ (\w+)="([^"]+)"@', $m[6], $mm))
 				{
@@ -930,8 +915,7 @@ 
 							if($pathinfo['basename'] == 'lang.xml' || substr($pathinfo['dirname'], -5) == '/lang')
 							{
 								$result = "Context::loadLang('{$relativeDir}');";
-							}
-							else
+							} else
 							{
 								$result = "require_once('./classes/xml/XmlJsFilter.class.php');\$__xmlFilter=new XmlJsFilter('{$relativeDir}','{$pathinfo['basename']}');\$__xmlFilter->compile();";
 							}
@@ -940,8 +924,7 @@ 
 							if($doUnload)
 							{
 								$result = "Context::unloadFile('{$attr['target']}','{$attr['targetie']}');";
-							}
-							else
+							} else
 							{
 								$metafile = $attr['target'];
 								$result = "\$__tmp=array('{$attr['target']}','{$attr['type']}','{$attr['targetie']}','{$attr['index']}');Context::loadFile(\$__tmp);unset(\$__tmp);";
@@ -951,8 +934,7 @@ 
 							if($doUnload)
 							{
 								$result = "Context::unloadFile('{$attr['target']}','{$attr['targetie']}','{$attr['media']}');";
-							}
-							else
+							} else
 							{
 								$metafile = $attr['target'];
 								$result = "\$__tmp=array('{$attr['target']}','{$attr['media']}','{$attr['targetie']}','{$attr['index']}');Context::loadFile(\$__tmp);unset(\$__tmp);";
@@ -1004,8 +986,7 @@ 
 				if($mm[1] == 'switch')
 				{
 					$m[9] = '';
-				}
-				elseif($mm[1] == 'foreach')
+				} elseif($mm[1] == 'foreach')
 				{
 					$var = preg_replace('/^\s*\(\s*(.+?) .*$/', '$1', $m[8]);
 					$precheck = "if({$var}&&count({$var}))";
@@ -1113,7 +1094,9 @@ 
 
 	function isSafeguard()
 	{
-		if ($this->dbinfo->safeguard === 'Y') return true;
+		if ($this->dbinfo->safeguard === 'Y') {
+			return true;
+		}
 
 		$absPath = str_replace(_XE_PATH_, '', $this->path);
 		$dirTpl = '(addon|admin|adminlogging|autoinstall|board|comment|communication|counter|document|editor|file|importer|install|integration_search|krzip|layout|member|menu|message|module|page|point|poll|rss|seo|session|spamfilter|syndication|tag|trash|widget)';