pradosoft / prado

framework/Util/TVarDumper.php

Doc Comments +3 added lines

@@ -55,6 +55,9 @@
 			return self::$_output;
 	}
 
+	/**
+	 * @param integer $level
+	 */
 	private static function dumpInternal($var,$level)
 	{
 		switch(gettype($var))

Spacing +43 added lines, -43 removed lines

@@ -40,84 +40,84 @@
 	 * @param integer maximum depth that the dumper should go into the variable. Defaults to 10.
 	 * @return string the string representation of the variable
 	 */
-	public static function dump($var,$depth=10,$highlight=false)
+	public static function dump($var, $depth = 10, $highlight = false)
 	{
-		self::$_output='';
-		self::$_objects=array();
-		self::$_depth=$depth;
-		self::dumpInternal($var,0);
-		if($highlight)
+		self::$_output = '';
+		self::$_objects = array();
+		self::$_depth = $depth;
+		self::dumpInternal($var, 0);
+		if ($highlight)
 		{
-			$result=highlight_string("<?php\n".self::$_output,true);
-			return preg_replace('/&lt;\\?php<br \\/>/','',$result,1);
+			$result = highlight_string("<?php\n" . self::$_output, true);
+			return preg_replace('/&lt;\\?php<br \\/>/', '', $result, 1);
 		}
 		else
 			return self::$_output;
 	}
 
-	private static function dumpInternal($var,$level)
+	private static function dumpInternal($var, $level)
 	{
-		switch(gettype($var))
+		switch (gettype($var))
 		{
 			case 'boolean':
-				self::$_output.=$var?'true':'false';
+				self::$_output .= $var ? 'true' : 'false';
 				break;
 			case 'integer':
-				self::$_output.="$var";
+				self::$_output .= "$var";
 				break;
 			case 'double':
-				self::$_output.="$var";
+				self::$_output .= "$var";
 				break;
 			case 'string':
-				self::$_output.="'$var'";
+				self::$_output .= "'$var'";
 				break;
 			case 'resource':
-				self::$_output.='{resource}';
+				self::$_output .= '{resource}';
 				break;
 			case 'NULL':
-				self::$_output.="null";
+				self::$_output .= "null";
 				break;
 			case 'unknown type':
-				self::$_output.='{unknown}';
+				self::$_output .= '{unknown}';
 				break;
 			case 'array':
-				if(self::$_depth<=$level)
-					self::$_output.='array(...)';
-				else if(empty($var))
-					self::$_output.='array()';
+				if (self::$_depth <= $level)
+					self::$_output .= 'array(...)';
+				else if (empty($var))
+					self::$_output .= 'array()';
 				else
 				{
-					$keys=array_keys($var);
-					$spaces=str_repeat(' ',$level*4);
-					self::$_output.="array\n".$spaces.'(';
-					foreach($keys as $key)
+					$keys = array_keys($var);
+					$spaces = str_repeat(' ', $level * 4);
+					self::$_output .= "array\n" . $spaces . '(';
+					foreach ($keys as $key)
 					{
-						self::$_output.="\n".$spaces."    [$key] => ";
-						self::$_output.=self::dumpInternal($var[$key],$level+1);
+						self::$_output .= "\n" . $spaces . "    [$key] => ";
+						self::$_output .= self::dumpInternal($var[$key], $level + 1);
 					}
-					self::$_output.="\n".$spaces.')';
+					self::$_output .= "\n" . $spaces . ')';
 				}
 				break;
 			case 'object':
-				if(($id=array_search($var,self::$_objects,true))!==false)
-					self::$_output.=get_class($var).'#'.($id+1).'(...)';
-				else if(self::$_depth<=$level)
-					self::$_output.=get_class($var).'(...)';
+				if (($id = array_search($var, self::$_objects, true)) !== false)
+					self::$_output .= get_class($var) . '#' . ($id + 1) . '(...)';
+				else if (self::$_depth <= $level)
+					self::$_output .= get_class($var) . '(...)';
 				else
 				{
-					$id=array_push(self::$_objects,$var);
-					$className=get_class($var);
-					$members=(array)$var;
-					$keys=array_keys($members);
-					$spaces=str_repeat(' ',$level*4);
-					self::$_output.="$className#$id\n".$spaces.'(';
-					foreach($keys as $key)
+					$id = array_push(self::$_objects, $var);
+					$className = get_class($var);
+					$members = (array) $var;
+					$keys = array_keys($members);
+					$spaces = str_repeat(' ', $level * 4);
+					self::$_output .= "$className#$id\n" . $spaces . '(';
+					foreach ($keys as $key)
 					{
-						$keyDisplay=strtr(trim($key),array("\0"=>':'));
-						self::$_output.="\n".$spaces."    [$keyDisplay] => ";
-						self::$_output.=self::dumpInternal($members[$key],$level+1);
+						$keyDisplay = strtr(trim($key), array("\0"=>':'));
+						self::$_output .= "\n" . $spaces . "    [$keyDisplay] => ";
+						self::$_output .= self::dumpInternal($members[$key], $level + 1);
 					}
-					self::$_output.="\n".$spaces.')';
+					self::$_output .= "\n" . $spaces . ')';
 				}
 				break;
 		}

Braces +12 added lines, -12 removed lines

@@ -50,9 +50,9 @@ 
 		{
 			$result=highlight_string("<?php\n".self::$_output,true);
 			return preg_replace('/&lt;\\?php<br \\/>/','',$result,1);
+		} else {
+					return self::$_output;
 		}
-		else
-			return self::$_output;
 	}
 
 	private static function dumpInternal($var,$level)
@@ -81,11 +81,11 @@ 
 				self::$_output.='{unknown}';
 				break;
 			case 'array':
-				if(self::$_depth<=$level)
-					self::$_output.='array(...)';
-				else if(empty($var))
-					self::$_output.='array()';
-				else
+				if(self::$_depth<=$level) {
+									self::$_output.='array(...)';
+				} else if(empty($var)) {
+									self::$_output.='array()';
+				} else
 				{
 					$keys=array_keys($var);
 					$spaces=str_repeat(' ',$level*4);
@@ -99,11 +99,11 @@ 
 				}
 				break;
 			case 'object':
-				if(($id=array_search($var,self::$_objects,true))!==false)
-					self::$_output.=get_class($var).'#'.($id+1).'(...)';
-				else if(self::$_depth<=$level)
-					self::$_output.=get_class($var).'(...)';
-				else
+				if(($id=array_search($var,self::$_objects,true))!==false) {
+									self::$_output.=get_class($var).'#'.($id+1).'(...)';
+				} else if(self::$_depth<=$level) {
+									self::$_output.=get_class($var).'(...)';
+				} else
 				{
 					$id=array_push(self::$_objects,$var);
 					$className=get_class($var);

framework/Web/Javascripts/JSMin.php

Doc Comments +9 added lines

@@ -73,6 +73,9 @@ 
 
   // -- Protected Instance Methods ---------------------------------------------
 
+  /**
+   * @param integer $d
+   */
   protected function action($d) {
     switch($d) {
       case 1:
@@ -132,6 +135,9 @@ 
     }
   }
 
+  /**
+   * @return string
+   */
   protected function get() {
     $c = $this->lookAhead;
     $this->lookAhead = null;
@@ -156,6 +162,9 @@ 
     return ' ';
   }
 
+  /**
+   * @param string $c
+   */
   protected function isAlphaNum($c) {
     return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1;
   }

Indentation +198 added lines, -198 removed lines

@@ -60,229 +60,229 @@
   // -- Public Static Methods --------------------------------------------------
 
   public static function minify($js) {
-    $jsmin = new JSMin($js);
-    return $jsmin->min();
+	$jsmin = new JSMin($js);
+	return $jsmin->min();
   }
 
   // -- Public Instance Methods ------------------------------------------------
 
   public function __construct($input) {
-    $this->input       = str_replace("\r\n", "\n", $input);
-    $this->inputLength = strlen($this->input);
+	$this->input       = str_replace("\r\n", "\n", $input);
+	$this->inputLength = strlen($this->input);
   }
 
   // -- Protected Instance Methods ---------------------------------------------
 
   protected function action($d) {
-    switch($d) {
-      case 1:
-        $this->output .= $this->a;
-
-      case 2:
-        $this->a = $this->b;
-
-        if ($this->a === "'" || $this->a === '"') {
-          for (;;) {
-            $this->output .= $this->a;
-            $this->a       = $this->get();
-
-            if ($this->a === $this->b) {
-              break;
-            }
-
-            if (ord($this->a) <= self::ORD_LF) {
-              throw new JSMinException('Unterminated string literal.');
-            }
-
-            if ($this->a === '\\') {
-              $this->output .= $this->a;
-              $this->a       = $this->get();
-            }
-          }
-        }
-
-      case 3:
-        $this->b = $this->next();
-
-        if ($this->b === '/' && (
-            $this->a === '(' || $this->a === ',' || $this->a === '=' ||
-            $this->a === ':' || $this->a === '[' || $this->a === '!' ||
-            $this->a === '&' || $this->a === '|' || $this->a === '?')) {
-
-          $this->output .= $this->a . $this->b;
-
-          for (;;) {
-            $this->a = $this->get();
-
-            if ($this->a === '/') {
-              break;
-            } elseif ($this->a === '\\') {
-              $this->output .= $this->a;
-              $this->a       = $this->get();
-            } elseif (ord($this->a) <= self::ORD_LF) {
-              throw new JSMinException('Unterminated regular expression '.
-                  'literal.');
-            }
-
-            $this->output .= $this->a;
-          }
-
-          $this->b = $this->next();
-        }
-    }
+	switch($d) {
+	  case 1:
+		$this->output .= $this->a;
+
+	  case 2:
+		$this->a = $this->b;
+
+		if ($this->a === "'" || $this->a === '"') {
+		  for (;;) {
+			$this->output .= $this->a;
+			$this->a       = $this->get();
+
+			if ($this->a === $this->b) {
+			  break;
+			}
+
+			if (ord($this->a) <= self::ORD_LF) {
+			  throw new JSMinException('Unterminated string literal.');
+			}
+
+			if ($this->a === '\\') {
+			  $this->output .= $this->a;
+			  $this->a       = $this->get();
+			}
+		  }
+		}
+
+	  case 3:
+		$this->b = $this->next();
+
+		if ($this->b === '/' && (
+			$this->a === '(' || $this->a === ',' || $this->a === '=' ||
+			$this->a === ':' || $this->a === '[' || $this->a === '!' ||
+			$this->a === '&' || $this->a === '|' || $this->a === '?')) {
+
+		  $this->output .= $this->a . $this->b;
+
+		  for (;;) {
+			$this->a = $this->get();
+
+			if ($this->a === '/') {
+			  break;
+			} elseif ($this->a === '\\') {
+			  $this->output .= $this->a;
+			  $this->a       = $this->get();
+			} elseif (ord($this->a) <= self::ORD_LF) {
+			  throw new JSMinException('Unterminated regular expression '.
+				  'literal.');
+			}
+
+			$this->output .= $this->a;
+		  }
+
+		  $this->b = $this->next();
+		}
+	}
   }
 
   protected function get() {
-    $c = $this->lookAhead;
-    $this->lookAhead = null;
-
-    if ($c === null) {
-      if ($this->inputIndex < $this->inputLength) {
-        $c = $this->input[$this->inputIndex];
-        $this->inputIndex += 1;
-      } else {
-        $c = null;
-      }
-    }
-
-    if ($c === "\r") {
-      return "\n";
-    }
-
-    if ($c === null || $c === "\n" || ord($c) >= self::ORD_SPACE) {
-      return $c;
-    }
-
-    return ' ';
+	$c = $this->lookAhead;
+	$this->lookAhead = null;
+
+	if ($c === null) {
+	  if ($this->inputIndex < $this->inputLength) {
+		$c = $this->input[$this->inputIndex];
+		$this->inputIndex += 1;
+	  } else {
+		$c = null;
+	  }
+	}
+
+	if ($c === "\r") {
+	  return "\n";
+	}
+
+	if ($c === null || $c === "\n" || ord($c) >= self::ORD_SPACE) {
+	  return $c;
+	}
+
+	return ' ';
   }
 
   protected function isAlphaNum($c) {
-    return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1;
+	return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1;
   }
 
   protected function min() {
-    $this->a = "\n";
-    $this->action(3);
-
-    while ($this->a !== null) {
-      switch ($this->a) {
-        case ' ':
-          if ($this->isAlphaNum($this->b)) {
-            $this->action(1);
-          } else {
-            $this->action(2);
-          }
-          break;
-
-        case "\n":
-          switch ($this->b) {
-            case '{':
-            case '[':
-            case '(':
-            case '+':
-            case '-':
-              $this->action(1);
-              break;
-
-            case ' ':
-              $this->action(3);
-              break;
-
-            default:
-              if ($this->isAlphaNum($this->b)) {
-                $this->action(1);
-              }
-              else {
-                $this->action(2);
-              }
-          }
-          break;
-
-        default:
-          switch ($this->b) {
-            case ' ':
-              if ($this->isAlphaNum($this->a)) {
-                $this->action(1);
-                break;
-              }
-
-              $this->action(3);
-              break;
-
-            case "\n":
-              switch ($this->a) {
-                case '}':
-                case ']':
-                case ')':
-                case '+':
-                case '-':
-                case '"':
-                case "'":
-                  $this->action(1);
-                  break;
-
-                default:
-                  if ($this->isAlphaNum($this->a)) {
-                    $this->action(1);
-                  }
-                  else {
-                    $this->action(3);
-                  }
-              }
-              break;
-
-            default:
-              $this->action(1);
-              break;
-          }
-      }
-    }
-
-    return $this->output;
+	$this->a = "\n";
+	$this->action(3);
+
+	while ($this->a !== null) {
+	  switch ($this->a) {
+		case ' ':
+		  if ($this->isAlphaNum($this->b)) {
+			$this->action(1);
+		  } else {
+			$this->action(2);
+		  }
+		  break;
+
+		case "\n":
+		  switch ($this->b) {
+			case '{':
+			case '[':
+			case '(':
+			case '+':
+			case '-':
+			  $this->action(1);
+			  break;
+
+			case ' ':
+			  $this->action(3);
+			  break;
+
+			default:
+			  if ($this->isAlphaNum($this->b)) {
+				$this->action(1);
+			  }
+			  else {
+				$this->action(2);
+			  }
+		  }
+		  break;
+
+		default:
+		  switch ($this->b) {
+			case ' ':
+			  if ($this->isAlphaNum($this->a)) {
+				$this->action(1);
+				break;
+			  }
+
+			  $this->action(3);
+			  break;
+
+			case "\n":
+			  switch ($this->a) {
+				case '}':
+				case ']':
+				case ')':
+				case '+':
+				case '-':
+				case '"':
+				case "'":
+				  $this->action(1);
+				  break;
+
+				default:
+				  if ($this->isAlphaNum($this->a)) {
+					$this->action(1);
+				  }
+				  else {
+					$this->action(3);
+				  }
+			  }
+			  break;
+
+			default:
+			  $this->action(1);
+			  break;
+		  }
+	  }
+	}
+
+	return $this->output;
   }
 
   protected function next() {
-    $c = $this->get();
-
-    if ($c === '/') {
-      switch($this->peek()) {
-        case '/':
-          for (;;) {
-            $c = $this->get();
-
-            if (ord($c) <= self::ORD_LF) {
-              return $c;
-            }
-          }
-
-        case '*':
-          $this->get();
-
-          for (;;) {
-            switch($this->get()) {
-              case '*':
-                if ($this->peek() === '/') {
-                  $this->get();
-                  return ' ';
-                }
-                break;
-
-              case null:
-                throw new JSMinException('Unterminated comment.');
-            }
-          }
-
-        default:
-          return $c;
-      }
-    }
-
-    return $c;
+	$c = $this->get();
+
+	if ($c === '/') {
+	  switch($this->peek()) {
+		case '/':
+		  for (;;) {
+			$c = $this->get();
+
+			if (ord($c) <= self::ORD_LF) {
+			  return $c;
+			}
+		  }
+
+		case '*':
+		  $this->get();
+
+		  for (;;) {
+			switch($this->get()) {
+			  case '*':
+				if ($this->peek() === '/') {
+				  $this->get();
+				  return ' ';
+				}
+				break;
+
+			  case null:
+				throw new JSMinException('Unterminated comment.');
+			}
+		  }
+
+		default:
+		  return $c;
+	  }
+	}
+
+	return $c;
   }
 
   protected function peek() {
-    $this->lookAhead = $this->get();
-    return $this->lookAhead;
+	$this->lookAhead = $this->get();
+	return $this->lookAhead;
   }
 }
 

Spacing +4 added lines, -4 removed lines

@@ -74,7 +74,7 @@ 
   // -- Protected Instance Methods ---------------------------------------------
 
   protected function action($d) {
-    switch($d) {
+    switch ($d) {
       case 1:
         $this->output .= $this->a;
 
@@ -120,7 +120,7 @@ 
               $this->output .= $this->a;
               $this->a       = $this->get();
             } elseif (ord($this->a) <= self::ORD_LF) {
-              throw new JSMinException('Unterminated regular expression '.
+              throw new JSMinException('Unterminated regular expression ' .
                   'literal.');
             }
 
@@ -245,7 +245,7 @@ 
     $c = $this->get();
 
     if ($c === '/') {
-      switch($this->peek()) {
+      switch ($this->peek()) {
         case '/':
           for (;;) {
             $c = $this->get();
@@ -259,7 +259,7 @@ 
           $this->get();
 
           for (;;) {
-            switch($this->get()) {
+            switch ($this->get()) {
               case '*':
                 if ($this->peek() === '/') {
                   $this->get();

Braces +2 added lines, -4 removed lines

@@ -191,8 +191,7 @@ 
             default:
               if ($this->isAlphaNum($this->b)) {
                 $this->action(1);
-              }
-              else {
+              } else {
                 $this->action(2);
               }
           }
@@ -224,8 +223,7 @@ 
                 default:
                   if ($this->isAlphaNum($this->a)) {
                     $this->action(1);
-                  }
-                  else {
+                  } else {
                     $this->action(3);
                   }
               }

framework/Web/Javascripts/TJavaScript.php

Doc Comments +4 added lines, -2 removed lines

@@ -93,7 +93,7 @@ 
 	}
 
 	/**
-	 * @return Marks a string as a javascript function. Once marke, the string is considered as a
+	 * @return TJavaScriptLiteral a string as a javascript function. Once marke, the string is considered as a
 	 * raw javascript function that is not supposed to be encoded by {@link encode}
 	 */
 	public static function quoteJsLiteral($js)
@@ -256,6 +256,7 @@ 
 	 * @param string string to be decoded
 	 * @param bool whether to convert returned objects to associative arrays
 	 * @param int recursion depth
+	 * @param string $value
 	 * @return mixed decoded variable
 	 */
 	public static function jsonDecode($value, $assoc = false, $depth = 512)
@@ -298,7 +299,8 @@ 
 	 * Minimize the size of a javascript script.
 	 * This method is based on Douglas Crockford's JSMin.
 	 * @param string code that you want to minimzie
-	 * @return minimized version of the code
+	 * @param string $code
+	 * @return string version of the code
 	 */
 	public static function JSMin($code)
 	{

Spacing +44 added lines, -44 removed lines

@@ -28,9 +28,9 @@ 
 	 */
 	public static function renderScriptFiles($files)
 	{
-		$str='';
-		foreach($files as $file)
-			$str.= self::renderScriptFile($file);
+		$str = '';
+		foreach ($files as $file)
+			$str .= self::renderScriptFile($file);
 		return $str;
 	}
 
@@ -41,7 +41,7 @@ 
 	 */
 	public static function renderScriptFile($file)
 	{
-		return '<script type="text/javascript" src="'.THttpUtility::htmlEncode($file)."\"></script>\n";
+		return '<script type="text/javascript" src="' . THttpUtility::htmlEncode($file) . "\"></script>\n";
 	}
 
 	/**
@@ -51,8 +51,8 @@ 
 	 */
 	public static function renderScriptBlocks($scripts)
 	{
-		if(count($scripts))
-			return "<script type=\"text/javascript\">\n/*<![CDATA[*/\n".implode("\n",$scripts)."\n/*]]>*/\n</script>\n";
+		if (count($scripts))
+			return "<script type=\"text/javascript\">\n/*<![CDATA[*/\n" . implode("\n", $scripts) . "\n/*]]>*/\n</script>\n";
 		else
 			return '';
 	}
@@ -64,8 +64,8 @@ 
 	 */
 	public static function renderScriptBlocksCallback($scripts)
 	{
-		if(count($scripts))
-			return implode("\n",$scripts)."\n";
+		if (count($scripts))
+			return implode("\n", $scripts) . "\n";
 		else
 			return '';
 	}
@@ -89,7 +89,7 @@ 
 	 */
 	public static function quoteString($js)
 	{
-		return self::jsonEncode($js,JSON_HEX_QUOT | JSON_HEX_APOS | JSON_HEX_TAG);
+		return self::jsonEncode($js, JSON_HEX_QUOT | JSON_HEX_APOS | JSON_HEX_TAG);
 	}
 
 	/**
@@ -98,7 +98,7 @@ 
 	 */
 	public static function quoteJsLiteral($js)
 	{
-		if($js instanceof TJavaScriptLiteral)
+		if ($js instanceof TJavaScriptLiteral)
 			return $js;
 		else
 			return new TJavaScriptLiteral($js);
@@ -150,47 +150,47 @@ 
 	 * @param boolean wether to encode empty strings too. Default to false for BC.
 	 * @return string the encoded string
 	 */
-	public static function encode($value,$toMap=true,$encodeEmptyStrings=false)
+	public static function encode($value, $toMap = true, $encodeEmptyStrings = false)
 	{
-		if(is_string($value))
+		if (is_string($value))
 			return self::quoteString($value);
-		else if(is_bool($value))
-			return $value?'true':'false';
-		else if(is_array($value))
+		else if (is_bool($value))
+			return $value ? 'true' : 'false';
+		else if (is_array($value))
 		{
-			$results='';
-			if(($n=count($value))>0 && array_keys($value)!==range(0,$n-1))
+			$results = '';
+			if (($n = count($value)) > 0 && array_keys($value) !== range(0, $n - 1))
 			{
-				foreach($value as $k=>$v)
+				foreach ($value as $k=>$v)
 				{
-					if($v!=='' || $encodeEmptyStrings)
+					if ($v !== '' || $encodeEmptyStrings)
 					{
-						if($results!=='')
-							$results.=',';
-						$results.="'$k':".self::encode($v,$toMap,$encodeEmptyStrings);
+						if ($results !== '')
+							$results .= ',';
+						$results .= "'$k':" . self::encode($v, $toMap, $encodeEmptyStrings);
 					}
 				}
-				return '{'.$results.'}';
+				return '{' . $results . '}';
 			}
 			else
 			{
-				foreach($value as $v)
+				foreach ($value as $v)
 				{
-					if($v!=='' || $encodeEmptyStrings)
+					if ($v !== '' || $encodeEmptyStrings)
 					{
-						if($results!=='')
-							$results.=',';
-						$results.=self::encode($v,$toMap, $encodeEmptyStrings);
+						if ($results !== '')
+							$results .= ',';
+						$results .= self::encode($v, $toMap, $encodeEmptyStrings);
 					}
 				}
-				return '['.$results.']';
+				return '[' . $results . ']';
 			}
 		}
-		else if(is_integer($value))
+		else if (is_integer($value))
 			return "$value";
-		else if(is_float($value))
+		else if (is_float($value))
 		{
-			switch($value)
+			switch ($value)
 			{
 				case -INF:
 					return 'Number.NEGATIVE_INFINITY';
@@ -199,20 +199,20 @@ 
 					return 'Number.POSITIVE_INFINITY';
 					break;
 				default:
-					$locale=localeConv();
-					if($locale['decimal_point']=='.')
+					$locale = localeConv();
+					if ($locale['decimal_point'] == '.')
 						return "$value";
 					else
 						return str_replace($locale['decimal_point'], '.', "$value");
 					break;
 			}
 		}
-		else if(is_object($value))
+		else if (is_object($value))
 			if ($value instanceof TJavaScriptLiteral)
 				return $value->toJavaScriptLiteral();
 			else
-				return self::encode(get_object_vars($value),$toMap);
-		else if($value===null)
+				return self::encode(get_object_vars($value), $toMap);
+		else if ($value === null)
 			return 'null';
 		else
 			return '';
@@ -225,12 +225,12 @@ 
 	 */
 	public static function jsonEncode($value, $options = 0)
 	{
-		if (($g=Prado::getApplication()->getGlobalization(false))!==null &&
-			strtoupper($enc=$g->getCharset())!='UTF-8') {
+		if (($g = Prado::getApplication()->getGlobalization(false)) !== null &&
+			strtoupper($enc = $g->getCharset()) != 'UTF-8') {
 			self::convertToUtf8($value, $enc);
 		}
 
-		$s = @json_encode($value,$options);
+		$s = @json_encode($value, $options);
 		self::checkJsonError();
 		return $s;
 	}
@@ -241,11 +241,11 @@ 
 	 * @param string $sourceEncoding
 	 */
 	private static function convertToUtf8(&$value, $sourceEncoding) {
-		if(is_string($value))
-			$value=iconv($sourceEncoding, 'UTF-8', $value);
+		if (is_string($value))
+			$value = iconv($sourceEncoding, 'UTF-8', $value);
 		else if (is_array($value))
 		{
-			foreach($value as &$element)
+			foreach ($value as &$element)
 				self::convertToUtf8($element, $sourceEncoding);
 		}
 	}
@@ -260,7 +260,7 @@ 
 	 */
 	public static function jsonDecode($value, $assoc = false, $depth = 512)
 	{
-		$s= @json_decode($value, $assoc, $depth);
+		$s = @json_decode($value, $assoc, $depth);
 		self::checkJsonError();
 		return $s;
 	}

Braces +54 added lines, -47 removed lines

@@ -29,8 +29,9 @@ 
 	public static function renderScriptFiles($files)
 	{
 		$str='';
-		foreach($files as $file)
-			$str.= self::renderScriptFile($file);
+		foreach($files as $file) {
+					$str.= self::renderScriptFile($file);
+		}
 		return $str;
 	}
 
@@ -51,10 +52,11 @@ 
 	 */
 	public static function renderScriptBlocks($scripts)
 	{
-		if(count($scripts))
-			return "<script type=\"text/javascript\">\n/*<![CDATA[*/\n".implode("\n",$scripts)."\n/*]]>*/\n</script>\n";
-		else
-			return '';
+		if(count($scripts)) {
+					return "<script type=\"text/javascript\">\n/*<![CDATA[*/\n".implode("\n",$scripts)."\n/*]]>*/\n</script>\n";
+		} else {
+					return '';
+		}
 	}
 
 	/**
@@ -64,10 +66,11 @@ 
 	 */
 	public static function renderScriptBlocksCallback($scripts)
 	{
-		if(count($scripts))
-			return implode("\n",$scripts)."\n";
-		else
-			return '';
+		if(count($scripts)) {
+					return implode("\n",$scripts)."\n";
+		} else {
+					return '';
+		}
 	}
 
 	/**
@@ -98,10 +101,11 @@ 
 	 */
 	public static function quoteJsLiteral($js)
 	{
-		if($js instanceof TJavaScriptLiteral)
-			return $js;
-		else
-			return new TJavaScriptLiteral($js);
+		if($js instanceof TJavaScriptLiteral) {
+					return $js;
+		} else {
+					return new TJavaScriptLiteral($js);
+		}
 	}
 
 	/**
@@ -152,11 +156,11 @@ 
 	 */
 	public static function encode($value,$toMap=true,$encodeEmptyStrings=false)
 	{
-		if(is_string($value))
-			return self::quoteString($value);
-		else if(is_bool($value))
-			return $value?'true':'false';
-		else if(is_array($value))
+		if(is_string($value)) {
+					return self::quoteString($value);
+		} else if(is_bool($value)) {
+					return $value?'true':'false';
+		} else if(is_array($value))
 		{
 			$results='';
 			if(($n=count($value))>0 && array_keys($value)!==range(0,$n-1))
@@ -165,30 +169,30 @@ 
 				{
 					if($v!=='' || $encodeEmptyStrings)
 					{
-						if($results!=='')
-							$results.=',';
+						if($results!=='') {
+													$results.=',';
+						}
 						$results.="'$k':".self::encode($v,$toMap,$encodeEmptyStrings);
 					}
 				}
 				return '{'.$results.'}';
-			}
-			else
+			} else
 			{
 				foreach($value as $v)
 				{
 					if($v!=='' || $encodeEmptyStrings)
 					{
-						if($results!=='')
-							$results.=',';
+						if($results!=='') {
+													$results.=',';
+						}
 						$results.=self::encode($v,$toMap, $encodeEmptyStrings);
 					}
 				}
 				return '['.$results.']';
 			}
-		}
-		else if(is_integer($value))
-			return "$value";
-		else if(is_float($value))
+		} else if(is_integer($value)) {
+					return "$value";
+		} else if(is_float($value))
 		{
 			switch($value)
 			{
@@ -200,22 +204,24 @@ 
 					break;
 				default:
 					$locale=localeConv();
-					if($locale['decimal_point']=='.')
-						return "$value";
-					else
-						return str_replace($locale['decimal_point'], '.', "$value");
+					if($locale['decimal_point']=='.') {
+											return "$value";
+					} else {
+											return str_replace($locale['decimal_point'], '.', "$value");
+					}
 					break;
 			}
-		}
-		else if(is_object($value))
-			if ($value instanceof TJavaScriptLiteral)
+		} else if(is_object($value)) {
+					if ($value instanceof TJavaScriptLiteral)
 				return $value->toJavaScriptLiteral();
-			else
-				return self::encode(get_object_vars($value),$toMap);
-		else if($value===null)
-			return 'null';
-		else
-			return '';
+		} else {
+							return self::encode(get_object_vars($value),$toMap);
+			}
+		else if($value===null) {
+					return 'null';
+		} else {
+					return '';
+		}
 	}
 	/**
 	 * Encodes a PHP variable into javascript string.
@@ -241,12 +247,13 @@ 
 	 * @param string $sourceEncoding
 	 */
 	private static function convertToUtf8(&$value, $sourceEncoding) {
-		if(is_string($value))
-			$value=iconv($sourceEncoding, 'UTF-8', $value);
-		else if (is_array($value))
+		if(is_string($value)) {
+					$value=iconv($sourceEncoding, 'UTF-8', $value);
+		} else if (is_array($value))
 		{
-			foreach($value as &$element)
-				self::convertToUtf8($element, $sourceEncoding);
+			foreach($value as &$element) {
+							self::convertToUtf8($element, $sourceEncoding);
+			}
 		}
 	}
 

framework/Web/Services/TJsonService.php

Doc Comments +1 added lines

@@ -140,6 +140,7 @@
 	/**
 	 * Renders content provided by TJsonResponse::getJsonContent() as
 	 * javascript in JSON format.
+	 * @param TJsonResponse $service
 	 */
 	protected function createJsonResponse($service,$properties,$config)
 	{

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TJsonService and TJsonResponse class file.
- *
- * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.Services
- */
+	 * TJsonService and TJsonResponse class file.
+	 *
+	 * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.Services
+	 */
 
 /**
  * TJsonService class provides to end-users javascript content response in

Spacing +32 added lines, -32 removed lines

@@ -54,7 +54,7 @@ 
 	/**
 	 * @var array registered services
 	 */
-	private $_services=array();
+	private $_services = array();
 
 	/**
 	 * Initializes this module.
@@ -72,20 +72,20 @@ 
 	 */
 	protected function loadJsonServices($config)
 	{
-		if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
+		if ($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 		{
-			if(is_array($config))
+			if (is_array($config))
 			{
-				foreach($config['json'] as $id => $json)
+				foreach ($config['json'] as $id => $json)
 					$this->_services[$id] = $json;
 			}
 		}
 		else
 		{
-			foreach($config->getElementsByTagName('json') as $json)
+			foreach ($config->getElementsByTagName('json') as $json)
 			{
-				if(($id=$json->getAttribute('id'))!==null)
-					$this->_services[$id]=$json;
+				if (($id = $json->getAttribute('id')) !== null)
+					$this->_services[$id] = $json;
 				else
 					throw new TConfigurationException('jsonservice_id_required');
 			}
@@ -98,58 +98,58 @@ 
 	 */
 	public function run()
 	{
-		$id=$this->getRequest()->getServiceParameter();
-		if(isset($this->_services[$id]))
+		$id = $this->getRequest()->getServiceParameter();
+		if (isset($this->_services[$id]))
 		{
-			$serviceConfig=$this->_services[$id];
-			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
+			$serviceConfig = $this->_services[$id];
+			if ($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 			{
-				if(isset($serviceConfig['class']))
+				if (isset($serviceConfig['class']))
 				{
-					$service=Prado::createComponent($serviceConfig['class']);
-					if($service instanceof TJsonResponse)
+					$service = Prado::createComponent($serviceConfig['class']);
+					if ($service instanceof TJsonResponse)
 					{
-						$properties = isset($serviceConfig['properties'])?$serviceConfig['properties']:array();
-						$this->createJsonResponse($service,$properties,$serviceConfig);
+						$properties = isset($serviceConfig['properties']) ? $serviceConfig['properties'] : array();
+						$this->createJsonResponse($service, $properties, $serviceConfig);
 					}
 					else
-						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
+						throw new TConfigurationException('jsonservice_response_type_invalid', $id);
 				}
 				else
-					throw new TConfigurationException('jsonservice_class_required',$id);
+					throw new TConfigurationException('jsonservice_class_required', $id);
 			}
 			else
 			{
-				$properties=$serviceConfig->getAttributes();
-				if(($class=$properties->remove('class'))!==null)
+				$properties = $serviceConfig->getAttributes();
+				if (($class = $properties->remove('class')) !== null)
 				{
-					$service=Prado::createComponent($class);
-					if($service instanceof TJsonResponse)
-						$this->createJsonResponse($service,$properties,$serviceConfig);
+					$service = Prado::createComponent($class);
+					if ($service instanceof TJsonResponse)
+						$this->createJsonResponse($service, $properties, $serviceConfig);
 					else
-						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
+						throw new TConfigurationException('jsonservice_response_type_invalid', $id);
 				}
 				else
-					throw new TConfigurationException('jsonservice_class_required',$id);
+					throw new TConfigurationException('jsonservice_class_required', $id);
 			}
 		}
 		else
-			throw new THttpException(404,'jsonservice_provider_unknown',$id);
+			throw new THttpException(404, 'jsonservice_provider_unknown', $id);
 	}
 
 	/**
 	 * Renders content provided by TJsonResponse::getJsonContent() as
 	 * javascript in JSON format.
 	 */
-	protected function createJsonResponse($service,$properties,$config)
+	protected function createJsonResponse($service, $properties, $config)
 	{
 		// init service properties
-		foreach($properties as $name=>$value)
-			$service->setSubproperty($name,$value);
+		foreach ($properties as $name=>$value)
+			$service->setSubproperty($name, $value);
 		$service->init($config);
 
 		//send content if not null
-		if(($content=$service->getJsonContent())!==null)
+		if (($content = $service->getJsonContent()) !== null)
 		{
 			$response = $this->getResponse();
 			$response->setContentType('application/json');
@@ -175,7 +175,7 @@ 
  */
 abstract class TJsonResponse extends TApplicationComponent
 {
-	private $_id='';
+	private $_id = '';
 
 	/**
 	 * Initializes the feed.
@@ -198,7 +198,7 @@ 
 	 */
 	public function setID($value)
 	{
-		$this->_id=$value;
+		$this->_id = $value;
 	}
 
 	/**

Braces +26 added lines, -24 removed lines

@@ -76,18 +76,19 @@ 
 		{
 			if(is_array($config))
 			{
-				foreach($config['json'] as $id => $json)
-					$this->_services[$id] = $json;
+				foreach($config['json'] as $id => $json) {
+									$this->_services[$id] = $json;
+				}
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('json') as $json)
 			{
-				if(($id=$json->getAttribute('id'))!==null)
-					$this->_services[$id]=$json;
-				else
-					throw new TConfigurationException('jsonservice_id_required');
+				if(($id=$json->getAttribute('id'))!==null) {
+									$this->_services[$id]=$json;
+				} else {
+									throw new TConfigurationException('jsonservice_id_required');
+				}
 			}
 		}
 	}
@@ -111,30 +112,30 @@ 
 					{
 						$properties = isset($serviceConfig['properties'])?$serviceConfig['properties']:array();
 						$this->createJsonResponse($service,$properties,$serviceConfig);
+					} else {
+											throw new TConfigurationException('jsonservice_response_type_invalid',$id);
 					}
-					else
-						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
+				} else {
+									throw new TConfigurationException('jsonservice_class_required',$id);
 				}
-				else
-					throw new TConfigurationException('jsonservice_class_required',$id);
-			}
-			else
+			} else
 			{
 				$properties=$serviceConfig->getAttributes();
 				if(($class=$properties->remove('class'))!==null)
 				{
 					$service=Prado::createComponent($class);
-					if($service instanceof TJsonResponse)
-						$this->createJsonResponse($service,$properties,$serviceConfig);
-					else
-						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
+					if($service instanceof TJsonResponse) {
+											$this->createJsonResponse($service,$properties,$serviceConfig);
+					} else {
+											throw new TConfigurationException('jsonservice_response_type_invalid',$id);
+					}
+				} else {
+									throw new TConfigurationException('jsonservice_class_required',$id);
 				}
-				else
-					throw new TConfigurationException('jsonservice_class_required',$id);
 			}
+		} else {
+					throw new THttpException(404,'jsonservice_provider_unknown',$id);
 		}
-		else
-			throw new THttpException(404,'jsonservice_provider_unknown',$id);
 	}
 
 	/**
@@ -144,8 +145,9 @@ 
 	protected function createJsonResponse($service,$properties,$config)
 	{
 		// init service properties
-		foreach($properties as $name=>$value)
-			$service->setSubproperty($name,$value);
+		foreach($properties as $name=>$value) {
+					$service->setSubproperty($name,$value);
+		}
 		$service->init($config);
 
 		//send content if not null

framework/Web/Services/TPageService.php

Doc Comments +7 added lines

@@ -369,6 +369,7 @@ 
 
 	/**
 	 * @param string default page path to be served if no explicit page is request
+	 * @param string $value
 	 * @throws TInvalidOperationException if the page service is initialized
 	 */
 	public function setDefaultPage($value)
@@ -528,6 +529,7 @@ 
 	 * @param array list of GET parameters, null if no GET parameters required
 	 * @param boolean whether to encode the ampersand in URL, defaults to true.
 	 * @param boolean whether to encode the GET parameters (their names and values), defaults to true.
+	 * @param string $pagePath
 	 * @return string URL for the page and GET parameters
 	 */
 	public function constructUrl($pagePath,$getParams=null,$encodeAmpersand=true,$encodeGetItems=true)
@@ -670,6 +672,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $configPath
+	 */
 	public function loadFromPhp($config,$configPath,$configPagePath)
 	{
 		$this->loadApplicationConfigurationFromPhp($config,$configPath);
@@ -683,6 +688,8 @@ 
 	 * @param TXmlElement config xml element
 	 * @param string the directory containing this configuration
 	 * @param string the page path that the config XML is associated with. The page path doesn't include the page name.
+	 * @param TXmlDocument $dom
+	 * @param string $configPath
 	 */
 	public function loadFromXml($dom,$configPath,$configPagePath)
 	{

Spacing +251 added lines, -251 removed lines

@@ -77,68 +77,68 @@ 
 	/**
 	 * Configuration file name
 	 */
-	const CONFIG_FILE_XML='config.xml';
+	const CONFIG_FILE_XML = 'config.xml';
 	/**
 	 * Configuration file name
 	 */
-	const CONFIG_FILE_PHP='config.php';
+	const CONFIG_FILE_PHP = 'config.php';
 	/**
 	 * Default base path
 	 */
-	const DEFAULT_BASEPATH='Pages';
+	const DEFAULT_BASEPATH = 'Pages';
 	/**
 	 * Fallback base path - used to be the default up to Prado < 3.2
 	 */
-	const FALLBACK_BASEPATH='pages';
+	const FALLBACK_BASEPATH = 'pages';
 	/**
 	 * Prefix of ID used for storing parsed configuration in cache
 	 */
-	const CONFIG_CACHE_PREFIX='prado:pageservice:';
+	const CONFIG_CACHE_PREFIX = 'prado:pageservice:';
 	/**
 	 * Page template file extension
 	 */
-	const PAGE_FILE_EXT='.page';
+	const PAGE_FILE_EXT = '.page';
 	/**
 	 * @var string root path of pages
 	 */
-	private $_basePath=null;
+	private $_basePath = null;
 	/**
 	 * @var string base path class in namespace format
 	 */
-	private $_basePageClass='TPage';
+	private $_basePageClass = 'TPage';
 	/**
 	 * @var string clientscript manager class in namespace format
 	 * @since 3.1.7
 	 */
-	private $_clientScriptManagerClass='System.Web.UI.TClientScriptManager';
+	private $_clientScriptManagerClass = 'System.Web.UI.TClientScriptManager';
 	/**
 	 * @var string default page
 	 */
-	private $_defaultPage='Home';
+	private $_defaultPage = 'Home';
 	/**
 	 * @var string requested page (path)
 	 */
-	private $_pagePath=null;
+	private $_pagePath = null;
 	/**
 	 * @var TPage the requested page
 	 */
-	private $_page=null;
+	private $_page = null;
 	/**
 	 * @var array list of initial page property values
 	 */
-	private $_properties=array();
+	private $_properties = array();
 	/**
 	 * @var boolean whether service is initialized
 	 */
-	private $_initialized=false;
+	private $_initialized = false;
 	/**
 	 * @var TThemeManager theme manager
 	 */
-	private $_themeManager=null;
+	private $_themeManager = null;
 	/**
 	 * @var TTemplateManager template manager
 	 */
-	private $_templateManager=null;
+	private $_templateManager = null;
 
 	/**
 	 * Initializes the service.
@@ -147,13 +147,13 @@ 
 	 */
 	public function init($config)
 	{
-		Prado::trace("Initializing TPageService",'System.Web.Services.TPageService');
+		Prado::trace("Initializing TPageService", 'System.Web.Services.TPageService');
 
-		$pageConfig=$this->loadPageConfig($config);
+		$pageConfig = $this->loadPageConfig($config);
 
 		$this->initPageContext($pageConfig);
 
-		$this->_initialized=true;
+		$this->_initialized = true;
 	}
 
 	/**
@@ -165,8 +165,8 @@ 
 	 */
 	protected function initPageContext($pageConfig)
 	{
-		$application=$this->getApplication();
-		foreach($pageConfig->getApplicationConfigurations() as $appConfig)
+		$application = $this->getApplication();
+		foreach ($pageConfig->getApplicationConfigurations() as $appConfig)
 			$application->applyConfiguration($appConfig);
 
 		$this->applyConfiguration($pageConfig);
@@ -179,21 +179,21 @@ 
 	protected function applyConfiguration($config)
 	{
 		// initial page properties (to be set when page runs)
-		$this->_properties=array_merge($this->_properties, $config->getProperties());
+		$this->_properties = array_merge($this->_properties, $config->getProperties());
 		$this->getApplication()->getAuthorizationRules()->mergeWith($config->getRules());
-		$pagePath=$this->getRequestedPagePath();
+		$pagePath = $this->getRequestedPagePath();
 		// external configurations
-		foreach($config->getExternalConfigurations() as $filePath=>$params)
+		foreach ($config->getExternalConfigurations() as $filePath=>$params)
 		{
-			list($configPagePath,$condition)=$params;
-			if($condition!==true)
-				$condition=$this->evaluateExpression($condition);
-			if($condition)
+			list($configPagePath, $condition) = $params;
+			if ($condition !== true)
+				$condition = $this->evaluateExpression($condition);
+			if ($condition)
 			{
-				if(($path=Prado::getPathOfNamespace($filePath,Prado::getApplication()->getConfigurationFileExt()))===null || !is_file($path))
-					throw new TConfigurationException('pageservice_includefile_invalid',$filePath);
-				$c=new TPageConfiguration($pagePath);
-				$c->loadFromFile($path,$configPagePath);
+				if (($path = Prado::getPathOfNamespace($filePath, Prado::getApplication()->getConfigurationFileExt())) === null || !is_file($path))
+					throw new TConfigurationException('pageservice_includefile_invalid', $filePath);
+				$c = new TPageConfiguration($pagePath);
+				$c->loadFromFile($path, $configPagePath);
 				$this->applyConfiguration($c);
 			}
 		}
@@ -206,9 +206,9 @@ 
 	 */
 	protected function determineRequestedPagePath()
 	{
-		$pagePath=$this->getRequest()->getServiceParameter();
-		if(empty($pagePath))
-			$pagePath=$this->getDefaultPage();
+		$pagePath = $this->getRequest()->getServiceParameter();
+		if (empty($pagePath))
+			$pagePath = $this->getDefaultPage();
 		return $pagePath;
 	}
 
@@ -219,77 +219,77 @@ 
 	 */
 	protected function loadPageConfig($config)
 	{
-		$application=$this->getApplication();
-		$pagePath=$this->getRequestedPagePath();
-		if(($cache=$application->getCache())===null)
+		$application = $this->getApplication();
+		$pagePath = $this->getRequestedPagePath();
+		if (($cache = $application->getCache()) === null)
 		{
-			$pageConfig=new TPageConfiguration($pagePath);
-			if($config!==null)
+			$pageConfig = new TPageConfiguration($pagePath);
+			if ($config !== null)
 			{
-				if($application->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
-					$pageConfig->loadPageConfigurationFromPhp($config,$application->getBasePath(),'');
+				if ($application->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+					$pageConfig->loadPageConfigurationFromPhp($config, $application->getBasePath(), '');
 				else
-					$pageConfig->loadPageConfigurationFromXml($config,$application->getBasePath(),'');
+					$pageConfig->loadPageConfigurationFromXml($config, $application->getBasePath(), '');
 			}
 			$pageConfig->loadFromFiles($this->getBasePath());
 		}
 		else
 		{
-			$configCached=true;
-			$currentTimestamp=array();
-			$arr=$cache->get(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath);
-			if(is_array($arr))
+			$configCached = true;
+			$currentTimestamp = array();
+			$arr = $cache->get(self::CONFIG_CACHE_PREFIX . $this->getID() . $pagePath);
+			if (is_array($arr))
 			{
-				list($pageConfig,$timestamps)=$arr;
-				if($application->getMode()!==TApplicationMode::Performance)
+				list($pageConfig, $timestamps) = $arr;
+				if ($application->getMode() !== TApplicationMode::Performance)
 				{
-					foreach($timestamps as $fileName=>$timestamp)
+					foreach ($timestamps as $fileName=>$timestamp)
 					{
-						if($fileName===0) // application config file
+						if ($fileName === 0) // application config file
 						{
-							$appConfigFile=$application->getConfigurationFile();
-							$currentTimestamp[0]=$appConfigFile===null?0:@filemtime($appConfigFile);
-							if($currentTimestamp[0]>$timestamp || ($timestamp>0 && !$currentTimestamp[0]))
-								$configCached=false;
+							$appConfigFile = $application->getConfigurationFile();
+							$currentTimestamp[0] = $appConfigFile === null ? 0 : @filemtime($appConfigFile);
+							if ($currentTimestamp[0] > $timestamp || ($timestamp > 0 && !$currentTimestamp[0]))
+								$configCached = false;
 						}
 						else
 						{
-							$currentTimestamp[$fileName]=@filemtime($fileName);
-							if($currentTimestamp[$fileName]>$timestamp || ($timestamp>0 && !$currentTimestamp[$fileName]))
-								$configCached=false;
+							$currentTimestamp[$fileName] = @filemtime($fileName);
+							if ($currentTimestamp[$fileName] > $timestamp || ($timestamp > 0 && !$currentTimestamp[$fileName]))
+								$configCached = false;
 						}
 					}
 				}
 			}
 			else
 			{
-				$configCached=false;
-				$paths=explode('.',$pagePath);
-				$configPath=$this->getBasePath();
-				$fileName = $this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP
+				$configCached = false;
+				$paths = explode('.', $pagePath);
+				$configPath = $this->getBasePath();
+				$fileName = $this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP
 					? self::CONFIG_FILE_PHP
 					: self::CONFIG_FILE_XML;
-				foreach($paths as $path)
+				foreach ($paths as $path)
 				{
-					$configFile=$configPath.DIRECTORY_SEPARATOR.$fileName;
-					$currentTimestamp[$configFile]=@filemtime($configFile);
-					$configPath.=DIRECTORY_SEPARATOR.$path;
+					$configFile = $configPath . DIRECTORY_SEPARATOR . $fileName;
+					$currentTimestamp[$configFile] = @filemtime($configFile);
+					$configPath .= DIRECTORY_SEPARATOR . $path;
 				}
-				$appConfigFile=$application->getConfigurationFile();
-				$currentTimestamp[0]=$appConfigFile===null?0:@filemtime($appConfigFile);
+				$appConfigFile = $application->getConfigurationFile();
+				$currentTimestamp[0] = $appConfigFile === null ? 0 : @filemtime($appConfigFile);
 			}
-			if(!$configCached)
+			if (!$configCached)
 			{
-				$pageConfig=new TPageConfiguration($pagePath);
-				if($config!==null)
+				$pageConfig = new TPageConfiguration($pagePath);
+				if ($config !== null)
 				{
-					if($application->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
-						$pageConfig->loadPageConfigurationFromPhp($config,$application->getBasePath(),'');
+					if ($application->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+						$pageConfig->loadPageConfigurationFromPhp($config, $application->getBasePath(), '');
 					else
-						$pageConfig->loadPageConfigurationFromXml($config,$application->getBasePath(),'');
+						$pageConfig->loadPageConfigurationFromXml($config, $application->getBasePath(), '');
 				}
 				$pageConfig->loadFromFiles($this->getBasePath());
-				$cache->set(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath,array($pageConfig,$currentTimestamp));
+				$cache->set(self::CONFIG_CACHE_PREFIX . $this->getID() . $pagePath, array($pageConfig, $currentTimestamp));
 			}
 		}
 		return $pageConfig;
@@ -300,9 +300,9 @@ 
 	 */
 	public function getTemplateManager()
 	{
-		if(!$this->_templateManager)
+		if (!$this->_templateManager)
 		{
-			$this->_templateManager=new TTemplateManager;
+			$this->_templateManager = new TTemplateManager;
 			$this->_templateManager->init(null);
 		}
 		return $this->_templateManager;
@@ -313,7 +313,7 @@ 
 	 */
 	public function setTemplateManager(TTemplateManager $value)
 	{
-		$this->_templateManager=$value;
+		$this->_templateManager = $value;
 	}
 
 	/**
@@ -321,9 +321,9 @@ 
 	 */
 	public function getThemeManager()
 	{
-		if(!$this->_themeManager)
+		if (!$this->_themeManager)
 		{
-			$this->_themeManager=new TThemeManager;
+			$this->_themeManager = new TThemeManager;
 			$this->_themeManager->init(null);
 		}
 		return $this->_themeManager;
@@ -334,7 +334,7 @@ 
 	 */
 	public function setThemeManager(TThemeManager $value)
 	{
-		$this->_themeManager=$value;
+		$this->_themeManager = $value;
 	}
 
 	/**
@@ -342,11 +342,11 @@ 
 	 */
 	public function getRequestedPagePath()
 	{
-		if($this->_pagePath===null)
+		if ($this->_pagePath === null)
 		{
-			$this->_pagePath=strtr($this->determineRequestedPagePath(),'/\\','..');
-			if(empty($this->_pagePath))
-				throw new THttpException(404,'pageservice_page_required');
+			$this->_pagePath = strtr($this->determineRequestedPagePath(), '/\\', '..');
+			if (empty($this->_pagePath))
+				throw new THttpException(404, 'pageservice_page_required');
 		}
 		return $this->_pagePath;
 	}
@@ -373,10 +373,10 @@ 
 	 */
 	public function setDefaultPage($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('pageservice_defaultpage_unchangeable');
 		else
-			$this->_defaultPage=$value;
+			$this->_defaultPage = $value;
 	}
 
 	/**
@@ -392,14 +392,14 @@ 
 	 */
 	public function getBasePath()
 	{
-		if($this->_basePath===null)
+		if ($this->_basePath === null)
 		{
-			$basePath=$this->getApplication()->getBasePath().DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;
-			if(($this->_basePath=realpath($basePath))===false || !is_dir($this->_basePath))
+			$basePath = $this->getApplication()->getBasePath() . DIRECTORY_SEPARATOR . self::DEFAULT_BASEPATH;
+			if (($this->_basePath = realpath($basePath)) === false || !is_dir($this->_basePath))
 			{
-				$basePath=$this->getApplication()->getBasePath().DIRECTORY_SEPARATOR.self::FALLBACK_BASEPATH;
-				if(($this->_basePath=realpath($basePath))===false || !is_dir($this->_basePath))
-					throw new TConfigurationException('pageservice_basepath_invalid',$basePath);
+				$basePath = $this->getApplication()->getBasePath() . DIRECTORY_SEPARATOR . self::FALLBACK_BASEPATH;
+				if (($this->_basePath = realpath($basePath)) === false || !is_dir($this->_basePath))
+					throw new TConfigurationException('pageservice_basepath_invalid', $basePath);
 			}
 		}
 		return $this->_basePath;
@@ -411,11 +411,11 @@ 
 	 */
 	public function setBasePath($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('pageservice_basepath_unchangeable');
-		else if(($path=Prado::getPathOfNamespace($value))===null || !is_dir($path))
-			throw new TConfigurationException('pageservice_basepath_invalid',$value);
-		$this->_basePath=realpath($path);
+		else if (($path = Prado::getPathOfNamespace($value)) === null || !is_dir($path))
+			throw new TConfigurationException('pageservice_basepath_invalid', $value);
+		$this->_basePath = realpath($path);
 	}
 
 	/**
@@ -426,7 +426,7 @@ 
 	 */
 	public function setBasePageClass($value)
 	{
-		$this->_basePageClass=$value;
+		$this->_basePageClass = $value;
 	}
 
 	/**
@@ -444,7 +444,7 @@ 
 	 */
 	public function setClientScriptManagerClass($value)
 	{
-		$this->_clientScriptManagerClass=$value;
+		$this->_clientScriptManagerClass = $value;
 	}
 
 	/**
@@ -463,9 +463,9 @@ 
 	 */
 	public function run()
 	{
-		Prado::trace("Running page service",'System.Web.Services.TPageService');
-		$this->_page=$this->createPage($this->getRequestedPagePath());
-		$this->runPage($this->_page,$this->_properties);
+		Prado::trace("Running page service", 'System.Web.Services.TPageService');
+		$this->_page = $this->createPage($this->getRequestedPagePath());
+		$this->runPage($this->_page, $this->_properties);
 	}
 
 	/**
@@ -477,35 +477,35 @@ 
 	 */
 	protected function createPage($pagePath)
 	{
-		$path=$this->getBasePath().DIRECTORY_SEPARATOR.strtr($pagePath,'.',DIRECTORY_SEPARATOR);
-		$hasTemplateFile=is_file($path.self::PAGE_FILE_EXT);
-		$hasClassFile=is_file($path.Prado::CLASS_FILE_EXT);
+		$path = $this->getBasePath() . DIRECTORY_SEPARATOR . strtr($pagePath, '.', DIRECTORY_SEPARATOR);
+		$hasTemplateFile = is_file($path . self::PAGE_FILE_EXT);
+		$hasClassFile = is_file($path . Prado::CLASS_FILE_EXT);
 
-		if(!$hasTemplateFile && !$hasClassFile)
-			throw new THttpException(404,'pageservice_page_unknown',$pagePath);
+		if (!$hasTemplateFile && !$hasClassFile)
+			throw new THttpException(404, 'pageservice_page_unknown', $pagePath);
 
-		if($hasClassFile)
+		if ($hasClassFile)
 		{
-			$className=basename($path);
-			if(!class_exists($className,false))
-				include_once($path.Prado::CLASS_FILE_EXT);
+			$className = basename($path);
+			if (!class_exists($className, false))
+				include_once($path . Prado::CLASS_FILE_EXT);
 		}
 		else
 		{
-			$className=$this->getBasePageClass();
+			$className = $this->getBasePageClass();
 			Prado::using($className);
-			if(($pos=strrpos($className,'.'))!==false)
-				$className=substr($className,$pos+1);
+			if (($pos = strrpos($className, '.')) !== false)
+				$className = substr($className, $pos + 1);
 		}
 
- 		if(!class_exists($className,false) || ($className!=='TPage' && !is_subclass_of($className,'TPage')))
-			throw new THttpException(404,'pageservice_page_unknown',$pagePath);
+ 		if (!class_exists($className, false) || ($className !== 'TPage' && !is_subclass_of($className, 'TPage')))
+			throw new THttpException(404, 'pageservice_page_unknown', $pagePath);
 
-		$page=Prado::createComponent($className);
+		$page = Prado::createComponent($className);
 		$page->setPagePath($pagePath);
 
-		if($hasTemplateFile)
-			$page->setTemplate($this->getTemplateManager()->getTemplateByFileName($path.self::PAGE_FILE_EXT));
+		if ($hasTemplateFile)
+			$page->setTemplate($this->getTemplateManager()->getTemplateByFileName($path . self::PAGE_FILE_EXT));
 
 		return $page;
 	}
@@ -515,10 +515,10 @@ 
 	 * @param TPage the page instance to be run
 	 * @param array list of initial page properties
 	 */
-	protected function runPage($page,$properties)
+	protected function runPage($page, $properties)
 	{
-		foreach($properties as $name=>$value)
-			$page->setSubProperty($name,$value);
+		foreach ($properties as $name=>$value)
+			$page->setSubProperty($name, $value);
 		$page->run($this->getResponse()->createHtmlWriter());
 	}
 
@@ -530,9 +530,9 @@ 
 	 * @param boolean whether to encode the GET parameters (their names and values), defaults to true.
 	 * @return string URL for the page and GET parameters
 	 */
-	public function constructUrl($pagePath,$getParams=null,$encodeAmpersand=true,$encodeGetItems=true)
+	public function constructUrl($pagePath, $getParams = null, $encodeAmpersand = true, $encodeGetItems = true)
 	{
-		return $this->getRequest()->constructUrl($this->getID(),$pagePath,$getParams,$encodeAmpersand,$encodeGetItems);
+		return $this->getRequest()->constructUrl($this->getID(), $pagePath, $getParams, $encodeAmpersand, $encodeGetItems);
 	}
 }
 
@@ -553,23 +553,23 @@ 
 	/**
 	 * @var array list of application configurations
 	 */
-	private $_appConfigs=array();
+	private $_appConfigs = array();
 	/**
 	 * @var array list of page initial property values
 	 */
-	private $_properties=array();
+	private $_properties = array();
 	/**
 	 * @var TAuthorizationRuleCollection list of authorization rules
 	 */
-	private $_rules=array();
+	private $_rules = array();
 	/**
 	 * @var array list of included configurations
 	 */
-	private $_includes=array();
+	private $_includes = array();
 	/**
 	 * @var string the currently request page in the format of Path.To.PageName
 	 */
-	private $_pagePath='';
+	private $_pagePath = '';
 
 	/**
 	 * Constructor.
@@ -577,7 +577,7 @@ 
 	 */
 	public function __construct($pagePath)
 	{
-		$this->_pagePath=$pagePath;
+		$this->_pagePath = $pagePath;
 	}
 
 	/**
@@ -624,24 +624,24 @@ 
 	 */
 	public function loadFromFiles($basePath)
 	{
-		$paths=explode('.',$this->_pagePath);
-		$page=array_pop($paths);
-		$path=$basePath;
-		$configPagePath='';
-		$fileName = Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP
+		$paths = explode('.', $this->_pagePath);
+		$page = array_pop($paths);
+		$path = $basePath;
+		$configPagePath = '';
+		$fileName = Prado::getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP
 			? TPageService::CONFIG_FILE_PHP
 			: TPageService::CONFIG_FILE_XML;
-		foreach($paths as $p)
+		foreach ($paths as $p)
 		{
-			$this->loadFromFile($path.DIRECTORY_SEPARATOR.$fileName,$configPagePath);
-			$path.=DIRECTORY_SEPARATOR.$p;
-			if($configPagePath==='')
-				$configPagePath=$p;
+			$this->loadFromFile($path . DIRECTORY_SEPARATOR . $fileName, $configPagePath);
+			$path .= DIRECTORY_SEPARATOR . $p;
+			if ($configPagePath === '')
+				$configPagePath = $p;
 			else
-				$configPagePath.='.'.$p;
+				$configPagePath .= '.' . $p;
 		}
-		$this->loadFromFile($path.DIRECTORY_SEPARATOR.$fileName,$configPagePath);
-		$this->_rules=new TAuthorizationRuleCollection($this->_rules);
+		$this->loadFromFile($path . DIRECTORY_SEPARATOR . $fileName, $configPagePath);
+		$this->_rules = new TAuthorizationRuleCollection($this->_rules);
 	}
 
 	/**
@@ -649,31 +649,31 @@ 
 	 * @param string config file name
 	 * @param string the page path that the config file is associated with. The page path doesn't include the page name.
 	 */
-	public function loadFromFile($fname,$configPagePath)
+	public function loadFromFile($fname, $configPagePath)
 	{
-		Prado::trace("Loading page configuration file $fname",'System.Web.Services.TPageService');
-		if(empty($fname) || !is_file($fname))
+		Prado::trace("Loading page configuration file $fname", 'System.Web.Services.TPageService');
+		if (empty($fname) || !is_file($fname))
 			return;
 
-		if(Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
+		if (Prado::getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 		{
 			$fcontent = include $fname;
-			$this->loadFromPhp($fcontent,dirname($fname),$configPagePath);
+			$this->loadFromPhp($fcontent, dirname($fname), $configPagePath);
 		}
 		else
 		{
-			$dom=new TXmlDocument;
-			if($dom->loadFromFile($fname))
-				$this->loadFromXml($dom,dirname($fname),$configPagePath);
+			$dom = new TXmlDocument;
+			if ($dom->loadFromFile($fname))
+				$this->loadFromXml($dom, dirname($fname), $configPagePath);
 			else
-				throw new TConfigurationException('pageserviceconf_file_invalid',$fname);
+				throw new TConfigurationException('pageserviceconf_file_invalid', $fname);
 		}
 	}
 
-	public function loadFromPhp($config,$configPath,$configPagePath)
+	public function loadFromPhp($config, $configPath, $configPagePath)
 	{
-		$this->loadApplicationConfigurationFromPhp($config,$configPath);
-		$this->loadPageConfigurationFromPhp($config,$configPath,$configPagePath);
+		$this->loadApplicationConfigurationFromPhp($config, $configPath);
+		$this->loadPageConfigurationFromPhp($config, $configPath, $configPagePath);
 	}
 
 	/**
@@ -684,17 +684,17 @@ 
 	 * @param string the directory containing this configuration
 	 * @param string the page path that the config XML is associated with. The page path doesn't include the page name.
 	 */
-	public function loadFromXml($dom,$configPath,$configPagePath)
+	public function loadFromXml($dom, $configPath, $configPagePath)
 	{
-		$this->loadApplicationConfigurationFromXml($dom,$configPath);
-		$this->loadPageConfigurationFromXml($dom,$configPath,$configPagePath);
+		$this->loadApplicationConfigurationFromXml($dom, $configPath);
+		$this->loadPageConfigurationFromXml($dom, $configPath, $configPagePath);
 	}
 
-	public function loadApplicationConfigurationFromPhp($config,$configPath)
+	public function loadApplicationConfigurationFromPhp($config, $configPath)
 	{
-		$appConfig=new TApplicationConfiguration;
-		$appConfig->loadFromPhp($config,$configPath);
-		$this->_appConfigs[]=$appConfig;
+		$appConfig = new TApplicationConfiguration;
+		$appConfig->loadFromPhp($config, $configPath);
+		$this->_appConfigs[] = $appConfig;
 	}
 
 	/**
@@ -702,102 +702,102 @@ 
 	 * @param TXmlElement config xml element
 	 * @param string base path corresponding to this xml element
 	 */
-	public function loadApplicationConfigurationFromXml($dom,$configPath)
+	public function loadApplicationConfigurationFromXml($dom, $configPath)
 	{
-		$appConfig=new TApplicationConfiguration;
-		$appConfig->loadFromXml($dom,$configPath);
-		$this->_appConfigs[]=$appConfig;
+		$appConfig = new TApplicationConfiguration;
+		$appConfig->loadFromXml($dom, $configPath);
+		$this->_appConfigs[] = $appConfig;
 	}
 
 	public function loadPageConfigurationFromPhp($config, $configPath, $configPagePath)
 	{
 		// authorization
-		if(isset($config['authorization']) && is_array($config['authorization']))
+		if (isset($config['authorization']) && is_array($config['authorization']))
 		{
 			$rules = array();
-			foreach($config['authorization'] as $authorization)
+			foreach ($config['authorization'] as $authorization)
 			{
-				$patterns=isset($authorization['pages'])?$authorization['pages']:'';
-				$ruleApplies=false;
-				if(empty($patterns) || trim($patterns)==='*') // null or empty string
-					$ruleApplies=true;
+				$patterns = isset($authorization['pages']) ? $authorization['pages'] : '';
+				$ruleApplies = false;
+				if (empty($patterns) || trim($patterns) === '*') // null or empty string
+					$ruleApplies = true;
 				else
 				{
-					foreach(explode(',',$patterns) as $pattern)
+					foreach (explode(',', $patterns) as $pattern)
 					{
-						if(($pattern=trim($pattern))!=='')
+						if (($pattern = trim($pattern)) !== '')
 						{
 							// we know $configPagePath and $this->_pagePath
-							if($configPagePath!=='')  // prepend the pattern with ConfigPagePath
-								$pattern=$configPagePath.'.'.$pattern;
-							if(strcasecmp($pattern,$this->_pagePath)===0)
+							if ($configPagePath !== '')  // prepend the pattern with ConfigPagePath
+								$pattern = $configPagePath . '.' . $pattern;
+							if (strcasecmp($pattern, $this->_pagePath) === 0)
 							{
-								$ruleApplies=true;
+								$ruleApplies = true;
 								break;
 							}
-							if($pattern[strlen($pattern)-1]==='*') // try wildcard matching
+							if ($pattern[strlen($pattern) - 1] === '*') // try wildcard matching
 							{
-								if(strncasecmp($this->_pagePath,$pattern,strlen($pattern)-1)===0)
+								if (strncasecmp($this->_pagePath, $pattern, strlen($pattern) - 1) === 0)
 								{
-									$ruleApplies=true;
+									$ruleApplies = true;
 									break;
 								}
 							}
 						}
 					}
 				}
-				if($ruleApplies)
+				if ($ruleApplies)
 				{
-					$action = isset($authorization['action'])?$authorization['action']:'';
-					$users = isset($authorization['users'])?$authorization['users']:'';
-					$roles = isset($authorization['roles'])?$authorization['roles']:'';
-					$verb = isset($authorization['verb'])?$authorization['verb']:'';
-					$ips = isset($authorization['ips'])?$authorization['ips']:'';
-					$rules[]=new TAuthorizationRule($action,$users,$roles,$verb,$ips);
+					$action = isset($authorization['action']) ? $authorization['action'] : '';
+					$users = isset($authorization['users']) ? $authorization['users'] : '';
+					$roles = isset($authorization['roles']) ? $authorization['roles'] : '';
+					$verb = isset($authorization['verb']) ? $authorization['verb'] : '';
+					$ips = isset($authorization['ips']) ? $authorization['ips'] : '';
+					$rules[] = new TAuthorizationRule($action, $users, $roles, $verb, $ips);
 				}
 			}
-			$this->_rules=array_merge($rules,$this->_rules);
+			$this->_rules = array_merge($rules, $this->_rules);
 		}
 		// pages
-		if(isset($config['pages']) && is_array($config['pages']))
+		if (isset($config['pages']) && is_array($config['pages']))
 		{
-			if(isset($config['pages']['properties']))
+			if (isset($config['pages']['properties']))
 			{
 				$this->_properties = array_merge($this->_properties, $config['pages']['properties']);
 				unset($config['pages']['properties']);
 			}
-			foreach($config['pages'] as $id => $page)
+			foreach ($config['pages'] as $id => $page)
 			{
 				$properties = array();
-				if(isset($page['properties']))
+				if (isset($page['properties']))
 				{
-					$properties=$page['properties'];
+					$properties = $page['properties'];
 					unset($page['properties']);
 				}
-				$matching=false;
-				$id=($configPagePath==='')?$id:$configPagePath.'.'.$id;
-				if(strcasecmp($id,$this->_pagePath)===0)
-					$matching=true;
-				else if($id[strlen($id)-1]==='*') // try wildcard matching
-					$matching=strncasecmp($this->_pagePath,$id,strlen($id)-1)===0;
-				if($matching)
-					$this->_properties=array_merge($this->_properties,$properties);
+				$matching = false;
+				$id = ($configPagePath === '') ? $id : $configPagePath . '.' . $id;
+				if (strcasecmp($id, $this->_pagePath) === 0)
+					$matching = true;
+				else if ($id[strlen($id) - 1] === '*') // try wildcard matching
+					$matching = strncasecmp($this->_pagePath, $id, strlen($id) - 1) === 0;
+				if ($matching)
+					$this->_properties = array_merge($this->_properties, $properties);
 			}
 		}
 
 		// external configurations
-		if(isset($config['includes']) && is_array($config['includes']))
+		if (isset($config['includes']) && is_array($config['includes']))
 		{
-			foreach($config['includes'] as $include)
+			foreach ($config['includes'] as $include)
 			{
-				$when = isset($include['when'])?true:false;
-				if(!isset($include['file']))
+				$when = isset($include['when']) ? true : false;
+				if (!isset($include['file']))
 					throw new TConfigurationException('pageserviceconf_includefile_required');
 				$filePath = $include['file'];
-				if(isset($this->_includes[$filePath]))
-					$this->_includes[$filePath]=array($configPagePath,'('.$this->_includes[$filePath][1].') || ('.$when.')');
+				if (isset($this->_includes[$filePath]))
+					$this->_includes[$filePath] = array($configPagePath, '(' . $this->_includes[$filePath][1] . ') || (' . $when . ')');
 				else
-					$this->_includes[$filePath]=array($configPagePath,$when);
+					$this->_includes[$filePath] = array($configPagePath, $when);
 			}
 		}
 	}
@@ -808,82 +808,82 @@ 
 	 * @param string base path corresponding to this xml element
 	 * @param string the page path that the config XML is associated with. The page path doesn't include the page name.
 	 */
-	public function loadPageConfigurationFromXml($dom,$configPath,$configPagePath)
+	public function loadPageConfigurationFromXml($dom, $configPath, $configPagePath)
 	{
 		// authorization
-		if(($authorizationNode=$dom->getElementByTagName('authorization'))!==null)
+		if (($authorizationNode = $dom->getElementByTagName('authorization')) !== null)
 		{
-			$rules=array();
-			foreach($authorizationNode->getElements() as $node)
+			$rules = array();
+			foreach ($authorizationNode->getElements() as $node)
 			{
-				$patterns=$node->getAttribute('pages');
-				$ruleApplies=false;
-				if(empty($patterns) || trim($patterns)==='*') // null or empty string
-					$ruleApplies=true;
+				$patterns = $node->getAttribute('pages');
+				$ruleApplies = false;
+				if (empty($patterns) || trim($patterns) === '*') // null or empty string
+					$ruleApplies = true;
 				else
 				{
-					foreach(explode(',',$patterns) as $pattern)
+					foreach (explode(',', $patterns) as $pattern)
 					{
-						if(($pattern=trim($pattern))!=='')
+						if (($pattern = trim($pattern)) !== '')
 						{
 							// we know $configPagePath and $this->_pagePath
-							if($configPagePath!=='')  // prepend the pattern with ConfigPagePath
-								$pattern=$configPagePath.'.'.$pattern;
-							if(strcasecmp($pattern,$this->_pagePath)===0)
+							if ($configPagePath !== '')  // prepend the pattern with ConfigPagePath
+								$pattern = $configPagePath . '.' . $pattern;
+							if (strcasecmp($pattern, $this->_pagePath) === 0)
 							{
-								$ruleApplies=true;
+								$ruleApplies = true;
 								break;
 							}
-							if($pattern[strlen($pattern)-1]==='*') // try wildcard matching
+							if ($pattern[strlen($pattern) - 1] === '*') // try wildcard matching
 							{
-								if(strncasecmp($this->_pagePath,$pattern,strlen($pattern)-1)===0)
+								if (strncasecmp($this->_pagePath, $pattern, strlen($pattern) - 1) === 0)
 								{
-									$ruleApplies=true;
+									$ruleApplies = true;
 									break;
 								}
 							}
 						}
 					}
 				}
-				if($ruleApplies)
-					$rules[]=new TAuthorizationRule($node->getTagName(),$node->getAttribute('users'),$node->getAttribute('roles'),$node->getAttribute('verb'),$node->getAttribute('ips'));
+				if ($ruleApplies)
+					$rules[] = new TAuthorizationRule($node->getTagName(), $node->getAttribute('users'), $node->getAttribute('roles'), $node->getAttribute('verb'), $node->getAttribute('ips'));
 			}
-			$this->_rules=array_merge($rules,$this->_rules);
+			$this->_rules = array_merge($rules, $this->_rules);
 		}
 
 		// pages
-		if(($pagesNode=$dom->getElementByTagName('pages'))!==null)
+		if (($pagesNode = $dom->getElementByTagName('pages')) !== null)
 		{
-			$this->_properties=array_merge($this->_properties,$pagesNode->getAttributes()->toArray());
+			$this->_properties = array_merge($this->_properties, $pagesNode->getAttributes()->toArray());
 			// at the page folder
-			foreach($pagesNode->getElementsByTagName('page') as $node)
+			foreach ($pagesNode->getElementsByTagName('page') as $node)
 			{
-				$properties=$node->getAttributes();
-				$id=$properties->remove('id');
-				if(empty($id))
-					throw new TConfigurationException('pageserviceconf_page_invalid',$configPath);
-				$matching=false;
-				$id=($configPagePath==='')?$id:$configPagePath.'.'.$id;
-				if(strcasecmp($id,$this->_pagePath)===0)
-					$matching=true;
-				else if($id[strlen($id)-1]==='*') // try wildcard matching
-					$matching=strncasecmp($this->_pagePath,$id,strlen($id)-1)===0;
-				if($matching)
-					$this->_properties=array_merge($this->_properties,$properties->toArray());
+				$properties = $node->getAttributes();
+				$id = $properties->remove('id');
+				if (empty($id))
+					throw new TConfigurationException('pageserviceconf_page_invalid', $configPath);
+				$matching = false;
+				$id = ($configPagePath === '') ? $id : $configPagePath . '.' . $id;
+				if (strcasecmp($id, $this->_pagePath) === 0)
+					$matching = true;
+				else if ($id[strlen($id) - 1] === '*') // try wildcard matching
+					$matching = strncasecmp($this->_pagePath, $id, strlen($id) - 1) === 0;
+				if ($matching)
+					$this->_properties = array_merge($this->_properties, $properties->toArray());
 			}
 		}
 
 		// external configurations
-		foreach($dom->getElementsByTagName('include') as $node)
+		foreach ($dom->getElementsByTagName('include') as $node)
 		{
-			if(($when=$node->getAttribute('when'))===null)
-				$when=true;
-			if(($filePath=$node->getAttribute('file'))===null)
+			if (($when = $node->getAttribute('when')) === null)
+				$when = true;
+			if (($filePath = $node->getAttribute('file')) === null)
 				throw new TConfigurationException('pageserviceconf_includefile_required');
-			if(isset($this->_includes[$filePath]))
-				$this->_includes[$filePath]=array($configPagePath,'('.$this->_includes[$filePath][1].') || ('.$when.')');
+			if (isset($this->_includes[$filePath]))
+				$this->_includes[$filePath] = array($configPagePath, '(' . $this->_includes[$filePath][1] . ') || (' . $when . ')');
 			else
-				$this->_includes[$filePath]=array($configPagePath,$when);
+				$this->_includes[$filePath] = array($configPagePath, $when);
 		}
 	}
 }

Braces +142 added lines, -101 removed lines

@@ -166,8 +166,9 @@ 
 	protected function initPageContext($pageConfig)
 	{
 		$application=$this->getApplication();
-		foreach($pageConfig->getApplicationConfigurations() as $appConfig)
-			$application->applyConfiguration($appConfig);
+		foreach($pageConfig->getApplicationConfigurations() as $appConfig) {
+					$application->applyConfiguration($appConfig);
+		}
 
 		$this->applyConfiguration($pageConfig);
 	}
@@ -186,12 +187,14 @@ 
 		foreach($config->getExternalConfigurations() as $filePath=>$params)
 		{
 			list($configPagePath,$condition)=$params;
-			if($condition!==true)
-				$condition=$this->evaluateExpression($condition);
+			if($condition!==true) {
+							$condition=$this->evaluateExpression($condition);
+			}
 			if($condition)
 			{
-				if(($path=Prado::getPathOfNamespace($filePath,Prado::getApplication()->getConfigurationFileExt()))===null || !is_file($path))
-					throw new TConfigurationException('pageservice_includefile_invalid',$filePath);
+				if(($path=Prado::getPathOfNamespace($filePath,Prado::getApplication()->getConfigurationFileExt()))===null || !is_file($path)) {
+									throw new TConfigurationException('pageservice_includefile_invalid',$filePath);
+				}
 				$c=new TPageConfiguration($pagePath);
 				$c->loadFromFile($path,$configPagePath);
 				$this->applyConfiguration($c);
@@ -207,8 +210,9 @@ 
 	protected function determineRequestedPagePath()
 	{
 		$pagePath=$this->getRequest()->getServiceParameter();
-		if(empty($pagePath))
-			$pagePath=$this->getDefaultPage();
+		if(empty($pagePath)) {
+					$pagePath=$this->getDefaultPage();
+		}
 		return $pagePath;
 	}
 
@@ -226,14 +230,14 @@ 
 			$pageConfig=new TPageConfiguration($pagePath);
 			if($config!==null)
 			{
-				if($application->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
-					$pageConfig->loadPageConfigurationFromPhp($config,$application->getBasePath(),'');
-				else
-					$pageConfig->loadPageConfigurationFromXml($config,$application->getBasePath(),'');
+				if($application->getConfigurationType()==TApplication::CONFIG_TYPE_PHP) {
+									$pageConfig->loadPageConfigurationFromPhp($config,$application->getBasePath(),'');
+				} else {
+									$pageConfig->loadPageConfigurationFromXml($config,$application->getBasePath(),'');
+				}
 			}
 			$pageConfig->loadFromFiles($this->getBasePath());
-		}
-		else
+		} else
 		{
 			$configCached=true;
 			$currentTimestamp=array();
@@ -245,23 +249,25 @@ 
 				{
 					foreach($timestamps as $fileName=>$timestamp)
 					{
-						if($fileName===0) // application config file
+						if($fileName===0) {
+							// application config file
 						{
 							$appConfigFile=$application->getConfigurationFile();
-							$currentTimestamp[0]=$appConfigFile===null?0:@filemtime($appConfigFile);
-							if($currentTimestamp[0]>$timestamp || ($timestamp>0 && !$currentTimestamp[0]))
-								$configCached=false;
 						}
-						else
+							$currentTimestamp[0]=$appConfigFile===null?0:@filemtime($appConfigFile);
+							if($currentTimestamp[0]>$timestamp || ($timestamp>0 && !$currentTimestamp[0])) {
+															$configCached=false;
+							}
+						} else
 						{
 							$currentTimestamp[$fileName]=@filemtime($fileName);
-							if($currentTimestamp[$fileName]>$timestamp || ($timestamp>0 && !$currentTimestamp[$fileName]))
-								$configCached=false;
+							if($currentTimestamp[$fileName]>$timestamp || ($timestamp>0 && !$currentTimestamp[$fileName])) {
+															$configCached=false;
+							}
 						}
 					}
 				}
-			}
-			else
+			} else
 			{
 				$configCached=false;
 				$paths=explode('.',$pagePath);
@@ -283,10 +289,11 @@ 
 				$pageConfig=new TPageConfiguration($pagePath);
 				if($config!==null)
 				{
-					if($application->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
-						$pageConfig->loadPageConfigurationFromPhp($config,$application->getBasePath(),'');
-					else
-						$pageConfig->loadPageConfigurationFromXml($config,$application->getBasePath(),'');
+					if($application->getConfigurationType()==TApplication::CONFIG_TYPE_PHP) {
+											$pageConfig->loadPageConfigurationFromPhp($config,$application->getBasePath(),'');
+					} else {
+											$pageConfig->loadPageConfigurationFromXml($config,$application->getBasePath(),'');
+					}
 				}
 				$pageConfig->loadFromFiles($this->getBasePath());
 				$cache->set(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath,array($pageConfig,$currentTimestamp));
@@ -345,8 +352,9 @@ 
 		if($this->_pagePath===null)
 		{
 			$this->_pagePath=strtr($this->determineRequestedPagePath(),'/\\','..');
-			if(empty($this->_pagePath))
-				throw new THttpException(404,'pageservice_page_required');
+			if(empty($this->_pagePath)) {
+							throw new THttpException(404,'pageservice_page_required');
+			}
 		}
 		return $this->_pagePath;
 	}
@@ -373,10 +381,11 @@ 
 	 */
 	public function setDefaultPage($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('pageservice_defaultpage_unchangeable');
-		else
-			$this->_defaultPage=$value;
+		if($this->_initialized) {
+					throw new TInvalidOperationException('pageservice_defaultpage_unchangeable');
+		} else {
+					$this->_defaultPage=$value;
+		}
 	}
 
 	/**
@@ -398,8 +407,9 @@ 
 			if(($this->_basePath=realpath($basePath))===false || !is_dir($this->_basePath))
 			{
 				$basePath=$this->getApplication()->getBasePath().DIRECTORY_SEPARATOR.self::FALLBACK_BASEPATH;
-				if(($this->_basePath=realpath($basePath))===false || !is_dir($this->_basePath))
-					throw new TConfigurationException('pageservice_basepath_invalid',$basePath);
+				if(($this->_basePath=realpath($basePath))===false || !is_dir($this->_basePath)) {
+									throw new TConfigurationException('pageservice_basepath_invalid',$basePath);
+				}
 			}
 		}
 		return $this->_basePath;
@@ -411,10 +421,11 @@ 
 	 */
 	public function setBasePath($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('pageservice_basepath_unchangeable');
-		else if(($path=Prado::getPathOfNamespace($value))===null || !is_dir($path))
-			throw new TConfigurationException('pageservice_basepath_invalid',$value);
+		if($this->_initialized) {
+					throw new TInvalidOperationException('pageservice_basepath_unchangeable');
+		} else if(($path=Prado::getPathOfNamespace($value))===null || !is_dir($path)) {
+					throw new TConfigurationException('pageservice_basepath_invalid',$value);
+		}
 		$this->_basePath=realpath($path);
 	}
 
@@ -481,31 +492,35 @@ 
 		$hasTemplateFile=is_file($path.self::PAGE_FILE_EXT);
 		$hasClassFile=is_file($path.Prado::CLASS_FILE_EXT);
 
-		if(!$hasTemplateFile && !$hasClassFile)
-			throw new THttpException(404,'pageservice_page_unknown',$pagePath);
+		if(!$hasTemplateFile && !$hasClassFile) {
+					throw new THttpException(404,'pageservice_page_unknown',$pagePath);
+		}
 
 		if($hasClassFile)
 		{
 			$className=basename($path);
-			if(!class_exists($className,false))
-				include_once($path.Prado::CLASS_FILE_EXT);
-		}
-		else
+			if(!class_exists($className,false)) {
+							include_once($path.Prado::CLASS_FILE_EXT);
+			}
+		} else
 		{
 			$className=$this->getBasePageClass();
 			Prado::using($className);
-			if(($pos=strrpos($className,'.'))!==false)
-				$className=substr($className,$pos+1);
+			if(($pos=strrpos($className,'.'))!==false) {
+							$className=substr($className,$pos+1);
+			}
 		}
 
- 		if(!class_exists($className,false) || ($className!=='TPage' && !is_subclass_of($className,'TPage')))
-			throw new THttpException(404,'pageservice_page_unknown',$pagePath);
+ 		if(!class_exists($className,false) || ($className!=='TPage' && !is_subclass_of($className,'TPage'))) {
+ 					throw new THttpException(404,'pageservice_page_unknown',$pagePath);
+ 		}
 
 		$page=Prado::createComponent($className);
 		$page->setPagePath($pagePath);
 
-		if($hasTemplateFile)
-			$page->setTemplate($this->getTemplateManager()->getTemplateByFileName($path.self::PAGE_FILE_EXT));
+		if($hasTemplateFile) {
+					$page->setTemplate($this->getTemplateManager()->getTemplateByFileName($path.self::PAGE_FILE_EXT));
+		}
 
 		return $page;
 	}
@@ -517,8 +532,9 @@ 
 	 */
 	protected function runPage($page,$properties)
 	{
-		foreach($properties as $name=>$value)
-			$page->setSubProperty($name,$value);
+		foreach($properties as $name=>$value) {
+					$page->setSubProperty($name,$value);
+		}
 		$page->run($this->getResponse()->createHtmlWriter());
 	}
 
@@ -635,10 +651,11 @@ 
 		{
 			$this->loadFromFile($path.DIRECTORY_SEPARATOR.$fileName,$configPagePath);
 			$path.=DIRECTORY_SEPARATOR.$p;
-			if($configPagePath==='')
-				$configPagePath=$p;
-			else
-				$configPagePath.='.'.$p;
+			if($configPagePath==='') {
+							$configPagePath=$p;
+			} else {
+							$configPagePath.='.'.$p;
+			}
 		}
 		$this->loadFromFile($path.DIRECTORY_SEPARATOR.$fileName,$configPagePath);
 		$this->_rules=new TAuthorizationRuleCollection($this->_rules);
@@ -652,21 +669,22 @@ 
 	public function loadFromFile($fname,$configPagePath)
 	{
 		Prado::trace("Loading page configuration file $fname",'System.Web.Services.TPageService');
-		if(empty($fname) || !is_file($fname))
-			return;
+		if(empty($fname) || !is_file($fname)) {
+					return;
+		}
 
 		if(Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent,dirname($fname),$configPagePath);
-		}
-		else
+		} else
 		{
 			$dom=new TXmlDocument;
-			if($dom->loadFromFile($fname))
-				$this->loadFromXml($dom,dirname($fname),$configPagePath);
-			else
-				throw new TConfigurationException('pageserviceconf_file_invalid',$fname);
+			if($dom->loadFromFile($fname)) {
+							$this->loadFromXml($dom,dirname($fname),$configPagePath);
+			} else {
+							throw new TConfigurationException('pageserviceconf_file_invalid',$fname);
+			}
 		}
 	}
 
@@ -719,27 +737,32 @@ 
 			{
 				$patterns=isset($authorization['pages'])?$authorization['pages']:'';
 				$ruleApplies=false;
-				if(empty($patterns) || trim($patterns)==='*') // null or empty string
+				if(empty($patterns) || trim($patterns)==='*') {
+					// null or empty string
 					$ruleApplies=true;
-				else
+				} else
 				{
 					foreach(explode(',',$patterns) as $pattern)
 					{
 						if(($pattern=trim($pattern))!=='')
 						{
 							// we know $configPagePath and $this->_pagePath
-							if($configPagePath!=='')  // prepend the pattern with ConfigPagePath
+							if($configPagePath!=='') {
+								// prepend the pattern with ConfigPagePath
 								$pattern=$configPagePath.'.'.$pattern;
+							}
 							if(strcasecmp($pattern,$this->_pagePath)===0)
 							{
 								$ruleApplies=true;
 								break;
 							}
-							if($pattern[strlen($pattern)-1]==='*') // try wildcard matching
+							if($pattern[strlen($pattern)-1]==='*') {
+								// try wildcard matching
 							{
 								if(strncasecmp($this->_pagePath,$pattern,strlen($pattern)-1)===0)
 								{
 									$ruleApplies=true;
+							}
 									break;
 								}
 							}
@@ -776,12 +799,15 @@ 
 				}
 				$matching=false;
 				$id=($configPagePath==='')?$id:$configPagePath.'.'.$id;
-				if(strcasecmp($id,$this->_pagePath)===0)
-					$matching=true;
-				else if($id[strlen($id)-1]==='*') // try wildcard matching
+				if(strcasecmp($id,$this->_pagePath)===0) {
+									$matching=true;
+				} else if($id[strlen($id)-1]==='*') {
+					// try wildcard matching
 					$matching=strncasecmp($this->_pagePath,$id,strlen($id)-1)===0;
-				if($matching)
-					$this->_properties=array_merge($this->_properties,$properties);
+				}
+				if($matching) {
+									$this->_properties=array_merge($this->_properties,$properties);
+				}
 			}
 		}
 
@@ -791,13 +817,15 @@ 
 			foreach($config['includes'] as $include)
 			{
 				$when = isset($include['when'])?true:false;
-				if(!isset($include['file']))
-					throw new TConfigurationException('pageserviceconf_includefile_required');
+				if(!isset($include['file'])) {
+									throw new TConfigurationException('pageserviceconf_includefile_required');
+				}
 				$filePath = $include['file'];
-				if(isset($this->_includes[$filePath]))
-					$this->_includes[$filePath]=array($configPagePath,'('.$this->_includes[$filePath][1].') || ('.$when.')');
-				else
-					$this->_includes[$filePath]=array($configPagePath,$when);
+				if(isset($this->_includes[$filePath])) {
+									$this->_includes[$filePath]=array($configPagePath,'('.$this->_includes[$filePath][1].') || ('.$when.')');
+				} else {
+									$this->_includes[$filePath]=array($configPagePath,$when);
+				}
 			}
 		}
 	}
@@ -818,35 +846,41 @@ 
 			{
 				$patterns=$node->getAttribute('pages');
 				$ruleApplies=false;
-				if(empty($patterns) || trim($patterns)==='*') // null or empty string
+				if(empty($patterns) || trim($patterns)==='*') {
+					// null or empty string
 					$ruleApplies=true;
-				else
+				} else
 				{
 					foreach(explode(',',$patterns) as $pattern)
 					{
 						if(($pattern=trim($pattern))!=='')
 						{
 							// we know $configPagePath and $this->_pagePath
-							if($configPagePath!=='')  // prepend the pattern with ConfigPagePath
+							if($configPagePath!=='') {
+								// prepend the pattern with ConfigPagePath
 								$pattern=$configPagePath.'.'.$pattern;
+							}
 							if(strcasecmp($pattern,$this->_pagePath)===0)
 							{
 								$ruleApplies=true;
 								break;
 							}
-							if($pattern[strlen($pattern)-1]==='*') // try wildcard matching
+							if($pattern[strlen($pattern)-1]==='*') {
+								// try wildcard matching
 							{
 								if(strncasecmp($this->_pagePath,$pattern,strlen($pattern)-1)===0)
 								{
 									$ruleApplies=true;
+							}
 									break;
 								}
 							}
 						}
 					}
 				}
-				if($ruleApplies)
-					$rules[]=new TAuthorizationRule($node->getTagName(),$node->getAttribute('users'),$node->getAttribute('roles'),$node->getAttribute('verb'),$node->getAttribute('ips'));
+				if($ruleApplies) {
+									$rules[]=new TAuthorizationRule($node->getTagName(),$node->getAttribute('users'),$node->getAttribute('roles'),$node->getAttribute('verb'),$node->getAttribute('ips'));
+				}
 			}
 			$this->_rules=array_merge($rules,$this->_rules);
 		}
@@ -860,30 +894,37 @@ 
 			{
 				$properties=$node->getAttributes();
 				$id=$properties->remove('id');
-				if(empty($id))
-					throw new TConfigurationException('pageserviceconf_page_invalid',$configPath);
+				if(empty($id)) {
+									throw new TConfigurationException('pageserviceconf_page_invalid',$configPath);
+				}
 				$matching=false;
 				$id=($configPagePath==='')?$id:$configPagePath.'.'.$id;
-				if(strcasecmp($id,$this->_pagePath)===0)
-					$matching=true;
-				else if($id[strlen($id)-1]==='*') // try wildcard matching
+				if(strcasecmp($id,$this->_pagePath)===0) {
+									$matching=true;
+				} else if($id[strlen($id)-1]==='*') {
+					// try wildcard matching
 					$matching=strncasecmp($this->_pagePath,$id,strlen($id)-1)===0;
-				if($matching)
-					$this->_properties=array_merge($this->_properties,$properties->toArray());
+				}
+				if($matching) {
+									$this->_properties=array_merge($this->_properties,$properties->toArray());
+				}
 			}
 		}
 
 		// external configurations
 		foreach($dom->getElementsByTagName('include') as $node)
 		{
-			if(($when=$node->getAttribute('when'))===null)
-				$when=true;
-			if(($filePath=$node->getAttribute('file'))===null)
-				throw new TConfigurationException('pageserviceconf_includefile_required');
-			if(isset($this->_includes[$filePath]))
-				$this->_includes[$filePath]=array($configPagePath,'('.$this->_includes[$filePath][1].') || ('.$when.')');
-			else
-				$this->_includes[$filePath]=array($configPagePath,$when);
+			if(($when=$node->getAttribute('when'))===null) {
+							$when=true;
+			}
+			if(($filePath=$node->getAttribute('file'))===null) {
+							throw new TConfigurationException('pageserviceconf_includefile_required');
+			}
+			if(isset($this->_includes[$filePath])) {
+							$this->_includes[$filePath]=array($configPagePath,'('.$this->_includes[$filePath][1].') || ('.$when.')');
+			} else {
+							$this->_includes[$filePath]=array($configPagePath,$when);
+			}
 		}
 	}
 }

framework/Web/Services/TRpcService.php

Doc Comments +5 added lines, -2 removed lines

@@ -258,6 +258,9 @@ 
  */
 class TRpcException extends TException
 {
+	/**
+	 * @param string $message
+	 */
 	public function __construct($message, $errorCode = -1)
 	{
 		$this->setErrorCode($errorCode);
@@ -334,7 +337,7 @@ 
 	}
 
 	/**
-	 * @return rpc server instance
+	 * @return TRpcServer server instance
 	 */
 	public function getRpcServer()
 	{
@@ -366,6 +369,7 @@ 
 	/**
 	 * @param string request payload
 	 * Processed the request ans returns the response, if any
+	 * @param string $requestPayload
 	 * @return processed response
 	 * @abstract
 	 */
@@ -641,7 +645,6 @@ 
 	/**
 	 * Registers a new RPC method and handler details
 	 * @param string $methodName
-	 * @param array $handlerDetails containing the callback handler
 	 */
 	public function addMethod($methodName, $methodDetails)
 	{

Spacing +42 added lines, -42 removed lines

@@ -90,28 +90,28 @@ 
 	{
 		$_properties = $this->apiProviders[$providerId];
 
-		if(($_providerClass = $_properties->remove('class')) === null)
+		if (($_providerClass = $_properties->remove('class')) === null)
 			throw new TConfigurationException('rpcservice_apiprovider_required');
 
 		Prado::using($_providerClass);
 
 		$_providerClassName = ($_pos = strrpos($_providerClass, '.')) !== false ? substr($_providerClass, $_pos + 1) : $_providerClass;
-		if(!is_subclass_of($_providerClassName, self::BASE_API_PROVIDER))
+		if (!is_subclass_of($_providerClassName, self::BASE_API_PROVIDER))
 			throw new TConfigurationException('rpcservice_apiprovider_invalid');
 
-		if(($_rpcServerClass = $_properties->remove('server')) === null)
+		if (($_rpcServerClass = $_properties->remove('server')) === null)
 			$_rpcServerClass = self::BASE_RPC_SERVER;
 
 		Prado::using($_rpcServerClass);
 
 		$_rpcServerClassName = ($_pos = strrpos($_rpcServerClass, '.')) !== false ? substr($_rpcServerClass, $_pos + 1) : $_rpcServerClass;
-		if($_rpcServerClassName!==self::BASE_RPC_SERVER && !is_subclass_of($_rpcServerClassName, self::BASE_RPC_SERVER))
+		if ($_rpcServerClassName !== self::BASE_RPC_SERVER && !is_subclass_of($_rpcServerClassName, self::BASE_RPC_SERVER))
 			throw new TConfigurationException('rpcservice_rpcserver_invalid');
 
 		$_apiProvider = new $_providerClassName(new $_rpcServerClassName($protocolHandler));
 		$_apiProvider->setId($providerId);
 
-		foreach($_properties as $_key => $_value)
+		foreach ($_properties as $_key => $_value)
 			$_apiProvider->setSubProperty($_key, $_value);
 
 		return $_apiProvider;
@@ -132,14 +132,14 @@ 
 	 */
 	public function loadConfig(TXmlElement $xml)
 	{
-		foreach($xml->getElementsByTagName('rpcapi') as $_apiProviderXml)
+		foreach ($xml->getElementsByTagName('rpcapi') as $_apiProviderXml)
 		{
 			$_properties = $_apiProviderXml->getAttributes();
 
-			if(($_id = $_properties->remove('id')) === null || $_id == "")
+			if (($_id = $_properties->remove('id')) === null || $_id == "")
 				throw new TConfigurationException('rpcservice_apiproviderid_required');
 
-			if(isset($this->apiProviders[$_id]))
+			if (isset($this->apiProviders[$_id]))
 				throw new TConfigurationException('rpcservice_apiproviderid_duplicated');
 
 			$this->apiProviders[$_id] = $_properties;
@@ -153,22 +153,22 @@ 
 	{
 		$_request = $this->getRequest();
 
-		if(($_providerId = $_request->getServiceParameter()) == "")
+		if (($_providerId = $_request->getServiceParameter()) == "")
 			throw new THttpException(400, 'RPC API-Provider id required');
 		
-		if(($_method = $_request->getRequestType()) != 'POST')
-			throw new THttpException(405, 'Invalid request method "'.$_method.'"!'); // TODO Exception muss "Allow POST" Header setzen
+		if (($_method = $_request->getRequestType()) != 'POST')
+			throw new THttpException(405, 'Invalid request method "' . $_method . '"!'); // TODO Exception muss "Allow POST" Header setzen
 
-		if(($_mimeType = $_request->getContentType()) === null)
+		if (($_mimeType = $_request->getContentType()) === null)
 			throw new THttpException(406, 'Content-Type is missing!'); // TODO Exception muss gültige Content-Type werte zurück geben
 
-		if(!in_array($_mimeType, array_keys($this->protocolHandlers)))
+		if (!in_array($_mimeType, array_keys($this->protocolHandlers)))
 			throw new THttpException(406, 'Unsupported Content-Type!'); // TODO see previous
 
 		$_protocolHandlerClass = $this->protocolHandlers[$_mimeType];
 		$_protocolHandler = new $_protocolHandlerClass;
 
-		if(($_result = $this->createApiProvider($_protocolHandler, $_providerId)->processRequest()) !== null)
+		if (($_result = $this->createApiProvider($_protocolHandler, $_providerId)->processRequest()) !== null)
 		{
 			$_response = $this->getResponse();
 			$_protocolHandler->createResponseHeaders($_response);
@@ -238,7 +238,7 @@ 
 		{
 			return $this->handler->callMethod($this->getPayload());
 		}
-		catch(TRpcException $e)
+		catch (TRpcException $e)
 		{
 			return $this->handler->createErrorResponse($e);
 		}
@@ -320,7 +320,7 @@ 
 	{
 		$this->rpcServer = $rpcServer;
 
-		foreach($this->registerMethods() as $_methodName => $_methodDetails)
+		foreach ($this->registerMethods() as $_methodName => $_methodDetails)
 			$this->rpcServer->addRpcMethod($_methodName, $_methodDetails);
 	}
 
@@ -418,13 +418,13 @@ 
 	 */
 	public function callApiMethod($methodName, $parameters)
 	{
-		if(!isset($this->rpcMethods[$methodName]))
-			throw new TRpcException('Method "'.$methodName.'" not found');
+		if (!isset($this->rpcMethods[$methodName]))
+			throw new TRpcException('Method "' . $methodName . '" not found');
 
-		if($parameters === null)
+		if ($parameters === null)
 			$parameters = array();
 
-		if(!is_array($parameters))
+		if (!is_array($parameters))
 			$parameters = array($parameters);
 		return call_user_func_array($this->rpcMethods[$methodName]['method'], $parameters);
 	}
@@ -445,8 +445,8 @@ 
  */
 class TJsonRpcProtocol extends TRpcProtocol
 {
-	protected $_id=null;
-	protected $_specificationVersion=1.0;
+	protected $_id = null;
+	protected $_specificationVersion = 1.0;
 
 	/**
 	 * Handles the RPC request
@@ -459,31 +459,31 @@ 
 		{
 			$_request = $this->decode($requestPayload);
 
-			if(isset($_request['jsonrpc']))
+			if (isset($_request['jsonrpc']))
 			{
-				$this->_specificationVersion=$_request['jsonrpc'];
-				if($this->_specificationVersion > 2.0)
+				$this->_specificationVersion = $_request['jsonrpc'];
+				if ($this->_specificationVersion > 2.0)
 					throw new TRpcException('Unsupported specification version', '-32600');
 			}
 
-			if(isset($_request['id']))
-				$this->_id=$_request['id'];
+			if (isset($_request['id']))
+				$this->_id = $_request['id'];
 
-			if(!isset($_request['method']))
+			if (!isset($_request['method']))
 					throw new TRpcException('Missing request method', '-32600');
 
-			if(!isset($_request['params']))
+			if (!isset($_request['params']))
 				$parameters = array();
 			else
 				$parameters = $_request['params'];
 
-			if(!is_array($parameters))
+			if (!is_array($parameters))
 				$parameters = array($parameters);
 
 			// a request without an id is a notification that doesn't need a response
-			if($this->_id !== null)
+			if ($this->_id !== null)
 			{
-				if($this->_specificationVersion==2.0)
+				if ($this->_specificationVersion == 2.0)
 				{
 					return $this->encode(array(
 						'jsonrpc' => '2.0',
@@ -499,15 +499,15 @@ 
 				}
 			}
 		}
-		catch(TRpcException $e)
+		catch (TRpcException $e)
 		{
 			return $this->createErrorResponse($e);
 		}
-		catch(THttpException $e)
+		catch (THttpException $e)
 		{
 			throw $e;
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			return $this->createErrorResponse(new TRpcException('An internal error occured', '-32603'));
 		}
@@ -520,7 +520,7 @@ 
 	 */
 	public function createErrorResponse(TRpcException $exception)
 	{
-		if($this->_specificationVersion==2.0)
+		if ($this->_specificationVersion == 2.0)
 		{
 			return $this->encode(array(
 				'id' => $this->_id,
@@ -580,7 +580,7 @@ 
 	private static function checkJsonError()
 	{
 		$errnum = json_last_error();
-		if($errnum != JSON_ERROR_NONE)
+		if ($errnum != JSON_ERROR_NONE)
 			throw new Exception("JSON error: $msg", $err);
 	}
 
@@ -593,8 +593,8 @@ 
 	 */
 	public function callApiMethod($methodName, $parameters)
 	{
-		if(!isset($this->rpcMethods[$methodName]))
-			throw new TRpcException('Method "'.$methodName.'" not found', '-32601');
+		if (!isset($this->rpcMethods[$methodName]))
+			throw new TRpcException('Method "' . $methodName . '" not found', '-32601');
 
 		return call_user_func_array($this->rpcMethods[$methodName]['method'], $parameters);
 	}
@@ -663,15 +663,15 @@ 
 		{
 			return xmlrpc_server_call_method($this->_xmlrpcServer, $requestPayload, null);
 		}
-		catch(TRpcException $e)
+		catch (TRpcException $e)
 		{
 			return $this->createErrorResponse($e);
 		}
-		catch(THttpException $e)
+		catch (THttpException $e)
 		{
 			throw $e;
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			return $this->createErrorResponse(new TRpcException('An internal error occured'));
 		}

Braces +78 added lines, -60 removed lines

@@ -90,29 +90,34 @@ 
 	{
 		$_properties = $this->apiProviders[$providerId];
 
-		if(($_providerClass = $_properties->remove('class')) === null)
-			throw new TConfigurationException('rpcservice_apiprovider_required');
+		if(($_providerClass = $_properties->remove('class')) === null) {
+					throw new TConfigurationException('rpcservice_apiprovider_required');
+		}
 
 		Prado::using($_providerClass);
 
 		$_providerClassName = ($_pos = strrpos($_providerClass, '.')) !== false ? substr($_providerClass, $_pos + 1) : $_providerClass;
-		if(!is_subclass_of($_providerClassName, self::BASE_API_PROVIDER))
-			throw new TConfigurationException('rpcservice_apiprovider_invalid');
+		if(!is_subclass_of($_providerClassName, self::BASE_API_PROVIDER)) {
+					throw new TConfigurationException('rpcservice_apiprovider_invalid');
+		}
 
-		if(($_rpcServerClass = $_properties->remove('server')) === null)
-			$_rpcServerClass = self::BASE_RPC_SERVER;
+		if(($_rpcServerClass = $_properties->remove('server')) === null) {
+					$_rpcServerClass = self::BASE_RPC_SERVER;
+		}
 
 		Prado::using($_rpcServerClass);
 
 		$_rpcServerClassName = ($_pos = strrpos($_rpcServerClass, '.')) !== false ? substr($_rpcServerClass, $_pos + 1) : $_rpcServerClass;
-		if($_rpcServerClassName!==self::BASE_RPC_SERVER && !is_subclass_of($_rpcServerClassName, self::BASE_RPC_SERVER))
-			throw new TConfigurationException('rpcservice_rpcserver_invalid');
+		if($_rpcServerClassName!==self::BASE_RPC_SERVER && !is_subclass_of($_rpcServerClassName, self::BASE_RPC_SERVER)) {
+					throw new TConfigurationException('rpcservice_rpcserver_invalid');
+		}
 
 		$_apiProvider = new $_providerClassName(new $_rpcServerClassName($protocolHandler));
 		$_apiProvider->setId($providerId);
 
-		foreach($_properties as $_key => $_value)
-			$_apiProvider->setSubProperty($_key, $_value);
+		foreach($_properties as $_key => $_value) {
+					$_apiProvider->setSubProperty($_key, $_value);
+		}
 
 		return $_apiProvider;
 	}
@@ -136,11 +141,13 @@ 
 		{
 			$_properties = $_apiProviderXml->getAttributes();
 
-			if(($_id = $_properties->remove('id')) === null || $_id == "")
-				throw new TConfigurationException('rpcservice_apiproviderid_required');
+			if(($_id = $_properties->remove('id')) === null || $_id == "") {
+							throw new TConfigurationException('rpcservice_apiproviderid_required');
+			}
 
-			if(isset($this->apiProviders[$_id]))
-				throw new TConfigurationException('rpcservice_apiproviderid_duplicated');
+			if(isset($this->apiProviders[$_id])) {
+							throw new TConfigurationException('rpcservice_apiproviderid_duplicated');
+			}
 
 			$this->apiProviders[$_id] = $_properties;
 		}
@@ -153,17 +160,24 @@ 
 	{
 		$_request = $this->getRequest();
 
-		if(($_providerId = $_request->getServiceParameter()) == "")
-			throw new THttpException(400, 'RPC API-Provider id required');
+		if(($_providerId = $_request->getServiceParameter()) == "") {
+					throw new THttpException(400, 'RPC API-Provider id required');
+		}
 		
-		if(($_method = $_request->getRequestType()) != 'POST')
-			throw new THttpException(405, 'Invalid request method "'.$_method.'"!'); // TODO Exception muss "Allow POST" Header setzen
+		if(($_method = $_request->getRequestType()) != 'POST') {
+					throw new THttpException(405, 'Invalid request method "'.$_method.'"!');
+		}
+		// TODO Exception muss "Allow POST" Header setzen
 
-		if(($_mimeType = $_request->getContentType()) === null)
-			throw new THttpException(406, 'Content-Type is missing!'); // TODO Exception muss gültige Content-Type werte zurück geben
+		if(($_mimeType = $_request->getContentType()) === null) {
+					throw new THttpException(406, 'Content-Type is missing!');
+		}
+		// TODO Exception muss gültige Content-Type werte zurück geben
 
-		if(!in_array($_mimeType, array_keys($this->protocolHandlers)))
-			throw new THttpException(406, 'Unsupported Content-Type!'); // TODO see previous
+		if(!in_array($_mimeType, array_keys($this->protocolHandlers))) {
+					throw new THttpException(406, 'Unsupported Content-Type!');
+		}
+		// TODO see previous
 
 		$_protocolHandlerClass = $this->protocolHandlers[$_mimeType];
 		$_protocolHandler = new $_protocolHandlerClass;
@@ -237,8 +251,7 @@ 
 		try
 		{
 			return $this->handler->callMethod($this->getPayload());
-		}
-		catch(TRpcException $e)
+		} catch(TRpcException $e)
 		{
 			return $this->handler->createErrorResponse($e);
 		}
@@ -320,8 +333,9 @@ 
 	{
 		$this->rpcServer = $rpcServer;
 
-		foreach($this->registerMethods() as $_methodName => $_methodDetails)
-			$this->rpcServer->addRpcMethod($_methodName, $_methodDetails);
+		foreach($this->registerMethods() as $_methodName => $_methodDetails) {
+					$this->rpcServer->addRpcMethod($_methodName, $_methodDetails);
+		}
 	}
 
 	/**
@@ -418,14 +432,17 @@ 
 	 */
 	public function callApiMethod($methodName, $parameters)
 	{
-		if(!isset($this->rpcMethods[$methodName]))
-			throw new TRpcException('Method "'.$methodName.'" not found');
+		if(!isset($this->rpcMethods[$methodName])) {
+					throw new TRpcException('Method "'.$methodName.'" not found');
+		}
 
-		if($parameters === null)
-			$parameters = array();
+		if($parameters === null) {
+					$parameters = array();
+		}
 
-		if(!is_array($parameters))
-			$parameters = array($parameters);
+		if(!is_array($parameters)) {
+					$parameters = array($parameters);
+		}
 		return call_user_func_array($this->rpcMethods[$methodName]['method'], $parameters);
 	}
 }
@@ -462,23 +479,28 @@ 
 			if(isset($_request['jsonrpc']))
 			{
 				$this->_specificationVersion=$_request['jsonrpc'];
-				if($this->_specificationVersion > 2.0)
-					throw new TRpcException('Unsupported specification version', '-32600');
+				if($this->_specificationVersion > 2.0) {
+									throw new TRpcException('Unsupported specification version', '-32600');
+				}
 			}
 
-			if(isset($_request['id']))
-				$this->_id=$_request['id'];
+			if(isset($_request['id'])) {
+							$this->_id=$_request['id'];
+			}
 
-			if(!isset($_request['method']))
-					throw new TRpcException('Missing request method', '-32600');
+			if(!isset($_request['method'])) {
+								throw new TRpcException('Missing request method', '-32600');
+			}
 
-			if(!isset($_request['params']))
-				$parameters = array();
-			else
-				$parameters = $_request['params'];
+			if(!isset($_request['params'])) {
+							$parameters = array();
+			} else {
+							$parameters = $_request['params'];
+			}
 
-			if(!is_array($parameters))
-				$parameters = array($parameters);
+			if(!is_array($parameters)) {
+							$parameters = array($parameters);
+			}
 
 			// a request without an id is a notification that doesn't need a response
 			if($this->_id !== null)
@@ -498,16 +520,13 @@ 
 					));
 				}
 			}
-		}
-		catch(TRpcException $e)
+		} catch(TRpcException $e)
 		{
 			return $this->createErrorResponse($e);
-		}
-		catch(THttpException $e)
+		} catch(THttpException $e)
 		{
 			throw $e;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			return $this->createErrorResponse(new TRpcException('An internal error occured', '-32603'));
 		}
@@ -580,8 +599,9 @@ 
 	private static function checkJsonError()
 	{
 		$errnum = json_last_error();
-		if($errnum != JSON_ERROR_NONE)
-			throw new Exception("JSON error: $msg", $err);
+		if($errnum != JSON_ERROR_NONE) {
+					throw new Exception("JSON error: $msg", $err);
+		}
 	}
 
 	/**
@@ -593,8 +613,9 @@ 
 	 */
 	public function callApiMethod($methodName, $parameters)
 	{
-		if(!isset($this->rpcMethods[$methodName]))
-			throw new TRpcException('Method "'.$methodName.'" not found', '-32601');
+		if(!isset($this->rpcMethods[$methodName])) {
+					throw new TRpcException('Method "'.$methodName.'" not found', '-32601');
+		}
 
 		return call_user_func_array($this->rpcMethods[$methodName]['method'], $parameters);
 	}
@@ -662,16 +683,13 @@ 
 		try
 		{
 			return xmlrpc_server_call_method($this->_xmlrpcServer, $requestPayload, null);
-		}
-		catch(TRpcException $e)
+		} catch(TRpcException $e)
 		{
 			return $this->createErrorResponse($e);
-		}
-		catch(THttpException $e)
+		} catch(THttpException $e)
 		{
 			throw $e;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			return $this->createErrorResponse(new TRpcException('An internal error occured'));
 		}

framework/Web/TAssetManager.php

Doc Comments +11 added lines

@@ -101,6 +101,7 @@ 
 	 * Sets the root directory storing published asset files.
 	 * The directory must be in namespace format.
 	 * @param string the root directory storing published asset files
+	 * @param string $value
 	 * @throws TInvalidOperationException if the module is initialized already
 	 */
 	public function setBasePath($value)
@@ -125,6 +126,7 @@ 
 
 	/**
 	 * @param string the base url that the published asset files can be accessed
+	 * @param string $value
 	 * @throws TInvalidOperationException if the module is initialized already
 	 */
 	public function setBaseUrl($value)
@@ -215,6 +217,7 @@ 
 	 * This method does not perform any publishing. It merely tells you
 	 * if the file path is published, what the URL will be to access it.
 	 * @param string directory or file path being published
+	 * @param string $path
 	 * @return string the published URL for the file path
 	 */
 	public function getPublishedUrl($path)
@@ -230,6 +233,7 @@ 
 	 * Generate a CRC32 hash for the directory path. Collisions are higher
 	 * than MD5 but generates a much smaller hash string.
 	 * @param string string to be hashed.
+	 * @param string $dir
 	 * @return string hashed string.
 	 */
 	protected function hash($dir)
@@ -243,6 +247,8 @@ 
 	 * or has an older file modification time.
 	 * @param string source file path
 	 * @param string destination directory (if not exists, it will be created)
+	 * @param string $src
+	 * @param string $dst
 	 */
 	protected function copyFile($src,$dst)
 	{
@@ -265,6 +271,8 @@ 
 	 * File modification time is used to ensure the copied files are latest.
 	 * @param string the source directory
 	 * @param string the destination directory
+	 * @param string $src
+	 * @param string $dst
 	 * @todo a generic solution to ignore certain directories and files
 	 */
 	public function copyDirectory($src,$dst)
@@ -306,6 +314,8 @@ 
 	 * @param string tar filename
 	 * @param string MD5 checksum for the corresponding tar file.
 	 * @param boolean Wether or not to check the time stamp of the file for publishing. Defaults to false.
+	 * @param string $tarfile
+	 * @param string $md5sum
 	 * @return string URL path to the directory where the tar file was extracted.
 	 */
 	public function publishTarFile($tarfile, $md5sum, $checkTimestamp=false)
@@ -336,6 +346,7 @@ 
 	 * N.B Tar file must not be compressed.
 	 * @param string tar file
 	 * @param string path where the contents of tar file are to be extracted
+	 * @param string $destination
 	 * @return boolean true if extract successful, false otherwise.
 	 */
 	protected function deployTarFile($path,$destination)

Spacing +77 added lines, -77 removed lines

@@ -45,19 +45,19 @@ 
 	/**
 	 * Default web accessible base path for storing private files
 	 */
-	const DEFAULT_BASEPATH='assets';
+	const DEFAULT_BASEPATH = 'assets';
 	/**
 	 * @var string base web accessible path for storing private files
 	 */
-	private $_basePath=null;
+	private $_basePath = null;
 	/**
 	 * @var string base URL for accessing the publishing directory.
 	 */
-	private $_baseUrl=null;
+	private $_baseUrl = null;
 	/**
 	 * @var boolean whether to use timestamp checking to ensure files are published with up-to-date versions.
 	 */
-	private $_checkTimestamp=false;
+	private $_checkTimestamp = false;
 	/**
 	 * @var TApplication application instance
 	 */
@@ -65,11 +65,11 @@ 
 	/**
 	 * @var array published assets
 	 */
-	private $_published=array();
+	private $_published = array();
 	/**
 	 * @var boolean whether the module is initialized
 	 */
-	private $_initialized=false;
+	private $_initialized = false;
 
 	/**
 	 * Initializes the module.
@@ -78,15 +78,15 @@ 
 	 */
 	public function init($config)
 	{
-		$application=$this->getApplication();
-		if($this->_basePath===null)
-			$this->_basePath=dirname($application->getRequest()->getApplicationFilePath()).DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;
-		if(!is_writable($this->_basePath) || !is_dir($this->_basePath))
-			throw new TConfigurationException('assetmanager_basepath_invalid',$this->_basePath);
-		if($this->_baseUrl===null)
-			$this->_baseUrl=rtrim(dirname($application->getRequest()->getApplicationUrl()),'/\\').'/'.self::DEFAULT_BASEPATH;
+		$application = $this->getApplication();
+		if ($this->_basePath === null)
+			$this->_basePath = dirname($application->getRequest()->getApplicationFilePath()) . DIRECTORY_SEPARATOR . self::DEFAULT_BASEPATH;
+		if (!is_writable($this->_basePath) || !is_dir($this->_basePath))
+			throw new TConfigurationException('assetmanager_basepath_invalid', $this->_basePath);
+		if ($this->_baseUrl === null)
+			$this->_baseUrl = rtrim(dirname($application->getRequest()->getApplicationUrl()), '/\\') . '/' . self::DEFAULT_BASEPATH;
 		$application->setAssetManager($this);
-		$this->_initialized=true;
+		$this->_initialized = true;
 	}
 
 	/**
@@ -105,13 +105,13 @@ 
 	 */
 	public function setBasePath($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('assetmanager_basepath_unchangeable');
 		else
 		{
-			$this->_basePath=Prado::getPathOfNamespace($value);
-			if($this->_basePath===null || !is_dir($this->_basePath) || !is_writable($this->_basePath))
-				throw new TInvalidDataValueException('assetmanager_basepath_invalid',$value);
+			$this->_basePath = Prado::getPathOfNamespace($value);
+			if ($this->_basePath === null || !is_dir($this->_basePath) || !is_writable($this->_basePath))
+				throw new TInvalidDataValueException('assetmanager_basepath_invalid', $value);
 		}
 	}
 
@@ -129,10 +129,10 @@ 
 	 */
 	public function setBaseUrl($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('assetmanager_baseurl_unchangeable');
 		else
-			$this->_baseUrl=rtrim($value,'/');
+			$this->_baseUrl = rtrim($value, '/');
 	}
 
 	/**
@@ -149,30 +149,30 @@ 
 	 * @throws TInvalidDataValueException if the file path to be published is
 	 * invalid
 	 */
-	public function publishFilePath($path,$checkTimestamp=false)
+	public function publishFilePath($path, $checkTimestamp = false)
 	{
-		if(isset($this->_published[$path]))
+		if (isset($this->_published[$path]))
 			return $this->_published[$path];
-		else if(empty($path) || ($fullpath=realpath($path))===false)
-			throw new TInvalidDataValueException('assetmanager_filepath_invalid',$path);
-		else if(is_file($fullpath))
+		else if (empty($path) || ($fullpath = realpath($path)) === false)
+			throw new TInvalidDataValueException('assetmanager_filepath_invalid', $path);
+		else if (is_file($fullpath))
 		{
-			$dir=$this->hash(dirname($fullpath));
-			$fileName=basename($fullpath);
-			$dst=$this->_basePath.DIRECTORY_SEPARATOR.$dir;
-			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
-				$this->copyFile($fullpath,$dst);
-			return $this->_published[$path]=$this->_baseUrl.'/'.$dir.'/'.$fileName;
+			$dir = $this->hash(dirname($fullpath));
+			$fileName = basename($fullpath);
+			$dst = $this->_basePath . DIRECTORY_SEPARATOR . $dir;
+			if (!is_file($dst . DIRECTORY_SEPARATOR . $fileName) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
+				$this->copyFile($fullpath, $dst);
+			return $this->_published[$path] = $this->_baseUrl . '/' . $dir . '/' . $fileName;
 		}
 		else
 		{
-			$dir=$this->hash($fullpath);
-			if(!is_dir($this->_basePath.DIRECTORY_SEPARATOR.$dir) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
+			$dir = $this->hash($fullpath);
+			if (!is_dir($this->_basePath . DIRECTORY_SEPARATOR . $dir) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
 			{
-				Prado::trace("Publishing directory $fullpath",'System.Web.UI.TAssetManager');
-				$this->copyDirectory($fullpath,$this->_basePath.DIRECTORY_SEPARATOR.$dir);
+				Prado::trace("Publishing directory $fullpath", 'System.Web.UI.TAssetManager');
+				$this->copyDirectory($fullpath, $this->_basePath . DIRECTORY_SEPARATOR . $dir);
 			}
-			return $this->_published[$path]=$this->_baseUrl.'/'.$dir;
+			return $this->_published[$path] = $this->_baseUrl . '/' . $dir;
 		}
 	}
 
@@ -189,7 +189,7 @@ 
 	 * @param $values List of published assets
 	 * @since 3.1.6
 	 */
-	protected function setPublished($values=array())
+	protected function setPublished($values = array())
 	{
 		$this->_published = $values;
 	}
@@ -203,11 +203,11 @@ 
 	 */
 	public function getPublishedPath($path)
 	{
-		$path=realpath($path);
-		if(is_file($path))
-			return $this->_basePath.DIRECTORY_SEPARATOR.$this->hash(dirname($path)).DIRECTORY_SEPARATOR.basename($path);
+		$path = realpath($path);
+		if (is_file($path))
+			return $this->_basePath . DIRECTORY_SEPARATOR . $this->hash(dirname($path)) . DIRECTORY_SEPARATOR . basename($path);
 		else
-			return $this->_basePath.DIRECTORY_SEPARATOR.$this->hash($path);
+			return $this->_basePath . DIRECTORY_SEPARATOR . $this->hash($path);
 	}
 
 	/**
@@ -219,11 +219,11 @@ 
 	 */
 	public function getPublishedUrl($path)
 	{
-		$path=realpath($path);
-		if(is_file($path))
-			return $this->_baseUrl.'/'.$this->hash(dirname($path)).'/'.basename($path);
+		$path = realpath($path);
+		if (is_file($path))
+			return $this->_baseUrl . '/' . $this->hash(dirname($path)) . '/' . basename($path);
 		else
-			return $this->_baseUrl.'/'.$this->hash($path);
+			return $this->_baseUrl . '/' . $this->hash($path);
 	}
 
 	/**
@@ -234,7 +234,7 @@ 
 	 */
 	protected function hash($dir)
 	{
-		return sprintf('%x',crc32($dir.Prado::getVersion()));
+		return sprintf('%x', crc32($dir . Prado::getVersion()));
 	}
 
 	/**
@@ -244,18 +244,18 @@ 
 	 * @param string source file path
 	 * @param string destination directory (if not exists, it will be created)
 	 */
-	protected function copyFile($src,$dst)
+	protected function copyFile($src, $dst)
 	{
-		if(!is_dir($dst))
+		if (!is_dir($dst))
 		{
 			@mkdir($dst);
 			@chmod($dst, PRADO_CHMOD);
 		}
-		$dstFile=$dst.DIRECTORY_SEPARATOR.basename($src);
-		if(@filemtime($dstFile)<@filemtime($src))
+		$dstFile = $dst . DIRECTORY_SEPARATOR . basename($src);
+		if (@filemtime($dstFile) < @filemtime($src))
 		{
-			Prado::trace("Publishing file $src to $dstFile",'System.Web.TAssetManager');
-			@copy($src,$dstFile);
+			Prado::trace("Publishing file $src to $dstFile", 'System.Web.TAssetManager');
+			@copy($src, $dstFile);
 		}
 	}
 
@@ -267,29 +267,29 @@ 
 	 * @param string the destination directory
 	 * @todo a generic solution to ignore certain directories and files
 	 */
-	public function copyDirectory($src,$dst)
+	public function copyDirectory($src, $dst)
 	{
-		if(!is_dir($dst))
+		if (!is_dir($dst))
 		{
 			@mkdir($dst);
 			@chmod($dst, PRADO_CHMOD);
 		}
-		if($folder=@opendir($src))
+		if ($folder = @opendir($src))
 		{
-			while($file=@readdir($folder))
+			while ($file = @readdir($folder))
 			{
-				if($file==='.' || $file==='..' || $file==='.svn')
+				if ($file === '.' || $file === '..' || $file === '.svn')
 					continue;
-				else if(is_file($src.DIRECTORY_SEPARATOR.$file))
+				else if (is_file($src . DIRECTORY_SEPARATOR . $file))
 				{
-					if(@filemtime($dst.DIRECTORY_SEPARATOR.$file)<@filemtime($src.DIRECTORY_SEPARATOR.$file))
+					if (@filemtime($dst . DIRECTORY_SEPARATOR . $file) < @filemtime($src . DIRECTORY_SEPARATOR . $file))
 					{
-						@copy($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
-						@chmod($dst.DIRECTORY_SEPARATOR.$file, PRADO_CHMOD);
+						@copy($src . DIRECTORY_SEPARATOR . $file, $dst . DIRECTORY_SEPARATOR . $file);
+						@chmod($dst . DIRECTORY_SEPARATOR . $file, PRADO_CHMOD);
 					}
 				}
 				else
-					$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
+					$this->copyDirectory($src . DIRECTORY_SEPARATOR . $file, $dst . DIRECTORY_SEPARATOR . $file);
 			}
 			closedir($folder);
 		} else {
@@ -308,26 +308,26 @@ 
 	 * @param boolean Wether or not to check the time stamp of the file for publishing. Defaults to false.
 	 * @return string URL path to the directory where the tar file was extracted.
 	 */
-	public function publishTarFile($tarfile, $md5sum, $checkTimestamp=false)
+	public function publishTarFile($tarfile, $md5sum, $checkTimestamp = false)
 	{
-		if(isset($this->_published[$md5sum]))
+		if (isset($this->_published[$md5sum]))
 			return $this->_published[$md5sum];
-		else if(($fullpath=realpath($md5sum))===false || !is_file($fullpath))
-			throw new TInvalidDataValueException('assetmanager_tarchecksum_invalid',$md5sum);
+		else if (($fullpath = realpath($md5sum)) === false || !is_file($fullpath))
+			throw new TInvalidDataValueException('assetmanager_tarchecksum_invalid', $md5sum);
 		else
 		{
-			$dir=$this->hash(dirname($fullpath));
-			$fileName=basename($fullpath);
-			$dst=$this->_basePath.DIRECTORY_SEPARATOR.$dir;
-			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
+			$dir = $this->hash(dirname($fullpath));
+			$fileName = basename($fullpath);
+			$dst = $this->_basePath . DIRECTORY_SEPARATOR . $dir;
+			if (!is_file($dst . DIRECTORY_SEPARATOR . $fileName) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
 			{
-				if(@filemtime($dst.DIRECTORY_SEPARATOR.$fileName)<@filemtime($fullpath))
+				if (@filemtime($dst . DIRECTORY_SEPARATOR . $fileName) < @filemtime($fullpath))
 				{
-					$this->copyFile($fullpath,$dst);
-					$this->deployTarFile($tarfile,$dst);
+					$this->copyFile($fullpath, $dst);
+					$this->deployTarFile($tarfile, $dst);
 				}
 			}
-			return $this->_published[$md5sum]=$this->_baseUrl.'/'.$dir;
+			return $this->_published[$md5sum] = $this->_baseUrl . '/' . $dir;
 		}
 	}
 
@@ -338,10 +338,10 @@ 
 	 * @param string path where the contents of tar file are to be extracted
 	 * @return boolean true if extract successful, false otherwise.
 	 */
-	protected function deployTarFile($path,$destination)
+	protected function deployTarFile($path, $destination)
 	{
-		if(($fullpath=realpath($path))===false || !is_file($fullpath))
-			throw new TIOException('assetmanager_tarfile_invalid',$path);
+		if (($fullpath = realpath($path)) === false || !is_file($fullpath))
+			throw new TIOException('assetmanager_tarfile_invalid', $path);
 		else
 		{
 			Prado::using('System.IO.TTarFileExtractor');

Braces +52 added lines, -45 removed lines

@@ -79,12 +79,15 @@ 
 	public function init($config)
 	{
 		$application=$this->getApplication();
-		if($this->_basePath===null)
-			$this->_basePath=dirname($application->getRequest()->getApplicationFilePath()).DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;
-		if(!is_writable($this->_basePath) || !is_dir($this->_basePath))
-			throw new TConfigurationException('assetmanager_basepath_invalid',$this->_basePath);
-		if($this->_baseUrl===null)
-			$this->_baseUrl=rtrim(dirname($application->getRequest()->getApplicationUrl()),'/\\').'/'.self::DEFAULT_BASEPATH;
+		if($this->_basePath===null) {
+					$this->_basePath=dirname($application->getRequest()->getApplicationFilePath()).DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;
+		}
+		if(!is_writable($this->_basePath) || !is_dir($this->_basePath)) {
+					throw new TConfigurationException('assetmanager_basepath_invalid',$this->_basePath);
+		}
+		if($this->_baseUrl===null) {
+					$this->_baseUrl=rtrim(dirname($application->getRequest()->getApplicationUrl()),'/\\').'/'.self::DEFAULT_BASEPATH;
+		}
 		$application->setAssetManager($this);
 		$this->_initialized=true;
 	}
@@ -105,13 +108,14 @@ 
 	 */
 	public function setBasePath($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('assetmanager_basepath_unchangeable');
-		else
+		if($this->_initialized) {
+					throw new TInvalidOperationException('assetmanager_basepath_unchangeable');
+		} else
 		{
 			$this->_basePath=Prado::getPathOfNamespace($value);
-			if($this->_basePath===null || !is_dir($this->_basePath) || !is_writable($this->_basePath))
-				throw new TInvalidDataValueException('assetmanager_basepath_invalid',$value);
+			if($this->_basePath===null || !is_dir($this->_basePath) || !is_writable($this->_basePath)) {
+							throw new TInvalidDataValueException('assetmanager_basepath_invalid',$value);
+			}
 		}
 	}
 
@@ -129,10 +133,11 @@ 
 	 */
 	public function setBaseUrl($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('assetmanager_baseurl_unchangeable');
-		else
-			$this->_baseUrl=rtrim($value,'/');
+		if($this->_initialized) {
+					throw new TInvalidOperationException('assetmanager_baseurl_unchangeable');
+		} else {
+					$this->_baseUrl=rtrim($value,'/');
+		}
 	}
 
 	/**
@@ -151,20 +156,20 @@ 
 	 */
 	public function publishFilePath($path,$checkTimestamp=false)
 	{
-		if(isset($this->_published[$path]))
-			return $this->_published[$path];
-		else if(empty($path) || ($fullpath=realpath($path))===false)
-			throw new TInvalidDataValueException('assetmanager_filepath_invalid',$path);
-		else if(is_file($fullpath))
+		if(isset($this->_published[$path])) {
+					return $this->_published[$path];
+		} else if(empty($path) || ($fullpath=realpath($path))===false) {
+					throw new TInvalidDataValueException('assetmanager_filepath_invalid',$path);
+		} else if(is_file($fullpath))
 		{
 			$dir=$this->hash(dirname($fullpath));
 			$fileName=basename($fullpath);
 			$dst=$this->_basePath.DIRECTORY_SEPARATOR.$dir;
-			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
-				$this->copyFile($fullpath,$dst);
+			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance) {
+							$this->copyFile($fullpath,$dst);
+			}
 			return $this->_published[$path]=$this->_baseUrl.'/'.$dir.'/'.$fileName;
-		}
-		else
+		} else
 		{
 			$dir=$this->hash($fullpath);
 			if(!is_dir($this->_basePath.DIRECTORY_SEPARATOR.$dir) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
@@ -204,10 +209,11 @@ 
 	public function getPublishedPath($path)
 	{
 		$path=realpath($path);
-		if(is_file($path))
-			return $this->_basePath.DIRECTORY_SEPARATOR.$this->hash(dirname($path)).DIRECTORY_SEPARATOR.basename($path);
-		else
-			return $this->_basePath.DIRECTORY_SEPARATOR.$this->hash($path);
+		if(is_file($path)) {
+					return $this->_basePath.DIRECTORY_SEPARATOR.$this->hash(dirname($path)).DIRECTORY_SEPARATOR.basename($path);
+		} else {
+					return $this->_basePath.DIRECTORY_SEPARATOR.$this->hash($path);
+		}
 	}
 
 	/**
@@ -220,10 +226,11 @@ 
 	public function getPublishedUrl($path)
 	{
 		$path=realpath($path);
-		if(is_file($path))
-			return $this->_baseUrl.'/'.$this->hash(dirname($path)).'/'.basename($path);
-		else
-			return $this->_baseUrl.'/'.$this->hash($path);
+		if(is_file($path)) {
+					return $this->_baseUrl.'/'.$this->hash(dirname($path)).'/'.basename($path);
+		} else {
+					return $this->_baseUrl.'/'.$this->hash($path);
+		}
 	}
 
 	/**
@@ -278,18 +285,18 @@ 
 		{
 			while($file=@readdir($folder))
 			{
-				if($file==='.' || $file==='..' || $file==='.svn')
-					continue;
-				else if(is_file($src.DIRECTORY_SEPARATOR.$file))
+				if($file==='.' || $file==='..' || $file==='.svn') {
+									continue;
+				} else if(is_file($src.DIRECTORY_SEPARATOR.$file))
 				{
 					if(@filemtime($dst.DIRECTORY_SEPARATOR.$file)<@filemtime($src.DIRECTORY_SEPARATOR.$file))
 					{
 						@copy($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
 						@chmod($dst.DIRECTORY_SEPARATOR.$file, PRADO_CHMOD);
 					}
+				} else {
+									$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
 				}
-				else
-					$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
 			}
 			closedir($folder);
 		} else {
@@ -310,11 +317,11 @@ 
 	 */
 	public function publishTarFile($tarfile, $md5sum, $checkTimestamp=false)
 	{
-		if(isset($this->_published[$md5sum]))
-			return $this->_published[$md5sum];
-		else if(($fullpath=realpath($md5sum))===false || !is_file($fullpath))
-			throw new TInvalidDataValueException('assetmanager_tarchecksum_invalid',$md5sum);
-		else
+		if(isset($this->_published[$md5sum])) {
+					return $this->_published[$md5sum];
+		} else if(($fullpath=realpath($md5sum))===false || !is_file($fullpath)) {
+					throw new TInvalidDataValueException('assetmanager_tarchecksum_invalid',$md5sum);
+		} else
 		{
 			$dir=$this->hash(dirname($fullpath));
 			$fileName=basename($fullpath);
@@ -340,9 +347,9 @@ 
 	 */
 	protected function deployTarFile($path,$destination)
 	{
-		if(($fullpath=realpath($path))===false || !is_file($fullpath))
-			throw new TIOException('assetmanager_tarfile_invalid',$path);
-		else
+		if(($fullpath=realpath($path))===false || !is_file($fullpath)) {
+					throw new TIOException('assetmanager_tarfile_invalid',$path);
+		} else
 		{
 			Prado::using('System.IO.TTarFileExtractor');
 			$tar = new TTarFileExtractor($fullpath);

framework/Web/TCacheHttpSession.php

Doc Comments +2 added lines

@@ -74,6 +74,7 @@ 
 
 	/**
 	 * @param string the ID of the cache module.
+	 * @param string $value
 	 */
 	public function setCacheModuleID($value)
 	{
@@ -130,6 +131,7 @@ 
 
 	/**
      * @param string prefix of session variable name to avoid conflict with other cache data
+     * @param string $value
      */
 	public function setKeyPrefix($value)
 	{

Indentation +10 added lines, -10 removed lines

@@ -50,8 +50,8 @@ 
 	 * It reads the CacheModule property.
 	 * @param TXmlElement module configuration
 	 */
-    public function init($config)
-    {
+	public function init($config)
+	{
 		if($this->_cacheModuleID==='')
 			throw new TConfigurationException('cachesession_cachemoduleid_required');
 		else if(($cache=$this->getApplication()->getModule($this->_cacheModuleID))===null)
@@ -62,7 +62,7 @@ 
 			throw new TConfigurationException('cachesession_cachemodule_invalid',$this->_cacheModuleID);
 		$this->setUseCustomStorage(true);
 		parent::init($config);
-    }
+	}
 
 	/**
 	 * @return string the ID of the cache module.
@@ -95,7 +95,7 @@ 
 	 */
 	public function _read($id)
 	{
-	    return $this->_cache->get($this->calculateKey($id));
+		return $this->_cache->get($this->calculateKey($id));
 	}
 
 	/**
@@ -117,7 +117,7 @@ 
 	 */
 	public function _destroy($id)
 	{
-	    return $this->_cache->delete($this->calculateKey($id));
+		return $this->_cache->delete($this->calculateKey($id));
 	}
 
 	/**
@@ -125,15 +125,15 @@ 
 	 */
 	public function getKeyPrefix()
 	{
-	    return $this->_prefix;
+		return $this->_prefix;
 	}
 
 	/**
-     * @param string prefix of session variable name to avoid conflict with other cache data
-     */
+	 * @param string prefix of session variable name to avoid conflict with other cache data
+	 */
 	public function setKeyPrefix($value)
 	{
-	    $this->_prefix=$value;
+		$this->_prefix=$value;
 	}
 
 	/**
@@ -142,7 +142,7 @@ 
 	 */
 	protected function calculateKey($id)
 	{
-	    return $this->_prefix.':'.$id;
+		return $this->_prefix.':'.$id;
 	}
 }
 

Spacing +13 added lines, -13 removed lines

@@ -40,8 +40,8 @@ 
  */
 class TCacheHttpSession extends THttpSession
 {
-	private $_prefix='session';
-	private $_cacheModuleID='';
+	private $_prefix = 'session';
+	private $_cacheModuleID = '';
 	private $_cache;
 
 	/**
@@ -52,14 +52,14 @@ 
 	 */
     public function init($config)
     {
-		if($this->_cacheModuleID==='')
+		if ($this->_cacheModuleID === '')
 			throw new TConfigurationException('cachesession_cachemoduleid_required');
-		else if(($cache=$this->getApplication()->getModule($this->_cacheModuleID))===null)
-			throw new TConfigurationException('cachesession_cachemodule_inexistent',$this->_cacheModuleID);
-		else if($cache instanceof ICache)
-			$this->_cache=$cache;
+		else if (($cache = $this->getApplication()->getModule($this->_cacheModuleID)) === null)
+			throw new TConfigurationException('cachesession_cachemodule_inexistent', $this->_cacheModuleID);
+		else if ($cache instanceof ICache)
+			$this->_cache = $cache;
 		else
-			throw new TConfigurationException('cachesession_cachemodule_invalid',$this->_cacheModuleID);
+			throw new TConfigurationException('cachesession_cachemodule_invalid', $this->_cacheModuleID);
 		$this->setUseCustomStorage(true);
 		parent::init($config);
     }
@@ -77,7 +77,7 @@ 
 	 */
 	public function setCacheModuleID($value)
 	{
-		$this->_cacheModuleID=$value;
+		$this->_cacheModuleID = $value;
 	}
 
 	/**
@@ -104,9 +104,9 @@ 
 	 * @param string session data
 	 * @return boolean whether session write is successful
 	 */
-	public function _write($id,$data)
+	public function _write($id, $data)
 	{
-		return $this->_cache->set($this->calculateKey($id),$data,$this->getTimeout());
+		return $this->_cache->set($this->calculateKey($id), $data, $this->getTimeout());
 	}
 
 	/**
@@ -133,7 +133,7 @@ 
      */
 	public function setKeyPrefix($value)
 	{
-	    $this->_prefix=$value;
+	    $this->_prefix = $value;
 	}
 
 	/**
@@ -142,7 +142,7 @@ 
 	 */
 	protected function calculateKey($id)
 	{
-	    return $this->_prefix.':'.$id;
+	    return $this->_prefix . ':' . $id;
 	}
 }
 

Braces +9 added lines, -8 removed lines

@@ -52,14 +52,15 @@
 	 */
     public function init($config)
     {
-		if($this->_cacheModuleID==='')
-			throw new TConfigurationException('cachesession_cachemoduleid_required');
-		else if(($cache=$this->getApplication()->getModule($this->_cacheModuleID))===null)
-			throw new TConfigurationException('cachesession_cachemodule_inexistent',$this->_cacheModuleID);
-		else if($cache instanceof ICache)
-			$this->_cache=$cache;
-		else
-			throw new TConfigurationException('cachesession_cachemodule_invalid',$this->_cacheModuleID);
+		if($this->_cacheModuleID==='') {
+					throw new TConfigurationException('cachesession_cachemoduleid_required');
+		} else if(($cache=$this->getApplication()->getModule($this->_cacheModuleID))===null) {
+					throw new TConfigurationException('cachesession_cachemodule_inexistent',$this->_cacheModuleID);
+		} else if($cache instanceof ICache) {
+					$this->_cache=$cache;
+		} else {
+					throw new TConfigurationException('cachesession_cachemodule_invalid',$this->_cacheModuleID);
+		}
 		$this->setUseCustomStorage(true);
 		parent::init($config);
     }

framework/Web/THttpRequest.php

Doc Comments +22 added lines, -1 removed lines

@@ -140,6 +140,7 @@ 
 
 	/**
 	 * @param string id of this module
+	 * @param string $value
 	 */
 	public function setID($value)
 	{
@@ -258,6 +259,7 @@ 
 
 	/**
 	 * Saves the current UrlManager instance to cache.
+	 * @param TUrlManager $manager
 	 * @return boolean true if UrlManager instance was cached, false otherwise.
 	 */
 	protected function cacheUrlManager($manager)
@@ -314,6 +316,7 @@ 
 	 * by loading it as an application module and setting this property
 	 * with the module ID.
 	 * @param string the ID of the URL manager module
+	 * @param string $value
 	 */
 	public function setUrlManager($value)
 	{
@@ -349,7 +352,7 @@ 
 	}
 
 	/**
-	 * @return THttpRequestUrlFormat the format of URLs. Defaults to THttpRequestUrlFormat::Get.
+	 * @return string the format of URLs. Defaults to THttpRequestUrlFormat::Get.
 	 */
 	public function getUrlFormat()
 	{
@@ -379,6 +382,7 @@ 
 
 	/**
 	 * @param string separator used to separate GET variable name and value when URL format is Path.
+	 * @param string $value
 	 * @throws TInvalidDataValueException if the separator is not a single character
 	 */
 	public function setUrlParamSeparator($value)
@@ -620,6 +624,7 @@ 
 
 	/**
 	 * @param boolean whether cookies should be validated.
+	 * @param boolean $value
 	 */
 	public function setEnableCookieValidation($value)
 	{
@@ -710,6 +715,7 @@ 
 	 * @param array GET parameters, null if not needed
 	 * @param boolean whether to encode the ampersand in URL, defaults to true.
 	 * @param boolean whether to encode the GET parameters (their names and values), defaults to false.
+	 * @param string $serviceID
 	 * @return string URL
 	 * @see TUrlManager::constructUrl
 	 */
@@ -915,6 +921,7 @@ 
 	 * Returns whether there is an element at the specified offset.
 	 * This method is required by the interface ArrayAccess.
 	 * @param mixed the offset to check on
+	 * @param integer $offset
 	 * @return boolean
 	 */
 	public function offsetExists($offset)
@@ -926,6 +933,7 @@ 
 	 * Returns the element at the specified offset.
 	 * This method is required by the interface ArrayAccess.
 	 * @param integer the offset to retrieve element.
+	 * @param integer $offset
 	 * @return mixed the element at the offset, null if no element is found at the offset
 	 */
 	public function offsetGet($offset)
@@ -938,6 +946,8 @@ 
 	 * This method is required by the interface ArrayAccess.
 	 * @param integer the offset to set element
 	 * @param mixed the element value
+	 * @param integer $offset
+	 * @param string $item
 	 */
 	public function offsetSet($offset,$item)
 	{
@@ -948,6 +958,7 @@ 
 	 * Unsets the element at the specified offset.
 	 * This method is required by the interface ArrayAccess.
 	 * @param mixed the offset to unset element
+	 * @param integer $offset
 	 */
 	public function offsetUnset($offset)
 	{
@@ -980,6 +991,7 @@ 
 	/**
 	 * Constructor.
 	 * @param mixed owner of this collection.
+	 * @param THttpResponse $owner
 	 */
 	public function __construct($owner=null)
 	{
@@ -992,6 +1004,7 @@ 
 	 * operations for each newly added THttpCookie object.
 	 * @param integer the specified position.
 	 * @param mixed new item
+	 * @param integer $index
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a THttpCookie object.
 	 */
 	public function insertAt($index,$item)
@@ -1011,6 +1024,7 @@ 
 	 * This overrides the parent implementation by performing additional
 	 * cleanup work when removing a TCookie object.
 	 * @param integer the index of the item to be removed.
+	 * @param integer $index
 	 * @return mixed the removed item.
 	 */
 	public function removeAt($index)
@@ -1109,6 +1123,7 @@ 
 
 	/**
 	 * @param string the domain to associate the cookie with
+	 * @param string $value
 	 */
 	public function setDomain($value)
 	{
@@ -1125,6 +1140,7 @@ 
 
 	/**
 	 * @param integer the time the cookie expires. This is a Unix timestamp so is in number of seconds since the epoch.
+	 * @param integer $value
 	 */
 	public function setExpire($value)
 	{
@@ -1157,6 +1173,7 @@ 
 
 	/**
 	 * @param string the name of the cookie
+	 * @param string $value
 	 */
 	public function setName($value)
 	{
@@ -1173,6 +1190,7 @@ 
 
 	/**
 	 * @param string the value of the cookie
+	 * @param string $value
 	 */
 	public function setValue($value)
 	{
@@ -1189,6 +1207,7 @@ 
 
 	/**
 	 * @param string the path on the server in which the cookie will be available on
+	 * @param string $value
 	 */
 	public function setPath($value)
 	{
@@ -1205,6 +1224,7 @@ 
 
 	/**
 	 * @param boolean ether the cookie should only be transmitted over a secure HTTPS connection
+	 * @param boolean $value
 	 */
 	public function setSecure($value)
 	{
@@ -1287,6 +1307,7 @@ 
 	 * Constructor.
 	 * Decomposes the specified URI into parts.
 	 * @param string URI to be represented
+	 * @param string $uri
 	 * @throws TInvalidDataValueException if URI is of bad format
 	 */
 	public function __construct($uri)

Spacing +183 added lines, -183 removed lines

@@ -66,34 +66,34 @@ 
  * @package System.Web
  * @since 3.0
  */
-class THttpRequest extends TApplicationComponent implements IteratorAggregate,ArrayAccess,Countable,IModule
+class THttpRequest extends TApplicationComponent implements IteratorAggregate, ArrayAccess, Countable, IModule
 {
-	const CGIFIX__PATH_INFO		= 1;
-	const CGIFIX__SCRIPT_NAME	= 2;
+	const CGIFIX__PATH_INFO = 1;
+	const CGIFIX__SCRIPT_NAME = 2;
 	/**
 	 * @var TUrlManager the URL manager module
 	 */
-	private $_urlManager=null;
+	private $_urlManager = null;
 	/**
 	 * @var string the ID of the URL manager module
 	 */
-	private $_urlManagerID='';
+	private $_urlManagerID = '';
 	/**
 	 * @var string Separator used to separate GET variable name and value when URL format is Path.
 	 */
-	private $_separator=',';
+	private $_separator = ',';
 	/**
 	 * @var string requested service ID
 	 */
-	private $_serviceID=null;
+	private $_serviceID = null;
 	/**
 	 * @var string requested service parameter
 	 */
-	private $_serviceParam=null;
+	private $_serviceParam = null;
 	/**
 	 * @var THttpCookieCollection cookies sent from user
 	 */
-	private $_cookies=null;
+	private $_cookies = null;
 	/**
 	 * @var string requested URI (URL w/o host info)
 	 */
@@ -105,20 +105,20 @@ 
 	/**
 	 * @var boolean whether the session ID should be kept in cookie only
 	 */
-	private $_cookieOnly=null;
-	private $_urlFormat=THttpRequestUrlFormat::Get;
+	private $_cookieOnly = null;
+	private $_urlFormat = THttpRequestUrlFormat::Get;
 	private $_services;
-	private $_requestResolved=false;
-	private $_enableCookieValidation=false;
-	private $_cgiFix=0;
+	private $_requestResolved = false;
+	private $_enableCookieValidation = false;
+	private $_cgiFix = 0;
 	/**
 	 * @var boolean whether to cache the TUrlManager class (useful with a lot of TUrlMappings)
 	 */
-	private $_enableCache=false;
+	private $_enableCache = false;
 	/**
 	 * @var string request URL
 	 */
-	private $_url=null;
+	private $_url = null;
 
 	/**
 	 * @var string module id
@@ -128,7 +128,7 @@ 
 	/**
 	 * @var array contains all request variables
 	 */
-	private $_items=array();
+	private $_items = array();
 
 	/**
 	 * @return string id of this module
@@ -143,7 +143,7 @@ 
 	 */
 	public function setID($value)
 	{
-		$this->_id=$value;
+		$this->_id = $value;
 	}
 
 	/**
@@ -154,13 +154,13 @@ 
 	public function init($config)
 	{
 		// Fill in default request info when the script is run in command line
-		if(php_sapi_name()==='cli')
+		if (php_sapi_name() === 'cli')
 		{
-			$_SERVER['REMOTE_ADDR']='127.0.0.1';
-			$_SERVER['REQUEST_METHOD']='GET';
-			$_SERVER['SERVER_NAME']='localhost';
-			$_SERVER['SERVER_PORT']=80;
-			$_SERVER['HTTP_USER_AGENT']='';
+			$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
+			$_SERVER['REQUEST_METHOD'] = 'GET';
+			$_SERVER['SERVER_NAME'] = 'localhost';
+			$_SERVER['SERVER_PORT'] = 80;
+			$_SERVER['HTTP_USER_AGENT'] = '';
 		}
 
 		// Info about server variables:
@@ -169,30 +169,30 @@ 
 		// QUERY_STRING is the string following the '?' in the ur (eg the a=x part in http://foo/bar?a=x)
 		// REQUEST_URI contains the URI part entered in the browser address bar
 		// SCRIPT_FILENAME is the file path to the executing script
-		if(isset($_SERVER['REQUEST_URI']))
-			$this->_requestUri=$_SERVER['REQUEST_URI'];
+		if (isset($_SERVER['REQUEST_URI']))
+			$this->_requestUri = $_SERVER['REQUEST_URI'];
 		else  // TBD: in this case, SCRIPT_NAME need to be escaped
-			$this->_requestUri=$_SERVER['SCRIPT_NAME'].(empty($_SERVER['QUERY_STRING'])?'':'?'.$_SERVER['QUERY_STRING']);
-
-		if($this->_cgiFix&self::CGIFIX__PATH_INFO && isset($_SERVER['ORIG_PATH_INFO']))
-			$this->_pathInfo=substr($_SERVER['ORIG_PATH_INFO'], strlen($_SERVER['SCRIPT_NAME']));
-		elseif(isset($_SERVER['PATH_INFO']))
-			$this->_pathInfo=$_SERVER['PATH_INFO'];
-		else if(strpos($_SERVER['PHP_SELF'],$_SERVER['SCRIPT_NAME'])===0 && $_SERVER['PHP_SELF']!==$_SERVER['SCRIPT_NAME'])
-			$this->_pathInfo=substr($_SERVER['PHP_SELF'],strlen($_SERVER['SCRIPT_NAME']));
+			$this->_requestUri = $_SERVER['SCRIPT_NAME'] . (empty($_SERVER['QUERY_STRING']) ? '' : '?' . $_SERVER['QUERY_STRING']);
+
+		if ($this->_cgiFix & self::CGIFIX__PATH_INFO && isset($_SERVER['ORIG_PATH_INFO']))
+			$this->_pathInfo = substr($_SERVER['ORIG_PATH_INFO'], strlen($_SERVER['SCRIPT_NAME']));
+		elseif (isset($_SERVER['PATH_INFO']))
+			$this->_pathInfo = $_SERVER['PATH_INFO'];
+		else if (strpos($_SERVER['PHP_SELF'], $_SERVER['SCRIPT_NAME']) === 0 && $_SERVER['PHP_SELF'] !== $_SERVER['SCRIPT_NAME'])
+			$this->_pathInfo = substr($_SERVER['PHP_SELF'], strlen($_SERVER['SCRIPT_NAME']));
 		else
-			$this->_pathInfo='';
+			$this->_pathInfo = '';
 
-		if(get_magic_quotes_gpc())
+		if (get_magic_quotes_gpc())
 		{
-			if(isset($_GET))
-				$_GET=$this->stripSlashes($_GET);
-			if(isset($_POST))
-				$_POST=$this->stripSlashes($_POST);
-			if(isset($_REQUEST))
-				$_REQUEST=$this->stripSlashes($_REQUEST);
-			if(isset($_COOKIE))
-				$_COOKIE=$this->stripSlashes($_COOKIE);
+			if (isset($_GET))
+				$_GET = $this->stripSlashes($_GET);
+			if (isset($_POST))
+				$_POST = $this->stripSlashes($_POST);
+			if (isset($_REQUEST))
+				$_REQUEST = $this->stripSlashes($_REQUEST);
+			if (isset($_COOKIE))
+				$_COOKIE = $this->stripSlashes($_COOKIE);
 		}
 
 		$this->getApplication()->setRequest($this);
@@ -206,7 +206,7 @@ 
 	 */
 	public function stripSlashes(&$data)
 	{
-		return is_array($data)?array_map(array($this,'stripSlashes'),$data):stripslashes($data);
+		return is_array($data) ? array_map(array($this, 'stripSlashes'), $data) : stripslashes($data);
 	}
 
 	/**
@@ -214,21 +214,21 @@ 
 	 */
 	public function getUrl()
 	{
-		if($this->_url===null)
+		if ($this->_url === null)
 		{
-			$secure=$this->getIsSecureConnection();
-			$url=$secure?'https://':'http://';
-			if(empty($_SERVER['HTTP_HOST']))
+			$secure = $this->getIsSecureConnection();
+			$url = $secure ? 'https://' : 'http://';
+			if (empty($_SERVER['HTTP_HOST']))
 			{
-				$url.=$_SERVER['SERVER_NAME'];
-				$port=$_SERVER['SERVER_PORT'];
-				if(($port!=80 && !$secure) || ($port!=443 && $secure))
-					$url.=':'.$port;
+				$url .= $_SERVER['SERVER_NAME'];
+				$port = $_SERVER['SERVER_PORT'];
+				if (($port != 80 && !$secure) || ($port != 443 && $secure))
+					$url .= ':' . $port;
 			}
 			else
-				$url.=$_SERVER['HTTP_HOST'];
-			$url.=$this->getRequestUri();
-			$this->_url=new TUri($url);
+				$url .= $_SERVER['HTTP_HOST'];
+			$url .= $this->getRequestUri();
+			$this->_url = new TUri($url);
 		}
 		return $this->_url;
 	}
@@ -262,16 +262,16 @@ 
 	 */
 	protected function cacheUrlManager($manager)
 	{
-		if($this->getEnableCache())
+		if ($this->getEnableCache())
 		{
 			$cache = $this->getApplication()->getCache();
-			if($cache !== null)
+			if ($cache !== null)
 			{
 				$dependencies = null;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
+				if ($this->getApplication()->getMode() !== TApplicationMode::Performance)
 					if ($manager instanceof TUrlMapping && $fn = $manager->getConfigFile())
 					{
-						$fn = Prado::getPathOfNamespace($fn,$this->getApplication()->getConfigurationFileExt());
+						$fn = Prado::getPathOfNamespace($fn, $this->getApplication()->getConfigurationFileExt());
 						$dependencies = new TFileCacheDependency($fn);
 					}
 				return $cache->set($this->getCacheKey(), $manager, 0, $dependencies);
@@ -286,13 +286,13 @@ 
 	 */
 	protected function loadCachedUrlManager()
 	{
-		if($this->getEnableCache())
+		if ($this->getEnableCache())
 		{
 			$cache = $this->getApplication()->getCache();
-			if($cache !== null)
+			if ($cache !== null)
 			{
 				$manager = $cache->get($this->getCacheKey());
-				if($manager instanceof TUrlManager)
+				if ($manager instanceof TUrlManager)
 					return $manager;
 			}
 		}
@@ -317,7 +317,7 @@ 
 	 */
 	public function setUrlManager($value)
 	{
-		$this->_urlManagerID=$value;
+		$this->_urlManagerID = $value;
 	}
 
 	/**
@@ -325,22 +325,22 @@ 
 	 */
 	public function getUrlManagerModule()
 	{
-		if($this->_urlManager===null)
+		if ($this->_urlManager === null)
 		{
-			if(($this->_urlManager = $this->loadCachedUrlManager())===null)
+			if (($this->_urlManager = $this->loadCachedUrlManager()) === null)
 			{
-				if(empty($this->_urlManagerID))
+				if (empty($this->_urlManagerID))
 				{
-					$this->_urlManager=new TUrlManager;
+					$this->_urlManager = new TUrlManager;
 					$this->_urlManager->init(null);
 				}
 				else
 				{
-					$this->_urlManager=$this->getApplication()->getModule($this->_urlManagerID);
-					if($this->_urlManager===null)
-						throw new TConfigurationException('httprequest_urlmanager_inexist',$this->_urlManagerID);
-					if(!($this->_urlManager instanceof TUrlManager))
-						throw new TConfigurationException('httprequest_urlmanager_invalid',$this->_urlManagerID);
+					$this->_urlManager = $this->getApplication()->getModule($this->_urlManagerID);
+					if ($this->_urlManager === null)
+						throw new TConfigurationException('httprequest_urlmanager_inexist', $this->_urlManagerID);
+					if (!($this->_urlManager instanceof TUrlManager))
+						throw new TConfigurationException('httprequest_urlmanager_invalid', $this->_urlManagerID);
 				}
 				$this->cacheUrlManager($this->_urlManager);
 			}
@@ -366,7 +366,7 @@ 
 	 */
 	public function setUrlFormat($value)
 	{
-		$this->_urlFormat=TPropertyValue::ensureEnum($value,'THttpRequestUrlFormat');
+		$this->_urlFormat = TPropertyValue::ensureEnum($value, 'THttpRequestUrlFormat');
 	}
 
 	/**
@@ -383,8 +383,8 @@ 
 	 */
 	public function setUrlParamSeparator($value)
 	{
-		if(strlen($value)===1)
-			$this->_separator=$value;
+		if (strlen($value) === 1)
+			$this->_separator = $value;
 		else
 			throw new TInvalidDataValueException('httprequest_separator_invalid');
 	}
@@ -394,7 +394,7 @@ 
 	 */
 	public function getRequestType()
 	{
-		return isset($_SERVER['REQUEST_METHOD'])?$_SERVER['REQUEST_METHOD']:null;
+		return isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : null;
 	}
 
 	/**
@@ -403,10 +403,10 @@ 
 	 */
 	public function getContentType($mimetypeOnly = true)
 	{
-		if(!isset($_SERVER['CONTENT_TYPE']))
+		if (!isset($_SERVER['CONTENT_TYPE']))
 			return null;
 
-		if($mimetypeOnly === true && ($_pos = strpos(';', $_SERVER['CONTENT_TYPE'])) !== false)
+		if ($mimetypeOnly === true && ($_pos = strpos(';', $_SERVER['CONTENT_TYPE'])) !== false)
 			return substr($_SERVER['CONTENT_TYPE'], 0, $_pos);
 
 		return $_SERVER['CONTENT_TYPE'];
@@ -417,7 +417,7 @@ 
 	 */
 	public function getIsSecureConnection()
 	{
-			return isset($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'],'off');
+			return isset($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'], 'off');
 	}
 
 	/**
@@ -433,7 +433,7 @@ 
 	 */
 	public function getQueryString()
 	{
-		return isset($_SERVER['QUERY_STRING'])?$_SERVER['QUERY_STRING']:null;
+		return isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : null;
 	}
 
 	/**
@@ -441,30 +441,30 @@ 
 	 */
 	public function getHttpProtocolVersion()
 	{
-		return isset($_SERVER['SERVER_PROTOCOL'])?$_SERVER['SERVER_PROTOCOL']:null;
+		return isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : null;
 	}
 
 	/**
 	 * @param integer|null Either {@link CASE_UPPER} or {@link CASE_LOWER} or as is null (default)
 	 * @return array
 	 */
-	public function getHeaders($case=null)
+	public function getHeaders($case = null)
 	{
 		static $result;
 
-		if($result === null && function_exists('apache_request_headers')) {
+		if ($result === null && function_exists('apache_request_headers')) {
 			$result = apache_request_headers();
 		}
-		elseif($result === null) {
+		elseif ($result === null) {
 			$result = array();
-			foreach($_SERVER as $key=>$value) {
-				if(strncasecmp($key, 'HTTP_', 5) !== 0) continue;
-					$key = str_replace(' ','-', ucwords(strtolower(str_replace('_',' ', substr($key, 5)))));
+			foreach ($_SERVER as $key=>$value) {
+				if (strncasecmp($key, 'HTTP_', 5) !== 0) continue;
+					$key = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($key, 5)))));
 					$result[$key] = $value;
 			}
 		}
 
-		if($case !== null)
+		if ($case !== null)
 			return array_change_key_case($result, $case);
 
 		return $result;
@@ -485,13 +485,13 @@ 
 	 * 						false - force http
 	 * @return string schema and hostname of the requested URL
 	 */
-	public function getBaseUrl($forceSecureConnection=null)
+	public function getBaseUrl($forceSecureConnection = null)
 	{
-		$url=$this->getUrl();
-		$scheme=($forceSecureConnection)?"https": (($forceSecureConnection === null)?$url->getScheme():'http');
-		$host=$url->getHost();
-		if (($port=$url->getPort())) $host.=':'.$port;
-		return $scheme.'://'.$host;
+		$url = $this->getUrl();
+		$scheme = ($forceSecureConnection) ? "https" : (($forceSecureConnection === null) ? $url->getScheme() : 'http');
+		$host = $url->getHost();
+		if (($port = $url->getPort())) $host .= ':' . $port;
+		return $scheme . '://' . $host;
 	}
 
 	/**
@@ -499,10 +499,10 @@ 
 	 */
 	public function getApplicationUrl()
 	{
-		if($this->_cgiFix&self::CGIFIX__SCRIPT_NAME && isset($_SERVER['ORIG_SCRIPT_NAME']))
+		if ($this->_cgiFix & self::CGIFIX__SCRIPT_NAME && isset($_SERVER['ORIG_SCRIPT_NAME']))
 			return $_SERVER['ORIG_SCRIPT_NAME'];
 
-		return isset($_SERVER['SCRIPT_NAME'])?$_SERVER['SCRIPT_NAME']:null;
+		return isset($_SERVER['SCRIPT_NAME']) ? $_SERVER['SCRIPT_NAME'] : null;
 	}
 
 	/**
@@ -512,7 +512,7 @@ 
 	 * 						false - force http
 	 * @return string entry script URL (w/ host part)
 	 */
-	public function getAbsoluteApplicationUrl($forceSecureConnection=null)
+	public function getAbsoluteApplicationUrl($forceSecureConnection = null)
 	{
 		return $this->getBaseUrl($forceSecureConnection) . $this->getApplicationUrl();
 	}
@@ -522,7 +522,7 @@ 
 	 */
 	public function getApplicationFilePath()
 	{
-		return realpath(isset($_SERVER['SCRIPT_FILENAME'])?$_SERVER['SCRIPT_FILENAME']:null);
+		return realpath(isset($_SERVER['SCRIPT_FILENAME']) ? $_SERVER['SCRIPT_FILENAME'] : null);
 	}
 
 	/**
@@ -530,7 +530,7 @@ 
 	 */
 	public function getServerName()
 	{
-		return isset($_SERVER['SERVER_NAME'])?$_SERVER['SERVER_NAME']:null;
+		return isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : null;
 	}
 
 	/**
@@ -538,7 +538,7 @@ 
 	 */
 	public function getServerPort()
 	{
-		return isset($_SERVER['SERVER_PORT'])?$_SERVER['SERVER_PORT']:null;
+		return isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : null;
 	}
 
 	/**
@@ -546,7 +546,7 @@ 
 	 */
 	public function getUrlReferrer()
 	{
-		return isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:null;
+		return isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null;
 	}
 
 	/**
@@ -559,7 +559,7 @@ 
 		{
 			return get_browser();
 		}
-		catch(TPhpErrorException $e)
+		catch (TPhpErrorException $e)
 		{
 			throw new TConfigurationException('httprequest_browscap_required');
 		}
@@ -570,7 +570,7 @@ 
 	 */
 	public function getUserAgent()
 	{
-		return isset($_SERVER['HTTP_USER_AGENT'])?$_SERVER['HTTP_USER_AGENT']:null;
+		return isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : null;
 	}
 
 	/**
@@ -578,7 +578,7 @@ 
 	 */
 	public function getUserHostAddress()
 	{
-		return isset($_SERVER['REMOTE_ADDR'])?$_SERVER['REMOTE_ADDR']:null;
+		return isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : null;
 	}
 
 	/**
@@ -586,7 +586,7 @@ 
 	 */
 	public function getUserHost()
 	{
-		return isset($_SERVER['REMOTE_HOST'])?$_SERVER['REMOTE_HOST']:null;
+		return isset($_SERVER['REMOTE_HOST']) ? $_SERVER['REMOTE_HOST'] : null;
 	}
 
 	/**
@@ -595,7 +595,7 @@ 
 	public function getAcceptTypes()
 	{
 		// TBD: break it into array??
-		return isset($_SERVER['HTTP_ACCEPT'])?$_SERVER['HTTP_ACCEPT']:null;
+		return isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null;
 	}
 
 	/**
@@ -623,7 +623,7 @@ 
 	 */
 	public function setEnableCookieValidation($value)
 	{
-		$this->_enableCookieValidation=TPropertyValue::ensureBoolean($value);
+		$this->_enableCookieValidation = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -643,7 +643,7 @@ 
 	 */
 	public function setCgiFix($value)
 	{
-		$this->_cgiFix=TPropertyValue::ensureInteger($value);
+		$this->_cgiFix = TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -651,22 +651,22 @@ 
 	 */
 	public function getCookies()
 	{
-		if($this->_cookies===null)
+		if ($this->_cookies === null)
 		{
-			$this->_cookies=new THttpCookieCollection;
-			if($this->getEnableCookieValidation())
+			$this->_cookies = new THttpCookieCollection;
+			if ($this->getEnableCookieValidation())
 			{
-				$sm=$this->getApplication()->getSecurityManager();
-				foreach($_COOKIE as $key=>$value)
+				$sm = $this->getApplication()->getSecurityManager();
+				foreach ($_COOKIE as $key=>$value)
 				{
-					if(($value=$sm->validateData($value))!==false)
-						$this->_cookies->add(new THttpCookie($key,$value));
+					if (($value = $sm->validateData($value)) !== false)
+						$this->_cookies->add(new THttpCookie($key, $value));
 				}
 			}
 			else
 			{
-				foreach($_COOKIE as $key=>$value)
-					$this->_cookies->add(new THttpCookie($key,$value));
+				foreach ($_COOKIE as $key=>$value)
+					$this->_cookies->add(new THttpCookie($key, $value));
 			}
 		}
 		return $this->_cookies;
@@ -713,13 +713,13 @@ 
 	 * @return string URL
 	 * @see TUrlManager::constructUrl
 	 */
-	public function constructUrl($serviceID,$serviceParam,$getItems=null,$encodeAmpersand=true,$encodeGetItems=true)
+	public function constructUrl($serviceID, $serviceParam, $getItems = null, $encodeAmpersand = true, $encodeGetItems = true)
 	{
-		if ($this->_cookieOnly===null)
-				$this->_cookieOnly=(int)ini_get('session.use_cookies') && (int)ini_get('session.use_only_cookies');
-		$url=$this->getUrlManagerModule()->constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems);
-		if(defined('SID') && SID != '' && !$this->_cookieOnly)
-			return $url . (strpos($url,'?')===false? '?' : ($encodeAmpersand?'&':'&')) . SID;
+		if ($this->_cookieOnly === null)
+				$this->_cookieOnly = (int) ini_get('session.use_cookies') && (int) ini_get('session.use_only_cookies');
+		$url = $this->getUrlManagerModule()->constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems);
+		if (defined('SID') && SID != '' && !$this->_cookieOnly)
+			return $url . (strpos($url, '?') === false ? '?' : ($encodeAmpersand ? '&' : '&')) . SID;
 		else
 			return $url;
 	}
@@ -747,15 +747,15 @@ 
 	 */
 	public function resolveRequest($serviceIDs)
 	{
-		Prado::trace("Resolving request from ".$_SERVER['REMOTE_ADDR'],'System.Web.THttpRequest');
-		$getParams=$this->parseUrl();
-		foreach($getParams as $name=>$value)
-			$_GET[$name]=$value;
-		$this->_items=array_merge($_GET,$_POST);
-		$this->_requestResolved=true;
-		foreach($serviceIDs as $serviceID)
+		Prado::trace("Resolving request from " . $_SERVER['REMOTE_ADDR'], 'System.Web.THttpRequest');
+		$getParams = $this->parseUrl();
+		foreach ($getParams as $name=>$value)
+			$_GET[$name] = $value;
+		$this->_items = array_merge($_GET, $_POST);
+		$this->_requestResolved = true;
+		foreach ($serviceIDs as $serviceID)
 		{
-			if($this->contains($serviceID))
+			if ($this->contains($serviceID))
 			{
 				$this->setServiceID($serviceID);
 				$this->setServiceParameter($this->itemAt($serviceID));
@@ -787,7 +787,7 @@ 
 	 */
 	public function setServiceID($value)
 	{
-		$this->_serviceID=$value;
+		$this->_serviceID = $value;
 	}
 
 	/**
@@ -804,7 +804,7 @@ 
 	 */
 	public function setServiceParameter($value)
 	{
-		$this->_serviceParam=$value;
+		$this->_serviceParam = $value;
 	}
 
 	//------ The following methods enable THttpRequest to be TMap-like -----
@@ -862,9 +862,9 @@ 
 	 * @param mixed key
 	 * @param mixed value
 	 */
-	public function add($key,$value)
+	public function add($key, $value)
 	{
-		$this->_items[$key]=$value;
+		$this->_items[$key] = $value;
 	}
 
 	/**
@@ -875,9 +875,9 @@ 
 	 */
 	public function remove($key)
 	{
-		if(isset($this->_items[$key]) || array_key_exists($key,$this->_items))
+		if (isset($this->_items[$key]) || array_key_exists($key, $this->_items))
 		{
-			$value=$this->_items[$key];
+			$value = $this->_items[$key];
 			unset($this->_items[$key]);
 			return $value;
 		}
@@ -890,7 +890,7 @@ 
 	 */
 	public function clear()
 	{
-		foreach(array_keys($this->_items) as $key)
+		foreach (array_keys($this->_items) as $key)
 			$this->remove($key);
 	}
 
@@ -900,7 +900,7 @@ 
 	 */
 	public function contains($key)
 	{
-		return isset($this->_items[$key]) || array_key_exists($key,$this->_items);
+		return isset($this->_items[$key]) || array_key_exists($key, $this->_items);
 	}
 
 	/**
@@ -939,9 +939,9 @@ 
 	 * @param integer the offset to set element
 	 * @param mixed the element value
 	 */
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
-		$this->add($offset,$item);
+		$this->add($offset, $item);
 	}
 
 	/**
@@ -981,9 +981,9 @@ 
 	 * Constructor.
 	 * @param mixed owner of this collection.
 	 */
-	public function __construct($owner=null)
+	public function __construct($owner = null)
 	{
-		$this->_o=$owner;
+		$this->_o = $owner;
 	}
 
 	/**
@@ -994,12 +994,12 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a THttpCookie object.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
-		if($item instanceof THttpCookie)
+		if ($item instanceof THttpCookie)
 		{
-			parent::insertAt($index,$item);
-			if($this->_o instanceof THttpResponse)
+			parent::insertAt($index, $item);
+			if ($this->_o instanceof THttpResponse)
 				$this->_o->addCookie($item);
 		}
 		else
@@ -1015,8 +1015,8 @@ 
 	 */
 	public function removeAt($index)
 	{
-		$item=parent::removeAt($index);
-		if($this->_o instanceof THttpResponse)
+		$item = parent::removeAt($index);
+		if ($this->_o instanceof THttpResponse)
 			$this->_o->removeCookie($item);
 		return $item;
 	}
@@ -1027,7 +1027,7 @@ 
 	 */
 	public function itemAt($index)
 	{
-		if(is_integer($index))
+		if (is_integer($index))
 			return parent::itemAt($index);
 		else
 			return $this->findCookieByName($index);
@@ -1040,8 +1040,8 @@ 
 	 */
 	public function findCookieByName($name)
 	{
-		foreach($this as $cookie)
-			if($cookie->getName()===$name)
+		foreach ($this as $cookie)
+			if ($cookie->getName() === $name)
 				return $cookie;
 		return null;
 	}
@@ -1062,7 +1062,7 @@ 
 	/**
 	 * @var string domain of the cookie
 	 */
-	private $_domain='';
+	private $_domain = '';
 	/**
 	 * @var string name of the cookie
 	 */
@@ -1070,33 +1070,33 @@ 
 	/**
 	 * @var string value of the cookie
 	 */
-	private $_value='';
+	private $_value = '';
 	/**
 	 * @var integer expire of the cookie
 	 */
-	private $_expire=0;
+	private $_expire = 0;
 	/**
 	 * @var string path of the cookie
 	 */
-	private $_path='/';
+	private $_path = '/';
 	/**
 	 * @var boolean whether cookie should be sent via secure connection
 	 */
-	private $_secure=false;
+	private $_secure = false;
 	/**
 	 * @var boolean if true the cookie value will be unavailable to JavaScript
 	 */
-	private $_httpOnly=false;
+	private $_httpOnly = false;
 
 	/**
 	 * Constructor.
 	 * @param string name of this cookie
 	 * @param string value of this cookie
 	 */
-	public function __construct($name,$value)
+	public function __construct($name, $value)
 	{
-		$this->_name=$name;
-		$this->_value=$value;
+		$this->_name = $name;
+		$this->_value = $value;
 	}
 
 	/**
@@ -1112,7 +1112,7 @@ 
 	 */
 	public function setDomain($value)
 	{
-		$this->_domain=$value;
+		$this->_domain = $value;
 	}
 
 	/**
@@ -1128,7 +1128,7 @@ 
 	 */
 	public function setExpire($value)
 	{
-		$this->_expire=TPropertyValue::ensureInteger($value);
+		$this->_expire = TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -1160,7 +1160,7 @@ 
 	 */
 	public function setName($value)
 	{
-		$this->_name=$value;
+		$this->_name = $value;
 	}
 
 	/**
@@ -1176,7 +1176,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		$this->_value=$value;
+		$this->_value = $value;
 	}
 
 	/**
@@ -1192,7 +1192,7 @@ 
 	 */
 	public function setPath($value)
 	{
-		$this->_path=$value;
+		$this->_path = $value;
 	}
 
 	/**
@@ -1208,7 +1208,7 @@ 
 	 */
 	public function setSecure($value)
 	{
-		$this->_secure=TPropertyValue::ensureBoolean($value);
+		$this->_secure = TPropertyValue::ensureBoolean($value);
 	}
 }
 
@@ -1236,7 +1236,7 @@ 
 	/**
 	 * @var array list of default ports for known schemes
 	 */
-	private static $_defaultPort=array(
+	private static $_defaultPort = array(
 		'ftp'=>21,
 		'gopher'=>70,
 		'http'=>80,
@@ -1291,22 +1291,22 @@ 
 	 */
 	public function __construct($uri)
 	{
-		if(($ret=@parse_url($uri))!==false)
+		if (($ret = @parse_url($uri)) !== false)
 		{
 			// decoding???
-			$this->_scheme=isset($ret['scheme'])?$ret['scheme']:'';
-			$this->_host=isset($ret['host'])?$ret['host']:'';
-			$this->_port=isset($ret['port'])?$ret['port']:'';
-			$this->_user=isset($ret['user'])?$ret['user']:'';
-			$this->_pass=isset($ret['pass'])?$ret['pass']:'';
-			$this->_path=isset($ret['path'])?$ret['path']:'';
-			$this->_query=isset($ret['query'])?$ret['query']:'';
-			$this->_fragment=isset($ret['fragment'])?$ret['fragment']:'';
-			$this->_uri=$uri;
+			$this->_scheme = isset($ret['scheme']) ? $ret['scheme'] : '';
+			$this->_host = isset($ret['host']) ? $ret['host'] : '';
+			$this->_port = isset($ret['port']) ? $ret['port'] : '';
+			$this->_user = isset($ret['user']) ? $ret['user'] : '';
+			$this->_pass = isset($ret['pass']) ? $ret['pass'] : '';
+			$this->_path = isset($ret['path']) ? $ret['path'] : '';
+			$this->_query = isset($ret['query']) ? $ret['query'] : '';
+			$this->_fragment = isset($ret['fragment']) ? $ret['fragment'] : '';
+			$this->_uri = $uri;
 		}
 		else
 		{
-			throw new TInvalidDataValueException('uri_format_invalid',$uri);
+			throw new TInvalidDataValueException('uri_format_invalid', $uri);
 		}
 	}
 
@@ -1399,8 +1399,8 @@ 
  */
 class THttpRequestUrlFormat extends TEnumerable
 {
-	const Get='Get';
-	const Path='Path';
-	const HiddenPath='HiddenPath';
+	const Get = 'Get';
+	const Path = 'Path';
+	const HiddenPath = 'HiddenPath';
 }
 

Braces +109 added lines, -83 removed lines

@@ -169,30 +169,37 @@ 
 		// QUERY_STRING is the string following the '?' in the ur (eg the a=x part in http://foo/bar?a=x)
 		// REQUEST_URI contains the URI part entered in the browser address bar
 		// SCRIPT_FILENAME is the file path to the executing script
-		if(isset($_SERVER['REQUEST_URI']))
-			$this->_requestUri=$_SERVER['REQUEST_URI'];
-		else  // TBD: in this case, SCRIPT_NAME need to be escaped
+		if(isset($_SERVER['REQUEST_URI'])) {
+					$this->_requestUri=$_SERVER['REQUEST_URI'];
+		} else {
+			// TBD: in this case, SCRIPT_NAME need to be escaped
 			$this->_requestUri=$_SERVER['SCRIPT_NAME'].(empty($_SERVER['QUERY_STRING'])?'':'?'.$_SERVER['QUERY_STRING']);
+		}
 
-		if($this->_cgiFix&self::CGIFIX__PATH_INFO && isset($_SERVER['ORIG_PATH_INFO']))
-			$this->_pathInfo=substr($_SERVER['ORIG_PATH_INFO'], strlen($_SERVER['SCRIPT_NAME']));
-		elseif(isset($_SERVER['PATH_INFO']))
-			$this->_pathInfo=$_SERVER['PATH_INFO'];
-		else if(strpos($_SERVER['PHP_SELF'],$_SERVER['SCRIPT_NAME'])===0 && $_SERVER['PHP_SELF']!==$_SERVER['SCRIPT_NAME'])
-			$this->_pathInfo=substr($_SERVER['PHP_SELF'],strlen($_SERVER['SCRIPT_NAME']));
-		else
-			$this->_pathInfo='';
+		if($this->_cgiFix&self::CGIFIX__PATH_INFO && isset($_SERVER['ORIG_PATH_INFO'])) {
+					$this->_pathInfo=substr($_SERVER['ORIG_PATH_INFO'], strlen($_SERVER['SCRIPT_NAME']));
+		} elseif(isset($_SERVER['PATH_INFO'])) {
+					$this->_pathInfo=$_SERVER['PATH_INFO'];
+		} else if(strpos($_SERVER['PHP_SELF'],$_SERVER['SCRIPT_NAME'])===0 && $_SERVER['PHP_SELF']!==$_SERVER['SCRIPT_NAME']) {
+					$this->_pathInfo=substr($_SERVER['PHP_SELF'],strlen($_SERVER['SCRIPT_NAME']));
+		} else {
+					$this->_pathInfo='';
+		}
 
 		if(get_magic_quotes_gpc())
 		{
-			if(isset($_GET))
-				$_GET=$this->stripSlashes($_GET);
-			if(isset($_POST))
-				$_POST=$this->stripSlashes($_POST);
-			if(isset($_REQUEST))
-				$_REQUEST=$this->stripSlashes($_REQUEST);
-			if(isset($_COOKIE))
-				$_COOKIE=$this->stripSlashes($_COOKIE);
+			if(isset($_GET)) {
+							$_GET=$this->stripSlashes($_GET);
+			}
+			if(isset($_POST)) {
+							$_POST=$this->stripSlashes($_POST);
+			}
+			if(isset($_REQUEST)) {
+							$_REQUEST=$this->stripSlashes($_REQUEST);
+			}
+			if(isset($_COOKIE)) {
+							$_COOKIE=$this->stripSlashes($_COOKIE);
+			}
 		}
 
 		$this->getApplication()->setRequest($this);
@@ -222,11 +229,12 @@ 
 			{
 				$url.=$_SERVER['SERVER_NAME'];
 				$port=$_SERVER['SERVER_PORT'];
-				if(($port!=80 && !$secure) || ($port!=443 && $secure))
-					$url.=':'.$port;
+				if(($port!=80 && !$secure) || ($port!=443 && $secure)) {
+									$url.=':'.$port;
+				}
+			} else {
+							$url.=$_SERVER['HTTP_HOST'];
 			}
-			else
-				$url.=$_SERVER['HTTP_HOST'];
 			$url.=$this->getRequestUri();
 			$this->_url=new TUri($url);
 		}
@@ -268,10 +276,11 @@ 
 			if($cache !== null)
 			{
 				$dependencies = null;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
-					if ($manager instanceof TUrlMapping && $fn = $manager->getConfigFile())
+				if($this->getApplication()->getMode() !== TApplicationMode::Performance) {
+									if ($manager instanceof TUrlMapping && $fn = $manager->getConfigFile())
 					{
 						$fn = Prado::getPathOfNamespace($fn,$this->getApplication()->getConfigurationFileExt());
+				}
 						$dependencies = new TFileCacheDependency($fn);
 					}
 				return $cache->set($this->getCacheKey(), $manager, 0, $dependencies);
@@ -292,8 +301,9 @@ 
 			if($cache !== null)
 			{
 				$manager = $cache->get($this->getCacheKey());
-				if($manager instanceof TUrlManager)
-					return $manager;
+				if($manager instanceof TUrlManager) {
+									return $manager;
+				}
 			}
 		}
 		return null;
@@ -333,14 +343,15 @@ 
 				{
 					$this->_urlManager=new TUrlManager;
 					$this->_urlManager->init(null);
-				}
-				else
+				} else
 				{
 					$this->_urlManager=$this->getApplication()->getModule($this->_urlManagerID);
-					if($this->_urlManager===null)
-						throw new TConfigurationException('httprequest_urlmanager_inexist',$this->_urlManagerID);
-					if(!($this->_urlManager instanceof TUrlManager))
-						throw new TConfigurationException('httprequest_urlmanager_invalid',$this->_urlManagerID);
+					if($this->_urlManager===null) {
+											throw new TConfigurationException('httprequest_urlmanager_inexist',$this->_urlManagerID);
+					}
+					if(!($this->_urlManager instanceof TUrlManager)) {
+											throw new TConfigurationException('httprequest_urlmanager_invalid',$this->_urlManagerID);
+					}
 				}
 				$this->cacheUrlManager($this->_urlManager);
 			}
@@ -383,10 +394,11 @@ 
 	 */
 	public function setUrlParamSeparator($value)
 	{
-		if(strlen($value)===1)
-			$this->_separator=$value;
-		else
-			throw new TInvalidDataValueException('httprequest_separator_invalid');
+		if(strlen($value)===1) {
+					$this->_separator=$value;
+		} else {
+					throw new TInvalidDataValueException('httprequest_separator_invalid');
+		}
 	}
 
 	/**
@@ -403,11 +415,13 @@ 
 	 */
 	public function getContentType($mimetypeOnly = true)
 	{
-		if(!isset($_SERVER['CONTENT_TYPE']))
-			return null;
+		if(!isset($_SERVER['CONTENT_TYPE'])) {
+					return null;
+		}
 
-		if($mimetypeOnly === true && ($_pos = strpos(';', $_SERVER['CONTENT_TYPE'])) !== false)
-			return substr($_SERVER['CONTENT_TYPE'], 0, $_pos);
+		if($mimetypeOnly === true && ($_pos = strpos(';', $_SERVER['CONTENT_TYPE'])) !== false) {
+					return substr($_SERVER['CONTENT_TYPE'], 0, $_pos);
+		}
 
 		return $_SERVER['CONTENT_TYPE'];
 	}
@@ -454,18 +468,20 @@ 
 
 		if($result === null && function_exists('apache_request_headers')) {
 			$result = apache_request_headers();
-		}
-		elseif($result === null) {
+		} elseif($result === null) {
 			$result = array();
 			foreach($_SERVER as $key=>$value) {
-				if(strncasecmp($key, 'HTTP_', 5) !== 0) continue;
+				if(strncasecmp($key, 'HTTP_', 5) !== 0) {
+					continue;
+				}
 					$key = str_replace(' ','-', ucwords(strtolower(str_replace('_',' ', substr($key, 5)))));
 					$result[$key] = $value;
 			}
 		}
 
-		if($case !== null)
-			return array_change_key_case($result, $case);
+		if($case !== null) {
+					return array_change_key_case($result, $case);
+		}
 
 		return $result;
 	}
@@ -490,7 +506,9 @@ 
 		$url=$this->getUrl();
 		$scheme=($forceSecureConnection)?"https": (($forceSecureConnection === null)?$url->getScheme():'http');
 		$host=$url->getHost();
-		if (($port=$url->getPort())) $host.=':'.$port;
+		if (($port=$url->getPort())) {
+			$host.=':'.$port;
+		}
 		return $scheme.'://'.$host;
 	}
 
@@ -499,8 +517,9 @@ 
 	 */
 	public function getApplicationUrl()
 	{
-		if($this->_cgiFix&self::CGIFIX__SCRIPT_NAME && isset($_SERVER['ORIG_SCRIPT_NAME']))
-			return $_SERVER['ORIG_SCRIPT_NAME'];
+		if($this->_cgiFix&self::CGIFIX__SCRIPT_NAME && isset($_SERVER['ORIG_SCRIPT_NAME'])) {
+					return $_SERVER['ORIG_SCRIPT_NAME'];
+		}
 
 		return isset($_SERVER['SCRIPT_NAME'])?$_SERVER['SCRIPT_NAME']:null;
 	}
@@ -558,8 +577,7 @@ 
 		try
 		{
 			return get_browser();
-		}
-		catch(TPhpErrorException $e)
+		} catch(TPhpErrorException $e)
 		{
 			throw new TConfigurationException('httprequest_browscap_required');
 		}
@@ -659,14 +677,15 @@ 
 				$sm=$this->getApplication()->getSecurityManager();
 				foreach($_COOKIE as $key=>$value)
 				{
-					if(($value=$sm->validateData($value))!==false)
-						$this->_cookies->add(new THttpCookie($key,$value));
+					if(($value=$sm->validateData($value))!==false) {
+											$this->_cookies->add(new THttpCookie($key,$value));
+					}
 				}
-			}
-			else
+			} else
 			{
-				foreach($_COOKIE as $key=>$value)
-					$this->_cookies->add(new THttpCookie($key,$value));
+				foreach($_COOKIE as $key=>$value) {
+									$this->_cookies->add(new THttpCookie($key,$value));
+				}
 			}
 		}
 		return $this->_cookies;
@@ -715,13 +734,15 @@ 
 	 */
 	public function constructUrl($serviceID,$serviceParam,$getItems=null,$encodeAmpersand=true,$encodeGetItems=true)
 	{
-		if ($this->_cookieOnly===null)
-				$this->_cookieOnly=(int)ini_get('session.use_cookies') && (int)ini_get('session.use_only_cookies');
+		if ($this->_cookieOnly===null) {
+						$this->_cookieOnly=(int)ini_get('session.use_cookies') && (int)ini_get('session.use_only_cookies');
+		}
 		$url=$this->getUrlManagerModule()->constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems);
-		if(defined('SID') && SID != '' && !$this->_cookieOnly)
-			return $url . (strpos($url,'?')===false? '?' : ($encodeAmpersand?'&':'&')) . SID;
-		else
-			return $url;
+		if(defined('SID') && SID != '' && !$this->_cookieOnly) {
+					return $url . (strpos($url,'?')===false? '?' : ($encodeAmpersand?'&':'&')) . SID;
+		} else {
+					return $url;
+		}
 	}
 
 	/**
@@ -749,8 +770,9 @@ 
 	{
 		Prado::trace("Resolving request from ".$_SERVER['REMOTE_ADDR'],'System.Web.THttpRequest');
 		$getParams=$this->parseUrl();
-		foreach($getParams as $name=>$value)
-			$_GET[$name]=$value;
+		foreach($getParams as $name=>$value) {
+					$_GET[$name]=$value;
+		}
 		$this->_items=array_merge($_GET,$_POST);
 		$this->_requestResolved=true;
 		foreach($serviceIDs as $serviceID)
@@ -880,9 +902,9 @@ 
 			$value=$this->_items[$key];
 			unset($this->_items[$key]);
 			return $value;
+		} else {
+					return null;
 		}
-		else
-			return null;
 	}
 
 	/**
@@ -890,8 +912,9 @@ 
 	 */
 	public function clear()
 	{
-		foreach(array_keys($this->_items) as $key)
-			$this->remove($key);
+		foreach(array_keys($this->_items) as $key) {
+					$this->remove($key);
+		}
 	}
 
 	/**
@@ -999,11 +1022,12 @@ 
 		if($item instanceof THttpCookie)
 		{
 			parent::insertAt($index,$item);
-			if($this->_o instanceof THttpResponse)
-				$this->_o->addCookie($item);
+			if($this->_o instanceof THttpResponse) {
+							$this->_o->addCookie($item);
+			}
+		} else {
+					throw new TInvalidDataTypeException('httpcookiecollection_httpcookie_required');
 		}
-		else
-			throw new TInvalidDataTypeException('httpcookiecollection_httpcookie_required');
 	}
 
 	/**
@@ -1016,8 +1040,9 @@ 
 	public function removeAt($index)
 	{
 		$item=parent::removeAt($index);
-		if($this->_o instanceof THttpResponse)
-			$this->_o->removeCookie($item);
+		if($this->_o instanceof THttpResponse) {
+					$this->_o->removeCookie($item);
+		}
 		return $item;
 	}
 
@@ -1027,10 +1052,11 @@ 
 	 */
 	public function itemAt($index)
 	{
-		if(is_integer($index))
-			return parent::itemAt($index);
-		else
-			return $this->findCookieByName($index);
+		if(is_integer($index)) {
+					return parent::itemAt($index);
+		} else {
+					return $this->findCookieByName($index);
+		}
 	}
 
 	/**
@@ -1040,9 +1066,10 @@ 
 	 */
 	public function findCookieByName($name)
 	{
-		foreach($this as $cookie)
-			if($cookie->getName()===$name)
+		foreach($this as $cookie) {
+					if($cookie->getName()===$name)
 				return $cookie;
+		}
 		return null;
 	}
 }
@@ -1303,8 +1330,7 @@ 
 			$this->_query=isset($ret['query'])?$ret['query']:'';
 			$this->_fragment=isset($ret['fragment'])?$ret['fragment']:'';
 			$this->_uri=$uri;
-		}
-		else
+		} else
 		{
 			throw new TInvalidDataValueException('uri_format_invalid',$uri);
 		}