pradosoft / prado

framework/Web/UI/ActiveControls/TActiveHyperLink.php

Spacing +8 added lines, -8 removed lines

@@ -50,7 +50,7 @@ 
 	 */
 	public function setText($value)
 	{
-		if(parent::getText() === $value)
+		if(parent::getText()===$value)
 			return;
 
 		parent::setText($value);
@@ -64,14 +64,14 @@ 
 	 */
 	public function setImageUrl($value)
 	{
-		if(parent::getImageUrl() === $value)
+		if(parent::getImageUrl()===$value)
 			return;
 
 		parent::setImageUrl($value);
-		if($this->getActiveControl()->canUpdateClientSide() && $value !== '')
+		if($this->getActiveControl()->canUpdateClientSide() && $value!=='')
 		{
-			$textWriter = new TTextWriter;
-			$renderer = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), $textWriter);
+			$textWriter=new TTextWriter;
+			$renderer=Prado::createComponent($this->GetResponse()->getHtmlWriterType(), $textWriter);
 			$this->createImage($value)->renderControl($renderer);
 			$this->getPage()->getCallbackClient()->update($this, $textWriter->flush());
 		}
@@ -83,14 +83,14 @@ 
 	 */
 	public function setNavigateUrl($value)
 	{
-		if(parent::getNavigateUrl() === $value)
+		if(parent::getNavigateUrl()===$value)
 			return;
 
 		parent::setNavigateUrl($value);
 		if($this->getActiveControl()->canUpdateClientSide())
 		{
 			//replace & with & and urldecode the url (setting the href using javascript is literal)
-			$url = urldecode(str_replace('&', '&', $value));
+			$url=urldecode(str_replace('&', '&', $value));
 			$this->getPage()->getCallbackClient()->setAttribute($this, 'href', $url);
 		}
 	}
@@ -101,7 +101,7 @@ 
 	 */
 	public function setTarget($value)
 	{
-		if(parent::getTarget() === $value)
+		if(parent::getTarget()===$value)
 			return;
 
 		parent::setTarget($value);

framework/Web/UI/ActiveControls/TActiveLabel.php

Spacing +3 added lines, -3 removed lines

@@ -55,7 +55,7 @@ 
 	 */
 	public function setText($value)
 	{
-		if(parent::getText() === $value)
+		if(parent::getText()===$value)
 			return;
 
 		parent::setText($value);
@@ -71,7 +71,7 @@ 
 	 */
 	public function setForControl($value)
 	{
-		if(parent::getForControl() === $value)
+		if(parent::getForControl()===$value)
 			return;
 
 		parent::setForControl($value);
@@ -87,7 +87,7 @@ 
 	 * @param THtmlWriter the writer used for the rendering purpose
 	 */
 	protected function addAttributesToRender($writer) {
-	    $writer->addAttribute('id',$this->getClientID());
+	    $writer->addAttribute('id', $this->getClientID());
 	    parent::addAttributesToRender($writer);
 	}
 }

Indentation +2 added lines, -2 removed lines

@@ -91,8 +91,8 @@
 	 * @param THtmlWriter the writer used for the rendering purpose
 	 */
 	protected function addAttributesToRender($writer) {
-	    $writer->addAttribute('id',$this->getClientID());
-	    parent::addAttributesToRender($writer);
+		$writer->addAttribute('id',$this->getClientID());
+		parent::addAttributesToRender($writer);
 	}
 }
 

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/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);

Doc Comments +2 added lines

@@ -48,6 +48,7 @@ 
 	/**
 	 * Sets the alternative text to be displayed in the TImage when the image is unavailable.
 	 * @param string the alternative text
+	 * @param string $value
 	 */
 	public function setAlternateText($value)
 	{
@@ -78,6 +79,7 @@ 
 
 	/**
 	 * @param string the URL of the image file
+	 * @param string $value
 	 */
 	public function setImageUrl($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/Web/UI/ActiveControls/TActiveImageButton.php

Spacing +5 added lines, -5 removed lines

@@ -58,7 +58,7 @@ 
 	 */
 	public function setAlternateText($value)
 	{
-		if(parent::getAlternateText() === $value)
+		if(parent::getAlternateText()===$value)
 			return;
 
 		parent::setAlternateText($value);
@@ -75,7 +75,7 @@ 
 	 */
 	public function setImageAlign($value)
 	{
-		if(parent::getImageAlign() === $value)
+		if(parent::getImageAlign()===$value)
 			return;
 
 		parent::setImageAlign($value);
@@ -88,7 +88,7 @@ 
 	 */
 	public function setImageUrl($value)
 	{
-		if(parent::getImageUrl() === $value)
+		if(parent::getImageUrl()===$value)
 			return;
 
 		parent::setImageUrl($value);
@@ -101,7 +101,7 @@ 
 	 */
 	public function setDescriptionUrl($value)
 	{
-		if(parent::getDescriptionUrl() === $value)
+		if(parent::getDescriptionUrl()===$value)
 			return;
 
 		parent::setDescriptionUrl($value);
@@ -151,7 +151,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());
 	}

Doc Comments +2 added lines

@@ -48,6 +48,7 @@ 
 	/**
 	 * Sets the alternative text to be displayed in the TImage when the image is unavailable.
 	 * @param string the alternative text
+	 * @param string $value
 	 */
 	public function setAlternateText($value)
 	{
@@ -78,6 +79,7 @@ 
 
 	/**
 	 * @param string the URL of the image file
+	 * @param string $value
 	 */
 	public function setImageUrl($value)
 	{

framework/Web/UI/WebControls/TCheckBoxList.php

Indentation +4 added lines, -4 removed lines

@@ -404,8 +404,8 @@ 
 	{
 	  if ($needSpan=$this->getSpanNeeded())
 	  {
-	    $writer->addAttribute('id', $this->getClientId());
-	    $writer->renderBeginTag('span');
+		$writer->addAttribute('id', $this->getClientId());
+		$writer->renderBeginTag('span');
 	  }
 		if($this->getItemCount()>0)
 		{
@@ -463,14 +463,14 @@ 
 	 */
 	public function getIsValid()
 	{
-	    return $this->_isValid;
+		return $this->_isValid;
 	}
 	/**
 	 * @param bool wether this control is valid.
 	 */
 	public function setIsValid($value)
 	{
-	    $this->_isValid=TPropertyValue::ensureBoolean($value);
+		$this->_isValid=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**

Doc Comments +5 added lines, -5 removed lines

@@ -59,7 +59,7 @@ 
 
 	/**
 	 * Creates a control used for repetition (used as a template).
-	 * @return TControl the control to be repeated
+	 * @return TCheckBoxItem the control to be repeated
 	 */
 	protected function createRepeatedControl()
 	{
@@ -71,7 +71,7 @@ 
 	 * This method overrides the parent implementation so that it always returns
 	 * the checkbox list itself (because the checkbox list does not have child controls.)
 	 * @param string control ID
-	 * @return TControl control being found
+	 * @return \Prado\Web\UI\TControl|null control being found
 	 */
 	public function findControl($id, $real=false)
 	{
@@ -145,7 +145,7 @@ 
 	}
 
 	/**
-	 * @return string the direction of traversing the list, defaults to 'Vertical'
+	 * @return TRepeatDirection the direction of traversing the list, defaults to 'Vertical'
 	 */
 	public function getRepeatDirection()
 	{
@@ -161,7 +161,7 @@ 
 	}
 
 	/**
-	 * @return string how the list should be displayed, using table or using line breaks. Defaults to 'Table'.
+	 * @return TRepeatLayout how the list should be displayed, using table or using line breaks. Defaults to 'Table'.
 	 */
 	public function getRepeatLayout()
 	{
@@ -440,7 +440,7 @@ 
 	/**
 	 * Returns the value to be validated.
 	 * This methid is required by \Prado\Web\UI\IValidatable interface.
-	 * @return mixed the value of the property to be validated.
+	 * @return string the value of the property to be validated.
 	 */
 	public function getValidationPropertyValue()
 	{

Spacing +26 added lines, -26 removed lines

@@ -75,7 +75,7 @@ 
 	 */
 	public function findControl($id, $real=false)
 	{
-  		if ($real===true)
+  		if($real===true)
   			return parent::findControl($id);
 		return $this;
 	}
@@ -103,7 +103,7 @@ 
 	 */
 	public function getTextAlign()
 	{
-		return $this->getViewState('TextAlign',TTextAlign::Right);
+		return $this->getViewState('TextAlign', TTextAlign::Right);
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 */
 	public function setTextAlign($value)
 	{
-		$this->setViewState('TextAlign',TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\TTextAlign'),TTextAlign::Right);
+		$this->setViewState('TextAlign', TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TTextAlign'), TTextAlign::Right);
 	}
 
 
@@ -120,10 +120,10 @@ 
 	 */
 	protected function getRepeatInfo()
 	{
-		if(($repeatInfo=$this->getViewState('RepeatInfo',null))===null)
+		if(($repeatInfo=$this->getViewState('RepeatInfo', null))===null)
 		{
 			$repeatInfo=new TRepeatInfo;
-			$this->setViewState('RepeatInfo',$repeatInfo,null);
+			$this->setViewState('RepeatInfo', $repeatInfo, null);
 		}
 		return $repeatInfo;
 	}
@@ -252,7 +252,7 @@ 
 	public function setEnabled($value)
 	{
 		parent::setEnabled($value);
-		$value = !TPropertyValue::ensureBoolean($value);
+		$value=!TPropertyValue::ensureBoolean($value);
 		// if this is an active control,
 		// and it's a callback,
 		// and we can update clientside,
@@ -261,9 +261,9 @@ 
 				$this->getPage()->getIsCallBack() &&
 				$this->getActiveControl()->canUpdateClientSide())
 		{
-			$items = $this->getItems();
-			$cs = $this->getPage()->getCallbackClient();
-			$baseClientID = $this->getClientID().'_c';
+			$items=$this->getItems();
+			$cs=$this->getPage()->getCallbackClient();
+			$baseClientID=$this->getClientID().'_c';
 			foreach($items as $index=>$item)
 			{
 				$cs->setAttribute($baseClientID.$index, 'disabled', $value);
@@ -278,7 +278,7 @@ 
 	 * @param integer index of the item being rendered
 	 * @return null
 	 */
-	public function generateItemStyle($itemType,$index)
+	public function generateItemStyle($itemType, $index)
 	{
 		return null;
 	}
@@ -291,7 +291,7 @@ 
 	 * @param string item type (Header,Footer,Item,AlternatingItem,SelectedItem,EditItem,Separator,Pager)
 	 * @param integer zero-based index of the item in the item list
 	 */
-	public function renderItem($writer,$repeatInfo,$itemType,$index)
+	public function renderItem($writer, $repeatInfo, $itemType, $index)
 	{
 		$repeatedControl=$this->_repeatedControl;
 		$item=$this->getItems()->itemAt($index);
@@ -302,7 +302,7 @@ 
 		$repeatedControl->setID("c$index");
 		$repeatedControl->setText($item->getText());
 		$repeatedControl->setChecked($item->getSelected());
-		$repeatedControl->setAttribute('value',$item->getValue());
+		$repeatedControl->setAttribute('value', $item->getValue());
 		$repeatedControl->setEnabled($this->_isEnabled && $item->getEnabled());
 		$repeatedControl->setEnableClientScript(false);
 		$repeatedControl->renderControl($writer);
@@ -315,13 +315,13 @@ 
 	 * @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($this->getEnabled(true))
 		{
-			$index=(int)substr($key,strlen($this->getUniqueID())+2);
+			$index=(int) substr($key, strlen($this->getUniqueID()) + 2);
 			$this->ensureDataBound();
-			if($index>=0 && $index<$this->getItemCount())
+			if($index >= 0 && $index < $this->getItemCount())
 			{
 				$item=$this->getItems()->itemAt($index);
 				if($item->getEnabled())
@@ -369,7 +369,7 @@ 
 		$this->_repeatedControl->setValidationGroup($this->getValidationGroup());
 		$page=$this->getPage();
 		$n=$this->getItemCount();
-		for($i=0;$i<$n;++$i)
+		for($i=0; $i < $n; ++$i)
 		{
 			$this->_repeatedControl->setID("c$i");
 			$page->registerRequiresPostData($this->_repeatedControl);
@@ -381,7 +381,7 @@ 
 	 *
 	 *@return boolean true if we need a span
 	 */
-	protected function getSpanNeeded ()
+	protected function getSpanNeeded()
 	{
 		return $this->getRepeatLayout()===TRepeatLayout::Raw;
 	}
@@ -393,12 +393,12 @@ 
 	 */
 	public function render($writer)
 	{
-	  if ($needSpan=$this->getSpanNeeded())
+	  if($needSpan=$this->getSpanNeeded())
 	  {
 	    $writer->addAttribute('id', $this->getClientId());
 	    $writer->renderBeginTag('span');
 	  }
-		if($this->getItemCount()>0)
+		if($this->getItemCount() > 0)
 		{
 			$this->_isEnabled=$this->getEnabled(true);
 			$repeatInfo=$this->getRepeatInfo();
@@ -410,11 +410,11 @@ 
 			$this->setAccessKey('');
 			$this->setTabIndex(0);
 			$this->addAttributesToRender($writer);
-			$repeatInfo->renderRepeater($writer,$this);
+			$repeatInfo->renderRepeater($writer, $this);
 			$this->setAccessKey($accessKey);
 			$this->setTabIndex($tabIndex);
 		}
-		if ($needSpan)
+		if($needSpan)
 		  $writer->renderEndTag();
 
 		//checkbox skipped the client control script in addAttributesToRender
@@ -480,11 +480,11 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['ValidationGroup'] = $this->getValidationGroup();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['ListName'] = $this->getUniqueID();
-		$options['ItemCount'] = $this->getItemCount();
+		$options['ID']=$this->getClientID();
+		$options['ValidationGroup']=$this->getValidationGroup();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['ListName']=$this->getUniqueID();
+		$options['ItemCount']=$this->getItemCount();
 		return $options;
 	}
 

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)',
                 '{',