Completed
Push — master ( 2c4901...f8799b )
by Fabio
10:54
created
framework/I18N/TGlobalization.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -225,10 +225,10 @@
 block discarded – undo
225 225
 				chmod($config['cache'], PRADO_CHMOD); //make it deletable
226 226
 			}
227 227
 		}
228
-        else
229
-        {
230
-            unset($config['cache']);
231
-        }
228
+		else
229
+		{
230
+			unset($config['cache']);
231
+		}
232 232
 		$this->_translation = $config;
233 233
 	}
234 234
 
Please login to merge, or discard this patch.
framework/pradolite.php 1 patch
Indentation   +92 added lines, -92 removed lines patch added patch discarded remove patch
@@ -4169,10 +4169,10 @@  discard block
 block discarded – undo
4169 4169
 		{
4170 4170
 			$value=TPropertyValue::ensureEnum($value,'THttpSessionCookieMode');
4171 4171
 			if($value===THttpSessionCookieMode::None) 
4172
-      {
4172
+	  {
4173 4173
 				ini_set('session.use_cookies','0');
4174 4174
 			  ini_set('session.use_only_cookies','0');
4175
-      }
4175
+	  }
4176 4176
 			else if($value===THttpSessionCookieMode::Allow)
4177 4177
 			{
4178 4178
 				ini_set('session.use_cookies','1');
@@ -5854,7 +5854,7 @@  discard block
 block discarded – undo
5854 5854
 	}
5855 5855
 	public function __construct($style=null)
5856 5856
 	{
5857
-    parent::__construct();
5857
+	parent::__construct();
5858 5858
 		if($style!==null)
5859 5859
 			$this->copyFrom($style);
5860 5860
 	}
@@ -6844,77 +6844,77 @@  discard block
 block discarded – undo
6844 6844
 			throw new TConfigurationException('templatecontrol_mastercontrol_required',get_class($this));
6845 6845
 		parent::initRecursive($namingContainer);
6846 6846
 	}
6847
-        public function tryToUpdateView($arObj, $throwExceptions = false)
6848
-        {
6849
-                $objAttrs = get_class_vars(get_class($arObj));
6850
-                foreach (array_keys($objAttrs) as $key)
6851
-                {
6852
-                        try
6853
-                        {
6854
-                                if ($key != "RELATIONS")
6855
-                                {
6856
-                                        $control = $this->{$key};
6857
-                                        if ($control instanceof TTextBox)
6858
-                                                $control->Text = $arObj->{$key};
6859
-                                        elseif ($control instanceof TCheckBox)
6860
-                                                $control->Checked = (boolean) $arObj->{$key};
6861
-                                        elseif ($control instanceof TDatePicker)
6862
-                                                $control->Date = $arObj->{$key};
6863
-                                }
6864
-                                else
6865
-                                {
6866
-                                        foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
6867
-                                        {
6868
-                                                $relControl = $this->{$relKey};
6869
-                                                switch ($relValues[0])
6870
-                                                {
6871
-                                                        case TActiveRecord::BELONGS_TO:
6872
-                                                        case TActiveRecord::HAS_ONE:
6873
-                                                                $relControl->Text = $arObj->{$relKey};
6874
-                                                                break;
6875
-                                                        case TActiveRecord::HAS_MANY:
6876
-                                                                if ($relControl instanceof TListControl)
6877
-                                                                {
6878
-                                                                        $relControl->DataSource = $arObj->{$relKey};
6879
-                                                                        $relControl->dataBind();
6880
-                                                                }
6881
-                                                                break;
6882
-                                                }
6883
-                                        }
6884
-                                        break;
6885
-                                }
6886
-                        } 
6887
-                        catch (Exception $ex)
6888
-                        {
6889
-                                if ($throwExceptions)
6890
-                                        throw $ex;
6891
-                        }
6892
-                }
6893
-        }
6894
-        public function tryToUpdateAR($arObj, $throwExceptions = false)
6895
-        {
6896
-                $objAttrs = get_class_vars(get_class($arObj));
6897
-                foreach (array_keys($objAttrs) as $key)
6898
-                {
6899
-                        try
6900
-                        {
6901
-                                if ($key == "RELATIONS")
6902
-                                        break;
6903
-                                $control = $this->{$key};
6904
-                                if ($control instanceof TTextBox)
6905
-                                        $arObj->{$key} = $control->Text;
6906
-                                elseif ($control instanceof TCheckBox)
6907
-                                        $arObj->{$key} = $control->Checked;
6908
-                                elseif ($control instanceof TDatePicker)
6909
-                                        $arObj->{$key} = $control->Date;
6910
-                        } 
6911
-                        catch (Exception $ex)
6912
-                        {
6913
-                                if ($throwExceptions)
6914
-                                        throw $ex;
6915
-                        }
6916
-                }
6917
-        }
6847
+		public function tryToUpdateView($arObj, $throwExceptions = false)
6848
+		{
6849
+				$objAttrs = get_class_vars(get_class($arObj));
6850
+				foreach (array_keys($objAttrs) as $key)
6851
+				{
6852
+						try
6853
+						{
6854
+								if ($key != "RELATIONS")
6855
+								{
6856
+										$control = $this->{$key};
6857
+										if ($control instanceof TTextBox)
6858
+												$control->Text = $arObj->{$key};
6859
+										elseif ($control instanceof TCheckBox)
6860
+												$control->Checked = (boolean) $arObj->{$key};
6861
+										elseif ($control instanceof TDatePicker)
6862
+												$control->Date = $arObj->{$key};
6863
+								}
6864
+								else
6865
+								{
6866
+										foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
6867
+										{
6868
+												$relControl = $this->{$relKey};
6869
+												switch ($relValues[0])
6870
+												{
6871
+														case TActiveRecord::BELONGS_TO:
6872
+														case TActiveRecord::HAS_ONE:
6873
+																$relControl->Text = $arObj->{$relKey};
6874
+																break;
6875
+														case TActiveRecord::HAS_MANY:
6876
+																if ($relControl instanceof TListControl)
6877
+																{
6878
+																		$relControl->DataSource = $arObj->{$relKey};
6879
+																		$relControl->dataBind();
6880
+																}
6881
+																break;
6882
+												}
6883
+										}
6884
+										break;
6885
+								}
6886
+						} 
6887
+						catch (Exception $ex)
6888
+						{
6889
+								if ($throwExceptions)
6890
+										throw $ex;
6891
+						}
6892
+				}
6893
+		}
6894
+		public function tryToUpdateAR($arObj, $throwExceptions = false)
6895
+		{
6896
+				$objAttrs = get_class_vars(get_class($arObj));
6897
+				foreach (array_keys($objAttrs) as $key)
6898
+				{
6899
+						try
6900
+						{
6901
+								if ($key == "RELATIONS")
6902
+										break;
6903
+								$control = $this->{$key};
6904
+								if ($control instanceof TTextBox)
6905
+										$arObj->{$key} = $control->Text;
6906
+								elseif ($control instanceof TCheckBox)
6907
+										$arObj->{$key} = $control->Checked;
6908
+								elseif ($control instanceof TDatePicker)
6909
+										$arObj->{$key} = $control->Date;
6910
+						} 
6911
+						catch (Exception $ex)
6912
+						{
6913
+								if ($throwExceptions)
6914
+										throw $ex;
6915
+						}
6916
+				}
6917
+		}
6918 6918
 }
6919 6919
 class TForm extends TControl
6920 6920
 {
@@ -7627,13 +7627,13 @@  discard block
 block discarded – undo
7627 7627
 		Prado::using('System.Web.UI.ActiveControls.TActivePageAdapter');
7628 7628
 		Prado::using('System.Web.UI.JuiControls.TJuiControlOptions');
7629 7629
 		$this->setAdapter(new TActivePageAdapter($this));
7630
-        $callbackEventParameter = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
7631
-        if(strlen($callbackEventParameter) > 0)
7632
-            $this->_postData[TPage::FIELD_CALLBACK_PARAMETER]=TJavaScript::jsonDecode((string)$callbackEventParameter);
7633
-                if (($g=$this->getApplication()->getGlobalization(false))!==null &&
7634
-            strtoupper($enc=$g->getCharset())!='UTF-8')
7635
-                foreach ($this->_postData as $k=>$v)
7636
-                	$this->_postData[$k]=self::decodeUTF8($v, $enc);
7630
+		$callbackEventParameter = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
7631
+		if(strlen($callbackEventParameter) > 0)
7632
+			$this->_postData[TPage::FIELD_CALLBACK_PARAMETER]=TJavaScript::jsonDecode((string)$callbackEventParameter);
7633
+				if (($g=$this->getApplication()->getGlobalization(false))!==null &&
7634
+			strtoupper($enc=$g->getCharset())!='UTF-8')
7635
+				foreach ($this->_postData as $k=>$v)
7636
+					$this->_postData[$k]=self::decodeUTF8($v, $enc);
7637 7637
 		$this->onPreInit(null);
7638 7638
 		$this->initRecursive();
7639 7639
 		$this->onInitComplete(null);
@@ -9218,15 +9218,15 @@  discard block
 block discarded – undo
9218 9218
 	  $component=new ReflectionClass('TComponent');
9219 9219
 	  $behaviors=$component->getStaticProperties();
9220 9220
 	  if(!isset($behaviors['_um']))
9221
-	    return false;
9221
+		return false;
9222 9222
 	  foreach($behaviors['_um'] as $name=>$list)
9223 9223
 	  {
9224
-	    if(strtolower($class->getShortName())!==$name && !$class->isSubclassOf($name)) continue;
9225
-	    foreach($list as $param)
9226
-	    {
9227
-	      if(method_exists($param->getBehavior(),$method))
9228
-	        return true;
9229
-	    }
9224
+		if(strtolower($class->getShortName())!==$name && !$class->isSubclassOf($name)) continue;
9225
+		foreach($list as $param)
9226
+		{
9227
+		  if(method_exists($param->getBehavior(),$method))
9228
+			return true;
9229
+		}
9230 9230
 	  }
9231 9231
 	  return false;
9232 9232
 	}
@@ -10304,10 +10304,10 @@  discard block
 block discarded – undo
10304 10304
 						$config['cache']);
10305 10305
 				chmod($config['cache'], PRADO_CHMOD); 			}
10306 10306
 		}
10307
-        else
10308
-        {
10309
-            unset($config['cache']);
10310
-        }
10307
+		else
10308
+		{
10309
+			unset($config['cache']);
10310
+		}
10311 10311
 		$this->_translation = $config;
10312 10312
 	}
10313 10313
 	public function getTranslationCatalogue()
Please login to merge, or discard this patch.