pradosoft / prado

framework/Web/Javascripts/packages.php

Spacing +7 added lines, -7 removed lines

@@ -3,13 +3,13 @@ 
 //$Id: packages.php 3319 2013-09-08 20:59:44Z ctrlaltca $
 
 // To make future upgrades easier
-if (!defined('PROTOTYPE_DIR')) define ('PROTOTYPE_DIR', 'prototype-1.7');
-if (!defined('JQUERY_DIR')) define ('JQUERY_DIR', 'jquery');
-if (!defined('BOOTSTRAP_DIR')) define ('BOOTSTRAP_DIR', 'bootstrap3');
-if (!defined('SCRIPTACULOUS_DIR')) define ('SCRIPTACULOUS_DIR', 'scriptaculous-1.9.0');
+if(!defined('PROTOTYPE_DIR')) define('PROTOTYPE_DIR', 'prototype-1.7');
+if(!defined('JQUERY_DIR')) define('JQUERY_DIR', 'jquery');
+if(!defined('BOOTSTRAP_DIR')) define('BOOTSTRAP_DIR', 'bootstrap3');
+if(!defined('SCRIPTACULOUS_DIR')) define('SCRIPTACULOUS_DIR', 'scriptaculous-1.9.0');
 
 //package names and its contents (files relative to the current directory)
-$packages = array(
+$packages=array(
 	// base prado scripts
 	'prado' => array(
 		'prado/prado.js',
@@ -115,7 +115,7 @@ 
 
 
 //package names and their dependencies
-$dependencies = array(
+$dependencies=array(
 		'jquery'			=> array('jquery'),
 		'prado'				=> array('jquery', 'prado'),
 		'bootstrap'			=> array('jquery', 'bootstrap'),
@@ -138,7 +138,7 @@ 
 		'jqueryui'			=> array('jquery', 'jqueryui'),
 		'prototype'			=> array('prototype'),
 		'dragdrop'			=> array('prototype', 'jquery', 'prado', 'ajax', 'dragdrop'),
-		'dragdropextra'		=> array('prototype', 'jquery', 'prado', 'ajax', 'dragdrop','dragdropextra'),
+		'dragdropextra'		=> array('prototype', 'jquery', 'prado', 'ajax', 'dragdrop', 'dragdropextra'),
 		'autocomplete'		=> array('prototype', 'jquery', 'prado', 'ajax', 'autocomplete'),
 );
 

framework/Web/Javascripts/TJavaScript.php

Spacing +24 added lines, -24 removed lines

@@ -30,7 +30,7 @@ 
 	{
 		$str='';
 		foreach($files as $file)
-			$str.= self::renderScriptFile($file);
+			$str.=self::renderScriptFile($file);
 		return $str;
 	}
 
@@ -52,7 +52,7 @@ 
 	public static function renderScriptBlocks($scripts)
 	{
 		if(count($scripts))
-			return "<script type=\"text/javascript\">\n/*<![CDATA[*/\n".implode("\n",$scripts)."\n/*]]>*/\n</script>\n";
+			return "<script type=\"text/javascript\">\n/*<![CDATA[*/\n".implode("\n", $scripts)."\n/*]]>*/\n</script>\n";
 		else
 			return '';
 	}
@@ -65,7 +65,7 @@ 
 	public static function renderScriptBlocksCallback($scripts)
 	{
 		if(count($scripts))
-			return implode("\n",$scripts)."\n";
+			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);
 	}
 
 	/**
@@ -150,16 +150,16 @@ 
 	 * @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))
 			return self::quoteString($value);
 		else if(is_bool($value))
-			return $value?'true':'false';
+			return $value ? 'true' : 'false';
 		else if(is_array($value))
 		{
 			$results='';
-			if(($n=count($value))>0 && array_keys($value)!==range(0,$n-1))
+			if(($n=count($value)) > 0 && array_keys($value)!==range(0, $n - 1))
 			{
 				foreach($value as $k=>$v)
 				{
@@ -167,7 +167,7 @@ 
 					{
 						if($results!=='')
 							$results.=',';
-						$results.="'$k':".self::encode($v,$toMap,$encodeEmptyStrings);
+						$results.="'$k':".self::encode($v, $toMap, $encodeEmptyStrings);
 					}
 				}
 				return '{'.$results.'}';
@@ -180,7 +180,7 @@ 
 					{
 						if($results!=='')
 							$results.=',';
-						$results.=self::encode($v,$toMap, $encodeEmptyStrings);
+						$results.=self::encode($v, $toMap, $encodeEmptyStrings);
 					}
 				}
 				return '['.$results.']';
@@ -208,10 +208,10 @@ 
 			}
 		}
 		else if(is_object($value))
-			if ($value instanceof TJavaScriptLiteral)
+			if($value instanceof TJavaScriptLiteral)
 				return $value->toJavaScriptLiteral();
 			else
-				return self::encode(get_object_vars($value),$toMap);
+				return self::encode(get_object_vars($value), $toMap);
 		else if($value===null)
 			return 'null';
 		else
@@ -223,14 +223,14 @@ 
 	 * @param mixed variable to be encoded
 	 * @return string encoded string
 	 */
-	public static function jsonEncode($value, $options = 0)
+	public static function jsonEncode($value, $options=0)
 	{
-		if (($g=Prado::getApplication()->getGlobalization(false))!==null &&
+		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;
 	}
@@ -243,7 +243,7 @@ 
 	private static function convertToUtf8(&$value, $sourceEncoding) {
 		if(is_string($value))
 			$value=iconv($sourceEncoding, 'UTF-8', $value);
-		else if (is_array($value))
+		else if(is_array($value))
 		{
 			foreach($value as &$element)
 				self::convertToUtf8($element, $sourceEncoding);
@@ -258,37 +258,37 @@ 
 	 * @param int recursion depth
 	 * @return mixed decoded variable
 	 */
-	public static function jsonDecode($value, $assoc = false, $depth = 512)
+	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;
 	}
 
 	private static function checkJsonError()
 	{
-		switch ($err = json_last_error())
+		switch($err=json_last_error())
 		{
 			case JSON_ERROR_NONE:
 				return;
 				break;
 			case JSON_ERROR_DEPTH:
-				$msg = 'Maximum stack depth exceeded';
+				$msg='Maximum stack depth exceeded';
 				break;
 			case JSON_ERROR_STATE_MISMATCH:
-				$msg = 'Underflow or the modes mismatch';
+				$msg='Underflow or the modes mismatch';
 				break;
 			case JSON_ERROR_CTRL_CHAR:
-				$msg = 'Unexpected control character found';
+				$msg='Unexpected control character found';
 				break;
 			case JSON_ERROR_SYNTAX:
-				$msg = 'Syntax error, malformed JSON';
+				$msg='Syntax error, malformed JSON';
 				break;
 			case JSON_ERROR_UTF8:
-				$msg = 'Malformed UTF-8 characters, possibly incorrectly encoded';
+				$msg='Malformed UTF-8 characters, possibly incorrectly encoded';
 				break;
 			default:
-				$msg = 'Unknown error';
+				$msg='Unknown error';
 				break;
 		}
 		throw new Exception("JSON error ($err): $msg");

framework/Web/Javascripts/JSMin.php

Spacing +66 added lines, -66 removed lines

@@ -46,29 +46,29 @@ 
  */
 
 class JSMin {
-  const ORD_LF    = 10;
-  const ORD_SPACE = 32;
+  const ORD_LF=10;
+  const ORD_SPACE=32;
 
-  protected $a           = '';
-  protected $b           = '';
-  protected $input       = '';
-  protected $inputIndex  = 0;
-  protected $inputLength = 0;
-  protected $lookAhead   = null;
-  protected $output      = '';
+  protected $a='';
+  protected $b='';
+  protected $input='';
+  protected $inputIndex=0;
+  protected $inputLength=0;
+  protected $lookAhead=null;
+  protected $output='';
 
   // -- Public Static Methods --------------------------------------------------
 
   public static function minify($js) {
-    $jsmin = new JSMin($js);
+    $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 ---------------------------------------------
@@ -76,80 +76,80 @@ 
   protected function action($d) {
     switch($d) {
       case 1:
-        $this->output .= $this->a;
+        $this->output.=$this->a;
 
       case 2:
-        $this->a = $this->b;
+        $this->a=$this->b;
 
-        if ($this->a === "'" || $this->a === '"') {
-          for (;;) {
-            $this->output .= $this->a;
-            $this->a       = $this->get();
+        if($this->a==="'" || $this->a==='"') {
+          for(;;) {
+            $this->output.=$this->a;
+            $this->a=$this->get();
 
-            if ($this->a === $this->b) {
+            if($this->a===$this->b) {
               break;
             }
 
-            if (ord($this->a) <= self::ORD_LF) {
+            if(ord($this->a) <= self::ORD_LF) {
               throw new JSMinException('Unterminated string literal.');
             }
 
-            if ($this->a === '\\') {
-              $this->output .= $this->a;
-              $this->a       = $this->get();
+            if($this->a==='\\') {
+              $this->output.=$this->a;
+              $this->a=$this->get();
             }
           }
         }
 
       case 3:
-        $this->b = $this->next();
+        $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 === '?')) {
+        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;
+          $this->output.=$this->a.$this->b;
 
-          for (;;) {
-            $this->a = $this->get();
+          for(;;) {
+            $this->a=$this->get();
 
-            if ($this->a === '/') {
+            if($this->a==='/') {
               break;
-            } elseif ($this->a === '\\') {
-              $this->output .= $this->a;
-              $this->a       = $this->get();
-            } elseif (ord($this->a) <= self::ORD_LF) {
+            } 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->output.=$this->a;
           }
 
-          $this->b = $this->next();
+          $this->b=$this->next();
         }
     }
   }
 
   protected function get() {
-    $c = $this->lookAhead;
-    $this->lookAhead = null;
+    $c=$this->lookAhead;
+    $this->lookAhead=null;
 
-    if ($c === null) {
-      if ($this->inputIndex < $this->inputLength) {
-        $c = $this->input[$this->inputIndex];
-        $this->inputIndex += 1;
+    if($c===null) {
+      if($this->inputIndex < $this->inputLength) {
+        $c=$this->input[$this->inputIndex];
+        $this->inputIndex+=1;
       } else {
-        $c = null;
+        $c=null;
       }
     }
 
-    if ($c === "\r") {
+    if($c==="\r") {
       return "\n";
     }
 
-    if ($c === null || $c === "\n" || ord($c) >= self::ORD_SPACE) {
+    if($c===null || $c==="\n" || ord($c) >= self::ORD_SPACE) {
       return $c;
     }
 
@@ -157,17 +157,17 @@ 
   }
 
   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->a="\n";
     $this->action(3);
 
-    while ($this->a !== null) {
-      switch ($this->a) {
+    while($this->a!==null) {
+      switch($this->a) {
         case ' ':
-          if ($this->isAlphaNum($this->b)) {
+          if($this->isAlphaNum($this->b)) {
             $this->action(1);
           } else {
             $this->action(2);
@@ -175,7 +175,7 @@ 
           break;
 
         case "\n":
-          switch ($this->b) {
+          switch($this->b) {
             case '{':
             case '[':
             case '(':
@@ -189,7 +189,7 @@ 
               break;
 
             default:
-              if ($this->isAlphaNum($this->b)) {
+              if($this->isAlphaNum($this->b)) {
                 $this->action(1);
               }
               else {
@@ -199,9 +199,9 @@ 
           break;
 
         default:
-          switch ($this->b) {
+          switch($this->b) {
             case ' ':
-              if ($this->isAlphaNum($this->a)) {
+              if($this->isAlphaNum($this->a)) {
                 $this->action(1);
                 break;
               }
@@ -210,7 +210,7 @@ 
               break;
 
             case "\n":
-              switch ($this->a) {
+              switch($this->a) {
                 case '}':
                 case ']':
                 case ')':
@@ -222,7 +222,7 @@ 
                   break;
 
                 default:
-                  if ($this->isAlphaNum($this->a)) {
+                  if($this->isAlphaNum($this->a)) {
                     $this->action(1);
                   }
                   else {
@@ -242,15 +242,15 @@ 
   }
 
   protected function next() {
-    $c = $this->get();
+    $c=$this->get();
 
-    if ($c === '/') {
+    if($c==='/') {
       switch($this->peek()) {
         case '/':
-          for (;;) {
-            $c = $this->get();
+          for(;;) {
+            $c=$this->get();
 
-            if (ord($c) <= self::ORD_LF) {
+            if(ord($c) <= self::ORD_LF) {
               return $c;
             }
           }
@@ -258,10 +258,10 @@ 
         case '*':
           $this->get();
 
-          for (;;) {
+          for(;;) {
             switch($this->get()) {
               case '*':
-                if ($this->peek() === '/') {
+                if($this->peek()==='/') {
                   $this->get();
                   return ' ';
                 }
@@ -281,7 +281,7 @@ 
   }
 
   protected function peek() {
-    $this->lookAhead = $this->get();
+    $this->lookAhead=$this->get();
     return $this->lookAhead;
   }
 }

framework/Web/TUrlManager.php

Spacing +11 added lines, -11 removed lines

@@ -64,10 +64,10 @@ 
 	 * @return string URL
 	 * @see parseUrl
 	 */
-	public function constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems)
+	public function constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems)
 	{
 		$url=$serviceID.'='.urlencode($serviceParam);
-		$amp=$encodeAmpersand?'&':'&';
+		$amp=$encodeAmpersand ? '&' : '&';
 		$request=$this->getRequest();
 		if(is_array($getItems) || $getItems instanceof Traversable)
 		{
@@ -103,9 +103,9 @@ 
 		switch($request->getUrlFormat())
 		{
 			case THttpRequestUrlFormat::Path:
-				return $request->getApplicationUrl().'/'.strtr($url,array($amp=>'/','?'=>'/','='=>$request->getUrlParamSeparator()));
+				return $request->getApplicationUrl().'/'.strtr($url, array($amp=>'/', '?'=>'/', '='=>$request->getUrlParamSeparator()));
 			case THttpRequestUrlFormat::HiddenPath:
-				return rtrim(dirname($request->getApplicationUrl()), '/').'/'.strtr($url,array($amp=>'/','?'=>'/','='=>$request->getUrlParamSeparator()));
+				return rtrim(dirname($request->getApplicationUrl()), '/').'/'.strtr($url, array($amp=>'/', '?'=>'/', '='=>$request->getUrlParamSeparator()));
 			default:
 				return $request->getApplicationUrl().'?'.$url;
 		}
@@ -127,24 +127,24 @@ 
 	public function parseUrl()
 	{
 		$request=$this->getRequest();
-		$pathInfo=trim($request->getPathInfo(),'/');
+		$pathInfo=trim($request->getPathInfo(), '/');
 		if(($request->getUrlFormat()===THttpRequestUrlFormat::Path ||
 			$request->getUrlFormat()===THttpRequestUrlFormat::HiddenPath) &&
 			$pathInfo!=='')
 		{
 			$separator=$request->getUrlParamSeparator();
-			$paths=explode('/',$pathInfo);
+			$paths=explode('/', $pathInfo);
 			$getVariables=array();
 			foreach($paths as $path)
 			{
 				if(($path=trim($path))!=='')
 				{
-					if(($pos=strpos($path,$separator))!==false)
+					if(($pos=strpos($path, $separator))!==false)
 					{
-						$name=substr($path,0,$pos);
-						$value=substr($path,$pos+1);
-						if(($pos=strpos($name,'[]'))!==false)
-							$getVariables[substr($name,0,$pos)][]=$value;
+						$name=substr($path, 0, $pos);
+						$value=substr($path, $pos + 1);
+						if(($pos=strpos($name, '[]'))!==false)
+							$getVariables[substr($name, 0, $pos)][]=$value;
 						else
 							$getVariables[$name]=$value;
 					}

framework/Web/THttpResponseAdapter.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 	 */
 	public function createNewHtmlWriter($type, $writer)
 	{
-		return $this->_response->createNewHtmlWriter($type,$writer);
+		return $this->_response->createNewHtmlWriter($type, $writer);
 	}
 }
 

framework/Web/Services/TRpcService.php

Spacing +40 added lines, -40 removed lines

@@ -59,17 +59,17 @@ 
 	/**
 	 * const string base api provider class which every API must extend
 	 */
-	const BASE_API_PROVIDER = 'TRpcApiProvider';
+	const BASE_API_PROVIDER='TRpcApiProvider';
 
 	/**
 	 * const string base RPC server implementation
 	 */
-	const BASE_RPC_SERVER = 'TRpcServer';
+	const BASE_RPC_SERVER='TRpcServer';
 
 	/**
 	 * @var array containing mimetype to protocol handler mappings
 	 */
-	protected $protocolHandlers = array(
+	protected $protocolHandlers=array(
 		'application/json' => 'TJsonRpcProtocol',
 		'text/xml' => 'TXmlRpcProtocol'
 	);
@@ -77,7 +77,7 @@ 
 	/**
 	 * @var array containing API provider and their configured properties
 	 */
-	protected $apiProviders = array();
+	protected $apiProviders=array();
 
 	// methods
 
@@ -88,27 +88,27 @@ 
 	 */
 	public function createApiProvider(TRpcProtocol $protocolHandler, $providerId)
 	{
-		$_properties = $this->apiProviders[$providerId];
+		$_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;
+		$_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(($_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;
+		$_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');
 
-		$_apiProvider = new $_providerClassName(new $_rpcServerClassName($protocolHandler));
+		$_apiProvider=new $_providerClassName(new $_rpcServerClassName($protocolHandler));
 		$_apiProvider->setId($providerId);
 
 		foreach($_properties as $_key => $_value)
@@ -134,15 +134,15 @@ 
 	{
 		foreach($xml->getElementsByTagName('rpcapi') as $_apiProviderXml)
 		{
-			$_properties = $_apiProviderXml->getAttributes();
+			$_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]))
 				throw new TConfigurationException('rpcservice_apiproviderid_duplicated');
 
-			$this->apiProviders[$_id] = $_properties;
+			$this->apiProviders[$_id]=$_properties;
 		}
 	}
 
@@ -151,26 +151,26 @@ 
 	 */
 	public function run()
 	{
-		$_request = $this->getRequest();
+		$_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')
+		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)))
 			throw new THttpException(406, 'Unsupported Content-Type!'); // TODO see previous
 
-		$_protocolHandlerClass = $this->protocolHandlers[$_mimeType];
-		$_protocolHandler = new $_protocolHandlerClass;
+		$_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();
+			$_response=$this->getResponse();
 			$_protocolHandler->createResponseHeaders($_response);
 			$_response->write($_result);
 		}
@@ -206,7 +206,7 @@ 
 	 */
 	public function __construct(TRpcProtocol $protocolHandler)
 	{
-		$this->handler = $protocolHandler;
+		$this->handler=$protocolHandler;
 	}
 	
 	/**
@@ -258,7 +258,7 @@ 
  */
 class TRpcException extends TException
 {
-	public function __construct($message, $errorCode = -1)
+	public function __construct($message, $errorCode=-1)
 	{
 		$this->setErrorCode($errorCode);
 
@@ -318,7 +318,7 @@ 
 	 */
 	public function __construct(TRpcServer $rpcServer)
 	{
-		$this->rpcServer = $rpcServer;
+		$this->rpcServer=$rpcServer;
 
 		foreach($this->registerMethods() as $_methodName => $_methodDetails)
 			$this->rpcServer->addRpcMethod($_methodName, $_methodDetails);
@@ -359,7 +359,7 @@ 
 	/**
 	 * @var array containing the mapping from RPC method names to the actual handlers
 	 */
-	protected $rpcMethods = array();
+	protected $rpcMethods=array();
 
 	// abstracts
 
@@ -407,7 +407,7 @@ 
 	 */
 	public function addMethod($methodName, $handlerDetails)
 	{
-		$this->rpcMethods[$methodName] = $handlerDetails;
+		$this->rpcMethods[$methodName]=$handlerDetails;
 	}
 
 	/**
@@ -421,11 +421,11 @@ 
 		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);
+			$parameters=array($parameters);
 		return call_user_func_array($this->rpcMethods[$methodName]['method'], $parameters);
 	}
 }
@@ -457,7 +457,7 @@ 
 	{
 		try
 		{
-			$_request = $this->decode($requestPayload);
+			$_request=$this->decode($requestPayload);
 
 			if(isset($_request['jsonrpc']))
 			{
@@ -473,15 +473,15 @@ 
 					throw new TRpcException('Missing request method', '-32600');
 
 			if(!isset($_request['params']))
-				$parameters = array();
+				$parameters=array();
 			else
-				$parameters = $_request['params'];
+				$parameters=$_request['params'];
 
 			if(!is_array($parameters))
-				$parameters = 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)
 				{
@@ -560,7 +560,7 @@ 
 	 */
 	public function decode($data)
 	{
-		$s = json_decode($data, true);
+		$s=json_decode($data, true);
 		self::checkJsonError();
 		return $s;
 	}
@@ -572,15 +572,15 @@ 
 	 */
 	public function encode($data)
 	{
-		$s = json_encode($data);
+		$s=json_encode($data);
 		self::checkJsonError();
 		return $s;		
 	}
 
 	private static function checkJsonError()
 	{
-		$errnum = json_last_error();
-		if($errnum != JSON_ERROR_NONE)
+		$errnum=json_last_error();
+		if($errnum!=JSON_ERROR_NONE)
 			throw new Exception("JSON error: $msg", $err);
 	}
 
@@ -625,7 +625,7 @@ 
 	 */
 	public function __construct()
 	{
-		$this->_xmlrpcServer = xmlrpc_server_create();
+		$this->_xmlrpcServer=xmlrpc_server_create();
 	}
 
 	/**

framework/Web/Services/TPageService.php

Spacing +94 added lines, -94 removed lines

@@ -147,7 +147,7 @@ 
 	 */
 	public function init($config)
 	{
-		Prado::trace("Initializing TPageService",'System.Web.Services.TPageService');
+		Prado::trace("Initializing TPageService", 'System.Web.Services.TPageService');
 
 		$pageConfig=$this->loadPageConfig($config);
 
@@ -185,15 +185,15 @@ 
 		// external configurations
 		foreach($config->getExternalConfigurations() as $filePath=>$params)
 		{
-			list($configPagePath,$condition)=$params;
+			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);
+				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);
+				$c->loadFromFile($path, $configPagePath);
 				$this->applyConfiguration($c);
 			}
 		}
@@ -227,9 +227,9 @@ 
 			if($config!==null)
 			{
 				if($application->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
-					$pageConfig->loadPageConfigurationFromPhp($config,$application->getBasePath(),'');
+					$pageConfig->loadPageConfigurationFromPhp($config, $application->getBasePath(), '');
 				else
-					$pageConfig->loadPageConfigurationFromXml($config,$application->getBasePath(),'');
+					$pageConfig->loadPageConfigurationFromXml($config, $application->getBasePath(), '');
 			}
 			$pageConfig->loadFromFiles($this->getBasePath());
 		}
@@ -240,7 +240,7 @@ 
 			$arr=$cache->get(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath);
 			if(is_array($arr))
 			{
-				list($pageConfig,$timestamps)=$arr;
+				list($pageConfig, $timestamps)=$arr;
 				if($application->getMode()!==TApplicationMode::Performance)
 				{
 					foreach($timestamps as $fileName=>$timestamp)
@@ -248,14 +248,14 @@ 
 						if($fileName===0) // application config file
 						{
 							$appConfigFile=$application->getConfigurationFile();
-							$currentTimestamp[0]=$appConfigFile===null?0:@filemtime($appConfigFile);
-							if($currentTimestamp[0]>$timestamp || ($timestamp>0 && !$currentTimestamp[0]))
+							$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]))
+							if($currentTimestamp[$fileName] > $timestamp || ($timestamp > 0 && !$currentTimestamp[$fileName]))
 								$configCached=false;
 						}
 					}
@@ -264,9 +264,9 @@ 
 			else
 			{
 				$configCached=false;
-				$paths=explode('.',$pagePath);
+				$paths=explode('.', $pagePath);
 				$configPath=$this->getBasePath();
-				$fileName = $this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP
+				$fileName=$this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP
 					? self::CONFIG_FILE_PHP
 					: self::CONFIG_FILE_XML;
 				foreach($paths as $path)
@@ -276,7 +276,7 @@ 
 					$configPath.=DIRECTORY_SEPARATOR.$path;
 				}
 				$appConfigFile=$application->getConfigurationFile();
-				$currentTimestamp[0]=$appConfigFile===null?0:@filemtime($appConfigFile);
+				$currentTimestamp[0]=$appConfigFile===null ? 0 : @filemtime($appConfigFile);
 			}
 			if(!$configCached)
 			{
@@ -284,12 +284,12 @@ 
 				if($config!==null)
 				{
 					if($application->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
-						$pageConfig->loadPageConfigurationFromPhp($config,$application->getBasePath(),'');
+						$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;
@@ -344,9 +344,9 @@ 
 	{
 		if($this->_pagePath===null)
 		{
-			$this->_pagePath=strtr($this->determineRequestedPagePath(),'/\\','..');
+			$this->_pagePath=strtr($this->determineRequestedPagePath(), '/\\', '..');
 			if(empty($this->_pagePath))
-				throw new THttpException(404,'pageservice_page_required');
+				throw new THttpException(404, 'pageservice_page_required');
 		}
 		return $this->_pagePath;
 	}
@@ -399,7 +399,7 @@ 
 			{
 				$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);
+					throw new TConfigurationException('pageservice_basepath_invalid', $basePath);
 			}
 		}
 		return $this->_basePath;
@@ -414,7 +414,7 @@ 
 		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);
+			throw new TConfigurationException('pageservice_basepath_invalid', $value);
 		$this->_basePath=realpath($path);
 	}
 
@@ -463,9 +463,9 @@ 
 	 */
 	public function run()
 	{
-		Prado::trace("Running page service",'System.Web.Services.TPageService');
+		Prado::trace("Running page service", 'System.Web.Services.TPageService');
 		$this->_page=$this->createPage($this->getRequestedPagePath());
-		$this->runPage($this->_page,$this->_properties);
+		$this->runPage($this->_page, $this->_properties);
 	}
 
 	/**
@@ -477,29 +477,29 @@ 
 	 */
 	protected function createPage($pagePath)
 	{
-		$path=$this->getBasePath().DIRECTORY_SEPARATOR.strtr($pagePath,'.',DIRECTORY_SEPARATOR);
+		$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);
+			throw new THttpException(404, 'pageservice_page_unknown', $pagePath);
 
 		if($hasClassFile)
 		{
 			$className=basename($path);
-			if(!class_exists($className,false))
+			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);
@@ -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);
+			$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);
 	}
 }
 
@@ -624,23 +624,23 @@ 
 	 */
 	public function loadFromFiles($basePath)
 	{
-		$paths=explode('.',$this->_pagePath);
+		$paths=explode('.', $this->_pagePath);
 		$page=array_pop($paths);
 		$path=$basePath;
 		$configPagePath='';
-		$fileName = Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP
+		$fileName=Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP
 			? TPageService::CONFIG_FILE_PHP
 			: TPageService::CONFIG_FILE_XML;
 		foreach($paths as $p)
 		{
-			$this->loadFromFile($path.DIRECTORY_SEPARATOR.$fileName,$configPagePath);
+			$this->loadFromFile($path.DIRECTORY_SEPARATOR.$fileName, $configPagePath);
 			$path.=DIRECTORY_SEPARATOR.$p;
 			if($configPagePath==='')
 				$configPagePath=$p;
 			else
 				$configPagePath.='.'.$p;
 		}
-		$this->loadFromFile($path.DIRECTORY_SEPARATOR.$fileName,$configPagePath);
+		$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');
+		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)
 		{
-			$fcontent = include $fname;
-			$this->loadFromPhp($fcontent,dirname($fname),$configPagePath);
+			$fcontent=include $fname;
+			$this->loadFromPhp($fcontent, dirname($fname), $configPagePath);
 		}
 		else
 		{
 			$dom=new TXmlDocument;
 			if($dom->loadFromFile($fname))
-				$this->loadFromXml($dom,dirname($fname),$configPagePath);
+				$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,16 +684,16 @@ 
 	 * @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);
+		$appConfig->loadFromPhp($config, $configPath);
 		$this->_appConfigs[]=$appConfig;
 	}
 
@@ -702,10 +702,10 @@ 
 	 * @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);
+		$appConfig->loadFromXml($dom, $configPath);
 		$this->_appConfigs[]=$appConfig;
 	}
 
@@ -714,30 +714,30 @@ 
 		// authorization
 		if(isset($config['authorization']) && is_array($config['authorization']))
 		{
-			$rules = array();
+			$rules=array();
 			foreach($config['authorization'] as $authorization)
 			{
-				$patterns=isset($authorization['pages'])?$authorization['pages']:'';
+				$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))!=='')
 						{
 							// we know $configPagePath and $this->_pagePath
 							if($configPagePath!=='')  // prepend the pattern with ConfigPagePath
 								$pattern=$configPagePath.'.'.$pattern;
-							if(strcasecmp($pattern,$this->_pagePath)===0)
+							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)
+								if(strncasecmp($this->_pagePath, $pattern, strlen($pattern) - 1)===0)
 								{
 									$ruleApplies=true;
 									break;
@@ -748,40 +748,40 @@ 
 				}
 				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']['properties']))
 			{
-				$this->_properties = array_merge($this->_properties, $config['pages']['properties']);
+				$this->_properties=array_merge($this->_properties, $config['pages']['properties']);
 				unset($config['pages']['properties']);
 			}
 			foreach($config['pages'] as $id => $page)
 			{
-				$properties = array();
+				$properties=array();
 				if(isset($page['properties']))
 				{
 					$properties=$page['properties'];
 					unset($page['properties']);
 				}
 				$matching=false;
-				$id=($configPagePath==='')?$id:$configPagePath.'.'.$id;
-				if(strcasecmp($id,$this->_pagePath)===0)
+				$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;
+				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);
+					$this->_properties=array_merge($this->_properties, $properties);
 			}
 		}
 
@@ -790,14 +790,14 @@ 
 		{
 			foreach($config['includes'] as $include)
 			{
-				$when = isset($include['when'])?true:false;
+				$when=isset($include['when']) ? true : false;
 				if(!isset($include['file']))
 					throw new TConfigurationException('pageserviceconf_includefile_required');
-				$filePath = $include['file'];
+				$filePath=$include['file'];
 				if(isset($this->_includes[$filePath]))
-					$this->_includes[$filePath]=array($configPagePath,'('.$this->_includes[$filePath][1].') || ('.$when.')');
+					$this->_includes[$filePath]=array($configPagePath, '('.$this->_includes[$filePath][1].') || ('.$when.')');
 				else
-					$this->_includes[$filePath]=array($configPagePath,$when);
+					$this->_includes[$filePath]=array($configPagePath, $when);
 			}
 		}
 	}
@@ -808,7 +808,7 @@ 
 	 * @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)
@@ -822,21 +822,21 @@ 
 					$ruleApplies=true;
 				else
 				{
-					foreach(explode(',',$patterns) as $pattern)
+					foreach(explode(',', $patterns) as $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(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)
+								if(strncasecmp($this->_pagePath, $pattern, strlen($pattern) - 1)===0)
 								{
 									$ruleApplies=true;
 									break;
@@ -846,30 +846,30 @@ 
 					}
 				}
 				if($ruleApplies)
-					$rules[]=new TAuthorizationRule($node->getTagName(),$node->getAttribute('users'),$node->getAttribute('roles'),$node->getAttribute('verb'),$node->getAttribute('ips'));
+					$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)
 		{
-			$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)
 			{
 				$properties=$node->getAttributes();
 				$id=$properties->remove('id');
 				if(empty($id))
-					throw new TConfigurationException('pageserviceconf_page_invalid',$configPath);
+					throw new TConfigurationException('pageserviceconf_page_invalid', $configPath);
 				$matching=false;
-				$id=($configPagePath==='')?$id:$configPagePath.'.'.$id;
-				if(strcasecmp($id,$this->_pagePath)===0)
+				$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;
+				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());
+					$this->_properties=array_merge($this->_properties, $properties->toArray());
 			}
 		}
 
@@ -881,9 +881,9 @@ 
 			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.')');
+				$this->_includes[$filePath]=array($configPagePath, '('.$this->_includes[$filePath][1].') || ('.$when.')');
 			else
-				$this->_includes[$filePath]=array($configPagePath,$when);
+				$this->_includes[$filePath]=array($configPagePath, $when);
 		}
 	}
 }

framework/Web/Services/TJsonService.php

Spacing +12 added lines, -12 removed lines

@@ -77,7 +77,7 @@ 
 			if(is_array($config))
 			{
 				foreach($config['json'] as $id => $json)
-					$this->_services[$id] = $json;
+					$this->_services[$id]=$json;
 			}
 		}
 		else
@@ -109,14 +109,14 @@ 
 					$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
 			{
@@ -125,33 +125,33 @@ 
 				{
 					$service=Prado::createComponent($class);
 					if($service instanceof TJsonResponse)
-						$this->createJsonResponse($service,$properties,$serviceConfig);
+						$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);
+			$service->setSubproperty($name, $value);
 		$service->init($config);
 
 		//send content if not null
 		if(($content=$service->getJsonContent())!==null)
 		{
-			$response = $this->getResponse();
+			$response=$this->getResponse();
 			$response->setContentType('application/json');
 			$response->setCharset('UTF-8');
 			//send content

framework/Web/Services/TSoapService.php

Spacing +35 added lines, -35 removed lines

@@ -120,7 +120,7 @@ 
 				$this->loadConfig($dom);
 			}
 			else
-				throw new TConfigurationException('soapservice_configfile_invalid',$this->_configFile);
+				throw new TConfigurationException('soapservice_configfile_invalid', $this->_configFile);
 		}
 		$this->loadConfig($config);
 
@@ -137,16 +137,16 @@ 
 	protected function resolveRequest()
 	{
 		$serverID=$this->getRequest()->getServiceParameter();
-		if(($pos=strrpos($serverID,'.wsdl'))===strlen($serverID)-5)
+		if(($pos=strrpos($serverID, '.wsdl'))===strlen($serverID) - 5)
 		{
-			$serverID=substr($serverID,0,$pos);
+			$serverID=substr($serverID, 0, $pos);
 			$this->_wsdlRequest=true;
 		}
 		else
 			$this->_wsdlRequest=false;
 		$this->_serverID=$serverID;
 		if(!isset($this->_servers[$serverID]))
-			throw new THttpException(400,'soapservice_request_invalid',$serverID);
+			throw new THttpException(400, 'soapservice_request_invalid', $serverID);
 	}
 
 	/**
@@ -162,9 +162,9 @@ 
 			{
 				foreach($config['soap'] as $id => $server)
 				{
-					$properties = isset($server['properties'])?$server['properties']:array();
+					$properties=isset($server['properties']) ? $server['properties'] : array();
 					if(isset($this->_servers[$id]))
-						throw new TConfigurationException('soapservice_serverid_duplicated',$id);
+						throw new TConfigurationException('soapservice_serverid_duplicated', $id);
 					$this->_servers[$id]=$properties;
 				}
 			}
@@ -177,7 +177,7 @@ 
 				if(($id=$properties->remove('id'))===null)
 					throw new TConfigurationException('soapservice_serverid_required');
 				if(isset($this->_servers[$id]))
-					throw new TConfigurationException('soapservice_serverid_duplicated',$id);
+					throw new TConfigurationException('soapservice_serverid_duplicated', $id);
 				$this->_servers[$id]=$properties;
 			}
 		}
@@ -198,8 +198,8 @@ 
 	 */
 	public function setConfigFile($value)
 	{
-		if(($this->_configFile=Prado::getPathOfNamespace($value,Prado::getApplication()->getConfigurationFileExt()))===null)
-			throw new TConfigurationException('soapservice_configfile_invalid',$value);
+		if(($this->_configFile=Prado::getPathOfNamespace($value, Prado::getApplication()->getConfigurationFileExt()))===null)
+			throw new TConfigurationException('soapservice_configfile_invalid', $value);
 	}
 
 	/**
@@ -210,9 +210,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($serverID,$getParams=null,$encodeAmpersand=true,$encodeGetItems=true)
+	public function constructUrl($serverID, $getParams=null, $encodeAmpersand=true, $encodeGetItems=true)
 	{
-		return $this->getRequest()->constructUrl($this->getID(),$serverID,$getParams,$encodeAmpersand,$encodeGetItems);
+		return $this->getRequest()->constructUrl($this->getID(), $serverID, $getParams, $encodeAmpersand, $encodeGetItems);
 	}
 
 	/**
@@ -248,13 +248,13 @@ 
 		if($serverClass===null)
 			$serverClass=self::DEFAULT_SOAP_SERVER;
 		Prado::using($serverClass);
-		$className=($pos=strrpos($serverClass,'.'))!==false?substr($serverClass,$pos+1):$serverClass;
-		if($className!==self::DEFAULT_SOAP_SERVER && !is_subclass_of($className,self::DEFAULT_SOAP_SERVER))
-			throw new TConfigurationException('soapservice_server_invalid',$serverClass);
+		$className=($pos=strrpos($serverClass, '.'))!==false ? substr($serverClass, $pos + 1) : $serverClass;
+		if($className!==self::DEFAULT_SOAP_SERVER && !is_subclass_of($className, self::DEFAULT_SOAP_SERVER))
+			throw new TConfigurationException('soapservice_server_invalid', $serverClass);
 		$server=new $className;
 		$server->setID($this->_serverID);
 		foreach($properties as $name=>$value)
-			$server->setSubproperty($name,$value);
+			$server->setSubproperty($name, $value);
 		return $server;
 	}
 
@@ -266,21 +266,21 @@ 
 	 */
 	public function run()
 	{
-		Prado::trace("Running SOAP service",'System.Web.Services.TSoapService');
+		Prado::trace("Running SOAP service", 'System.Web.Services.TSoapService');
 		$server=$this->createServer();
 		$this->getResponse()->setContentType('text/xml');
 		$this->getResponse()->setCharset($server->getEncoding());
 		if($this->getIsWsdlRequest())
 		{
 			// server WSDL file
-			Prado::trace("Generating WSDL",'System.Web.Services.TSoapService');
+			Prado::trace("Generating WSDL", 'System.Web.Services.TSoapService');
 			$this->getResponse()->clear();
 			$this->getResponse()->write($server->getWsdl());
 		}
 		else
 		{
 			// provide SOAP service
-			Prado::trace("Handling SOAP request",'System.Web.Services.TSoapService');
+			Prado::trace("Handling SOAP request", 'System.Web.Services.TSoapService');
 			$server->run();
 		}
 	}
@@ -331,8 +331,8 @@ 
 	 */
 	public function setID($id)
 	{
-		if(strrpos($this->_id,'.wsdl')===strlen($this->_id)-5)
-			throw new TInvalidDataValueException('soapserver_id_invalid',$id);
+		if(strrpos($this->_id, '.wsdl')===strlen($this->_id) - 5)
+			throw new TInvalidDataValueException('soapserver_id_invalid', $id);
 		$this->_id=$id;
 	}
 
@@ -344,7 +344,7 @@ 
 		if(($provider=$this->getProvider())!==null)
 		{
 			Prado::using($provider);
-			$providerClass=($pos=strrpos($provider,'.'))!==false?substr($provider,$pos+1):$provider;
+			$providerClass=($pos=strrpos($provider, '.'))!==false ? substr($provider, $pos + 1) : $provider;
 			$this->guessMethodCallRequested($providerClass);
 			$server=$this->createServer();
 			$server->setClass($providerClass, $this);
@@ -357,7 +357,7 @@ 
 		{
 			$server->handle();
 		}
-		catch (Exception $e)
+		catch(Exception $e)
 		{
 			if($this->getApplication()->getMode()===TApplicationMode::Debug)
 				$this->fault($e->getMessage(), $e->__toString());
@@ -376,7 +376,7 @@ 
 	 */
 	public function fault($title, $details='', $code='SERVER', $actor='', $name='')
 	{
-		Prado::trace('SOAP-Fault '.$code. ' '.$title.' : '.$details, 'System.Web.Services.TSoapService');
+		Prado::trace('SOAP-Fault '.$code.' '.$title.' : '.$details, 'System.Web.Services.TSoapService');
 		$this->_server->fault($code, $title, $actor, $details, $name);
 	}
 
@@ -387,14 +387,14 @@ 
 	 */
 	protected function guessMethodCallRequested($class)
 	{
-		$namespace = $class.'wsdl';
-		$message = file_get_contents("php://input");
-		$matches= array();
+		$namespace=$class.'wsdl';
+		$message=file_get_contents("php://input");
+		$matches=array();
 		if(preg_match('/xmlns:([^=]+)="urn:'.$namespace.'"/', $message, $matches))
 		{
 			if(preg_match('/<'.$matches[1].':([a-zA-Z_]+[a-zA-Z0-9_]+)/', $message, $method))
 			{
-				$this->_requestedMethod = $method[1];
+				$this->_requestedMethod=$method[1];
 			}
 		}
 	}
@@ -417,8 +417,8 @@ 
 		if($this->_server===null)
 		{
 			if($this->getApplication()->getMode()===TApplicationMode::Debug)
-				ini_set("soap.wsdl_cache_enabled",0);
-			$this->_server = new SoapServer($this->getWsdlUri(),$this->getOptions());
+				ini_set("soap.wsdl_cache_enabled", 0);
+			$this->_server=new SoapServer($this->getWsdlUri(), $this->getOptions());
 		}
 		return $this->_server;
 	}
@@ -459,7 +459,7 @@ 
 		if($this->_wsdlUri==='')
 		{
 			$provider=$this->getProvider();
-			$providerClass=($pos=strrpos($provider,'.'))!==false?substr($provider,$pos+1):$provider;
+			$providerClass=($pos=strrpos($provider, '.'))!==false ? substr($provider, $pos + 1) : $provider;
 			Prado::using($provider);
 			if($this->getApplication()->getMode()===TApplicationMode::Performance && ($cache=$this->getApplication()->getCache())!==null)
 			{
@@ -468,7 +468,7 @@ 
 					return $wsdl;
 				Prado::using('System.3rdParty.WsdlGen.WsdlGenerator');
 				$wsdl=WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding());
-				$cache->set(self::WSDL_CACHE_PREFIX.$providerClass,$wsdl);
+				$cache->set(self::WSDL_CACHE_PREFIX.$providerClass, $wsdl);
 				return $wsdl;
 			}
 			else
@@ -487,7 +487,7 @@ 
 	public function getWsdlUri()
 	{
 		if($this->_wsdlUri==='')
-			return $this->getRequest()->getBaseUrl().$this->getService()->constructUrl($this->getID().'.wsdl',false);
+			return $this->getRequest()->getBaseUrl().$this->getService()->constructUrl($this->getID().'.wsdl', false);
 		else
 			return $this->_wsdlUri;
 	}
@@ -506,7 +506,7 @@ 
 	public function getUri()
 	{
 		if($this->_uri==='')
-			return $this->getRequest()->getBaseUrl().$this->getService()->constructUrl($this->getID(),false);
+			return $this->getRequest()->getBaseUrl().$this->getService()->constructUrl($this->getID(), false);
 		else
 			return $this->_uri;
 	}
@@ -552,7 +552,7 @@ 
 		if($value==='1.1' || $value==='1.2' || $value==='')
 			$this->_version=$value;
 		else
-			throw new TInvalidDataValueException('soapserver_version_invalid',$value);
+			throw new TInvalidDataValueException('soapserver_version_invalid', $value);
 	}
 
 	/**
@@ -616,7 +616,7 @@ 
 	 */
 	public function setClassMaps($classes)
 	{
-		$this->_classMap = $classes;
+		$this->_classMap=$classes;
 	}
 }