pradosoft / prado

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();
 	}
 }

framework/Web/THttpResponse.php

Braces +5 added lines, -9 removed lines

@@ -281,7 +281,7 @@ 
 		$status=TPropertyValue::ensureInteger($status);
 		if(isset(self::$HTTP_STATUS_CODES[$status])) {
 			$this->_reason=self::$HTTP_STATUS_CODES[$status];
-		}else{
+		} else{
 			if($reason===null || $reason==='') {
 				throw new TInvalidDataValueException("response_status_reason_missing");
 			}
@@ -377,8 +377,7 @@ 
 		{
 			foreach($headers as $h)
 				header($h);
-		}
-		else
+		} else
 		{
 			header('Pragma: public');
 			header('Expires: 0');
@@ -488,13 +487,11 @@ 
 				{
 					$this->_bufferOutput = false;
 					ob_end_flush();
-				}
-				else
+				} else
 					ob_flush();
 				flush();
 			}
-		}
-		else
+		} else
 			flush();
 	}
 
@@ -645,8 +642,7 @@ 
 				$cookie->getSecure(),
 				$cookie->getHttpOnly()
 			);
-		}
-		else {
+		} else {
 			setcookie(
 				$cookie->getName(),
 				$cookie->getValue(),

framework/Web/Services/TJsonService.php

Braces +6 added lines, -12 removed lines

@@ -79,8 +79,7 @@ 
 				foreach($config['json'] as $id => $json)
 					$this->_services[$id] = $json;
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('json') as $json)
 			{
@@ -111,14 +110,11 @@ 
 					{
 						$properties = isset($serviceConfig['properties'])?$serviceConfig['properties']:array();
 						$this->createJsonResponse($service,$properties,$serviceConfig);
-					}
-					else
+					} else
 						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
-				}
-				else
+				} else
 					throw new TConfigurationException('jsonservice_class_required',$id);
-			}
-			else
+			} else
 			{
 				$properties=$serviceConfig->getAttributes();
 				if(($class=$properties->remove('class'))!==null)
@@ -128,12 +124,10 @@ 
 						$this->createJsonResponse($service,$properties,$serviceConfig);
 					else
 						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
-				}
-				else
+				} else
 					throw new TConfigurationException('jsonservice_class_required',$id);
 			}
-		}
-		else
+		} else
 			throw new THttpException(404,'jsonservice_provider_unknown',$id);
 	}
 

framework/Web/UI/ActiveControls/TActiveTableRow.php

Braces +2 added lines, -4 removed lines

@@ -119,8 +119,7 @@ 
 		{
 			$this->raiseCallbackEvent($param);
 			return true;
-		}
-		else return false;
+		} else return false;
 	}
 
 	/**
@@ -163,8 +162,7 @@ 
 			parent::render($writer);
 			if ($this->getActiveControl()->canUpdateClientSide())
 				$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
-		}
-		else
+		} else
 		{
 			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 			// If we update a TActiveTableRow on callback, we shouldn't update all childs,

framework/Web/UI/WebControls/TRepeatInfo.php

Braces +8 added lines, -16 removed lines

@@ -191,13 +191,11 @@ 
 				$control->setCaption($this->_caption);
 				$control->setCaptionAlign($this->_captionAlign);
 			}
-		}
-		else if($this->_repeatLayout===TRepeatLayout::Raw)
+		} else if($this->_repeatLayout===TRepeatLayout::Raw)
 		{
 			$this->renderRawContents($writer,$user);
 			return;
-		}
-		else
+		} else
 			$control=new TWebControl;
 		$control->setID($user->getClientID());
 		$control->copyBaseAttributes($user);
@@ -295,8 +293,7 @@ 
 				}
 			}
 			$writer->renderEndTag();
-		}
-		else
+		} else
 		{
 			$column=0;
 			for($i=0;$i<$itemCount;++$i)
@@ -334,8 +331,7 @@ 
 			$rows=$itemCount;
 			$columns=1;
 			$lastColumns=1;
-		}
-		else
+		} else
 		{
 			$columns=$this->_repeatColumns;
 			$rows=(int)(($itemCount+$columns-1)/$columns);
@@ -391,8 +387,7 @@ 
 						$user->renderItem($writer,$this,'Separator',$index);
 						$writer->renderEndTag();
 						$writer->writeLine();
-					}
-					else if($columns>1)
+					} else if($columns>1)
 						$writer->write("<td></td>\n");
 				}
 				if($row==$rows-1)
@@ -407,8 +402,7 @@ 
 				$writer->writeLine();
 			}
 			$writer->renderEndTag();
-		}
-		else
+		} else
 		{
 			$renderedItems=0;
 			for($row=0;$row<$rows;++$row)
@@ -473,8 +467,7 @@ 
 			$writer->renderEndTag();
 			$writer->renderEndTag();
 			$writer->renderEndTag();
-		}
-		else
+		} else
 		{
 			$user->renderItem($writer,$this,'Header',-1);
 			if($needBreak)
@@ -505,8 +498,7 @@ 
 			$writer->renderEndTag();
 			$writer->renderEndTag();
 			$writer->renderEndTag();
-		}
-		else
+		} else
 			$user->renderItem($writer,$this,'Footer',-1);
 		$writer->writeLine();
 	}

framework/Web/UI/WebControls/TListBox.php

Braces +4 added lines, -8 removed lines

@@ -101,8 +101,7 @@ 
 				{
 					$this->setSelectedIndex($index);
 					return $this->_dataChanged=true;
-				}
-				else
+				} else
 					return false;
 			}
 			if(!is_array($selections))
@@ -124,8 +123,7 @@ 
 						break;
 					}
 				}
-			}
-			else
+			} else
 				$flag=true;
 			if($flag)
 			{
@@ -133,13 +131,11 @@ 
 				$this->_dataChanged=true;
 			}
 			return $flag;
-		}
-		else if($this->getSelectedIndex()!==-1)
+		} else if($this->getSelectedIndex()!==-1)
 		{
 			$this->clearSelection();
 			return $this->_dataChanged=true;
-		}
-		else
+		} else
 			return false;
 	}
 

framework/Web/UI/WebControls/TBaseValidator.php

Braces +2 added lines, -4 removed lines

@@ -518,16 +518,14 @@
 				{
 					$this->setIsValid(true);
 					$this->onValidationSuccess();
-				}
-				else
+				} else
 				{
 					if($target)
 						$target->setIsValid(false);
 					$this->setIsValid(false);
 					$this->onValidationError();
 				}
-			}
-			else
+			} else
 			{
 				$this->evaluateIsValid();
 				$this->setIsValid(true);

framework/Web/UI/TTemplateControl.php

Braces +6 added lines, -12 removed lines

@@ -69,8 +69,7 @@ 
 			if(!isset(self::$_template[$class]))
 				self::$_template[$class]=$this->loadTemplate();
 			return self::$_template[$class];
-		}
-		else
+		} else
 			return $this->_localTemplate;
 	}
 
@@ -205,8 +204,7 @@ 
 			$controls=$placeholder->getParent()->getControls();
 			$loc=$controls->remove($placeholder);
 			$controls->insertAt($loc,$content);
-		}
-		else
+		} else
 			throw new TConfigurationException('templatecontrol_placeholder_inexistent',$id);
 	}
 
@@ -232,8 +230,7 @@ 
 			$master->ensureChildControls();
 			foreach($this->_contents as $id=>$content)
 				$master->injectContent($id,$content);
-		}
-		else if(!empty($this->_contents))
+		} else if(!empty($this->_contents))
 			throw new TConfigurationException('templatecontrol_mastercontrol_required',get_class($this));
 		parent::initRecursive($namingContainer);
 	}
@@ -261,8 +258,7 @@ 
                                                 $control->Checked = (boolean) $arObj->{$key};
                                         elseif ($control instanceof TDatePicker)
                                                 $control->Date = $arObj->{$key};
-                                }
-                                else
+                                } else
                                 {
                                         foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
                                         {
@@ -284,8 +280,7 @@ 
                                         }
                                         break;
                                 }
-                        } 
-                        catch (Exception $ex)
+                        } catch (Exception $ex)
                         {
                                 if ($throwExceptions)
                                         throw $ex;
@@ -315,8 +310,7 @@ 
                                         $arObj->{$key} = $control->Checked;
                                 elseif ($control instanceof TDatePicker)
                                         $arObj->{$key} = $control->Date;
-                        } 
-                        catch (Exception $ex)
+                        } catch (Exception $ex)
                         {
                                 if ($throwExceptions)
                                         throw $ex;