pradosoft / prado

framework/Web/UI/TTemplate.php

Braces +27 added lines, -54 removed lines

@@ -243,8 +243,7 @@ 
 						$component->createdOnTemplate($parent);
 					if($component->getAllowChildControls())
 						$controls[$key]=$component;
-				}
-				else if($component instanceof TComponent)
+				} else if($component instanceof TComponent)
 				{
 					$controls[$key]=$component;
 					if(isset($properties['id']))
@@ -262,8 +261,7 @@ 
 					else
 						$component->createdOnTemplate($parent);
 				}
-			}
-			else
+			} else
 			{
 				if($object[1] instanceof TCompositeLiteral)
 				{
@@ -274,8 +272,7 @@ 
 						$directChildren[]=$o;
 					else
 						$parent->addParsedObject($o);
-				}
-				else
+				} else
 				{
 					if($parent===$parentControl)
 						$directChildren[]=$object[1];
@@ -386,8 +383,7 @@ 
 					throw new TConfigurationException('template_tag_unexpected',$name,$value[1]);
 					break;
 			}
-		}
-		else
+		} else
 		{
 			if (substr($name,0,2)=='js')
 				if ($value and !($value instanceof TJavaScriptLiteral))
@@ -435,8 +431,7 @@ 
 					throw new TConfigurationException('template_tag_unexpected',$name,$value[1]);
 					break;
 			}
-		}
-		else
+		} else
 			$component->setSubProperty($name,$value);
 	}
 
@@ -497,8 +492,7 @@ 
 						$stack[] = $type;
 						$container=$c-1;
 					}
-				}
-				else if(strpos($str,'</com:')===0)	// closing component tag
+				} else if(strpos($str,'</com:')===0)	// closing component tag
 				{
 					if($expectPropEnd)
 						continue;
@@ -517,8 +511,7 @@ 
 						throw new TConfigurationException('template_closingtag_expected',$tag, "</com:$type>");
 					}
 					$container=$tpl[$container][0];
-				}
-				else if(strpos($str,'<%@')===0)	// directive
+				} else if(strpos($str,'<%@')===0)	// directive
 				{
 					if($expectPropEnd)
 						continue;
@@ -528,8 +521,7 @@ 
 					if(isset($tpl[0]) || $this->_directive!==null)
 						throw new TConfigurationException('template_directive_nonunique');
 					$this->_directive=$this->parseAttributes($match[4][0],$match[4][1]);
-				}
-				else if(strpos($str,'<%')===0)	// expression
+				} else if(strpos($str,'<%')===0)	// expression
 				{
 					if($expectPropEnd)
 						continue;
@@ -554,8 +546,7 @@ 
 						$literal=strtr(trim(substr($literal,0,strlen($literal)-1)),array("'"=>"\'","\\"=>"\\\\"));
 						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"Prado::localize('$literal')"));
 					}
-				}
-				else if(strpos($str,'<prop:')===0)	// opening property
+				} else if(strpos($str,'<prop:')===0)	// opening property
 				{
 					if(strrpos($str,'/>')===strlen($str)-2)  //subproperties
 					{
@@ -577,8 +568,7 @@ 
 								throw new TConfigurationException('template_property_duplicated',$name);
 							$tpl[$container][2][$name]=$value;
 						}
-					}
-					else  // regular property
+					} else  // regular property
 					{
 						$prop=strtolower($match[3][0]);
 						$stack[] = '@'.$prop;
@@ -590,8 +580,7 @@ 
 							$expectPropEnd=true;
 						}
 					}
-				}
-				else if(strpos($str,'</prop:')===0)	// closing property
+				} else if(strpos($str,'</prop:')===0)	// closing property
 				{
 					$prop=strtolower($match[3][0]);
 					if(empty($stack))
@@ -618,23 +607,20 @@ 
 								if(isset($tpl[$container][2][$prop]))
 									throw new TConfigurationException('template_property_duplicated',$prop);
 								$tpl[$container][2][$prop]=$value;
-							}
-							else	// a property for the template control
+							} else	// a property for the template control
 								$this->_directive[$prop]=$value;
 							$textStart=$matchEnd+1;
 						}
 						$expectPropEnd=false;
 					}
-				}
-				else if(strpos($str,'<!--')===0)	// comments
+				} else if(strpos($str,'<!--')===0)	// comments
 				{
 					if($expectPropEnd)
 						throw new TConfigurationException('template_comments_forbidden');
 					if($matchStart>$textStart)
 						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
 					$textStart=$matchEnd+1;
-				}
-				else
+				} else
 					throw new TConfigurationException('template_matching_unexpected',$match);
 			}
 			if(!empty($stack))
@@ -645,8 +631,7 @@ 
 			}
 			if($textStart<strlen($input))
 				$tpl[$c++]=array($container,substr($input,$textStart));
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			if(($e instanceof TException) && ($e instanceof TTemplateException))
 				throw $e;
@@ -679,14 +664,12 @@ 
 				{
 					$parent=null;
 					$objects[$id]=$object;
-				}
-				else
+				} else
 				{
 					$parent=$object[0];
 					$merged=array($parent,array($object[1]));
 				}
-			}
-			else
+			} else
 				$merged[1][]=$object[1];
 		}
 		if($parent!==null)
@@ -725,8 +708,7 @@ 
 					$attributes[$name]=$this->parseTemplateProperty(substr($value,1,strlen($value)-2),$match[2][1]+1);
 				else
 					$attributes[$name]=$this->parseTemplateProperty($value,$match[2][1]);
-			}
-			else
+			} else
 			{
 				if($value[0]==='\'' || $value[0]==='"')
 					$attributes[$name]=$this->parseAttribute(substr($value,1,strlen($value)-2));
@@ -775,8 +757,7 @@ 
 				return array(self::CONFIG_DATABIND,ltrim($expr,'.'));
 			else
 				return array(self::CONFIG_EXPRESSION,ltrim($expr,'.'));
-		}
-		else if(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS',$value,$matches) && $matches[0]===$value)
+		} else if(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS',$value,$matches) && $matches[0]===$value)
 		{
 			$value=$matches[1];
 			if($value[2]==='~')
@@ -789,8 +770,7 @@ 
 				$literal = trim(substr($value,3,strlen($value)-5));
 				return array(self::CONFIG_EXPRESSION,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'");
 			}
-		}
-		else
+		} else
 			return $value;
 	}
 
@@ -812,16 +792,14 @@ 
 					$subname=substr($name,0,$pos);
 					if(!$class->hasMethod('get'.$subname))
 						throw new TConfigurationException('template_property_unknown',$type,$subname);
-				}
-				else if(strncasecmp($name,'on',2)===0)
+				} else if(strncasecmp($name,'on',2)===0)
 				{
 					// an event
 					if(!$class->hasMethod($name))
 						throw new TConfigurationException('template_event_unknown',$type,$name);
 					else if(!is_string($att))
 						throw new TConfigurationException('template_eventhandler_invalid',$type,$name);
-				}
-				else
+				} else
 				{
 					// a simple property
 					if (! ($class->hasMethod('set'.$name) || $class->hasMethod('setjs'.$name) || $this->isClassBehaviorMethod($class,'set'.$name)) )
@@ -830,8 +808,7 @@ 
 							throw new TConfigurationException('template_property_readonly',$type,$name);
 						else
 							throw new TConfigurationException('template_property_unknown',$type,$name);
-					}
-					else if(is_array($att) && $att[0]!==self::CONFIG_EXPRESSION)
+					} else if(is_array($att) && $att[0]!==self::CONFIG_EXPRESSION)
 					{
 						if(strcasecmp($name,'id')===0)
 							throw new TConfigurationException('template_controlid_invalid',$type);
@@ -840,8 +817,7 @@ 
 					}
 				}
 			}
-		}
-		else if(is_subclass_of($className,'\Prado\TComponent') || $className==='\Prado\TComponent')
+		} else if(is_subclass_of($className,'\Prado\TComponent') || $className==='\Prado\TComponent')
 		{
 			foreach($attributes as $name=>$att)
 			{
@@ -853,8 +829,7 @@ 
 					$subname=substr($name,0,$pos);
 					if(!$class->hasMethod('get'.$subname))
 						throw new TConfigurationException('template_property_unknown',$type,$subname);
-				}
-				else if(strncasecmp($name,'on',2)===0)
+				} else if(strncasecmp($name,'on',2)===0)
 					throw new TConfigurationException('template_event_forbidden',$type,$name);
 				else
 				{
@@ -868,8 +843,7 @@ 
 					}
 				}
 			}
-		}
-		else
+		} else
 			throw new TConfigurationException('template_component_required',$type);
 		return $class->getName();
 	}
@@ -905,8 +879,7 @@ 
 						$line=$line-$this->_includeAtLine[$i]+1;
 						$srcFile=$this->_includedFiles[$i];
 						break;
-					}
-					else
+					} else
 						$line=$line-$this->_includeLines[$i]+1;
 				}
 			}