Completed
Push — prado-3.3 ( f4da81...5dd4b5 )
by Fabio
09:03
created
framework/Web/UI/TCachePageStatePersister.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 			if($cache===null || !($cache instanceof ICache))
111 111
 			{
112 112
 				if($this->_cacheModuleID!=='')
113
-					throw new TConfigurationException('cachepagestatepersister_cachemoduleid_invalid',$this->_cacheModuleID);
113
+					throw new TConfigurationException('cachepagestatepersister_cachemoduleid_invalid', $this->_cacheModuleID);
114 114
 				else
115 115
 					throw new TConfigurationException('cachepagestatepersister_cache_required');
116 116
 			}
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 	 */
134 134
 	public function setCacheTimeout($value)
135 135
 	{
136
-		if(($value=TPropertyValue::ensureInteger($value))>=0)
136
+		if(($value=TPropertyValue::ensureInteger($value)) >= 0)
137 137
 			$this->_timeout=$value;
138 138
 		else
139 139
 			throw new TInvalidDataValueException('cachepagestatepersister_timeout_invalid');
@@ -173,10 +173,10 @@  discard block
 block discarded – undo
173 173
 	 */
174 174
 	public function save($data)
175 175
 	{
176
-		$timestamp=(string)microtime(true);
176
+		$timestamp=(string) microtime(true);
177 177
 		$key=$this->calculateKey($timestamp);
178
-		$this->getCache()->add($key,$data,$this->_timeout);
179
-		$this->_page->setClientState(TPageStateFormatter::serialize($this->_page,$timestamp));
178
+		$this->getCache()->add($key, $data, $this->_timeout);
179
+		$this->_page->setClientState(TPageStateFormatter::serialize($this->_page, $timestamp));
180 180
 	}
181 181
 
182 182
 	/**
@@ -186,13 +186,13 @@  discard block
 block discarded – undo
186 186
 	 */
187 187
 	public function load()
188 188
 	{
189
-		if(($timestamp=TPageStateFormatter::unserialize($this->_page,$this->_page->getRequestClientState()))!==null)
189
+		if(($timestamp=TPageStateFormatter::unserialize($this->_page, $this->_page->getRequestClientState()))!==null)
190 190
 		{
191 191
 			$key=$this->calculateKey($timestamp);
192 192
 			if(($data=$this->getCache()->get($key))!==false)
193 193
 				return $data;
194 194
 		}
195
-		throw new THttpException(400,'cachepagestatepersister_pagestate_corrupted');
195
+		throw new THttpException(400, 'cachepagestatepersister_pagestate_corrupted');
196 196
 	}
197 197
 }
198 198
 
Please login to merge, or discard this patch.
framework/Web/UI/TThemeManager.php 1 patch
Spacing   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 	/**
47 47
 	 * default theme class
48 48
 	 */
49
-	const DEFAULT_THEMECLASS = 'TTheme';
49
+	const DEFAULT_THEMECLASS='TTheme';
50 50
 
51 51
 	/**
52 52
 	 * @var string
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 	public function getTheme($name)
89 89
 	{
90 90
 		$themePath=$this->getBasePath().DIRECTORY_SEPARATOR.$name;
91
-		$themeUrl=rtrim($this->getBaseUrl(),'/').'/'.$name;
91
+		$themeUrl=rtrim($this->getBaseUrl(), '/').'/'.$name;
92 92
 		return Prado::createComponent($this->getThemeClass(), $themePath, $themeUrl);
93 93
 	}
94 94
 
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 	 * @param string|null $class Theme class name in namespace format
97 97
 	 */
98 98
 	public function setThemeClass($class) {
99
-		$this->_themeClass = $class===null ? self::DEFAULT_THEMECLASS : (string)$class;
99
+		$this->_themeClass=$class===null ? self::DEFAULT_THEMECLASS : (string) $class;
100 100
 	}
101 101
 
102 102
 	/**
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 		{
134 134
 			$this->_basePath=dirname($this->getRequest()->getApplicationFilePath()).DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;
135 135
 			if(($basePath=realpath($this->_basePath))===false || !is_dir($basePath))
136
-				throw new TConfigurationException('thememanager_basepath_invalid2',$this->_basePath);
136
+				throw new TConfigurationException('thememanager_basepath_invalid2', $this->_basePath);
137 137
 			$this->_basePath=$basePath;
138 138
 		}
139 139
 		return $this->_basePath;
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 		{
152 152
 			$this->_basePath=Prado::getPathOfNamespace($value);
153 153
 			if($this->_basePath===null || !is_dir($this->_basePath))
154
-				throw new TInvalidDataValueException('thememanager_basepath_invalid',$value);
154
+				throw new TInvalidDataValueException('thememanager_basepath_invalid', $value);
155 155
 		}
156 156
 	}
157 157
 
@@ -165,10 +165,10 @@  discard block
 block discarded – undo
165 165
 		{
166 166
 			$appPath=dirname($this->getRequest()->getApplicationFilePath());
167 167
 			$basePath=$this->getBasePath();
168
-			if(strpos($basePath,$appPath)===false)
168
+			if(strpos($basePath, $appPath)===false)
169 169
 				throw new TConfigurationException('thememanager_baseurl_required');
170
-			$appUrl=rtrim(dirname($this->getRequest()->getApplicationUrl()),'/\\');
171
-			$this->_baseUrl=$appUrl.strtr(substr($basePath,strlen($appPath)),'\\','/');
170
+			$appUrl=rtrim(dirname($this->getRequest()->getApplicationUrl()), '/\\');
171
+			$this->_baseUrl=$appUrl.strtr(substr($basePath, strlen($appPath)), '\\', '/');
172 172
 		}
173 173
 		return $this->_baseUrl;
174 174
 	}
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 	 */
179 179
 	public function setBaseUrl($value)
180 180
 	{
181
-		$this->_baseUrl=rtrim($value,'/');
181
+		$this->_baseUrl=rtrim($value, '/');
182 182
 	}
183 183
 }
184 184
 
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
 	 * @param string theme URL
249 249
 	 * @throws TConfigurationException if theme path does not exist or any parsing error of the skin files
250 250
 	 */
251
-	public function __construct($themePath,$themeUrl)
251
+	public function __construct($themePath, $themeUrl)
252 252
 	{
253 253
 		$this->_themeUrl=$themeUrl;
254 254
 		$this->_themePath=realpath($themePath);
@@ -260,21 +260,21 @@  discard block
 block discarded – undo
260 260
 			$array=$cache->get(self::THEME_CACHE_PREFIX.$themePath);
261 261
 			if(is_array($array))
262 262
 			{
263
-				list($skins,$cssFiles,$jsFiles,$timestamp)=$array;
263
+				list($skins, $cssFiles, $jsFiles, $timestamp)=$array;
264 264
 				if($this->getApplication()->getMode()!==TApplicationMode::Performance)
265 265
 				{
266 266
 					if(($dir=opendir($themePath))===false)
267
-						throw new TIOException('theme_path_inexistent',$themePath);
267
+						throw new TIOException('theme_path_inexistent', $themePath);
268 268
 					$cacheValid=true;
269 269
 					while(($file=readdir($dir))!==false)
270 270
 					{
271 271
 						if($file==='.' || $file==='..')
272 272
 							continue;
273
-						else if(basename($file,'.css')!==$file)
273
+						else if(basename($file, '.css')!==$file)
274 274
 							$this->_cssFiles[]=$themeUrl.'/'.$file;
275
-						else if(basename($file,'.js')!==$file)
275
+						else if(basename($file, '.js')!==$file)
276 276
 							$this->_jsFiles[]=$themeUrl.'/'.$file;
277
-						else if(basename($file,self::SKIN_FILE_EXT)!==$file && filemtime($themePath.DIRECTORY_SEPARATOR.$file)>$timestamp)
277
+						else if(basename($file, self::SKIN_FILE_EXT)!==$file && filemtime($themePath.DIRECTORY_SEPARATOR.$file) > $timestamp)
278 278
 						{
279 279
 							$cacheValid=false;
280 280
 							break;
@@ -299,29 +299,29 @@  discard block
 block discarded – undo
299 299
 			$this->_jsFiles=array();
300 300
 			$this->_skins=array();
301 301
 			if(($dir=opendir($themePath))===false)
302
-				throw new TIOException('theme_path_inexistent',$themePath);
302
+				throw new TIOException('theme_path_inexistent', $themePath);
303 303
 			while(($file=readdir($dir))!==false)
304 304
 			{
305 305
 				if($file==='.' || $file==='..')
306 306
 					continue;
307
-				else if(basename($file,'.css')!==$file)
307
+				else if(basename($file, '.css')!==$file)
308 308
 					$this->_cssFiles[]=$themeUrl.'/'.$file;
309
-				else if(basename($file,'.js')!==$file)
309
+				else if(basename($file, '.js')!==$file)
310 310
 					$this->_jsFiles[]=$themeUrl.'/'.$file;
311
-				else if(basename($file,self::SKIN_FILE_EXT)!==$file)
311
+				else if(basename($file, self::SKIN_FILE_EXT)!==$file)
312 312
 				{
313
-					$template=new TTemplate(file_get_contents($themePath.'/'.$file),$themePath,$themePath.'/'.$file);
313
+					$template=new TTemplate(file_get_contents($themePath.'/'.$file), $themePath, $themePath.'/'.$file);
314 314
 					foreach($template->getItems() as $skin)
315 315
 					{
316 316
 						if(!isset($skin[2]))  // a text string, ignored
317 317
 							continue;
318 318
 						else if($skin[0]!==-1)
319
-							throw new TConfigurationException('theme_control_nested',$skin[1],dirname($themePath));
319
+							throw new TConfigurationException('theme_control_nested', $skin[1], dirname($themePath));
320 320
 						$type=$skin[1];
321
-						$id=isset($skin[2]['skinid'])?$skin[2]['skinid']:0;
321
+						$id=isset($skin[2]['skinid']) ? $skin[2]['skinid'] : 0;
322 322
 						unset($skin[2]['skinid']);
323 323
 						if(isset($this->_skins[$type][$id]))
324
-							throw new TConfigurationException('theme_skinid_duplicated',$type,$id,dirname($themePath));
324
+							throw new TConfigurationException('theme_skinid_duplicated', $type, $id, dirname($themePath));
325 325
 						/*
326 326
 						foreach($skin[2] as $name=>$value)
327 327
 						{
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
 			sort($this->_cssFiles);
338 338
 			sort($this->_jsFiles);
339 339
 			if($cache!==null)
340
-				$cache->set(self::THEME_CACHE_PREFIX.$themePath,array($this->_skins,$this->_cssFiles,$this->_jsFiles,time()));
340
+				$cache->set(self::THEME_CACHE_PREFIX.$themePath, array($this->_skins, $this->_cssFiles, $this->_jsFiles, time()));
341 341
 		}
342 342
 	}
343 343
 
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
354 354
 	 */
355 355
 	protected function setName($value)
356 356
 	{
357
-		$this->_name = $value;
357
+		$this->_name=$value;
358 358
 	}
359 359
 
360 360
 	/**
@@ -370,7 +370,7 @@  discard block
 block discarded – undo
370 370
 	 */
371 371
 	protected function setBaseUrl($value)
372 372
 	{
373
-		$this->_themeUrl=rtrim($value,'/');
373
+		$this->_themeUrl=rtrim($value, '/');
374 374
 	}
375 375
 
376 376
 	/**
@@ -402,7 +402,7 @@  discard block
 block discarded – undo
402 402
 	 */
403 403
 	protected function setSkins($value)
404 404
 	{
405
-		$this->_skins = $value;
405
+		$this->_skins=$value;
406 406
 	}
407 407
 
408 408
 	/**
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
423 423
 		{
424 424
 			foreach($this->_skins[$type][$id] as $name=>$value)
425 425
 			{
426
-				Prado::trace("Applying skin $name to $type",'System.Web.UI.TThemeManager');
426
+				Prado::trace("Applying skin $name to $type", 'System.Web.UI.TThemeManager');
427 427
 				if(is_array($value))
428 428
 				{
429 429
 					switch($value[0])
@@ -432,28 +432,28 @@  discard block
 block discarded – undo
432 432
 							$value=$this->evaluateExpression($value[1]);
433 433
 							break;
434 434
 						case TTemplate::CONFIG_ASSET:
435
-							$value=$this->_themeUrl.'/'.ltrim($value[1],'/');
435
+							$value=$this->_themeUrl.'/'.ltrim($value[1], '/');
436 436
 							break;
437 437
 						case TTemplate::CONFIG_DATABIND:
438
-							$control->bindProperty($name,$value[1]);
438
+							$control->bindProperty($name, $value[1]);
439 439
 							break;
440 440
 						case TTemplate::CONFIG_PARAMETER:
441
-							$control->setSubProperty($name,$this->getApplication()->getParameters()->itemAt($value[1]));
441
+							$control->setSubProperty($name, $this->getApplication()->getParameters()->itemAt($value[1]));
442 442
 							break;
443 443
 						case TTemplate::CONFIG_TEMPLATE:
444
-							$control->setSubProperty($name,$value[1]);
444
+							$control->setSubProperty($name, $value[1]);
445 445
 							break;
446 446
 						case TTemplate::CONFIG_LOCALIZATION:
447
-							$control->setSubProperty($name,Prado::localize($value[1]));
447
+							$control->setSubProperty($name, Prado::localize($value[1]));
448 448
 							break;
449 449
 						default:
450
-							throw new TConfigurationException('theme_tag_unexpected',$name,$value[0]);
450
+							throw new TConfigurationException('theme_tag_unexpected', $name, $value[0]);
451 451
 							break;
452 452
 					}
453 453
 				}
454 454
 				if(!is_array($value))
455 455
 				{
456
-					if(strpos($name,'.')===false)	// is simple property or custom attribute
456
+					if(strpos($name, '.')===false)	// is simple property or custom attribute
457 457
 					{
458 458
 						if($control->hasProperty($name))
459 459
 						{
@@ -463,13 +463,13 @@  discard block
 block discarded – undo
463 463
 								$control->$setter($value);
464 464
 							}
465 465
 							else
466
-								throw new TConfigurationException('theme_property_readonly',$type,$name);
466
+								throw new TConfigurationException('theme_property_readonly', $type, $name);
467 467
 						}
468 468
 						else
469
-							throw new TConfigurationException('theme_property_undefined',$type,$name);
469
+							throw new TConfigurationException('theme_property_undefined', $type, $name);
470 470
 					}
471 471
 					else	// complex property
472
-						$control->setSubProperty($name,$value);
472
+						$control->setSubProperty($name, $value);
473 473
 				}
474 474
 			}
475 475
 			return true;
Please login to merge, or discard this patch.
framework/Web/UI/ActiveControls/TActiveDataGrid.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 		parent::setDataSource($value);
95 95
 		if($this->getActiveControl()->canUpdateClientSide()) {
96 96
 			$this->renderPager();
97
-			$this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
97
+			$this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
98 98
 		}
99 99
 	}
100 100
 
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 	 * @param string CommandParameter corresponding to the OnCommand event of the button
137 137
 	 * @return mixed the button instance
138 138
 	 */
139
-	protected function createPagerButton($pager,$buttonType,$enabled,$text,$commandName,$commandParameter) {
139
+	protected function createPagerButton($pager, $buttonType, $enabled, $text, $commandName, $commandParameter) {
140 140
 		if($buttonType===TDataGridPagerButtonType::LinkButton) {
141 141
 			if($enabled)
142 142
 				$button=new TActiveLinkButton;
@@ -179,10 +179,10 @@  discard block
 block discarded – undo
179 179
 	public function render($writer) {
180 180
 		if($this->getHasPreRendered()) {
181 181
 			$this->renderDataGrid($writer);
182
-			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(),$writer);
182
+			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(), $writer);
183 183
 		}
184 184
 		else {
185
-			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
185
+			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
186 186
 		}
187 187
 	}
188 188
 
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 		foreach($pager as $item) {
197 197
 			if($item->ControlToPaginate==$this->ID) {
198 198
 				$writer=$this->getResponse()->createHtmlWriter();
199
-				$this->getPage()->getAdapter()->registerControlToRender($item,$writer);
199
+				$this->getPage()->getAdapter()->registerControlToRender($item, $writer);
200 200
 			}
201 201
 		}
202 202
 	}
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 	 * @param THtmlWriter writer for the rendering purpose
209 209
 	 */
210 210
 	private function renderDataGrid($writer) {
211
-	  $writer->addAttribute('id',$this->getSurroundingTagID());
211
+	  $writer->addAttribute('id', $this->getSurroundingTagID());
212 212
 	  $writer->renderBeginTag($this->getSurroundingTag());
213 213
 		parent::render($writer);
214 214
 		$writer->renderEndTag();
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
  * @since 3.1.9
235 235
  */
236 236
 class TActiveBoundColumn extends TBoundColumn {
237
-	protected function initializeHeaderCell($cell,$columnIndex) {
237
+	protected function initializeHeaderCell($cell, $columnIndex) {
238 238
 		$text=$this->getHeaderText();
239 239
 
240 240
 		if(($classPath=$this->getHeaderRenderer())!=='') {
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
  * @since 3.1.9
314 314
  */
315 315
 class TActiveEditCommandColumn extends TEditCommandColumn {
316
-	protected function createButton($commandName,$text,$causesValidation,$validationGroup) {
316
+	protected function createButton($commandName, $text, $causesValidation, $validationGroup) {
317 317
 		if($this->getButtonType()===TButtonColumnType::LinkButton)
318 318
 			$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
319 319
 		else if($this->getButtonType()===TButtonColumnType::PushButton)
@@ -322,9 +322,9 @@  discard block
 block discarded – undo
322 322
 			{
323 323
 				$button=Prado::createComponent('System.Web.UI.WebControls.TActiveImageButton');
324 324
 				$button->setToolTip($text);
325
-				if(strcasecmp($commandName,'Update')===0)
325
+				if(strcasecmp($commandName, 'Update')===0)
326 326
 					$url=$this->getUpdateImageUrl();
327
-				else if(strcasecmp($commandName,'Cancel')===0)
327
+				else if(strcasecmp($commandName, 'Cancel')===0)
328 328
 						$url=$this->getCancelImageUrl();
329 329
 					else
330 330
 						$url=$this->getEditImageUrl();
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
  * @since 3.1.9
356 356
  */
357 357
 class TActiveButtonColumn extends TButtonColumn {
358
-	public function initializeCell($cell,$columnIndex,$itemType) {
358
+	public function initializeCell($cell, $columnIndex, $itemType) {
359 359
 		if($itemType===TListItemType::Item || $itemType===TListItemType::AlternatingItem || $itemType===TListItemType::SelectedItem || $itemType===TListItemType::EditItem) {
360 360
 			$buttonType=$this->getButtonType();
361 361
 			if($buttonType===TButtonColumnType::LinkButton)
@@ -373,12 +373,12 @@  discard block
 block discarded – undo
373 373
 			$button->setCausesValidation($this->getCausesValidation());
374 374
 			$button->setValidationGroup($this->getValidationGroup());
375 375
 			if($this->getDataTextField()!=='' || ($buttonType===TButtonColumnType::ImageButton && $this->getDataImageUrlField()!==''))
376
-				$button->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
376
+				$button->attachEventHandler('OnDataBinding', array($this, 'dataBindColumn'));
377 377
 			$cell->getControls()->add($button);
378
-			$cell->registerObject('Button',$button);
378
+			$cell->registerObject('Button', $button);
379 379
 		}
380 380
 		else
381
-			parent::initializeCell($cell,$columnIndex,$itemType);
381
+			parent::initializeCell($cell, $columnIndex, $itemType);
382 382
 	}
383 383
 }
384 384
 
@@ -402,7 +402,7 @@  discard block
 block discarded – undo
402 402
  * @since 3.1.9
403 403
  */
404 404
 class TActiveTemplateColumn extends TTemplateColumn {
405
-	protected function initializeHeaderCell($cell,$columnIndex) {
405
+	protected function initializeHeaderCell($cell, $columnIndex) {
406 406
 		$text=$this->getHeaderText();
407 407
 
408 408
 		if(($classPath=$this->getHeaderRenderer())!=='') {
@@ -473,7 +473,7 @@  discard block
 block discarded – undo
473 473
 class TActiveHyperLinkColumn extends THyperLinkColumn
474 474
 {
475 475
 
476
-	protected function initializeHeaderCell($cell,$columnIndex)
476
+	protected function initializeHeaderCell($cell, $columnIndex)
477 477
 	{
478 478
 		$text=$this->getHeaderText();
479 479
 
@@ -562,7 +562,7 @@  discard block
 block discarded – undo
562 562
 	 * @param integer the index to the Columns property that the cell resides in.
563 563
 	 * @param string the type of cell (Header,Footer,Item,AlternatingItem,EditItem,SelectedItem)
564 564
 	 */
565
-	public function initializeCell($cell,$columnIndex,$itemType)
565
+	public function initializeCell($cell, $columnIndex, $itemType)
566 566
 	{
567 567
 		if($itemType===TListItemType::Item || $itemType===TListItemType::AlternatingItem || $itemType===TListItemType::SelectedItem || $itemType===TListItemType::EditItem)
568 568
 		{
@@ -571,15 +571,15 @@  discard block
 block discarded – undo
571 571
 				$checkBox->setEnabled(false);
572 572
 			$cell->setHorizontalAlign('Center');
573 573
 			$cell->getControls()->add($checkBox);
574
-			$cell->registerObject('CheckBox',$checkBox);
574
+			$cell->registerObject('CheckBox', $checkBox);
575 575
 			if($this->getDataField()!=='')
576
-				$checkBox->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
576
+				$checkBox->attachEventHandler('OnDataBinding', array($this, 'dataBindColumn'));
577 577
 		}
578 578
 		else
579
-			parent::initializeCell($cell,$columnIndex,$itemType);
579
+			parent::initializeCell($cell, $columnIndex, $itemType);
580 580
 	}
581 581
 
582
-	protected function initializeHeaderCell($cell,$columnIndex)
582
+	protected function initializeHeaderCell($cell, $columnIndex)
583 583
 	{
584 584
 		$text=$this->getHeaderText();
585 585
 
@@ -658,7 +658,7 @@  discard block
 block discarded – undo
658 658
  */
659 659
 class TActiveDropDownListColumn extends TDropDownListColumn
660 660
 {
661
-	protected function initializeHeaderCell($cell,$columnIndex)
661
+	protected function initializeHeaderCell($cell, $columnIndex)
662 662
 	{
663 663
 		$text=$this->getHeaderText();
664 664
 
@@ -745,7 +745,7 @@  discard block
 block discarded – undo
745 745
  * @since 3.1.9
746 746
  */
747 747
 class TActiveLiteralColumn extends TLiteralColumn {
748
-	protected function initializeHeaderCell($cell,$columnIndex) {
748
+	protected function initializeHeaderCell($cell, $columnIndex) {
749 749
 		$text=$this->getHeaderText();
750 750
 
751 751
 		if(($classPath=$this->getHeaderRenderer())!=='') {
@@ -821,8 +821,8 @@  discard block
 block discarded – undo
821 821
 	 */
822 822
 	public function getClientSide()
823 823
 	{
824
-		if($this->_callbackoptions === null)
825
-			$this->_callbackoptions = new TCallbackOptions;
824
+		if($this->_callbackoptions===null)
825
+			$this->_callbackoptions=new TCallbackOptions;
826 826
 		return $this->_callbackoptions->getClientSide();
827 827
 	}
828 828
 }
Please login to merge, or discard this patch.
framework/Web/UI/ActiveControls/TAutoComplete.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 	 */
121 121
 	public function setFrequency($value)
122 122
 	{
123
-		$this->setViewState('frequency', TPropertyValue::ensureFloat($value),'');
123
+		$this->setViewState('frequency', TPropertyValue::ensureFloat($value), '');
124 124
 	}
125 125
 
126 126
 	/**
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 	 */
129 129
 	public function getMinChars()
130 130
 	{
131
-		return $this->getViewState('minChars','');
131
+		return $this->getViewState('minChars', '');
132 132
 	}
133 133
 
134 134
 	/**
@@ -167,17 +167,17 @@  discard block
 block discarded – undo
167 167
 	 */
168 168
  	public function raiseCallbackEvent($param)
169 169
 	{
170
-		$token = $param->getCallbackParameter();
171
-		if(is_array($token) && count($token) == 2)
170
+		$token=$param->getCallbackParameter();
171
+		if(is_array($token) && count($token)==2)
172 172
 		{
173
-			if($token[1] === '__TAutoComplete_onSuggest__')
173
+			if($token[1]==='__TAutoComplete_onSuggest__')
174 174
 			{
175
-				$parameter = new TAutoCompleteEventParameter($this->getResponse(), $token[0]);
175
+				$parameter=new TAutoCompleteEventParameter($this->getResponse(), $token[0]);
176 176
 				$this->onSuggest($parameter);
177 177
 			}
178
-			else if($token[1] === '__TAutoComplete_onSuggestionSelected__')
178
+			else if($token[1]==='__TAutoComplete_onSuggestionSelected__')
179 179
 			{
180
-				$parameter = new TAutoCompleteEventParameter($this->getResponse(), null, $token[0]);
180
+				$parameter=new TAutoCompleteEventParameter($this->getResponse(), null, $token[0]);
181 181
 				$this->onSuggestionSelected($parameter);
182 182
 			}
183 183
 		}
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 	public function getResultPanel()
235 235
 	{
236 236
 		if($this->_resultPanel===null)
237
-			$this->_resultPanel = $this->createResultPanel();
237
+			$this->_resultPanel=$this->createResultPanel();
238 238
 		return $this->_resultPanel;
239 239
 	}
240 240
 
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
 	 */
244 244
 	protected function createResultPanel()
245 245
 	{
246
-		$panel = Prado::createComponent('System.Web.UI.WebControls.TPanel');
246
+		$panel=Prado::createComponent('System.Web.UI.WebControls.TPanel');
247 247
 		$this->getControls()->add($panel);
248 248
 		$panel->setID('result');
249 249
 		return $panel;
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
 	public function getSuggestions()
256 256
 	{
257 257
 		if($this->_repeater===null)
258
-			$this->_repeater = $this->createRepeater();
258
+			$this->_repeater=$this->createRepeater();
259 259
 		return $this->_repeater;
260 260
 	}
261 261
 
@@ -264,10 +264,10 @@  discard block
 block discarded – undo
264 264
 	 */
265 265
 	protected function createRepeater()
266 266
 	{
267
-		$repeater = Prado::createComponent('System.Web.UI.WebControls.TRepeater');
267
+		$repeater=Prado::createComponent('System.Web.UI.WebControls.TRepeater');
268 268
 		$repeater->setHeaderTemplate(new TAutoCompleteTemplate('<ul>'));
269 269
 		$repeater->setFooterTemplate(new TAutoCompleteTemplate('</ul>'));
270
-		$repeater->setItemTemplate(new TTemplate('<li><%# $this->DataItem %></li>',null));
270
+		$repeater->setItemTemplate(new TTemplate('<li><%# $this->DataItem %></li>', null));
271 271
 		$repeater->setEmptyTemplate(new TAutoCompleteTemplate('<ul></ul>'));
272 272
 		$this->getControls()->add($repeater);
273 273
 		return $repeater;
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
 		if($this->getActiveControl()->canUpdateClientSide())
312 312
 		{
313 313
 			$this->getSuggestions()->render($writer);
314
-			$boundary = $writer->getWriter()->getBoundary();
314
+			$boundary=$writer->getWriter()->getBoundary();
315 315
 			$this->getResponse()->getAdapter()->setResponseData($boundary);
316 316
 		}
317 317
 	}
@@ -323,29 +323,29 @@  discard block
 block discarded – undo
323 323
 	{
324 324
 		//disallow page state update ?
325 325
 		//$this->getActiveControl()->getClientSide()->setEnablePageStateUpdate(false);
326
-		$options = array();
327
-		if(strlen($string = $this->getSeparator()))
326
+		$options=array();
327
+		if(strlen($string=$this->getSeparator()))
328 328
 		{
329
-			$string = strtr($string,array('\t'=>"\t",'\n'=>"\n",'\r'=>"\r"));
330
-			$token = preg_split('//', $string, -1, PREG_SPLIT_NO_EMPTY);
331
-			$options['tokens'] = $token;
329
+			$string=strtr($string, array('\t'=>"\t", '\n'=>"\n", '\r'=>"\r"));
330
+			$token=preg_split('//', $string, -1, PREG_SPLIT_NO_EMPTY);
331
+			$options['tokens']=$token;
332 332
 		}
333 333
 		if($this->getAutoPostBack())
334 334
 		{
335
-			$options = array_merge($options,parent::getPostBackOptions());
336
-			$options['AutoPostBack'] = true;
335
+			$options=array_merge($options, parent::getPostBackOptions());
336
+			$options['AutoPostBack']=true;
337 337
 		}
338
-		if(strlen($select = $this->getTextCssClass()))
339
-			$options['select'] = $select;
340
-		$options['ResultPanel'] = $this->getResultPanel()->getClientID();
341
-		$options['ID'] = $this->getClientID();
342
-		$options['EventTarget'] = $this->getUniqueID();
338
+		if(strlen($select=$this->getTextCssClass()))
339
+			$options['select']=$select;
340
+		$options['ResultPanel']=$this->getResultPanel()->getClientID();
341
+		$options['ID']=$this->getClientID();
342
+		$options['EventTarget']=$this->getUniqueID();
343 343
 		if(($minchars=$this->getMinChars())!=='')
344
-			$options['minChars'] = $minchars;
344
+			$options['minChars']=$minchars;
345 345
 		if(($frequency=$this->getFrequency())!=='')
346
-			$options['frequency'] = $frequency;
347
-		$options['CausesValidation'] = $this->getCausesValidation();
348
-		$options['ValidationGroup'] = $this->getValidationGroup();
346
+			$options['frequency']=$frequency;
347
+		$options['CausesValidation']=$this->getCausesValidation();
348
+		$options['ValidationGroup']=$this->getValidationGroup();
349 349
 		return $options;
350 350
 	}
351 351
 
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
423 423
 
424 424
 	public function __construct($template)
425 425
 	{
426
-		$this->_template = $template;
426
+		$this->_template=$template;
427 427
 	}
428 428
 	/**
429 429
 	 * Instantiates the template.
Please login to merge, or discard this patch.
framework/Web/UI/ActiveControls/TCallbackClientScript.php 1 patch
Spacing   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 	 */
69 69
 	public function __construct()
70 70
 	{
71
-		$this->_actions = new TList;
71
+		$this->_actions=new TList;
72 72
 	}
73 73
 
74 74
 	/**
@@ -88,14 +88,14 @@  discard block
 block discarded – undo
88 88
 	public function callClientFunction($function, $params=array())
89 89
 	{
90 90
 		if(!is_array($params))
91
-			$params = array($params);
91
+			$params=array($params);
92 92
 
93 93
 		if(count($params) > 0)
94 94
 		{
95
-			if ($params[0] instanceof ISurroundable)
96
-				$params[0] = $params[0]->getSurroundingTagID();
95
+			if($params[0] instanceof ISurroundable)
96
+				$params[0]=$params[0]->getSurroundingTagID();
97 97
 			elseif($params[0] instanceof TControl)
98
-				$params[0] = $params[0]->getClientID();
98
+				$params[0]=$params[0]->getClientID();
99 99
 		}
100 100
 		$this->_actions->add(array($function => $params));
101 101
 	}
@@ -108,13 +108,13 @@  discard block
 block discarded – undo
108 108
 	 */
109 109
 	public function jQuery($element, $method, $params=array())
110 110
 	{
111
-		if ($element instanceof ISurroundable)
112
-			$element = $element->getSurroundingTagID();
111
+		if($element instanceof ISurroundable)
112
+			$element=$element->getSurroundingTagID();
113 113
 		elseif($element instanceof TControl)
114
-			$element = $element->getClientID();
114
+			$element=$element->getClientID();
115 115
 
116 116
 		if(!is_array($params))
117
-			$params = array($params);
117
+			$params=array($params);
118 118
 
119 119
 		$this->_actions->add(array('Prado.Element.j' => array($element, $method, $params)));
120 120
 	}
@@ -147,14 +147,14 @@  discard block
 block discarded – undo
147 147
 	 */
148 148
 	public function select($control, $method='Value', $value=null, $type=null)
149 149
 	{
150
-		$method = TPropertyValue::ensureEnum($method,
150
+		$method=TPropertyValue::ensureEnum($method,
151 151
 				'Value', 'Index', 'Clear', 'Indices', 'Values', 'All', 'Invert');
152
-		$type = ($type===null) ? $this->getSelectionControlType($control) : $type;
153
-		$total = $this->getSelectionControlIsListType($control) ? $control->getItemCount() : 1;
152
+		$type=($type===null) ? $this->getSelectionControlType($control) : $type;
153
+		$total=$this->getSelectionControlIsListType($control) ? $control->getItemCount() : 1;
154 154
 
155 155
 		// pass the ID to avoid getting the surrounding elements (ISurroundable)
156 156
 		if($control instanceof TControl)
157
-			$control = $control->getClientID();
157
+			$control=$control->getClientID();
158 158
 
159 159
 		$this->callClientFunction('Prado.Element.select',
160 160
 				array($control, $type.$method, $value, $total));
@@ -214,9 +214,9 @@  discard block
 block discarded – undo
214 214
 	public function setAttribute($control, $name, $value)
215 215
 	{
216 216
 		// Attributes should be applied on Surrounding tag, except for 'disabled' attribute
217
-		if ($control instanceof ISurroundable && strtolower($name)!=='disabled')
217
+		if($control instanceof ISurroundable && strtolower($name)!=='disabled')
218 218
 			$control=$control->getSurroundingTagID();
219
-		$this->callClientFunction('Prado.Element.setAttribute',array($control, $name, $value));
219
+		$this->callClientFunction('Prado.Element.setAttribute', array($control, $name, $value));
220 220
 	}
221 221
 
222 222
 	/**
@@ -226,25 +226,25 @@  discard block
 block discarded – undo
226 226
 	 */
227 227
 	public function setListItems($control, $items)
228 228
 	{
229
-		$options = array();
229
+		$options=array();
230 230
 		if($control instanceof TListControl)
231 231
 		{
232
-			$promptText		= $control->getPromptText();
233
-			$promptValue	= $control->getPromptValue();
232
+			$promptText=$control->getPromptText();
233
+			$promptValue=$control->getPromptValue();
234 234
 
235 235
 			if($promptValue==='')
236
-				$promptValue = $promptText;
236
+				$promptValue=$promptText;
237 237
 
238 238
 			if($promptValue!=='')
239
-				$options[] = array($promptText, $promptValue);
239
+				$options[]=array($promptText, $promptValue);
240 240
 		}
241 241
 
242 242
 		foreach($items as $item)
243 243
 		{
244 244
 			if($item->getHasAttributes())
245
-				$options[] =  array($item->getText(),$item->getValue(), $item->getAttributes()->itemAt('Group'));
245
+				$options[]=array($item->getText(), $item->getValue(), $item->getAttributes()->itemAt('Group'));
246 246
 			else
247
-				$options[] = array($item->getText(),$item->getValue());
247
+				$options[]=array($item->getText(), $item->getValue());
248 248
 		}
249 249
 		$this->callClientFunction('Prado.Element.setOptions', array($control, $options));
250 250
 	}
@@ -422,16 +422,16 @@  discard block
 block discarded – undo
422 422
 	{
423 423
 		if($content instanceof TControl)
424 424
 		{
425
-			$boundary = $this->getRenderedContentBoundary($content);
426
-			$content = null;
425
+			$boundary=$this->getRenderedContentBoundary($content);
426
+			$content=null;
427 427
 		}
428 428
 		else if($content instanceof THtmlWriter)
429 429
 		{
430
-			$boundary = $this->getResponseContentBoundary($content);
431
-			$content = null;
430
+			$boundary=$this->getResponseContentBoundary($content);
431
+			$content=null;
432 432
 		}
433 433
 		else
434
-			$boundary = null;
434
+			$boundary=null;
435 435
 
436 436
 		$this->callClientFunction('Prado.Element.replace', array($element, $content, $boundary, $self));
437 437
 	}
@@ -456,11 +456,11 @@  discard block
 block discarded – undo
456 456
 	{
457 457
 		if($writer instanceof THtmlWriter)
458 458
 		{
459
-			$boundary = $this->getResponseContentBoundary($writer);
460
-			$content = null;
459
+			$boundary=$this->getResponseContentBoundary($writer);
460
+			$content=null;
461 461
 		} else {
462
-			$boundary = null;
463
-			$content = $writer;
462
+			$boundary=null;
463
+			$content=$writer;
464 464
 		}
465 465
 
466 466
 		$this->callClientFunction('Prado.Element.evaluateScript', array($content, $boundary));
@@ -476,11 +476,11 @@  discard block
 block discarded – undo
476 476
 	{
477 477
 		if($content instanceof TControl)
478 478
 		{
479
-			$boundary = $this->getRenderedContentBoundary($content);
479
+			$boundary=$this->getRenderedContentBoundary($content);
480 480
 		}
481 481
 		elseif($content instanceof THtmlWriter)
482 482
 		{
483
-			$boundary = $this->getResponseContentBoundary($content);
483
+			$boundary=$this->getResponseContentBoundary($content);
484 484
 		}
485 485
 
486 486
 		$this->callClientFunction('Prado.Element.appendScriptBlock', array($boundary));
@@ -496,8 +496,8 @@  discard block
 block discarded – undo
496 496
 	 */
497 497
 	private function getRenderedContentBoundary($control)
498 498
 	{
499
-		$writer = $this->getResponse()->createHtmlWriter();
500
-		$adapter = $control->getPage()->getAdapter();
499
+		$writer=$this->getResponse()->createHtmlWriter();
500
+		$adapter=$control->getPage()->getAdapter();
501 501
 		$adapter->registerControlToRender($control, $writer);
502 502
 		return $writer->getWriter()->getBoundary();
503 503
 	}
@@ -561,7 +561,7 @@  discard block
 block discarded – undo
561 561
 	 */
562 562
 	public function fadeTo($element, $value, $duration=500)
563 563
 	{
564
-		$value = TPropertyValue::ensureFloat($value);
564
+		$value=TPropertyValue::ensureFloat($value);
565 565
 		$this->visualEffect('fadeTo', $element, array($duration, $value));
566 566
 	}
567 567
 
Please login to merge, or discard this patch.
framework/Web/UI/ActiveControls/TActiveControlAdapter.php 1 patch
Spacing   +53 added lines, -53 removed lines patch added patch discarded remove patch
@@ -69,12 +69,12 @@  discard block
 block discarded – undo
69 69
 		if($type===null)
70 70
 		{
71 71
 			if($this->getControl() instanceof ICallbackEventHandler)
72
-				$this->_activeControlType = 'TBaseActiveCallbackControl';
72
+				$this->_activeControlType='TBaseActiveCallbackControl';
73 73
 			else
74
-				$this->_activeControlType = 'TBaseActiveControl';
74
+				$this->_activeControlType='TBaseActiveControl';
75 75
 		}
76 76
 		else
77
-			$this->_activeControlType = $type;
77
+			$this->_activeControlType=$type;
78 78
 	}
79 79
 
80 80
  	/**
@@ -114,8 +114,8 @@  discard block
 block discarded – undo
114 114
 	{
115 115
 		if($this->_baseActiveControl===null)
116 116
 		{
117
-			$type = $this->_activeControlType;
118
-			$this->_baseActiveControl = new $type($this->getControl());
117
+			$type=$this->_activeControlType;
118
+			$this->_baseActiveControl=new $type($this->getControl());
119 119
 		}
120 120
 		return $this->_baseActiveControl;
121 121
 	}
@@ -127,10 +127,10 @@  discard block
 block discarded – undo
127 127
 	{
128 128
 		if($this->getPage()->getIsCallback())
129 129
 		{
130
-			$target = $this->getPage()->getCallbackEventTarget();
130
+			$target=$this->getPage()->getCallbackEventTarget();
131 131
 			if($target instanceof ICallbackEventHandler)
132 132
 			{
133
-				$client = $target->getActiveControl()->getClientSide();
133
+				$client=$target->getActiveControl()->getClientSide();
134 134
 				return $client->getEnablePageStateUpdate();
135 135
 			}
136 136
 		}
@@ -144,8 +144,8 @@  discard block
 block discarded – undo
144 144
 	{
145 145
 		if($this->getIsTrackingPageState())
146 146
 		{
147
-		  $stateTrackerClass = $this->_stateTrackerClass;
148
-			$this->_stateTracker = new $stateTrackerClass($this->getControl());
147
+		  $stateTrackerClass=$this->_stateTrackerClass;
148
+			$this->_stateTracker=new $stateTrackerClass($this->getControl());
149 149
 			$this->_stateTracker->trackChanges();
150 150
 		}
151 151
 		parent::onLoad($param);
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 	 */
179 179
 	public function setStateTracker($value)
180 180
 	{
181
-		$this->_stateTrackerClass = TPropertyValue::ensureString($value);
181
+		$this->_stateTrackerClass=TPropertyValue::ensureString($value);
182 182
 	}
183 183
 }
184 184
 
@@ -216,10 +216,10 @@  discard block
 block discarded – undo
216 216
 	 */
217 217
 	public function __construct($control)
218 218
 	{
219
-		$this->_control = $control;
220
-		$this->_existingState = new TMap;
221
-		$this->_nullObject = new stdClass;
222
-		$this->_states = new TMap;
219
+		$this->_control=$control;
220
+		$this->_existingState=new TMap;
221
+		$this->_nullObject=new stdClass;
222
+		$this->_states=new TMap;
223 223
 		$this->addStatesToTrack();
224 224
 	}
225 225
 
@@ -233,14 +233,14 @@  discard block
 block discarded – undo
233 233
 	 */
234 234
 	protected function addStatesToTrack()
235 235
 	{
236
-		$states = $this->getStatesToTrack();
237
-		$states['Visible'] = array('TScalarDiff', array($this, 'updateVisible'));
238
-		$states['Enabled'] = array('TScalarDiff', array($this, 'updateEnabled'));
239
-		$states['Attributes'] = array('TMapCollectionDiff', array($this, 'updateAttributes'));
240
-		$states['Style'] = array('TStyleDiff', array($this, 'updateStyle'));
241
-		$states['TabIndex'] = array('TScalarDiff', array($this, 'updateTabIndex'));
242
-		$states['ToolTip'] = array('TScalarDiff', array($this, 'updateToolTip'));
243
-		$states['AccessKey'] = array('TScalarDiff', array($this, 'updateAccessKey'));
236
+		$states=$this->getStatesToTrack();
237
+		$states['Visible']=array('TScalarDiff', array($this, 'updateVisible'));
238
+		$states['Enabled']=array('TScalarDiff', array($this, 'updateEnabled'));
239
+		$states['Attributes']=array('TMapCollectionDiff', array($this, 'updateAttributes'));
240
+		$states['Style']=array('TStyleDiff', array($this, 'updateStyle'));
241
+		$states['TabIndex']=array('TScalarDiff', array($this, 'updateTabIndex'));
242
+		$states['ToolTip']=array('TScalarDiff', array($this, 'updateToolTip'));
243
+		$states['AccessKey']=array('TScalarDiff', array($this, 'updateAccessKey'));
244 244
 	}
245 245
 
246 246
 	/**
@@ -259,8 +259,8 @@  discard block
 block discarded – undo
259 259
 	{
260 260
 		foreach($this->_states as $name => $value)
261 261
 		{
262
-			$obj = $this->_control->getViewState($name);
263
-			$this->_existingState[$name] = is_object($obj) ? clone($obj) : $obj;
262
+			$obj=$this->_control->getViewState($name);
263
+			$this->_existingState[$name]=is_object($obj) ? clone($obj) : $obj;
264 264
 		}
265 265
 	}
266 266
 
@@ -269,16 +269,16 @@  discard block
 block discarded – undo
269 269
 	 */
270 270
 	protected function getChanges()
271 271
 	{
272
-		$changes = array();
272
+		$changes=array();
273 273
 		foreach($this->_states as $name => $details)
274 274
 		{
275
-			$new = $this->_control->getViewState($name);
276
-			$old = $this->_existingState[$name];
277
-			if($new !== $old)
275
+			$new=$this->_control->getViewState($name);
276
+			$old=$this->_existingState[$name];
277
+			if($new!==$old)
278 278
 			{
279
-				$diff = new $details[0]($new, $old, $this->_nullObject);
280
-				if(($change = $diff->getDifference()) !== $this->_nullObject)
281
-					$changes[] = array($details[1],array($change));
279
+				$diff=new $details[0]($new, $old, $this->_nullObject);
280
+				if(($change=$diff->getDifference())!==$this->_nullObject)
281
+					$changes[]=array($details[1], array($change));
282 282
 			}
283 283
 		}
284 284
 		return $changes;
@@ -335,10 +335,10 @@  discard block
 block discarded – undo
335 335
 	 */
336 336
 	protected function updateVisible($visible)
337 337
 	{
338
-		if($visible === false)
339
-			$this->client()->replaceContent($this->_control,"<span id=\"".$this->_control->getClientID()."\" style=\"display:none\" ></span>");
338
+		if($visible===false)
339
+			$this->client()->replaceContent($this->_control, "<span id=\"".$this->_control->getClientID()."\" style=\"display:none\" ></span>");
340 340
 		else
341
-			$this->client()->replaceContent($this->_control,$this->_control);
341
+			$this->client()->replaceContent($this->_control, $this->_control);
342 342
 	}
343 343
 
344 344
 	/**
@@ -403,9 +403,9 @@  discard block
 block discarded – undo
403 403
 	 */
404 404
 	public function __construct($new, $old, $null)
405 405
 	{
406
-		$this->_new = $new;
407
-		$this->_old = $old;
408
-		$this->_null = $null;
406
+		$this->_new=$new;
407
+		$this->_old=$old;
408
+		$this->_null=$null;
409 409
 	}
410 410
 
411 411
 	/**
@@ -430,8 +430,8 @@  discard block
 block discarded – undo
430 430
 	 */
431 431
 	public function getDifference()
432 432
 	{
433
-		if(gettype($this->_new) === gettype($this->_old)
434
-			&& $this->_new === $this->_old)
433
+		if(gettype($this->_new)===gettype($this->_old)
434
+			&& $this->_new===$this->_old)
435 435
 			return $this->_null;
436 436
 		else
437 437
 			return $this->_new;
@@ -457,10 +457,10 @@  discard block
 block discarded – undo
457 457
 	{
458 458
 		if(!($obj instanceof TStyle))
459 459
 			return array();
460
-		$style = $obj->getStyleFields();
461
-		$style = array_merge($style,$this->getStyleFromString($obj->getCustomStyle()));
460
+		$style=$obj->getStyleFields();
461
+		$style=array_merge($style, $this->getStyleFromString($obj->getCustomStyle()));
462 462
 		if($obj->hasFont())
463
-			$style = array_merge($style, $this->getStyleFromString($obj->getFont()->toString()));
463
+			$style=array_merge($style, $this->getStyleFromString($obj->getFont()->toString()));
464 464
 		return $style;
465 465
 	}
466 466
 
@@ -470,14 +470,14 @@  discard block
 block discarded – undo
470 470
 	 */
471 471
 	protected function getStyleFromString($string)
472 472
 	{
473
-		$style = array();
473
+		$style=array();
474 474
 		if(!is_string($string)) return $style;
475 475
 
476
-		foreach(explode(';',$string) as $sub)
476
+		foreach(explode(';', $string) as $sub)
477 477
 		{
478
-			$arr=explode(':',$sub);
478
+			$arr=explode(':', $sub);
479 479
 			if(isset($arr[1]) && trim($arr[0])!=='')
480
-				$style[trim($arr[0])] = trim($arr[1]);
480
+				$style[trim($arr[0])]=trim($arr[1]);
481 481
 		}
482 482
 		return $style;
483 483
 	}
@@ -494,7 +494,7 @@  discard block
 block discarded – undo
494 494
 		}
495 495
 		else
496 496
 		{
497
-			return $this->_old->getCssClass() !== $this->_new->getCssClass() ?
497
+			return $this->_old->getCssClass()!==$this->_new->getCssClass() ?
498 498
 				$this->_new->getCssClass() : null;
499 499
 		}
500 500
 	}
@@ -504,7 +504,7 @@  discard block
 block discarded – undo
504 504
 	 */
505 505
 	protected function getStyleDiff()
506 506
 	{
507
-		$diff = array_diff_assoc(
507
+		$diff=array_diff_assoc(
508 508
 					$this->getCombinedStyle($this->_new),
509 509
 					$this->getCombinedStyle($this->_old));
510 510
 		return count($diff) > 0 ? $diff : null;
@@ -519,8 +519,8 @@  discard block
 block discarded – undo
519 519
 			return $this->_null;
520 520
 		else
521 521
 		{
522
-			$css = $this->getCssClassDiff();
523
-			$style = $this->getStyleDiff();
522
+			$css=$this->getCssClassDiff();
523
+			$style=$this->getStyleDiff();
524 524
 			if(($css!==null) || ($style!==null))
525 525
 				return array('CssClass' => $css, 'Style' => $style);
526 526
 			else
@@ -551,9 +551,9 @@  discard block
 block discarded – undo
551 551
 		}
552 552
 		else
553 553
 		{
554
-			$new = $this->_new->toArray();
555
-			$old = $this->_old->toArray();
556
-			$diff = array_diff_assoc($new, $old);
554
+			$new=$this->_new->toArray();
555
+			$old=$this->_old->toArray();
556
+			$diff=array_diff_assoc($new, $old);
557 557
 			return count($diff) > 0 ? $diff : $this->_null;
558 558
 		}
559 559
 	}
Please login to merge, or discard this patch.
framework/Web/UI/ActiveControls/TValueTriggeredCallback.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 	 */
80 80
 	public function setDecayRate($value)
81 81
 	{
82
-		$decay = TPropertyValue::ensureFloat($value);
82
+		$decay=TPropertyValue::ensureFloat($value);
83 83
 		if($decay < 0)
84 84
 			throw new TConfigurationException('callback_decay_be_not_negative', $this->getID());
85 85
 		$this->setViewState('Decay', $decay);
@@ -90,10 +90,10 @@  discard block
 block discarded – undo
90 90
 	 */
91 91
 	protected function getTriggerOptions()
92 92
 	{
93
-		$options = parent::getTriggerOptions();
94
-		$options['PropertyName'] = $this->getPropertyName();
95
-		$options['Interval'] = $this->getInterval();
96
-		$options['Decay'] = $this->getDecayRate();
93
+		$options=parent::getTriggerOptions();
94
+		$options['PropertyName']=$this->getPropertyName();
95
+		$options['Interval']=$this->getInterval();
96
+		$options['Decay']=$this->getDecayRate();
97 97
 		return $options;
98 98
 	}
99 99
 
Please login to merge, or discard this patch.
framework/Web/UI/ActiveControls/TActiveListControlAdapter.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -67,20 +67,20 @@  discard block
 block discarded – undo
67 67
 		if($this->canUpdateClientSide())
68 68
 		{
69 69
 			$this->updateListItems();
70
-			$n = $this->getControl()->getItemCount();
70
+			$n=$this->getControl()->getItemCount();
71 71
 
72 72
 			$promptValue=$this->getControl()->getPromptValue();
73 73
 			if($promptValue==='')
74 74
 				$promptValue=$this->getControl()->getPromptText();
75 75
 
76
-			$list = array();
76
+			$list=array();
77 77
 			foreach($indices as $index)
78 78
 			{
79
-				$index = intval($index);
79
+				$index=intval($index);
80 80
 				if($promptValue!=='')
81 81
 					$index++;
82 82
 				if($index >= 0 && $index <= $n)
83
-					$list[] = $index;
83
+					$list[]=$index;
84 84
 			}
85 85
 			if(count($list) > 0)
86 86
 				$this->getPage()->getCallbackClient()->select(
@@ -111,9 +111,9 @@  discard block
 block discarded – undo
111 111
 		if($this->canUpdateClientSide())
112 112
 		{
113 113
 			$this->updateListItems();
114
-			$list = array();
114
+			$list=array();
115 115
 			foreach($values as $value)
116
-				$list[] = $value;
116
+				$list[]=$value;
117 117
 			if(count($list) > 0)
118 118
 				$this->getPage()->getCallbackClient()->select(
119 119
 					$this->getControl(), 'Values', $list);
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 	{
147 147
 		if($this->canUpdateClientSide())
148 148
 		{
149
-			$items = $this->getControl()->getItems();
149
+			$items=$this->getControl()->getItems();
150 150
 			if($items instanceof TActiveListItemCollection
151 151
 				&& $items->getListHasChanged())
152 152
 			{
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
 	 */
198 198
 	public function setControl(IActiveControl $control)
199 199
 	{
200
-		$this->_control = $control;
200
+		$this->_control=$control;
201 201
 	}
202 202
 
203 203
 	/**
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
 	 */
222 222
 	public function updateClientSide()
223 223
 	{
224
-		$client = $this->getControl()->getPage()->getCallbackClient();
224
+		$client=$this->getControl()->getPage()->getCallbackClient();
225 225
 		$client->setListItems($this->getControl(), $this);
226 226
 		$this->_hasChanged=false;
227 227
 	}
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
 	{
239 239
 		parent::insertAt($index, $value);
240 240
 		if($this->canUpdateClientSide())
241
-			$this->_hasChanged = true;
241
+			$this->_hasChanged=true;
242 242
 	}
243 243
 
244 244
 	/**
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
 	{
250 250
 		parent::removeAt($index);
251 251
 		if($this->canUpdateClientSide())
252
-			$this->_hasChanged = true;
252
+			$this->_hasChanged=true;
253 253
 	}
254 254
 }
255 255
 
Please login to merge, or discard this patch.
framework/Web/UI/ActiveControls/TActiveClientScript.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -41,11 +41,11 @@  discard block
 block discarded – undo
41 41
 	 */
42 42
 	protected function renderCustomScriptFile($writer)
43 43
 	{
44
-		if(($scriptUrl = $this->getScriptUrl())!=='')
44
+		if(($scriptUrl=$this->getScriptUrl())!=='')
45 45
 		{
46 46
 			if($this->getPage()->getIsCallback())
47 47
 			{
48
-				$cs = $this->getPage()->getClientScript();
48
+				$cs=$this->getPage()->getClientScript();
49 49
 				$uniqueid=$this->ClientID.'_custom';
50 50
 				if(!$cs->isScriptFileRegistered($uniqueid))
51 51
 					$cs->registerScriptFile($uniqueid, $scriptUrl);
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 		{
66 66
 			if($this->getPage()->getIsCallback())
67 67
 			{
68
-				$extWriter= $this->getPage()->getResponse()->createHtmlWriter();
68
+				$extWriter=$this->getPage()->getResponse()->createHtmlWriter();
69 69
 				$extWriter->write("/*<![CDATA[*/\n");
70 70
 				$this->renderChildren($extWriter);
71 71
 				$extWriter->write("\n/*]]>*/");
Please login to merge, or discard this patch.