pradosoft / prado

framework/Util/TVarDumper.php

Spacing +19 added lines, -19 removed lines

@@ -48,9 +48,9 @@ 
 		self::$_objects = [];
 		self::$_depth = $depth;
 		self::dumpInternal($var, 0);
-		if($highlight)
+		if ($highlight)
 		{
-			$result = highlight_string("<?php\n" . self::$_output, true);
+			$result = highlight_string("<?php\n".self::$_output, true);
 			return preg_replace('/&lt;\\?php<br \\/>/', '', $result, 1);
 		}
 		else
@@ -59,10 +59,10 @@ 
 
 	private static function dumpInternal($var, $level)
 	{
-		switch(gettype($var))
+		switch (gettype($var))
 		{
 			case 'boolean':
-				self::$_output .= $var?'true':'false';
+				self::$_output .= $var ? 'true' : 'false';
 				break;
 			case 'integer':
 				self::$_output .= "$var";
@@ -83,43 +83,43 @@ 
 				self::$_output .= '{unknown}';
 				break;
 			case 'array':
-				if(self::$_depth <= $level)
+				if (self::$_depth <= $level)
 					self::$_output .= 'array(...)';
-				elseif(empty($var))
+				elseif (empty($var))
 					self::$_output .= 'array()';
 				else
 				{
 					$keys = array_keys($var);
 					$spaces = str_repeat(' ', $level * 4);
-					self::$_output .= "array\n" . $spaces . '(';
-					foreach($keys as $key)
+					self::$_output .= "array\n".$spaces.'(';
+					foreach ($keys as $key)
 					{
-						self::$_output .= "\n" . $spaces . "    [$key] => ";
+						self::$_output .= "\n".$spaces."    [$key] => ";
 						self::$_output .= self::dumpInternal($var[$key], $level + 1);
 					}
-					self::$_output .= "\n" . $spaces . ')';
+					self::$_output .= "\n".$spaces.')';
 				}
 				break;
 			case 'object':
-				if(($id = array_search($var, self::$_objects, true)) !== false)
-					self::$_output .= get_class($var) . '#' . ($id + 1) . '(...)';
-				elseif(self::$_depth <= $level)
-					self::$_output .= get_class($var) . '(...)';
+				if (($id = array_search($var, self::$_objects, true)) !== false)
+					self::$_output .= get_class($var).'#'.($id + 1).'(...)';
+				elseif (self::$_depth <= $level)
+					self::$_output .= get_class($var).'(...)';
 				else
 				{
 					$id = array_push(self::$_objects, $var);
 					$className = get_class($var);
-					$members = (array)$var;
+					$members = (array) $var;
 					$keys = array_keys($members);
 					$spaces = str_repeat(' ', $level * 4);
-					self::$_output .= "$className#$id\n" . $spaces . '(';
-					foreach($keys as $key)
+					self::$_output .= "$className#$id\n".$spaces.'(';
+					foreach ($keys as $key)
 					{
 						$keyDisplay = strtr(trim($key), ["\0" => ':']);
-						self::$_output .= "\n" . $spaces . "    [$keyDisplay] => ";
+						self::$_output .= "\n".$spaces."    [$keyDisplay] => ";
 						self::$_output .= self::dumpInternal($members[$key], $level + 1);
 					}
-					self::$_output .= "\n" . $spaces . ')';
+					self::$_output .= "\n".$spaces.')';
 				}
 				break;
 		}

Braces +12 added lines, -12 removed lines

@@ -52,9 +52,9 @@ 
 		{
 			$result = highlight_string("<?php\n" . self::$_output, true);
 			return preg_replace('/&lt;\\?php<br \\/>/', '', $result, 1);
+		} else {
+					return self::$_output;
 		}
-		else
-			return self::$_output;
 	}
 
 	private static function dumpInternal($var, $level)
@@ -83,11 +83,11 @@ 
 				self::$_output .= '{unknown}';
 				break;
 			case 'array':
-				if(self::$_depth <= $level)
-					self::$_output .= 'array(...)';
-				elseif(empty($var))
-					self::$_output .= 'array()';
-				else
+				if(self::$_depth <= $level) {
+									self::$_output .= 'array(...)';
+				} elseif(empty($var)) {
+									self::$_output .= 'array()';
+				} else
 				{
 					$keys = array_keys($var);
 					$spaces = str_repeat(' ', $level * 4);
@@ -101,11 +101,11 @@ 
 				}
 				break;
 			case 'object':
-				if(($id = array_search($var, self::$_objects, true)) !== false)
-					self::$_output .= get_class($var) . '#' . ($id + 1) . '(...)';
-				elseif(self::$_depth <= $level)
-					self::$_output .= get_class($var) . '(...)';
-				else
+				if(($id = array_search($var, self::$_objects, true)) !== false) {
+									self::$_output .= get_class($var) . '#' . ($id + 1) . '(...)';
+				} elseif(self::$_depth <= $level) {
+									self::$_output .= get_class($var) . '(...)';
+				} else
 				{
 					$id = array_push(self::$_objects, $var);
 					$className = get_class($var);

framework/Util/TDataFieldAccessor.php

Spacing +8 added lines, -8 removed lines

@@ -57,9 +57,9 @@ 
 	{
 		try
 		{
-			if(is_array($data) || ($data instanceof \ArrayAccess))
+			if (is_array($data) || ($data instanceof \ArrayAccess))
 			{
-				if(isset($data[$field]))
+				if (isset($data[$field]))
 					return $data[$field];
 
 				$tmp = $data;
@@ -67,25 +67,25 @@ 
 					$tmp = $tmp[$f];
 				return $tmp;
 			}
-			elseif(is_object($data))
+			elseif (is_object($data))
 			{
-				if(strpos($field, '.') === false)  // simple field
+				if (strpos($field, '.') === false)  // simple field
 				{
-					if(method_exists($data, 'get' . $field))
-						return call_user_func([$data,'get' . $field]);
+					if (method_exists($data, 'get'.$field))
+						return call_user_func([$data, 'get'.$field]);
 					else
 						return $data->{$field};
 				}
 				else // field in the format of xxx.yyy.zzz
 				{
 					$object = $data;
-					foreach(explode('.', $field) as $f)
+					foreach (explode('.', $field) as $f)
 						$object = TDataFieldAccessor::getDataFieldValue($object, $f);
 					return $object;
 				}
 			}
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			throw new TInvalidDataValueException('datafieldaccessor_datafield_invalid', $field, $e->getMessage());
 		}

Braces +17 added lines, -15 removed lines

@@ -59,33 +59,35 @@
 		{
 			if(is_array($data) || ($data instanceof \ArrayAccess))
 			{
-				if(isset($data[$field]))
-					return $data[$field];
+				if(isset($data[$field])) {
+									return $data[$field];
+				}
 
 				$tmp = $data;
-				foreach (explode(".", $field) as $f)
-					$tmp = $tmp[$f];
+				foreach (explode(".", $field) as $f) {
+									$tmp = $tmp[$f];
+				}
 				return $tmp;
-			}
-			elseif(is_object($data))
+			} elseif(is_object($data))
 			{
-				if(strpos($field, '.') === false)  // simple field
+				if(strpos($field, '.') === false) {
+					// simple field
 				{
 					if(method_exists($data, 'get' . $field))
 						return call_user_func([$data,'get' . $field]);
-					else
-						return $data->{$field};
-				}
-				else // field in the format of xxx.yyy.zzz
+				} else {
+											return $data->{$field};
+					}
+				} else // field in the format of xxx.yyy.zzz
 				{
 					$object = $data;
-					foreach(explode('.', $field) as $f)
-						$object = TDataFieldAccessor::getDataFieldValue($object, $f);
+					foreach(explode('.', $field) as $f) {
+											$object = TDataFieldAccessor::getDataFieldValue($object, $f);
+					}
 					return $object;
 				}
 			}
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TInvalidDataValueException('datafieldaccessor_datafield_invalid', $field, $e->getMessage());
 		}

framework/Util/TLogger.php

Spacing +28 added lines, -28 removed lines

@@ -69,14 +69,14 @@ 
 	 */
 	public function log($message, $level, $category = 'Uncategorized', $ctl = null)
 	{
-		if($ctl) {
-			if($ctl instanceof TControl)
+		if ($ctl) {
+			if ($ctl instanceof TControl)
 				$ctl = $ctl->ClientId;
-			elseif(!is_string($ctl))
+			elseif (!is_string($ctl))
 				$ctl = null;
 		} else
 			$ctl = null;
-		$this->_logs[] = [$message,$level,$category,microtime(true),memory_get_usage(),$ctl];
+		$this->_logs[] = [$message, $level, $category, microtime(true), memory_get_usage(), $ctl];
 	}
 
 	/**
@@ -118,17 +118,17 @@ 
 		$this->_categories = $categories;
 		$this->_controls = $controls;
 		$this->_timestamp = $timestamp;
-		if(empty($levels) && empty($categories) && empty($controls) && null === $timestamp)
+		if (empty($levels) && empty($categories) && empty($controls) && null === $timestamp)
 			return $this->_logs;
 		$logs = $this->_logs;
-		if(!empty($levels))
-			$logs = array_values(array_filter(array_filter($logs, [$this,'filterByLevels'])));
-		if(!empty($categories))
-			$logs = array_values(array_filter(array_filter($logs, [$this,'filterByCategories'])));
-		if(!empty($controls))
-			$logs = array_values(array_filter(array_filter($logs, [$this,'filterByControl'])));
-		if(null !== $timestamp)
-			$logs = array_values(array_filter(array_filter($logs, [$this,'filterByTimeStamp'])));
+		if (!empty($levels))
+			$logs = array_values(array_filter(array_filter($logs, [$this, 'filterByLevels'])));
+		if (!empty($categories))
+			$logs = array_values(array_filter(array_filter($logs, [$this, 'filterByCategories'])));
+		if (!empty($controls))
+			$logs = array_values(array_filter(array_filter($logs, [$this, 'filterByControl'])));
+		if (null !== $timestamp)
+			$logs = array_values(array_filter(array_filter($logs, [$this, 'filterByTimeStamp'])));
 		return $logs;
 	}
 
@@ -162,20 +162,20 @@ 
 		$this->_categories = $categories;
 		$this->_controls = $controls;
 		$this->_timestamp = $timestamp;
-		if(empty($levels) && empty($categories) && empty($controls) && null === $timestamp)
+		if (empty($levels) && empty($categories) && empty($controls) && null === $timestamp)
 		{
 			$this->_logs = [];
 			return;
 		}
 		$logs = $this->_logs;
-		if(!empty($levels))
-			$logs = array_filter(array_filter($logs, [$this,'filterByLevels']));
-		if(!empty($categories))
-			$logs = array_filter(array_filter($logs, [$this,'filterByCategories']));
-		if(!empty($controls))
-			$logs = array_filter(array_filter($logs, [$this,'filterByControl']));
-		if(null !== $timestamp)
-			$logs = array_filter(array_filter($logs, [$this,'filterByTimeStamp']));
+		if (!empty($levels))
+			$logs = array_filter(array_filter($logs, [$this, 'filterByLevels']));
+		if (!empty($categories))
+			$logs = array_filter(array_filter($logs, [$this, 'filterByCategories']));
+		if (!empty($controls))
+			$logs = array_filter(array_filter($logs, [$this, 'filterByControl']));
+		if (null !== $timestamp)
+			$logs = array_filter(array_filter($logs, [$this, 'filterByTimeStamp']));
 		$this->_logs = array_values(array_diff_key($this->_logs, $logs));
 	}
 
@@ -185,10 +185,10 @@ 
 	 */
 	private function filterByCategories($value)
 	{
-		foreach($this->_categories as $category)
+		foreach ($this->_categories as $category)
 		{
 			// element 2 is the category
-			if($value[2] === $category || strpos($value[2], $category . '.') === 0)
+			if ($value[2] === $category || strpos($value[2], $category.'.') === 0)
 				return $value;
 		}
 		return false;
@@ -201,7 +201,7 @@ 
 	private function filterByLevels($value)
 	{
 		// element 1 are the levels
-		if($value[1] & $this->_levels)
+		if ($value[1] & $this->_levels)
 			return $value;
 		else
 			return false;
@@ -214,9 +214,9 @@ 
 	private function filterByControl($value)
 	{
 		// element 5 are the control client ids
-		foreach($this->_controls as $control)
+		foreach ($this->_controls as $control)
 		{
-			if($value[5] === $control || strpos($value[5], $control) === 0)
+			if ($value[5] === $control || strpos($value[5], $control) === 0)
 				return $value;
 		}
 		return false;
@@ -229,7 +229,7 @@ 
 	private function filterByTimeStamp($value)
 	{
 		// element 3 is the timestamp
-		if($value[3] <= $this->_timestamp)
+		if ($value[3] <= $this->_timestamp)
 			return $value;
 		else
 			return false;

Braces +51 added lines, -36 removed lines

@@ -70,12 +70,14 @@ 
 	public function log($message, $level, $category = 'Uncategorized', $ctl = null)
 	{
 		if($ctl) {
-			if($ctl instanceof TControl)
-				$ctl = $ctl->ClientId;
-			elseif(!is_string($ctl))
-				$ctl = null;
-		} else
-			$ctl = null;
+			if($ctl instanceof TControl) {
+							$ctl = $ctl->ClientId;
+			} elseif(!is_string($ctl)) {
+							$ctl = null;
+			}
+		} else {
+					$ctl = null;
+		}
 		$this->_logs[] = [$message,$level,$category,microtime(true),memory_get_usage(),$ctl];
 	}
 
@@ -118,17 +120,22 @@ 
 		$this->_categories = $categories;
 		$this->_controls = $controls;
 		$this->_timestamp = $timestamp;
-		if(empty($levels) && empty($categories) && empty($controls) && null === $timestamp)
-			return $this->_logs;
+		if(empty($levels) && empty($categories) && empty($controls) && null === $timestamp) {
+					return $this->_logs;
+		}
 		$logs = $this->_logs;
-		if(!empty($levels))
-			$logs = array_values(array_filter(array_filter($logs, [$this,'filterByLevels'])));
-		if(!empty($categories))
-			$logs = array_values(array_filter(array_filter($logs, [$this,'filterByCategories'])));
-		if(!empty($controls))
-			$logs = array_values(array_filter(array_filter($logs, [$this,'filterByControl'])));
-		if(null !== $timestamp)
-			$logs = array_values(array_filter(array_filter($logs, [$this,'filterByTimeStamp'])));
+		if(!empty($levels)) {
+					$logs = array_values(array_filter(array_filter($logs, [$this,'filterByLevels'])));
+		}
+		if(!empty($categories)) {
+					$logs = array_values(array_filter(array_filter($logs, [$this,'filterByCategories'])));
+		}
+		if(!empty($controls)) {
+					$logs = array_values(array_filter(array_filter($logs, [$this,'filterByControl'])));
+		}
+		if(null !== $timestamp) {
+					$logs = array_values(array_filter(array_filter($logs, [$this,'filterByTimeStamp'])));
+		}
 		return $logs;
 	}
 
@@ -168,14 +175,18 @@ 
 			return;
 		}
 		$logs = $this->_logs;
-		if(!empty($levels))
-			$logs = array_filter(array_filter($logs, [$this,'filterByLevels']));
-		if(!empty($categories))
-			$logs = array_filter(array_filter($logs, [$this,'filterByCategories']));
-		if(!empty($controls))
-			$logs = array_filter(array_filter($logs, [$this,'filterByControl']));
-		if(null !== $timestamp)
-			$logs = array_filter(array_filter($logs, [$this,'filterByTimeStamp']));
+		if(!empty($levels)) {
+					$logs = array_filter(array_filter($logs, [$this,'filterByLevels']));
+		}
+		if(!empty($categories)) {
+					$logs = array_filter(array_filter($logs, [$this,'filterByCategories']));
+		}
+		if(!empty($controls)) {
+					$logs = array_filter(array_filter($logs, [$this,'filterByControl']));
+		}
+		if(null !== $timestamp) {
+					$logs = array_filter(array_filter($logs, [$this,'filterByTimeStamp']));
+		}
 		$this->_logs = array_values(array_diff_key($this->_logs, $logs));
 	}
 
@@ -188,8 +199,9 @@ 
 		foreach($this->_categories as $category)
 		{
 			// element 2 is the category
-			if($value[2] === $category || strpos($value[2], $category . '.') === 0)
-				return $value;
+			if($value[2] === $category || strpos($value[2], $category . '.') === 0) {
+							return $value;
+			}
 		}
 		return false;
 	}
@@ -201,10 +213,11 @@ 
 	private function filterByLevels($value)
 	{
 		// element 1 are the levels
-		if($value[1] & $this->_levels)
-			return $value;
-		else
-			return false;
+		if($value[1] & $this->_levels) {
+					return $value;
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -216,8 +229,9 @@ 
 		// element 5 are the control client ids
 		foreach($this->_controls as $control)
 		{
-			if($value[5] === $control || strpos($value[5], $control) === 0)
-				return $value;
+			if($value[5] === $control || strpos($value[5], $control) === 0) {
+							return $value;
+			}
 		}
 		return false;
 	}
@@ -229,10 +243,11 @@ 
 	private function filterByTimeStamp($value)
 	{
 		// element 3 is the timestamp
-		if($value[3] <= $this->_timestamp)
-			return $value;
-		else
-			return false;
+		if($value[3] <= $this->_timestamp) {
+					return $value;
+		} else {
+					return false;
+		}
 	}
 }
 

framework/Util/TSimpleDateFormatter.php

Spacing +38 added lines, -38 removed lines

@@ -127,31 +127,31 @@ 
 
 	public function getMonthPattern()
 	{
-		if(is_int(strpos($this->pattern, 'MMMM')))
+		if (is_int(strpos($this->pattern, 'MMMM')))
 			return 'MMMM';
-		if(is_int(strpos($this->pattern, 'MMM')))
+		if (is_int(strpos($this->pattern, 'MMM')))
 			return 'MMM';
-		if(is_int(strpos($this->pattern, 'MM')))
+		if (is_int(strpos($this->pattern, 'MM')))
 			return 'MM';
-		if(is_int(strpos($this->pattern, 'M')))
+		if (is_int(strpos($this->pattern, 'M')))
 			return 'M';
 		return false;
 	}
 
 	public function getDayPattern()
 	{
-		if(is_int(strpos($this->pattern, 'dd')))
+		if (is_int(strpos($this->pattern, 'dd')))
 			return 'dd';
-		if(is_int(strpos($this->pattern, 'd')))
+		if (is_int(strpos($this->pattern, 'd')))
 			return 'd';
 		return false;
 	}
 
 	public function getYearPattern()
 	{
-		if(is_int(strpos($this->pattern, 'yyyy')))
+		if (is_int(strpos($this->pattern, 'yyyy')))
 			return 'yyyy';
-		if(is_int(strpos($this->pattern, 'yy')))
+		if (is_int(strpos($this->pattern, 'yy')))
 			return 'yy';
 		return false;
 	}
@@ -159,11 +159,11 @@ 
 	public function getDayMonthYearOrdering()
 	{
 		$ordering = [];
-		if(is_int($day = strpos($this->pattern, 'd')))
+		if (is_int($day = strpos($this->pattern, 'd')))
 			$ordering['day'] = $day;
-		if(is_int($month = strpos($this->pattern, 'M')))
+		if (is_int($month = strpos($this->pattern, 'M')))
 			$ordering['month'] = $month;
-		if(is_int($year = strpos($this->pattern, 'yy')))
+		if (is_int($year = strpos($this->pattern, 'yy')))
 			$ordering['year'] = $year;
 		asort($ordering);
 		return array_keys($ordering);
@@ -176,7 +176,7 @@ 
 	 */
 	private function getDate($value)
 	{
-		if(is_numeric($value))
+		if (is_numeric($value))
 		{
 			$date = new \DateTime;
 			$date->setTimeStamp($value);
@@ -191,7 +191,7 @@ 
 	 */
 	public function isValidDate($value)
 	{
-		if($value === null) {
+		if ($value === null) {
 			return false;
 		} else {
 			return $this->parse($value, false) !== null;
@@ -206,16 +206,16 @@ 
 	 */
 	public function parse($value, $defaultToCurrentTime = true)
 	{
-		if(is_int($value) || is_float($value))
+		if (is_int($value) || is_float($value))
 			return $value;
-		elseif(!is_string($value))
+		elseif (!is_string($value))
 			throw new TInvalidDataValueException('date_to_parse_must_be_string', $value);
 
-		if(empty($this->pattern)) return time();
+		if (empty($this->pattern)) return time();
 
 		$date = time();
 
-		if($this->length(trim($value)) < 1)
+		if ($this->length(trim($value)) < 1)
 			return $defaultToCurrentTime ? $date : null;
 
 		$pattern = $this->pattern;
@@ -228,7 +228,7 @@ 
 		$x = null; $y = null;
 
 
-		if($defaultToCurrentTime)
+		if ($defaultToCurrentTime)
 		{
 			$year = "{$date['year']}";
 			$month = $date['mon'];
@@ -253,30 +253,30 @@ 
 
 			if ($token == 'yyyy' || $token == 'yy' || $token == 'y')
 			{
-				if ($token == 'yyyy') { $x = 4;$y = 4; }
-				if ($token == 'yy')   { $x = 2;$y = 2; }
-				if ($token == 'y')    { $x = 2;$y = 4; }
+				if ($token == 'yyyy') { $x = 4; $y = 4; }
+				if ($token == 'yy') { $x = 2; $y = 2; }
+				if ($token == 'y') { $x = 2; $y = 4; }
 				$year = $this->getInteger($value, $i_val, $x, $y);
-				if($year === null)
+				if ($year === null)
 					return null;
 					//throw new TInvalidDataValueException('Invalid year', $value);
 				$i_val += strlen($year);
-				if(strlen($year) == 2)
+				if (strlen($year) == 2)
 				{
-					$iYear = (int)$year;
-					if($iYear > 70)
+					$iYear = (int) $year;
+					if ($iYear > 70)
 						$year = $iYear + 1900;
 					else
 						$year = $iYear + 2000;
 				}
-				$year = (int)$year;
+				$year = (int) $year;
 			}
-			elseif($token == 'MM' || $token == 'M')
+			elseif ($token == 'MM' || $token == 'M')
 			{
-				$month = $this->getInteger($value,$i_val,
+				$month = $this->getInteger($value, $i_val,
 									$this->length($token), 2);
-				$iMonth = (int)$month;
-				if($month === null || $iMonth < 1 || $iMonth > 12)
+				$iMonth = (int) $month;
+				if ($month === null || $iMonth < 1 || $iMonth > 12)
 					return null;
 					//throw new TInvalidDataValueException('Invalid month', $value);
 				$i_val += strlen($month);
@@ -284,10 +284,10 @@ 
 			}
 			elseif ($token == 'dd' || $token == 'd')
 			{
-				$day = $this->getInteger($value,$i_val,
+				$day = $this->getInteger($value, $i_val,
 									$this->length($token), 2);
-				$iDay = (int)$day;
-				if($day === null || $iDay < 1 || $iDay > 31)
+				$iDay = (int) $day;
+				if ($day === null || $iDay < 1 || $iDay > 31)
 					return null;
 					//throw new TInvalidDataValueException('Invalid day', $value);
 				$i_val += strlen($day);
@@ -295,7 +295,7 @@ 
 			}
 			else
 			{
-				if($this->substring($value, $i_val, $this->length($token)) != $token)
+				if ($this->substring($value, $i_val, $this->length($token)) != $token)
 					return null;
 					//throw new TInvalidDataValueException("Subpattern '{$this->pattern}' mismatch", $value);
 				else
@@ -305,15 +305,15 @@ 
 		if ($i_val != $this->length($value))
 			return null;
 			//throw new TInvalidDataValueException("Pattern '{$this->pattern}' mismatch", $value);
-		if(!$defaultToCurrentTime && ($month === null || $day === null || $year === null))
+		if (!$defaultToCurrentTime && ($month === null || $day === null || $year === null))
 			return null;
 		else
 		{
-			if(empty($year)) {
+			if (empty($year)) {
 				$year = date('Y');
 			}
-			$day = (int)$day <= 0 ? 1 : (int)$day;
-			$month = (int)$month <= 0 ? 1 : (int)$month;
+			$day = (int) $day <= 0 ? 1 : (int) $day;
+			$month = (int) $month <= 0 ? 1 : (int) $month;
 
 			$s = new \DateTime;
 			$s->setDate($year, $month, $day);

Braces +80 added lines, -60 removed lines

@@ -127,44 +127,55 @@ 
 
 	public function getMonthPattern()
 	{
-		if(is_int(strpos($this->pattern, 'MMMM')))
-			return 'MMMM';
-		if(is_int(strpos($this->pattern, 'MMM')))
-			return 'MMM';
-		if(is_int(strpos($this->pattern, 'MM')))
-			return 'MM';
-		if(is_int(strpos($this->pattern, 'M')))
-			return 'M';
+		if(is_int(strpos($this->pattern, 'MMMM'))) {
+					return 'MMMM';
+		}
+		if(is_int(strpos($this->pattern, 'MMM'))) {
+					return 'MMM';
+		}
+		if(is_int(strpos($this->pattern, 'MM'))) {
+					return 'MM';
+		}
+		if(is_int(strpos($this->pattern, 'M'))) {
+					return 'M';
+		}
 		return false;
 	}
 
 	public function getDayPattern()
 	{
-		if(is_int(strpos($this->pattern, 'dd')))
-			return 'dd';
-		if(is_int(strpos($this->pattern, 'd')))
-			return 'd';
+		if(is_int(strpos($this->pattern, 'dd'))) {
+					return 'dd';
+		}
+		if(is_int(strpos($this->pattern, 'd'))) {
+					return 'd';
+		}
 		return false;
 	}
 
 	public function getYearPattern()
 	{
-		if(is_int(strpos($this->pattern, 'yyyy')))
-			return 'yyyy';
-		if(is_int(strpos($this->pattern, 'yy')))
-			return 'yy';
+		if(is_int(strpos($this->pattern, 'yyyy'))) {
+					return 'yyyy';
+		}
+		if(is_int(strpos($this->pattern, 'yy'))) {
+					return 'yy';
+		}
 		return false;
 	}
 
 	public function getDayMonthYearOrdering()
 	{
 		$ordering = [];
-		if(is_int($day = strpos($this->pattern, 'd')))
-			$ordering['day'] = $day;
-		if(is_int($month = strpos($this->pattern, 'M')))
-			$ordering['month'] = $month;
-		if(is_int($year = strpos($this->pattern, 'yy')))
-			$ordering['year'] = $year;
+		if(is_int($day = strpos($this->pattern, 'd'))) {
+					$ordering['day'] = $day;
+		}
+		if(is_int($month = strpos($this->pattern, 'M'))) {
+					$ordering['month'] = $month;
+		}
+		if(is_int($year = strpos($this->pattern, 'yy'))) {
+					$ordering['year'] = $year;
+		}
 		asort($ordering);
 		return array_keys($ordering);
 	}
@@ -206,17 +217,21 @@ 
 	 */
 	public function parse($value, $defaultToCurrentTime = true)
 	{
-		if(is_int($value) || is_float($value))
-			return $value;
-		elseif(!is_string($value))
-			throw new TInvalidDataValueException('date_to_parse_must_be_string', $value);
+		if(is_int($value) || is_float($value)) {
+					return $value;
+		} elseif(!is_string($value)) {
+					throw new TInvalidDataValueException('date_to_parse_must_be_string', $value);
+		}
 
-		if(empty($this->pattern)) return time();
+		if(empty($this->pattern)) {
+			return time();
+		}
 
 		$date = time();
 
-		if($this->length(trim($value)) < 1)
-			return $defaultToCurrentTime ? $date : null;
+		if($this->length(trim($value)) < 1) {
+					return $defaultToCurrentTime ? $date : null;
+		}
 
 		$pattern = $this->pattern;
 
@@ -233,8 +248,7 @@ 
 			$year = "{$date['year']}";
 			$month = $date['mon'];
 			$day = $date['mday'];
-		}
-		else
+		} else
 		{
 			$year = null;
 			$month = null;
@@ -257,57 +271,61 @@ 
 				if ($token == 'yy')   { $x = 2;$y = 2; }
 				if ($token == 'y')    { $x = 2;$y = 4; }
 				$year = $this->getInteger($value, $i_val, $x, $y);
-				if($year === null)
-					return null;
+				if($year === null) {
+									return null;
+				}
 					//throw new TInvalidDataValueException('Invalid year', $value);
 				$i_val += strlen($year);
 				if(strlen($year) == 2)
 				{
 					$iYear = (int)$year;
-					if($iYear > 70)
-						$year = $iYear + 1900;
-					else
-						$year = $iYear + 2000;
+					if($iYear > 70) {
+											$year = $iYear + 1900;
+					} else {
+											$year = $iYear + 2000;
+					}
 				}
 				$year = (int)$year;
-			}
-			elseif($token == 'MM' || $token == 'M')
+			} elseif($token == 'MM' || $token == 'M')
 			{
 				$month = $this->getInteger($value,$i_val,
 									$this->length($token), 2);
 				$iMonth = (int)$month;
-				if($month === null || $iMonth < 1 || $iMonth > 12)
-					return null;
+				if($month === null || $iMonth < 1 || $iMonth > 12) {
+									return null;
+				}
 					//throw new TInvalidDataValueException('Invalid month', $value);
 				$i_val += strlen($month);
 				$month = $iMonth;
-			}
-			elseif ($token == 'dd' || $token == 'd')
+			} elseif ($token == 'dd' || $token == 'd')
 			{
 				$day = $this->getInteger($value,$i_val,
 									$this->length($token), 2);
 				$iDay = (int)$day;
-				if($day === null || $iDay < 1 || $iDay > 31)
-					return null;
+				if($day === null || $iDay < 1 || $iDay > 31) {
+									return null;
+				}
 					//throw new TInvalidDataValueException('Invalid day', $value);
 				$i_val += strlen($day);
 				$day = $iDay;
-			}
-			else
+			} else
 			{
-				if($this->substring($value, $i_val, $this->length($token)) != $token)
-					return null;
+				if($this->substring($value, $i_val, $this->length($token)) != $token) {
+									return null;
+				}
 					//throw new TInvalidDataValueException("Subpattern '{$this->pattern}' mismatch", $value);
-				else
-					$i_val += $this->length($token);
+				else {
+									$i_val += $this->length($token);
+				}
 			}
 		}
-		if ($i_val != $this->length($value))
-			return null;
+		if ($i_val != $this->length($value)) {
+					return null;
+		}
 			//throw new TInvalidDataValueException("Pattern '{$this->pattern}' mismatch", $value);
-		if(!$defaultToCurrentTime && ($month === null || $day === null || $year === null))
-			return null;
-		else
+		if(!$defaultToCurrentTime && ($month === null || $day === null || $year === null)) {
+					return null;
+		} else
 		{
 			if(empty($year)) {
 				$year = date('Y');
@@ -369,10 +387,12 @@ 
 		for ($x = $maxlength; $x >= $minlength; $x--)
 		{
 			$token = $this->substring($str, $i, $x);
-			if ($this->length($token) < $minlength)
-				return null;
-			if (preg_match('/^\d+$/', $token))
-				return $token;
+			if ($this->length($token) < $minlength) {
+							return null;
+			}
+			if (preg_match('/^\d+$/', $token)) {
+							return $token;
+			}
 		}
 		return null;
 	}

framework/Util/TFirePhpLogRoute.php

Spacing +6 added lines, -6 removed lines

@@ -36,13 +36,13 @@ 
 
 	public function processLogs($logs)
 	{
-		if(empty($logs) || $this->getApplication()->getMode() === 'Performance')
+		if (empty($logs) || $this->getApplication()->getMode() === 'Performance')
 			return;
 
-		if(headers_sent()) {
+		if (headers_sent()) {
 			echo '
 				<div style="width:100%; background-color:darkred; color:#FFF; padding:2px">
-					TFirePhpLogRoute.GroupLabel "<i>' . $this -> getGroupLabel() . '</i>" -
+					TFirePhpLogRoute.GroupLabel "<i>' . $this -> getGroupLabel().'</i>" -
 					Routing to FirePHP impossible, because headers already sent!
 				</div>
 			';
@@ -58,7 +58,7 @@ 
 
 		$first = $logs[0][3];
 		$c = count($logs);
-		for($i = 0,$n = $c;$i < $n;++$i)
+		for ($i = 0, $n = $c; $i < $n; ++$i)
 		{
 			$message = $logs[$i][0];
 			$level = $logs[$i][1];
@@ -89,7 +89,7 @@ 
 	 */
 	protected static function translateLogLevel($level)
 	{
-		switch($level)
+		switch ($level)
 		{
 			case TLogger::INFO:
 				return FirePHP::INFO;
@@ -112,7 +112,7 @@ 
 	 */
 	public function getGroupLabel()
 	{
-		if($this->_groupLabel === null)
+		if ($this->_groupLabel === null)
 			$this->_groupLabel = self::DEFAULT_LABEL;
 
 		return $this->_groupLabel;

Braces +7 added lines, -6 removed lines

@@ -36,8 +36,9 @@ 
 
 	public function processLogs($logs)
 	{
-		if(empty($logs) || $this->getApplication()->getMode() === 'Performance')
-			return;
+		if(empty($logs) || $this->getApplication()->getMode() === 'Performance') {
+					return;
+		}
 
 		if(headers_sent()) {
 			echo '
@@ -68,8 +69,7 @@ 
 			{
 				$delta = $logs[$i + 1][3] - $logs[$i][3];
 				$total = $logs[$i + 1][3] - $first;
-			}
-			else
+			} else
 			{
 				$delta = '?';
 				$total = $logs[$i][3] - $first;
@@ -112,8 +112,9 @@ 
 	 */
 	public function getGroupLabel()
 	{
-		if($this->_groupLabel === null)
-			$this->_groupLabel = self::DEFAULT_LABEL;
+		if($this->_groupLabel === null) {
+					$this->_groupLabel = self::DEFAULT_LABEL;
+		}
 
 		return $this->_groupLabel;
 	}

framework/Util/TBrowserLogRoute.php

Spacing +11 added lines, -11 removed lines

@@ -32,12 +32,12 @@ 
 
 	public function processLogs($logs)
 	{
-		if(empty($logs) || $this->getApplication()->getMode() === 'Performance') return;
+		if (empty($logs) || $this->getApplication()->getMode() === 'Performance') return;
 		$first = $logs[0][3];
 		$even = true;
 		$response = $this->getApplication()->getResponse();
 		$response->write($this->renderHeader());
-		for($i = 0,$n = count($logs);$i < $n;++$i)
+		for ($i = 0, $n = count($logs); $i < $n; ++$i)
 		{
 			if ($i < $n - 1)
 			{
@@ -74,7 +74,7 @@ 
 	protected function renderHeader()
 	{
 		$string = '';
-		if($className = $this->getCssClass())
+		if ($className = $this->getCssClass())
 		{
 			$string = <<<EOD
 <table class="$className">
@@ -112,7 +112,7 @@ 
 		$delta = sprintf('%0.6f', $info['delta']);
 		$msg = preg_replace('/\(line[^\)]+\)$/', '', $log[0]); //remove line number info
 		$msg = THttpUtility::htmlEncode($msg);
-		if($this->getCssClass())
+		if ($this->getCssClass())
 		{
 			$colorCssClass = $log[1];
 			$messageCssClass = $info['even'] ? 'even' : 'odd';
@@ -145,7 +145,7 @@ 
 
 	protected function getColorLevel($level)
 	{
-		switch($level)
+		switch ($level)
 		{
 			case TLogger::DEBUG: return 'green';
 			case TLogger::INFO: return 'black';
@@ -161,21 +161,21 @@ 
 	protected function renderFooter()
 	{
 		$string = '';
-		if($this->getCssClass())
+		if ($this->getCssClass())
 		{
 			$string .= '<tr class="footer"><td colspan="5">';
-			foreach(self::$_levelValues as $name => $level)
+			foreach (self::$_levelValues as $name => $level)
 			{
-				$string .= '<span class="level' . $level . '">' . strtoupper($name) . "</span>";
+				$string .= '<span class="level'.$level.'">'.strtoupper($name)."</span>";
 			}
 		}
 		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)
+			foreach (self::$_levelValues as $name => $level)
 			{
-				$string .= "<span style=\"color:white; border:1px solid white; background-color:" . $this->getColorLevel($level);
-				$string .= ";margin: 0.5em; padding:0.01em;\">" . strtoupper($name) . "</span>";
+				$string .= "<span style=\"color:white; border:1px solid white; background-color:".$this->getColorLevel($level);
+				$string .= ";margin: 0.5em; padding:0.01em;\">".strtoupper($name)."</span>";
 			}
 		}
 		$string .= '</td></tr></table>';

Braces +7 added lines, -9 removed lines

@@ -32,7 +32,9 @@ 
 
 	public function processLogs($logs)
 	{
-		if(empty($logs) || $this->getApplication()->getMode() === 'Performance') return;
+		if(empty($logs) || $this->getApplication()->getMode() === 'Performance') {
+			return;
+		}
 		$first = $logs[0][3];
 		$even = true;
 		$response = $this->getApplication()->getResponse();
@@ -43,8 +45,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;
@@ -87,8 +88,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">
@@ -125,8 +125,7 @@ 
 		<td class="cumulatedtime">{$total}</td>
 	</tr>
 EOD;
-		}
-		else
+		} else
 		{
 			$bgcolor = $info['even'] ? "#fff" : "#eee";
 			$color = $this->getColorLevel($log[1]);
@@ -168,8 +167,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)

framework/Util/TParameterModule.php

Spacing +21 added lines, -21 removed lines

@@ -66,13 +66,13 @@ 
 	public function init($config)
 	{
 		$this->loadParameters($config);
-		if($this->_paramFile !== null)
+		if ($this->_paramFile !== null)
 		{
 			$configFile = null;
-			if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_XML && ($cache = $this->getApplication()->getCache()) !== null)
+			if ($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_XML && ($cache = $this->getApplication()->getCache()) !== null)
 			{
-				$cacheKey = 'TParameterModule:' . $this->_paramFile;
-				if(($configFile = $cache->get($cacheKey)) === false)
+				$cacheKey = 'TParameterModule:'.$this->_paramFile;
+				if (($configFile = $cache->get($cacheKey)) === false)
 				{
 					$configFile = new TXmlDocument;
 					$configFile->loadFromFile($this->_paramFile);
@@ -81,7 +81,7 @@ 
 			}
 			else
 			{
-				if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+				if ($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 				{
 					$configFile = include $this->_paramFile;
 				}
@@ -104,14 +104,14 @@ 
 	protected function loadParameters($config)
 	{
 		$parameters = [];
-		if(is_array($config))
+		if (is_array($config))
 		{
-			foreach($config as $id => $parameter)
+			foreach ($config as $id => $parameter)
 			{
-				if(is_array($parameter) && isset($parameter['class']))
+				if (is_array($parameter) && isset($parameter['class']))
 				{
-					$properties = isset($parameter['properties'])?$parameter['properties']:[];
-					$parameters[$id] = [$parameter['class'],$properties];
+					$properties = isset($parameter['properties']) ? $parameter['properties'] : [];
+					$parameters[$id] = [$parameter['class'], $properties];
 				}
 				else
 				{
@@ -119,32 +119,32 @@ 
 				}
 			}
 		}
-		elseif($config instanceof TXmlElement)
+		elseif ($config instanceof TXmlElement)
 		{
-			foreach($config->getElementsByTagName('parameter') as $node)
+			foreach ($config->getElementsByTagName('parameter') as $node)
 			{
 				$properties = $node->getAttributes();
-				if(($id = $properties->remove('id')) === null)
+				if (($id = $properties->remove('id')) === null)
 					throw new TConfigurationException('parametermodule_parameterid_required');
-				if(($type = $properties->remove('class')) === null)
+				if (($type = $properties->remove('class')) === null)
 				{
-					if(($value = $properties->remove('value')) === null)
+					if (($value = $properties->remove('value')) === null)
 						$parameters[$id] = $node;
 					else
 						$parameters[$id] = $value;
 				}
 				else
-					$parameters[$id] = [$type,$properties->toArray()];
+					$parameters[$id] = [$type, $properties->toArray()];
 			}
 		}
 
 		$appParams = $this->getApplication()->getParameters();
-		foreach($parameters as $id => $parameter)
+		foreach ($parameters as $id => $parameter)
 		{
-			if(is_array($parameter))
+			if (is_array($parameter))
 			{
 				$component = Prado::createComponent($parameter[0]);
-				foreach($parameter[1] as $name => $value)
+				foreach ($parameter[1] as $name => $value)
 					$component->setSubProperty($name, $value);
 				$appParams->add($id, $component);
 			}
@@ -169,9 +169,9 @@ 
 	 */
 	public function setParameterFile($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('parametermodule_parameterfile_unchangeable');
-		elseif(($this->_paramFile = Prado::getPathOfNamespace($value, $this->getApplication()->getConfigurationFileExt())) === null || !is_file($this->_paramFile))
+		elseif (($this->_paramFile = Prado::getPathOfNamespace($value, $this->getApplication()->getConfigurationFileExt())) === null || !is_file($this->_paramFile))
 			throw new TConfigurationException('parametermodule_parameterfile_invalid', $value);
 	}
 }

Braces +24 added lines, -24 removed lines

@@ -78,14 +78,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);
@@ -112,29 +110,29 @@ 
 				{
 					$properties = isset($parameter['properties'])?$parameter['properties']:[];
 					$parameters[$id] = [$parameter['class'],$properties];
-				}
-				else
+				} else
 				{
 					$parameters[$id] = $parameter;
 				}
 			}
-		}
-		elseif($config instanceof TXmlElement)
+		} elseif($config instanceof TXmlElement)
 		{
 			foreach($config->getElementsByTagName('parameter') as $node)
 			{
 				$properties = $node->getAttributes();
-				if(($id = $properties->remove('id')) === null)
-					throw new TConfigurationException('parametermodule_parameterid_required');
+				if(($id = $properties->remove('id')) === null) {
+									throw new TConfigurationException('parametermodule_parameterid_required');
+				}
 				if(($type = $properties->remove('class')) === null)
 				{
-					if(($value = $properties->remove('value')) === null)
-						$parameters[$id] = $node;
-					else
-						$parameters[$id] = $value;
+					if(($value = $properties->remove('value')) === null) {
+											$parameters[$id] = $node;
+					} else {
+											$parameters[$id] = $value;
+					}
+				} else {
+									$parameters[$id] = [$type,$properties->toArray()];
 				}
-				else
-					$parameters[$id] = [$type,$properties->toArray()];
 			}
 		}
 
@@ -144,12 +142,13 @@ 
 			if(is_array($parameter))
 			{
 				$component = Prado::createComponent($parameter[0]);
-				foreach($parameter[1] as $name => $value)
-					$component->setSubProperty($name, $value);
+				foreach($parameter[1] as $name => $value) {
+									$component->setSubProperty($name, $value);
+				}
 				$appParams->add($id, $component);
+			} else {
+							$appParams->add($id, $parameter);
 			}
-			else
-				$appParams->add($id, $parameter);
 		}
 	}
 
@@ -169,10 +168,11 @@ 
 	 */
 	public function setParameterFile($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('parametermodule_parameterfile_unchangeable');
-		elseif(($this->_paramFile = Prado::getPathOfNamespace($value, $this->getApplication()->getConfigurationFileExt())) === null || !is_file($this->_paramFile))
-			throw new TConfigurationException('parametermodule_parameterfile_invalid', $value);
+		if($this->_initialized) {
+					throw new TInvalidOperationException('parametermodule_parameterfile_unchangeable');
+		} elseif(($this->_paramFile = Prado::getPathOfNamespace($value, $this->getApplication()->getConfigurationFileExt())) === null || !is_file($this->_paramFile)) {
+					throw new TConfigurationException('parametermodule_parameterfile_invalid', $value);
+		}
 	}
 }
 

framework/Util/TDbLogRoute.php

Spacing +14 added lines, -14 removed lines

@@ -67,7 +67,7 @@ 
 	 */
 	public function __destruct()
 	{
-		if($this->_db !== null)
+		if ($this->_db !== null)
 			$this->_db->setActive(false);
 	}
 
@@ -83,15 +83,15 @@ 
 		$db = $this->getDbConnection();
 		$db->setActive(true);
 
-		$sql = 'SELECT * FROM ' . $this->_logTable . ' WHERE 0=1';
+		$sql = 'SELECT * FROM '.$this->_logTable.' WHERE 0=1';
 		try
 		{
 			$db->createCommand($sql)->query()->close();
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			// DB table not exists
-			if($this->_autoCreate)
+			if ($this->_autoCreate)
 				$this->createDbTable();
 			else
 				throw new TConfigurationException('db_logtable_inexistent', $this->_logTable);
@@ -106,9 +106,9 @@ 
 	 */
 	protected function processLogs($logs)
 	{
-		$sql = 'INSERT INTO ' . $this->_logTable . '(level, category, logtime, message) VALUES (:level, :category, :logtime, :message)';
+		$sql = 'INSERT INTO '.$this->_logTable.'(level, category, logtime, message) VALUES (:level, :category, :logtime, :message)';
 		$command = $this->getDbConnection()->createCommand($sql);
-		foreach($logs as $log)
+		foreach ($logs as $log)
 		{
 			$command->bindValue(':message', $log[0]);
 			$command->bindValue(':level', $log[1]);
@@ -127,11 +127,11 @@ 
 		$db = $this->getDbConnection();
 		$driver = $db->getDriverName();
 		$autoidAttributes = '';
-		if($driver === 'mysql')
+		if ($driver === 'mysql')
 			$autoidAttributes = 'AUTO_INCREMENT';
 
-		$sql = 'CREATE TABLE ' . $this->_logTable . ' (
-			log_id INTEGER NOT NULL PRIMARY KEY ' . $autoidAttributes . ',
+		$sql = 'CREATE TABLE '.$this->_logTable.' (
+			log_id INTEGER NOT NULL PRIMARY KEY ' . $autoidAttributes.',
 			level INTEGER,
 			category VARCHAR(128),
 			logtime VARCHAR(20),
@@ -147,10 +147,10 @@ 
 	 */
 	protected function createDbConnection()
 	{
-		if($this->_connID !== '')
+		if ($this->_connID !== '')
 		{
 			$config = $this->getApplication()->getModule($this->_connID);
-			if($config instanceof TDataSourceConfig)
+			if ($config instanceof TDataSourceConfig)
 				return $config->getDbConnection();
 			else
 				throw new TConfigurationException('dblogroute_connectionid_invalid', $this->_connID);
@@ -159,8 +159,8 @@ 
 		{
 			$db = new TDbConnection;
 			// default to SQLite3 database
-			$dbFile = $this->getApplication()->getRuntimePath() . '/sqlite3.log';
-			$db->setConnectionString('sqlite:' . $dbFile);
+			$dbFile = $this->getApplication()->getRuntimePath().'/sqlite3.log';
+			$db->setConnectionString('sqlite:'.$dbFile);
 			return $db;
 		}
 	}
@@ -170,7 +170,7 @@ 
 	 */
 	public function getDbConnection()
 	{
-		if($this->_db === null)
+		if ($this->_db === null)
 			$this->_db = $this->createDbConnection();
 		return $this->_db;
 	}

Braces +21 added lines, -18 removed lines

@@ -67,8 +67,9 @@ 
 	 */
 	public function __destruct()
 	{
-		if($this->_db !== null)
-			$this->_db->setActive(false);
+		if($this->_db !== null) {
+					$this->_db->setActive(false);
+		}
 	}
 
 	/**
@@ -87,14 +88,14 @@ 
 		try
 		{
 			$db->createCommand($sql)->query()->close();
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			// DB table not exists
-			if($this->_autoCreate)
-				$this->createDbTable();
-			else
-				throw new TConfigurationException('db_logtable_inexistent', $this->_logTable);
+			if($this->_autoCreate) {
+							$this->createDbTable();
+			} else {
+							throw new TConfigurationException('db_logtable_inexistent', $this->_logTable);
+			}
 		}
 
 		parent::init($config);
@@ -127,8 +128,9 @@ 
 		$db = $this->getDbConnection();
 		$driver = $db->getDriverName();
 		$autoidAttributes = '';
-		if($driver === 'mysql')
-			$autoidAttributes = 'AUTO_INCREMENT';
+		if($driver === 'mysql') {
+					$autoidAttributes = 'AUTO_INCREMENT';
+		}
 
 		$sql = 'CREATE TABLE ' . $this->_logTable . ' (
 			log_id INTEGER NOT NULL PRIMARY KEY ' . $autoidAttributes . ',
@@ -150,12 +152,12 @@ 
 		if($this->_connID !== '')
 		{
 			$config = $this->getApplication()->getModule($this->_connID);
-			if($config instanceof TDataSourceConfig)
-				return $config->getDbConnection();
-			else
-				throw new TConfigurationException('dblogroute_connectionid_invalid', $this->_connID);
-		}
-		else
+			if($config instanceof TDataSourceConfig) {
+							return $config->getDbConnection();
+			} else {
+							throw new TConfigurationException('dblogroute_connectionid_invalid', $this->_connID);
+			}
+		} else
 		{
 			$db = new TDbConnection;
 			// default to SQLite3 database
@@ -170,8 +172,9 @@ 
 	 */
 	public function getDbConnection()
 	{
-		if($this->_db === null)
-			$this->_db = $this->createDbConnection();
+		if($this->_db === null) {
+					$this->_db = $this->createDbConnection();
+		}
 		return $this->_db;
 	}
 

framework/IO/TTarFileExtractor.php

Spacing +21 added lines, -21 removed lines

@@ -144,16 +144,16 @@ 
 
 		  // ----- Look if a local copy need to be done
 		  if ($this->_temp_tarname == '') {
-			  $this->_temp_tarname = uniqid('tar') . '.tmp';
+			  $this->_temp_tarname = uniqid('tar').'.tmp';
 			  if (!$v_file_from = @fopen($this->_tarname, 'rb')) {
 				$this->_error('Unable to open in read mode \''
-							  . $this->_tarname . '\'');
+							  . $this->_tarname.'\'');
 				$this->_temp_tarname = '';
 				return false;
 			  }
 			  if (!$v_file_to = @fopen($this->_temp_tarname, 'wb')) {
 				$this->_error('Unable to open in write mode \''
-							  . $this->_temp_tarname . '\'');
+							  . $this->_temp_tarname.'\'');
 				$this->_temp_tarname = '';
 				return false;
 			  }
@@ -173,7 +173,7 @@ 
 		$this->_file = @fopen($v_filename, "rb");
 
 		if ($this->_file == 0) {
-			$this->_error('Unable to open in read mode \'' . $v_filename . '\'');
+			$this->_error('Unable to open in read mode \''.$v_filename.'\'');
 			return false;
 		}
 
@@ -246,7 +246,7 @@ 
 
 		if (strlen($v_binary_data) != 512) {
 			$v_header['filename'] = '';
-			$this->_error('Invalid block size : ' . strlen($v_binary_data));
+			$this->_error('Invalid block size : '.strlen($v_binary_data));
 			return false;
 		}
 
@@ -276,9 +276,9 @@ 
 			if (($v_checksum == 256) && ($v_header['checksum'] == 0))
 				return true;
 
-			$this->_error('Invalid checksum for file "' . $v_data['filename']
-						  . '" : ' . $v_checksum . ' calculated, '
-						  . $v_header['checksum'] . ' expected');
+			$this->_error('Invalid checksum for file "'.$v_data['filename']
+						  . '" : '.$v_checksum.' calculated, '
+						  . $v_header['checksum'].' expected');
 			return false;
 		}
 
@@ -330,7 +330,7 @@ 
 	$p_path = $this->_translateWinPath($p_path, false);
 	if ($p_path == '' || (substr($p_path, 0, 1) != '/'
 		&& substr($p_path, 0, 3) != "../" && !strpos($p_path, ':'))) {
-	  $p_path = "./" . $p_path;
+	  $p_path = "./".$p_path;
 	}
 	$p_remove_path = $this->_translateWinPath($p_remove_path);
 
@@ -353,7 +353,7 @@ 
 		  $v_listing = true;
 	  break;
 	  default :
-		$this->_error('Invalid extract mode (' . $p_mode . ')');
+		$this->_error('Invalid extract mode ('.$p_mode.')');
 		return false;
 	}
 
@@ -416,25 +416,25 @@ 
 			$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'];
+			  $v_header['filename'] = $p_path.$v_header['filename'];
 		  else
-			$v_header['filename'] = $p_path . '/' . $v_header['filename'];
+			$v_header['filename'] = $p_path.'/'.$v_header['filename'];
 		}
 		if (file_exists($v_header['filename'])) {
 		  if ((@is_dir($v_header['filename']))
 			  && ($v_header['typeflag'] == '')) {
-			$this->_error('File ' . $v_header['filename']
+			$this->_error('File '.$v_header['filename']
 						  . ' already exists as a directory');
 			return false;
 		  }
 		  if (($this->_isArchive($v_header['filename']))
 			  && ($v_header['typeflag'] == "5")) {
-			$this->_error('Directory ' . $v_header['filename']
+			$this->_error('Directory '.$v_header['filename']
 						  . ' already exists as a file');
 			return false;
 		  }
 		  if (!is_writable($v_header['filename'])) {
-			$this->_error('File ' . $v_header['filename']
+			$this->_error('File '.$v_header['filename']
 						  . ' already exists and is write protected');
 			return false;
 		  }
@@ -446,9 +446,9 @@ 
 		// ----- Check the directory availability and create it if necessary
 		elseif (($v_result
 				 = $this->_dirCheck(($v_header['typeflag'] == "5"
-									?$v_header['filename']
+									? $v_header['filename']
 									:dirname($v_header['filename'])))) != 1) {
-			$this->_error('Unable to create path for ' . $v_header['filename']);
+			$this->_error('Unable to create path for '.$v_header['filename']);
 			return false;
 		}
 
@@ -457,14 +457,14 @@ 
 			if (!@file_exists($v_header['filename'])) {
 				if (!@mkdir($v_header['filename'], PRADO_CHMOD)) {
 					$this->_error('Unable to create directory {'
-								  . $v_header['filename'] . '}');
+								  . $v_header['filename'].'}');
 					return false;
 				}
 				chmod($v_header['filename'], PRADO_CHMOD);
 			}
 		  } else {
 			  if (($v_dest_file = @fopen($v_header['filename'], "wb")) == 0) {
-				  $this->_error('Error while opening {' . $v_header['filename']
+				  $this->_error('Error while opening {'.$v_header['filename']
 								. '} in write binary mode');
 				  return false;
 			  } else {
@@ -489,10 +489,10 @@ 
 		  // ----- Check the file size
 		  clearstatcache();
 		  if (filesize($v_header['filename']) != $v_header['size']) {
-			  $this->_error('Extracted file ' . $v_header['filename']
+			  $this->_error('Extracted file '.$v_header['filename']
 							. ' does not have the correct file size \''
 							. filesize($v_header['filename'])
-							. '\' (' . $v_header['size']
+							. '\' ('.$v_header['size']
 							. ' expected). Archive may be corrupted.');
 			  return false;
 		  }

Braces +59 added lines, -40 removed lines

@@ -69,8 +69,9 @@ 
 	{
 		$this->_close();
 		// ----- Look for a local copy to delete
-		if ($this->_temp_tarname != '')
-			@unlink($this->_temp_tarname);
+		if ($this->_temp_tarname != '') {
+					@unlink($this->_temp_tarname);
+		}
 	}
 
 	public function extract($p_path = '')
@@ -157,8 +158,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);
 		  }
@@ -166,9 +168,10 @@ 
 		  // ----- File to open if the local copy
 		  $v_filename = $this->_temp_tarname;
 
-		} else
-		  // ----- File to open if the normal Tar file
+		} else {
+				  // ----- File to open if the normal Tar file
 		  $v_filename = $this->_tarname;
+		}
 
 		$this->_file = @fopen($v_filename, "rb");
 
@@ -229,8 +232,9 @@ 
 	private function _jumpBlock($p_len = null)
 	{
 	  if (is_resource($this->_file)) {
-		  if ($p_len === null)
-			  $p_len = 1;
+		  if ($p_len === null) {
+		  			  $p_len = 1;
+		  }
 
 			  @fseek($this->_file, @ftell($this->_file) + ($p_len * 512));
 	  }
@@ -253,14 +257,17 @@ 
 		// ----- Calculate the checksum
 		$v_checksum = 0;
 		// ..... First part of the header
-		for ($i = 0; $i < 148; $i++)
-			$v_checksum += ord(substr($v_binary_data, $i, 1));
+		for ($i = 0; $i < 148; $i++) {
+					$v_checksum += ord(substr($v_binary_data, $i, 1));
+		}
 		// ..... Ignore the checksum value and replace it by ' ' (space)
-		for ($i = 148; $i < 156; $i++)
-			$v_checksum += ord(' ');
+		for ($i = 148; $i < 156; $i++) {
+					$v_checksum += ord(' ');
+		}
 		// ..... Last part of the header
-		for ($i = 156; $i < 512; $i++)
-		   $v_checksum += ord(substr($v_binary_data, $i, 1));
+		for ($i = 156; $i < 512; $i++) {
+				   $v_checksum += ord(substr($v_binary_data, $i, 1));
+		}
 
 		$v_data = unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/"
 						 . "a8checksum/a1typeflag/a100link/a6magic/a2version/"
@@ -273,8 +280,9 @@ 
 			$v_header['filename'] = '';
 
 			// ----- Look for last block (empty block)
-			if (($v_checksum == 256) && ($v_header['checksum'] == 0))
-				return true;
+			if (($v_checksum == 256) && ($v_header['checksum'] == 0)) {
+							return true;
+			}
 
 			$this->_error('Invalid checksum for file "' . $v_data['filename']
 						  . '" : ' . $v_checksum . ' calculated, '
@@ -311,8 +319,9 @@ 
 	  // ----- Read the next header
 	  $v_binary_data = $this->_readBlock();
 
-	  if (!$this->_readHeader($v_binary_data, $v_header))
-		return false;
+	  if (!$this->_readHeader($v_binary_data, $v_header)) {
+	  		return false;
+	  }
 
 	  $v_header['filename'] = $v_filename;
 
@@ -335,8 +344,9 @@ 
 	$p_remove_path = $this->_translateWinPath($p_remove_path);
 
 	// ----- Look for path to remove format (should end by /)
-	if (($p_remove_path != '') && (substr($p_remove_path, -1) != '/'))
-	  $p_remove_path .= '/';
+	if (($p_remove_path != '') && (substr($p_remove_path, -1) != '/')) {
+		  $p_remove_path .= '/';
+	}
 	$p_remove_path_size = strlen($p_remove_path);
 
 	switch ($p_mode) {
@@ -364,8 +374,9 @@ 
 	  $v_extract_file = false;
 	  $v_extraction_stopped = 0;
 
-	  if (!$this->_readHeader($v_binary_data, $v_header))
-		return false;
+	  if (!$this->_readHeader($v_binary_data, $v_header)) {
+	  		return false;
+	  }
 
 	  if ($v_header['filename'] == '') {
 		continue;
@@ -373,8 +384,9 @@ 
 
 	  // ----- Look for long filename
 	  if ($v_header['typeflag'] == 'L') {
-		if (!$this->_readLongHeader($v_header))
-		  return false;
+		if (!$this->_readLongHeader($v_header)) {
+				  return false;
+		}
 	  }
 
 	  if ((!$v_extract_all) && (is_array($p_file_list))) {
@@ -408,17 +420,20 @@ 
 	  {
 		if (($p_remove_path != '')
 			&& (substr($v_header['filename'], 0, $p_remove_path_size)
-				== $p_remove_path))
-		  $v_header['filename'] = substr($v_header['filename'],
+				== $p_remove_path)) {
+				  $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'];
-		  else
-			$v_header['filename'] = $p_path . '/' . $v_header['filename'];
+		  if (substr($v_header['filename'], 0, 1) == '/') {
+		  			  $v_header['filename'] = $p_path . $v_header['filename'];
+		  } else {
+		  			$v_header['filename'] = $p_path . '/' . $v_header['filename'];
+		  }
 		}
 		if (file_exists($v_header['filename'])) {
 		  if ((@is_dir($v_header['filename']))
@@ -514,10 +529,12 @@ 
 	  if ($v_listing || $v_extract_file || $v_extraction_stopped) {
 		// ----- Log extracted files
 		if (($v_file_dir = dirname($v_header['filename']))
-			== $v_header['filename'])
-		  $v_file_dir = '';
-		if ((substr($v_header['filename'], 0, 1) == '/') && ($v_file_dir == ''))
-		  $v_file_dir = '/';
+			== $v_header['filename']) {
+				  $v_file_dir = '';
+		}
+		if ((substr($v_header['filename'], 0, 1) == '/') && ($v_file_dir == '')) {
+				  $v_file_dir = '/';
+		}
 
 		$p_list_detail[$v_nb++] = $v_header;
 	  }
@@ -536,15 +553,17 @@ 
 	 */
 	protected function _dirCheck($p_dir)
 	{
-		if ((@is_dir($p_dir)) || ($p_dir == ''))
-			return true;
+		if ((@is_dir($p_dir)) || ($p_dir == '')) {
+					return true;
+		}
 
 		$p_parent_dir = dirname($p_dir);
 
 		if (($p_parent_dir != $p_dir) &&
 			($p_parent_dir != '') &&
-			(!$this->_dirCheck($p_parent_dir)))
-			 return false;
+			(!$this->_dirCheck($p_parent_dir))) {
+					 return false;
+		}
 
 		if (!@mkdir($p_dir, PRADO_CHMOD)) {
 			$this->_error("Unable to create directory '$p_dir'");