pradosoft / prado

framework/Web/UI/ActiveControls/TActivePager.php

Braces +3 added lines, -6 removed lines

@@ -136,8 +136,7 @@ 
 				$button->setCssClass($this->getButtonCssClass());
 				return $button;
 			}
-		}
-		elseif($buttonType === TPagerButtonType::ImageButton)
+		} elseif($buttonType === TPagerButtonType::ImageButton)
 		{
 			$button = new TActiveImageButton;
 			$button->setImageUrl($this->getPageImageUrl($text, $commandName));
@@ -145,8 +144,7 @@ 
 				$button->Visible = true;
 			else
 				$button->Visible = false;
-		}
-		else
+		} else
 		{
 			$button = new TActiveButton;
 			if(!$enabled)
@@ -206,8 +204,7 @@ 
 			TWebControl::render($writer);
 			if($this->getActiveControl()->canUpdateClientSide())
 				$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
-		}
-		else
+		} else
 		{
 			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 		}

framework/Web/UI/ActiveControls/TBaseActiveCallbackControl.php

Braces +2 added lines, -4 removed lines

@@ -116,8 +116,7 @@ 
 				$newid = substr($id, $pos + 1);
 				if ($control !== null)
 					$control = $control->$newid;
-			}
-			else
+			} else
 			{
 				// TCheckBoxList overrides findControl() with a fake implementation
 				// but accepts a second parameter to use the standard one
@@ -179,8 +178,7 @@ 
 		{
 			$group = $this->getValidationGroup();
 			return $this->getPage()->getValidators($group)->getCount() > 0;
-		}
-		else
+		} else
 			return false;
 	}
 

framework/Web/UI/ActiveControls/TActiveHtmlArea.php

Braces +1 added lines, -2 removed lines

@@ -71,8 +71,7 @@
 		$value = str_ireplace(["\r\n", "\n"], "", $value);
 		$command = "tinyMCE.getInstanceById('{$this->getClientID()}').execCommand('mceSetContent',false,'{$value}')";
 		$this->getPage()->getCallbackClient()->evaluateScript($command);
-	  }
-	  else
+	  } else
 		$this->getPage()->getCallbackClient()->setValue($this, $value);
 	}
   }

framework/Web/UI/ActiveControls/TActiveFileUpload.php

Braces +4 added lines, -8 removed lines

@@ -239,13 +239,11 @@ 
 				// this is the most secure method, file info can't be forged from client side, no matter what
 				$token = md5('TActiveFileUpload::Params::' . $this->ClientID . '::' . rand(1000 * 1000, 9999 * 1000));
 				$cache->set($token, serialize($params), 5 * 60); // expire in 5 minutes - the callback should arrive back in seconds, actually
-			}
-		elseif ($mgr = Prado::getApplication()->getSecurityManager())
+			} elseif ($mgr = Prado::getApplication()->getSecurityManager())
 			{
 				// this is a less secure method, file info can be still forged from client side, but only if attacker knows the secret application key
 				$token = urlencode(base64_encode($mgr->encrypt(serialize($params))));
-			}
-		else
+			} else
 			throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
 
 		return $token;
@@ -259,13 +257,11 @@ 
 				assert($v != '');
 				$cache->delete($token); // remove it from cache so it can't be used again and won't take up space either
 				$params = unserialize($v);
-			}
-		elseif ($mgr = Prado::getApplication()->getSecurityManager())
+			} elseif ($mgr = Prado::getApplication()->getSecurityManager())
 			{
 				$v = $mgr->decrypt(base64_decode(urldecode($token)));
 				$params = unserialize($v);
-			}
-		else
+			} else
 			throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
 
 		assert($params instanceof TActiveFileUploadCallbackParams);

framework/Web/UI/TCompositeLiteral.php

Braces +1 added lines, -2 removed lines

@@ -52,8 +52,7 @@
 				elseif($item[0] === self::TYPE_DATABINDING)
 					$this->_bindings[$id] = $item[1];
 				$this->_items[$id] = '';
-			}
-			else
+			} else
 				$this->_items[$id] = $item;
 		}
 	}

framework/Web/UI/TTemplate.php

Braces +27 added lines, -54 removed lines

@@ -244,8 +244,7 @@ 
 						$component->createdOnTemplate($parent);
 					if($component->getAllowChildControls())
 						$controls[$key] = $component;
-				}
-				elseif($component instanceof TComponent)
+				} elseif($component instanceof TComponent)
 				{
 					$controls[$key] = $component;
 					if(isset($properties['id']))
@@ -263,8 +262,7 @@ 
 					else
 						$component->createdOnTemplate($parent);
 				}
-			}
-			else
+			} else
 			{
 				if($object[1] instanceof TCompositeLiteral)
 				{
@@ -275,8 +273,7 @@ 
 						$directChildren[] = $o;
 					else
 						$parent->addParsedObject($o);
-				}
-				else
+				} else
 				{
 					if($parent === $parentControl)
 						$directChildren[] = $object[1];
@@ -387,8 +384,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))
@@ -436,8 +432,7 @@ 
 					throw new TConfigurationException('template_tag_unexpected', $name, $value[1]);
 					break;
 			}
-		}
-		else
+		} else
 			$component->setSubProperty($name, $value);
 	}
 
@@ -498,8 +493,7 @@ 
 						$stack[] = $type;
 						$container = $c - 1;
 					}
-				}
-				elseif(strpos($str, '</com:') === 0)	// closing component tag
+				} elseif(strpos($str, '</com:') === 0)	// closing component tag
 				{
 					if($expectPropEnd)
 						continue;
@@ -518,8 +512,7 @@ 
 						throw new TConfigurationException('template_closingtag_expected', $tag, "</com:$type>");
 					}
 					$container = $tpl[$container][0];
-				}
-				elseif(strpos($str, '<%@') === 0)	// directive
+				} elseif(strpos($str, '<%@') === 0)	// directive
 				{
 					if($expectPropEnd)
 						continue;
@@ -529,8 +522,7 @@ 
 					if(isset($tpl[0]) || $this->_directive !== null)
 						throw new TConfigurationException('template_directive_nonunique');
 					$this->_directive = $this->parseAttributes($match[4][0], $match[4][1]);
-				}
-				elseif(strpos($str, '<%') === 0)	// expression
+				} elseif(strpos($str, '<%') === 0)	// expression
 				{
 					if($expectPropEnd)
 						continue;
@@ -555,8 +547,7 @@ 
 						$literal = strtr(trim(substr($literal, 0, strlen($literal) - 1)), ["'" => "\'","\\" => "\\\\"]);
 						$tpl[$c++] = [$container,[TCompositeLiteral::TYPE_EXPRESSION,"Prado::localize('$literal')"]];
 					}
-				}
-				elseif(strpos($str, '<prop:') === 0)	// opening property
+				} elseif(strpos($str, '<prop:') === 0)	// opening property
 				{
 					if(strrpos($str, '/>') === strlen($str) - 2)  //subproperties
 					{
@@ -578,8 +569,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;
@@ -591,8 +581,7 @@ 
 							$expectPropEnd = true;
 						}
 					}
-				}
-				elseif(strpos($str, '</prop:') === 0)	// closing property
+				} elseif(strpos($str, '</prop:') === 0)	// closing property
 				{
 					$prop = strtolower($match[3][0]);
 					if(empty($stack))
@@ -619,23 +608,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;
 					}
-				}
-				elseif(strpos($str, '<!--') === 0)	// comments
+				} elseif(strpos($str, '<!--') === 0)	// comments
 				{
 					if($expectPropEnd)
 						throw new TConfigurationException('template_comments_forbidden');
 					if($matchStart > $textStart)
 						$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
 					$textStart = $matchEnd + 1;
-				}
-				else
+				} else
 					throw new TConfigurationException('template_matching_unexpected', $match);
 			}
 			if(!empty($stack))
@@ -646,8 +632,7 @@ 
 			}
 			if($textStart < strlen($input))
 				$tpl[$c++] = [$container,substr($input, $textStart)];
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			if(($e instanceof TException) && ($e instanceof TTemplateException))
 				throw $e;
@@ -680,14 +665,12 @@ 
 				{
 					$parent = null;
 					$objects[$id] = $object;
-				}
-				else
+				} else
 				{
 					$parent = $object[0];
 					$merged = [$parent,[$object[1]]];
 				}
-			}
-			else
+			} else
 				$merged[1][] = $object[1];
 		}
 		if($parent !== null)
@@ -726,8 +709,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));
@@ -776,8 +758,7 @@ 
 				return [self::CONFIG_DATABIND,ltrim($expr, '.')];
 			else
 				return [self::CONFIG_EXPRESSION,ltrim($expr, '.')];
-		}
-		elseif(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS', $value, $matches) && $matches[0] === $value)
+		} elseif(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS', $value, $matches) && $matches[0] === $value)
 		{
 			$value = $matches[1];
 			if($value[2] === '~')
@@ -790,8 +771,7 @@ 
 				$literal = trim(substr($value, 3, strlen($value) - 5));
 				return [self::CONFIG_EXPRESSION,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'"];
 			}
-		}
-		else
+		} else
 			return $value;
 	}
 
@@ -813,16 +793,14 @@ 
 					$subname = substr($name, 0, $pos);
 					if(!$class->hasMethod('get' . $subname))
 						throw new TConfigurationException('template_property_unknown', $type, $subname);
-				}
-				elseif(strncasecmp($name, 'on', 2) === 0)
+				} elseif(strncasecmp($name, 'on', 2) === 0)
 				{
 					// an event
 					if(!$class->hasMethod($name))
 						throw new TConfigurationException('template_event_unknown', $type, $name);
 					elseif(!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)))
@@ -831,8 +809,7 @@ 
 							throw new TConfigurationException('template_property_readonly', $type, $name);
 						else
 							throw new TConfigurationException('template_property_unknown', $type, $name);
-					}
-					elseif(is_array($att) && $att[0] !== self::CONFIG_EXPRESSION)
+					} elseif(is_array($att) && $att[0] !== self::CONFIG_EXPRESSION)
 					{
 						if(strcasecmp($name, 'id') === 0)
 							throw new TConfigurationException('template_controlid_invalid', $type);
@@ -841,8 +818,7 @@ 
 					}
 				}
 			}
-		}
-		elseif(is_subclass_of($className, '\Prado\TComponent') || $className === '\Prado\TComponent')
+		} elseif(is_subclass_of($className, '\Prado\TComponent') || $className === '\Prado\TComponent')
 		{
 			foreach($attributes as $name => $att)
 			{
@@ -854,8 +830,7 @@ 
 					$subname = substr($name, 0, $pos);
 					if(!$class->hasMethod('get' . $subname))
 						throw new TConfigurationException('template_property_unknown', $type, $subname);
-				}
-				elseif(strncasecmp($name, 'on', 2) === 0)
+				} elseif(strncasecmp($name, 'on', 2) === 0)
 					throw new TConfigurationException('template_event_forbidden', $type, $name);
 				else
 				{
@@ -869,8 +844,7 @@ 
 					}
 				}
 			}
-		}
-		else
+		} else
 			throw new TConfigurationException('template_component_required', $type);
 		return $class->getName();
 	}
@@ -906,8 +880,7 @@ 
 						$line = $line - $this->_includeAtLine[$i] + 1;
 						$srcFile = $this->_includedFiles[$i];
 						break;
-					}
-					else
+					} else
 						$line = $line - $this->_includeLines[$i] + 1;
 				}
 			}

framework/Web/UI/TPage.php

Braces +7 added lines, -14 removed lines

@@ -204,8 +204,7 @@ 
 				$this->processCallbackRequest($writer);
 			else
 				$this->processPostBackRequest($writer);
-		}
-		else
+		} else
 			$this->processNormalRequest($writer);
 
 		$this->_writer = null;
@@ -494,8 +493,7 @@ 
 			{
 				foreach($this->_validators as $validator)
 					$validator->validate();
-			}
-			else
+			} else
 			{
 				foreach($this->_validators as $validator)
 				{
@@ -523,8 +521,7 @@ 
 						return false;
 			}
 			return true;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('page_isvalid_unknown');
 	}
 
@@ -878,15 +875,13 @@ 
 				{
 					if($control->loadPostData($key, $postData))
 						$this->_controlsPostDataChanged[] = $control;
-				}
-				elseif($control instanceof IPostBackEventHandler &&
+				} elseif($control instanceof IPostBackEventHandler &&
 					empty($this->_postData[self::FIELD_POSTBACK_TARGET]))
 				{
 					$this->_postData->add(self::FIELD_POSTBACK_TARGET, $key);  // not calling setPostBackEventTarget() because the control may be removed later
 				}
 				unset($this->_controlsRequiringPostData[$key]);
-			}
-			elseif($beforeLoad)
+			} elseif($beforeLoad)
 				$this->_restPostData->add($key, $value);
 		}
 
@@ -898,8 +893,7 @@ 
 				{
 					if($control->loadPostData($key, $this->_postData))
 						$this->_controlsPostDataChanged[] = $control;
-				}
-				else
+				} else
 					throw new TInvalidDataValueException('page_postbackcontrol_invalid', $key);
 				unset($this->_controlsRequiringPostData[$key]);
 			}
@@ -978,8 +972,7 @@ 
 			else
 				$focus = $this->_focus;
 			$this->getClientScript()->registerFocusControl($focus);
-		}
-		elseif($this->_postData && ($lastFocus = $this->_postData->itemAt(self::FIELD_LASTFOCUS)) !== null)
+		} elseif($this->_postData && ($lastFocus = $this->_postData->itemAt(self::FIELD_LASTFOCUS)) !== null)
 			$this->getClientScript()->registerFocusControl($lastFocus);
 		$this->_inFormRender = false;
 	}

framework/Web/UI/THtmlWriter.php

Braces +1 added lines, -2 removed lines

@@ -208,8 +208,7 @@
 		{
 			$str .= ' />';
 			$this->_openTags[] = '';
-		}
-		else
+		} else
 		{
 			$str .= '>';
 			$this->_openTags[] = $tagName;

framework/Web/UI/TControl.php

Braces +14 added lines, -24 removed lines

@@ -406,11 +406,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;
 	}
 
@@ -564,8 +562,7 @@ 
 				if(!$control->getVisible(false))
 					return false;
 			return true;
-		}
-		else
+		} else
 			return $this->getViewState('Visible', true);
 	}
 
@@ -595,8 +592,7 @@ 
 				if(!$control->getViewState('Enabled', true))
 					return false;
 			return true;
-		}
-		else
+		} else
 			return $this->getViewState('Enabled', true);
 	}
 
@@ -693,8 +689,7 @@ 
 				if($control->_flags & self::IS_DISABLE_VIEWSTATE)
 					return false;
 			return true;
-		}
-		else
+		} else
 			return !($this->_flags & self::IS_DISABLE_VIEWSTATE);
 	}
 
@@ -779,8 +774,7 @@ 
 			if(is_object($this->_tempState[$key]) && $this->_trackViewState)
 				$this->_viewState[$key] = $this->_tempState[$key];
 			return $this->_tempState[$key];
-		}
-		else
+		} else
 			return $defaultValue;
 	}
 
@@ -800,8 +794,7 @@ 
 		{
 			unset($this->_tempState[$key]);
 			$this->_viewState[$key] = $value;
-		}
-		else
+		} else
 		{
 			unset($this->_viewState[$key]);
 			if($value === $defaultValue)
@@ -950,8 +943,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;
@@ -1190,8 +1182,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;
 	}
 
@@ -1227,8 +1220,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)
@@ -1633,8 +1625,7 @@ 
 			{
 				$this->_rf[self::RF_CONTROLSTATE] = &$state[1];
 				unset($state[1]);
-			}
-			else
+			} else
 				unset($this->_rf[self::RF_CONTROLSTATE]);
 			if($needViewState)
 			{
@@ -1711,8 +1702,7 @@ 
 		{
 			$page->applyControlStyleSheet($this);
 			$this->_flags |= self::IS_STYLESHEET_APPLIED;
-		}
-		elseif($this->_flags & self::IS_STYLESHEET_APPLIED)
+		} elseif($this->_flags & self::IS_STYLESHEET_APPLIED)
 			throw new TInvalidOperationException('control_stylesheet_applied', get_class($this));
 	}