pradosoft / prado

framework/Util/TDataFieldAccessor.php

Indentation +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 
 				$tmp = $data;
 				foreach (explode(".", $field) as $f)
-				    $tmp = $tmp[$f];
+					$tmp = $tmp[$f];
 				return $tmp;
 			}
 			else if(is_object($data))

Spacing +10 added lines, -10 removed lines

@@ -48,7 +48,7 @@ 
 	 * @return mixed value at the specified field
 	 * @throws TInvalidDataValueException if field or data is invalid
 	 */
-	public static function getDataFieldValue($data,$field)
+	public static function getDataFieldValue($data, $field)
 	{
 		try
 		{
@@ -57,33 +57,33 @@ 
 				if(isset($data[$field]))
 					return $data[$field];
 
-				$tmp = $data;
-				foreach (explode(".", $field) as $f)
-				    $tmp = $tmp[$f];
+				$tmp=$data;
+				foreach(explode(".", $field) as $f)
+				    $tmp=$tmp[$f];
 				return $tmp;
 			}
 			else if(is_object($data))
 			{
-				if(strpos($field,'.')===false)  // simple field
+				if(strpos($field, '.')===false)  // simple field
 				{
 					if(method_exists($data, 'get'.$field))
-						return call_user_func(array($data,'get'.$field));
+						return call_user_func(array($data, 'get'.$field));
 					else
 						return $data->{$field};
 				}
 				else // field in the format of xxx.yyy.zzz
 				{
 					$object=$data;
-					foreach(explode('.',$field) as $f)
-						$object = TDataFieldAccessor::getDataFieldValue($object, $f);
+					foreach(explode('.', $field) as $f)
+						$object=TDataFieldAccessor::getDataFieldValue($object, $f);
 					return $object;
 				}
 			}
 		}
 		catch(Exception $e)
 		{
-			throw new TInvalidDataValueException('datafieldaccessor_datafield_invalid',$field,$e->getMessage());
+			throw new TInvalidDataValueException('datafieldaccessor_datafield_invalid', $field, $e->getMessage());
 		}
-		throw new TInvalidDataValueException('datafieldaccessor_data_invalid',$field);
+		throw new TInvalidDataValueException('datafieldaccessor_data_invalid', $field);
 	}
 }

Braces +3 added lines, -6 removed lines

@@ -61,8 +61,7 @@ 
 				foreach (explode(".", $field) as $f)
 				    $tmp = $tmp[$f];
 				return $tmp;
-			}
-			else if(is_object($data))
+			} else if(is_object($data))
 			{
 				if(strpos($field,'.')===false)  // simple field
 				{
@@ -70,8 +69,7 @@ 
 						return call_user_func(array($data,'get'.$field));
 					else
 						return $data->{$field};
-				}
-				else // field in the format of xxx.yyy.zzz
+				} else // field in the format of xxx.yyy.zzz
 				{
 					$object=$data;
 					foreach(explode('.',$field) as $f)
@@ -79,8 +77,7 @@ 
 					return $object;
 				}
 			}
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TInvalidDataValueException('datafieldaccessor_datafield_invalid',$field,$e->getMessage());
 		}

framework/Util/TDateTimeStamp.php

Indentation +8 added lines, -9 removed lines

@@ -1,13 +1,12 @@ 
 <?php
 /**
- * TDateTimeStamp class file.
-
- * @author Fabio Bas ctrlaltca[AT]gmail[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.Util
- */
+	 * TDateTimeStamp class file.
+	 * @author Fabio Bas ctrlaltca[AT]gmail[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.Util
+	 */
 
 /**
  * TDateTimeStamp Class
@@ -186,7 +185,7 @@ 
 
 	/**
 	 * @return integer|float a timestamp given a local time
-     */
+	 */
 	function getTimeStamp($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_gmt=false)
 	{
 		$dt = new DateTime();

Doc Comments +1 added lines, -1 removed lines

@@ -185,7 +185,7 @@
 	}
 
 	/**
-	 * @return integer|float a timestamp given a local time
+	 * @return integer a timestamp given a local time
      */
 	function getTimeStamp($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_gmt=false)
 	{

Spacing +34 added lines, -34 removed lines

@@ -25,8 +25,8 @@ 
  */
 class TDateTimeStamp
 {
-	protected static $_month_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
-	protected static $_month_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
+	protected static $_month_normal=array("", 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+	protected static $_month_leaf=array("", 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
 
 	/**
 	 * Returns the day of the week (0=Sunday, 1=Monday, .. 6=Saturday)
@@ -36,7 +36,7 @@ 
 	 */
 	public function getDayofWeek($year, $month, $day)
 	{
-		$dt = new DateTime();
+		$dt=new DateTime();
 		$dt->setDate($year, $month, $day);
 		return (int) $dt->format('w');
 	}
@@ -49,8 +49,8 @@ 
 	 */
 	public function isLeapYear($year)
 	{
-		$year = $this->digitCheck($year);
-		$dt = new DateTime();
+		$year=$this->digitCheck($year);
+		$dt=new DateTime();
 		$dt->setDate($year, 1, 1);
 		return (bool) $dt->format('L');
 	}
@@ -62,22 +62,22 @@ 
 	 */
 	protected function digitCheck($y)
 	{
-		if ($y < 100){
-			$yr = (integer) date("Y");
-			$century = (integer) ($yr /100);
+		if($y < 100) {
+			$yr=(integer) date("Y");
+			$century=(integer) ($yr / 100);
 
-			if ($yr%100 > 50) {
-				$c1 = $century + 1;
-				$c0 = $century;
+			if($yr % 100 > 50) {
+				$c1=$century + 1;
+				$c0=$century;
 			} else {
-				$c1 = $century;
-				$c0 = $century - 1;
+				$c1=$century;
+				$c0=$century - 1;
 			}
-			$c1 *= 100;
+			$c1*=100;
 			// if 2-digit year is less than 30 years in future, set it to this century
 			// otherwise if more than 30 years in future, then we set 2-digit year to the prev century.
-			if (($y + $c1) < $yr+30) $y = $y + $c1;
-			else $y = $y + $c0*100;
+			if(($y + $c1) < $yr + 30) $y=$y + $c1;
+			else $y=$y + $c0 * 100;
 		}
 		return $y;
 	}
@@ -92,7 +92,7 @@ 
 	 */
 	public function getGMTDiff($ts=false)
 	{
-		$dt = new DateTime();
+		$dt=new DateTime();
 		if($ts)
 			$dt->setTimeStamp($ts);
 		else
@@ -106,9 +106,9 @@ 
 	 */
 	function parseDate($txt=false)
 	{
-		if ($txt === false) return getdate();
+		if($txt===false) return getdate();
 
-		$dt = new DateTime($txt);
+		$dt=new DateTime($txt);
 
 		return array(
 			'seconds' => (int) $dt->format('s'),
@@ -128,11 +128,11 @@ 
 	/**
 	 * @return array an array with date info.
 	 */
-	function getDate($d=false,$fast=false)
+	function getDate($d=false, $fast=false)
 	{
-		if ($d === false) return getdate();
+		if($d===false) return getdate();
 
-		$dt = new DateTime();
+		$dt=new DateTime();
 		$dt->setTimestamp($d);
 
 		return array(
@@ -153,20 +153,20 @@ 
 	/**
 	 * @return boolean true if valid date, semantic check only.
 	 */
-	public function isValidDate($y,$m,$d)
+	public function isValidDate($y, $m, $d)
 	{
-		if ($this->isLeapYear($y))
-			$marr =& self::$_month_leaf;
+		if($this->isLeapYear($y))
+			$marr=& self::$_month_leaf;
 		else
-			$marr =& self::$_month_normal;
+			$marr=& self::$_month_normal;
 
-		if ($m > 12 || $m < 1) return false;
+		if($m > 12 || $m < 1) return false;
 
-		if ($d > 31 || $d < 1) return false;
+		if($d > 31 || $d < 1) return false;
 
-		if ($marr[$m] < $d) return false;
+		if($marr[$m] < $d) return false;
 
-		if ($y < 1000 && $y > 3000) return false;
+		if($y < 1000 && $y > 3000) return false;
 
 		return true;
 	}
@@ -174,9 +174,9 @@ 
 	/**
 	 * @return string formatted date based on timestamp $d
 	 */
-	function formatDate($fmt,$ts=false,$is_gmt=false)
+	function formatDate($fmt, $ts=false, $is_gmt=false)
 	{
-		$dt = new DateTime();
+		$dt=new DateTime();
 		if($is_gmt)
 			$dt->setTimeZone(new DateTimeZone('UTC'));
 		$dt->setTimestamp($ts);
@@ -187,9 +187,9 @@ 
 	/**
 	 * @return integer|float a timestamp given a local time
      */
-	function getTimeStamp($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_gmt=false)
+	function getTimeStamp($hr, $min, $sec, $mon=false, $day=false, $year=false, $is_gmt=false)
 	{
-		$dt = new DateTime();
+		$dt=new DateTime();
 		if($is_gmt)
 			$dt->setTimeZone(new DateTimeZone('UTC'));
 		$dt->setDate($year!==false ? $year : date('Y'),

framework/Caching/TMemCache.php

Indentation +62 added lines, -62 removed lines

@@ -104,30 +104,30 @@ 
 	/**
 	 * @var boolean controls the use of a persistent connection. Default to true.
 	 */
-    private $_persistence = true;
-    /**
-     * @var integer number of buckets to create for this server which in turn control its
-     * probability of it being selected. The probability is relative to the total weight
-     * of all servers.
-     */
-    private $_weight = 1;
+	private $_persistence = true;
+	/**
+	 * @var integer number of buckets to create for this server which in turn control its
+	 * probability of it being selected. The probability is relative to the total weight
+	 * of all servers.
+	 */
+	private $_weight = 1;
 
-    private $_timeout = 360;
+	private $_timeout = 360;
 
-    private $_retryInterval = 15;
+	private $_retryInterval = 15;
 	/**
-	* @var integer Controls the minimum value length before attempting to compress automatically.
-	*/
-    private $_threshold=0;
+	 * @var integer Controls the minimum value length before attempting to compress automatically.
+	 */
+	private $_threshold=0;
 
 	/**
-	* @var float Specifies the minimum amount of savings to actually store the value compressed. The supplied value must be between 0 and 1. Default value is 0.2 giving a minimum 20% compression savings.
-	*/
-    private $_minSavings=0.0;
+	 * @var float Specifies the minimum amount of savings to actually store the value compressed. The supplied value must be between 0 and 1. Default value is 0.2 giving a minimum 20% compression savings.
+	 */
+	private $_minSavings=0.0;
 
-    private $_status = true;
+	private $_status = true;
 
-    private $_failureCallback = null;
+	private $_failureCallback = null;
 
 	/**
 	 * @var boolean whether to use memcached or memcache as the underlying caching extension.
@@ -171,63 +171,63 @@ 
 		$this->_cache = $this->_useMemcached ? new Memcached : new Memcache;
 		$this->loadConfig($config);
 		if(count($this->_servers))
-        {
-            foreach($this->_servers as $server)
-            {
-                Prado::trace('Adding server '.$server['Host'].' from serverlist', 'System.Caching.TMemCache');
-                if($this->_cache->addServer($server['Host'],$server['Port'],$server['Persistent'],
-                    $server['Weight'],$server['Timeout'],$server['RetryInterval'])===false)
-                    throw new TConfigurationException('memcache_connection_failed',$server['Host'],$server['Port']);
-            }
-        }
-        else
-        {
-            Prado::trace('Adding server '.$this->_host, 'System.Caching.TMemCache');
-            if($this->_cache->addServer($this->_host,$this->_port)===false)
-                throw new TConfigurationException('memcache_connection_failed',$this->_host,$this->_port);
-        }
+		{
+			foreach($this->_servers as $server)
+			{
+				Prado::trace('Adding server '.$server['Host'].' from serverlist', 'System.Caching.TMemCache');
+				if($this->_cache->addServer($server['Host'],$server['Port'],$server['Persistent'],
+					$server['Weight'],$server['Timeout'],$server['RetryInterval'])===false)
+					throw new TConfigurationException('memcache_connection_failed',$server['Host'],$server['Port']);
+			}
+		}
+		else
+		{
+			Prado::trace('Adding server '.$this->_host, 'System.Caching.TMemCache');
+			if($this->_cache->addServer($this->_host,$this->_port)===false)
+				throw new TConfigurationException('memcache_connection_failed',$this->_host,$this->_port);
+		}
 		if($this->_threshold!==0)
-            $this->_cache->setCompressThreshold($this->_threshold,$this->_minSavings);
+			$this->_cache->setCompressThreshold($this->_threshold,$this->_minSavings);
 		$this->_initialized=true;
 		parent::init($config);
 	}
 
-    /**
+	/**
 	 * Loads configuration from an XML element
 	 * @param TXmlElement configuration node
 	 * @throws TConfigurationException if log route class or type is not specified
 	 */
 	private function loadConfig($xml)
 	{
-	    if($xml instanceof TXmlElement)
+		if($xml instanceof TXmlElement)
 		{
-    		foreach($xml->getElementsByTagName('server') as $serverConfig)
-    		{
-    			$properties=$serverConfig->getAttributes();
-    			if(($host=$properties->remove('Host'))===null)
-    				throw new TConfigurationException('memcache_serverhost_required');
-    			if(($port=$properties->remove('Port'))===null)
-        			throw new TConfigurationException('memcache_serverport_required');
-        		if(!is_numeric($port))
-        		    throw new TConfigurationException('memcache_serverport_invalid');
-        		$server = array('Host'=>$host,'Port'=>$port,'Weight'=>1,'Timeout'=>1800,'RetryInterval'=>15,'Persistent'=>true);
-        		$checks = array(
-        		    'Weight'=>'memcache_serverweight_invalid',
-        		    'Timeout'=>'memcache_servertimeout_invalid',
-        		    'RetryInterval'=>'memcach_serverretryinterval_invalid'
-        		);
-        		foreach($checks as $property=>$exception)
-        		{
-        		    $value=$properties->remove($property);
-        		    if($value!==null && is_numeric($value))
-        		        $server[$property]=$value;
-        		    else if($value!==null)
-        		        throw new TConfigurationException($exception);
-        		}
-        		$server['Persistent']= TPropertyValue::ensureBoolean($properties->remove('Persistent'));
-    			$this->_servers[]=$server;
-    		}
-	    }
+			foreach($xml->getElementsByTagName('server') as $serverConfig)
+			{
+				$properties=$serverConfig->getAttributes();
+				if(($host=$properties->remove('Host'))===null)
+					throw new TConfigurationException('memcache_serverhost_required');
+				if(($port=$properties->remove('Port'))===null)
+					throw new TConfigurationException('memcache_serverport_required');
+				if(!is_numeric($port))
+					throw new TConfigurationException('memcache_serverport_invalid');
+				$server = array('Host'=>$host,'Port'=>$port,'Weight'=>1,'Timeout'=>1800,'RetryInterval'=>15,'Persistent'=>true);
+				$checks = array(
+					'Weight'=>'memcache_serverweight_invalid',
+					'Timeout'=>'memcache_servertimeout_invalid',
+					'RetryInterval'=>'memcach_serverretryinterval_invalid'
+				);
+				foreach($checks as $property=>$exception)
+				{
+					$value=$properties->remove($property);
+					if($value!==null && is_numeric($value))
+						$server[$property]=$value;
+					else if($value!==null)
+						throw new TConfigurationException($exception);
+				}
+				$server['Persistent']= TPropertyValue::ensureBoolean($properties->remove('Persistent'));
+				$this->_servers[]=$server;
+			}
+		}
 	}
 
 	/**

Spacing +22 added lines, -22 removed lines

@@ -104,17 +104,17 @@ 
 	/**
 	 * @var boolean controls the use of a persistent connection. Default to true.
 	 */
-    private $_persistence = true;
+    private $_persistence=true;
     /**
      * @var integer number of buckets to create for this server which in turn control its
      * probability of it being selected. The probability is relative to the total weight
      * of all servers.
      */
-    private $_weight = 1;
+    private $_weight=1;
 
-    private $_timeout = 360;
+    private $_timeout=360;
 
-    private $_retryInterval = 15;
+    private $_retryInterval=15;
 	/**
 	* @var integer Controls the minimum value length before attempting to compress automatically.
 	*/
@@ -125,9 +125,9 @@ 
 	*/
     private $_minSavings=0.0;
 
-    private $_status = true;
+    private $_status=true;
 
-    private $_failureCallback = null;
+    private $_failureCallback=null;
 
 	/**
 	 * @var boolean whether to use memcached or memcache as the underlying caching extension.
@@ -168,26 +168,26 @@ 
 		if(!extension_loaded('memcached') && $this->_useMemcached)
 			throw new TConfigurationException('memcached_extension_required');
 		
-		$this->_cache = $this->_useMemcached ? new Memcached : new Memcache;
+		$this->_cache=$this->_useMemcached ? new Memcached : new Memcache;
 		$this->loadConfig($config);
 		if(count($this->_servers))
         {
             foreach($this->_servers as $server)
             {
                 Prado::trace('Adding server '.$server['Host'].' from serverlist', 'System.Caching.TMemCache');
-                if($this->_cache->addServer($server['Host'],$server['Port'],$server['Persistent'],
-                    $server['Weight'],$server['Timeout'],$server['RetryInterval'])===false)
-                    throw new TConfigurationException('memcache_connection_failed',$server['Host'],$server['Port']);
+                if($this->_cache->addServer($server['Host'], $server['Port'], $server['Persistent'],
+                    $server['Weight'], $server['Timeout'], $server['RetryInterval'])===false)
+                    throw new TConfigurationException('memcache_connection_failed', $server['Host'], $server['Port']);
             }
         }
         else
         {
             Prado::trace('Adding server '.$this->_host, 'System.Caching.TMemCache');
-            if($this->_cache->addServer($this->_host,$this->_port)===false)
-                throw new TConfigurationException('memcache_connection_failed',$this->_host,$this->_port);
+            if($this->_cache->addServer($this->_host, $this->_port)===false)
+                throw new TConfigurationException('memcache_connection_failed', $this->_host, $this->_port);
         }
 		if($this->_threshold!==0)
-            $this->_cache->setCompressThreshold($this->_threshold,$this->_minSavings);
+            $this->_cache->setCompressThreshold($this->_threshold, $this->_minSavings);
 		$this->_initialized=true;
 		parent::init($config);
 	}
@@ -210,8 +210,8 @@ 
         			throw new TConfigurationException('memcache_serverport_required');
         		if(!is_numeric($port))
         		    throw new TConfigurationException('memcache_serverport_invalid');
-        		$server = array('Host'=>$host,'Port'=>$port,'Weight'=>1,'Timeout'=>1800,'RetryInterval'=>15,'Persistent'=>true);
-        		$checks = array(
+        		$server=array('Host'=>$host, 'Port'=>$port, 'Weight'=>1, 'Timeout'=>1800, 'RetryInterval'=>15, 'Persistent'=>true);
+        		$checks=array(
         		    'Weight'=>'memcache_serverweight_invalid',
         		    'Timeout'=>'memcache_servertimeout_invalid',
         		    'RetryInterval'=>'memcach_serverretryinterval_invalid'
@@ -224,7 +224,7 @@ 
         		    else if($value!==null)
         		        throw new TConfigurationException($exception);
         		}
-        		$server['Persistent']= TPropertyValue::ensureBoolean($properties->remove('Persistent'));
+        		$server['Persistent']=TPropertyValue::ensureBoolean($properties->remove('Persistent'));
     			$this->_servers[]=$server;
     		}
 	    }
@@ -350,12 +350,12 @@ 
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	protected function setValue($key,$value,$expire)
+	protected function setValue($key, $value, $expire)
 	{
 		if($this->_useMemcached) {
-			return $this->_cache->set($key,$value,$expire);
+			return $this->_cache->set($key, $value, $expire);
 		} else {
-			return $this->_cache->set($key,$value,0,$expire);
+			return $this->_cache->set($key, $value, 0, $expire);
 		}
 	}
 
@@ -368,12 +368,12 @@ 
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	protected function addValue($key,$value,$expire)
+	protected function addValue($key, $value, $expire)
 	{
 		if($this->_useMemcached) {
-			$this->_cache->add($key,$value,$expire);
+			$this->_cache->add($key, $value, $expire);
 		} else {
-			return $this->_cache->add($key,$value,0,$expire);
+			return $this->_cache->add($key, $value, 0, $expire);
 		}
 	}
 

Braces +1 added lines, -2 removed lines

@@ -124,8 +124,7 @@
         	if (!@mysql_select_db($dsninfo['database'], $conn))
         		throw new Exception('Error in connecting database, dns:'.
         							$dsninfo);
-        }
-        else
+        } else
         	throw new Exception('Please provide a database for message'.
         						' translation.');
        return $conn;

framework/Web/Services/TFeedService.php

Indentation +3 added lines, -3 removed lines

@@ -139,9 +139,9 @@
 			$feed->init($feedConfig);
 
 			$content=$feed->getFeedContent();
-		    //$this->getResponse()->setContentType('application/rss+xml');
-		    $this->getResponse()->setContentType($feed->getContentType());
-		    $this->getResponse()->write($content);
+			//$this->getResponse()->setContentType('application/rss+xml');
+			$this->getResponse()->setContentType($feed->getContentType());
+			$this->getResponse()->write($content);
 		}
 		else
 			throw new THttpException(404,'feedservice_feed_unknown',$id);

Spacing +10 added lines, -10 removed lines

@@ -72,7 +72,7 @@ 
 			if(is_array($config))
 			{
 				foreach($config as $id => $feed)
-					$this->_feeds[$id] = $feed;
+					$this->_feeds[$id]=$feed;
 			}
 		}
 		else
@@ -105,20 +105,20 @@ 
 		if(isset($this->_feeds[$id]))
 		{
 			$feedConfig=$this->_feeds[$id];
-			$properties = array();
-			$feed = null;
+			$properties=array();
+			$feed=null;
 			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 			{
 				if(isset($feedConfig['class']))
 				{
 					$feed=Prado::createComponent($feedConfig['class']);
 					if($service instanceof IFeedContentProvider)
-						$properties=isset($feedConfig['properties'])?$feedConfig['properties']:array();
+						$properties=isset($feedConfig['properties']) ? $feedConfig['properties'] : array();
 					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
 			{
@@ -127,15 +127,15 @@ 
 				{
 					$feed=Prado::createComponent($class);
 					if(!($feed instanceof IFeedContentProvider))
-						throw new TConfigurationException('feedservice_feedtype_invalid',$id);
+						throw new TConfigurationException('feedservice_feedtype_invalid', $id);
 				}
 				else
-					throw new TConfigurationException('feedservice_class_required',$id);
+					throw new TConfigurationException('feedservice_class_required', $id);
 			}
 
 			// init feed properties
 			foreach($properties as $name=>$value)
-				$feed->setSubproperty($name,$value);
+				$feed->setSubproperty($name, $value);
 			$feed->init($feedConfig);
 
 			$content=$feed->getFeedContent();
@@ -144,7 +144,7 @@ 
 		    $this->getResponse()->write($content);
 		}
 		else
-			throw new THttpException(404,'feedservice_feed_unknown',$id);
+			throw new THttpException(404, 'feedservice_feed_unknown', $id);
 	}
 }
 

Braces +5 added lines, -10 removed lines

@@ -74,8 +74,7 @@ 
 				foreach($config as $id => $feed)
 					$this->_feeds[$id] = $feed;
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('feed') as $feed)
 			{
@@ -116,11 +115,9 @@ 
 						$properties=isset($feedConfig['properties'])?$feedConfig['properties']:array();
 					else
 						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
-				}
-				else
+				} else
 					throw new TConfigurationException('jsonservice_class_required',$id);
-			}
-			else
+			} else
 			{
 				$properties=$feedConfig->getAttributes();
 				if(($class=$properties->remove('class'))!==null)
@@ -128,8 +125,7 @@ 
 					$feed=Prado::createComponent($class);
 					if(!($feed instanceof IFeedContentProvider))
 						throw new TConfigurationException('feedservice_feedtype_invalid',$id);
-				}
-				else
+				} else
 					throw new TConfigurationException('feedservice_class_required',$id);
 			}
 
@@ -142,8 +138,7 @@ 
 		    //$this->getResponse()->setContentType('application/rss+xml');
 		    $this->getResponse()->setContentType($feed->getContentType());
 		    $this->getResponse()->write($content);
-		}
-		else
+		} else
 			throw new THttpException(404,'feedservice_feed_unknown',$id);
 	}
 }

framework/Web/UI/TCachePageStatePersister.php

Indentation +4 added lines, -4 removed lines

@@ -144,15 +144,15 @@
 	 */
 	public function getKeyPrefix()
 	{
-	    return $this->_prefix;
+		return $this->_prefix;
 	}
 
 	/**
-     * @param string prefix of cache variable name to avoid conflict with other cache data
-     */
+	 * @param string prefix of cache variable name to avoid conflict with other cache data
+	 */
 	public function setKeyPrefix($value)
 	{
-	    $this->_prefix=$value;
+		$this->_prefix=$value;
 	}
 
 	/**

Spacing +7 added lines, -7 removed lines

@@ -110,7 +110,7 @@ 
 			if($cache===null || !($cache instanceof ICache))
 			{
 				if($this->_cacheModuleID!=='')
-					throw new TConfigurationException('cachepagestatepersister_cachemoduleid_invalid',$this->_cacheModuleID);
+					throw new TConfigurationException('cachepagestatepersister_cachemoduleid_invalid', $this->_cacheModuleID);
 				else
 					throw new TConfigurationException('cachepagestatepersister_cache_required');
 			}
@@ -133,7 +133,7 @@ 
 	 */
 	public function setCacheTimeout($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))>=0)
+		if(($value=TPropertyValue::ensureInteger($value)) >= 0)
 			$this->_timeout=$value;
 		else
 			throw new TInvalidDataValueException('cachepagestatepersister_timeout_invalid');
@@ -173,10 +173,10 @@ 
 	 */
 	public function save($data)
 	{
-		$timestamp=(string)microtime(true);
+		$timestamp=(string) microtime(true);
 		$key=$this->calculateKey($timestamp);
-		$this->getCache()->add($key,$data,$this->_timeout);
-		$this->_page->setClientState(TPageStateFormatter::serialize($this->_page,$timestamp));
+		$this->getCache()->add($key, $data, $this->_timeout);
+		$this->_page->setClientState(TPageStateFormatter::serialize($this->_page, $timestamp));
 	}
 
 	/**
@@ -186,13 +186,13 @@ 
 	 */
 	public function load()
 	{
-		if(($timestamp=TPageStateFormatter::unserialize($this->_page,$this->_page->getRequestClientState()))!==null)
+		if(($timestamp=TPageStateFormatter::unserialize($this->_page, $this->_page->getRequestClientState()))!==null)
 		{
 			$key=$this->calculateKey($timestamp);
 			if(($data=$this->getCache()->get($key))!==false)
 				return $data;
 		}
-		throw new THttpException(400,'cachepagestatepersister_pagestate_corrupted');
+		throw new THttpException(400, 'cachepagestatepersister_pagestate_corrupted');
 	}
 }
 

framework/Web/UI/WebControls/TListControl.php

Indentation +47 added lines, -47 removed lines

@@ -334,8 +334,8 @@ 
 
 	/**
 	 * @return boolean a value indicating whether an automatic postback to the server
-     * will occur whenever the user makes change to the list control and then tabs out of it.
-     * Defaults to false.
+	 * will occur whenever the user makes change to the list control and then tabs out of it.
+	 * Defaults to false.
 	 */
 	public function getAutoPostBack()
 	{
@@ -591,23 +591,23 @@ 
 	 * @param string the value of the item to be selected.
 	 */
 	public function setSelectedValue($value)
-    {
-	    if($this->_items)
-	    {
-		    if($value===null)
-		    	$this->clearSelection();
-		    else if(($item=$this->_items->findItemByValue($value))!==null)
-	    	{
-		    	$this->clearSelection();
-		    	$item->setSelected(true);
-	    	}
-	    	else
+	{
+		if($this->_items)
+		{
+			if($value===null)
+				$this->clearSelection();
+			else if(($item=$this->_items->findItemByValue($value))!==null)
+			{
+				$this->clearSelection();
+				$item->setSelected(true);
+			}
+			else
 				$this->clearSelection();
-    	}
-    	$this->_cachedSelectedValue=$value;
+		}
+		$this->_cachedSelectedValue=$value;
 		if($this->getAdapter() instanceof IListControlAdapter)
 			$this->getAdapter()->setSelectedValue($value);
-    }
+	}
 
 
 	/**
@@ -655,36 +655,36 @@ 
 			$this->getAdapter()->setSelectedValues($values);
 	}
 
-    /**
-     * @return string selected value
-     */
-    public function getText()
-    {
-	    return $this->getSelectedValue();
-    }
-
-    /**
-     * @param string value to be selected
-     */
-    public function setText($value)
-    {
-	    $this->setSelectedValue($value);
-    }
-
-    /**
-     * Clears all existing selections.
-     */
-    public function clearSelection()
-    {
-	    if($this->_items)
-	    {
-		    foreach($this->_items as $item)
-		    	$item->setSelected(false);
-	    }
+	/**
+	 * @return string selected value
+	 */
+	public function getText()
+	{
+		return $this->getSelectedValue();
+	}
+
+	/**
+	 * @param string value to be selected
+	 */
+	public function setText($value)
+	{
+		$this->setSelectedValue($value);
+	}
+
+	/**
+	 * Clears all existing selections.
+	 */
+	public function clearSelection()
+	{
+		if($this->_items)
+		{
+			foreach($this->_items as $item)
+				$item->setSelected(false);
+		}
 
 		if($this->getAdapter() instanceof IListControlAdapter)
 			$this->getAdapter()->clearSelection();
-    }
+	}
 
 	/**
 	 * @return string the group of validators which the list control causes validation upon postback
@@ -914,10 +914,10 @@ 
 	 */
 	public function setSelectedValues($values);
 
-    /**
-     * Clears all existing selections on the client side.
-     */
-    public function clearSelection();
+	/**
+	 * Clears all existing selections on the client side.
+	 */
+	public function clearSelection();
 }
 
 

Doc Comments +10 added lines

@@ -347,6 +347,7 @@ 
 	 * An automatic postback to the server will occur whenever the user
 	 * makes change to the list control and then tabs out of it.
 	 * @param boolean the value indicating if postback automatically
+	 * @param boolean $value
 	 */
 	public function setAutoPostBack($value)
 	{
@@ -379,6 +380,7 @@ 
 
 	/**
 	 * @param string the field of the data source that provides the text content of the list items.
+	 * @param string $value
 	 */
 	public function setDataTextField($value)
 	{
@@ -398,6 +400,7 @@ 
 	 * The format string is used in {@link TDataValueFormatter::format()} to format the Text property value
 	 * of each item in the list control.
 	 * @param string the formatting string used to control how data bound to the list control is displayed.
+	 * @param string $value
 	 * @see TDataValueFormatter::format()
 	 */
 	public function setDataTextFormatString($value)
@@ -415,6 +418,7 @@ 
 
 	/**
 	 * @param string the field of the data source that provides the value of each list item.
+	 * @param string $value
 	 */
 	public function setDataValueField($value)
 	{
@@ -856,6 +860,7 @@ 
 	 * as the first and second parameters in {@link sprintf}.
 	 * @param string format string
 	 * @param mixed the data to be formatted
+	 * @param string $formatString
 	 * @return string the formatted result
 	 */
 	protected function formatDataValue($formatString,$value)
@@ -894,28 +899,33 @@ 
 	/**
 	 * Selects an item based on zero-base index on the client side.
 	 * @param integer the index (zero-based) of the item to be selected
+	 * @return void
 	 */
 	public function setSelectedIndex($index);
 	/**
 	 * Selects a list of item based on zero-base indices on the client side.
 	 * @param array list of index of items to be selected
+	 * @return void
 	 */
 	public function setSelectedIndices($indices);
 
 	/**
 	 * Sets selection by item value on the client side.
 	 * @param string the value of the item to be selected.
+	 * @return void
 	 */
 	public function setSelectedValue($value);
 
 	/**
 	 * Sets selection by a list of item values on the client side.
 	 * @param array list of the selected item values
+	 * @return void
 	 */
 	public function setSelectedValues($values);
 
     /**
      * Clears all existing selections on the client side.
+     * @return void
      */
     public function clearSelection();
 }

Spacing +58 added lines, -58 removed lines

@@ -113,7 +113,7 @@ 
 	 */
 	public function getEnableClientScript()
 	{
-		return $this->getViewState('EnableClientScript',true);
+		return $this->getViewState('EnableClientScript', true);
 	}
 
 	/**
@@ -121,7 +121,7 @@ 
 	 */
 	public function setEnableClientScript($value)
 	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableClientScript', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -133,7 +133,7 @@ 
 		$page=$this->getPage();
 		$page->ensureRenderInForm($this);
 		if($this->getIsMultiSelect())
-			$writer->addAttribute('multiple','multiple');
+			$writer->addAttribute('multiple', 'multiple');
 		if($this->getEnabled(true))
 		{
 			if($this->getAutoPostBack()
@@ -144,7 +144,7 @@ 
 			}
 		}
 		else if($this->getEnabled())
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 		parent::addAttributesToRender($writer);
 	}
 
@@ -153,8 +153,8 @@ 
 	 */
 	protected function renderClientControlScript($writer)
 	{
-		$writer->addAttribute('id',$this->getClientID());
-		$this->getPage()->getClientScript()->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
+		$writer->addAttribute('id', $this->getClientID());
+		$this->getPage()->getClientScript()->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
 	/**
@@ -172,10 +172,10 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['ValidationGroup'] = $this->getValidationGroup();
-		$options['EventTarget'] = $this->getUniqueID();
+		$options['ID']=$this->getClientID();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['ValidationGroup']=$this->getValidationGroup();
+		$options['EventTarget']=$this->getUniqueID();
 		return $options;
 	}
 
@@ -224,18 +224,18 @@ 
 			$item=$items->createListItem();
 			if(is_array($object) || is_object($object))
 			{
-				$text=TDataFieldAccessor::getDataFieldValue($object,$textField);
-				$value=TDataFieldAccessor::getDataFieldValue($object,$valueField);
+				$text=TDataFieldAccessor::getDataFieldValue($object, $textField);
+				$value=TDataFieldAccessor::getDataFieldValue($object, $valueField);
 				$item->setValue($value);
 				if($groupField!=='')
-					$item->setAttribute('Group',TDataFieldAccessor::getDataFieldValue($object,$groupField));
+					$item->setAttribute('Group', TDataFieldAccessor::getDataFieldValue($object, $groupField));
 			}
 			else
 			{
 				$text=$object;
 				$item->setValue("$key");
 			}
-			$item->setText($this->formatDataValue($textFormat,$text));
+			$item->setText($this->formatDataValue($textFormat, $text));
 		}
 		// SelectedValue or SelectedIndex may be set before databinding
 		// so we make them be effective now
@@ -287,7 +287,7 @@ 
 	{
 		parent::saveState();
 		if($this->_items)
-			$this->setViewState('Items',$this->_items->saveState(),null);
+			$this->setViewState('Items', $this->_items->saveState(), null);
 		else
 			$this->clearViewState('Items');
 	}
@@ -303,7 +303,7 @@ 
 		if(!$this->getIsDataBound())
 		{
 			$this->_items=$this->createListItemCollection();
-			$this->_items->loadState($this->getViewState('Items',null));
+			$this->_items->loadState($this->getViewState('Items', null));
 		}
 		$this->clearViewState('Items');
 	}
@@ -321,7 +321,7 @@ 
 	 */
 	public function getAppendDataBoundItems()
 	{
-		return $this->getViewState('AppendDataBoundItems',false);
+		return $this->getViewState('AppendDataBoundItems', false);
 	}
 
 	/**
@@ -329,7 +329,7 @@ 
 	 */
 	public function setAppendDataBoundItems($value)
 	{
-		$this->setViewState('AppendDataBoundItems',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('AppendDataBoundItems', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -339,7 +339,7 @@ 
 	 */
 	public function getAutoPostBack()
 	{
-		return $this->getViewState('AutoPostBack',false);
+		return $this->getViewState('AutoPostBack', false);
 	}
 
 	/**
@@ -350,7 +350,7 @@ 
 	 */
 	public function setAutoPostBack($value)
 	{
-		$this->setViewState('AutoPostBack',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('AutoPostBack', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -358,7 +358,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getViewState('CausesValidation',true);
+		return $this->getViewState('CausesValidation', true);
 	}
 
 	/**
@@ -366,7 +366,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setViewState('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -374,7 +374,7 @@ 
 	 */
 	public function getDataTextField()
 	{
-		return $this->getViewState('DataTextField','');
+		return $this->getViewState('DataTextField', '');
 	}
 
 	/**
@@ -382,7 +382,7 @@ 
 	 */
 	public function setDataTextField($value)
 	{
-		$this->setViewState('DataTextField',$value,'');
+		$this->setViewState('DataTextField', $value, '');
 	}
 
 	/**
@@ -390,7 +390,7 @@ 
 	 */
 	public function getDataTextFormatString()
 	{
-		return $this->getViewState('DataTextFormatString','');
+		return $this->getViewState('DataTextFormatString', '');
 	}
 
 	/**
@@ -402,7 +402,7 @@ 
 	 */
 	public function setDataTextFormatString($value)
 	{
-		$this->setViewState('DataTextFormatString',$value,'');
+		$this->setViewState('DataTextFormatString', $value, '');
 	}
 
 	/**
@@ -410,7 +410,7 @@ 
 	 */
 	public function getDataValueField()
 	{
-		return $this->getViewState('DataValueField','');
+		return $this->getViewState('DataValueField', '');
 	}
 
 	/**
@@ -418,7 +418,7 @@ 
 	 */
 	public function setDataValueField($value)
 	{
-		$this->setViewState('DataValueField',$value,'');
+		$this->setViewState('DataValueField', $value, '');
 	}
 
 	/**
@@ -426,7 +426,7 @@ 
 	 */
 	public function getDataGroupField()
 	{
-		return $this->getViewState('DataGroupField','');
+		return $this->getViewState('DataGroupField', '');
 	}
 
 	/**
@@ -434,7 +434,7 @@ 
 	 */
 	public function setDataGroupField($value)
 	{
-		$this->setViewState('DataGroupField',$value,'');
+		$this->setViewState('DataGroupField', $value, '');
 	}
 
 	/**
@@ -442,7 +442,7 @@ 
 	 */
 	public function getItemCount()
 	{
-		return $this->_items?$this->_items->getCount():0;
+		return $this->_items ? $this->_items->getCount() : 0;
 	}
 
 	/**
@@ -450,7 +450,7 @@ 
 	 */
 	public function getHasItems()
 	{
-		return ($this->_items && $this->_items->getCount()>0);
+		return ($this->_items && $this->_items->getCount() > 0);
 	}
 
 	/**
@@ -471,7 +471,7 @@ 
 		if($this->_items)
 		{
 			$n=$this->_items->getCount();
-			for($i=0;$i<$n;++$i)
+			for($i=0; $i < $n; ++$i)
 				if($this->_items->itemAt($i)->getSelected())
 					return $i;
 		}
@@ -483,12 +483,12 @@ 
 	 */
 	public function setSelectedIndex($index)
 	{
-		if(($index=TPropertyValue::ensureInteger($index))<0)
+		if(($index=TPropertyValue::ensureInteger($index)) < 0)
 			$index=-1;
 		if($this->_items)
 		{
 			$this->clearSelection();
-			if($index>=0 && $index<$this->_items->getCount())
+			if($index >= 0 && $index < $this->_items->getCount())
 				$this->_items->itemAt($index)->setSelected(true);
 		}
 		$this->_cachedSelectedIndex=$index;
@@ -505,7 +505,7 @@ 
 		if($this->_items)
 		{
 			$n=$this->_items->getCount();
-			for($i=0;$i<$n;++$i)
+			for($i=0; $i < $n; ++$i)
 				if($this->_items->itemAt($i)->getSelected())
 					$selections[]=$i;
 		}
@@ -525,14 +525,14 @@ 
 				$n=$this->_items->getCount();
 				foreach($indices as $index)
 				{
-					if($index>=0 && $index<$n)
+					if($index >= 0 && $index < $n)
 						$this->_items->itemAt($index)->setSelected(true);
 				}
 			}
 			$this->_cachedSelectedIndices=$indices;
 		}
 		else
-			throw new TNotSupportedException('listcontrol_multiselect_unsupported',get_class($this));
+			throw new TNotSupportedException('listcontrol_multiselect_unsupported', get_class($this));
 
 		if($this->getAdapter() instanceof IListControlAdapter)
 			$this->getAdapter()->setSelectedIndices($indices);
@@ -543,7 +543,7 @@ 
 	 */
 	public function getSelectedItem()
 	{
-		if(($index=$this->getSelectedIndex())>=0)
+		if(($index=$this->getSelectedIndex()) >= 0)
 			return $this->_items->itemAt($index);
 		else
 			return null;
@@ -581,7 +581,7 @@ 
 	public function getSelectedValue()
 	{
 		$index=$this->getSelectedIndex();
-		return $index>=0?$this->getItems()->itemAt($index)->getValue():'';
+		return $index >= 0 ? $this->getItems()->itemAt($index)->getValue() : '';
 	}
 
 	/**
@@ -649,7 +649,7 @@ 
 			$this->_cachedSelectedValues=$values;
 		}
 		else
-			throw new TNotSupportedException('listcontrol_multiselect_unsupported',get_class($this));
+			throw new TNotSupportedException('listcontrol_multiselect_unsupported', get_class($this));
 
 		if($this->getAdapter() instanceof IListControlAdapter)
 			$this->getAdapter()->setSelectedValues($values);
@@ -691,7 +691,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -699,7 +699,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -708,7 +708,7 @@ 
 	 */
 	public function getPromptText()
 	{
-		return $this->getViewState('PromptText','');
+		return $this->getViewState('PromptText', '');
 	}
 
 	/**
@@ -717,7 +717,7 @@ 
 	 */
 	public function setPromptText($value)
 	{
-		$this->setViewState('PromptText',$value,'');
+		$this->setViewState('PromptText', $value, '');
 	}
 
 	/**
@@ -727,7 +727,7 @@ 
 	 */
 	public function getPromptValue()
 	{
-		return $this->getViewState('PromptValue','');
+		return $this->getViewState('PromptValue', '');
 	}
 
 	/**
@@ -737,7 +737,7 @@ 
 	 */
 	public function setPromptValue($value)
 	{
-		$this->setViewState('PromptValue',(string)$value,'');
+		$this->setViewState('PromptValue', (string) $value, '');
 	}
 
 	/**
@@ -748,7 +748,7 @@ 
 	 */
 	public function onSelectedIndexChanged($param)
 	{
-		$this->raiseEvent('OnSelectedIndexChanged',$this,$param);
+		$this->raiseEvent('OnSelectedIndexChanged', $this, $param);
 		$this->onTextChanged($param);
 	}
 
@@ -760,7 +760,7 @@ 
 	 */
 	public function onTextChanged($param)
 	{
-		$this->raiseEvent('OnTextChanged',$this,$param);
+		$this->raiseEvent('OnTextChanged', $this, $param);
 	}
 
 	/**
@@ -776,7 +776,7 @@ 
 			$value=$text;
 		if($value!=='')
 		{
-			$writer->addAttribute('value',$value);
+			$writer->addAttribute('value', $value);
 			$writer->renderBeginTag('option');
 			$writer->write(THttpUtility::htmlEncode($text));
 			$writer->renderEndTag();
@@ -814,14 +814,14 @@ 
 							}
 							if($group!==null)
 							{
-								$writer->addAttribute('label',$group);
+								$writer->addAttribute('label', $group);
 								$writer->renderBeginTag('optgroup');
 								$writer->writeLine();
 								$previousGroup=$group;
 							}
 						}
 						foreach($item->getAttributes() as $name=>$value)
-							$writer->addAttribute($name,$value);
+							$writer->addAttribute($name, $value);
 					}
 					else if($previousGroup!==null)
 					{
@@ -830,8 +830,8 @@ 
 						$previousGroup=null;
 					}
 					if($item->getSelected())
-						$writer->addAttribute('selected','selected');
-					$writer->addAttribute('value',$item->getValue());
+						$writer->addAttribute('selected', 'selected');
+					$writer->addAttribute('value', $item->getValue());
 					$writer->renderBeginTag('option');
 					$writer->write(THttpUtility::htmlEncode($item->getText()));
 					$writer->renderEndTag();
@@ -858,13 +858,13 @@ 
 	 * @param mixed the data to be formatted
 	 * @return string the formatted result
 	 */
-	protected function formatDataValue($formatString,$value)
+	protected function formatDataValue($formatString, $value)
 	{
 		if($formatString==='')
 			return TPropertyValue::ensureString($value);
 		else if($formatString[0]==='#')
 		{
-			$expression=strtr(substr($formatString,1),array('{0}'=>'$value'));
+			$expression=strtr(substr($formatString, 1), array('{0}'=>'$value'));
 			try
 			{
 				if(eval("\$result=$expression;")===false)
@@ -873,11 +873,11 @@ 
 			}
 			catch(Exception $e)
 			{
-				throw new TInvalidDataValueException('listcontrol_expression_invalid',get_class($this),$expression,$e->getMessage());
+				throw new TInvalidDataValueException('listcontrol_expression_invalid', get_class($this), $expression, $e->getMessage());
 			}
 		}
 		else
-			return sprintf($formatString,$value);
+			return sprintf($formatString, $value);
 	}
 }
 

Braces +11 added lines, -22 removed lines

@@ -142,8 +142,7 @@ 
 			{
 				$this->renderClientControlScript($writer);
 			}
-		}
-		else if($this->getEnabled())
+		} else if($this->getEnabled())
 			$writer->addAttribute('disabled','disabled');
 		parent::addAttributesToRender($writer);
 	}
@@ -229,8 +228,7 @@ 
 				$item->setValue($value);
 				if($groupField!=='')
 					$item->setAttribute('Group',TDataFieldAccessor::getDataFieldValue($object,$groupField));
-			}
-			else
+			} else
 			{
 				$text=$object;
 				$item->setValue("$key");
@@ -243,18 +241,15 @@ 
 		{
 			$this->setSelectedValue($this->_cachedSelectedValue);
 			$this->resetCachedSelections();
-		}
-		else if($this->_cachedSelectedIndex!==-1)
+		} else if($this->_cachedSelectedIndex!==-1)
 		{
 			$this->setSelectedIndex($this->_cachedSelectedIndex);
 			$this->resetCachedSelections();
-		}
-		else if($this->_cachedSelectedValues!==null)
+		} else if($this->_cachedSelectedValues!==null)
 		{
 			$this->setSelectedValues($this->_cachedSelectedValues);
 			$this->resetCachedSelections();
-		}
-		else if($this->_cachedSelectedIndices!==null)
+		} else if($this->_cachedSelectedIndices!==null)
 		{
 			$this->setSelectedIndices($this->_cachedSelectedIndices);
 			$this->resetCachedSelections();
@@ -530,8 +525,7 @@ 
 				}
 			}
 			$this->_cachedSelectedIndices=$indices;
-		}
-		else
+		} else
 			throw new TNotSupportedException('listcontrol_multiselect_unsupported',get_class($this));
 
 		if($this->getAdapter() instanceof IListControlAdapter)
@@ -600,8 +594,7 @@ 
 	    	{
 		    	$this->clearSelection();
 		    	$item->setSelected(true);
-	    	}
-	    	else
+	    	} else
 				$this->clearSelection();
     	}
     	$this->_cachedSelectedValue=$value;
@@ -647,8 +640,7 @@ 
 				}
 			}
 			$this->_cachedSelectedValues=$values;
-		}
-		else
+		} else
 			throw new TNotSupportedException('listcontrol_multiselect_unsupported',get_class($this));
 
 		if($this->getAdapter() instanceof IListControlAdapter)
@@ -822,8 +814,7 @@ 
 						}
 						foreach($item->getAttributes() as $name=>$value)
 							$writer->addAttribute($name,$value);
-					}
-					else if($previousGroup!==null)
+					} else if($previousGroup!==null)
 					{
 						$writer->renderEndTag();
 						$writer->writeLine();
@@ -870,13 +861,11 @@ 
 				if(eval("\$result=$expression;")===false)
 					throw new Exception('');
 				return $result;
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				throw new TInvalidDataValueException('listcontrol_expression_invalid',get_class($this),$expression,$e->getMessage());
 			}
-		}
-		else
+		} else
 			return sprintf($formatString,$value);
 	}
 }

framework/Web/UI/WebControls/TAccordion.php

Indentation +14 added lines, -14 removed lines

@@ -180,24 +180,24 @@ 
 	}
 
 	/**
-	* @return string URL for the CSS file including all relevant CSS class definitions. Defaults to ''.
-	*/
+	 * @return string URL for the CSS file including all relevant CSS class definitions. Defaults to ''.
+	 */
 	public function getCssUrl()
 	{
 		return $this->getViewState('CssUrl','default');
 	}
 
 	/**
-	* @param string URL for the CSS file including all relevant CSS class definitions.
-	*/
+	 * @param string URL for the CSS file including all relevant CSS class definitions.
+	 */
 	public function setCssUrl($value)
 	{
 		$this->setViewState('CssUrl',TPropertyValue::ensureString($value),'');
 	}
 
 	/**
-		* @return string CSS class for the whole accordion control div.
-	*/
+	 * @return string CSS class for the whole accordion control div.
+	 */
 	public function getCssClass()
 	{
 		$cssClass=parent::getCssClass();
@@ -205,32 +205,32 @@ 
 	}
 
 	/**
-		* @return string CSS class for the currently displayed view div. Defaults to 'accordion-view'.
-	*/
+	 * @return string CSS class for the currently displayed view div. Defaults to 'accordion-view'.
+	 */
 	public function getViewCssClass()
 	{
 		return $this->getViewStyle()->getCssClass();
 	}
 
 	/**
-	* @param string CSS class for the currently displayed view div.
-	*/
+	 * @param string CSS class for the currently displayed view div.
+	 */
 	public function setViewCssClass($value)
 	{
 		$this->getViewStyle()->setCssClass($value);
 	}
 
 	/**
-		* @return string CSS class for the currently displayed view div. Defaults to 'accordion-view'.
-	*/
+	 * @return string CSS class for the currently displayed view div. Defaults to 'accordion-view'.
+	 */
 	public function getAnimationDuration()
 	{
 		return $this->getViewState('AnimationDuration','1');
 	}
 
 	/**
-	* @param string CSS class for the currently displayed view div.
-	*/
+	 * @param string CSS class for the currently displayed view div.
+	 */
 	public function setAnimationDuration($value)
 	{
 		$this->setViewState('AnimationDuration',$value);

Doc Comments +2 added lines, -1 removed lines

@@ -546,7 +546,7 @@ 
 	private $_active=false;
 
 	/**
-	 * @return the tag name for the view element
+	 * @return string tag name for the view element
 	 */
 	protected function getTagName()
 	{
@@ -714,6 +714,7 @@ 
 	/**
 	 * Finds the index of the tab view whose ID is the same as the one being looked for.
 	 * @param string the explicit ID of the tab view to be looked for
+	 * @param string $id
 	 * @return integer the index of the tab view found, -1 if not found.
 	 */
 	public function findIndexByID($id)

Spacing +56 added lines, -56 removed lines

@@ -94,7 +94,7 @@ 
 	 */
 	public function getActiveViewIndex()
 	{
-		return $this->getViewState('ActiveViewIndex',0);
+		return $this->getViewState('ActiveViewIndex', 0);
 	}
 
 	/**
@@ -103,7 +103,7 @@ 
 	 */
 	public function setActiveViewIndex($value)
 	{
-		$this->setViewState('ActiveViewIndex',TPropertyValue::ensureInteger($value),0);
+		$this->setViewState('ActiveViewIndex', TPropertyValue::ensureInteger($value), 0);
 		$this->setActiveViewID('');
 	}
 
@@ -115,7 +115,7 @@ 
 	 */
 	public function getActiveViewID()
 	{
-		return $this->getViewState('ActiveViewID','');
+		return $this->getViewState('ActiveViewID', '');
 	}
 
 	/**
@@ -123,7 +123,7 @@ 
 	 */
 	public function setActiveViewID($value)
 	{
-		$this->setViewState('ActiveViewID',$value,'');
+		$this->setViewState('ActiveViewID', $value, '');
 	}
 
 	/**
@@ -139,17 +139,17 @@ 
 		$views=$this->getViews();
 		if(($id=$this->getActiveViewID())!=='')
 		{
-			if(($index=$views->findIndexByID($id))>=0)
+			if(($index=$views->findIndexByID($id)) >= 0)
 				$activeView=$views->itemAt($index);
 			else
-				throw new TInvalidDataValueException('accordion_activeviewid_invalid',$id);
+				throw new TInvalidDataValueException('accordion_activeviewid_invalid', $id);
 		}
-		else if(($index=$this->getActiveViewIndex())>=0)
+		else if(($index=$this->getActiveViewIndex()) >= 0)
 		{
-			if($index<$views->getCount())
+			if($index < $views->getCount())
 				$activeView=$views->itemAt($index);
 			else
-				throw new TInvalidDataValueException('accordion_activeviewindex_invalid',$index);
+				throw new TInvalidDataValueException('accordion_activeviewindex_invalid', $index);
 		}
 		else
 		{
@@ -173,7 +173,7 @@ 
 	 */
 	public function setActiveView($view)
 	{
-		if($this->getViews()->indexOf($view)>=0)
+		if($this->getViews()->indexOf($view) >= 0)
 			$this->activateView($view);
 		else
 			throw new TInvalidOperationException('accordion_view_inexistent');
@@ -184,7 +184,7 @@ 
 	*/
 	public function getCssUrl()
 	{
-		return $this->getViewState('CssUrl','default');
+		return $this->getViewState('CssUrl', 'default');
 	}
 
 	/**
@@ -192,7 +192,7 @@ 
 	*/
 	public function setCssUrl($value)
 	{
-		$this->setViewState('CssUrl',TPropertyValue::ensureString($value),'');
+		$this->setViewState('CssUrl', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -201,7 +201,7 @@ 
 	public function getCssClass()
 	{
 		$cssClass=parent::getCssClass();
-			return $cssClass===''?'accordion':$cssClass;
+			return $cssClass==='' ? 'accordion' : $cssClass;
 	}
 
 	/**
@@ -225,7 +225,7 @@ 
 	*/
 	public function getAnimationDuration()
 	{
-		return $this->getViewState('AnimationDuration','1');
+		return $this->getViewState('AnimationDuration', '1');
 	}
 
 	/**
@@ -233,7 +233,7 @@ 
 	*/
 	public function setAnimationDuration($value)
 	{
-		$this->setViewState('AnimationDuration',$value);
+		$this->setViewState('AnimationDuration', $value);
 	}
 
 	/**
@@ -241,11 +241,11 @@ 
 	 */
 	public function getViewStyle()
 	{
-		if(($style=$this->getViewState('ViewStyle',null))===null)
+		if(($style=$this->getViewState('ViewStyle', null))===null)
 		{
 			$style=new TStyle;
 			$style->setCssClass('accordion-view');
-			$this->setViewState('ViewStyle',$style,null);
+			$this->setViewState('ViewStyle', $style, null);
 		}
 		return $style;
 	}
@@ -271,11 +271,11 @@ 
 	 */
 	public function getHeaderStyle()
 	{
-		if(($style=$this->getViewState('HeaderStyle',null))===null)
+		if(($style=$this->getViewState('HeaderStyle', null))===null)
 		{
 			$style=new TStyle;
 			$style->setCssClass('accordion-header');
-			$this->setViewState('HeaderStyle',$style,null);
+			$this->setViewState('HeaderStyle', $style, null);
 		}
 		return $style;
 	}
@@ -301,11 +301,11 @@ 
 	 */
 	public function getActiveHeaderStyle()
 	{
-		if(($style=$this->getViewState('ActiveHeaderStyle',null))===null)
+		if(($style=$this->getViewState('ActiveHeaderStyle', null))===null)
 		{
 			$style=new TStyle;
 			$style->setCssClass('accordion-header-active');
-			$this->setViewState('ActiveHeaderStyle',$style,null);
+			$this->setViewState('ActiveHeaderStyle', $style, null);
 		}
 		return $style;
 	}
@@ -355,11 +355,11 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the control has been changed
 	 */
-	public function loadPostData($key,$values)
+	public function loadPostData($key, $values)
 	{
 		if(($index=$values[$this->getClientID().'_1'])!==null)
 		{
-			$index=(int)$index;
+			$index=(int) $index;
 			$currentIndex=$this->getActiveViewIndex();
 			if($currentIndex!==$index)
 			{
@@ -399,7 +399,7 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 		$this->setCssClass($this->getCssClass());
 		parent::addAttributesToRender($writer);
 	}
@@ -412,7 +412,7 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		$this->getActiveView();  // determine the active view
+		$this->getActiveView(); // determine the active view
 		$this->registerStyleSheet();
 	}
 
@@ -423,17 +423,17 @@ 
 	 */
 	protected function registerStyleSheet()
 	{
-		$url = $this->getCssUrl();
+		$url=$this->getCssUrl();
 
-		if($url === '') {
+		if($url==='') {
 			return;
 		}
 
-		if($url === 'default') {
-			$url = $this->getApplication()->getAssetManager()->publishFilePath(dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'accordion.css');
+		if($url==='default') {
+			$url=$this->getApplication()->getAssetManager()->publishFilePath(dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'accordion.css');
 		}
 
-		if($url !== '') {
+		if($url!=='') {
 			$this->getPage()->getClientScript()->registerStyleSheetFile($url, $url);
 		}
 	}
@@ -452,7 +452,7 @@ 
 		$code="new $className($options);";
 		$cs->registerEndScript("prado:$id", $code);
 		// ensure an item is always active and visible
-		$index = $this->getActiveViewIndex();
+		$index=$this->getActiveViewIndex();
 		if(!$this->getViews()->itemAt($index)->Visible)
 			$index=0;
 		$cs->registerHiddenField($id.'_1', $index);
@@ -475,17 +475,17 @@ 
 	 */
 	protected function getClientOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['ActiveHeaderCssClass'] = $this->getActiveHeaderCssClass();
-		$options['HeaderCssClass'] = $this->getHeaderCssClass();
-		$options['Duration'] = $this->getAnimationDuration();
+		$options['ID']=$this->getClientID();
+		$options['ActiveHeaderCssClass']=$this->getActiveHeaderCssClass();
+		$options['HeaderCssClass']=$this->getHeaderCssClass();
+		$options['Duration']=$this->getAnimationDuration();
 
-		if (($viewheight = $this->getViewHeight())>0)
-			$options['maxHeight'] = $viewheight;
-		$views = array();
+		if(($viewheight=$this->getViewHeight()) > 0)
+			$options['maxHeight']=$viewheight;
+		$views=array();
 		foreach($this->getViews() as $view)
-			$views[$view->getClientID()] = $view->getVisible() ? '1': '0';
-		$options['Views'] = $views;
+			$views[$view->getClientID()]=$view->getVisible() ? '1' : '0';
+		$options['Views']=$views;
 
 		return $options;
 	}
@@ -520,7 +520,7 @@ 
 	public function renderContents($writer)
 	{
 		$views=$this->getViews();
-		if($views->getCount()>0)
+		if($views->getCount() > 0)
 		{
 			$writer->writeLine();
 			foreach($views as $view)
@@ -566,13 +566,13 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		if(!$this->getActive() && $this->getPage()->getClientSupportsJavaScript())
-			$this->getStyle()->setStyleField('display','none');
+			$this->getStyle()->setStyleField('display', 'none');
 
 		$this->getStyle()->mergeWith($this->getParent()->getViewStyle());
 
 		parent::addAttributesToRender($writer);
 
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 	}
 
 	/**
@@ -580,7 +580,7 @@ 
 	 */
 	public function getCaption()
 	{
-		return $this->getViewState('Caption','');
+		return $this->getViewState('Caption', '');
 	}
 
 	/**
@@ -588,7 +588,7 @@ 
 	 */
 	public function setCaption($value)
 	{
-		$this->setViewState('Caption',TPropertyValue::ensureString($value),'');
+		$this->setViewState('Caption', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -596,7 +596,7 @@ 
 	 */
 	public function getNavigateUrl()
 	{
-		return $this->getViewState('NavigateUrl','');
+		return $this->getViewState('NavigateUrl', '');
 	}
 
 	/**
@@ -606,7 +606,7 @@ 
 	 */
 	public function setNavigateUrl($value)
 	{
-		$this->setViewState('NavigateUrl',TPropertyValue::ensureString($value),'');
+		$this->setViewState('NavigateUrl', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -614,7 +614,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -624,7 +624,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',TPropertyValue::ensureString($value),'');
+		$this->setViewState('Text', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -663,9 +663,9 @@ 
 	{
 		if($this->getVisible(false) && $this->getPage()->getClientSupportsJavaScript())
 		{
-			$writer->addAttribute('id',$this->getClientID().'_0');
+			$writer->addAttribute('id', $this->getClientID().'_0');
 
-			$style=$this->getActive()?$this->getParent()->getActiveHeaderStyle():$this->getParent()->getHeaderStyle();
+			$style=$this->getActive() ? $this->getParent()->getActiveHeaderStyle() : $this->getParent()->getHeaderStyle();
 
 			$style->addAttributesToRender($writer);
 
@@ -684,14 +684,14 @@ 
 	 */
 	protected function renderHeaderContent($writer)
 	{
-		$url = $this->getNavigateUrl();
+		$url=$this->getNavigateUrl();
 		if(($caption=$this->getCaption())==='')
 			$caption='&nbsp;';
 
-		if ($url!='')
+		if($url!='')
 			$writer->write("<a href=\"{$url}\">");
 		$writer->write("{$caption}");
-		if ($url!='')
+		if($url!='')
 			$writer->write("</a>");
 	}
 }
@@ -714,10 +714,10 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a {@link TAccordionView} object.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof TAccordionView)
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('tabviewcollection_tabview_required');
 	}

Braces +3 added lines, -6 removed lines

@@ -136,15 +136,13 @@ 
 				$activeView=$views->itemAt($index);
 			else
 				throw new TInvalidDataValueException('tabpanel_activeviewid_invalid',$id);
-		}
-		else if(($index=$this->getActiveViewIndex())>=0)
+		} else if(($index=$this->getActiveViewIndex())>=0)
 		{
 			if($index<$views->getCount())
 				$activeView=$views->itemAt($index);
 			else
 				throw new TInvalidDataValueException('tabpanel_activeviewindex_invalid',$index);
-		}
-		else
+		} else
 		{
 			foreach($views as $index=>$view)
 			{
@@ -320,8 +318,7 @@ 
 				$this->setActiveViewIndex($index);
 				$this->setActiveViewID($view->getID(false));
 				$view->setActive(true);
-			}
-			else
+			} else
 				$v->setActive(false);
 		}
 	}

framework/Web/UI/WebControls/TXmlTransform.php

Indentation +69 added lines, -69 removed lines

@@ -46,50 +46,50 @@ 
    * @throws TConfigurationException If XSL extension is not available
    */
   public function __construct() {
-    if(!class_exists('XSLTProcessor', false)) {
-      throw new TConfigurationException('xmltransform_xslextension_required');
-    }
+	if(!class_exists('XSLTProcessor', false)) {
+	  throw new TConfigurationException('xmltransform_xslextension_required');
+	}
   }
 
   /**
    * @return string The path to the XML style sheet.
    */
   public function getTransformPath() {
-    return $this->getViewState('TransformPath', '');
+	return $this->getViewState('TransformPath', '');
   }
 
   /**
    * @param string The path to the XML style sheet.  It must be in namespace format.
    */
   public function setTransformPath($value) {
-    if(!is_file($value)) {
-      $value = Prado::getPathOfNamespace($value, self::EXT_XSL_FILE);
-      if($value === null) {
+	if(!is_file($value)) {
+	  $value = Prado::getPathOfNamespace($value, self::EXT_XSL_FILE);
+	  if($value === null) {
 	throw new TInvalidDataValueException('xmltransform_transformpath_invalid', $value);
-      }
-    }
-    $this->setViewState('TransformPath', $value, '');
+	  }
+	}
+	$this->setViewState('TransformPath', $value, '');
   }
 
   /**
    * @return string XML style sheet as string
    */
   public function getTransformContent() {
-    return $this->getViewState('TransformContent', '');
+	return $this->getViewState('TransformContent', '');
   }
 
   /**
    * @param string $value XML style sheet as string
    */
   public function setTransformContent($value) {
-    $this->setViewState('TransformContent', $value, '');
+	$this->setViewState('TransformContent', $value, '');
   }
 
   /**
    * @return string The path to the XML document. It must be in namespace format.
    */
   public function getDocumentPath() {
-    return $this->getViewState('DocumentPath', '');
+	return $this->getViewState('DocumentPath', '');
   }
 
   /**
@@ -97,27 +97,27 @@ 
    * @throws TInvalidDataValueException
    */
   public function setDocumentPath($value) {
-    if(!is_file($value)) {
-      $value = Prado::getPathOfNamespace($value, self::EXT_XML_FILE);
-      if($value === null) {
+	if(!is_file($value)) {
+	  $value = Prado::getPathOfNamespace($value, self::EXT_XML_FILE);
+	  if($value === null) {
 	throw new TInvalidDataValueException('xmltransform_documentpath_invalid', $value);
-      }
-    }
-    $this->setViewState('DocumentPath', $value, '');
+	  }
+	}
+	$this->setViewState('DocumentPath', $value, '');
   }
 
   /**
    * @return string XML data
    */
   public function getDocumentContent() {
-    return $this->getViewState('DocumentContent', '');
+	return $this->getViewState('DocumentContent', '');
   }
 
   /**
    * @param string $value XML data. If not empty, it takes precedence over {@link setDocumentPath DocumentPath}.
    */
   public function setDocumentContent($value) {
-    $this->setViewState('DocumentContent', $value, '');
+	$this->setViewState('DocumentContent', $value, '');
   }
 
   /**
@@ -125,41 +125,41 @@ 
    * @return TAttributeCollection the list of custom parameters
    */
   public function getParameters() {
-    if($params = $this->getViewState('Parameters',null)) {
-      return $params;
-    } else {
-      $params = new TAttributeCollection();
-      $this->setViewState('Parameters', $params, null);
-      return $params;
-    }
+	if($params = $this->getViewState('Parameters',null)) {
+	  return $params;
+	} else {
+	  $params = new TAttributeCollection();
+	  $this->setViewState('Parameters', $params, null);
+	  return $params;
+	}
   }
 
   private function getTransformXmlDocument() {
-    if(($content = $this->getTransformContent()) !== '') {
-      $document = new DOMDocument();
-      $document->loadXML($content);
-      return $document;
-    } else if(($path = $this->getTransformPath()) !== '') {
-      $document = new DOMDocument();
-      $document->load($path);
-      return $document;
-    } else {
-      throw new TConfigurationException('xmltransform_transform_required');
-    }
+	if(($content = $this->getTransformContent()) !== '') {
+	  $document = new DOMDocument();
+	  $document->loadXML($content);
+	  return $document;
+	} else if(($path = $this->getTransformPath()) !== '') {
+	  $document = new DOMDocument();
+	  $document->load($path);
+	  return $document;
+	} else {
+	  throw new TConfigurationException('xmltransform_transform_required');
+	}
   }
 
   private function getSourceXmlDocument() {
-    if(($content = $this->getDocumentContent()) !== '') {
-      $document = new DOMDocument();
-      $document->loadXML($content);
-      return $document;
-    } else if(($path = $this->getDocumentPath()) !== '') {
-      $document = new DOMDocument();
-      $document->load($path);
-      return $document;
-    } else {
-      return null;
-    }
+	if(($content = $this->getDocumentContent()) !== '') {
+	  $document = new DOMDocument();
+	  $document->loadXML($content);
+	  return $document;
+	} else if(($path = $this->getDocumentPath()) !== '') {
+	  $document = new DOMDocument();
+	  $document->load($path);
+	  return $document;
+	} else {
+	  return null;
+	}
   }
 
   /**
@@ -167,27 +167,27 @@ 
    * @param THtmlWriter The writer used for the rendering purpose
    */
   public function render($writer) {
-    if(($document=$this->getSourceXmlDocument()) === null) {
+	if(($document=$this->getSourceXmlDocument()) === null) {
 	  $htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
 	  parent::render($htmlWriter);
-      $document = new DOMDocument();
-      $document->loadXML($htmlWriter->flush());
-    }
-    $stylesheet = $this->getTransformXmlDocument();
-
-    // Perform XSL transformation
-    $xslt = new XSLTProcessor();
-    $xslt->importStyleSheet($stylesheet);
-
-    // Check for parameters
-    $parameters = $this->getParameters();
-    foreach($parameters as $name => $value) {
-      $xslt->setParameter('', $name, $value);
-    }
-    $output = $xslt->transformToXML($document);
-
-    // Write output
-    $writer->write($output);
+	  $document = new DOMDocument();
+	  $document->loadXML($htmlWriter->flush());
+	}
+	$stylesheet = $this->getTransformXmlDocument();
+
+	// Perform XSL transformation
+	$xslt = new XSLTProcessor();
+	$xslt->importStyleSheet($stylesheet);
+
+	// Check for parameters
+	$parameters = $this->getParameters();
+	foreach($parameters as $name => $value) {
+	  $xslt->setParameter('', $name, $value);
+	}
+	$output = $xslt->transformToXML($document);
+
+	// Write output
+	$writer->write($output);
   }
 }
 

Spacing +23 added lines, -23 removed lines

@@ -36,8 +36,8 @@ 
  */
 class TXmlTransform extends TControl {
 
-  const EXT_XML_FILE = '.xml';
-  const EXT_XSL_FILE = '.xsl';
+  const EXT_XML_FILE='.xml';
+  const EXT_XSL_FILE='.xsl';
 
   /**
    * Constructor
@@ -63,8 +63,8 @@ 
    */
   public function setTransformPath($value) {
     if(!is_file($value)) {
-      $value = Prado::getPathOfNamespace($value, self::EXT_XSL_FILE);
-      if($value === null) {
+      $value=Prado::getPathOfNamespace($value, self::EXT_XSL_FILE);
+      if($value===null) {
 	throw new TInvalidDataValueException('xmltransform_transformpath_invalid', $value);
       }
     }
@@ -98,8 +98,8 @@ 
    */
   public function setDocumentPath($value) {
     if(!is_file($value)) {
-      $value = Prado::getPathOfNamespace($value, self::EXT_XML_FILE);
-      if($value === null) {
+      $value=Prado::getPathOfNamespace($value, self::EXT_XML_FILE);
+      if($value===null) {
 	throw new TInvalidDataValueException('xmltransform_documentpath_invalid', $value);
       }
     }
@@ -125,22 +125,22 @@ 
    * @return TAttributeCollection the list of custom parameters
    */
   public function getParameters() {
-    if($params = $this->getViewState('Parameters',null)) {
+    if($params=$this->getViewState('Parameters', null)) {
       return $params;
     } else {
-      $params = new TAttributeCollection();
+      $params=new TAttributeCollection();
       $this->setViewState('Parameters', $params, null);
       return $params;
     }
   }
 
   private function getTransformXmlDocument() {
-    if(($content = $this->getTransformContent()) !== '') {
-      $document = new DOMDocument();
+    if(($content=$this->getTransformContent())!=='') {
+      $document=new DOMDocument();
       $document->loadXML($content);
       return $document;
-    } else if(($path = $this->getTransformPath()) !== '') {
-      $document = new DOMDocument();
+    } else if(($path=$this->getTransformPath())!=='') {
+      $document=new DOMDocument();
       $document->load($path);
       return $document;
     } else {
@@ -149,12 +149,12 @@ 
   }
 
   private function getSourceXmlDocument() {
-    if(($content = $this->getDocumentContent()) !== '') {
-      $document = new DOMDocument();
+    if(($content=$this->getDocumentContent())!=='') {
+      $document=new DOMDocument();
       $document->loadXML($content);
       return $document;
-    } else if(($path = $this->getDocumentPath()) !== '') {
-      $document = new DOMDocument();
+    } else if(($path=$this->getDocumentPath())!=='') {
+      $document=new DOMDocument();
       $document->load($path);
       return $document;
     } else {
@@ -167,24 +167,24 @@ 
    * @param THtmlWriter The writer used for the rendering purpose
    */
   public function render($writer) {
-    if(($document=$this->getSourceXmlDocument()) === null) {
-	  $htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
+    if(($document=$this->getSourceXmlDocument())===null) {
+	  $htmlWriter=Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
 	  parent::render($htmlWriter);
-      $document = new DOMDocument();
+      $document=new DOMDocument();
       $document->loadXML($htmlWriter->flush());
     }
-    $stylesheet = $this->getTransformXmlDocument();
+    $stylesheet=$this->getTransformXmlDocument();
 
     // Perform XSL transformation
-    $xslt = new XSLTProcessor();
+    $xslt=new XSLTProcessor();
     $xslt->importStyleSheet($stylesheet);
 
     // Check for parameters
-    $parameters = $this->getParameters();
+    $parameters=$this->getParameters();
     foreach($parameters as $name => $value) {
       $xslt->setParameter('', $name, $value);
     }
-    $output = $xslt->transformToXML($document);
+    $output=$xslt->transformToXML($document);
 
     // Write output
     $writer->write($output);

framework/Web/UI/WebControls/TReCaptcha.php

Indentation +3 added lines, -3 removed lines

@@ -170,12 +170,12 @@
 	public function validate()
 	{
 		if (!
-		      (
+			  (
 			($challenge = @$_POST[$this->getChallengeFieldName()])
 			and
 			($response = @$_POST[$this->getResponseFieldName()])
-		      )
-                   )
+			  )
+				   )
 		   return false;
 
 		$resp = recaptcha_check_answer(

Braces +1 added lines, -2 removed lines

@@ -246,8 +246,7 @@
 				$writer->write($html);
 
 				$cs->registerEndScript('ReCaptcha::EventScript', 'jQuery(document).ready(function() { '.$readyscript.'; } );');
-			}
-		else
+			} else
 			{
 				$options = $this->getClientSideOptions();
 				$options['callback'] = new TJavaScriptLiteral('function() { '.$readyscript.'; '.$this->getCallbackScript().'; }');

Spacing +27 added lines, -28 removed lines

@@ -55,8 +55,8 @@ 
 {
 	private $_isValid=true;
 
-	const ChallengeFieldName = 'recaptcha_challenge_field';
-	const ResponseFieldName = 'recaptcha_response_field';
+	const ChallengeFieldName='recaptcha_challenge_field';
+	const ResponseFieldName='recaptcha_response_field';
 
 	public function getTagName()
 	{
@@ -157,28 +157,27 @@ 
 	
 	public function getClientSideOptions()
 	{
-		$options = array();
-		if ($theme = $this->getThemeName())
-			$options['theme'] = $theme;
-		if ($lang = $this->getLanguage())
-			$options['lang'] = $lang;
-		if ($trans = $this->getCustomTranslations())
-			$options['custom_translations'] = $trans;
+		$options=array();
+		if($theme=$this->getThemeName())
+			$options['theme']=$theme;
+		if($lang=$this->getLanguage())
+			$options['lang']=$lang;
+		if($trans=$this->getCustomTranslations())
+			$options['custom_translations']=$trans;
 		return $options;
 	}
 
 	public function validate()
 	{
-		if (!
-		      (
-			($challenge = @$_POST[$this->getChallengeFieldName()])
+		if(!(
+			($challenge=@$_POST[$this->getChallengeFieldName()])
 			and
-			($response = @$_POST[$this->getResponseFieldName()])
+			($response=@$_POST[$this->getResponseFieldName()])
 		      )
                    )
 		   return false;
 
-		$resp = recaptcha_check_answer(
+		$resp=recaptcha_check_answer(
 			$this->getPrivateKey(),
 			$_SERVER["REMOTE_ADDR"],
 			$challenge,
@@ -195,13 +194,13 @@ 
 	{
 		parent::onPreRender($param);
 
-		if("" == $this->getPublicKey())
+		if(""==$this->getPublicKey())
 			throw new TConfigurationException('recaptcha_publickey_unknown');
-		if("" == $this->getPrivateKey())
+		if(""==$this->getPrivateKey())
 			throw new TConfigurationException('recaptcha_privatekey_unknown');
 
 		// need to register captcha fields so they will be sent back also in callbacks 
-		$page = $this->getPage();
+		$page=$this->getPage();
 		$page->registerRequiresPostData($this->getChallengeFieldName());
 		$page->registerRequiresPostData($this->getResponseFieldName());
 	}
@@ -209,32 +208,32 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 	}
 
 	public function regenerateToken()
 	{
 		// if we're in a callback, then schedule re-rendering of the control 
 		// if not, don't do anything, because a new challenge will be rendered anyway
-		if ($this->Page->IsCallback)
-			$this->Page->CallbackClient->jQuery($this->getClientID().' #recaptcha_reload','click');
+		if($this->Page->IsCallback)
+			$this->Page->CallbackClient->jQuery($this->getClientID().' #recaptcha_reload', 'click');
 	}
 
 	public function renderContents($writer)
 	{
-		$readyscript = 'jQuery(document).trigger('.TJavaScript::quoteString('captchaready:'.$this->getClientID()).')';
-		$cs = $this->Page->ClientScript;
-		$id = $this->getClientID();
-		$divid = $id.'_1_recaptchadiv';
+		$readyscript='jQuery(document).trigger('.TJavaScript::quoteString('captchaready:'.$this->getClientID()).')';
+		$cs=$this->Page->ClientScript;
+		$id=$this->getClientID();
+		$divid=$id.'_1_recaptchadiv';
 		$writer->write('<div id="'.htmlspecialchars($divid).'">');
 	
-		if (!$this->Page->IsCallback)
+		if(!$this->Page->IsCallback)
 			{
 				$writer->write(TJavaScript::renderScriptBlock(
 					'var RecaptchaOptions = '.TJavaScript::jsonEncode($this->getClientSideOptions()).';'
 				));
 	
-				$html = recaptcha_get_html($this->getPublicKey());
+				$html=recaptcha_get_html($this->getPublicKey());
 				/*
 				reCAPTCHA currently does not support multiple validations per page
 				$html = str_replace(
@@ -249,8 +248,8 @@ 
 			}
 		else
 			{
-				$options = $this->getClientSideOptions();
-				$options['callback'] = new TJavaScriptLiteral('function() { '.$readyscript.'; '.$this->getCallbackScript().'; }');
+				$options=$this->getClientSideOptions();
+				$options['callback']=new TJavaScriptLiteral('function() { '.$readyscript.'; '.$this->getCallbackScript().'; }');
 				$cs->registerScriptFile('ReCaptcha::AjaxScript', 'http://www.google.com/recaptcha/api/js/recaptcha_ajax.js');
 				$cs->registerEndScript('ReCaptcha::CreateScript::'.$id, implode(' ', array(
 					'if (!jQuery('.TJavaScript::quoteString('#'.$this->getResponseFieldName()).'))',