pradosoft / prado

framework/Web/UI/WebControls/TListControl.php

Indentation +43 added lines, -43 removed lines

@@ -332,8 +332,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()
 	{
@@ -589,23 +589,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);
-    }
+	}
 
 
 	/**
@@ -653,36 +653,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

framework/Caching/TMemCache.php

Indentation +62 added lines, -62 removed lines

@@ -111,30 +111,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.
@@ -178,63 +178,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', '\Prado\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, '\Prado\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', '\Prado\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, '\Prado\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;
+			}
+		}
 	}
 
 	/**

framework/Web/UI/WebControls/TReCaptcha.php

Indentation +11 added lines, -11 removed lines

@@ -178,12 +178,12 @@ 
 	public function validate()
 	{
 		if (!
-		      (
+			  (
 			($challenge = @$_POST[$this->getChallengeFieldName()])
 			and
 			($response = @$_POST[$this->getResponseFieldName()])
-		      )
-                   )
+			  )
+				   )
 		   return false;
 
 		return $this->recaptcha_check_answer(
@@ -350,14 +350,14 @@ 
 	}
 
 	/**
-	* Calls an HTTP POST function to verify if the user's guess was correct
-	* @param string $privkey
-	* @param string $remoteip
-	* @param string $challenge
-	* @param string $response
-	* @param array $extra_params an array of extra variables to post to the server
-	* @return bool
-	*/
+	 * Calls an HTTP POST function to verify if the user's guess was correct
+	 * @param string $privkey
+	 * @param string $remoteip
+	 * @param string $challenge
+	 * @param string $response
+	 * @param array $extra_params an array of extra variables to post to the server
+	 * @return bool
+	 */
 	private function recaptcha_check_answer($privkey, $remoteip, $challenge, $response, $extra_params = array())
 	{
 		//discard spam submissions

framework/PradoBase.php

Indentation +4 added lines, -4 removed lines

@@ -26,13 +26,13 @@
 if(!defined('PRADO_DIR'))
 	define('PRADO_DIR', __DIR__);
 /**
- * Defines the default permission for writable directories and files
- */
+	 * Defines the default permission for writable directories and files
+	 */
 if(!defined('PRADO_CHMOD'))
 	define('PRADO_CHMOD',0777);
 /**
- * Defines the Composer's vendor/ path.
- */
+	 * Defines the Composer's vendor/ path.
+	 */
 if(!defined('PRADO_VENDORDIR'))
 {
 	$reflector = new \ReflectionClass('\Composer\Autoload\ClassLoader');

bin/prado-cli.php

Indentation +90 added lines, -90 removed lines

@@ -623,31 +623,31 @@ 
  */
 class PradoCommandLineActiveRecordGenAll extends PradoCommandLineAction
 {
-    protected $action = 'generateAll';
-    protected $parameters = array('output');
-    protected $optional = array('directory', 'soap', 'overwrite', 'prefix', 'postfix');
-    protected $description = "Generate Active Record skeleton for all Tables to <output> file using application.xml in [directory]. May also generate [soap] properties.\nGenerated Classes are named like the Table with optional [Prefix] and/or [Postfix]. [Overwrite] is used to overwrite existing Files.";
-    private $_soap = false;
-    private $_prefix = '';
-    private $_postfix = '';
-    private $_overwrite = false;
-
-    public function performAction($args) {
-        $app_dir = count($args) > 2 ? $this->getAppDir($args[2]) : $this->getAppDir();
-        $this->_soap = count($args) > 3 ? ($args[3] == "soap" || $args[3] == "true" ? true : false) : false;
-        $this->_overwrite = count($args) > 4 ? ($args[4] == "overwrite" || $args[4] == "true" ? true : false) : false;
-        $this->_prefix = count($args) > 5 ? $args[5] : '';
-        $this->_postfix = count($args) > 6 ? $args[6] : '';
-
-        if ($app_dir !== false) {
-            $config = $this->getActiveRecordConfig($app_dir);
-
-            $manager = TActiveRecordManager::getInstance();
-            $con = $manager->getDbConnection();
-            $con->Active = true;
-
-            switch($con->getDriverName())
-           	{
+	protected $action = 'generateAll';
+	protected $parameters = array('output');
+	protected $optional = array('directory', 'soap', 'overwrite', 'prefix', 'postfix');
+	protected $description = "Generate Active Record skeleton for all Tables to <output> file using application.xml in [directory]. May also generate [soap] properties.\nGenerated Classes are named like the Table with optional [Prefix] and/or [Postfix]. [Overwrite] is used to overwrite existing Files.";
+	private $_soap = false;
+	private $_prefix = '';
+	private $_postfix = '';
+	private $_overwrite = false;
+
+	public function performAction($args) {
+		$app_dir = count($args) > 2 ? $this->getAppDir($args[2]) : $this->getAppDir();
+		$this->_soap = count($args) > 3 ? ($args[3] == "soap" || $args[3] == "true" ? true : false) : false;
+		$this->_overwrite = count($args) > 4 ? ($args[4] == "overwrite" || $args[4] == "true" ? true : false) : false;
+		$this->_prefix = count($args) > 5 ? $args[5] : '';
+		$this->_postfix = count($args) > 6 ? $args[6] : '';
+
+		if ($app_dir !== false) {
+			$config = $this->getActiveRecordConfig($app_dir);
+
+			$manager = TActiveRecordManager::getInstance();
+			$con = $manager->getDbConnection();
+			$con->Active = true;
+
+			switch($con->getDriverName())
+		   	{
 				case 'mysqli':
 				case 'mysql':
 					$command = $con->createCommand("SHOW TABLES");
@@ -665,27 +665,27 @@ 
 				default:
 					echo "\n    Sorry, generateAll is not implemented for ".$con->getDriverName()."\n";
 					
-           	}
-
-            $dataReader = $command->query();
-            $dataReader->bindColumn(1, $table);
-            $tables = array();
-            while ($dataReader->read() !== false) {
-                $tables[] = $table;
-            }
-            $con->Active = False;
-            foreach ($tables as $key => $table) {
-                $output = $args[1] . "." . $this->_prefix . ucfirst($table) . $this->_postfix;
-                if ($config !== false && $output !== false) {
-                    $this->generate("generate " . $table . " " . $output . " " . $this->_soap . " " . $this->_overwrite);
-                }
-            }
-        }
-        return true;
-    }
-
-    public function generate($l)
-    {
+		   	}
+
+			$dataReader = $command->query();
+			$dataReader->bindColumn(1, $table);
+			$tables = array();
+			while ($dataReader->read() !== false) {
+				$tables[] = $table;
+			}
+			$con->Active = False;
+			foreach ($tables as $key => $table) {
+				$output = $args[1] . "." . $this->_prefix . ucfirst($table) . $this->_postfix;
+				if ($config !== false && $output !== false) {
+					$this->generate("generate " . $table . " " . $output . " " . $this->_soap . " " . $this->_overwrite);
+				}
+			}
+		}
+		return true;
+	}
+
+	public function generate($l)
+	{
 		$input = explode(" ", trim($l));
 		if(count($input) > 2)
 		{
@@ -702,49 +702,49 @@ 
 		{
 			echo "\n    Usage: generate table_name Application.pages.RecordClassName\n";
 		}
-    }
-
-    protected function getAppDir($dir=".") {
-        if (is_dir($dir))
-            return realpath($dir);
-        if (false !== ($app_dir = realpath($dir . '/protected/')) && is_dir($app_dir))
-            return $app_dir;
-        echo '** Unable to find directory "' . $dir . "\".\n";
-        return false;
-    }
-
-    protected function getXmlFile($app_dir) {
-        if (false !== ($xml = realpath($app_dir . '/application.xml')) && is_file($xml))
-            return $xml;
-        if (false !== ($xml = realpath($app_dir . '/protected/application.xml')) && is_file($xml))
-            return $xml;
-        echo '** Unable to find application.xml in ' . $app_dir . "\n";
-        return false;
-    }
-
-    protected function getActiveRecordConfig($app_dir) {
-        if (false === ($xml = $this->getXmlFile($app_dir)))
-            return false;
-        if (false !== ($app = $this->initializePradoApplication($app_dir))) {
-            Prado::using('System.Data.ActiveRecord.TActiveRecordConfig');
-            foreach ($app->getModules() as $module)
-                if ($module instanceof TActiveRecordConfig)
-                    return $module;
-            echo '** Unable to find TActiveRecordConfig module in ' . $xml . "\n";
-        }
-        return false;
-    }
-
-    protected function getOutputFile($app_dir, $namespace) {
-        if (is_file($namespace) && strpos($namespace, $app_dir) === 0)
-            return $namespace;
-        $file = Prado::getPathOfNamespace($namespace, "");
-        if ($file !== null && false !== ($path = realpath(dirname($file))) && is_dir($path)) {
-            if (strpos($path, $app_dir) === 0)
-                return $file;
-        }
-        echo '** Output file ' . $file . ' must be within directory ' . $app_dir . "\n";
-        return false;
-    }
+	}
+
+	protected function getAppDir($dir=".") {
+		if (is_dir($dir))
+			return realpath($dir);
+		if (false !== ($app_dir = realpath($dir . '/protected/')) && is_dir($app_dir))
+			return $app_dir;
+		echo '** Unable to find directory "' . $dir . "\".\n";
+		return false;
+	}
+
+	protected function getXmlFile($app_dir) {
+		if (false !== ($xml = realpath($app_dir . '/application.xml')) && is_file($xml))
+			return $xml;
+		if (false !== ($xml = realpath($app_dir . '/protected/application.xml')) && is_file($xml))
+			return $xml;
+		echo '** Unable to find application.xml in ' . $app_dir . "\n";
+		return false;
+	}
+
+	protected function getActiveRecordConfig($app_dir) {
+		if (false === ($xml = $this->getXmlFile($app_dir)))
+			return false;
+		if (false !== ($app = $this->initializePradoApplication($app_dir))) {
+			Prado::using('System.Data.ActiveRecord.TActiveRecordConfig');
+			foreach ($app->getModules() as $module)
+				if ($module instanceof TActiveRecordConfig)
+					return $module;
+			echo '** Unable to find TActiveRecordConfig module in ' . $xml . "\n";
+		}
+		return false;
+	}
+
+	protected function getOutputFile($app_dir, $namespace) {
+		if (is_file($namespace) && strpos($namespace, $app_dir) === 0)
+			return $namespace;
+		$file = Prado::getPathOfNamespace($namespace, "");
+		if ($file !== null && false !== ($path = realpath(dirname($file))) && is_dir($path)) {
+			if (strpos($path, $app_dir) === 0)
+				return $file;
+		}
+		echo '** Output file ' . $file . ' must be within directory ' . $app_dir . "\n";
+		return false;
+	}
 
 }

framework/Web/TCacheHttpSession.php

Indentation +10 added lines, -10 removed lines

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

framework/Caching/TRedisCache.php

Indentation +42 added lines, -43 removed lines

@@ -74,7 +74,6 @@ 
  * </code>
  * where {@link setHost Host} and {@link setPort Port} or {@link setSocket Socket} are configurable properties
  * of TRedisCache.
-
  * @author Jens Klaer <kj.landwehr.software@gmail.com>
  * @author LANDWEHR Computer und Software GmbH
  * @since 4.0
@@ -112,8 +111,8 @@ 
    */
   public function __destruct()
   {
-    if ($this->_cache instanceof \Redis)
-      $this->_cache->close();
+	if ($this->_cache instanceof \Redis)
+	  $this->_cache->close();
   }
 
   /**
@@ -125,21 +124,21 @@ 
    */
   public function init($config)
   {
-    if (!extension_loaded('redis') || !class_exists('\Redis', false))
-      throw new TConfigurationException('rediscache_extension_required');
-    $this->_cache = new \Redis();
-    if ($this->_socket !== null)
-      $this->_cache->connect($this->_socket);
-    else
-      $this->_cache->connect($this->_host, $this->_port);
-    $this->_cache->setOption(\Redis::OPT_SERIALIZER, \Redis::SERIALIZER_PHP);
-    $this->_cache->select($this->_index);
-    parent::init($config);
-    $this->_initialized = true;
+	if (!extension_loaded('redis') || !class_exists('\Redis', false))
+	  throw new TConfigurationException('rediscache_extension_required');
+	$this->_cache = new \Redis();
+	if ($this->_socket !== null)
+	  $this->_cache->connect($this->_socket);
+	else
+	  $this->_cache->connect($this->_host, $this->_port);
+	$this->_cache->setOption(\Redis::OPT_SERIALIZER, \Redis::SERIALIZER_PHP);
+	$this->_cache->select($this->_index);
+	parent::init($config);
+	$this->_initialized = true;
   }
 
   public function valid($key) {
-    return true;
+	return true;
   }
 
   /**
@@ -147,7 +146,7 @@ 
    */
   public function getHost()
   {
-    return $this->_host;
+	return $this->_host;
   }
 
   /**
@@ -156,10 +155,10 @@ 
    */
   public function setHost($value)
   {
-    if ($this->_initialized)
-      throw new TInvalidOperationException('rediscache_host_unchangeable');
-    else
-      $this->_host = $value;
+	if ($this->_initialized)
+	  throw new TInvalidOperationException('rediscache_host_unchangeable');
+	else
+	  $this->_host = $value;
   }
 
   /**
@@ -167,7 +166,7 @@ 
    */
   public function getPort()
   {
-    return $this->_port;
+	return $this->_port;
   }
 
   /**
@@ -176,10 +175,10 @@ 
    */
   public function setPort($value)
   {
-    if ($this->_initialized)
-      throw new TInvalidOperationException('rediscache_port_unchangeable');
-    else
-      $this->_port = TPropertyValue::ensureInteger($value);
+	if ($this->_initialized)
+	  throw new TInvalidOperationException('rediscache_port_unchangeable');
+	else
+	  $this->_port = TPropertyValue::ensureInteger($value);
   }
 
   /**
@@ -187,7 +186,7 @@ 
    */
   public function getSocket()
   {
-    return $this->_socket;
+	return $this->_socket;
   }
 
   /**
@@ -196,10 +195,10 @@ 
    */
   public function setSocket($value)
   {
-    if($this->_initialized)
-      throw new TInvalidOperationException('rediscache_socket_unchangeable');
-    else
-      $this->_socket = TPropertyValue::ensureString($value);
+	if($this->_initialized)
+	  throw new TInvalidOperationException('rediscache_socket_unchangeable');
+	else
+	  $this->_socket = TPropertyValue::ensureString($value);
   }
 
   /**
@@ -207,7 +206,7 @@ 
    */
   public function getIndex()
   {
-    return $this->_index;
+	return $this->_index;
   }
 
   /**
@@ -216,10 +215,10 @@ 
    */
   public function setIndex($value)
   {
-    if ($this->_initialized)
-      throw new TInvalidOperationException('rediscache_index_unchangeable');
-    else
-      $this->_index = TPropertyValue::ensureInteger($value);
+	if ($this->_initialized)
+	  throw new TInvalidOperationException('rediscache_index_unchangeable');
+	else
+	  $this->_index = TPropertyValue::ensureInteger($value);
   }
 
   /**
@@ -230,7 +229,7 @@ 
    */
   protected function getValue($key)
   {
-    return $this->_cache->get($key);
+	return $this->_cache->get($key);
   }
 
   /**
@@ -244,8 +243,8 @@ 
    */
   protected function setValue($key, $value, $expire)
   {
-    $options = $expire === 0 ? array() : array('ex' => $expire);
-    return $this->_cache->set($key, $value, $options);
+	$options = $expire === 0 ? array() : array('ex' => $expire);
+	return $this->_cache->set($key, $value, $options);
   }
 
   /**
@@ -259,8 +258,8 @@ 
    */
   protected function addValue($key, $value, $expire)
   {
-    $options = $expire === 0 ? array('nx') : array('nx', 'ex' => $expire);
-    return $this->_cache->set($key, $value, $options);
+	$options = $expire === 0 ? array('nx') : array('nx', 'ex' => $expire);
+	return $this->_cache->set($key, $value, $options);
   }
 
   /**
@@ -271,8 +270,8 @@ 
    */
   protected function deleteValue($key)
   {
-    $this->_cache->delete($key);
-    return true;
+	$this->_cache->delete($key);
+	return true;
   }
 
   /**
@@ -280,7 +279,7 @@ 
    */
   public function flush()
   {
-    return $this->_cache->flushDB();
+	return $this->_cache->flushDB();
   }
 }
 

framework/Caching/TEtcdCache.php

Indentation +40 added lines, -40 removed lines

@@ -83,9 +83,9 @@ 
 	}
   
   /**
-	 * Gets the host the etcd instance is running on, defaults to 'localhost'.
-	 * @return string the etcd host
-	 */
+   * Gets the host the etcd instance is running on, defaults to 'localhost'.
+   * @return string the etcd host
+   */
 	public function getHost() {
 	  return $this->_host;
 	}
@@ -95,13 +95,13 @@ 
 	 * @param string $value the etcd host
 	 */
 	public function setHost($value) {
-    $this->_host = TPropertyValue::ensureString($value);
+	$this->_host = TPropertyValue::ensureString($value);
 	}
     
   /**
-	 * Gets the port the etcd instance is running on, defaults to 2379.
-	 * @return integer the etcd port
-	 */
+   * Gets the port the etcd instance is running on, defaults to 2379.
+   * @return integer the etcd port
+   */
 	public function getPort() {
 	  return $this->_port;
 	}
@@ -111,13 +111,13 @@ 
 	 * @param integer $value the etcd port
 	 */
 	public function setPort($value) {
-    $this->_port = TPropertyValue::ensureInteger($value);
+	$this->_port = TPropertyValue::ensureInteger($value);
 	}
      
   /**
-	 * Sets the directory to store values in, defaults to 'pradocache'.
-	 * @return string the directory to store values in
-	 */
+   * Sets the directory to store values in, defaults to 'pradocache'.
+   * @return string the directory to store values in
+   */
 	public function getDir() {
 	  return $this->_dir;
 	}
@@ -127,7 +127,7 @@ 
 	 * @param string $value the directory to store values in
 	 */
 	public function setDir($value) {
-    $this->_dir = TPropertyValue::ensureString($value);
+	$this->_dir = TPropertyValue::ensureString($value);
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	protected function getValue($key)
 	{                                     
 		$result = $this->request('GET', $this->_dir . '/' . $key);
-    return property_exists($result, 'errorCode') ? false : unserialize($result->node->value);
+	return property_exists($result, 'errorCode') ? false : unserialize($result->node->value);
 	}
 
 	/**
@@ -153,10 +153,10 @@ 
 	 */
 	protected function setValue($key, $value, $expire)
 	{
-    $value = array('value' => serialize($value));
-    if ($expire > 0) $value['ttl'] = $expire;
+	$value = array('value' => serialize($value));
+	if ($expire > 0) $value['ttl'] = $expire;
 		$result = $this->request('PUT', $this->_dir . '/' . $key, $value);    
-    return !property_exists($result, 'errorCode');
+	return !property_exists($result, 'errorCode');
 	}
 
 	/**
@@ -170,10 +170,10 @@ 
 	 */
 	protected function addValue($key, $value, $expire)
 	{
-    $value = array('value' => serialize($value), 'prevExist' => 'false');
-    if ($expire > 0) $value['ttl'] = $expire;
+	$value = array('value' => serialize($value), 'prevExist' => 'false');
+	if ($expire > 0) $value['ttl'] = $expire;
 		$result = $this->request('PUT', $this->_dir . '/' . $key, $value);
-    return !property_exists($result, 'errorCode');
+	return !property_exists($result, 'errorCode');
 	}
 
 	/**
@@ -185,7 +185,7 @@ 
 	protected function deleteValue($key)
 	{
 		$this->request('DELETE', $this->_dir . '/' . $key);
-    return true;
+	return true;
 	}
 
 	/**
@@ -194,30 +194,30 @@ 
 	 */
 	public function flush()
 	{
-     $this->request('DELETE', $this->_dir . '?recursive=true');
+	 $this->request('DELETE', $this->_dir . '?recursive=true');
 	}
   
   /**
-	 * This method does the actual cURL request by generating the method specific
-	 * URL, setting the cURL options and adding additional request parameters.
-	 * The etcd always returns a JSON string which is decoded and returned to
-	 * the calling method.
-	 * @param string the HTTP method for the request (GET,PUT,DELETE)
-	 * @param string the the key to perform the action on (includes the directory)
-	 * @param array the additional post data to send with the request
-	 * @return \stdClass the response from the etcd instance
-	 */
+   * This method does the actual cURL request by generating the method specific
+   * URL, setting the cURL options and adding additional request parameters.
+   * The etcd always returns a JSON string which is decoded and returned to
+   * the calling method.
+   * @param string the HTTP method for the request (GET,PUT,DELETE)
+   * @param string the the key to perform the action on (includes the directory)
+   * @param array the additional post data to send with the request
+   * @return \stdClass the response from the etcd instance
+   */
   protected function request($method, $key, $value=array()) {
-    $curl = curl_init("http://{$this->_host}:{$this->_port}/v2/keys/{$key}");
-    curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $method);
-    curl_setopt($curl, CURLOPT_HEADER, false);
-    curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);   
-    curl_setopt($curl, CURLOPT_FOLLOWLOCATION, false);
-    curl_setopt($curl, CURLOPT_HTTPHEADER, array('Content-Type: application/x-www-form-urlencoded'));
-    curl_setopt($curl, CURLOPT_POSTFIELDS, http_build_query($value));
-    $response = curl_exec($curl);
-    curl_close($curl);
-    return json_decode($response);
+	$curl = curl_init("http://{$this->_host}:{$this->_port}/v2/keys/{$key}");
+	curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $method);
+	curl_setopt($curl, CURLOPT_HEADER, false);
+	curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);   
+	curl_setopt($curl, CURLOPT_FOLLOWLOCATION, false);
+	curl_setopt($curl, CURLOPT_HTTPHEADER, array('Content-Type: application/x-www-form-urlencoded'));
+	curl_setopt($curl, CURLOPT_POSTFIELDS, http_build_query($value));
+	$response = curl_exec($curl);
+	curl_close($curl);
+	return json_decode($response);
   }
 
 }
\ No newline at end of file

framework/Web/UI/WebControls/TReCaptcha2.php

Indentation +293 added lines, -293 removed lines

@@ -60,310 +60,310 @@
 
 class TReCaptcha2 extends TActivePanel implements \Prado\Web\UI\ActiveControls\ICallbackEventHandler, \Prado\Web\UI\IValidatable
 {
-    const ChallengeFieldName = 'g-recaptcha-response';
-    private $_widgetId=0;
-    private $_isValid=true;
+	const ChallengeFieldName = 'g-recaptcha-response';
+	private $_widgetId=0;
+	private $_isValid=true;
 
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setAdapter(new TActiveControlAdapter($this));
-    }
-    public function getActiveControl()
-    {
-        return $this->getAdapter()->getBaseActiveControl();
-    }
-    public function getClientSide()
-    {
-        return $this->getAdapter()->getBaseActiveControl()->getClientSide();
-    }
-    public function getClientClassName()
-    {
-        return 'Prado.WebUI.TReCaptcha2';
-    }
-    public function getTagName()
-    {
-        return 'div';
-    }
-    /**
-     * Returns true if this control validated successfully.
-     * Defaults to true.
-     * @return bool wether this control validated successfully.
-     */
-    public function getIsValid()
-    {
-        return $this->_isValid;
-    }
-    /**
-     * @param bool wether this control is valid.
-     */
-    public function setIsValid($value)
-    {
-        $this->_isValid=TPropertyValue::ensureBoolean($value);
-    }
-    public function getValidationPropertyValue()
-    {
-        return $this->Request[$this->getResponseFieldName()];
-    }
-    public function getResponseFieldName()
-    {
-        $captchas = $this->Page->findControlsByType('Prado\Web\UI\WebControls\TReCaptcha2');
-        $cont = 0;
-        $responseFieldName = self::ChallengeFieldName;
-        foreach ($captchas as $captcha)
-        {
-            if ($this->getClientID() == $captcha->ClientID)
-            {
-                $responseFieldName .= ($cont > 0) ? '-'.$cont : '';
-            }
-            $cont++;
-        }
-        return $responseFieldName;
-    }
-    /**
-     * Returns your site key.
-     * @return string.
-     */
-    public function getSiteKey()
-    {
-        return $this->getViewState('SiteKey');
-    }
-    /**
-     * @param string your site key.
-     */
-    public function setSiteKey($value)
-    {
-        $this->setViewState('SiteKey', TPropertyValue::ensureString($value));
-    }
-    /**
-     * Returns your secret key.
-     * @return string.
-     */
-    public function getSecretKey()
-    {
-        return $this->getViewState('SecretKey');
-    }
-    /**
-     * @param string your secret key.
-     */
-    public function setSecretKey($value)
-    {
-        $this->setViewState('SecretKey', TPropertyValue::ensureString($value));
-    }
-    /**
-     * Returns your language.
-     * @return string.
-     */
-    public function getLanguage()
-    {
-        return $this->getViewState('Language', 'en');
-    }
-    /**
-     * @param string your language.
-     */
-    public function setLanguage($value)
-    {
-        $this->setViewState('Language', TPropertyValue::ensureString($value), 'en');
-    }
-    /**
-     * Returns the color theme of the widget.
-     * @return string.
-     */
-    public function getTheme()
-    {
-        return $this->getViewState('Theme', 'light');
-    }
-    /**
-     * The color theme of the widget.
-     * Default: light
-     * @param string the color theme of the widget.
-     */
-    public function setTheme($value)
-    {
-        $this->setViewState('Theme', TPropertyValue::ensureString($value), 'light');
-    }
-    /**
-     * Returns the type of CAPTCHA to serve.
-     * @return string.
-     */
-    public function getType()
-    {
-        return $this->getViewState('Type', 'image');
-    }
-    /**
-     * The type of CAPTCHA to serve.
-     * Default: image
-     * @param string the type of CAPTCHA to serve.
-     */
-    public function setType($value)
-    {
-        $this->setViewState('Type', TPropertyValue::ensureString($value), 'image');
-    }
-    /**
-     * Returns the size of the widget.
-     * @return string.
-     */
-    public function getSize()
-    {
-        return $this->getViewState('Size', 'normal');
-    }
-    /**
-     * The size of the widget.
-     * Default: normal
-     * @param string the size of the widget.
-     */
-    public function setSize($value)
-    {
-        $this->setViewState('Size', TPropertyValue::ensureString($value), 'normal');
-    }
-    /**
-     * Returns the tabindex of the widget and challenge.
-     * If other elements in your page use tabindex, it should be set to make user navigation easier.
-     * @return string.
-     */
-    public function getTabIndex()
-    {
-        return $this->getViewState('TabIndex', 0);
-    }
-    /**
-     * The tabindex of the widget and challenge.
-     * If other elements in your page use tabindex, it should be set to make user navigation easier.
-     * Default: 0
-     * @param string the tabindex of the widget and challenge.
-     */
-    public function setTabIndex($value)
-    {
-        $this->setViewState('TabIndex', TPropertyValue::ensureInteger($value), 0);
-    }
-    /**
-     * Resets the reCAPTCHA widget.
-     * Optional widget ID, defaults to the first widget created if unspecified.
-     */
-    public function reset()
-    {
-        $this->Page->CallbackClient->callClientFunction('grecaptcha.reset',array(array($this->WidgetId)));
-    }
-    /**
-     * Gets the response for the reCAPTCHA widget.
-     */
-    public function getResponse()
-    {
-        return $this->getViewState('Response', '');
-    }
-    public function setResponse($value)
-    {
-        $this->setViewState('Response', TPropertyValue::ensureString($value), '');
-    }
-    public function getWidgetId()
-    {
-        return $this->getViewState('WidgetId', 0);
-    }
-    public function setWidgetId($value)
-    {
-        $this->setViewState('WidgetId', TPropertyValue::ensureInteger($value), 0);
-    }
-    protected function getClientOptions()
-    {
-        $options['ID'] = $this->getClientID();
-        $options['EventTarget'] = $this->getUniqueID();
-        $options['FormID'] = $this->Page->getForm()->getClientID();
-        $options['onCallback'] = $this->hasEventHandler('OnCallback');
-        $options['onCallbackExpired'] = $this->hasEventHandler('OnCallbackExpired');
-        $options['options']['sitekey'] = $this->getSiteKey();
-        if ($theme = $this->getTheme()) $options['options']['theme'] = $theme;
-        if ($type = $this->getType()) $options['options']['type'] = $type;
-        if ($size = $this->getSize()) $options['options']['size'] = $size;
-        if ($tabIndex = $this->getTabIndex()) $options['options']['tabindex'] = $tabIndex;
+	public function __construct()
+	{
+		parent::__construct();
+		$this->setAdapter(new TActiveControlAdapter($this));
+	}
+	public function getActiveControl()
+	{
+		return $this->getAdapter()->getBaseActiveControl();
+	}
+	public function getClientSide()
+	{
+		return $this->getAdapter()->getBaseActiveControl()->getClientSide();
+	}
+	public function getClientClassName()
+	{
+		return 'Prado.WebUI.TReCaptcha2';
+	}
+	public function getTagName()
+	{
+		return 'div';
+	}
+	/**
+	 * Returns true if this control validated successfully.
+	 * Defaults to true.
+	 * @return bool wether this control validated successfully.
+	 */
+	public function getIsValid()
+	{
+		return $this->_isValid;
+	}
+	/**
+	 * @param bool wether this control is valid.
+	 */
+	public function setIsValid($value)
+	{
+		$this->_isValid=TPropertyValue::ensureBoolean($value);
+	}
+	public function getValidationPropertyValue()
+	{
+		return $this->Request[$this->getResponseFieldName()];
+	}
+	public function getResponseFieldName()
+	{
+		$captchas = $this->Page->findControlsByType('Prado\Web\UI\WebControls\TReCaptcha2');
+		$cont = 0;
+		$responseFieldName = self::ChallengeFieldName;
+		foreach ($captchas as $captcha)
+		{
+			if ($this->getClientID() == $captcha->ClientID)
+			{
+				$responseFieldName .= ($cont > 0) ? '-'.$cont : '';
+			}
+			$cont++;
+		}
+		return $responseFieldName;
+	}
+	/**
+	 * Returns your site key.
+	 * @return string.
+	 */
+	public function getSiteKey()
+	{
+		return $this->getViewState('SiteKey');
+	}
+	/**
+	 * @param string your site key.
+	 */
+	public function setSiteKey($value)
+	{
+		$this->setViewState('SiteKey', TPropertyValue::ensureString($value));
+	}
+	/**
+	 * Returns your secret key.
+	 * @return string.
+	 */
+	public function getSecretKey()
+	{
+		return $this->getViewState('SecretKey');
+	}
+	/**
+	 * @param string your secret key.
+	 */
+	public function setSecretKey($value)
+	{
+		$this->setViewState('SecretKey', TPropertyValue::ensureString($value));
+	}
+	/**
+	 * Returns your language.
+	 * @return string.
+	 */
+	public function getLanguage()
+	{
+		return $this->getViewState('Language', 'en');
+	}
+	/**
+	 * @param string your language.
+	 */
+	public function setLanguage($value)
+	{
+		$this->setViewState('Language', TPropertyValue::ensureString($value), 'en');
+	}
+	/**
+	 * Returns the color theme of the widget.
+	 * @return string.
+	 */
+	public function getTheme()
+	{
+		return $this->getViewState('Theme', 'light');
+	}
+	/**
+	 * The color theme of the widget.
+	 * Default: light
+	 * @param string the color theme of the widget.
+	 */
+	public function setTheme($value)
+	{
+		$this->setViewState('Theme', TPropertyValue::ensureString($value), 'light');
+	}
+	/**
+	 * Returns the type of CAPTCHA to serve.
+	 * @return string.
+	 */
+	public function getType()
+	{
+		return $this->getViewState('Type', 'image');
+	}
+	/**
+	 * The type of CAPTCHA to serve.
+	 * Default: image
+	 * @param string the type of CAPTCHA to serve.
+	 */
+	public function setType($value)
+	{
+		$this->setViewState('Type', TPropertyValue::ensureString($value), 'image');
+	}
+	/**
+	 * Returns the size of the widget.
+	 * @return string.
+	 */
+	public function getSize()
+	{
+		return $this->getViewState('Size', 'normal');
+	}
+	/**
+	 * The size of the widget.
+	 * Default: normal
+	 * @param string the size of the widget.
+	 */
+	public function setSize($value)
+	{
+		$this->setViewState('Size', TPropertyValue::ensureString($value), 'normal');
+	}
+	/**
+	 * Returns the tabindex of the widget and challenge.
+	 * If other elements in your page use tabindex, it should be set to make user navigation easier.
+	 * @return string.
+	 */
+	public function getTabIndex()
+	{
+		return $this->getViewState('TabIndex', 0);
+	}
+	/**
+	 * The tabindex of the widget and challenge.
+	 * If other elements in your page use tabindex, it should be set to make user navigation easier.
+	 * Default: 0
+	 * @param string the tabindex of the widget and challenge.
+	 */
+	public function setTabIndex($value)
+	{
+		$this->setViewState('TabIndex', TPropertyValue::ensureInteger($value), 0);
+	}
+	/**
+	 * Resets the reCAPTCHA widget.
+	 * Optional widget ID, defaults to the first widget created if unspecified.
+	 */
+	public function reset()
+	{
+		$this->Page->CallbackClient->callClientFunction('grecaptcha.reset',array(array($this->WidgetId)));
+	}
+	/**
+	 * Gets the response for the reCAPTCHA widget.
+	 */
+	public function getResponse()
+	{
+		return $this->getViewState('Response', '');
+	}
+	public function setResponse($value)
+	{
+		$this->setViewState('Response', TPropertyValue::ensureString($value), '');
+	}
+	public function getWidgetId()
+	{
+		return $this->getViewState('WidgetId', 0);
+	}
+	public function setWidgetId($value)
+	{
+		$this->setViewState('WidgetId', TPropertyValue::ensureInteger($value), 0);
+	}
+	protected function getClientOptions()
+	{
+		$options['ID'] = $this->getClientID();
+		$options['EventTarget'] = $this->getUniqueID();
+		$options['FormID'] = $this->Page->getForm()->getClientID();
+		$options['onCallback'] = $this->hasEventHandler('OnCallback');
+		$options['onCallbackExpired'] = $this->hasEventHandler('OnCallbackExpired');
+		$options['options']['sitekey'] = $this->getSiteKey();
+		if ($theme = $this->getTheme()) $options['options']['theme'] = $theme;
+		if ($type = $this->getType()) $options['options']['type'] = $type;
+		if ($size = $this->getSize()) $options['options']['size'] = $size;
+		if ($tabIndex = $this->getTabIndex()) $options['options']['tabindex'] = $tabIndex;
 
-        return $options;
-    }
-    protected function registerClientScript()
-    {
-        $id         = $this->getClientID();
-        $options    = TJavaScript::encode($this->getClientOptions());
-        $className  = $this->getClientClassName();
-        $cs         = $this->Page->ClientScript;
-        $code       = "new $className($options);";
+		return $options;
+	}
+	protected function registerClientScript()
+	{
+		$id         = $this->getClientID();
+		$options    = TJavaScript::encode($this->getClientOptions());
+		$className  = $this->getClientClassName();
+		$cs         = $this->Page->ClientScript;
+		$code       = "new $className($options);";
 
-        $cs->registerPradoScript('ajax');
-        $cs->registerEndScript("grecaptcha:$id", $code);
-    }
-    public function validate()
-    {
-        $value = $this->getValidationPropertyValue();
-        if($value === null || empty($value))
-            return false;
+		$cs->registerPradoScript('ajax');
+		$cs->registerEndScript("grecaptcha:$id", $code);
+	}
+	public function validate()
+	{
+		$value = $this->getValidationPropertyValue();
+		if($value === null || empty($value))
+			return false;
 
-        return true;
-    }
-    /**
-     * Checks for API keys
-     * @param mixed event parameter
-     */
-    public function onPreRender($param)
-    {
-        parent::onPreRender($param);
+		return true;
+	}
+	/**
+	 * Checks for API keys
+	 * @param mixed event parameter
+	 */
+	public function onPreRender($param)
+	{
+		parent::onPreRender($param);
 
-        if("" == $this->getSiteKey())
-            throw new TConfigurationException('recaptcha_publickey_unknown');
-        if("" == $this->getSecretKey())
-            throw new TConfigurationException('recaptcha_privatekey_unknown');
+		if("" == $this->getSiteKey())
+			throw new TConfigurationException('recaptcha_publickey_unknown');
+		if("" == $this->getSecretKey())
+			throw new TConfigurationException('recaptcha_privatekey_unknown');
 
-        // need to register captcha fields so they will be sent postback
-        $this->Page->registerRequiresPostData($this->getResponseFieldName());
-        $this->Page->ClientScript->registerHeadScriptFile('grecaptcha2', 'https://www.google.com/recaptcha/api.js?onload=TReCaptcha2_onloadCallback&render=explicit&hl=' . $this->getLanguage());
-    }
-    protected function addAttributesToRender($writer)
-    {
-        $writer->addAttribute('id',$this->getClientID());
-        parent::addAttributesToRender($writer);
-    }
-    public function raiseCallbackEvent($param)
-    {
-        $params = $param->getCallbackParameter();
-        if ($params instanceof stdClass)
-        {
-            $callback = property_exists($params, 'onCallback');
-            $callbackExpired = property_exists($params, 'onCallbackExpired');
+		// need to register captcha fields so they will be sent postback
+		$this->Page->registerRequiresPostData($this->getResponseFieldName());
+		$this->Page->ClientScript->registerHeadScriptFile('grecaptcha2', 'https://www.google.com/recaptcha/api.js?onload=TReCaptcha2_onloadCallback&render=explicit&hl=' . $this->getLanguage());
+	}
+	protected function addAttributesToRender($writer)
+	{
+		$writer->addAttribute('id',$this->getClientID());
+		parent::addAttributesToRender($writer);
+	}
+	public function raiseCallbackEvent($param)
+	{
+		$params = $param->getCallbackParameter();
+		if ($params instanceof stdClass)
+		{
+			$callback = property_exists($params, 'onCallback');
+			$callbackExpired = property_exists($params, 'onCallbackExpired');
 
-            if ($callback)
-            {
-                $this->WidgetId = $params->widgetId;
-                $this->Response = $params->response;
-                $this->Page->CallbackClient->jQuery($params->responseField, 'text',array($params->response));
+			if ($callback)
+			{
+				$this->WidgetId = $params->widgetId;
+				$this->Response = $params->response;
+				$this->Page->CallbackClient->jQuery($params->responseField, 'text',array($params->response));
 
-                if ($params->onCallback)
-                {
-                    $this->onCallback($param);
-                }
-            }
+				if ($params->onCallback)
+				{
+					$this->onCallback($param);
+				}
+			}
 
-            if ($callbackExpired)
-            {
-                $this->Response = '';
-                $this->reset();
+			if ($callbackExpired)
+			{
+				$this->Response = '';
+				$this->reset();
 
-                if ($params->onCallbackExpired)
-                {
-                    $this->onCallbackExpired($param);
-                }
-            }
-        }
-    }
+				if ($params->onCallbackExpired)
+				{
+					$this->onCallbackExpired($param);
+				}
+			}
+		}
+	}
 
-    public function onCallback($param)
-    {
-        $this->raiseEvent('OnCallback', $this, $param);
-    }
+	public function onCallback($param)
+	{
+		$this->raiseEvent('OnCallback', $this, $param);
+	}
 
-    public function onCallbackExpired($param)
-    {
-        $this->raiseEvent('OnCallbackExpired', $this, $param);
-    }
+	public function onCallbackExpired($param)
+	{
+		$this->raiseEvent('OnCallbackExpired', $this, $param);
+	}
 
-    public function render($writer)
-    {
-        $this->registerClientScript();
-        parent::render($writer);
-    }
+	public function render($writer)
+	{
+		$this->registerClientScript();
+		parent::render($writer);
+	}
 }