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/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/TStack.php

Braces +1 added lines, -2 removed lines

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

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

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

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