pradosoft / prado

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

@@ -147,6 +147,7 @@ 
 	/**
 	 * Sets the height of the image in the THyperLink
 	 * @param string height of the image in the THyperLink
+	 * @param string $value
 	 */
 	public function setImageHeight($value)
 	{
@@ -181,6 +182,7 @@ 
 	/**
 	 * Sets the width of the image in the THyperLink
 	 * @param string width of the image
+	 * @param string $value
 	 */
 	public function setImageWidth($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/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)',
                 '{',

framework/Web/UI/WebControls/TReCaptcha2.php

Indentation +293 added lines, -293 removed lines

@@ -55,310 +55,310 @@
 
 class TReCaptcha2 extends TActivePanel implements ICallbackEventHandler, 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('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('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);
+	}
 }

Spacing +41 added lines, -41 removed lines

@@ -55,7 +55,7 @@ 
 
 class TReCaptcha2 extends TActivePanel implements ICallbackEventHandler, IValidatable
 {
-    const ChallengeFieldName = 'g-recaptcha-response';
+    const ChallengeFieldName='g-recaptcha-response';
     private $_widgetId=0;
     private $_isValid=true;
 
@@ -102,14 +102,14 @@ 
     }
     public function getResponseFieldName()
     {
-        $captchas = $this->Page->findControlsByType('TReCaptcha2');
-        $cont = 0;
-        $responseFieldName = self::ChallengeFieldName;
-        foreach ($captchas as $captcha)
+        $captchas=$this->Page->findControlsByType('TReCaptcha2');
+        $cont=0;
+        $responseFieldName=self::ChallengeFieldName;
+        foreach($captchas as $captcha)
         {
-            if ($this->getClientID() == $captcha->ClientID)
+            if($this->getClientID()==$captcha->ClientID)
             {
-                $responseFieldName .= ($cont > 0) ? '-'.$cont : '';
+                $responseFieldName.=($cont > 0) ? '-'.$cont : '';
             }
             $cont++;
         }
@@ -236,7 +236,7 @@ 
      */
     public function reset()
     {
-        $this->Page->CallbackClient->callClientFunction('grecaptcha.reset',array(array($this->WidgetId)));
+        $this->Page->CallbackClient->callClientFunction('grecaptcha.reset', array(array($this->WidgetId)));
     }
     /**
      * Gets the response for the reCAPTCHA widget.
@@ -259,34 +259,34 @@ 
     }
     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;
+        $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);";
+        $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))
+        $value=$this->getValidationPropertyValue();
+        if($value===null || empty($value))
             return false;
 
         return true;
@@ -299,46 +299,46 @@ 
     {
         parent::onPreRender($param);
 
-        if("" == $this->getSiteKey())
+        if(""==$this->getSiteKey())
             throw new TConfigurationException('recaptcha_publickey_unknown');
-        if("" == $this->getSecretKey())
+        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());
+        $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());
+        $writer->addAttribute('id', $this->getClientID());
         parent::addAttributesToRender($writer);
     }
     public function raiseCallbackEvent($param)
     {
-        $params = $param->getCallbackParameter();
-        if ($params instanceof stdClass)
+        $params=$param->getCallbackParameter();
+        if($params instanceof stdClass)
         {
-            $callback = property_exists($params, 'onCallback');
-            $callbackExpired = property_exists($params, 'onCallbackExpired');
+            $callback=property_exists($params, 'onCallback');
+            $callbackExpired=property_exists($params, 'onCallbackExpired');
 
-            if ($callback)
+            if($callback)
             {
-                $this->WidgetId = $params->widgetId;
-                $this->Response = $params->response;
-                $this->Page->CallbackClient->jQuery($params->responseField, 'text',array($params->response));
+                $this->WidgetId=$params->widgetId;
+                $this->Response=$params->response;
+                $this->Page->CallbackClient->jQuery($params->responseField, 'text', array($params->response));
 
-                if ($params->onCallback)
+                if($params->onCallback)
                 {
                     $this->onCallback($param);
                 }
             }
 
-            if ($callbackExpired)
+            if($callbackExpired)
             {
-                $this->Response = '';
+                $this->Response='';
                 $this->reset();
 
-                if ($params->onCallbackExpired)
+                if($params->onCallbackExpired)
                 {
                     $this->onCallbackExpired($param);
                 }

framework/Web/UI/WebControls/TStyleSheet.php

Spacing +6 added lines, -6 removed lines

@@ -82,7 +82,7 @@ 
 	 */
 	public function getMediaType()
 	{
-		return $this->getViewState('MediaType','');
+		return $this->getViewState('MediaType', '');
 	}
 
 	/**
@@ -90,7 +90,7 @@ 
 	 */
 	public function setMediaType($value)
 	{
-		$this->setViewState('MediaType',$value,'');
+		$this->setViewState('MediaType', $value, '');
 	}
 
 	/**
@@ -100,17 +100,17 @@ 
 	 */
 	public function onPreRender($param)
 	{
-		$cs = $this->getPage()->getClientScript();
+		$cs=$this->getPage()->getClientScript();
 
-		$styles = preg_split('/,|\s+/', $this->getPradoStyles());
+		$styles=preg_split('/,|\s+/', $this->getPradoStyles());
 		foreach($styles as $style)
 		{
-			if(($style = trim($style))!=='')
+			if(($style=trim($style))!=='')
 				$cs->registerPradoStyle($style);
 		}
 
 		if(($url=$this->getStyleSheetUrl())!=='')
-			$cs->registerStyleSheetFile($url,$url,$this->getMediaType());
+			$cs->registerStyleSheetFile($url, $url, $this->getMediaType());
 	}
 
 	/**

framework/Web/UI/WebControls/TStyle.php

Indentation +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
 	 */
 	public function __construct($style=null)
 	{
-    parent::__construct();
+	parent::__construct();
 		if($style!==null)
 			$this->copyFrom($style);
 	}

Doc Comments +4 added lines, -1 removed lines

@@ -228,7 +228,7 @@ 
 	}
 
 	/**
-	 * @return TDisplayStyle display style
+	 * @return string display style
 	 */
 	public function getDisplayStyle()
 	{
@@ -285,6 +285,7 @@ 
 	 * Sets custom style fields from a string.
 	 * Custom style fields will be overwritten by style fields explicitly defined.
 	 * @param string the custom style of the control
+	 * @param string $value
 	 */
 	public function setCustomStyle($value)
 	{
@@ -304,6 +305,8 @@ 
 	 * Style fields set by this method will overwrite those set by {@link setCustomStyle}.
 	 * @param string style field name
 	 * @param string style field value
+	 * @param string $name
+	 * @param string $value
 	 */
 	public function setStyleField($name,$value)
 	{

Spacing +32 added lines, -32 removed lines

@@ -53,16 +53,16 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		parent::_getZappableSleepProps($exprops);
-		if ($this->_fields===array())
-			$exprops[] = "\0TStyle\0_fields";
+		if($this->_fields===array())
+			$exprops[]="\0TStyle\0_fields";
 		if($this->_font===null)
-			$exprops[] = "\0TStyle\0_font";
+			$exprops[]="\0TStyle\0_font";
 		if($this->_class===null)
-			$exprops[] = "\0TStyle\0_class";
-		if ($this->_customStyle===null)
-			$exprops[] = "\0TStyle\0_customStyle";
-		if ($this->_displayStyle==='Fixed')
-			$exprops[] = "\0TStyle\0_displayStyle";
+			$exprops[]="\0TStyle\0_class";
+		if($this->_customStyle===null)
+			$exprops[]="\0TStyle\0_customStyle";
+		if($this->_displayStyle==='Fixed')
+			$exprops[]="\0TStyle\0_displayStyle";
 	}
 
 	/**
@@ -82,7 +82,7 @@ 
 	public function __clone()
 	{
 		if($this->_font!==null)
-			$this->_font = clone($this->_font);
+			$this->_font=clone($this->_font);
 	}
 
 	/**
@@ -90,7 +90,7 @@ 
 	 */
 	public function getBackColor()
 	{
-		return isset($this->_fields['background-color'])?$this->_fields['background-color']:'';
+		return isset($this->_fields['background-color']) ? $this->_fields['background-color'] : '';
 	}
 
 	/**
@@ -109,7 +109,7 @@ 
 	 */
 	public function getBorderColor()
 	{
-		return isset($this->_fields['border-color'])?$this->_fields['border-color']:'';
+		return isset($this->_fields['border-color']) ? $this->_fields['border-color'] : '';
 	}
 
 	/**
@@ -128,7 +128,7 @@ 
 	 */
 	public function getBorderStyle()
 	{
-		return isset($this->_fields['border-style'])?$this->_fields['border-style']:'';
+		return isset($this->_fields['border-style']) ? $this->_fields['border-style'] : '';
 	}
 
 	/**
@@ -148,7 +148,7 @@ 
 	 */
 	public function getBorderWidth()
 	{
-		return isset($this->_fields['border-width'])?$this->_fields['border-width']:'';
+		return isset($this->_fields['border-width']) ? $this->_fields['border-width'] : '';
 	}
 
 	/**
@@ -167,7 +167,7 @@ 
 	 */
 	public function getCssClass()
 	{
-		return $this->_class===null?'':$this->_class;
+		return $this->_class===null ? '' : $this->_class;
 	}
 
 	/**
@@ -201,7 +201,7 @@ 
 	 */
 	public function hasFont()
 	{
-		return $this->_font !== null;
+		return $this->_font!==null;
 	}
 
 	/**
@@ -209,20 +209,20 @@ 
 	 */
 	public function setDisplayStyle($value)
 	{
-		$this->_displayStyle = TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TDisplayStyle');
+		$this->_displayStyle=TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TDisplayStyle');
 		switch($this->_displayStyle)
 		{
 			case TDisplayStyle::None:
-				$this->_fields['display'] = 'none';
+				$this->_fields['display']='none';
 				break;
 			case TDisplayStyle::Dynamic:
-				$this->_fields['display'] = ''; //remove the display property
+				$this->_fields['display']=''; //remove the display property
 				break;
 			case TDisplayStyle::Fixed:
-				$this->_fields['visibility'] = 'visible';
+				$this->_fields['visibility']='visible';
 				break;
 			case TDisplayStyle::Hidden:
-				$this->_fields['visibility'] = 'hidden';
+				$this->_fields['visibility']='hidden';
 				break;
 		}
 	}
@@ -240,7 +240,7 @@ 
 	 */
 	public function getForeColor()
 	{
-		return isset($this->_fields['color'])?$this->_fields['color']:'';
+		return isset($this->_fields['color']) ? $this->_fields['color'] : '';
 	}
 
 	/**
@@ -259,7 +259,7 @@ 
 	 */
 	public function getHeight()
 	{
-		return isset($this->_fields['height'])?$this->_fields['height']:'';
+		return isset($this->_fields['height']) ? $this->_fields['height'] : '';
 	}
 
 	/**
@@ -278,7 +278,7 @@ 
 	 */
 	public function getCustomStyle()
 	{
-		return $this->_customStyle===null?'':$this->_customStyle;
+		return $this->_customStyle===null ? '' : $this->_customStyle;
 	}
 
 	/**
@@ -296,7 +296,7 @@ 
 	 */
 	public function getStyleField($name)
 	{
-		return isset($this->_fields[$name])?$this->_fields[$name]:'';
+		return isset($this->_fields[$name]) ? $this->_fields[$name] : '';
 	}
 
 	/**
@@ -305,7 +305,7 @@ 
 	 * @param string style field name
 	 * @param string style field value
 	 */
-	public function setStyleField($name,$value)
+	public function setStyleField($name, $value)
 	{
 		$this->_fields[$name]=$value;
 	}
@@ -332,7 +332,7 @@ 
 	 */
 	public function getWidth()
 	{
-		return isset($this->_fields['width'])?$this->_fields['width']:'';
+		return isset($this->_fields['width']) ? $this->_fields['width'] : '';
 	}
 
 	/**
@@ -364,7 +364,7 @@ 
 	{
 		if($style instanceof TStyle)
 		{
-			$this->_fields=array_merge($this->_fields,$style->_fields);
+			$this->_fields=array_merge($this->_fields, $style->_fields);
 			if($style->_class!==null)
 				$this->_class=$style->_class;
 			if($style->_customStyle!==null)
@@ -384,7 +384,7 @@ 
 	{
 		if($style instanceof TStyle)
 		{
-			$this->_fields=array_merge($style->_fields,$this->_fields);
+			$this->_fields=array_merge($style->_fields, $this->_fields);
 			if($this->_class===null)
 				$this->_class=$style->_class;
 			if($this->_customStyle===null)
@@ -402,18 +402,18 @@ 
 	{
 		if($this->_customStyle!==null)
 		{
-			foreach(explode(';',$this->_customStyle) as $style)
+			foreach(explode(';', $this->_customStyle) as $style)
 			{
-				$arr=explode(':',$style,2);
+				$arr=explode(':', $style, 2);
 				if(isset($arr[1]) && trim($arr[0])!=='')
-					$writer->addStyleAttribute(trim($arr[0]),trim($arr[1]));
+					$writer->addStyleAttribute(trim($arr[0]), trim($arr[1]));
 			}
 		}
 		$writer->addStyleAttributes($this->_fields);
 		if($this->_font!==null)
 			$this->_font->addAttributesToRender($writer);
 		if($this->_class!==null)
-			$writer->addAttribute('class',$this->_class);
+			$writer->addAttribute('class', $this->_class);
 	}
 
 	/**

framework/Caching/ICache.php

Doc Comments +1 added lines

@@ -149,6 +149,7 @@
 	/**
 	 * Finds the database connection instance from the Application modules.
 	 * @param string Database connection module ID.
+	 * @param string $id
 	 * @return TDbConnection database connection.
 	 * @throws TConfigurationException when module is not of TDbConnection or TDataSourceConfig.
 	 */

Spacing +2 added lines, -2 removed lines

@@ -200,7 +200,7 @@ 
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labelled invalid.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	public function set($id,$value,$expire=0,$dependency=null);
+	public function set($id, $value, $expire=0, $dependency=null);
 	/**
 	 * Stores a value identified by a key into cache if the cache does not contain this key.
 	 * Nothing will be done if the cache already contains the key.
@@ -210,7 +210,7 @@ 
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labelled invalid.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	public function add($id,$value,$expire=0,$dependency=null);
+	public function add($id, $value, $expire=0, $dependency=null);
 	/**
 	 * Deletes a value with the specified key from cache
 	 * @param string the key of the value to be deleted