xpressengine / xe-core

tools/minify/cssmin/CSSmin.php

Doc Comments +11 added lines, -2 removed lines

@@ -606,6 +606,11 @@ 
  * ---------------------------------------------------------------------------------------------
  */
 
+/**
+ * @param double $v1
+ * @param double $v2
+ * @param integer $vh
+ */
 private function hue_to_rgb($v1, $v2, $vh)
 {
 	$vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh);
@@ -620,6 +625,10 @@ 
 	return intval(floor(floatval($n) + 0.5), 10);
 }
 
+/**
+ * @param integer $min
+ * @param integer $max
+ */
 private function clamp_number($n, $min, $max)
 {
 	return min(max($n, $min), $max);
@@ -648,7 +657,7 @@ 
  *
  * @param string   $str
  * @param int      $from index
- * @param int|bool $to index (optional)
+ * @param integer $to index (optional)
  * @return string
  */
 private function substring($str, $from = 0, $to = FALSE)
@@ -680,7 +689,7 @@ 
  *
  * @param string   $str
  * @param int      $start index
- * @param int|bool $end index (optional)
+ * @param integer $end index (optional)
  * @return string
  */
 private function str_slice($str, $start = 0, $end = FALSE)

Braces +9 added lines, -3 removed lines

@@ -609,9 +609,15 @@
 private function hue_to_rgb($v1, $v2, $vh)
 {
 	$vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh);
-	if ($vh * 6 < 1) return $v1 + ($v2 - $v1) * 6 * $vh;
-	if ($vh * 2 < 1) return $v2;
-	if ($vh * 3 < 2) return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6;
+	if ($vh * 6 < 1) {
+		return $v1 + ($v2 - $v1) * 6 * $vh;
+	}
+	if ($vh * 2 < 1) {
+		return $v2;
+	}
+	if ($vh * 3 < 2) {
+		return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6;
+	}
 	return $v1;
 }
 

Spacing +31 added lines, -31 removed lines

@@ -47,7 +47,7 @@ 
 		$this->memory_limit = 128 * 1048576; // 128MB in bytes
 		$this->max_execution_time = 60; // 1 min
 		$this->pcre_backtrack_limit = 1000 * 1000;
-		$this->pcre_recursion_limit =  500 * 1000;
+		$this->pcre_recursion_limit = 500 * 1000;
 
 		$this->raise_php_limits = (bool) $raise_php_limits;
 	}
@@ -84,8 +84,8 @@ 
 			}
 		$comment_found = $this->str_slice($css, $start_index + 2, $end_index);
 		$this->comments[] = $comment_found;
-		$comment_preserve_string = self::COMMENT . (count($this->comments) - 1) . '___';
-		$css = $this->str_slice($css, 0, $start_index + 2) . $comment_preserve_string . $this->str_slice($css, $end_index);
+		$comment_preserve_string = self::COMMENT.(count($this->comments) - 1).'___';
+		$css = $this->str_slice($css, 0, $start_index + 2).$comment_preserve_string.$this->str_slice($css, $end_index);
 		// Set correct start_index: Fixes issue #2528130
 		$start_index = $end_index + 2 + strlen($comment_preserve_string) - strlen($comment_found);
 	}
@@ -145,7 +145,7 @@ 
 }
 
 // Update the first chunk and push the charset to the top of the file.
-$css_chunks[0] = $charset . $css_chunks[0];
+$css_chunks[0] = $charset.$css_chunks[0];
 
 return implode('', $css_chunks);
 }
@@ -220,17 +220,17 @@ 
 	for ($i = 0, $max = count($this->comments); $i < $max; $i++) {
 
 		$token = $this->comments[$i];
-		$placeholder = '/' . self::COMMENT . $i . '___/';
+		$placeholder = '/'.self::COMMENT.$i.'___/';
 
 		// ! in the first position of the comment means preserve
 		// so push to the preserved tokens keeping the !
 		if (substr($token, 0, 1) === '!') {
 			$this->preserved_tokens[] = $token;
-			$token_tring = self::TOKEN . (count($this->preserved_tokens) - 1) . '___';
+			$token_tring = self::TOKEN.(count($this->preserved_tokens) - 1).'___';
 			$css = preg_replace($placeholder, $token_tring, $css, 1);
 			// Preserve new lines for /*! important comments
-			$css = preg_replace('/\s*[\n\r\f]+\s*(\/\*'. $token_tring .')/S', self::NL.'$1', $css);
-			$css = preg_replace('/('. $token_tring .'\*\/)\s*[\n\r\f]+\s*/S', '$1'.self::NL, $css);
+			$css = preg_replace('/\s*[\n\r\f]+\s*(\/\*'.$token_tring.')/S', self::NL.'$1', $css);
+			$css = preg_replace('/('.$token_tring.'\*\/)\s*[\n\r\f]+\s*/S', '$1'.self::NL, $css);
 			continue;
 		}
 
@@ -238,10 +238,10 @@ 
 		// shorten that to /*\*/ and the next one to /**/
 		if (substr($token, (strlen($token) - 1), 1) === '\\') {
 			$this->preserved_tokens[] = '\\';
-			$css = preg_replace($placeholder,  self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1);
+			$css = preg_replace($placeholder, self::TOKEN.(count($this->preserved_tokens) - 1).'___', $css, 1);
 			$i = $i + 1; // attn: advancing the loop
 			$this->preserved_tokens[] = '';
-			$css = preg_replace('/' . self::COMMENT . $i . '___/',  self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1);
+			$css = preg_replace('/'.self::COMMENT.$i.'___/', self::TOKEN.(count($this->preserved_tokens) - 1).'___', $css, 1);
 			continue;
 		}
 
@@ -252,13 +252,13 @@ 
 			if ($start_index > 2) {
 				if (substr($css, $start_index - 3, 1) === '>') {
 					$this->preserved_tokens[] = '';
-					$css = preg_replace($placeholder,  self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1);
+					$css = preg_replace($placeholder, self::TOKEN.(count($this->preserved_tokens) - 1).'___', $css, 1);
 				}
 			}
 		}
 
 		// in all other cases kill the comment
-		$css = preg_replace('/\/\*' . $this->str_slice($placeholder, 1, -1) . '\*\//', '', $css, 1);
+		$css = preg_replace('/\/\*'.$this->str_slice($placeholder, 1, -1).'\*\//', '', $css, 1);
 	}
 
 
@@ -291,7 +291,7 @@ 
 	// Swap out any pseudo-class colons with the token, and then swap back.
 	$css = preg_replace_callback('/(?:^|\})(?:(?:[^\{\:])+\:)+(?:[^\{]*\{)/', array($this, 'replace_colon'), $css);
 	$css = preg_replace('/\s+([\!\{\}\;\:\>\+\(\)\]\~\=,])/', '$1', $css);
-	$css = preg_replace('/' . self::CLASSCOLON . '/', ':', $css);
+	$css = preg_replace('/'.self::CLASSCOLON.'/', ':', $css);
 
 	// retain space for special IE6 cases
 	$css = preg_replace('/\:first\-(line|letter)(\{|,)/i', ':first-$1 $2', $css);
@@ -355,7 +355,7 @@ 
 					while ($i < strlen($css)) {
 					$i++;
 					if ($css[$i - 1] === '}' && $i - $start_index > $linebreak_pos) {
-					$css = $this->str_slice($css, 0, $i) . "\n" . $this->str_slice($css, $i);
+					$css = $this->str_slice($css, 0, $i)."\n".$this->str_slice($css, $i);
 					$start_index = $i;
 					}
 					}
@@ -366,11 +366,11 @@ 
 					$css = preg_replace('/;;+/', ';', $css);
 
 					// Restore new lines for /*! important comments
-					$css = preg_replace('/'. self::NL .'/', "\n", $css);
+					$css = preg_replace('/'.self::NL.'/', "\n", $css);
 
 					// restore preserved comments and strings
 					for ($i = 0, $max = count($this->preserved_tokens); $i < $max; $i++) {
-						$css = preg_replace('/' . self::TOKEN . $i . '___/', $this->preserved_tokens[$i], $css, 1);
+						$css = preg_replace('/'.self::TOKEN.$i.'___/', $this->preserved_tokens[$i], $css, 1);
 					}
 
 					// Trim the final string (for any leading or trailing white spaces)
@@ -410,7 +410,7 @@ 
 			$terminator = ')';
 		}
 
-		while ($found_terminator === FALSE && $end_index+1 <= $max_index) {
+		while ($found_terminator === FALSE && $end_index + 1 <= $max_index) {
 			$end_index = $this->index_of($css, $terminator, $end_index + 1);
 
 			// endIndex == 0 doesn't really apply here
@@ -430,7 +430,7 @@ 
 			$token = preg_replace('/\s+/', '', $token);
 			$this->preserved_tokens[] = $token;
 
-			$preserver = 'url(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___)';
+			$preserver = 'url('.self::TOKEN.(count($this->preserved_tokens) - 1).'___)';
 			$sb[] = $preserver;
 
 			$append_index = $end_index + 1;
@@ -491,16 +491,16 @@ 
 
 		if ($is_filter) {
 			// Restore, maintain case, otherwise filter will break
-			$sb[] = $m[1] . '#' . $m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7];
+			$sb[] = $m[1].'#'.$m[2].$m[3].$m[4].$m[5].$m[6].$m[7];
 		} else {
 			if (strtolower($m[2]) == strtolower($m[3]) &&
 					strtolower($m[4]) == strtolower($m[5]) &&
 					strtolower($m[6]) == strtolower($m[7])) {
 				// Compress.
-				$hex = '#' . strtolower($m[3] . $m[5] . $m[7]);
+				$hex = '#'.strtolower($m[3].$m[5].$m[7]);
 			} else {
 				// Non compressible color, restore but lower case.
-				$hex = '#' . strtolower($m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7]);
+				$hex = '#'.strtolower($m[2].$m[3].$m[4].$m[5].$m[6].$m[7]);
 			}
 			// replace Hex colors to short safe color names
 			$sb[] = array_key_exists($hex, $short_safe) ? $short_safe[$hex] : $hex;
@@ -529,7 +529,7 @@ 
 	// one, maybe more? put'em back then
 	if (($pos = $this->index_of($match, self::COMMENT)) >= 0) {
 		for ($i = 0, $max = count($this->comments); $i < $max; $i++) {
-			$match = preg_replace('/' . self::COMMENT . $i . '___/', $this->comments[$i], $match, 1);
+			$match = preg_replace('/'.self::COMMENT.$i.'___/', $this->comments[$i], $match, 1);
 		}
 	}
 
@@ -537,7 +537,7 @@ 
 	$match = preg_replace('/progid\:DXImageTransform\.Microsoft\.Alpha\(Opacity\=/i', 'alpha(opacity=', $match);
 
 			$this->preserved_tokens[] = $match;
-			return $quote . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . $quote;
+			return $quote.self::TOKEN.(count($this->preserved_tokens) - 1).'___'.$quote;
 			}
 
 			private function replace_colon($matches)
@@ -548,13 +548,13 @@ 
 			private function replace_calc($matches)
 			{
 			$this->preserved_tokens[] = preg_replace('/\s?([\*\/\(\),])\s?/', '$1', $matches[0]);
-			return self::TOKEN . (count($this->preserved_tokens) - 1) . '___';
+			return self::TOKEN.(count($this->preserved_tokens) - 1).'___';
 			}
 
 			private function rgb_to_hex($matches)
 			{
 			// Support for percentage values rgb(100%, 0%, 45%);
-			if ($this->index_of($matches[1], '%') >= 0){
+			if ($this->index_of($matches[1], '%') >= 0) {
 				$rgbcolors = explode(',', str_replace('%', '', $matches[1]));
 				for ($i = 0; $i < count($rgbcolors); $i++) {
 					$rgbcolors[$i] = $this->round_number(floatval($rgbcolors[$i]) * 2.55);
@@ -570,11 +570,11 @@ 
 			}
 
 			// Fix for issue #2528093
-			if (!preg_match('/[\s\,\);\}]/', $matches[2])){
-				$matches[2] = ' ' . $matches[2];
+			if (!preg_match('/[\s\,\);\}]/', $matches[2])) {
+				$matches[2] = ' '.$matches[2];
 			}
 
-			return '#' . implode('', $rgbcolors) . $matches[2];
+			return '#'.implode('', $rgbcolors).$matches[2];
 			}
 
 private function hsl_to_hex($matches)
@@ -594,9 +594,9 @@ 
 	} else {
 		$v2 = $l < 0.5 ? $l * (1 + $s) : ($l + $s) - ($s * $l);
 		$v1 = (2 * $l) - $v2;
-		$r = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h + (1/3)));
+		$r = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h + (1 / 3)));
 		$g = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h));
-		$b = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h - (1/3)));
+		$b = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h - (1 / 3)));
 	}
 
 	return $this->rgb_to_hex(array('', $r.','.$g.','.$b, $matches[2]));
@@ -611,7 +611,7 @@ 
 	$vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh);
 	if ($vh * 6 < 1) return $v1 + ($v2 - $v1) * 6 * $vh;
 	if ($vh * 2 < 1) return $v2;
-	if ($vh * 3 < 2) return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6;
+	if ($vh * 3 < 2) return $v1 + ($v2 - $v1) * ((2 / 3) - $vh) * 6;
 	return $v1;
 }
 

tools/minify/jsminplus/jsminplus.php

Doc Comments +35 added lines

@@ -114,6 +114,9 @@ 
 		$this->parser = new JSParser();
 	}
 
+	/**
+	 * @return string
+	 */
 	public static function minify($js, $filename='')
 	{
 		static $instance;
@@ -125,6 +128,9 @@ 
 		return $instance->min($js, $filename);
 	}
 
+	/**
+	 * @param string $filename
+	 */
 	private function min($js, $filename)
 	{
 		try
@@ -140,6 +146,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param JSNode $n
+	 */
 	private function parseTree($n, $noBlockGrouping = false)
 	{
 		$s = '';
@@ -545,6 +554,9 @@ 
 		return $s;
 	}
 
+	/**
+	 * @param string $string
+	 */
 	private function isValidIdentifier($string)
 	{
 		return preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $string) && !in_array($string, $this->reserved);
@@ -608,6 +620,9 @@ 
 		$this->t = new JSTokenizer();
 	}
 
+	/**
+	 * @param integer $l
+	 */
 	public function parse($s, $f, $l)
 	{
 		// initialize tokenizer
@@ -621,6 +636,9 @@ 
 		return $n;
 	}
 
+	/**
+	 * @param JSCompilerContext $x
+	 */
 	private function Script($x)
 	{
 		$n = $this->Statements($x);
@@ -971,6 +989,10 @@ 
 		return $n;
 	}
 
+	/**
+	 * @param boolean $requireName
+	 * @param integer $functionForm
+	 */
 	private function FunctionDefinition($x, $requireName, $functionForm)
 	{
 		$f = new JSNode($this->t);
@@ -1437,6 +1459,10 @@ 
 	}
 
 	// Statement stack and nested statement handler.
+
+	/**
+	 * @param JSNode $node
+	 */
 	private function nest($x, $node, $end = false)
 	{
 		array_push($x->stmtStack, $node);
@@ -1501,6 +1527,9 @@ 
 	public $funDecls = array();
 	public $varDecls = array();
 
+	/**
+	 * @param boolean $inFunction
+	 */
 	public function __construct($inFunction)
 	{
 		$this->inFunction = $inFunction;
@@ -1519,6 +1548,9 @@ 
 	public $funDecls = array();
 	public $varDecls = array();
 
+	/**
+	 * @param JSTokenizer $t
+	 */
 	public function __construct($t, $type=0)
 	{
 		if ($token = $t->currentToken())
@@ -1673,6 +1705,9 @@ 
 		$this->scanOperand = true;
 	}
 
+	/**
+	 * @param integer|null $chunksize
+	 */
 	public function getInput($chunksize)
 	{
 		if ($chunksize)

Indentation +6 added lines, -6 removed lines

@@ -786,10 +786,10 @@ 
 			return $n;
 
 			case KEYWORD_WHILE:
-			        $n = new JSNode($this->t);
-			        $n->isLoop = true;
-			        $n->condition = $this->ParenExpression($x);
-			        $n->body = $this->nest($x, $n);
+					$n = new JSNode($this->t);
+					$n->isLoop = true;
+					$n->condition = $this->ParenExpression($x);
+					$n->body = $this->nest($x, $n);
 			return $n;
 
 			case KEYWORD_DO:
@@ -909,7 +909,7 @@ 
 
 			case KEYWORD_VAR:
 			case KEYWORD_CONST:
-			        $n = $this->Variables($x);
+					$n = $this->Variables($x);
 			break;
 
 			case TOKEN_CONDCOMMENT_START:
@@ -1693,7 +1693,7 @@ 
 
 	public function mustMatch($tt)
 	{
-	        if (!$this->match($tt))
+			if (!$this->match($tt))
 			throw $this->newSyntaxError('Unexpected token; token ' . $tt . ' expected');
 
 		return $this->currentToken();

Braces +350 added lines, -274 removed lines

@@ -119,8 +119,9 @@ 
 		static $instance;
 
 		// this is a singleton
-		if(!$instance)
-			$instance = new JSMinPlus();
+		if(!$instance) {
+					$instance = new JSMinPlus();
+		}
 
 		return $instance->min($js, $filename);
 	}
@@ -131,8 +132,7 @@ 
 		{
 			$n = $this->parser->parse($js, $filename, 1);
 			return $this->parseTree($n);
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			echo $e->getMessage() . "\n";
 		}
@@ -149,8 +149,9 @@ 
 			case KEYWORD_FUNCTION:
 				$s .= 'function' . ($n->name ? ' ' . $n->name : '') . '(';
 				$params = $n->params;
-				for ($i = 0, $j = count($params); $i < $j; $i++)
-					$s .= ($i ? ',' : '') . $params[$i];
+				for ($i = 0, $j = count($params); $i < $j; $i++) {
+									$s .= ($i ? ',' : '') . $params[$i];
+				}
 				$s .= '){' . $this->parseTree($n->body, true) . '}';
 			break;
 
@@ -176,13 +177,11 @@ 
 							{
 								// put declared functions on a new line
 								$s .= "\n";
-							}
-							elseif ($type == KEYWORD_VAR && $type == $lastType)
+							} elseif ($type == KEYWORD_VAR && $type == $lastType)
 							{
 								// mutiple var-statements can go into one
 								$t = ',' . substr($t, 4);
-							}
-							else
+							} else
 							{
 								// add terminator
 								$s .= ';';
@@ -208,24 +207,26 @@ 
 				$elsePart = $n->elsePart ? $this->parseTree($n->elsePart) : null;
 
 				// empty if-statement
-				if ($thenPart == '')
-					$thenPart = ';';
+				if ($thenPart == '') {
+									$thenPart = ';';
+				}
 
 				if ($elsePart)
 				{
 					// be carefull and always make a block out of the thenPart; could be more optimized but is a lot of trouble
-					if ($thenPart != ';' && $thenPart[0] != '{')
-						$thenPart = '{' . $thenPart . '}';
+					if ($thenPart != ';' && $thenPart[0] != '{') {
+											$thenPart = '{' . $thenPart . '}';
+					}
 
 					$s .= $thenPart . 'else';
 
 					// we could check for more, but that hardly ever applies so go for performance
-					if ($elsePart[0] != '{')
-						$s .= ' ';
+					if ($elsePart[0] != '{') {
+											$s .= ' ';
+					}
 
 					$s .= $elsePart;
-				}
-				else
+				} else
 				{
 					$s .= $thenPart;
 				}
@@ -237,18 +238,20 @@ 
 				for ($i = 0, $j = count($cases); $i < $j; $i++)
 				{
 					$case = $cases[$i];
-					if ($case->type == KEYWORD_CASE)
-						$s .= 'case' . ($case->caseLabel->type != TOKEN_STRING ? ' ' : '') . $this->parseTree($case->caseLabel) . ':';
-					else
-						$s .= 'default:';
+					if ($case->type == KEYWORD_CASE) {
+											$s .= 'case' . ($case->caseLabel->type != TOKEN_STRING ? ' ' : '') . $this->parseTree($case->caseLabel) . ':';
+					} else {
+											$s .= 'default:';
+					}
 
 					$statement = $this->parseTree($case->statements, true);
 					if ($statement)
 					{
 						$s .= $statement;
 						// no terminator for last statement
-						if ($i + 1 < $j)
-							$s .= ';';
+						if ($i + 1 < $j) {
+													$s .= ';';
+						}
 					}
 				}
 				$s .= '}';
@@ -260,8 +263,9 @@ 
 					. ';' . ($n->update ? $this->parseTree($n->update) : '') . ')';
 
 				$body  = $this->parseTree($n->body);
-				if ($body == '')
-					$body = ';';
+				if ($body == '') {
+									$body = ';';
+				}
 
 				$s .= $body;
 			break;
@@ -270,8 +274,9 @@ 
 				$s = 'while(' . $this->parseTree($n->condition) . ')';
 
 				$body  = $this->parseTree($n->body);
-				if ($body == '')
-					$body = ';';
+				if ($body == '') {
+									$body = ';';
+				}
 
 				$s .= $body;
 			break;
@@ -280,8 +285,9 @@ 
 				$s = 'for(' . ($n->varDecl ? $this->parseTree($n->varDecl) : $this->parseTree($n->iterator)) . ' in ' . $this->parseTree($n->object) . ')';
 
 				$body  = $this->parseTree($n->body);
-				if ($body == '')
-					$body = ';';
+				if ($body == '') {
+									$body = ';';
+				}
 
 				$s .= $body;
 			break;
@@ -303,8 +309,9 @@ 
 					$t = $catchClauses[$i];
 					$s .= 'catch(' . $t->varName . ($t->guard ? ' if ' . $this->parseTree($t->guard) : '') . '){' . $this->parseTree($t->block, true) . '}';
 				}
-				if ($n->finallyBlock)
-					$s .= 'finally{' . $this->parseTree($n->finallyBlock, true) . '}';
+				if ($n->finallyBlock) {
+									$s .= 'finally{' . $this->parseTree($n->finallyBlock, true) . '}';
+				}
 			break;
 
 			case KEYWORD_THROW:
@@ -320,8 +327,9 @@ 
 					{
 						if (	$t[0] != '(' && $t[0] != '[' && $t[0] != '{' &&
 							$t[0] != '"' && $t[0] != "'" && $t[0] != '/'
-						)
-							$s .= ' ';
+						) {
+													$s .= ' ';
+						}
 
 						$s .= $t;
 					}
@@ -341,8 +349,9 @@ 
 					$t = $childs[$i];
 					$s .= ($i ? ',' : '') . $t->name;
 					$u = $t->initializer;
-					if ($u)
-						$s .= '=' . $this->parseTree($u);
+					if ($u) {
+											$s .= '=' . $this->parseTree($u);
+					}
 				}
 			break;
 
@@ -354,13 +363,15 @@ 
 			case TOKEN_CONDCOMMENT_END:
 				$s = $n->value . ($n->type == TOKEN_CONDCOMMENT_START ? ' ' : '');
 				$childs = $n->treeNodes;
-				for ($i = 0, $j = count($childs); $i < $j; $i++)
-					$s .= $this->parseTree($childs[$i]);
+				for ($i = 0, $j = count($childs); $i < $j; $i++) {
+									$s .= $this->parseTree($childs[$i]);
+				}
 			break;
 
 			case OP_SEMICOLON:
-				if ($expression = $n->expression)
-					$s = $this->parseTree($expression);
+				if ($expression = $n->expression) {
+									$s = $this->parseTree($expression);
+				}
 			break;
 
 			case JS_LABEL:
@@ -369,8 +380,9 @@ 
 
 			case OP_COMMA:
 				$childs = $n->treeNodes;
-				for ($i = 0, $j = count($childs); $i < $j; $i++)
-					$s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
+				for ($i = 0, $j = count($childs); $i < $j; $i++) {
+									$s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
+				}
 			break;
 
 			case OP_ASSIGN:
@@ -449,10 +461,11 @@ 
 
 			case OP_INCREMENT:
 			case OP_DECREMENT:
-				if ($n->postfix)
-					$s = $this->parseTree($n->treeNodes[0]) . $n->value;
-				else
-					$s = $n->value . $this->parseTree($n->treeNodes[0]);
+				if ($n->postfix) {
+									$s = $this->parseTree($n->treeNodes[0]) . $n->value;
+				} else {
+									$s = $n->value . $this->parseTree($n->treeNodes[0]);
+				}
 			break;
 
 			case OP_DOT:
@@ -465,16 +478,18 @@ 
 				if (	$n->treeNodes[0]->type == TOKEN_IDENTIFIER &&
 					$n->treeNodes[1]->type == TOKEN_STRING &&
 					$this->isValidIdentifier(substr($n->treeNodes[1]->value, 1, -1))
-				)
-					$s .= '.' . substr($n->treeNodes[1]->value, 1, -1);
-				else
-					$s .= '[' . $this->parseTree($n->treeNodes[1]) . ']';
+				) {
+									$s .= '.' . substr($n->treeNodes[1]->value, 1, -1);
+				} else {
+									$s .= '[' . $this->parseTree($n->treeNodes[1]) . ']';
+				}
 			break;
 
 			case JS_LIST:
 				$childs = $n->treeNodes;
-				for ($i = 0, $j = count($childs); $i < $j; $i++)
-					$s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
+				for ($i = 0, $j = count($childs); $i < $j; $i++) {
+									$s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
+				}
 			break;
 
 			case JS_CALL:
@@ -502,27 +517,29 @@ 
 				for ($i = 0, $j = count($childs); $i < $j; $i++)
 				{
 					$t = $childs[$i];
-					if ($i)
-						$s .= ',';
+					if ($i) {
+											$s .= ',';
+					}
 					if ($t->type == JS_PROPERTY_INIT)
 					{
 						// Ditch the quotes when the index is a valid identifier
 						if (	$t->treeNodes[0]->type == TOKEN_STRING &&
 							$this->isValidIdentifier(substr($t->treeNodes[0]->value, 1, -1))
-						)
-							$s .= substr($t->treeNodes[0]->value, 1, -1);
-						else
-							$s .= $t->treeNodes[0]->value;
+						) {
+													$s .= substr($t->treeNodes[0]->value, 1, -1);
+						} else {
+													$s .= $t->treeNodes[0]->value;
+						}
 
 						$s .= ':' . $this->parseTree($t->treeNodes[1]);
-					}
-					else
+					} else
 					{
 						$s .= $t->type == JS_GETTER ? 'get' : 'set';
 						$s .= ' ' . $t->name . '(';
 						$params = $t->params;
-						for ($i = 0, $j = count($params); $i < $j; $i++)
-							$s .= ($i ? ',' : '') . $params[$i];
+						for ($i = 0, $j = count($params); $i < $j; $i++) {
+													$s .= ($i ? ',' : '') . $params[$i];
+						}
 						$s .= '){' . $this->parseTree($t->body, true) . '}';
 					}
 				}
@@ -615,8 +632,9 @@ 
 
 		$x = new JSCompilerContext(false);
 		$n = $this->Script($x);
-		if (!$this->t->isDone())
-			throw $this->t->newSyntaxError('Syntax error');
+		if (!$this->t->isDone()) {
+					throw $this->t->newSyntaxError('Syntax error');
+		}
 
 		return $n;
 	}
@@ -636,8 +654,9 @@ 
 		$n = new JSNode($this->t, JS_BLOCK);
 		array_push($x->stmtStack, $n);
 
-		while (!$this->t->isDone() && $this->t->peek() != OP_RIGHT_CURLY)
-			$n->addNode($this->Statement($x));
+		while (!$this->t->isDone() && $this->t->peek() != OP_RIGHT_CURLY) {
+					$n->addNode($this->Statement($x));
+		}
 
 		array_pop($x->stmtStack);
 
@@ -701,15 +720,17 @@ 
 					switch ($tt)
 					{
 						case KEYWORD_DEFAULT:
-							if ($n->defaultIndex >= 0)
-								throw $this->t->newSyntaxError('More than one switch default');
+							if ($n->defaultIndex >= 0) {
+															throw $this->t->newSyntaxError('More than one switch default');
+							}
 							// FALL THROUGH
 						case KEYWORD_CASE:
 							$n2 = new JSNode($this->t);
-							if ($tt == KEYWORD_DEFAULT)
-								$n->defaultIndex = count($n->cases);
-							else
-								$n2->caseLabel = $this->Expression($x, OP_COLON);
+							if ($tt == KEYWORD_DEFAULT) {
+															$n->defaultIndex = count($n->cases);
+							} else {
+															$n2->caseLabel = $this->Expression($x, OP_COLON);
+							}
 								break;
 						default:
 							throw $this->t->newSyntaxError('Invalid switch case');
@@ -717,8 +738,9 @@ 
 
 					$this->t->mustMatch(OP_COLON);
 					$n2->statements = new JSNode($this->t, JS_BLOCK);
-					while (($tt = $this->t->peek()) != KEYWORD_CASE && $tt != KEYWORD_DEFAULT && $tt != OP_RIGHT_CURLY)
-						$n2->statements->addNode($this->Statement($x));
+					while (($tt = $this->t->peek()) != KEYWORD_CASE && $tt != KEYWORD_DEFAULT && $tt != OP_RIGHT_CURLY) {
+											$n2->statements->addNode($this->Statement($x));
+					}
 
 					array_push($n->cases, $n2);
 				}
@@ -738,8 +760,7 @@ 
 					{
 						$this->t->get();
 						$n2 = $this->Variables($x);
-					}
-					else
+					} else
 					{
 						$n2 = $this->Expression($x);
 					}
@@ -763,16 +784,14 @@ 
 						// NB: n2[0].type == IDENTIFIER and n2[0].value == n2[0].name.
 						$n->iterator = $n2->treeNodes[0];
 						$n->varDecl = $n2;
-					}
-					else
+					} else
 					{
 						$n->iterator = $n2;
 						$n->varDecl = null;
 					}
 
 					$n->object = $this->Expression($x);
-				}
-				else
+				} else
 				{
 					$n->setup = $n2 ? $n2 : null;
 					$this->t->mustMatch(OP_SEMICOLON);
@@ -824,17 +843,18 @@ 
 				{
 					do
 					{
-						if (--$i < 0)
-							throw $this->t->newSyntaxError('Label not found');
+						if (--$i < 0) {
+													throw $this->t->newSyntaxError('Label not found');
+						}
 					}
 					while ($ss[$i]->label != $label);
-				}
-				else
+				} else
 				{
 					do
 					{
-						if (--$i < 0)
-							throw $this->t->newSyntaxError('Invalid ' . $tt);
+						if (--$i < 0) {
+													throw $this->t->newSyntaxError('Invalid ' . $tt);
+						}
 					}
 					while (!$ss[$i]->isLoop && ($tt != KEYWORD_BREAK || $ss[$i]->type != KEYWORD_SWITCH));
 				}
@@ -855,15 +875,16 @@ 
 
 					if ($this->t->match(KEYWORD_IF))
 					{
-						if ($x->ecmaStrictMode)
-							throw $this->t->newSyntaxError('Illegal catch guard');
+						if ($x->ecmaStrictMode) {
+													throw $this->t->newSyntaxError('Illegal catch guard');
+						}
 
-						if (count($n->catchClauses) && !end($n->catchClauses)->guard)
-							throw $this->t->newSyntaxError('Guarded catch after unguarded');
+						if (count($n->catchClauses) && !end($n->catchClauses)->guard) {
+													throw $this->t->newSyntaxError('Guarded catch after unguarded');
+						}
 
 						$n2->guard = $this->Expression($x);
-					}
-					else
+					} else
 					{
 						$n2->guard = null;
 					}
@@ -873,11 +894,13 @@ 
 					array_push($n->catchClauses, $n2);
 				}
 
-				if ($this->t->match(KEYWORD_FINALLY))
-					$n->finallyBlock = $this->Block($x);
+				if ($this->t->match(KEYWORD_FINALLY)) {
+									$n->finallyBlock = $this->Block($x);
+				}
 
-				if (!count($n->catchClauses) && !$n->finallyBlock)
-					throw $this->t->newSyntaxError('Invalid try statement');
+				if (!count($n->catchClauses) && !$n->finallyBlock) {
+									throw $this->t->newSyntaxError('Invalid try statement');
+				}
 			return $n;
 
 			case KEYWORD_CATCH:
@@ -890,15 +913,17 @@ 
 			break;
 
 			case KEYWORD_RETURN:
-				if (!$x->inFunction)
-					throw $this->t->newSyntaxError('Invalid return');
+				if (!$x->inFunction) {
+									throw $this->t->newSyntaxError('Invalid return');
+				}
 
 				$n = new JSNode($this->t);
 				$tt = $this->t->peekOnSameLine();
-				if ($tt != TOKEN_END && $tt != TOKEN_NEWLINE && $tt != OP_SEMICOLON && $tt != OP_RIGHT_CURLY)
-					$n->value = $this->Expression($x);
-				else
-					$n->value = null;
+				if ($tt != TOKEN_END && $tt != TOKEN_NEWLINE && $tt != OP_SEMICOLON && $tt != OP_RIGHT_CURLY) {
+									$n->value = $this->Expression($x);
+				} else {
+									$n->value = null;
+				}
 			break;
 
 			case KEYWORD_WITH:
@@ -939,8 +964,9 @@ 
 						$ss = $x->stmtStack;
 						for ($i = count($ss) - 1; $i >= 0; --$i)
 						{
-							if ($ss[$i]->label == $label)
-								throw $this->t->newSyntaxError('Duplicate label');
+							if ($ss[$i]->label == $label) {
+															throw $this->t->newSyntaxError('Duplicate label');
+							}
 						}
 
 						$this->t->get();
@@ -962,8 +988,9 @@ 
 		if ($this->t->lineno == $this->t->currentToken()->lineno)
 		{
 			$tt = $this->t->peekOnSameLine();
-			if ($tt != TOKEN_END && $tt != TOKEN_NEWLINE && $tt != OP_SEMICOLON && $tt != OP_RIGHT_CURLY)
-				throw $this->t->newSyntaxError('Missing ; before statement');
+			if ($tt != TOKEN_END && $tt != TOKEN_NEWLINE && $tt != OP_SEMICOLON && $tt != OP_RIGHT_CURLY) {
+							throw $this->t->newSyntaxError('Missing ; before statement');
+			}
 		}
 
 		$this->t->match(OP_SEMICOLON);
@@ -975,26 +1002,30 @@ 
 	{
 		$f = new JSNode($this->t);
 
-		if ($f->type != KEYWORD_FUNCTION)
-			$f->type = ($f->value == 'get') ? JS_GETTER : JS_SETTER;
+		if ($f->type != KEYWORD_FUNCTION) {
+					$f->type = ($f->value == 'get') ? JS_GETTER : JS_SETTER;
+		}
 
-		if ($this->t->match(TOKEN_IDENTIFIER))
-			$f->name = $this->t->currentToken()->value;
-		elseif ($requireName)
-			throw $this->t->newSyntaxError('Missing function identifier');
+		if ($this->t->match(TOKEN_IDENTIFIER)) {
+					$f->name = $this->t->currentToken()->value;
+		} elseif ($requireName) {
+					throw $this->t->newSyntaxError('Missing function identifier');
+		}
 
 		$this->t->mustMatch(OP_LEFT_PAREN);
 			$f->params = array();
 
 		while (($tt = $this->t->get()) != OP_RIGHT_PAREN)
 		{
-			if ($tt != TOKEN_IDENTIFIER)
-				throw $this->t->newSyntaxError('Missing formal parameter');
+			if ($tt != TOKEN_IDENTIFIER) {
+							throw $this->t->newSyntaxError('Missing formal parameter');
+			}
 
 			array_push($f->params, $this->t->currentToken()->value);
 
-			if ($this->t->peek() != OP_RIGHT_PAREN)
-				$this->t->mustMatch(OP_COMMA);
+			if ($this->t->peek() != OP_RIGHT_PAREN) {
+							$this->t->mustMatch(OP_COMMA);
+			}
 		}
 
 		$this->t->mustMatch(OP_LEFT_CURLY);
@@ -1006,8 +1037,9 @@ 
 		$f->end = $this->t->currentToken()->end;
 
 		$f->functionForm = $functionForm;
-		if ($functionForm == DECLARED_FORM)
-			array_push($x->funDecls, $f);
+		if ($functionForm == DECLARED_FORM) {
+					array_push($x->funDecls, $f);
+		}
 
 		return $f;
 	}
@@ -1025,8 +1057,9 @@ 
 
 			if ($this->t->match(OP_ASSIGN))
 			{
-				if ($this->t->currentToken()->assignOp)
-					throw $this->t->newSyntaxError('Invalid variable initialization');
+				if ($this->t->currentToken()->assignOp) {
+									throw $this->t->newSyntaxError('Invalid variable initialization');
+				}
 
 				$n2->initializer = $this->Expression($x, OP_COMMA);
 			}
@@ -1073,13 +1106,15 @@ 
 					break 2;
 
 				case OP_HOOK:
-					if ($this->t->scanOperand)
-						break 2;
+					if ($this->t->scanOperand) {
+											break 2;
+					}
 
 					while (	!empty($operators) &&
 						$this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt]
-					)
-						$this->reduce($operators, $operands);
+					) {
+											$this->reduce($operators, $operands);
+					}
 
 					array_push($operators, new JSNode($this->t));
 
@@ -1087,29 +1122,33 @@ 
 					$this->t->scanOperand = true;
 					$n = $this->Expression($x);
 
-					if (!$this->t->match(OP_COLON))
-						break 2;
+					if (!$this->t->match(OP_COLON)) {
+											break 2;
+					}
 
 					--$x->hookLevel;
 					array_push($operands, $n);
 				break;
 
 				case OP_COLON:
-					if ($x->hookLevel)
-						break 2;
+					if ($x->hookLevel) {
+											break 2;
+					}
 
 					throw $this->t->newSyntaxError('Invalid label');
 				break;
 
 				case OP_ASSIGN:
-					if ($this->t->scanOperand)
-						break 2;
+					if ($this->t->scanOperand) {
+											break 2;
+					}
 
 					// Use >, not >=, for right-associative ASSIGN
 					while (	!empty($operators) &&
 						$this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt]
-					)
-						$this->reduce($operators, $operands);
+					) {
+											$this->reduce($operators, $operands);
+					}
 
 					array_push($operators, new JSNode($this->t));
 					end($operands)->assignOp = $this->t->currentToken()->assignOp;
@@ -1123,8 +1162,9 @@ 
 					if ($x->inForLoopInit && !$x->hookLevel &&
 						!$x->bracketLevel && !$x->curlyLevel &&
 						!$x->parenLevel
-					)
-						break 2;
+					) {
+											break 2;
+					}
 				// FALL THROUGH
 				case OP_COMMA:
 					// A comma operator should not be parsed if we're parsing the then part
@@ -1132,8 +1172,9 @@ 
 					if ($tt == OP_COMMA && $x->hookLevel &&
 						!$x->bracketLevel && !$x->curlyLevel &&
 						!$x->parenLevel
-					)
-						break 2;
+					) {
+											break 2;
+					}
 				// Treat comma as left-associative so reduce can fold left-heavy
 				// COMMA trees into a single array.
 				// FALL THROUGH
@@ -1149,20 +1190,21 @@ 
 				case OP_PLUS: case OP_MINUS:
 				case OP_MUL: case OP_DIV: case OP_MOD:
 				case OP_DOT:
-					if ($this->t->scanOperand)
-						break 2;
+					if ($this->t->scanOperand) {
+											break 2;
+					}
 
 					while (	!empty($operators) &&
 						$this->opPrecedence[end($operators)->type] >= $this->opPrecedence[$tt]
-					)
-						$this->reduce($operators, $operands);
+					) {
+											$this->reduce($operators, $operands);
+					}
 
 					if ($tt == OP_DOT)
 					{
 						$this->t->mustMatch(TOKEN_IDENTIFIER);
 						array_push($operands, new JSNode($this->t, OP_DOT, array_pop($operands), new JSNode($this->t)));
-					}
-					else
+					} else
 					{
 						array_push($operators, new JSNode($this->t));
 						$this->t->scanOperand = true;
@@ -1172,8 +1214,9 @@ 
 				case KEYWORD_DELETE: case KEYWORD_VOID: case KEYWORD_TYPEOF:
 				case OP_NOT: case OP_BITWISE_NOT: case OP_UNARY_PLUS: case OP_UNARY_MINUS:
 				case KEYWORD_NEW:
-					if (!$this->t->scanOperand)
-						break 2;
+					if (!$this->t->scanOperand) {
+											break 2;
+					}
 
 					array_push($operators, new JSNode($this->t));
 				break;
@@ -1182,19 +1225,20 @@ 
 					if ($this->t->scanOperand)
 					{
 						array_push($operators, new JSNode($this->t));  // prefix increment or decrement
-					}
-					else
+					} else
 					{
 						// Don't cross a line boundary for postfix {in,de}crement.
 						$t = $this->t->tokens[($this->t->tokenIndex + $this->t->lookahead - 1) & 3];
-						if ($t && $t->lineno != $this->t->lineno)
-							break 2;
+						if ($t && $t->lineno != $this->t->lineno) {
+													break 2;
+						}
 
 						if (!empty($operators))
 						{
 							// Use >, not >=, so postfix has higher precedence than prefix.
-							while ($this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt])
-								$this->reduce($operators, $operands);
+							while ($this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt]) {
+															$this->reduce($operators, $operands);
+							}
 						}
 
 						$n = new JSNode($this->t, $tt, array_pop($operands));
@@ -1204,8 +1248,9 @@ 
 				break;
 
 				case KEYWORD_FUNCTION:
-					if (!$this->t->scanOperand)
-						break 2;
+					if (!$this->t->scanOperand) {
+											break 2;
+					}
 
 					array_push($operands, $this->FunctionDefinition($x, false, EXPRESSED_FORM));
 					$this->t->scanOperand = false;
@@ -1213,8 +1258,9 @@ 
 
 				case KEYWORD_NULL: case KEYWORD_THIS: case KEYWORD_TRUE: case KEYWORD_FALSE:
 				case TOKEN_IDENTIFIER: case TOKEN_NUMBER: case TOKEN_STRING: case TOKEN_REGEXP:
-					if (!$this->t->scanOperand)
-						break 2;
+					if (!$this->t->scanOperand) {
+											break 2;
+					}
 
 					array_push($operands, new JSNode($this->t));
 					$this->t->scanOperand = false;
@@ -1222,10 +1268,11 @@ 
 
 				case TOKEN_CONDCOMMENT_START:
 				case TOKEN_CONDCOMMENT_END:
-					if ($this->t->scanOperand)
-						array_push($operators, new JSNode($this->t));
-					else
-						array_push($operands, new JSNode($this->t));
+					if ($this->t->scanOperand) {
+											array_push($operators, new JSNode($this->t));
+					} else {
+											array_push($operands, new JSNode($this->t));
+					}
 				break;
 
 				case OP_LEFT_BRACKET:
@@ -1244,15 +1291,15 @@ 
 							}
 
 							$n->addNode($this->Expression($x, OP_COMMA));
-							if (!$this->t->match(OP_COMMA))
-								break;
+							if (!$this->t->match(OP_COMMA)) {
+															break;
+							}
 						}
 
 						$this->t->mustMatch(OP_RIGHT_BRACKET);
 						array_push($operands, $n);
 						$this->t->scanOperand = false;
-					}
-					else
+					} else
 					{
 						// Property indexing operator.
 						array_push($operators, new JSNode($this->t, JS_INDEX));
@@ -1262,18 +1309,21 @@ 
 				break;
 
 				case OP_RIGHT_BRACKET:
-					if ($this->t->scanOperand || $x->bracketLevel == $bl)
-						break 2;
+					if ($this->t->scanOperand || $x->bracketLevel == $bl) {
+											break 2;
+					}
 
-					while ($this->reduce($operators, $operands)->type != JS_INDEX)
-						continue;
+					while ($this->reduce($operators, $operands)->type != JS_INDEX) {
+											continue;
+					}
 
 					--$x->bracketLevel;
 				break;
 
 				case OP_LEFT_CURLY:
-					if (!$this->t->scanOperand)
-						break 2;
+					if (!$this->t->scanOperand) {
+											break 2;
+					}
 
 					// Object initialiser.  As for array initialisers (see above),
 					// parse using recursive descent.
@@ -1287,12 +1337,12 @@ 
 							$tv = $this->t->currentToken()->value;
 							if (($tv == 'get' || $tv == 'set') && $this->t->peek() == TOKEN_IDENTIFIER)
 							{
-								if ($x->ecmaStrictMode)
-									throw $this->t->newSyntaxError('Illegal property accessor');
+								if ($x->ecmaStrictMode) {
+																	throw $this->t->newSyntaxError('Illegal property accessor');
+								}
 
 								$n->addNode($this->FunctionDefinition($x, true, EXPRESSED_FORM));
-							}
-							else
+							} else
 							{
 								switch ($tt)
 								{
@@ -1303,8 +1353,9 @@ 
 									break;
 
 									case OP_RIGHT_CURLY:
-										if ($x->ecmaStrictMode)
-											throw $this->t->newSyntaxError('Illegal trailing ,');
+										if ($x->ecmaStrictMode) {
+																					throw $this->t->newSyntaxError('Illegal trailing ,');
+										}
 									break 3;
 
 									default:
@@ -1327,21 +1378,22 @@ 
 				break;
 
 				case OP_RIGHT_CURLY:
-					if (!$this->t->scanOperand && $x->curlyLevel != $cl)
-						throw new Exception('PANIC: right curly botch');
+					if (!$this->t->scanOperand && $x->curlyLevel != $cl) {
+											throw new Exception('PANIC: right curly botch');
+					}
 				break 2;
 
 				case OP_LEFT_PAREN:
 					if ($this->t->scanOperand)
 					{
 						array_push($operators, new JSNode($this->t, JS_GROUP));
-					}
-					else
+					} else
 					{
 						while (	!empty($operators) &&
 							$this->opPrecedence[end($operators)->type] > $this->opPrecedence[KEYWORD_NEW]
-						)
-							$this->reduce($operators, $operands);
+						) {
+													$this->reduce($operators, $operands);
+						}
 
 						// Handle () now, to regularize the n-ary case for n > 0.
 						// We must set scanOperand in case there are arguments and
@@ -1354,8 +1406,7 @@ 
 							{
 								array_pop($operators);
 								$n->addNode(array_pop($operands));
-							}
-							else
+							} else
 							{
 								$n = new JSNode($this->t, JS_CALL, array_pop($operands), new JSNode($this->t, JS_LIST));
 							}
@@ -1365,18 +1416,20 @@ 
 							break;
 						}
 
-						if ($n && $n->type == KEYWORD_NEW)
-							$n->type = JS_NEW_WITH_ARGS;
-						else
-							array_push($operators, new JSNode($this->t, JS_CALL));
+						if ($n && $n->type == KEYWORD_NEW) {
+													$n->type = JS_NEW_WITH_ARGS;
+						} else {
+													array_push($operators, new JSNode($this->t, JS_CALL));
+						}
 					}
 
 					++$x->parenLevel;
 				break;
 
 				case OP_RIGHT_PAREN:
-					if ($this->t->scanOperand || $x->parenLevel == $pl)
-						break 2;
+					if ($this->t->scanOperand || $x->parenLevel == $pl) {
+											break 2;
+					}
 
 					while (($tt = $this->reduce($operators, $operands)->type) != JS_GROUP &&
 						$tt != JS_CALL && $tt != JS_NEW_WITH_ARGS
@@ -1388,10 +1441,11 @@ 
 					if ($tt != JS_GROUP)
 					{
 						$n = end($operands);
-						if ($n->treeNodes[1]->type != OP_COMMA)
-							$n->treeNodes[1] = new JSNode($this->t, JS_LIST, $n->treeNodes[1]);
-						else
-							$n->treeNodes[1]->type = JS_LIST;
+						if ($n->treeNodes[1]->type != OP_COMMA) {
+													$n->treeNodes[1] = new JSNode($this->t, JS_LIST, $n->treeNodes[1]);
+						} else {
+													$n->treeNodes[1]->type = JS_LIST;
+						}
 					}
 
 					--$x->parenLevel;
@@ -1405,24 +1459,29 @@ 
 			}
 		}
 
-		if ($x->hookLevel != $hl)
-			throw $this->t->newSyntaxError('Missing : in conditional expression');
+		if ($x->hookLevel != $hl) {
+					throw $this->t->newSyntaxError('Missing : in conditional expression');
+		}
 
-		if ($x->parenLevel != $pl)
-			throw $this->t->newSyntaxError('Missing ) in parenthetical');
+		if ($x->parenLevel != $pl) {
+					throw $this->t->newSyntaxError('Missing ) in parenthetical');
+		}
 
-		if ($x->bracketLevel != $bl)
-			throw $this->t->newSyntaxError('Missing ] in index expression');
+		if ($x->bracketLevel != $bl) {
+					throw $this->t->newSyntaxError('Missing ] in index expression');
+		}
 
-		if ($this->t->scanOperand)
-			throw $this->t->newSyntaxError('Missing operand');
+		if ($this->t->scanOperand) {
+					throw $this->t->newSyntaxError('Missing operand');
+		}
 
 		// Resume default mode, scanning for operands, not operators.
 		$this->t->scanOperand = true;
 		$this->t->unget();
 
-		while (count($operators))
-			$this->reduce($operators, $operands);
+		while (count($operators)) {
+					$this->reduce($operators, $operands);
+		}
 
 		return array_pop($operands);
 	}
@@ -1443,8 +1502,9 @@ 
 		$n = $this->statement($x);
 		array_pop($x->stmtStack);
 
-		if ($end)
-			$this->t->mustMatch($end);
+		if ($end) {
+					$this->t->mustMatch($end);
+		}
 
 		return $n;
 	}
@@ -1473,13 +1533,15 @@ 
 
 		// Always use push to add operands to n, to update start and end
 		$a = array_splice($operands, $c - $arity);
-		for ($i = 0; $i < $arity; $i++)
-			$n->addNode($a[$i]);
+		for ($i = 0; $i < $arity; $i++) {
+					$n->addNode($a[$i]);
+		}
 
 		// Include closing bracket or postfix operator in [start,end]
 		$te = $this->t->currentToken()->end;
-		if ($n->end < $te)
-			$n->end = $te;
+		if ($n->end < $te) {
+					$n->end = $te;
+		}
 
 		array_push($operands, $n);
 
@@ -1528,8 +1590,7 @@ 
 			$this->lineno = $token->lineno;
 			$this->start = $token->start;
 			$this->end = $token->end;
-		}
-		else
+		} else
 		{
 			$this->type = $type;
 			$this->lineno = $t->lineno;
@@ -1538,8 +1599,9 @@ 
 		if (($numargs = func_num_args()) > 2)
 		{
 			$args = func_get_args();;
-			for ($i = 2; $i < $numargs; $i++)
-				$this->addNode($args[$i]);
+			for ($i = 2; $i < $numargs; $i++) {
+							$this->addNode($args[$i]);
+			}
 		}
 	}
 
@@ -1551,8 +1613,9 @@ 
 
 	public function __get($name)
 	{
-		if (isset($this->$name))
-			return $this->$name;
+		if (isset($this->$name)) {
+					return $this->$name;
+		}
 
 		return null;
 	}
@@ -1561,10 +1624,12 @@ 
 	{
 		if ($node !== null)
 		{
-			if ($node->start < $this->start)
-				$this->start = $node->start;
-			if ($this->end < $node->end)
-				$this->end = $node->end;
+			if ($node->start < $this->start) {
+							$this->start = $node->start;
+			}
+			if ($this->end < $node->end) {
+							$this->end = $node->end;
+			}
 		}
 
 		$this->treeNodes[] = $node;
@@ -1649,14 +1714,16 @@ 
 		$this->opRegExp = '#^(' . implode('|', array_map('preg_quote', array_keys($this->opTypeNames))) . ')#';
 
 		// this is quite a hidden yet convenient place to create the defines for operators and keywords
-		foreach ($this->opTypeNames as $operand => $name)
-			define('OP_' . $name, $operand);
+		foreach ($this->opTypeNames as $operand => $name) {
+					define('OP_' . $name, $operand);
+		}
 
 		define('OP_UNARY_PLUS', 'U+');
 		define('OP_UNARY_MINUS', 'U-');
 
-		foreach ($this->keywords as $keyword)
-			define('KEYWORD_' . strtoupper($keyword), $keyword);
+		foreach ($this->keywords as $keyword) {
+					define('KEYWORD_' . strtoupper($keyword), $keyword);
+		}
 	}
 
 	public function init($source, $filename = '', $lineno = 1)
@@ -1675,8 +1742,9 @@ 
 
 	public function getInput($chunksize)
 	{
-		if ($chunksize)
-			return substr($this->source, $this->cursor, $chunksize);
+		if ($chunksize) {
+					return substr($this->source, $this->cursor, $chunksize);
+		}
 
 		return substr($this->source, $this->cursor);
 	}
@@ -1693,8 +1761,9 @@ 
 
 	public function mustMatch($tt)
 	{
-	        if (!$this->match($tt))
-			throw $this->newSyntaxError('Unexpected token; token ' . $tt . ' expected');
+	        if (!$this->match($tt)) {
+	        			throw $this->newSyntaxError('Unexpected token; token ' . $tt . ' expected');
+	        }
 
 		return $this->currentToken();
 	}
@@ -1704,12 +1773,12 @@ 
 		if ($this->lookahead)
 		{
 			$next = $this->tokens[($this->tokenIndex + $this->lookahead) & 3];
-			if ($this->scanNewlines && $next->lineno != $this->lineno)
-				$tt = TOKEN_NEWLINE;
-			else
-				$tt = $next->type;
-		}
-		else
+			if ($this->scanNewlines && $next->lineno != $this->lineno) {
+							$tt = TOKEN_NEWLINE;
+			} else {
+							$tt = $next->type;
+			}
+		} else
 		{
 			$tt = $this->get();
 			$this->unget();
@@ -1729,8 +1798,9 @@ 
 
 	public function currentToken()
 	{
-		if (!empty($this->tokens))
-			return $this->tokens[$this->tokenIndex];
+		if (!empty($this->tokens)) {
+					return $this->tokens[$this->tokenIndex];
+		}
 	}
 
 	public function get($chunksize = 1000)
@@ -1740,8 +1810,9 @@ 
 			$this->lookahead--;
 			$this->tokenIndex = ($this->tokenIndex + 1) & 3;
 			$token = $this->tokens[$this->tokenIndex];
-			if ($token->type != TOKEN_NEWLINE || $this->scanNewlines)
-				return $token->type;
+			if ($token->type != TOKEN_NEWLINE || $this->scanNewlines) {
+							return $token->type;
+			}
 		}
 
 		$conditional_comment = false;
@@ -1758,22 +1829,27 @@ 
 				$spaces = $match[0];
 				$spacelen = strlen($spaces);
 				$this->cursor += $spacelen;
-				if (!$this->scanNewlines)
-					$this->lineno += substr_count($spaces, "\n");
+				if (!$this->scanNewlines) {
+									$this->lineno += substr_count($spaces, "\n");
+				}
 
-				if ($spacelen == $chunksize)
-					continue; // complete chunk contained whitespace
+				if ($spacelen == $chunksize) {
+									continue;
+				}
+				// complete chunk contained whitespace
 
 				$input = $this->getInput($chunksize);
-				if ($input == '' || $input[0] != '/')
-					break;
+				if ($input == '' || $input[0] != '/') {
+									break;
+				}
 			}
 
 			// Comments
 			if (!preg_match('/^\/(?:\*(@(?:cc_on|if|elif|else|end))?.*?\*\/|\/[^\n]*)/s', $input, $match))
 			{
-				if (!$chunksize)
-					break;
+				if (!$chunksize) {
+									break;
+				}
 
 				// retry with a full chunk fetch; this also prevents breakage of long regular expressions (which will never match a comment)
 				$chunksize = null;
@@ -1786,8 +1862,7 @@ 
 				$match[0] = '/*' . $match[1];
 				$conditional_comment = true;
 				break;
-			}
-			else
+			} else
 			{
 				$this->cursor += strlen($match[0]);
 				$this->lineno += substr_count($match[0], "\n");
@@ -1798,12 +1873,10 @@ 
 		{
 			$tt = TOKEN_END;
 			$match = array('');
-		}
-		elseif ($conditional_comment)
+		} elseif ($conditional_comment)
 		{
 			$tt = TOKEN_CONDCOMMENT_START;
-		}
-		else
+		} else
 		{
 			switch ($input[0])
 			{
@@ -1812,8 +1885,7 @@ 
 					if (preg_match('/^\d+\.\d*(?:[eE][-+]?\d+)?|^\d+(?:\.\d*)?[eE][-+]?\d+/', $input, $match))
 					{
 						$tt = TOKEN_NUMBER;
-					}
-					else if (preg_match('/^0[xX][\da-fA-F]+|^0[0-7]*|^\d+/', $input, $match))
+					} else if (preg_match('/^0[xX][\da-fA-F]+|^0[0-7]*|^\d+/', $input, $match))
 					{
 						// this should always match because of \d+
 						$tt = TOKEN_NUMBER;
@@ -1825,11 +1897,12 @@ 
 					if (preg_match('/^"(?:\\\\(?:.|\r?\n)|[^\\\\"\r\n]+)*"|^\'(?:\\\\(?:.|\r?\n)|[^\\\\\'\r\n]+)*\'/', $input, $match))
 					{
 						$tt = TOKEN_STRING;
-					}
-					else
+					} else
 					{
-						if ($chunksize)
-							return $this->get(null); // retry with a full chunk fetch
+						if ($chunksize) {
+													return $this->get(null);
+						}
+						// retry with a full chunk fetch
 
 						throw $this->newSyntaxError('Unterminated string literal');
 					}
@@ -1861,16 +1934,16 @@ 
 					{
 						$tt = OP_ASSIGN;
 						$match[0] .= '=';
-					}
-					else
+					} else
 					{
 						$tt = $op;
 						if ($this->scanOperand)
 						{
-							if ($op == OP_PLUS)
-								$tt = OP_UNARY_PLUS;
-							elseif ($op == OP_MINUS)
-								$tt = OP_UNARY_MINUS;
+							if ($op == OP_PLUS) {
+															$tt = OP_UNARY_PLUS;
+							} elseif ($op == OP_MINUS) {
+															$tt = OP_UNARY_MINUS;
+							}
 						}
 						$op = null;
 					}
@@ -1906,9 +1979,9 @@ 
 					{
 						$match = array('@*/');
 						$tt = TOKEN_CONDCOMMENT_END;
+					} else {
+											throw $this->newSyntaxError('Illegal token');
 					}
-					else
-						throw $this->newSyntaxError('Illegal token');
 				break;
 
 				case "\n":
@@ -1916,9 +1989,9 @@ 
 					{
 						$match = array("\n");
 						$tt = TOKEN_NEWLINE;
+					} else {
+											throw $this->newSyntaxError('Illegal token');
 					}
-					else
-						throw $this->newSyntaxError('Illegal token');
 				break;
 
 				default:
@@ -1926,22 +1999,24 @@ 
 					if (preg_match('/^[$\w]+/', $input, $match))
 					{
 						$tt = in_array($match[0], $this->keywords) ? $match[0] : TOKEN_IDENTIFIER;
+					} else {
+											throw $this->newSyntaxError('Illegal token');
 					}
-					else
-						throw $this->newSyntaxError('Illegal token');
 			}
 		}
 
 		$this->tokenIndex = ($this->tokenIndex + 1) & 3;
 
-		if (!isset($this->tokens[$this->tokenIndex]))
-			$this->tokens[$this->tokenIndex] = new JSToken();
+		if (!isset($this->tokens[$this->tokenIndex])) {
+					$this->tokens[$this->tokenIndex] = new JSToken();
+		}
 
 		$token = $this->tokens[$this->tokenIndex];
 		$token->type = $tt;
 
-		if ($tt == OP_ASSIGN)
-			$token->assignOp = $op;
+		if ($tt == OP_ASSIGN) {
+					$token->assignOp = $op;
+		}
 
 		$token->start = $this->cursor;
 
@@ -1956,8 +2031,9 @@ 
 
 	public function unget()
 	{
-		if (++$this->lookahead == 4)
-			throw $this->newSyntaxError('PANIC: too much lookahead!');
+		if (++$this->lookahead == 4) {
+					throw $this->newSyntaxError('PANIC: too much lookahead!');
+		}
 
 		$this->tokenIndex = ($this->tokenIndex - 1) & 3;
 	}

Spacing +79 added lines, -79 removed lines

@@ -114,12 +114,12 @@ 
 		$this->parser = new JSParser();
 	}
 
-	public static function minify($js, $filename='')
+	public static function minify($js, $filename = '')
 	{
 		static $instance;
 
 		// this is a singleton
-		if(!$instance)
+		if (!$instance)
 			$instance = new JSMinPlus();
 
 		return $instance->min($js, $filename);
@@ -132,9 +132,9 @@ 
 			$n = $this->parser->parse($js, $filename, 1);
 			return $this->parseTree($n);
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
-			echo $e->getMessage() . "\n";
+			echo $e->getMessage()."\n";
 		}
 
 		return false;
@@ -147,11 +147,11 @@ 
 		switch ($n->type)
 		{
 			case KEYWORD_FUNCTION:
-				$s .= 'function' . ($n->name ? ' ' . $n->name : '') . '(';
+				$s .= 'function'.($n->name ? ' '.$n->name : '').'(';
 				$params = $n->params;
 				for ($i = 0, $j = count($params); $i < $j; $i++)
-					$s .= ($i ? ',' : '') . $params[$i];
-				$s .= '){' . $this->parseTree($n->body, true) . '}';
+					$s .= ($i ? ',' : '').$params[$i];
+				$s .= '){'.$this->parseTree($n->body, true).'}';
 			break;
 
 			case JS_SCRIPT:
@@ -180,7 +180,7 @@ 
 							elseif ($type == KEYWORD_VAR && $type == $lastType)
 							{
 								// mutiple var-statements can go into one
-								$t = ',' . substr($t, 4);
+								$t = ','.substr($t, 4);
 							}
 							else
 							{
@@ -198,12 +198,12 @@ 
 
 				if ($c > 1 && !$noBlockGrouping)
 				{
-					$s = '{' . $s . '}';
+					$s = '{'.$s.'}';
 				}
 			break;
 
 			case KEYWORD_IF:
-				$s = 'if(' . $this->parseTree($n->condition) . ')';
+				$s = 'if('.$this->parseTree($n->condition).')';
 				$thenPart = $this->parseTree($n->thenPart);
 				$elsePart = $n->elsePart ? $this->parseTree($n->elsePart) : null;
 
@@ -215,9 +215,9 @@ 
 				{
 					// be carefull and always make a block out of the thenPart; could be more optimized but is a lot of trouble
 					if ($thenPart != ';' && $thenPart[0] != '{')
-						$thenPart = '{' . $thenPart . '}';
+						$thenPart = '{'.$thenPart.'}';
 
-					$s .= $thenPart . 'else';
+					$s .= $thenPart.'else';
 
 					// we could check for more, but that hardly ever applies so go for performance
 					if ($elsePart[0] != '{')
@@ -232,13 +232,13 @@ 
 			break;
 
 			case KEYWORD_SWITCH:
-				$s = 'switch(' . $this->parseTree($n->discriminant) . '){';
+				$s = 'switch('.$this->parseTree($n->discriminant).'){';
 				$cases = $n->cases;
 				for ($i = 0, $j = count($cases); $i < $j; $i++)
 				{
 					$case = $cases[$i];
 					if ($case->type == KEYWORD_CASE)
-						$s .= 'case' . ($case->caseLabel->type != TOKEN_STRING ? ' ' : '') . $this->parseTree($case->caseLabel) . ':';
+						$s .= 'case'.($case->caseLabel->type != TOKEN_STRING ? ' ' : '').$this->parseTree($case->caseLabel).':';
 					else
 						$s .= 'default:';
 
@@ -255,9 +255,9 @@ 
 			break;
 
 			case KEYWORD_FOR:
-				$s = 'for(' . ($n->setup ? $this->parseTree($n->setup) : '')
-					. ';' . ($n->condition ? $this->parseTree($n->condition) : '')
-					. ';' . ($n->update ? $this->parseTree($n->update) : '') . ')';
+				$s = 'for('.($n->setup ? $this->parseTree($n->setup) : '')
+					. ';'.($n->condition ? $this->parseTree($n->condition) : '')
+					. ';'.($n->update ? $this->parseTree($n->update) : '').')';
 
 				$body  = $this->parseTree($n->body);
 				if ($body == '')
@@ -267,7 +267,7 @@ 
 			break;
 
 			case KEYWORD_WHILE:
-				$s = 'while(' . $this->parseTree($n->condition) . ')';
+				$s = 'while('.$this->parseTree($n->condition).')';
 
 				$body  = $this->parseTree($n->body);
 				if ($body == '')
@@ -277,7 +277,7 @@ 
 			break;
 
 			case JS_FOR_IN:
-				$s = 'for(' . ($n->varDecl ? $this->parseTree($n->varDecl) : $this->parseTree($n->iterator)) . ' in ' . $this->parseTree($n->object) . ')';
+				$s = 'for('.($n->varDecl ? $this->parseTree($n->varDecl) : $this->parseTree($n->iterator)).' in '.$this->parseTree($n->object).')';
 
 				$body  = $this->parseTree($n->body);
 				if ($body == '')
@@ -287,28 +287,28 @@ 
 			break;
 
 			case KEYWORD_DO:
-				$s = 'do{' . $this->parseTree($n->body, true) . '}while(' . $this->parseTree($n->condition) . ')';
+				$s = 'do{'.$this->parseTree($n->body, true).'}while('.$this->parseTree($n->condition).')';
 			break;
 
 			case KEYWORD_BREAK:
 			case KEYWORD_CONTINUE:
-				$s = $n->value . ($n->label ? ' ' . $n->label : '');
+				$s = $n->value.($n->label ? ' '.$n->label : '');
 			break;
 
 			case KEYWORD_TRY:
-				$s = 'try{' . $this->parseTree($n->tryBlock, true) . '}';
+				$s = 'try{'.$this->parseTree($n->tryBlock, true).'}';
 				$catchClauses = $n->catchClauses;
 				for ($i = 0, $j = count($catchClauses); $i < $j; $i++)
 				{
 					$t = $catchClauses[$i];
-					$s .= 'catch(' . $t->varName . ($t->guard ? ' if ' . $this->parseTree($t->guard) : '') . '){' . $this->parseTree($t->block, true) . '}';
+					$s .= 'catch('.$t->varName.($t->guard ? ' if '.$this->parseTree($t->guard) : '').'){'.$this->parseTree($t->block, true).'}';
 				}
 				if ($n->finallyBlock)
-					$s .= 'finally{' . $this->parseTree($n->finallyBlock, true) . '}';
+					$s .= 'finally{'.$this->parseTree($n->finallyBlock, true).'}';
 			break;
 
 			case KEYWORD_THROW:
-				$s = 'throw ' . $this->parseTree($n->exception);
+				$s = 'throw '.$this->parseTree($n->exception);
 			break;
 
 			case KEYWORD_RETURN:
@@ -318,7 +318,7 @@ 
 					$t = $this->parseTree($n->value);
 					if (strlen($t))
 					{
-						if (	$t[0] != '(' && $t[0] != '[' && $t[0] != '{' &&
+						if ($t[0] != '(' && $t[0] != '[' && $t[0] != '{' &&
 							$t[0] != '"' && $t[0] != "'" && $t[0] != '/'
 						)
 							$s .= ' ';
@@ -329,20 +329,20 @@ 
 			break;
 
 			case KEYWORD_WITH:
-				$s = 'with(' . $this->parseTree($n->object) . ')' . $this->parseTree($n->body);
+				$s = 'with('.$this->parseTree($n->object).')'.$this->parseTree($n->body);
 			break;
 
 			case KEYWORD_VAR:
 			case KEYWORD_CONST:
-				$s = $n->value . ' ';
+				$s = $n->value.' ';
 				$childs = $n->treeNodes;
 				for ($i = 0, $j = count($childs); $i < $j; $i++)
 				{
 					$t = $childs[$i];
-					$s .= ($i ? ',' : '') . $t->name;
+					$s .= ($i ? ',' : '').$t->name;
 					$u = $t->initializer;
 					if ($u)
-						$s .= '=' . $this->parseTree($u);
+						$s .= '='.$this->parseTree($u);
 				}
 			break;
 
@@ -352,7 +352,7 @@ 
 
 			case TOKEN_CONDCOMMENT_START:
 			case TOKEN_CONDCOMMENT_END:
-				$s = $n->value . ($n->type == TOKEN_CONDCOMMENT_START ? ' ' : '');
+				$s = $n->value.($n->type == TOKEN_CONDCOMMENT_START ? ' ' : '');
 				$childs = $n->treeNodes;
 				for ($i = 0, $j = count($childs); $i < $j; $i++)
 					$s .= $this->parseTree($childs[$i]);
@@ -364,21 +364,21 @@ 
 			break;
 
 			case JS_LABEL:
-				$s = $n->label . ':' . $this->parseTree($n->statement);
+				$s = $n->label.':'.$this->parseTree($n->statement);
 			break;
 
 			case OP_COMMA:
 				$childs = $n->treeNodes;
 				for ($i = 0, $j = count($childs); $i < $j; $i++)
-					$s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
+					$s .= ($i ? ',' : '').$this->parseTree($childs[$i]);
 			break;
 
 			case OP_ASSIGN:
-				$s = $this->parseTree($n->treeNodes[0]) . $n->value . $this->parseTree($n->treeNodes[1]);
+				$s = $this->parseTree($n->treeNodes[0]).$n->value.$this->parseTree($n->treeNodes[1]);
 			break;
 
 			case OP_HOOK:
-				$s = $this->parseTree($n->treeNodes[0]) . '?' . $this->parseTree($n->treeNodes[1]) . ':' . $this->parseTree($n->treeNodes[2]);
+				$s = $this->parseTree($n->treeNodes[0]).'?'.$this->parseTree($n->treeNodes[1]).':'.$this->parseTree($n->treeNodes[2]);
 			break;
 
 			case OP_OR: case OP_AND:
@@ -387,7 +387,7 @@ 
 			case OP_LT: case OP_LE: case OP_GE: case OP_GT:
 			case OP_LSH: case OP_RSH: case OP_URSH:
 			case OP_MUL: case OP_DIV: case OP_MOD:
-				$s = $this->parseTree($n->treeNodes[0]) . $n->type . $this->parseTree($n->treeNodes[1]);
+				$s = $this->parseTree($n->treeNodes[0]).$n->type.$this->parseTree($n->treeNodes[1]);
 			break;
 
 			case OP_PLUS:
@@ -403,87 +403,87 @@ 
 					case OP_DECREMENT:
 					case OP_UNARY_PLUS:
 					case OP_UNARY_MINUS:
-						$s = $left . $n->type . ' ' . $right;
+						$s = $left.$n->type.' '.$right;
 					break;
 
 					case TOKEN_STRING:
 						//combine concatted strings with same quotestyle
 						if ($n->type == OP_PLUS && substr($left, -1) == $right[0])
 						{
-							$s = substr($left, 0, -1) . substr($right, 1);
+							$s = substr($left, 0, -1).substr($right, 1);
 							break;
 						}
 					// FALL THROUGH
 
 					default:
-						$s = $left . $n->type . $right;
+						$s = $left.$n->type.$right;
 				}
 			break;
 
 			case KEYWORD_IN:
-				$s = $this->parseTree($n->treeNodes[0]) . ' in ' . $this->parseTree($n->treeNodes[1]);
+				$s = $this->parseTree($n->treeNodes[0]).' in '.$this->parseTree($n->treeNodes[1]);
 			break;
 
 			case KEYWORD_INSTANCEOF:
-				$s = $this->parseTree($n->treeNodes[0]) . ' instanceof ' . $this->parseTree($n->treeNodes[1]);
+				$s = $this->parseTree($n->treeNodes[0]).' instanceof '.$this->parseTree($n->treeNodes[1]);
 			break;
 
 			case KEYWORD_DELETE:
-				$s = 'delete ' . $this->parseTree($n->treeNodes[0]);
+				$s = 'delete '.$this->parseTree($n->treeNodes[0]);
 			break;
 
 			case KEYWORD_VOID:
-				$s = 'void(' . $this->parseTree($n->treeNodes[0]) . ')';
+				$s = 'void('.$this->parseTree($n->treeNodes[0]).')';
 			break;
 
 			case KEYWORD_TYPEOF:
-				$s = 'typeof ' . $this->parseTree($n->treeNodes[0]);
+				$s = 'typeof '.$this->parseTree($n->treeNodes[0]);
 			break;
 
 			case OP_NOT:
 			case OP_BITWISE_NOT:
 			case OP_UNARY_PLUS:
 			case OP_UNARY_MINUS:
-				$s = $n->value . $this->parseTree($n->treeNodes[0]);
+				$s = $n->value.$this->parseTree($n->treeNodes[0]);
 			break;
 
 			case OP_INCREMENT:
 			case OP_DECREMENT:
 				if ($n->postfix)
-					$s = $this->parseTree($n->treeNodes[0]) . $n->value;
+					$s = $this->parseTree($n->treeNodes[0]).$n->value;
 				else
-					$s = $n->value . $this->parseTree($n->treeNodes[0]);
+					$s = $n->value.$this->parseTree($n->treeNodes[0]);
 			break;
 
 			case OP_DOT:
-				$s = $this->parseTree($n->treeNodes[0]) . '.' . $this->parseTree($n->treeNodes[1]);
+				$s = $this->parseTree($n->treeNodes[0]).'.'.$this->parseTree($n->treeNodes[1]);
 			break;
 
 			case JS_INDEX:
 				$s = $this->parseTree($n->treeNodes[0]);
 				// See if we can replace named index with a dot saving 3 bytes
-				if (	$n->treeNodes[0]->type == TOKEN_IDENTIFIER &&
+				if ($n->treeNodes[0]->type == TOKEN_IDENTIFIER &&
 					$n->treeNodes[1]->type == TOKEN_STRING &&
 					$this->isValidIdentifier(substr($n->treeNodes[1]->value, 1, -1))
 				)
-					$s .= '.' . substr($n->treeNodes[1]->value, 1, -1);
+					$s .= '.'.substr($n->treeNodes[1]->value, 1, -1);
 				else
-					$s .= '[' . $this->parseTree($n->treeNodes[1]) . ']';
+					$s .= '['.$this->parseTree($n->treeNodes[1]).']';
 			break;
 
 			case JS_LIST:
 				$childs = $n->treeNodes;
 				for ($i = 0, $j = count($childs); $i < $j; $i++)
-					$s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
+					$s .= ($i ? ',' : '').$this->parseTree($childs[$i]);
 			break;
 
 			case JS_CALL:
-				$s = $this->parseTree($n->treeNodes[0]) . '(' . $this->parseTree($n->treeNodes[1]) . ')';
+				$s = $this->parseTree($n->treeNodes[0]).'('.$this->parseTree($n->treeNodes[1]).')';
 			break;
 
 			case KEYWORD_NEW:
 			case JS_NEW_WITH_ARGS:
-				$s = 'new ' . $this->parseTree($n->treeNodes[0]) . '(' . ($n->type == JS_NEW_WITH_ARGS ? $this->parseTree($n->treeNodes[1]) : '') . ')';
+				$s = 'new '.$this->parseTree($n->treeNodes[0]).'('.($n->type == JS_NEW_WITH_ARGS ? $this->parseTree($n->treeNodes[1]) : '').')';
 			break;
 
 			case JS_ARRAY_INIT:
@@ -491,7 +491,7 @@ 
 				$childs = $n->treeNodes;
 				for ($i = 0, $j = count($childs); $i < $j; $i++)
 				{
-					$s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
+					$s .= ($i ? ',' : '').$this->parseTree($childs[$i]);
 				}
 				$s .= ']';
 			break;
@@ -507,23 +507,23 @@ 
 					if ($t->type == JS_PROPERTY_INIT)
 					{
 						// Ditch the quotes when the index is a valid identifier
-						if (	$t->treeNodes[0]->type == TOKEN_STRING &&
+						if ($t->treeNodes[0]->type == TOKEN_STRING &&
 							$this->isValidIdentifier(substr($t->treeNodes[0]->value, 1, -1))
 						)
 							$s .= substr($t->treeNodes[0]->value, 1, -1);
 						else
 							$s .= $t->treeNodes[0]->value;
 
-						$s .= ':' . $this->parseTree($t->treeNodes[1]);
+						$s .= ':'.$this->parseTree($t->treeNodes[1]);
 					}
 					else
 					{
 						$s .= $t->type == JS_GETTER ? 'get' : 'set';
-						$s .= ' ' . $t->name . '(';
+						$s .= ' '.$t->name.'(';
 						$params = $t->params;
 						for ($i = 0, $j = count($params); $i < $j; $i++)
-							$s .= ($i ? ',' : '') . $params[$i];
-						$s .= '){' . $this->parseTree($t->body, true) . '}';
+							$s .= ($i ? ',' : '').$params[$i];
+						$s .= '){'.$this->parseTree($t->body, true).'}';
 					}
 				}
 				$s .= '}';
@@ -535,11 +535,11 @@ 
 			break;
 
 			case JS_GROUP:
-				$s = '(' . $this->parseTree($n->treeNodes[0]) . ')';
+				$s = '('.$this->parseTree($n->treeNodes[0]).')';
 			break;
 
 			default:
-				throw new Exception('UNKNOWN TOKEN TYPE: ' . $n->type);
+				throw new Exception('UNKNOWN TOKEN TYPE: '.$n->type);
 		}
 
 		return $s;
@@ -834,7 +834,7 @@ 
 					do
 					{
 						if (--$i < 0)
-							throw $this->t->newSyntaxError('Invalid ' . $tt);
+							throw $this->t->newSyntaxError('Invalid '.$tt);
 					}
 					while (!$ss[$i]->isLoop && ($tt != KEYWORD_BREAK || $ss[$i]->type != KEYWORD_SWITCH));
 				}
@@ -1041,7 +1041,7 @@ 
 		return $n;
 	}
 
-	private function Expression($x, $stop=false)
+	private function Expression($x, $stop = false)
 	{
 		$operators = array();
 		$operands = array();
@@ -1076,7 +1076,7 @@ 
 					if ($this->t->scanOperand)
 						break 2;
 
-					while (	!empty($operators) &&
+					while (!empty($operators) &&
 						$this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt]
 					)
 						$this->reduce($operators, $operands);
@@ -1106,7 +1106,7 @@ 
 						break 2;
 
 					// Use >, not >=, for right-associative ASSIGN
-					while (	!empty($operators) &&
+					while (!empty($operators) &&
 						$this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt]
 					)
 						$this->reduce($operators, $operands);
@@ -1152,7 +1152,7 @@ 
 					if ($this->t->scanOperand)
 						break 2;
 
-					while (	!empty($operators) &&
+					while (!empty($operators) &&
 						$this->opPrecedence[end($operators)->type] >= $this->opPrecedence[$tt]
 					)
 						$this->reduce($operators, $operands);
@@ -1181,7 +1181,7 @@ 
 				case OP_INCREMENT: case OP_DECREMENT:
 					if ($this->t->scanOperand)
 					{
-						array_push($operators, new JSNode($this->t));  // prefix increment or decrement
+						array_push($operators, new JSNode($this->t)); // prefix increment or decrement
 					}
 					else
 					{
@@ -1338,7 +1338,7 @@ 
 					}
 					else
 					{
-						while (	!empty($operators) &&
+						while (!empty($operators) &&
 							$this->opPrecedence[end($operators)->type] > $this->opPrecedence[KEYWORD_NEW]
 						)
 							$this->reduce($operators, $operands);
@@ -1519,7 +1519,7 @@ 
 	public $funDecls = array();
 	public $varDecls = array();
 
-	public function __construct($t, $type=0)
+	public function __construct($t, $type = 0)
 	{
 		if ($token = $t->currentToken())
 		{
@@ -1537,7 +1537,7 @@ 
 
 		if (($numargs = func_num_args()) > 2)
 		{
-			$args = func_get_args();;
+			$args = func_get_args(); ;
 			for ($i = 2; $i < $numargs; $i++)
 				$this->addNode($args[$i]);
 		}
@@ -1646,17 +1646,17 @@ 
 
 	public function __construct()
 	{
-		$this->opRegExp = '#^(' . implode('|', array_map('preg_quote', array_keys($this->opTypeNames))) . ')#';
+		$this->opRegExp = '#^('.implode('|', array_map('preg_quote', array_keys($this->opTypeNames))).')#';
 
 		// this is quite a hidden yet convenient place to create the defines for operators and keywords
 		foreach ($this->opTypeNames as $operand => $name)
-			define('OP_' . $name, $operand);
+			define('OP_'.$name, $operand);
 
 		define('OP_UNARY_PLUS', 'U+');
 		define('OP_UNARY_MINUS', 'U-');
 
 		foreach ($this->keywords as $keyword)
-			define('KEYWORD_' . strtoupper($keyword), $keyword);
+			define('KEYWORD_'.strtoupper($keyword), $keyword);
 	}
 
 	public function init($source, $filename = '', $lineno = 1)
@@ -1694,7 +1694,7 @@ 
 	public function mustMatch($tt)
 	{
 	        if (!$this->match($tt))
-			throw $this->newSyntaxError('Unexpected token; token ' . $tt . ' expected');
+			throw $this->newSyntaxError('Unexpected token; token '.$tt.' expected');
 
 		return $this->currentToken();
 	}
@@ -1735,7 +1735,7 @@ 
 
 	public function get($chunksize = 1000)
 	{
-		while($this->lookahead)
+		while ($this->lookahead)
 		{
 			$this->lookahead--;
 			$this->tokenIndex = ($this->tokenIndex + 1) & 3;
@@ -1747,7 +1747,7 @@ 
 		$conditional_comment = false;
 
 		// strip whitespace and comments
-		while(true)
+		while (true)
 		{
 			$input = $this->getInput($chunksize);
 
@@ -1783,7 +1783,7 @@ 
 			// check if this is a conditional (JScript) comment
 			if (!empty($match[1]))
 			{
-				$match[0] = '/*' . $match[1];
+				$match[0] = '/*'.$match[1];
 				$conditional_comment = true;
 				break;
 			}
@@ -1964,7 +1964,7 @@ 
 
 	public function newSyntaxError($m)
 	{
-		return new Exception('Parse error: ' . $m . ' in file \'' . $this->filename . '\' on line ' . $this->lineno);
+		return new Exception('Parse error: '.$m.' in file \''.$this->filename.'\' on line '.$this->lineno);
 	}
 }
 

tools/minify/minify.php

Doc Comments +6 added lines

@@ -172,6 +172,9 @@ 
 	}
 }
 
+/**
+ * @param string $ext
+ */
 function get_target_files($ext, $dir, $files_to_skip) {
 	$files = glob("{$dir}*.{$ext}");
 	$skips = glob("{$dir}*.min.{$ext}");
@@ -181,6 +184,9 @@ 
 	return $files;
 }
 
+/**
+ * @param string $content
+ */
 function closure_compile($content) {
 	require_once dirname(__FILE__).'/../../classes/httprequest/XEHttpRequest.class.php';
 

Braces +49 added lines, -17 removed lines

@@ -21,9 +21,13 @@ 
 	$argc = $_SERVER['argc'];
 
 	// get target directories
-	if($argc < 1) exit;
-	elseif($argc < 2) $dirs = array($_SERVER['PWD']);
-	else $dirs = array_slice($argv, 1);
+	if($argc < 1) {
+		exit;
+	} elseif($argc < 2) {
+		$dirs = array($_SERVER['PWD']);
+	} else {
+		$dirs = array_slice($argv, 1);
+	}
 
 	$dirs = array_map('realpath', $dirs);
 	$dirs = array_map('add_dirsep', $dirs);
@@ -33,7 +37,9 @@ 
 
 // add directory separator
 function add_dirsep($path) {
-	if(substr($path,-1) != DIRECTORY_SEPARATOR) $path .= DIRECTORY_SEPARATOR;
+	if(substr($path,-1) != DIRECTORY_SEPARATOR) {
+		$path .= DIRECTORY_SEPARATOR;
+	}
 	return $path;
 }
 
@@ -53,7 +59,9 @@ 
 	// files to skip
 	$files_to_skip = $config['skip'];
 	foreach($files_to_skip as $idx=>$file) {
-		if($file) $files_to_skip[$idx] = realpath($dir.trim($file));
+		if($file) {
+			$files_to_skip[$idx] = realpath($dir.trim($file));
+		}
 	}
 
 	echo "  Minifying JavaScript files...";
@@ -63,7 +71,9 @@ 
 		require dirname(__FILE__).'/jsminplus/jsminplus.php';
 	}
 	foreach($js_files as $file) {
-		if(!is_readable($file)) continue;
+		if(!is_readable($file)) {
+			continue;
+		}
 
 		$target  = preg_replace('@\.js$@', '.min.js', $file);
 		$content = file_get_contents($file);
@@ -102,7 +112,9 @@ 
 	$oCSSmin = new CSSmin();
 
 	foreach($css_files as $file) {
-		if(!is_readable($file)) continue;
+		if(!is_readable($file)) {
+			continue;
+		}
 
 		$target  = preg_replace('@\.css$@', '.min.css', $file);
 		$content = file_get_contents($file);
@@ -117,51 +129,71 @@ 
 	$default = array('option'=>array(), 'skip'=>array(), 'merge'=>array());
 	$file    = $dir.'minify.ini';
 
-	if(!is_readable($file)) return $default;
+	if(!is_readable($file)) {
+		return $default;
+	}
 
 	$config_str = file_get_contents($file);
 	$config_str = preg_replace_callback('/(\[(?:skip|merge *>> *.+?)\])([\s\S]+?)(?=\[|$)/', 'transform_config_str', $config_str);
 
 	$config = parse_ini_string($config_str, 1);
-	if($config === false) return $default;
+	if($config === false) {
+		return $default;
+	}
 
-	if(is_array($config['skip'])) $config['skip'] = array_keys($config['skip']);
+	if(is_array($config['skip'])) {
+		$config['skip'] = array_keys($config['skip']);
+	}
 
 	foreach($config as $section=>$value) {
 		if(preg_match('/merge *>> *(.+)/', $section, $match)) {
-			if(!is_array($config['merge'])) $config['merge'] = array();
+			if(!is_array($config['merge'])) {
+				$config['merge'] = array();
+			}
 			$config['merge'][trim($match[1])] = array_keys($value);
 
 			unset($config[$section]);
 		}
 	}
 
-	if(is_array($config['option'])) $config = array_merge($config['option'], $config);
+	if(is_array($config['option'])) {
+		$config = array_merge($config['option'], $config);
+	}
 	$config = array_merge($default, $config);
 
 	return $config;
 }
 
 function transform_config_str($matches) {
-	if(!$matches[2]) return $matches[0];
+	if(!$matches[2]) {
+		return $matches[0];
+	}
 	$values = preg_replace('/$/m', '=', trim($matches[2]));
 
 	return "{$matches[1]}\n{$values}\n\n";
 }
 
 function merge($files, $target, $base_dir) {
-	if(!is_array($files)) return false;
+	if(!is_array($files)) {
+		return false;
+	}
 
 	$body   = '';
 	$is_css = !!preg_match('/\.css$/', $target);
 
 	foreach($files as $file) {
 		$file = $base_dir.trim($file);
-		if(!is_readable($file)) continue;
+		if(!is_readable($file)) {
+			continue;
+		}
 
 		$content = trim(file_get_contents($file));
-		if($is_css && $body) $content = preg_replace('/^@.+?;/m', '', $content);
-		if($content) $body .= $content."\n";
+		if($is_css && $body) {
+			$content = preg_replace('/^@.+?;/m', '', $content);
+		}
+		if($content) {
+			$body .= $content."\n";
+		}
 	}
 
 	if ($body) {

Spacing +29 added lines, -29 removed lines

@@ -11,7 +11,7 @@ 
  * @author NAVER(developer@xpressengine.com)
  */
 
-if(version_compare(PHP_VERSION, '5.3.0', '<')) {
+if (version_compare(PHP_VERSION, '5.3.0', '<')) {
 	echo "PHP 5.3.0 or above version is required.";
 	exit(1);
 }
@@ -21,8 +21,8 @@ 
 	$argc = $_SERVER['argc'];
 
 	// get target directories
-	if($argc < 1) exit;
-	elseif($argc < 2) $dirs = array($_SERVER['PWD']);
+	if ($argc < 1) exit;
+	elseif ($argc < 2) $dirs = array($_SERVER['PWD']);
 	else $dirs = array_slice($argv, 1);
 
 	$dirs = array_map('realpath', $dirs);
@@ -33,7 +33,7 @@ 
 
 // add directory separator
 function add_dirsep($path) {
-	if(substr($path,-1) != DIRECTORY_SEPARATOR) $path .= DIRECTORY_SEPARATOR;
+	if (substr($path, -1) != DIRECTORY_SEPARATOR) $path .= DIRECTORY_SEPARATOR;
 	return $path;
 }
 
@@ -46,38 +46,38 @@ 
 	echo " Done\n";
 
 	// merge
-	foreach($config['merge'] as $target=>$files) {
+	foreach ($config['merge'] as $target=>$files) {
 		merge($files, $target, $dir);
 	}
 
 	// files to skip
 	$files_to_skip = $config['skip'];
-	foreach($files_to_skip as $idx=>$file) {
-		if($file) $files_to_skip[$idx] = realpath($dir.trim($file));
+	foreach ($files_to_skip as $idx=>$file) {
+		if ($file) $files_to_skip[$idx] = realpath($dir.trim($file));
 	}
 
 	echo "  Minifying JavaScript files...";
 	$js_files = get_target_files('js', $dir, $files_to_skip);
 
-	if(count($js_files) && !class_exists('JSMinPlus')) {
+	if (count($js_files) && !class_exists('JSMinPlus')) {
 		require dirname(__FILE__).'/jsminplus/jsminplus.php';
 	}
-	foreach($js_files as $file) {
-		if(!is_readable($file)) continue;
+	foreach ($js_files as $file) {
+		if (!is_readable($file)) continue;
 
 		$target  = preg_replace('@\.js$@', '.min.js', $file);
 		$content = file_get_contents($file);
 
 		// save copyright to preserve it
-		if(preg_match('@^[ \t]*(/\*\*.+?\*/)@s', $content, $matches)) {
+		if (preg_match('@^[ \t]*(/\*\*.+?\*/)@s', $content, $matches)) {
 			$copyright = $matches[1]."\n";
 		} else {
 			$copyright = '';
 		}
 
-		if($config['use_closure_compiler']) {
+		if ($config['use_closure_compiler']) {
 			$content = closure_compile($content);
-			if(!$content) {
+			if (!$content) {
 				echo "   CANNOT compile the js file with closure compiler.\n";
 				echo "   Trying again with JSMinPlus.\n";
 				$content = JSMinPlus::minify($content);
@@ -95,14 +95,14 @@ 
 	echo "  Minifying CSS files...";
 	$css_files = get_target_files('css', $dir, $files_to_skip);
 
-	if(count($css_files) && !class_exists('CSSmin')) {
+	if (count($css_files) && !class_exists('CSSmin')) {
 		require dirname(__FILE__).'/cssmin/CSSmin.php';
 	}
 
 	$oCSSmin = new CSSmin();
 
-	foreach($css_files as $file) {
-		if(!is_readable($file)) continue;
+	foreach ($css_files as $file) {
+		if (!is_readable($file)) continue;
 
 		$target  = preg_replace('@\.css$@', '.min.css', $file);
 		$content = file_get_contents($file);
@@ -117,51 +117,51 @@ 
 	$default = array('option'=>array(), 'skip'=>array(), 'merge'=>array());
 	$file    = $dir.'minify.ini';
 
-	if(!is_readable($file)) return $default;
+	if (!is_readable($file)) return $default;
 
 	$config_str = file_get_contents($file);
 	$config_str = preg_replace_callback('/(\[(?:skip|merge *>> *.+?)\])([\s\S]+?)(?=\[|$)/', 'transform_config_str', $config_str);
 
 	$config = parse_ini_string($config_str, 1);
-	if($config === false) return $default;
+	if ($config === false) return $default;
 
-	if(is_array($config['skip'])) $config['skip'] = array_keys($config['skip']);
+	if (is_array($config['skip'])) $config['skip'] = array_keys($config['skip']);
 
-	foreach($config as $section=>$value) {
-		if(preg_match('/merge *>> *(.+)/', $section, $match)) {
-			if(!is_array($config['merge'])) $config['merge'] = array();
+	foreach ($config as $section=>$value) {
+		if (preg_match('/merge *>> *(.+)/', $section, $match)) {
+			if (!is_array($config['merge'])) $config['merge'] = array();
 			$config['merge'][trim($match[1])] = array_keys($value);
 
 			unset($config[$section]);
 		}
 	}
 
-	if(is_array($config['option'])) $config = array_merge($config['option'], $config);
+	if (is_array($config['option'])) $config = array_merge($config['option'], $config);
 	$config = array_merge($default, $config);
 
 	return $config;
 }
 
 function transform_config_str($matches) {
-	if(!$matches[2]) return $matches[0];
+	if (!$matches[2]) return $matches[0];
 	$values = preg_replace('/$/m', '=', trim($matches[2]));
 
 	return "{$matches[1]}\n{$values}\n\n";
 }
 
 function merge($files, $target, $base_dir) {
-	if(!is_array($files)) return false;
+	if (!is_array($files)) return false;
 
 	$body   = '';
 	$is_css = !!preg_match('/\.css$/', $target);
 
-	foreach($files as $file) {
+	foreach ($files as $file) {
 		$file = $base_dir.trim($file);
-		if(!is_readable($file)) continue;
+		if (!is_readable($file)) continue;
 
 		$content = trim(file_get_contents($file));
-		if($is_css && $body) $content = preg_replace('/^@.+?;/m', '', $content);
-		if($content) $body .= $content."\n";
+		if ($is_css && $body) $content = preg_replace('/^@.+?;/m', '', $content);
+		if ($content) $body .= $content."\n";
 	}
 
 	if ($body) {

addons/adminlogging/adminlogging.addon.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 	exit();
 
 /**
@@ -10,7 +10,7 @@ 
  * @brief admin log
  */
 $logged_info = Context::get('logged_info');
-if($logged_info && $logged_info->is_admin == 'Y' && stripos(Context::get('act'), 'admin') !== false && $called_position == 'before_module_proc')
+if ($logged_info && $logged_info->is_admin == 'Y' && stripos(Context::get('act'), 'admin') !== false && $called_position == 'before_module_proc')
 {
 	$oAdminloggingController = getController('adminlogging');
 	$oAdminloggingController->insertLog($this->module, $this->act);

Braces +2 added lines, -1 removed lines

@@ -1,8 +1,9 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if(!defined('__XE__')) {
 	exit();
+}
 
 /**
  * @file point.addon.php

addons/autolink/autolink.addon.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 	exit();
 
 /**
@@ -9,9 +9,9 @@ 
  * @author NAVER (developers@xpressengine.com)
  * @brief Automatic link add-on
  */
-if($called_position == 'after_module_proc' && Context::getResponseMethod() == "HTML")
+if ($called_position == 'after_module_proc' && Context::getResponseMethod() == "HTML")
 {
-	if(Mobile::isFromMobilePhone())
+	if (Mobile::isFromMobilePhone())
 	{
 		Context::addJsFile('./common/js/jquery.min.js', false, '', -1000000);
 		Context::addJsFile('./common/js/xe.min.js', false, '', -1000000);

Braces +2 added lines, -1 removed lines

@@ -1,8 +1,9 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if(!defined('__XE__')) {
 	exit();
+}
 
 /**
  * @file point.addon.php

addons/blogapi/blogapi.addon.php

Braces +41 added lines, -38 removed lines

@@ -1,8 +1,9 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if(!defined('__XE__')) {
 	exit();
+}
 
 /**
  * @file blogapicounter.addon.php
@@ -47,7 +48,9 @@ 
 	exit;
 }
 
-if(version_compare(PHP_VERSION, '5.2.11', '<=')) libxml_disable_entity_loader(true);
+if(version_compare(PHP_VERSION, '5.2.11', '<=')) {
+	libxml_disable_entity_loader(true);
+}
 $xml = new SimpleXMLElement($xml, LIBXML_NONET | LIBXML_NOENT);
 
 $method_name = (string)$xml->methodName;
@@ -77,8 +80,7 @@ 
 			$content = getXmlRpcFailure(1, $output->getMessage());
 			printContent($content);
 		}
-	}
-	else
+	} else
 	{
 		$content = getXmlRpcFailure(1, 'not logged');
 		printContent($content);
@@ -167,10 +169,11 @@ 
 			foreach($fileinfo as $key => $val)
 			{
 				$nodename = (string)$val->name;
-				if($nodename == 'bits')
-					$filedata = base64_decode((string)$val->value->base64);
-				elseif($nodename == 'name')
-					$filename = (string)$val->value->string;
+				if($nodename == 'bits') {
+									$filedata = base64_decode((string)$val->value->base64);
+				} elseif($nodename == 'name') {
+									$filename = (string)$val->value->string;
+				}
 			}
 
 			$tmp_arr = explode('/', $filename);
@@ -192,16 +195,14 @@ 
 			if(!$document_srl)
 			{
 				printContent(getXmlRpcFailure(1, 'no permission'));
-			}
-			else
+			} else
 			{
 				$oDocumentModel = getModel('document');
 				$oDocument = $oDocumentModel->getDocument($document_srl);
 				if(!$oDocument->isExists() || !$oDocument->isGranted())
 				{
 					printContent(getXmlRpcFailure(1, 'no permission'));
-				}
-				else
+				} else
 				{
 					// Get a list of categories and set Context
 					$category = "";
@@ -268,8 +269,9 @@ 
 						{
 							foreach($category_list as $category_srl => $category_info)
 							{
-								if($category_info->title == $category)
-									$obj->category_srl = $category_srl;
+								if($category_info->title == $category) {
+																	$obj->category_srl = $category_srl;
+								}
 							}
 						}
 						break;
@@ -279,8 +281,9 @@ 
 						{
 							$tag_list[] = (string)$tag->string;
 						}
-						if(count($tag_list))
-							$obj->tags = implode(',', $tag_list);
+						if(count($tag_list)) {
+													$obj->tags = implode(',', $tag_list);
+						}
 						break;
 				}
 			}
@@ -327,8 +330,7 @@ 
 			if(!$output->toBool())
 			{
 				$content = getXmlRpcFailure(1, $output->getMessage());
-			}
-			else
+			} else
 			{
 				$content = getXmlRpcResponse(strval($document_srl));
 			}
@@ -340,8 +342,9 @@ 
 		// Edit post
 		case 'metaWeblog.editPost' :
 			$tmp_val = (string)$params[0]->value->string;
-			if(!$tmp_val)
-				$tmp_val = (string)$params[0]->value->i4;
+			if(!$tmp_val) {
+							$tmp_val = (string)$params[0]->value->i4;
+			}
 			if(!$tmp_val)
 			{
 				$content = getXmlRpcFailure(1, 'no permission');
@@ -385,8 +388,9 @@ 
 						{
 							foreach($category_list as $category_srl => $category_info)
 							{
-								if($category_info->title == $category)
-									$obj->category_srl = $category_srl;
+								if($category_info->title == $category) {
+																	$obj->category_srl = $category_srl;
+								}
 							}
 						}
 						break;
@@ -396,8 +400,9 @@ 
 						{
 							$tag_list[] = (string)$tag->string;
 						}
-						if(count($tag_list))
-							$obj->tags = implode(',', $tag_list);
+						if(count($tag_list)) {
+													$obj->tags = implode(',', $tag_list);
+						}
 						break;
 				}
 			}
@@ -418,8 +423,9 @@ 
 						$file_info['name'] = $file_list[$i];
 
 						$moved_filename = sprintf('./files/attach/images/%s/%s/%s', $this->module_srl, $document_srl, $file_info['name']);
-						if(file_exists($moved_filename))
-							continue;
+						if(file_exists($moved_filename)) {
+													continue;
+						}
 
 						$fileOutput = $oFileController->insertFile($file_info, $this->module_srl, $document_srl, 0, true);
 						$uploaded_filename = $fileOutput->get('uploaded_filename');
@@ -436,8 +442,7 @@ 
 			if(!$output->toBool())
 			{
 				$content = getXmlRpcFailure(1, $output->getMessage());
-			}
-			else
+			} else
 			{
 				$content = getXmlRpcResponse(true);
 				FileHandler::removeDir($tmp_uploaded_path);
@@ -458,21 +463,20 @@ 
 			{
 				$content = getXmlRpcFailure(1, 'not exists');
 				// Check if a permission to delete a document is granted
-			}
-			elseif(!$oDocument->isGranted())
+			} elseif(!$oDocument->isGranted())
 			{
 				$content = getXmlRpcFailure(1, 'no permission');
 				break;
 				// Delete
-			}
-			else
+			} else
 			{
 				$oDocumentController = getController('document');
 				$output = $oDocumentController->deleteDocument($document_srl);
-				if(!$output->toBool())
-					$content = getXmlRpcFailure(1, $output->getMessage());
-				else
-					$content = getXmlRpcResponse(true);
+				if(!$output->toBool()) {
+									$content = getXmlRpcFailure(1, $output->getMessage());
+				} else {
+									$content = getXmlRpcResponse(true);
+				}
 			}
 
 			printContent($content);
@@ -492,8 +496,7 @@ 
 			if(!$output->toBool() || !$output->data)
 			{
 				$content = getXmlRpcFailure(1, 'post not founded');
-			}
-			else
+			} else
 			{
 				$oEditorController = getController('editor');
 

Spacing +104 added lines, -104 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 	exit();
 
 /**
@@ -13,27 +13,27 @@ 
  * It should be called before executing the module(before_module_proc). If not, it is forced to shut down.
  * */
 // Insert a rsd tag when called_position is after_module_proc
-if($called_position == 'after_module_proc')
+if ($called_position == 'after_module_proc')
 {
 	// Create rsd address of the current module
 	$site_module_info = Context::get('site_module_info');
 	$rsd_url = getFullSiteUrl($site_module_info->domain, '', 'mid', $this->module_info->mid, 'act', 'api');
 	// Insert rsd tag into the header
-	Context::addHtmlHeader("    " . '<link rel="EditURI" type="application/rsd+xml" title="RSD" href="' . $rsd_url . '" />');
+	Context::addHtmlHeader("    ".'<link rel="EditURI" type="application/rsd+xml" title="RSD" href="'.$rsd_url.'" />');
 }
 // If act isnot api, just return
-if($_REQUEST['act'] != 'api')
+if ($_REQUEST['act'] != 'api')
 {
 	return;
 }
 
 // Read func file
-require_once(_XE_PATH_ . 'addons/blogapi/blogapi.func.php');
+require_once(_XE_PATH_.'addons/blogapi/blogapi.func.php');
 
 $xml = $GLOBALS['HTTP_RAW_POST_DATA'];
 
 // If HTTP_RAW_POST_DATA is NULL, Print error message
-if(!$xml)
+if (!$xml)
 {
 	$content = getXmlRpcFailure(1, 'Invalid Method Call');
 	printContent($content);
@@ -41,38 +41,38 @@ 
 
 // xmlprc parsing
 // Parse the requested xmlrpc
-if(Security::detectingXEE($xml))
+if (Security::detectingXEE($xml))
 {
 	header("HTTP/1.0 400 Bad Request");
 	exit;
 }
 
-if(version_compare(PHP_VERSION, '5.2.11', '<=')) libxml_disable_entity_loader(true);
+if (version_compare(PHP_VERSION, '5.2.11', '<=')) libxml_disable_entity_loader(true);
 $xml = new SimpleXMLElement($xml, LIBXML_NONET | LIBXML_NOENT);
 
-$method_name = (string)$xml->methodName;
+$method_name = (string) $xml->methodName;
 $params = $xml->params->param;
 
 // Compatible with some of methodname
-if(in_array($method_name, array('metaWeblog.deletePost', 'metaWeblog.getUsersBlogs', 'metaWeblog.getUserInfo')))
+if (in_array($method_name, array('metaWeblog.deletePost', 'metaWeblog.getUsersBlogs', 'metaWeblog.getUserInfo')))
 {
 	$method_name = str_replace('metaWeblog.', 'blogger.', $method_name);
 }
 
 // Get user_id, password and attempt log-in
-$user_id = trim((string)$params[1]->value->string);
-$password = trim((string)$params[2]->value->string);
+$user_id = trim((string) $params[1]->value->string);
+$password = trim((string) $params[2]->value->string);
 
 // Before executing the module, authentication is processed.
-if($called_position == 'before_module_init')
+if ($called_position == 'before_module_init')
 {
 	// Attempt log-in by using member controller
-	if($user_id && $password)
+	if ($user_id && $password)
 	{
 		$oMemberController = getController('member');
 		$output = $oMemberController->doLogin($user_id, $password);
 		// If login fails, an error message appears
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$content = getXmlRpcFailure(1, $output->getMessage());
 			printContent($content);
@@ -86,10 +86,10 @@ 
 }
 
 // Before module processing, handle requests from blogapi tool and then terminate.
-if($called_position == 'before_module_proc')
+if ($called_position == 'before_module_proc')
 {
 	// Check writing permission 
-	if(!$this->grant->write_document)
+	if (!$this->grant->write_document)
 	{
 		printContent(getXmlRpcFailure(1, 'no permission'));
 	}
@@ -99,10 +99,10 @@ 
 	$category_list = $oDocumentModel->getCategoryList($this->module_srl);
 
 	// Specifies a temporary file storage
-	$tmp_uploaded_path = sprintf(_XE_PATH_ . 'files/cache/blogapi/%s/%s/', $this->mid, $user_id);
-	$uploaded_target_path = sprintf(_XE_PATH_ . 'files/cache/blogapi/%s/%s/', $this->mid, $user_id);
+	$tmp_uploaded_path = sprintf(_XE_PATH_.'files/cache/blogapi/%s/%s/', $this->mid, $user_id);
+	$uploaded_target_path = sprintf(_XE_PATH_.'files/cache/blogapi/%s/%s/', $this->mid, $user_id);
 
-	switch($method_name)
+	switch ($method_name)
 	{
 		// Blog information
 		case 'blogger.getUsersBlogs' :
@@ -119,9 +119,9 @@ 
 		// Return a list of categories
 		case 'metaWeblog.getCategories' :
 			$category_obj_list = array();
-			if($category_list)
+			if ($category_list)
 			{
-				foreach($category_list as $category_srl => $category_info)
+				foreach ($category_list as $category_srl => $category_info)
 				{
 					$obj = new stdClass();
 					$obj->description = $category_info->title;
@@ -142,35 +142,35 @@ 
 			// Check a file upload permission
 			$oFileModel = getModel('file');
 			$file_module_config = $oFileModel->getFileModuleConfig($this->module_srl);
-			if(is_array($file_module_config->download_grant) && count($file_module_config->download_grant) > 0)
+			if (is_array($file_module_config->download_grant) && count($file_module_config->download_grant) > 0)
 			{
 				$logged_info = Context::get('logged_info');
-				if($logged_info->is_admin != 'Y')
+				if ($logged_info->is_admin != 'Y')
 				{
 					$is_permitted = false;
-					for($i = 0; $i < count($file_module_config->download_grant); $i++)
+					for ($i = 0; $i < count($file_module_config->download_grant); $i++)
 					{
 						$group_srl = $file_module_config->download_grant[$i];
-						if($logged_info->group_list[$group_srl])
+						if ($logged_info->group_list[$group_srl])
 						{
 							$is_permitted = true;
 							break;
 						}
 					}
-					if(!$is_permitted){
+					if (!$is_permitted) {
 						printContent(getXmlRpcFailure(1, 'no permission'));
 					}
 				}
 			}
 
 			$fileinfo = $params[3]->value->struct->member;
-			foreach($fileinfo as $key => $val)
+			foreach ($fileinfo as $key => $val)
 			{
-				$nodename = (string)$val->name;
-				if($nodename == 'bits')
-					$filedata = base64_decode((string)$val->value->base64);
-				elseif($nodename == 'name')
-					$filename = (string)$val->value->string;
+				$nodename = (string) $val->name;
+				if ($nodename == 'bits')
+					$filedata = base64_decode((string) $val->value->base64);
+				elseif ($nodename == 'name')
+					$filename = (string) $val->value->string;
 			}
 
 			$tmp_arr = explode('/', $filename);
@@ -181,15 +181,15 @@ 
 			$target_filename = sprintf('%s%s', $tmp_uploaded_path, $filename);
 			FileHandler::writeFile($target_filename, $filedata);
 			$obj = new stdClass();
-			$obj->url = Context::getRequestUri() . $target_filename;
+			$obj->url = Context::getRequestUri().$target_filename;
 
 			$content = getXmlRpcResponse($obj);
 			printContent($content);
 			break;
 		// Get posts
 		case 'metaWeblog.getPost' :
-			$document_srl = (string)$params[0]->value->string;
-			if(!$document_srl)
+			$document_srl = (string) $params[0]->value->string;
+			if (!$document_srl)
 			{
 				printContent(getXmlRpcFailure(1, 'no permission'));
 			}
@@ -197,7 +197,7 @@ 
 			{
 				$oDocumentModel = getModel('document');
 				$oDocument = $oDocumentModel->getDocument($document_srl);
-				if(!$oDocument->isExists() || !$oDocument->isGranted())
+				if (!$oDocument->isExists() || !$oDocument->isGranted())
 				{
 					printContent(getXmlRpcFailure(1, 'no permission'));
 				}
@@ -205,37 +205,37 @@ 
 				{
 					// Get a list of categories and set Context
 					$category = "";
-					if($oDocument->get('category_srl'))
+					if ($oDocument->get('category_srl'))
 					{
 						$oDocumentModel = getModel('document');
 						$category_list = $oDocumentModel->getCategoryList($oDocument->get('module_srl'));
-						if($category_list[$oDocument->get('category_srl')])
+						if ($category_list[$oDocument->get('category_srl')])
 						{
 							$category = $category_list[$oDocument->get('category_srl')]->title;
 						}
 					}
 
 					$content = sprintf(
-							'<?xml version="1.0" encoding="utf-8"?>' .
-							'<methodResponse>' .
-							'<params>' .
-								'<param>' .
-									'<value>' .
-										'<struct>' .
-											'<member><name>categories</name><value><array><data><value><![CDATA[%s]]></value></data></array></value></member>' .
-											'<member><name>dateCreated</name><value><dateTime.iso8601>%s</dateTime.iso8601></value></member>' .
-											'<member><name>description</name><value><![CDATA[%s]]></value></member>' .
-											'<member><name>link</name><value>%s</value></member>' .
-											'<member><name>postid</name><value><string>%s</string></value></member>' .
-											'<member><name>title</name><value><![CDATA[%s]]></value></member>' .
-											'<member><name>publish</name><value><boolean>1</boolean></value></member>' .
-										'</struct>' .
-									'</value>' .
-								'</param>' .
-							'</params>' .
+							'<?xml version="1.0" encoding="utf-8"?>'.
+							'<methodResponse>'.
+							'<params>'.
+								'<param>'.
+									'<value>'.
+										'<struct>'.
+											'<member><name>categories</name><value><array><data><value><![CDATA[%s]]></value></data></array></value></member>'.
+											'<member><name>dateCreated</name><value><dateTime.iso8601>%s</dateTime.iso8601></value></member>'.
+											'<member><name>description</name><value><![CDATA[%s]]></value></member>'.
+											'<member><name>link</name><value>%s</value></member>'.
+											'<member><name>postid</name><value><string>%s</string></value></member>'.
+											'<member><name>title</name><value><![CDATA[%s]]></value></member>'.
+											'<member><name>publish</name><value><boolean>1</boolean></value></member>'.
+										'</struct>'.
+									'</value>'.
+								'</param>'.
+							'</params>'.
 							'</methodResponse>', 
 							$category,
-							date("Ymd", $oDocument->getRegdateTime()) . 'T' . date("H:i:s", $oDocument->getRegdateTime()),
+							date("Ymd", $oDocument->getRegdateTime()).'T'.date("H:i:s", $oDocument->getRegdateTime()),
 							$oDocument->getContent(false, false, true, false),
 							getFullUrl('', 'document_srl', $oDocument->document_srl),
 							$oDocument->document_srl,
@@ -251,35 +251,35 @@ 
 			$obj = new stdClass();
 			$info = $params[3];
 			// Get information of post, title, and category
-			foreach($info->value->struct->member as $val)
+			foreach ($info->value->struct->member as $val)
 			{
-				switch((string)$val->name)
+				switch ((string) $val->name)
 				{
 					case 'title' :
-						$obj->title = (string)$val->value->string;
+						$obj->title = (string) $val->value->string;
 						break;
 					case 'description' :
-						$obj->content = (string)$val->value->string;
+						$obj->content = (string) $val->value->string;
 						break;
 					case 'categories' :
 						$categories = $val->value->array->data->value;
-						$category = (string)$categories[0]->string;
-						if($category && $category_list)
+						$category = (string) $categories[0]->string;
+						if ($category && $category_list)
 						{
-							foreach($category_list as $category_srl => $category_info)
+							foreach ($category_list as $category_srl => $category_info)
 							{
-								if($category_info->title == $category)
+								if ($category_info->title == $category)
 									$obj->category_srl = $category_srl;
 							}
 						}
 						break;
 					case 'tagwords' :
 						$tags = $val->value->array->data->value;
-						foreach($tags as $tag)
+						foreach ($tags as $tag)
 						{
-							$tag_list[] = (string)$tag->string;
+							$tag_list[] = (string) $tag->string;
 						}
-						if(count($tag_list))
+						if (count($tag_list))
 							$obj->tags = implode(',', $tag_list);
 						break;
 				}
@@ -291,21 +291,21 @@ 
 			$obj->module_srl = $this->module_srl;
 
 			// Attachment
-			if(is_dir($tmp_uploaded_path))
+			if (is_dir($tmp_uploaded_path))
 			{
 				$file_list = FileHandler::readDir($tmp_uploaded_path);
 				$file_count = count($file_list);
-				if($file_count)
+				if ($file_count)
 				{
 					$oFileController = getController('file');
-					for($i = 0; $i < $file_count; $i++)
+					for ($i = 0; $i < $file_count; $i++)
 					{
 						$file_info['tmp_name'] = sprintf('%s%s', $tmp_uploaded_path, $file_list[$i]);
 						$file_info['name'] = $file_list[$i];
 						$fileOutput = $oFileController->insertFile($file_info, $this->module_srl, $document_srl, 0, true);
 						$uploaded_filename = $fileOutput->get('uploaded_filename');
 						$source_filename = $fileOutput->get('source_filename');
-						$obj->content = str_replace($uploaded_target_path . $source_filename, sprintf('/files/attach/images/%s/%s%s', $this->module_srl, getNumberingPath($document_srl, 3), $uploaded_filename), $obj->content);
+						$obj->content = str_replace($uploaded_target_path.$source_filename, sprintf('/files/attach/images/%s/%s%s', $this->module_srl, getNumberingPath($document_srl, 3), $uploaded_filename), $obj->content);
 					}
 					$obj->uploaded_count = $file_count;
 				}
@@ -324,7 +324,7 @@ 
 			$obj->homepage = $logged_info->homepage;
 			$output = $oDocumentController->insertDocument($obj, TRUE);
 
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$content = getXmlRpcFailure(1, $output->getMessage());
 			}
@@ -339,17 +339,17 @@ 
 
 		// Edit post
 		case 'metaWeblog.editPost' :
-			$tmp_val = (string)$params[0]->value->string;
-			if(!$tmp_val)
-				$tmp_val = (string)$params[0]->value->i4;
-			if(!$tmp_val)
+			$tmp_val = (string) $params[0]->value->string;
+			if (!$tmp_val)
+				$tmp_val = (string) $params[0]->value->i4;
+			if (!$tmp_val)
 			{
 				$content = getXmlRpcFailure(1, 'no permission');
 				break;
 			}
 			$tmp_arr = explode('/', $tmp_val);
 			$document_srl = array_pop($tmp_arr);
-			if(!$document_srl)
+			if (!$document_srl)
 			{
 				$content = getXmlRpcFailure(1, 'no permission');
 				break;
@@ -358,7 +358,7 @@ 
 			$oDocumentModel = getModel('document');
 			$oDocument = $oDocumentModel->getDocument($document_srl);
 			// Check if a permission to modify a document is granted
-			if(!$oDocument->isGranted())
+			if (!$oDocument->isGranted())
 			{
 				$content = getXmlRpcFailure(1, 'no permission');
 				break;
@@ -368,35 +368,35 @@ 
 
 			$info = $params[3];
 			// Get information of post, title, and category
-			foreach($info->value->struct->member as $val)
+			foreach ($info->value->struct->member as $val)
 			{
-				switch((string)$val->name)
+				switch ((string) $val->name)
 				{
 					case 'title' :
-						$obj->title = (string)$val->value->string;
+						$obj->title = (string) $val->value->string;
 						break;
 					case 'description' :
-						$obj->content = (string)$val->value->string;
+						$obj->content = (string) $val->value->string;
 						break;
 					case 'categories' :
 						$categories = $val->value->array->data->value;
-						$category = (string)$categories[0]->string;
-						if($category && $category_list)
+						$category = (string) $categories[0]->string;
+						if ($category && $category_list)
 						{
-							foreach($category_list as $category_srl => $category_info)
+							foreach ($category_list as $category_srl => $category_info)
 							{
-								if($category_info->title == $category)
+								if ($category_info->title == $category)
 									$obj->category_srl = $category_srl;
 							}
 						}
 						break;
 					case 'tagwords' :
 						$tags = $val->value->array->data->value;
-						foreach($tags as $tag)
+						foreach ($tags as $tag)
 						{
-							$tag_list[] = (string)$tag->string;
+							$tag_list[] = (string) $tag->string;
 						}
-						if(count($tag_list))
+						if (count($tag_list))
 							$obj->tags = implode(',', $tag_list);
 						break;
 				}
@@ -405,26 +405,26 @@ 
 			$obj->document_srl = $document_srl;
 			$obj->module_srl = $this->module_srl;
 			// Attachment
-			if(is_dir($tmp_uploaded_path))
+			if (is_dir($tmp_uploaded_path))
 			{
 				$file_list = FileHandler::readDir($tmp_uploaded_path);
 				$file_count = count($file_list);
-				if($file_count)
+				if ($file_count)
 				{
 					$oFileController = getController('file');
-					for($i = 0; $i < $file_count; $i++)
+					for ($i = 0; $i < $file_count; $i++)
 					{
 						$file_info['tmp_name'] = sprintf('%s%s', $tmp_uploaded_path, $file_list[$i]);
 						$file_info['name'] = $file_list[$i];
 
 						$moved_filename = sprintf('./files/attach/images/%s/%s/%s', $this->module_srl, $document_srl, $file_info['name']);
-						if(file_exists($moved_filename))
+						if (file_exists($moved_filename))
 							continue;
 
 						$fileOutput = $oFileController->insertFile($file_info, $this->module_srl, $document_srl, 0, true);
 						$uploaded_filename = $fileOutput->get('uploaded_filename');
 						$source_filename = $fileOutput->get('source_filename');
-						$obj->content = str_replace($uploaded_target_path . $source_filename, sprintf('/files/attach/images/%s/%s%s', $this->module_srl, getNumberingPath($document_srl, 3), $uploaded_filename), $obj->content);
+						$obj->content = str_replace($uploaded_target_path.$source_filename, sprintf('/files/attach/images/%s/%s%s', $this->module_srl, getNumberingPath($document_srl, 3), $uploaded_filename), $obj->content);
 					}
 					$obj->uploaded_count += $file_count;
 				}
@@ -433,7 +433,7 @@ 
 			$oDocumentController = getController('document');
 			$output = $oDocumentController->updateDocument($oDocument, $obj, TRUE);
 
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$content = getXmlRpcFailure(1, $output->getMessage());
 			}
@@ -447,19 +447,19 @@ 
 			break;
 		// Delete the post
 		case 'blogger.deletePost' :
-			$tmp_val = (string)$params[1]->value->string;
+			$tmp_val = (string) $params[1]->value->string;
 			$tmp_arr = explode('/', $tmp_val);
 			$document_srl = array_pop($tmp_arr);
 			// Get a document
 			$oDocumentModel = getModel('document');
 			$oDocument = $oDocumentModel->getDocument($document_srl);
 			// If the document exists
-			if(!$oDocument->isExists())
+			if (!$oDocument->isExists())
 			{
 				$content = getXmlRpcFailure(1, 'not exists');
 				// Check if a permission to delete a document is granted
 			}
-			elseif(!$oDocument->isGranted())
+			elseif (!$oDocument->isGranted())
 			{
 				$content = getXmlRpcFailure(1, 'no permission');
 				break;
@@ -469,7 +469,7 @@ 
 			{
 				$oDocumentController = getController('document');
 				$output = $oDocumentController->deleteDocument($document_srl);
-				if(!$output->toBool())
+				if (!$output->toBool())
 					$content = getXmlRpcFailure(1, $output->getMessage());
 				else
 					$content = getXmlRpcResponse(true);
@@ -489,7 +489,7 @@ 
 			$args->search_target = 'member_srl';
 			$args->search_keyword = $logged_info->member_srl;
 			$output = $oDocumentModel->getDocumentList($args);
-			if(!$output->toBool() || !$output->data)
+			if (!$output->toBool() || !$output->data)
 			{
 				$content = getXmlRpcFailure(1, 'post not founded');
 			}
@@ -498,12 +498,12 @@ 
 				$oEditorController = getController('editor');
 
 				$posts = array();
-				foreach($output->data as $key => $oDocument)
+				foreach ($output->data as $key => $oDocument)
 				{
 					$post = new stdClass();
 					$post->categories = array();
-					$post->dateCreated = date("Ymd", $oDocument->getRegdateTime()) . 'T' . date("H:i:s", $oDocument->getRegdateTime());
-					$post->description = sprintf('<![CDATA[%s]]>',$oEditorController->transComponent($oDocument->getContent(false, false, true, false)));
+					$post->dateCreated = date("Ymd", $oDocument->getRegdateTime()).'T'.date("H:i:s", $oDocument->getRegdateTime());
+					$post->description = sprintf('<![CDATA[%s]]>', $oEditorController->transComponent($oDocument->getContent(false, false, true, false)));
 					$post->link = $post->permaLink = getFullUrl('', 'document_srl', $oDocument->document_srl);
 					$post->postid = $oDocument->document_srl;
 					$post->title = htmlspecialchars($oDocument->get('title'), ENT_COMPAT | ENT_HTML401, 'UTF-8', false);

addons/blogapi/blogapi.func.php

Braces +9 added lines, -15 removed lines

@@ -1,8 +1,9 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if(!defined('__XE__')) {
 	exit();
+}
 
 /**
  * @file ./addons/blogapi/blogapi.func.php
@@ -34,24 +35,19 @@ 
 	if(preg_match('/^\<\!\[CDATA\[/',$val))
 	{
 		$buff = sprintf("<value>%s</value>", $val);
-	}
-	elseif(is_int($val))
+	} elseif(is_int($val))
 	{
 		$buff = sprintf("<value><i4>%d</i4></value>", $val);
-	}
-	elseif(is_string($val) && preg_match('/^([0-9]+)T([0-9\:]+)$/', $val))
+	} elseif(is_string($val) && preg_match('/^([0-9]+)T([0-9\:]+)$/', $val))
 	{
 		$buff = sprintf("<value><dateTime.iso8601>%s</dateTime.iso8601></value>\n", $val);
-	}
-	elseif(is_double($val))
+	} elseif(is_double($val))
 	{
 		$buff = sprintf("<value><double>%f</double></value>", $val);
-	}
-	elseif(is_bool($val))
+	} elseif(is_bool($val))
 	{
 		$buff = sprintf("<value><boolean>%d</boolean></value>", $val ? 1 : 0);
-	}
-	elseif(is_object($val))
+	} elseif(is_object($val))
 	{
 		$values = get_object_vars($val);
 		$val_count = count($values);
@@ -61,8 +57,7 @@ 
 			$buff .= sprintf("<member>\n<name>%s</name>\n%s</member>\n", htmlspecialchars($k, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), _getEncodedVal($v, true));
 		}
 		$buff .= "</struct></value>\n";
-	}
-	elseif(is_array($val))
+	} elseif(is_array($val))
 	{
 		$val_count = count($val);
 		$buff = "<value><array>\n<data>";
@@ -71,8 +66,7 @@ 
 			$buff .= _getEncodedVal($val[$i], true);
 		}
 		$buff .= "</data>\n</array></value>";
-	}
-	else
+	} else
 	{
 		$buff = sprintf("<value><string>%s</string></value>\n", $val);
 	}

Spacing +13 added lines, -13 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 	exit();
 
 /**
@@ -21,7 +21,7 @@ 
 // Display results
 function getXmlRpcResponse($params)
 {
-	$buff = '<?xml version="1.0" encoding="utf-8"?>' . "\n<methodResponse><params>";
+	$buff = '<?xml version="1.0" encoding="utf-8"?>'."\n<methodResponse><params>";
 	$buff .= _getEncodedVal($params);
 	$buff .= "</params>\n</methodResponse>\n";
 
@@ -31,42 +31,42 @@ 
 // Encoding
 function _getEncodedVal($val, $is_sub_set = false)
 {
-	if(preg_match('/^\<\!\[CDATA\[/',$val))
+	if (preg_match('/^\<\!\[CDATA\[/', $val))
 	{
 		$buff = sprintf("<value>%s</value>", $val);
 	}
-	elseif(is_int($val))
+	elseif (is_int($val))
 	{
 		$buff = sprintf("<value><i4>%d</i4></value>", $val);
 	}
-	elseif(is_string($val) && preg_match('/^([0-9]+)T([0-9\:]+)$/', $val))
+	elseif (is_string($val) && preg_match('/^([0-9]+)T([0-9\:]+)$/', $val))
 	{
 		$buff = sprintf("<value><dateTime.iso8601>%s</dateTime.iso8601></value>\n", $val);
 	}
-	elseif(is_double($val))
+	elseif (is_double($val))
 	{
 		$buff = sprintf("<value><double>%f</double></value>", $val);
 	}
-	elseif(is_bool($val))
+	elseif (is_bool($val))
 	{
 		$buff = sprintf("<value><boolean>%d</boolean></value>", $val ? 1 : 0);
 	}
-	elseif(is_object($val))
+	elseif (is_object($val))
 	{
 		$values = get_object_vars($val);
 		$val_count = count($values);
 		$buff = "<value><struct>";
-		foreach($values as $k => $v)
+		foreach ($values as $k => $v)
 		{
 			$buff .= sprintf("<member>\n<name>%s</name>\n%s</member>\n", htmlspecialchars($k, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), _getEncodedVal($v, true));
 		}
 		$buff .= "</struct></value>\n";
 	}
-	elseif(is_array($val))
+	elseif (is_array($val))
 	{
 		$val_count = count($val);
 		$buff = "<value><array>\n<data>";
-		for($i = 0; $i < $val_count; $i++)
+		for ($i = 0; $i < $val_count; $i++)
 		{
 			$buff .= _getEncodedVal($val[$i], true);
 		}
@@ -76,7 +76,7 @@ 
 	{
 		$buff = sprintf("<value><string>%s</string></value>\n", $val);
 	}
-	if(!$is_sub_set)
+	if (!$is_sub_set)
 	{
 		return sprintf("<param>\n%s</param>", $buff);
 	}
@@ -88,7 +88,7 @@ 
 {
 	header("Content-Type: text/xml; charset=UTF-8");
 	header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-	header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+	header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 	header("Cache-Control: no-store, no-cache, must-revalidate");
 	header("Cache-Control: post-check=0, pre-check=0", false);
 	header("Pragma: no-cache");

addons/counter/counter.addon.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 	exit();
 
 /**
@@ -10,7 +10,7 @@ 
  * @brief Counter add-on
  */
 // Execute if called_position is before_display_content
-if($called_position == 'before_module_init' && Context::get('module') != 'admin' && Context::getResponseMethod() == 'HTML' && Context::isInstalled() && !isCrawler())
+if ($called_position == 'before_module_init' && Context::get('module') != 'admin' && Context::getResponseMethod() == 'HTML' && Context::isInstalled() && !isCrawler())
 {
 	$oCounterController = getController('counter');
 	$oCounterController->counterExecute();

Braces +2 added lines, -1 removed lines

@@ -1,8 +1,9 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if(!defined('__XE__')) {
 	exit();
+}
 
 /**
  * @file point.addon.php

addons/member_communication/member_communication.addon.php

Braces +10 added lines, -9 removed lines

@@ -1,8 +1,9 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if(!defined('__XE__')) {
 	exit();
+}
 
 /**
  * @file member_communication.addon.php
@@ -44,8 +45,7 @@ 
 		$text = preg_replace('@\r?\n@', '\\n', addslashes(Context::getLang('alert_new_message_arrived')));
 		Context::addHtmlFooter("<script type=\"text/javascript\">jQuery(function(){ xeNotifyMessage('{$text}','{$new_message_count}'); });</script>");
 	}
-}
-elseif($this->act == 'getMemberMenu' && $called_position == 'before_module_proc')
+} elseif($this->act == 'getMemberMenu' && $called_position == 'before_module_proc')
 {
 	$member_srl = Context::get('target_srl');
 	$oCommunicationModel = getModel('communication');
@@ -60,8 +60,7 @@ 
 		// Display a list of friends
 		$oMemberController->addMemberPopupMenu(getUrl('', 'mid', $mid, 'act', 'dispCommunicationFriend'), 'cmd_view_friend', '', 'self');
 		// If not, Add menus to send message and to add friends
-	}
-	else
+	} else
 	{
 		// Get member information
 		$oMemberModel = getModel('member');
@@ -73,11 +72,13 @@ 
 
 		$oMemberController = getController('member');
 		// Add a menu for sending message
-		if($logged_info->is_admin == 'Y' || $target_member_info->allow_message == 'Y' || ($target_member_info->allow_message == 'F' && $oCommunicationModel->isFriend($member_srl)))
-			$oMemberController->addMemberPopupMenu(getUrl('', 'mid', Context::get('cur_mid'), 'act', 'dispCommunicationSendMessage', 'receiver_srl', $member_srl), 'cmd_send_message', '', 'popup');
+		if($logged_info->is_admin == 'Y' || $target_member_info->allow_message == 'Y' || ($target_member_info->allow_message == 'F' && $oCommunicationModel->isFriend($member_srl))) {
+					$oMemberController->addMemberPopupMenu(getUrl('', 'mid', Context::get('cur_mid'), 'act', 'dispCommunicationSendMessage', 'receiver_srl', $member_srl), 'cmd_send_message', '', 'popup');
+		}
 		// Add a menu for listing friends (if a friend is new)
-		if(!$oCommunicationModel->isAddedFriend($member_srl))
-			$oMemberController->addMemberPopupMenu(getUrl('', 'mid', Context::get('cur_mid'), 'act', 'dispCommunicationAddFriend', 'target_srl', $member_srl), 'cmd_add_friend', '', 'popup');
+		if(!$oCommunicationModel->isAddedFriend($member_srl)) {
+					$oMemberController->addMemberPopupMenu(getUrl('', 'mid', Context::get('cur_mid'), 'act', 'dispCommunicationAddFriend', 'target_srl', $member_srl), 'cmd_add_friend', '', 'popup');
+		}
 	}
 }
 /* End of file member_communication.addon.php */

Spacing +12 added lines, -12 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 	exit();
 
 /**
@@ -15,7 +15,7 @@ 
  */
 // Stop if non-logged-in user is
 $logged_info = Context::get('logged_info');
-if(!$logged_info|| isCrawler())
+if (!$logged_info || isCrawler())
 {
 	return;
 }
@@ -23,35 +23,35 @@ 
 /**
  * Message/Friend munus are added on the pop-up window and member profile. Check if a new message is received
  * */
-if($this->module != 'member' && $called_position == 'before_module_init')
+if ($this->module != 'member' && $called_position == 'before_module_init')
 {
 	// Load a language file from the communication module
-	Context::loadLang(_XE_PATH_ . 'modules/communication/lang');
+	Context::loadLang(_XE_PATH_.'modules/communication/lang');
 	// Add menus on the member login information
 	$oMemberController = getController('member');
 	$oMemberController->addMemberMenu('dispCommunicationFriend', 'cmd_view_friend');
 	$oMemberController->addMemberMenu('dispCommunicationMessages', 'cmd_view_message_box');
 
-	$flag_file = _XE_PATH_ . 'files/member_extra_info/new_message_flags/' . getNumberingPath($logged_info->member_srl) . $logged_info->member_srl;
-	if($addon_info->use_alarm != 'N' && file_exists($flag_file))
+	$flag_file = _XE_PATH_.'files/member_extra_info/new_message_flags/'.getNumberingPath($logged_info->member_srl).$logged_info->member_srl;
+	if ($addon_info->use_alarm != 'N' && file_exists($flag_file))
 	{
 		// Pop-up to display messages if a flag on new message is set
 		$new_message_count = (int) trim(FileHandler::readFile($flag_file));
 		FileHandler::removeFile($flag_file);
-		Context::loadLang(_XE_PATH_ . 'addons/member_communication/lang');
+		Context::loadLang(_XE_PATH_.'addons/member_communication/lang');
 		Context::loadFile(array('./addons/member_communication/tpl/member_communication.js'), true);
 
 		$text = preg_replace('@\r?\n@', '\\n', addslashes(Context::getLang('alert_new_message_arrived')));
 		Context::addHtmlFooter("<script type=\"text/javascript\">jQuery(function(){ xeNotifyMessage('{$text}','{$new_message_count}'); });</script>");
 	}
 }
-elseif($this->act == 'getMemberMenu' && $called_position == 'before_module_proc')
+elseif ($this->act == 'getMemberMenu' && $called_position == 'before_module_proc')
 {
 	$member_srl = Context::get('target_srl');
 	$oCommunicationModel = getModel('communication');
 
 	// Add a feature to display own message box.
-	if($logged_info->member_srl == $member_srl)
+	if ($logged_info->member_srl == $member_srl)
 	{
 		$mid = Context::get('cur_mid');
 		$oMemberController = getController('member');
@@ -66,17 +66,17 @@ 
 		// Get member information
 		$oMemberModel = getModel('member');
 		$target_member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
-		if(!$target_member_info->member_srl)
+		if (!$target_member_info->member_srl)
 		{
 			return;
 		}
 
 		$oMemberController = getController('member');
 		// Add a menu for sending message
-		if($logged_info->is_admin == 'Y' || $target_member_info->allow_message == 'Y' || ($target_member_info->allow_message == 'F' && $oCommunicationModel->isFriend($member_srl)))
+		if ($logged_info->is_admin == 'Y' || $target_member_info->allow_message == 'Y' || ($target_member_info->allow_message == 'F' && $oCommunicationModel->isFriend($member_srl)))
 			$oMemberController->addMemberPopupMenu(getUrl('', 'mid', Context::get('cur_mid'), 'act', 'dispCommunicationSendMessage', 'receiver_srl', $member_srl), 'cmd_send_message', '', 'popup');
 		// Add a menu for listing friends (if a friend is new)
-		if(!$oCommunicationModel->isAddedFriend($member_srl))
+		if (!$oCommunicationModel->isAddedFriend($member_srl))
 			$oMemberController->addMemberPopupMenu(getUrl('', 'mid', Context::get('cur_mid'), 'act', 'dispCommunicationAddFriend', 'target_srl', $member_srl), 'cmd_add_friend', '', 'popup');
 	}
 }