pradosoft / prado

framework/Web/UI/ActiveControls/TCallbackClientScript.php

Braces +3 added lines, -6 removed lines

@@ -424,13 +424,11 @@ 
 		{
 			$boundary = $this->getRenderedContentBoundary($content);
 			$content = null;
-		}
-		else if($content instanceof THtmlWriter)
+		} else if($content instanceof THtmlWriter)
 		{
 			$boundary = $this->getResponseContentBoundary($content);
 			$content = null;
-		}
-		else
+		} else
 			$boundary = null;
 
 		$this->callClientFunction('Prado.Element.replace', array($element, $content, $boundary, $self));
@@ -477,8 +475,7 @@ 
 		if($content instanceof TControl)
 		{
 			$boundary = $this->getRenderedContentBoundary($content);
-		}
-		elseif($content instanceof THtmlWriter)
+		} elseif($content instanceof THtmlWriter)
 		{
 			$boundary = $this->getResponseContentBoundary($content);
 		}

framework/Web/UI/ActiveControls/TActiveDataGrid.php

Braces +34 added lines, -68 removed lines

@@ -145,8 +145,7 @@ 
 				$button->setText($text);
 				return $button;
 			}
-		}
-		else {
+		} else {
 			$button=new TActiveButton;
 			if(!$enabled)
 				$button->setEnabled(false);
@@ -180,8 +179,7 @@ 
 		if($this->getHasPreRendered()) {
 			$this->renderDataGrid($writer);
 			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(),$writer);
-		}
-		else {
+		} else {
 			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
 		}
 	}
@@ -248,8 +246,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		else if($this->getAllowSorting()) {
+		} else if($this->getAllowSorting()) {
 				$sortExpression=$this->getSortExpression();
 				if(($url=$this->getHeaderImageUrl())!=='') {
 					$button=Prado::createComponent('System.Web.UI.WebControls.TActiveImageButton');
@@ -262,19 +259,16 @@ 
 					}
 					$button->setCausesValidation(false);
 					$cell->getControls()->add($button);
-				}
-				else if($text!=='') {
+				} else if($text!=='') {
 						$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 						$button->setText($text);
 						$button->setCommandName(TDataGrid::CMD_SORT);
 						$button->setCommandParameter($sortExpression);
 						$button->setCausesValidation(false);
 						$cell->getControls()->add($button);
-					}
-					else
+					} else
 						$cell->setText(' ');
-			}
-			else {
+			} else {
 				if(($url=$this->getHeaderImageUrl())!=='') {
 					$image=Prado::createComponent('System.Web.UI.WebControls.TActiveImage');
 					$image->setImageUrl($url);
@@ -283,8 +277,7 @@ 
 						$image->setToolTip($text);
 					}
 					$cell->getControls()->add($image);
-				}
-				else if($text!=='')
+				} else if($text!=='')
 						$cell->setText($text);
 					else
 						$cell->setText(' ');
@@ -376,8 +369,7 @@ 
 				$button->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
 			$cell->getControls()->add($button);
 			$cell->registerObject('Button',$button);
-		}
-		else
+		} else
 			parent::initializeCell($cell,$columnIndex,$itemType);
 	}
 }
@@ -416,8 +408,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		else if($this->getAllowSorting()) {
+		} else if($this->getAllowSorting()) {
 				$sortExpression=$this->getSortExpression();
 				if(($url=$this->getHeaderImageUrl())!=='') {
 					$button=Prado::createComponent('System.Web.UI.WebControls.TActiveImageButton');
@@ -428,27 +419,23 @@ 
 						$button->setAlternateText($text);
 					$button->setCausesValidation(false);
 					$cell->getControls()->add($button);
-				}
-				else if($text!=='') {
+				} else if($text!=='') {
 						$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 						$button->setText($text);
 						$button->setCommandName(TDataGrid::CMD_SORT);
 						$button->setCommandParameter($sortExpression);
 						$button->setCausesValidation(false);
 						$cell->getControls()->add($button);
-					}
-					else
+					} else
 						$cell->setText(' ');
-			}
-			else {
+			} else {
 				if(($url=$this->getHeaderImageUrl())!=='') {
 					$image=Prado::createComponent('System.Web.UI.WebControls.TActiveImage');
 					$image->setImageUrl($url);
 					if($text!=='')
 						$image->setAlternateText($text);
 					$cell->getControls()->add($image);
-				}
-				else if($text!=='')
+				} else if($text!=='')
 						$cell->setText($text);
 					else
 						$cell->setText(' ');
@@ -491,8 +478,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		else if($this->getAllowSorting())
+		} else if($this->getAllowSorting())
 		{
 			$sortExpression=$this->getSortExpression();
 			if(($url=$this->getHeaderImageUrl())!=='')
@@ -505,8 +491,7 @@ 
 					$button->setAlternateText($text);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 			{
 				$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 				$button->setText($text);
@@ -514,11 +499,9 @@ 
 				$button->setCommandParameter($sortExpression);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else
+			} else
 				$cell->setText(' ');
-		}
-		else
+		} else
 		{
 			if(($url=$this->getHeaderImageUrl())!=='')
 			{
@@ -527,8 +510,7 @@ 
 				if($text!=='')
 					$image->setAlternateText($text);
 				$cell->getControls()->add($image);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 				$cell->setText($text);
 			else
 				$cell->setText(' ');
@@ -574,8 +556,7 @@ 
 			$cell->registerObject('CheckBox',$checkBox);
 			if($this->getDataField()!=='')
 				$checkBox->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
-		}
-		else
+		} else
 			parent::initializeCell($cell,$columnIndex,$itemType);
 	}
 
@@ -597,8 +578,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		else if($this->getAllowSorting())
+		} else if($this->getAllowSorting())
 		{
 			$sortExpression=$this->getSortExpression();
 			if(($url=$this->getHeaderImageUrl())!=='')
@@ -611,8 +591,7 @@ 
 					$button->setAlternateText($text);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 			{
 				$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 				$button->setText($text);
@@ -620,11 +599,9 @@ 
 				$button->setCommandParameter($sortExpression);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else
+			} else
 				$cell->setText(' ');
-		}
-		else
+		} else
 		{
 			if(($url=$this->getHeaderImageUrl())!=='')
 			{
@@ -633,8 +610,7 @@ 
 				if($text!=='')
 					$image->setAlternateText($text);
 				$cell->getControls()->add($image);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 				$cell->setText($text);
 			else
 				$cell->setText(' ');
@@ -676,8 +652,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		else if($this->getAllowSorting())
+		} else if($this->getAllowSorting())
 		{
 			$sortExpression=$this->getSortExpression();
 			if(($url=$this->getHeaderImageUrl())!=='')
@@ -690,8 +665,7 @@ 
 					$button->setAlternateText($text);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 			{
 				$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 				$button->setText($text);
@@ -699,11 +673,9 @@ 
 				$button->setCommandParameter($sortExpression);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else
+			} else
 				$cell->setText(' ');
-		}
-		else
+		} else
 		{
 			if(($url=$this->getHeaderImageUrl())!=='')
 			{
@@ -712,8 +684,7 @@ 
 				if($text!=='')
 					$image->setAlternateText($text);
 				$cell->getControls()->add($image);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 				$cell->setText($text);
 			else
 				$cell->setText(' ');
@@ -759,8 +730,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		else if($this->getAllowSorting()) {
+		} else if($this->getAllowSorting()) {
 				$sortExpression=$this->getSortExpression();
 				if(($url=$this->getHeaderImageUrl())!=='') {
 					$button=Prado::createComponent('System.Web.UI.WebControls.TActiveImageButton');
@@ -773,19 +743,16 @@ 
 					}
 					$button->setCausesValidation(false);
 					$cell->getControls()->add($button);
-				}
-				else if($text!=='') {
+				} else if($text!=='') {
 						$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 						$button->setText($text);
 						$button->setCommandName(TDataGrid::CMD_SORT);
 						$button->setCommandParameter($sortExpression);
 						$button->setCausesValidation(false);
 						$cell->getControls()->add($button);
-					}
-					else
+					} else
 						$cell->setText(' ');
-			}
-			else {
+			} else {
 				if(($url=$this->getHeaderImageUrl())!=='') {
 					$image=Prado::createComponent('System.Web.UI.WebControls.TActiveImage');
 					$image->setImageUrl($url);
@@ -794,8 +761,7 @@ 
 						$image->setToolTip($text);
 					}
 					$cell->getControls()->add($image);
-				}
-				else if($text!=='')
+				} else if($text!=='')
 						$cell->setText($text);
 					else
 						$cell->setText(' ');

framework/Web/TAssetManager.php

Braces +2 added lines, -4 removed lines

@@ -163,8 +163,7 @@ 
 			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 				$this->copyFile($fullpath,$dst);
 			return $this->_published[$path]=$this->_baseUrl.'/'.$dir.'/'.$fileName;
-		}
-		else
+		} else
 		{
 			$dir=$this->hash($fullpath);
 			if(!is_dir($this->_basePath.DIRECTORY_SEPARATOR.$dir) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
@@ -287,8 +286,7 @@ 
 						@copy($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
 						@chmod($dst.DIRECTORY_SEPARATOR.$file, PRADO_CHMOD);
 					}
-				}
-				else
+				} else
 					$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
 			}
 			closedir($folder);

framework/Collections/TQueue.php

Braces +1 added lines, -2 removed lines

@@ -81,8 +81,7 @@
 				$this->_d[]=$item;
 				++$this->_c;
 			}
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('queue_data_not_iterable');
 	}
 

requirements/index.php

Braces +1 added lines, -2 removed lines

@@ -70,8 +70,7 @@
 
 		echo "\n\n** PDF file quickstart.pdf created **\n\n";
 
-	}
-	else
+	} else
 	{
 		echo " Unable to find pdfLatex executable $pdflatexExec";
 	}

bin/prado-cli.php

Braces +5 added lines, -10 removed lines

@@ -105,8 +105,7 @@ 
 			{
 				$valid |= $action->performAction($args);
 				break;
-			}
-			else
+			} else
 			{
 				$valid = false;
 			}
@@ -207,8 +206,7 @@ 
 			}
 
 			return Prado::getApplication();
-		}
-		else
+		} else
 		{
 			PradoCommandLineInterpreter::printGreeting();
 			echo '+'.str_repeat('-',77)."+\n";
@@ -514,8 +512,7 @@ 
 			$running_dir = substr(str_replace(realpath('./'),'',$test_dir),1);
 			echo 'Running unit tests in directory "'.$running_dir."\":\n";
 			$test->run(new TextReporter());
-		}
-		else
+		} else
 		{
 			$running_dir = substr(str_replace(realpath('./'),'',$dir),1);
 			echo '** Unable to find test directory "'.$running_dir.'/unit" or "'.$running_dir.'/tests/unit".'."\n";
@@ -669,8 +666,7 @@ 
 			{
 				echo '** Unable to find table or view "'.$tablename.'" in "'.$manager->getDbConnection()->getConnectionString()."\".\n";
 				return false;
-			}
-			else
+			} else
 			{
 				$properties = array();
 				foreach($tableInfo->getColumns() as $field=>$column)
@@ -855,8 +851,7 @@ 
 					$args = array($input[0],$input[1], $input[2],$app_dir,'soap');
 				$cmd = new PradoCommandLineActiveRecordGen;
 				$cmd->performAction($args);
-			}
-			else
+			} else
 			{
 				echo "\n    Usage: generate table_name Application.pages.RecordClassName\n";
 			}

framework/Web/THttpSession.php

Braces +4 added lines, -8 removed lines

@@ -309,13 +309,11 @@ 
       {
 				ini_set('session.use_cookies','0');
 			  ini_set('session.use_only_cookies','0');
-      }
-			else if($value===THttpSessionCookieMode::Allow)
+      } else if($value===THttpSessionCookieMode::Allow)
 			{
 				ini_set('session.use_cookies','1');
 				ini_set('session.use_only_cookies','0');
-			}
-			else
+			} else
 			{
 				ini_set('session.use_cookies','1');
 				ini_set('session.use_only_cookies','1');
@@ -368,8 +366,7 @@ 
 			{
 				ini_set('session.gc_probability',$value);
 				ini_set('session.gc_divisor','100');
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('httpsession_gcprobability_invalid',$value);
 		}
 	}
@@ -557,8 +554,7 @@ 
 			$value=$_SESSION[$key];
 			unset($_SESSION[$key]);
 			return $value;
-		}
-		else
+		} else
 			return null;
 	}
 

framework/Web/Javascripts/TJavaScript.php

Braces +3 added lines, -6 removed lines

@@ -171,8 +171,7 @@ 
 					}
 				}
 				return '{'.$results.'}';
-			}
-			else
+			} else
 			{
 				foreach($value as $v)
 				{
@@ -185,8 +184,7 @@ 
 				}
 				return '['.$results.']';
 			}
-		}
-		else if(is_integer($value))
+		} else if(is_integer($value))
 			return "$value";
 		else if(is_float($value))
 		{
@@ -206,8 +204,7 @@ 
 						return str_replace($locale['decimal_point'], '.', "$value");
 					break;
 			}
-		}
-		else if(is_object($value))
+		} else if(is_object($value))
 			if ($value instanceof TJavaScriptLiteral)
 				return $value->toJavaScriptLiteral();
 			else

framework/Web/TUrlManager.php

Braces +5 added lines, -10 removed lines

@@ -80,12 +80,10 @@ 
 						$name=urlencode($name.'[]');
 						foreach($value as $v)
 							$url.=$amp.$name.'='.urlencode($v);
-					}
-					else
+					} else
 						$url.=$amp.urlencode($name).'='.urlencode($value);
 				}
-			}
-			else
+			} else
 			{
 				foreach($getItems as $name=>$value)
 				{
@@ -93,8 +91,7 @@ 
 					{
 						foreach($value as $v)
 							$url.=$amp.$name.'[]='.$v;
-					}
-					else
+					} else
 						$url.=$amp.$name.'='.$value;
 				}
 			}
@@ -147,14 +144,12 @@ 
 							$getVariables[substr($name,0,$pos)][]=$value;
 						else
 							$getVariables[$name]=$value;
-					}
-					else
+					} else
 						$getVariables[$path]='';
 				}
 			}
 			return $getVariables;
-		}
-		else
+		} else
 			return array();
 	}
 }