pradosoft / prado

framework/Web/UI/ActiveControls/TTimeTriggeredCallback.php

Spacing +13 added lines, -13 removed lines

@@ -43,16 +43,16 @@ 
 	 */
 	public function setInterval($value)
 	{
-		$interval = TPropertyValue::ensureFloat($value);
+		$interval=TPropertyValue::ensureFloat($value);
 		if($interval <= 0)
 			throw new TConfigurationException('callback_interval_be_positive', $this->getID());
 
-		if($this->getInterval() === $value)
+		if($this->getInterval()===$value)
 			return;
 
 		$this->setViewState('Interval', $interval, 1);
-		if ($this->getActiveControl()->canUpdateClientSide()){
-			$client = $this->getPage()->getCallbackClient();
+		if($this->getActiveControl()->canUpdateClientSide()) {
+			$client=$this->getPage()->getCallbackClient();
 			$client->callClientFunction('Prado.WebUI.TTimeTriggeredCallback.setTimerInterval', array($this, $interval));
 		}
 	}
@@ -62,7 +62,7 @@ 
 	 */
 	public function startTimer()
 	{
-		$client = $this->getPage()->getCallbackClient();
+		$client=$this->getPage()->getCallbackClient();
 		$client->callClientFunction('Prado.WebUI.TTimeTriggeredCallback.start', array($this));
 	}
 
@@ -71,7 +71,7 @@ 
 	 */
 	public function stopTimer()
 	{
-		$client = $this->getPage()->getCallbackClient();
+		$client=$this->getPage()->getCallbackClient();
 		$client->callClientFunction('Prado.WebUI.TTimeTriggeredCallback.stop', array($this));
 	}
 
@@ -97,9 +97,9 @@ 
 	 */
 	protected function getTriggerOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget']= $this->getUniqueID();
-		$options['Interval'] = $this->getInterval();
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
+		$options['Interval']=$this->getInterval();
 		return $options;
 	}
 
@@ -112,10 +112,10 @@ 
 		parent::render($writer);
 		$this->getActiveControl()->registerCallbackClientScript(
 			$this->getClientClassName(), $this->getTriggerOptions());
-		if($this->getStartTimerOnLoad()){
-			$id = $this->getClientID();
-			$code = "Prado.WebUI.TTimeTriggeredCallback.start('{$id}');";
-			$cs = $this->getPage()->getClientScript();
+		if($this->getStartTimerOnLoad()) {
+			$id=$this->getClientID();
+			$code="Prado.WebUI.TTimeTriggeredCallback.start('{$id}');";
+			$cs=$this->getPage()->getClientScript();
 			$cs->registerEndScript("{$id}:start", $code);
 		}
 	}

framework/Web/UI/ActiveControls/TActiveButton.php

Spacing +2 added lines, -2 removed lines

@@ -94,7 +94,7 @@ 
 	 */
 	public function setText($value)
 	{
-		if(parent::getText() === $value)
+		if(parent::getText()===$value)
 			return;
 
 		parent::setText($value);
@@ -117,7 +117,7 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 		$this->getActiveControl()->registerCallbackClientScript(
 			$this->getClientClassName(), $this->getPostBackOptions());
 	}

framework/Web/UI/ActiveControls/TActiveImage.php

Spacing +4 added lines, -4 removed lines

@@ -48,7 +48,7 @@ 
 	 */
 	public function setAlternateText($value)
 	{
-		if(parent::getAlternateText() === $value)
+		if(parent::getAlternateText()===$value)
 			return;
 
 		parent::setAlternateText($value);
@@ -65,7 +65,7 @@ 
 	 */
 	public function setImageAlign($value)
 	{
-		if(parent::getImageAlign() === $value)
+		if(parent::getImageAlign()===$value)
 			return;
 
 		parent::setImageAlign($value);
@@ -78,7 +78,7 @@ 
 	 */
 	public function setImageUrl($value)
 	{
-		if(parent::getImageUrl() === $value)
+		if(parent::getImageUrl()===$value)
 			return;
 
 		parent::setImageUrl($value);
@@ -91,7 +91,7 @@ 
 	 */
 	public function setDescriptionUrl($value)
 	{
-		if(parent::getDescriptionUrl() === $value)
+		if(parent::getDescriptionUrl()===$value)
 			return;
 
 		parent::setDescriptionUrl($value);

framework/Web/UI/ActiveControls/TActiveLinkButton.php

Spacing +4 added lines, -4 removed lines

@@ -95,7 +95,7 @@ 
 	 */
 	public function setText($value)
 	{
-		if(parent::getText() === $value)
+		if(parent::getText()===$value)
 			return;
 
 		parent::setText($value);
@@ -118,7 +118,7 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 
 		if($this->getEnabled(true))
 		{
@@ -134,7 +134,7 @@ 
 	 */
 	public function setEnabled($value)
 	{
-		if(parent::getEnabled() === $value)
+		if(parent::getEnabled()===$value)
 			return;
 
 		parent::setEnabled($value);
@@ -142,7 +142,7 @@ 
 		{
 			if($this->getEnabled(true))
 			{
-				$nop = "javascript:;//".$this->getClientID();
+				$nop="javascript:;//".$this->getClientID();
 				$this->getPage()->getCallbackClient()->setAttribute($this, 'href', $nop);
 
 				$this->getActiveControl()->registerCallbackClientScript(

framework/Web/UI/ActiveControls/TActiveCheckBox.php

Spacing +10 added lines, -10 removed lines

@@ -88,7 +88,7 @@ 
 	 */
 	public function setText($value)
 	{
-		if(parent::getText() === $value)
+		if(parent::getText()===$value)
 			return;
 
 		parent::setText($value);
@@ -105,8 +105,8 @@ 
 	 */
 	public function setChecked($value)
 	{
-		$value = TPropertyValue::ensureBoolean($value);
-		if(parent::getChecked() === $value)
+		$value=TPropertyValue::ensureBoolean($value);
+		if(parent::getChecked()===$value)
 			return;
 
 		parent::setChecked($value);
@@ -132,10 +132,10 @@ 
 	 * @param string checkbox id
 	 * @param string onclick js
 	 */
-	protected function renderInputTag($writer,$clientID,$onclick)
+	protected function renderInputTag($writer, $clientID, $onclick)
 	{
-		parent::renderInputTag($writer,$clientID,$onclick);
-		if ($this->getAutoPostBack())
+		parent::renderInputTag($writer, $clientID, $onclick);
+		if($this->getAutoPostBack())
 			$this->getActiveControl()->registerCallbackClientScript(
 				$this->getClientClassName(), $this->getPostBackOptions());
 	}
@@ -154,8 +154,8 @@ 
 	 */
 	public function getLabelAttributes()
 	{
-		$attributes = parent::getLabelAttributes();
-		$attributes['id'] = $this->getDefaultLabelID();
+		$attributes=parent::getLabelAttributes();
+		$attributes['id']=$this->getDefaultLabelID();
 		return $attributes;
 	}
 
@@ -165,7 +165,7 @@ 
 	 * @param string checkbox id
 	 * @param string label text
 	 */
-	protected function renderLabel($writer,$clientID,$text)
+	protected function renderLabel($writer, $clientID, $text)
 	{
 		$writer->addAttribute('id', $this->getDefaultLabelID());
 		parent::renderLabel($writer, $clientID, $text);
@@ -176,7 +176,7 @@ 
 	 */
 	protected function getDefaultLabelID()
 	{
-		if($attributes=$this->getViewState('LabelAttributes',null))
+		if($attributes=$this->getViewState('LabelAttributes', null))
 			return TCheckBox::getLabelAttributes()->itemAt('id');
 		else
 			return $this->getClientID().'_label';

framework/Caching/TEACache.php

Spacing +1 added lines, -1 removed lines

@@ -1,1 +1,1 @@
-<?php
/**
 * TEACache class file
 *
 * @author Dario rigolin <drigolin@e-portaltech.it>
 * @link https://github.com/pradosoft/prado
 * @copyright Copyright &copy; 2005-2016 The PRADO Group
 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
 * @package System.Caching
 */

/**
 * TEACache class
 *
 * TEACache implements a cache application module based on {@link http://eaccelerator.net/ eAccelerator}.
 *
 * By definition, cache does not ensure the existence of a value
 * even if it never expires. Cache is not meant to be an persistent storage.
 *
 * To use this module, the eAccelerator PHP extension must be loaded and enabled
 *
 * Please note that as of v0.9.6, eAccelerator no longer supports data caching.
 * This means if you still want to use this component, your eAccelerator should be of 0.9.5.x or lower version.
 *
 * Some usage examples of TEACache are as follows,
 * <code>
 * $cache=new TEACache;  // TEACache may also be loaded as a Prado application module
 * $cache->init(null);
 * $cache->add('object',$object);
 * $object2=$cache->get('object');
 * </code>
 *
 * If loaded, TEACache will register itself with {@link TApplication} as the
 * cache module. It can be accessed via {@link TApplication::getCache()}.
 *
 * TEACache may be configured in application configuration file as follows
 * <code>
 * <module id="cache" class="System.Caching.TEACache" />
 * </code>
 *
 * @author Dario Rigolin <drigolin@e-portaltech.it>
 * @package System.Caching
 * @since 3.2.2
 */
class TEACache extends TCache
{
   /**
    * Initializes this module.
    * This method is required by the IModule interface.
    * @param TXmlElement configuration for this module, can be null
    * @throws TConfigurationException if eaccelerator extension is not installed or not started, check your php.ini
    */
	public function init($config)
	{
		if(!function_exists('eaccelerator_get'))
			throw new TConfigurationException('eacceleratorcache_extension_required');
		parent::init($config);
	}

	/**
	 * Retrieves a value from cache with a specified key.
	 * This is the implementation of the method declared in the parent class.
	 * @param string a unique key identifying the cached value
	 * @return string the value stored in cache, false if the value is not in the cache or expired.
	 */
	protected function getValue($key)
	{
		$value = eaccelerator_get($key);
		return ($value === null) ? false : $value;
	}

	/**
	 * Stores a value identified by a key in cache.
	 * This is the implementation of the method declared in the parent class.
	 *
	 * @param string the key identifying the value to be cached
	 * @param string the value to be cached
	 * @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)
	{
		return eaccelerator_put($key,$value,$expire);
	}

	/**
	 * Stores a value identified by a key into cache if the cache does not contain this key.
	 * This is the implementation of the method declared in the parent class.
	 *
	 * @param string the key identifying the value to be cached
	 * @param string the value to be cached
	 * @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)
	{
		return (null === eaccelerator_get($key)) ? $this->setValue($key,$value,$expire) : false;
	}

	/**
	 * Deletes a value with the specified key from cache
	 * This is the implementation of the method declared in the parent class.
	 * @param string the key of the value to be deleted
	 * @return boolean if no error happens during deletion
	 */
	protected function deleteValue($key)
	{
		return eaccelerator_rm($key);
	}

	/**
	 * Deletes all values from cache.
	 * Be careful of performing this operation if the cache is shared by multiple applications.
	 */
	public function flush()
	{
		// first, remove expired content from cache
		eaccelerator_gc();
		// now, remove leftover cache-keys
		$keys = eaccelerator_list_keys();
		foreach($keys as $key)
			$this->deleteValue(substr($key['name'], 1));
		return true;
	}
}

\ No newline at end of file
+<?php
/**
 * TEACache class file
 *
 * @author Dario rigolin <drigolin@e-portaltech.it>
 * @link https://github.com/pradosoft/prado
 * @copyright Copyright &copy; 2005-2016 The PRADO Group
 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
 * @package System.Caching
 */

/**
 * TEACache class
 *
 * TEACache implements a cache application module based on {@link http://eaccelerator.net/ eAccelerator}.
 *
 * By definition, cache does not ensure the existence of a value
 * even if it never expires. Cache is not meant to be an persistent storage.
 *
 * To use this module, the eAccelerator PHP extension must be loaded and enabled
 *
 * Please note that as of v0.9.6, eAccelerator no longer supports data caching.
 * This means if you still want to use this component, your eAccelerator should be of 0.9.5.x or lower version.
 *
 * Some usage examples of TEACache are as follows,
 * <code>
 * $cache=new TEACache;  // TEACache may also be loaded as a Prado application module
 * $cache->init(null);
 * $cache->add('object',$object);
 * $object2=$cache->get('object');
 * </code>
 *
 * If loaded, TEACache will register itself with {@link TApplication} as the
 * cache module. It can be accessed via {@link TApplication::getCache()}.
 *
 * TEACache may be configured in application configuration file as follows
 * <code>
 * <module id="cache" class="System.Caching.TEACache" />
 * </code>
 *
 * @author Dario Rigolin <drigolin@e-portaltech.it>
 * @package System.Caching
 * @since 3.2.2
 */
class TEACache extends TCache {
   /**
    * Initializes this module.
    * This method is required by the IModule interface.
    * @param TXmlElement configuration for this module, can be null
    * @throws TConfigurationException if eaccelerator extension is not installed or not started, check your php.ini
    */
	public function init($config) {
		if(!function_exists('eaccelerator_get'))
			throw new TConfigurationException('eacceleratorcache_extension_required'); parent::init($config); }

	/**
	 * Retrieves a value from cache with a specified key.
	 * This is the implementation of the method declared in the parent class.
	 * @param string a unique key identifying the cached value
	 * @return string the value stored in cache, false if the value is not in the cache or expired.
	 */
	protected function getValue($key) {
		$value=eaccelerator_get($key); return ($value===null) ? false : $value; }

	/**
	 * Stores a value identified by a key in cache.
	 * This is the implementation of the method declared in the parent class.
	 *
	 * @param string the key identifying the value to be cached
	 * @param string the value to be cached
	 * @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) {
		return eaccelerator_put($key, $value, $expire); }

	/**
	 * Stores a value identified by a key into cache if the cache does not contain this key.
	 * This is the implementation of the method declared in the parent class.
	 *
	 * @param string the key identifying the value to be cached
	 * @param string the value to be cached
	 * @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) {
		return (null===eaccelerator_get($key)) ? $this->setValue($key, $value, $expire) : false; }

	/**
	 * Deletes a value with the specified key from cache
	 * This is the implementation of the method declared in the parent class.
	 * @param string the key of the value to be deleted
	 * @return boolean if no error happens during deletion
	 */
	protected function deleteValue($key) {
		return eaccelerator_rm($key); }

	/**
	 * Deletes all values from cache.
	 * Be careful of performing this operation if the cache is shared by multiple applications.
	 */
	public function flush() {
		// first, remove expired content from cache
		eaccelerator_gc(); // now, remove leftover cache-keys
		$keys=eaccelerator_list_keys(); foreach($keys as $key)
			$this->deleteValue(substr($key['name'], 1)); return true; }
}

\ No newline at end of file

framework/Web/UI/ActiveControls/TActiveRadioButton.php

Spacing +10 added lines, -10 removed lines

@@ -88,7 +88,7 @@ 
 	 */
 	public function setText($value)
 	{
-		if(parent::getText() === $value)
+		if(parent::getText()===$value)
 			return;
 
 		parent::setText($value);
@@ -105,8 +105,8 @@ 
 	 */
 	public function setChecked($value)
 	{
-		$value = TPropertyValue::ensureBoolean($value);
-		if(parent::getChecked() === $value)
+		$value=TPropertyValue::ensureBoolean($value);
+		if(parent::getChecked()===$value)
 			return;
 
 		parent::setChecked($value);
@@ -132,10 +132,10 @@ 
 	 * @param string checkbox id
 	 * @param string onclick js
 	 */
-	protected function renderInputTag($writer,$clientID,$onclick)
+	protected function renderInputTag($writer, $clientID, $onclick)
 	{
-		parent::renderInputTag($writer,$clientID,$onclick);
-		if ($this->getAutoPostBack())
+		parent::renderInputTag($writer, $clientID, $onclick);
+		if($this->getAutoPostBack())
 			$this->getActiveControl()->registerCallbackClientScript(
 				$this->getClientClassName(), $this->getPostBackOptions());
 	}
@@ -154,8 +154,8 @@ 
 	 */
 	public function getLabelAttributes()
 	{
-		$attributes = parent::getLabelAttributes();
-		$attributes['id'] = $this->getDefaultLabelID();
+		$attributes=parent::getLabelAttributes();
+		$attributes['id']=$this->getDefaultLabelID();
 		return $attributes;
 	}
 
@@ -165,7 +165,7 @@ 
 	 * @param string checkbox id
 	 * @param string label text
 	 */
-	protected function renderLabel($writer,$clientID,$text)
+	protected function renderLabel($writer, $clientID, $text)
 	{
 		$writer->addAttribute('id', $this->getDefaultLabelID());
 		parent::renderLabel($writer, $clientID, $text);
@@ -176,7 +176,7 @@ 
 	 */
 	protected function getDefaultLabelID()
 	{
-		if($attributes=$this->getViewState('LabelAttributes',null))
+		if($attributes=$this->getViewState('LabelAttributes', null))
 			return TCheckBox::getLabelAttributes()->itemAt('id');
 		else
 			return $this->getClientID().'_label';

framework/Web/UI/ActiveControls/TActiveTextBox.php

Spacing +2 added lines, -2 removed lines

@@ -94,7 +94,7 @@ 
 	 */
 	public function setText($value)
 	{
-		if(parent::getText() === $value)
+		if(parent::getText()===$value)
 			return;
 
 		parent::setText($value);
@@ -117,7 +117,7 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 		$this->getActiveControl()->registerCallbackClientScript(
 			$this->getClientClassName(), $this->getPostBackOptions());
 	}

framework/Web/UI/WebControls/TReCaptcha2Validator.php

Indentation +72 added lines, -72 removed lines

@@ -29,82 +29,82 @@
 
 class TReCaptcha2Validator extends TBaseValidator
 {
-    protected $_isvalid = null;
+	protected $_isvalid = null;
 
-    protected function getClientClassName()
-    {
-        return 'Prado.WebUI.TReCaptcha2Validator';
-    }
-    public function getEnableClientScript()
-    {
-        return true;
-    }
-    protected function getCaptchaControl()
-    {
-        $control = $this->getValidationTarget();
-        if (!$control)
-            throw new Exception('No target control specified for TReCaptcha2Validator');
-        if (!($control instanceof TReCaptcha2))
-            throw new Exception('TReCaptcha2Validator only works with TReCaptcha2 controls');
-        return $control;
-    }
-    public function getClientScriptOptions()
-    {
-        $options = parent::getClientScriptOptions();
-        $options['ResponseFieldName'] = $this->getCaptchaControl()->getResponseFieldName();
-        return $options;
-    }
-    /**
-     * This method overrides the parent's implementation.
-     * The validation succeeds if the input control has the same value
-     * as the one displayed in the corresponding RECAPTCHA control.
-     *
-     * @return boolean whether the validation succeeds
-     */
-    protected function evaluateIsValid()
-    {
-        // check validity only once (if trying to evaulate multiple times, all redundant checks would fail)
-        if (is_null($this->_isvalid))
-        {
-            $control = $this->getCaptchaControl();
-            $this->_isvalid = $control->validate();
-        }
-        return ($this->_isvalid==true);
-    }
-    public function onPreRender($param)
-    {
-        parent::onPreRender($param);
+	protected function getClientClassName()
+	{
+		return 'Prado.WebUI.TReCaptcha2Validator';
+	}
+	public function getEnableClientScript()
+	{
+		return true;
+	}
+	protected function getCaptchaControl()
+	{
+		$control = $this->getValidationTarget();
+		if (!$control)
+			throw new Exception('No target control specified for TReCaptcha2Validator');
+		if (!($control instanceof TReCaptcha2))
+			throw new Exception('TReCaptcha2Validator only works with TReCaptcha2 controls');
+		return $control;
+	}
+	public function getClientScriptOptions()
+	{
+		$options = parent::getClientScriptOptions();
+		$options['ResponseFieldName'] = $this->getCaptchaControl()->getResponseFieldName();
+		return $options;
+	}
+	/**
+	 * This method overrides the parent's implementation.
+	 * The validation succeeds if the input control has the same value
+	 * as the one displayed in the corresponding RECAPTCHA control.
+	 *
+	 * @return boolean whether the validation succeeds
+	 */
+	protected function evaluateIsValid()
+	{
+		// check validity only once (if trying to evaulate multiple times, all redundant checks would fail)
+		if (is_null($this->_isvalid))
+		{
+			$control = $this->getCaptchaControl();
+			$this->_isvalid = $control->validate();
+		}
+		return ($this->_isvalid==true);
+	}
+	public function onPreRender($param)
+	{
+		parent::onPreRender($param);
 
-        $cs = $this->Page->getClientScript();
-        $cs->registerPradoScript('validator');
+		$cs = $this->Page->getClientScript();
+		$cs->registerPradoScript('validator');
 
-        // communicate validation status to the client side
-        $value = $this->_isvalid===false ? '0' : '1';
-        $cs->registerHiddenField($this->getClientID().'_1',$value);
+		// communicate validation status to the client side
+		$value = $this->_isvalid===false ? '0' : '1';
+		$cs->registerHiddenField($this->getClientID().'_1',$value);
 
-        // update validator display
-        if ($control = $this->getValidationTarget())
-        {
-            $fn = 'captchaUpdateValidatorStatus_'.$this->getClientID();
+		// update validator display
+		if ($control = $this->getValidationTarget())
+		{
+			$fn = 'captchaUpdateValidatorStatus_'.$this->getClientID();
 
-            $cs->registerEndScript($this->getClientID().'::validate', implode(' ',array(
-                // this function will be used to update the validator
-                'function '.$fn.'(valid)',
-                '{',
-                '  jQuery('.TJavaScript::quoteString('#'.$this->getClientID().'_1').').val(valid);',
-                '  Prado.Validation.validateControl('.TJavaScript::quoteString($control->ClientID).'); ',
-                '}',
-                '',
-                // update the validator to the result if we're in a callback 
-                // (if we're in initial rendering or a postback then the result will be rendered directly to the page html anyway)
-                $this->Page->IsCallback ? $fn.'('.$value.');' : '',
-                '',
-                // install event handler that clears the validation error when user changes the captcha response field
-                'jQuery("#'.$control->getClientID().'").on("change", '.TJavaScript::quoteString('#'.$control->getResponseFieldName()).', function() { ',
-                    $fn.'("1");',
-                '});',
-            )));
-        }
-    }
+			$cs->registerEndScript($this->getClientID().'::validate', implode(' ',array(
+				// this function will be used to update the validator
+				'function '.$fn.'(valid)',
+				'{',
+				'  jQuery('.TJavaScript::quoteString('#'.$this->getClientID().'_1').').val(valid);',
+				'  Prado.Validation.validateControl('.TJavaScript::quoteString($control->ClientID).'); ',
+				'}',
+				'',
+				// update the validator to the result if we're in a callback 
+				// (if we're in initial rendering or a postback then the result will be rendered directly to the page html anyway)
+				$this->Page->IsCallback ? $fn.'('.$value.');' : '',
+				'',
+				// install event handler that clears the validation error when user changes the captcha response field
+				'jQuery("#'.$control->getClientID().'").on("change", '.TJavaScript::quoteString('#'.$control->getResponseFieldName()).', function() { ',
+					$fn.'("1");',
+				'});',
+			)));
+		}
+	}
 }
 

Spacing +15 added lines, -15 removed lines

@@ -29,7 +29,7 @@ 
 
 class TReCaptcha2Validator extends TBaseValidator
 {
-    protected $_isvalid = null;
+    protected $_isvalid=null;
 
     protected function getClientClassName()
     {
@@ -41,17 +41,17 @@ 
     }
     protected function getCaptchaControl()
     {
-        $control = $this->getValidationTarget();
-        if (!$control)
+        $control=$this->getValidationTarget();
+        if(!$control)
             throw new Exception('No target control specified for TReCaptcha2Validator');
-        if (!($control instanceof TReCaptcha2))
+        if(!($control instanceof TReCaptcha2))
             throw new Exception('TReCaptcha2Validator only works with TReCaptcha2 controls');
         return $control;
     }
     public function getClientScriptOptions()
     {
-        $options = parent::getClientScriptOptions();
-        $options['ResponseFieldName'] = $this->getCaptchaControl()->getResponseFieldName();
+        $options=parent::getClientScriptOptions();
+        $options['ResponseFieldName']=$this->getCaptchaControl()->getResponseFieldName();
         return $options;
     }
     /**
@@ -64,10 +64,10 @@ 
     protected function evaluateIsValid()
     {
         // check validity only once (if trying to evaulate multiple times, all redundant checks would fail)
-        if (is_null($this->_isvalid))
+        if(is_null($this->_isvalid))
         {
-            $control = $this->getCaptchaControl();
-            $this->_isvalid = $control->validate();
+            $control=$this->getCaptchaControl();
+            $this->_isvalid=$control->validate();
         }
         return ($this->_isvalid==true);
     }
@@ -75,19 +75,19 @@ 
     {
         parent::onPreRender($param);
 
-        $cs = $this->Page->getClientScript();
+        $cs=$this->Page->getClientScript();
         $cs->registerPradoScript('validator');
 
         // communicate validation status to the client side
-        $value = $this->_isvalid===false ? '0' : '1';
-        $cs->registerHiddenField($this->getClientID().'_1',$value);
+        $value=$this->_isvalid===false ? '0' : '1';
+        $cs->registerHiddenField($this->getClientID().'_1', $value);
 
         // update validator display
-        if ($control = $this->getValidationTarget())
+        if($control=$this->getValidationTarget())
         {
-            $fn = 'captchaUpdateValidatorStatus_'.$this->getClientID();
+            $fn='captchaUpdateValidatorStatus_'.$this->getClientID();
 
-            $cs->registerEndScript($this->getClientID().'::validate', implode(' ',array(
+            $cs->registerEndScript($this->getClientID().'::validate', implode(' ', array(
                 // this function will be used to update the validator
                 'function '.$fn.'(valid)',
                 '{',