pradosoft / prado

framework/Web/UI/TControl.php

Braces +16 added lines, -28 removed lines

@@ -377,11 +377,9 @@ 
 					return $this->_id;
 				else
 					return ($this->_uid=$prefix.self::ID_SEPARATOR.$this->_id);
-			}
-			else	// no naming container
+			} else	// no naming container
 				return $this->_id;
-		}
-		else
+		} else
 			return $this->_uid;
 	}
 
@@ -535,8 +533,7 @@ 
 				if(!$control->getVisible(false))
 					return false;
 			return true;
-		}
-		else
+		} else
 			return $this->getViewState('Visible',true);
 	}
 
@@ -566,8 +563,7 @@ 
 				if(!$control->getViewState('Enabled',true))
 					return false;
 			return true;
-		}
-		else
+		} else
 			return $this->getViewState('Enabled',true);
 	}
 
@@ -664,8 +660,7 @@ 
 				if($control->_flags & self::IS_DISABLE_VIEWSTATE)
 					return false;
 			return true;
-		}
-		else
+		} else
 			return !($this->_flags & self::IS_DISABLE_VIEWSTATE);
 	}
 
@@ -750,8 +745,7 @@ 
 			if(is_object($this->_tempState[$key]) && $this->_trackViewState)
 				$this->_viewState[$key]=$this->_tempState[$key];
 			return $this->_tempState[$key];
-		}
-		else
+		} else
 			return $defaultValue;
 	}
 
@@ -774,8 +768,7 @@ 
 				unset($this->_viewState[$key]);
 			else
 				$this->_viewState[$key]=$value;
-		}
-		else
+		} else
 		{
 			unset($this->_viewState[$key]);
 			if($value===$defaultValue)
@@ -924,8 +917,7 @@ 
 					$this->createChildControls();
 				$this->_flags &= ~self::IS_CREATING_CHILD;
 				$this->_flags |= self::IS_CHILD_CREATED;
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				$this->_flags &= ~self::IS_CREATING_CHILD;
 				$this->_flags |= self::IS_CHILD_CREATED;
@@ -1164,8 +1156,9 @@ 
 	final protected function isDescendentOf($ancestor)
 	{
 		$control=$this;
-		while($control!==$ancestor && $control->_parent)
-			$control=$control->_parent;
+		while($control!==$ancestor && $control->_parent) {
+					$control=$control->_parent;
+		}
 		return $control===$ancestor;
 	}
 
@@ -1201,8 +1194,7 @@ 
 				{
 					$state=$this->_rf[self::RF_CHILD_STATE][$control->_id];
 					unset($this->_rf[self::RF_CHILD_STATE][$control->_id]);
-				}
-				else
+				} else
 					$state=null;
 				$control->loadStateRecursive($state,!($this->_flags & self::IS_DISABLE_VIEWSTATE));
 				if($this->_stage>=self::CS_LOADED)
@@ -1607,8 +1599,7 @@ 
 			{
 				$this->_rf[self::RF_CONTROLSTATE]=&$state[1];
 				unset($state[1]);
-			}
-			else
+			} else
 				unset($this->_rf[self::RF_CONTROLSTATE]);
 			if($needViewState)
 			{
@@ -1685,8 +1676,7 @@ 
 		{
 			$page->applyControlStyleSheet($this);
 			$this->_flags |= self::IS_STYLESHEET_APPLIED;
-		}
-		else if($this->_flags & self::IS_STYLESHEET_APPLIED)
+		} else if($this->_flags & self::IS_STYLESHEET_APPLIED)
 			throw new TInvalidOperationException('control_stylesheet_applied',get_class($this));
 	}
 
@@ -1805,8 +1795,7 @@ 
 		{
 			parent::insertAt($index,$item);
 			$this->_o->addedControl($item);
-		}
-		else if(is_string($item) || ($item instanceof IRenderable))
+		} else if(is_string($item) || ($item instanceof IRenderable))
 			parent::insertAt($index,$item);
 		else
 			throw new TInvalidDataTypeException('controlcollection_control_required');
@@ -2318,8 +2307,7 @@ 
 				else if($item[0]===self::TYPE_DATABINDING)
 					$this->_bindings[$id]=$item[1];
 				$this->_items[$id]='';
-			}
-			else
+			} else
 				$this->_items[$id]=$item;
 		}
 	}

framework/Web/UI/TTemplateManager.php

Braces +28 added lines, -56 removed lines

@@ -107,8 +107,7 @@ 
 				$cache->set(self::TEMPLATE_CACHE_PREFIX.$fileName,array($template,$timestamps));
 				return $template;
 			}
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -357,8 +356,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']))
@@ -376,8 +374,7 @@ 
 					else
 						$component->createdOnTemplate($parent);
 				}
-			}
-			else
+			} else
 			{
 				if($object[1] instanceof TCompositeLiteral)
 				{
@@ -388,8 +385,7 @@ 
 						$directChildren[]=$o;
 					else
 						$parent->addParsedObject($o);
-				}
-				else
+				} else
 				{
 					if($parent===$parentControl)
 						$directChildren[]=$object[1];
@@ -500,8 +496,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))
@@ -549,8 +544,7 @@ 
 					throw new TConfigurationException('template_tag_unexpected',$name,$value[1]);
 					break;
 			}
-		}
-		else
+		} else
 			$component->setSubProperty($name,$value);
 	}
 
@@ -611,8 +605,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;
@@ -631,8 +624,7 @@ 
 						throw new TConfigurationException('template_closingtag_expected',$tag);
 					}
 					$container=$tpl[$container][0];
-				}
-				else if(strpos($str,'<%@')===0)	// directive
+				} else if(strpos($str,'<%@')===0)	// directive
 				{
 					if($expectPropEnd)
 						continue;
@@ -642,8 +634,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;
@@ -668,8 +659,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
 					{
@@ -691,8 +681,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;
@@ -704,8 +693,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))
@@ -732,23 +720,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))
@@ -759,8 +744,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;
@@ -793,14 +777,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)
@@ -839,8 +821,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));
@@ -889,8 +870,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]==='~')
@@ -903,8 +883,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;
 	}
 
@@ -926,16 +905,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)) )
@@ -944,8 +921,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);
@@ -954,8 +930,7 @@ 
 					}
 				}
 			}
-		}
-		else if(is_subclass_of($className,'TComponent') || $className==='TComponent')
+		} else if(is_subclass_of($className,'TComponent') || $className==='TComponent')
 		{
 			foreach($attributes as $name=>$att)
 			{
@@ -967,8 +942,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
 				{
@@ -982,8 +956,7 @@ 
 					}
 				}
 			}
-		}
-		else
+		} else
 			throw new TConfigurationException('template_component_required',$type);
 	}
 
@@ -1018,8 +991,7 @@ 
 						$line=$line-$this->_includeAtLine[$i]+1;
 						$srcFile=$this->_includedFiles[$i];
 						break;
-					}
-					else
+					} else
 						$line=$line-$this->_includeLines[$i]+1;
 				}
 			}

framework/Web/UI/JuiControls/TJuiDialog.php

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if ($this->sourcepath === NULL)
 		{
 			$this->sourcepath = $sourcepath;
-		}
-		else
+		} else
 		{
 			$this->sourcepath->append($sourcepath);
 		}

framework/Web/UI/TClientScriptManager.php

Braces +2 added lines, -4 removed lines

@@ -226,8 +226,7 @@ 
 				$base = $dir;
 			}
 			return array($assets->getPublishedPath($base), $assets->publishFilePath($base));
-		}
-		else
+		} else
 		{
 			return array($assets->getBasePath().str_replace($assets->getBaseUrl(),'',$base), $base);
 		}
@@ -748,8 +747,7 @@ 
 			{
 				foreach($value as $v)
 					$str.='<input type="hidden" name="'.$name.'[]" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
-			}
-			else
+			} else
 			{
 				$str.='<input type="hidden" name="'.$name.'" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
 			}

framework/Web/TUrlMapping.php

Braces +11 added lines, -18 removed lines

@@ -131,15 +131,13 @@ 
 			{
 				$config = include $this->_configFile;
 				$this->loadUrlMappings($dom);
-			}
-			else
+			} else
 			{
 				$dom=new TXmlDocument;
 				$dom->loadFromFile($this->_configFile);
 				$this->loadUrlMappings($dom);
 			}
-		}
-		else
+		} else
 			throw new TConfigurationException('urlmapping_configfile_inexistent',$this->_configFile);
 	}
 
@@ -246,8 +244,7 @@ 
 					$this->buildUrlMapping($class,$properties,$url);
 				}
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('url') as $url)
 			{
@@ -361,8 +358,7 @@ 
 					if($rule->supportCustomUrl($getItems))
 						return $rule->constructUrl($getItems,$encodeAmpersand,$encodeGetItems);
 				}
-			}
-			elseif(isset($this->_constructRules[$wildCardKey]))
+			} elseif(isset($this->_constructRules[$wildCardKey]))
 			{
 				foreach($this->_constructRules[$wildCardKey] as $rule)
 				{
@@ -733,10 +729,10 @@ 
 			$params=explode('/',$matches['urlparams']);
 			if ($this->_separator==='/')
 			{
-				while($key=array_shift($params))
-					$matches[$key]=($value=array_shift($params)) ? $value : '';
-			}
-			else
+				while($key=array_shift($params)) {
+									$matches[$key]=($value=array_shift($params)) ? $value : '';
+				}
+			} else
 			{
 				array_pop($params);
 				foreach($params as $param)
@@ -928,12 +924,10 @@ 
 						$name=rawurlencode($name.'[]');
 						foreach($value as $v)
 							$url2.=$amp.$name.'='.rawurlencode($v);
-					}
-					else
+					} else
 						$url2.=$amp.rawurlencode($name).'='.rawurlencode($value);
 				}
-			}
-			else
+			} else
 			{
 				foreach($extra as $name=>$value)
 				{
@@ -941,8 +935,7 @@ 
 					{
 						foreach($value as $v)
 							$url2.=$amp.$name.'[]='.$v;
-					}
-					else
+					} else
 						$url2.=$amp.$name.'='.$value;
 				}
 			}

framework/Util/TDataFieldAccessor.php

Braces +3 added lines, -6 removed lines

@@ -61,8 +61,7 @@ 
 				foreach (explode(".", $field) as $f)
 				    $tmp = $tmp[$f];
 				return $tmp;
-			}
-			else if(is_object($data))
+			} else if(is_object($data))
 			{
 				if(strpos($field,'.')===false)  // simple field
 				{
@@ -70,8 +69,7 @@ 
 						return call_user_func(array($data,'get'.$field));
 					else
 						return $data->{$field};
-				}
-				else // field in the format of xxx.yyy.zzz
+				} else // field in the format of xxx.yyy.zzz
 				{
 					$object=$data;
 					foreach(explode('.',$field) as $f)
@@ -79,8 +77,7 @@ 
 					return $object;
 				}
 			}
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TInvalidDataValueException('datafieldaccessor_datafield_invalid',$field,$e->getMessage());
 		}

framework/Util/TParameterModule.php

Braces +6 added lines, -12 removed lines

@@ -71,14 +71,12 @@ 
 					$configFile->loadFromFile($this->_paramFile);
 					$cache->set($cacheKey,$configFile,0,new TFileCacheDependency($this->_paramFile));
 				}
-			}
-			else
+			} else
 			{
 				if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 				{
 					$configFile = include $this->_paramFile;
-				}
-				else
+				} else
 				{
 					$configFile=new TXmlDocument;
 					$configFile->loadFromFile($this->_paramFile);
@@ -105,14 +103,12 @@ 
 				{
 					$properties = isset($parameter['properties'])?$parameter['properties']:array();
 					$parameters[$id]=array($parameter['class'],$properties);
-				}
-				else
+				} else
 				{
 					$parameters[$id] = $parameter;
 				}
 			}
-		}
-		else if($config instanceof TXmlElement)
+		} else if($config instanceof TXmlElement)
 		{
 			foreach($config->getElementsByTagName('parameter') as $node)
 			{
@@ -125,8 +121,7 @@ 
 						$parameters[$id]=$node;
 					else
 						$parameters[$id]=$value;
-				}
-				else
+				} else
 					$parameters[$id]=array($type,$properties->toArray());
 			}
 		}
@@ -140,8 +135,7 @@ 
 				foreach($parameter[1] as $name=>$value)
 					$component->setSubProperty($name,$value);
 				$appParams->add($id,$component);
-			}
-			else
+			} else
 				$appParams->add($id,$parameter);
 		}
 	}

framework/Util/TLogRouter.php

Braces +10 added lines, -20 removed lines

@@ -65,15 +65,13 @@ 
 				{
 					$phpConfig = include $this->_configFile;
 					$this->loadConfig($phpConfig);
-				}
-				else
+				} else
 				{
 					$dom=new TXmlDocument;
 					$dom->loadFromFile($this->_configFile);
 					$this->loadConfig($dom);
 				}
-			}
-			else
+			} else
 				throw new TConfigurationException('logrouter_configfile_invalid',$this->_configFile);
 		}
 		$this->loadConfig($config);
@@ -105,8 +103,7 @@ 
 					$route->init($route);
 				}
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('route') as $routeConfig)
 			{
@@ -647,8 +644,7 @@ 
 			{
 				$timing['delta'] = $logs[$i+1][3] - $logs[$i][3];
 				$timing['total'] = $logs[$i+1][3] - $first;
-			}
-			else
+			} else
 			{
 				$timing['delta'] = '?';
 				$timing['total'] = $logs[$i][3] - $first;
@@ -691,8 +687,7 @@ 
 		<th>Category</th><th>Message</th><th>Time Spent (s)</th><th>Cumulated Time Spent (s)</th>
 	</tr>
 EOD;
-		}
-		else
+		} else
 		{
 			$string = <<<EOD
 <table cellspacing="0" cellpadding="2" border="0" width="100%" style="table-layout:auto">
@@ -729,8 +724,7 @@ 
 		<td class="cumulatedtime">{$total}</td>
 	</tr>
 EOD;
-		}
-		else
+		} else
 		{
 			$bgcolor = $info['even'] ? "#fff" : "#eee";
 			$color = $this->getColorLevel($log[1]);
@@ -772,8 +766,7 @@ 
 			{
 				$string .= '<span class="level'.$level.'">'.strtoupper($name)."</span>";
 			}
-		}
-		else
+		} else
 		{
 			$string .= "<tr><td colspan=\"5\" style=\"text-align:center; background-color:black; border-top: 1px solid #ccc; padding:0.2em;\">";
 			foreach(self::$_levelValues as $name => $level)
@@ -858,8 +851,7 @@ 
 		try
 		{
 			$db->createCommand($sql)->query()->close();
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			// DB table not exists
 			if($this->_autoCreate)
@@ -925,8 +917,7 @@ 
 				return $config->getDbConnection();
 			else
 				throw new TConfigurationException('dblogroute_connectionid_invalid',$this->_connID);
-		}
-		else
+		} else
 		{
 			$db=new TDbConnection;
 			// default to SQLite3 database
@@ -1138,8 +1129,7 @@ 
 			{
 				$delta = $logs[$i+1][3] - $logs[$i][3];
 				$total = $logs[$i+1][3] - $first;
-			}
-			else
+			} else
 			{
 				$delta = '?';
 				$total = $logs[$i][3] - $first;

framework/IO/TTarFileExtractor.php

Braces +6 added lines, -4 removed lines

@@ -155,8 +155,9 @@ 
                 $this->_temp_tarname = '';
                 return false;
               }
-              while ($v_data = @fread($v_file_from, 1024))
-                  @fwrite($v_file_to, $v_data);
+              while ($v_data = @fread($v_file_from, 1024)) {
+                                @fwrite($v_file_to, $v_data);
+              }
               @fclose($v_file_from);
               @fclose($v_file_to);
           }
@@ -410,8 +411,9 @@ 
           $v_header['filename'] = substr($v_header['filename'],
 		                                 $p_remove_path_size);
         if (($p_path != './') && ($p_path != '/')) {
-          while (substr($p_path, -1) == '/')
-            $p_path = substr($p_path, 0, strlen($p_path)-1);
+          while (substr($p_path, -1) == '/') {
+                      $p_path = substr($p_path, 0, strlen($p_path)-1);
+          }
 
           if (substr($v_header['filename'], 0, 1) == '/')
               $v_header['filename'] = $p_path.$v_header['filename'];