pradosoft / prado

framework/Security/TAuthManager.php

Indentation +1 added lines, -1 removed lines

@@ -289,7 +289,7 @@
 
 		// check for authentication expiration
 		$isAuthExpired = $this->_authExpire>0 && !$user->getIsGuest() &&
-        ($expiretime=$session->itemAt('AuthExpireTime')) && $expiretime<time();
+		($expiretime=$session->itemAt('AuthExpireTime')) && $expiretime<time();
 
 		// try authenticating through cookie if possible
 		if($this->getAllowAutoLogin() && ($user->getIsGuest() || $isAuthExpired))

Braces +1 added lines, -2 removed lines

@@ -430,8 +430,7 @@
 				$this->getResponse()->getCookies()->add($cookie);
 			}
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 

framework/I18N/core/DateFormat.php

Indentation +20 added lines, -20 removed lines

@@ -79,7 +79,7 @@ 
 
 	/**
 	 * The DateTimeFormatInfo, containing culture specific patterns and names.
- 	 * @var DateTimeFormatInfo
+	 * @var DateTimeFormatInfo
 	 */
 	protected $formatInfo;
 
@@ -308,8 +308,8 @@ 
 
 	/**
 	 * Get the year.
- 	 * "yy" will return the last two digits of year.
- 	 * "yyyy" will return the full integer year.
+	 * "yy" will return the last two digits of year.
+	 * "yyyy" will return the full integer year.
 	 * @param array getdate format.
 	 * @param string a pattern.
 	 * @return string year
@@ -330,10 +330,10 @@ 
 
 	/**
 	 * Get the month.
- 	 * "M" will return integer 1 through 12
- 	 * "MM" will return the narrow month name, e.g. "J"
- 	 * "MMM" will return the abrreviated month name, e.g. "Jan"
- 	 * "MMMM" will return the month name, e.g. "January"
+	 * "M" will return integer 1 through 12
+	 * "MM" will return the narrow month name, e.g. "J"
+	 * "MMM" will return the abrreviated month name, e.g. "Jan"
+	 * "MMMM" will return the month name, e.g. "January"
 	 * @param array getdate format.
 	 * @param string a pattern.
 	 * @return string month name
@@ -361,10 +361,10 @@ 
 
 	/**
 	 * Get the day of the week.
- 	 * "E" will return integer 0 (for Sunday) through 6 (for Saturday).
- 	 * "EE" will return the narrow day of the week, e.g. "M"
- 	 * "EEE" will return the abrreviated day of the week, e.g. "Mon"
- 	 * "EEEE" will return the day of the week, e.g. "Monday"
+	 * "E" will return integer 0 (for Sunday) through 6 (for Saturday).
+	 * "EE" will return the narrow day of the week, e.g. "M"
+	 * "EEE" will return the abrreviated day of the week, e.g. "Mon"
+	 * "EEEE" will return the day of the week, e.g. "Monday"
 	 * @param array getdate format.
 	 * @param string a pattern.
 	 * @return string day of the week.
@@ -394,7 +394,7 @@ 
 
 	/**
 	 * Get the day of the month.
- 	 * "d" for non-padding, "dd" will always return 2 characters.
+	 * "d" for non-padding, "dd" will always return 2 characters.
 	 * @param array getdate format.
 	 * @param string a pattern.
 	 * @return string day of the month
@@ -581,14 +581,14 @@ 
 	protected function getDayInMonth($date, $pattern='FF')
 	{
 		switch ($pattern) {
-		    case 'F':
-		      return @date('j', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
-		      break;
-		    case 'FF':
-		      return @date('d', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
-		      break;
-		    default:
-		      throw new Exception('The pattern for day in month is "F" or "FF".');
+			case 'F':
+			  return @date('j', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
+			  break;
+			case 'FF':
+			  return @date('d', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
+			  break;
+			default:
+			  throw new Exception('The pattern for day in month is "F" or "FF".');
 		}
 	}
 

Braces +4 added lines, -8 removed lines

@@ -134,12 +134,10 @@ 
 			{
 				$sub = preg_replace('/(^\')|(\'$)/','',$pattern);
 				$tokens[$i] =  str_replace('``````','\'',$sub);
-			}
-			else if($pattern == '``````')
+			} else if($pattern == '``````')
 			{
 				$tokens[$i] = '\'';
-			}
-			else
+			} else
 			{
 				$function = $this->getFunctionName($pattern);
 				if($function != null)
@@ -149,8 +147,7 @@ 
 					{
 						$rs = $this->$fName($date, $pattern);
 						$tokens[$i] = $rs;
-					}
-					else
+					} else
 						throw new
 						Exception('function '.$function.' not found.');
 				}
@@ -285,8 +282,7 @@ 
 			if($char==null || $pattern{$i} == $char || $text)
 			{
 				$token .= $pattern{$i};
-			}
-			else
+			} else
 			{
 				$tokens[] = str_replace("","'",$token);
 				$token = $pattern{$i};

framework/I18N/core/NumberFormat.php

Indentation +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
 
 	/**
 	 * The DateTimeFormatInfo, containing culture specific patterns and names.
- 	 * @var DateTimeFormatInfo
+	 * @var DateTimeFormatInfo
 	 */
 	protected $formatInfo;
 
@@ -116,7 +116,7 @@ 
 	function format($number, $pattern='d', $currency='USD', $charset='UTF-8')
 	{
 		$oldLocale=setLocale(LC_NUMERIC, '0');
-	    setlocale(LC_NUMERIC, 'C');
+		setlocale(LC_NUMERIC, 'C');
 
 		$this->setPattern($pattern);
 

Braces +7 added lines, -14 removed lines

@@ -203,16 +203,14 @@ 
 						$integer = $groupSeparator . $integer;
 						$count++;
 					}
-				}
-				else if($multiGroup && $count >= 1)
+				} else if($multiGroup && $count >= 1)
 				{
 					if($i != 0 && ($i-$groupSize[0])%$groupSize[1] == 0)
 					{
 						$integer = $groupSeparator . $integer;
 						$count++;
 					}
-				}
-				else
+				} else
 				{
 					if($i != 0 && $i%$groupSize[0] == 0)
 					{
@@ -223,8 +221,7 @@ 
 
 				$integer = $char . $integer;
 			}
-		}
-		else
+		} else
 			$integer = $string;
 
 		return $integer;
@@ -250,27 +247,23 @@ 
 			if($decimalDigits == -1)
 			{
 				$decimal = substr($string, $dp+1);
-			}
-			else if(is_int($decimalDigits))
+			} else if(is_int($decimalDigits))
 			{
 				$float = round((float)$string, $decimalDigits);
 				if(strpos((string)$float, '.') === false)
 				{
 					$decimal = str_pad($decimal,$decimalDigits,'0');
-				}
-				else
+				} else
 				{
 					$decimal = substr($float, strpos($float,'.')+1);
 					if(strlen($decimal)<$decimalDigits)
 						$decimal = str_pad($decimal,$decimalDigits,'0');
 				}
-			}
-			else
+			} else
 				return $decimal;
 
 			return $decimalSeparator.$decimal;
-		}
-		else if ($decimalDigits > 0)
+		} else if ($decimalDigits > 0)
 			return $decimalSeparator.str_pad($decimal,$decimalDigits,'0');
 
 		return $decimal;

framework/I18N/core/MessageSource_XLIFF.php

Indentation +1 added lines, -1 removed lines

@@ -290,7 +290,7 @@
 
 		//find the body element
 		$xpath = new DomXPath($dom);
-    	$body = $xpath->query('//body')->item(0);
+		$body = $xpath->query('//body')->item(0);
 
 		$lastNodes = $xpath->query('//trans-unit[last()]');
 		if(($last=$lastNodes->item(0))!==null) {

framework/I18N/core/CultureInfo.php

Indentation +3 added lines, -3 removed lines

@@ -199,9 +199,9 @@
 	}
 
 	/**
-	* Gets the CultureInfo that for this culture string
-	* @return CultureInfo invariant culture info is "en".
-	*/
+	 * Gets the CultureInfo that for this culture string
+	 * @return CultureInfo invariant culture info is "en".
+	 */
 	public static function getInstance($culture)
 	{
 		static $instances = array();

framework/I18N/core/Gettext/TGettext.php

Indentation +209 added lines, -209 removed lines

@@ -58,229 +58,229 @@
  */
 class TGettext
 {
-    /**
-     * strings
-     *
-     * associative array with all [msgid => msgstr] entries
-     *
-     * @access  protected
-     * @var     array
-    */
-    protected $strings = array();
+	/**
+	 * strings
+	 *
+	 * associative array with all [msgid => msgstr] entries
+	 *
+	 * @access  protected
+	 * @var     array
+	 */
+	protected $strings = array();
 
-    /**
-     * meta
-     *
-     * associative array containing meta
-     * information like project name or content type
-     *
-     * @access  protected
-     * @var     array
-     */
-    protected $meta = array();
+	/**
+	 * meta
+	 *
+	 * associative array containing meta
+	 * information like project name or content type
+	 *
+	 * @access  protected
+	 * @var     array
+	 */
+	protected $meta = array();
 
-    /**
-     * file path
-     *
-     * @access  protected
-     * @var     string
-     */
-    protected $file = '';
+	/**
+	 * file path
+	 *
+	 * @access  protected
+	 * @var     string
+	 */
+	protected $file = '';
 
-    /**
-     * Factory
-     *
-     * @static
-     * @access  public
-     * @return  object  Returns File_Gettext_PO or File_Gettext_MO on success
-     *                  or PEAR_Error on failure.
-     * @param   string  $format MO or PO
-     * @param   string  $file   path to GNU gettext file
-     */
-    static function factory($format, $file = '')
-    {
-        $format = strToUpper($format);
-        $filename = dirname(__FILE__).'/'.$format.'.php';
-        if(is_file($filename) == false)
-        	throw new Exception ("Class file $file not found");
+	/**
+	 * Factory
+	 *
+	 * @static
+	 * @access  public
+	 * @return  object  Returns File_Gettext_PO or File_Gettext_MO on success
+	 *                  or PEAR_Error on failure.
+	 * @param   string  $format MO or PO
+	 * @param   string  $file   path to GNU gettext file
+	 */
+	static function factory($format, $file = '')
+	{
+		$format = strToUpper($format);
+		$filename = dirname(__FILE__).'/'.$format.'.php';
+		if(is_file($filename) == false)
+			throw new Exception ("Class file $file not found");
 
-        include_once $filename;
-        $class = 'TGettext_' . $format;
+		include_once $filename;
+		$class = 'TGettext_' . $format;
 
-        return new $class($file);
-    }
+		return new $class($file);
+	}
 
-    /**
-     * poFile2moFile
-     *
-     * That's a simple fake of the 'msgfmt' console command.  It reads the
-     * contents of a GNU PO file and saves them to a GNU MO file.
-     *
-     * @static
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   string  $pofile path to GNU PO file
-     * @param   string  $mofile path to GNU MO file
-     */
-    static function poFile2moFile($pofile, $mofile)
-    {
-        if (!is_file($pofile)) {
-            throw new Exception("File $pofile doesn't exist.");
-        }
+	/**
+	 * poFile2moFile
+	 *
+	 * That's a simple fake of the 'msgfmt' console command.  It reads the
+	 * contents of a GNU PO file and saves them to a GNU MO file.
+	 *
+	 * @static
+	 * @access  public
+	 * @return  mixed   Returns true on success or PEAR_Error on failure.
+	 * @param   string  $pofile path to GNU PO file
+	 * @param   string  $mofile path to GNU MO file
+	 */
+	static function poFile2moFile($pofile, $mofile)
+	{
+		if (!is_file($pofile)) {
+			throw new Exception("File $pofile doesn't exist.");
+		}
 
-        include_once dirname(__FILE__).'/PO.php';
+		include_once dirname(__FILE__).'/PO.php';
 
-        $PO = new TGettext_PO($pofile);
-        if (true !== ($e = $PO->load())) {
-            return $e;
-        }
+		$PO = new TGettext_PO($pofile);
+		if (true !== ($e = $PO->load())) {
+			return $e;
+		}
 
-        $MO = $PO->toMO();
-        if (true !== ($e = $MO->save($mofile))) {
-            return $e;
-        }
-        unset($PO, $MO);
+		$MO = $PO->toMO();
+		if (true !== ($e = $MO->save($mofile))) {
+			return $e;
+		}
+		unset($PO, $MO);
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * prepare
-     *
-     * @static
-     * @access  protected
-     * @return  string
-     * @param   string  $string
-     * @param   bool    $reverse
-     */
-    static function prepare($string, $reverse = false)
-    {
-        if ($reverse) {
-            $smap = array('"', "\n", "\t", "\r");
-            $rmap = array('\"', '\\n"' . "\n" . '"', '\\t', '\\r');
-            return (string) str_replace($smap, $rmap, $string);
-        } else {
-        	$string = preg_replace('/"\s+"/', '', $string);
-            $smap = array('\\n', '\\r', '\\t', '\"');
-            $rmap = array("\n", "\r", "\t", '"');
-            return (string) str_replace($smap, $rmap, $string);
-        }
-    }
+	/**
+	 * prepare
+	 *
+	 * @static
+	 * @access  protected
+	 * @return  string
+	 * @param   string  $string
+	 * @param   bool    $reverse
+	 */
+	static function prepare($string, $reverse = false)
+	{
+		if ($reverse) {
+			$smap = array('"', "\n", "\t", "\r");
+			$rmap = array('\"', '\\n"' . "\n" . '"', '\\t', '\\r');
+			return (string) str_replace($smap, $rmap, $string);
+		} else {
+			$string = preg_replace('/"\s+"/', '', $string);
+			$smap = array('\\n', '\\r', '\\t', '\"');
+			$rmap = array("\n", "\r", "\t", '"');
+			return (string) str_replace($smap, $rmap, $string);
+		}
+	}
 
-    /**
-     * meta2array
-     *
-     * @static
-     * @access  public
-     * @return  array
-     * @param   string  $meta
-     */
-    static function meta2array($meta)
-    {
-        $array = array();
-        foreach (explode("\n", $meta) as $info) {
-            if ($info = trim($info)) {
-                list($key, $value) = explode(':', $info, 2);
-                $array[trim($key)] = trim($value);
-            }
-        }
-        return $array;
-    }
+	/**
+	 * meta2array
+	 *
+	 * @static
+	 * @access  public
+	 * @return  array
+	 * @param   string  $meta
+	 */
+	static function meta2array($meta)
+	{
+		$array = array();
+		foreach (explode("\n", $meta) as $info) {
+			if ($info = trim($info)) {
+				list($key, $value) = explode(':', $info, 2);
+				$array[trim($key)] = trim($value);
+			}
+		}
+		return $array;
+	}
 
-    /**
-     * toArray
-     *
-     * Returns meta info and strings as an array of a structure like that:
-     * <code>
-     *   array(
-     *       'meta' => array(
-     *           'Content-Type'      => 'text/plain; charset=iso-8859-1',
-     *           'Last-Translator'   => 'Michael Wallner <mike@iworks.at>',
-     *           'PO-Revision-Date'  => '2004-07-21 17:03+0200',
-     *           'Language-Team'     => 'German <mail@example.com>',
-     *       ),
-     *       'strings' => array(
-     *           'All rights reserved'   => 'Alle Rechte vorbehalten',
-     *           'Welcome'               => 'Willkommen',
-     *           // ...
-     *       )
-     *   )
-     * </code>
-     *
-     * @see     fromArray()
-     * @access  protected
-     * @return  array
-     */
-    function toArray()
-    {
-    	return array('meta' => $this->meta, 'strings' => $this->strings);
-    }
+	/**
+	 * toArray
+	 *
+	 * Returns meta info and strings as an array of a structure like that:
+	 * <code>
+	 *   array(
+	 *       'meta' => array(
+	 *           'Content-Type'      => 'text/plain; charset=iso-8859-1',
+	 *           'Last-Translator'   => 'Michael Wallner <mike@iworks.at>',
+	 *           'PO-Revision-Date'  => '2004-07-21 17:03+0200',
+	 *           'Language-Team'     => 'German <mail@example.com>',
+	 *       ),
+	 *       'strings' => array(
+	 *           'All rights reserved'   => 'Alle Rechte vorbehalten',
+	 *           'Welcome'               => 'Willkommen',
+	 *           // ...
+	 *       )
+	 *   )
+	 * </code>
+	 *
+	 * @see     fromArray()
+	 * @access  protected
+	 * @return  array
+	 */
+	function toArray()
+	{
+		return array('meta' => $this->meta, 'strings' => $this->strings);
+	}
 
-    /**
-     * fromArray
-     *
-     * Assigns meta info and strings from an array of a structure like that:
-     * <code>
-     *   array(
-     *       'meta' => array(
-     *           'Content-Type'      => 'text/plain; charset=iso-8859-1',
-     *           'Last-Translator'   => 'Michael Wallner <mike@iworks.at>',
-     *           'PO-Revision-Date'  => date('Y-m-d H:iO'),
-     *           'Language-Team'     => 'German <mail@example.com>',
-     *       ),
-     *       'strings' => array(
-     *           'All rights reserved'   => 'Alle Rechte vorbehalten',
-     *           'Welcome'               => 'Willkommen',
-     *           // ...
-     *       )
-     *   )
-     * </code>
-     *
-     * @see     toArray()
-     * @access  protected
-     * @return  bool
-     * @param   array       $array
-     */
-    function fromArray($array)
-    {
-    	if (!array_key_exists('strings', $array)) {
-    	    if (count($array) != 2) {
-                return false;
-    	    } else {
-    	        list($this->meta, $this->strings) = $array;
-            }
-    	} else {
-            $this->meta = @$array['meta'];
-            $this->strings = @$array['strings'];
-        }
-        return true;
-    }
+	/**
+	 * fromArray
+	 *
+	 * Assigns meta info and strings from an array of a structure like that:
+	 * <code>
+	 *   array(
+	 *       'meta' => array(
+	 *           'Content-Type'      => 'text/plain; charset=iso-8859-1',
+	 *           'Last-Translator'   => 'Michael Wallner <mike@iworks.at>',
+	 *           'PO-Revision-Date'  => date('Y-m-d H:iO'),
+	 *           'Language-Team'     => 'German <mail@example.com>',
+	 *       ),
+	 *       'strings' => array(
+	 *           'All rights reserved'   => 'Alle Rechte vorbehalten',
+	 *           'Welcome'               => 'Willkommen',
+	 *           // ...
+	 *       )
+	 *   )
+	 * </code>
+	 *
+	 * @see     toArray()
+	 * @access  protected
+	 * @return  bool
+	 * @param   array       $array
+	 */
+	function fromArray($array)
+	{
+		if (!array_key_exists('strings', $array)) {
+			if (count($array) != 2) {
+				return false;
+			} else {
+				list($this->meta, $this->strings) = $array;
+			}
+		} else {
+			$this->meta = @$array['meta'];
+			$this->strings = @$array['strings'];
+		}
+		return true;
+	}
 
-    /**
-     * toMO
-     *
-     * @access  protected
-     * @return  object  File_Gettext_MO
-     */
-    function toMO()
-    {
-        include_once dirname(__FILE__).'/MO.php';
-        $MO = new TGettext_MO;
-        $MO->fromArray($this->toArray());
-        return $MO;
-    }
+	/**
+	 * toMO
+	 *
+	 * @access  protected
+	 * @return  object  File_Gettext_MO
+	 */
+	function toMO()
+	{
+		include_once dirname(__FILE__).'/MO.php';
+		$MO = new TGettext_MO;
+		$MO->fromArray($this->toArray());
+		return $MO;
+	}
 
-    /**
-     * toPO
-     *
-     * @access  protected
-     * @return  object      File_Gettext_PO
-     */
-    function toPO()
-    {
-        include_once dirname(__FILE__).'/PO.php';
-        $PO = new TGettext_PO;
-        $PO->fromArray($this->toArray());
-        return $PO;
-    }
+	/**
+	 * toPO
+	 *
+	 * @access  protected
+	 * @return  object      File_Gettext_PO
+	 */
+	function toPO()
+	{
+		include_once dirname(__FILE__).'/PO.php';
+		$PO = new TGettext_PO;
+		$PO->fromArray($this->toArray());
+		return $PO;
+	}
 }

framework/I18N/core/MessageSource_MySQL.php

Indentation +36 added lines, -36 removed lines

@@ -92,43 +92,43 @@
 		*/
 		$dsninfo = $this->dns;
 
-     	if (isset($dsninfo['protocol']) && $dsninfo['protocol'] == 'unix')
-            $dbhost = ':' . $dsninfo['socket'];
-        else
-        {
+	 	if (isset($dsninfo['protocol']) && $dsninfo['protocol'] == 'unix')
+			$dbhost = ':' . $dsninfo['socket'];
+		else
+		{
 			$dbhost = $dsninfo['hostspec'] ? $dsninfo['hostspec'] : 'localhost';
-            if (!empty($dsninfo['port']))
-                $dbhost .= ':' . $dsninfo['port'];
-        }
-        $user = $dsninfo['username'];
-        $pw = $dsninfo['password'];
-
-        $connect_function = 'mysql_connect';
-
-        if ($dbhost && $user && $pw)
-            $conn = @$connect_function($dbhost, $user, $pw);
-        elseif ($dbhost && $user)
-            $conn = @$connect_function($dbhost, $user);
-        elseif ($dbhost)
-            $conn = @$connect_function($dbhost);
-        else
-            $conn = false;
-
-        if (empty($conn))
-        {
-        	throw new Exception('Error in connecting to '.$dsninfo);
-        }
-
-        if ($dsninfo['database'])
-        {
-        	if (!@mysql_select_db($dsninfo['database'], $conn))
-        		throw new Exception('Error in connecting database, dns:'.
-        							$dsninfo);
-        }
-        else
-        	throw new Exception('Please provide a database for message'.
-        						' translation.');
-       return $conn;
+			if (!empty($dsninfo['port']))
+				$dbhost .= ':' . $dsninfo['port'];
+		}
+		$user = $dsninfo['username'];
+		$pw = $dsninfo['password'];
+
+		$connect_function = 'mysql_connect';
+
+		if ($dbhost && $user && $pw)
+			$conn = @$connect_function($dbhost, $user, $pw);
+		elseif ($dbhost && $user)
+			$conn = @$connect_function($dbhost, $user);
+		elseif ($dbhost)
+			$conn = @$connect_function($dbhost);
+		else
+			$conn = false;
+
+		if (empty($conn))
+		{
+			throw new Exception('Error in connecting to '.$dsninfo);
+		}
+
+		if ($dsninfo['database'])
+		{
+			if (!@mysql_select_db($dsninfo['database'], $conn))
+				throw new Exception('Error in connecting database, dns:'.
+									$dsninfo);
+		}
+		else
+			throw new Exception('Please provide a database for message'.
+								' translation.');
+	   return $conn;
 	}
 
 	/**

Braces +1 added lines, -2 removed lines

@@ -124,8 +124,7 @@
         	if (!@mysql_select_db($dsninfo['database'], $conn))
         		throw new Exception('Error in connecting database, dns:'.
         							$dsninfo);
-        }
-        else
+        } else
         	throw new Exception('Please provide a database for message'.
         						' translation.');
        return $conn;

framework/Util/TDataFieldAccessor.php

Indentation +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 
 				$tmp = $data;
 				foreach (explode(".", $field) as $f)
-				    $tmp = $tmp[$f];
+					$tmp = $tmp[$f];
 				return $tmp;
 			}
 			else if(is_object($data))

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/Web/Javascripts/JSMin.php

Braces +2 added lines, -4 removed lines

@@ -191,8 +191,7 @@ 
             default:
               if ($this->isAlphaNum($this->b)) {
                 $this->action(1);
-              }
-              else {
+              } else {
                 $this->action(2);
               }
           }
@@ -224,8 +223,7 @@ 
                 default:
                   if ($this->isAlphaNum($this->a)) {
                     $this->action(1);
-                  }
-                  else {
+                  } else {
                     $this->action(3);
                   }
               }

Indentation +198 added lines, -198 removed lines

@@ -59,228 +59,228 @@
   // -- Public Static Methods --------------------------------------------------
 
   public static function minify($js) {
-    $jsmin = new JSMin($js);
-    return $jsmin->min();
+	$jsmin = new JSMin($js);
+	return $jsmin->min();
   }
 
   // -- Public Instance Methods ------------------------------------------------
 
   public function __construct($input) {
-    $this->input       = str_replace("\r\n", "\n", $input);
-    $this->inputLength = strlen($this->input);
+	$this->input       = str_replace("\r\n", "\n", $input);
+	$this->inputLength = strlen($this->input);
   }
 
   // -- Protected Instance Methods ---------------------------------------------
 
   protected function action($d) {
-    switch($d) {
-      case 1:
-        $this->output .= $this->a;
-
-      case 2:
-        $this->a = $this->b;
-
-        if ($this->a === "'" || $this->a === '"') {
-          for (;;) {
-            $this->output .= $this->a;
-            $this->a       = $this->get();
-
-            if ($this->a === $this->b) {
-              break;
-            }
-
-            if (ord($this->a) <= self::ORD_LF) {
-              throw new JSMinException('Unterminated string literal.');
-            }
-
-            if ($this->a === '\\') {
-              $this->output .= $this->a;
-              $this->a       = $this->get();
-            }
-          }
-        }
-
-      case 3:
-        $this->b = $this->next();
-
-        if ($this->b === '/' && (
-            $this->a === '(' || $this->a === ',' || $this->a === '=' ||
-            $this->a === ':' || $this->a === '[' || $this->a === '!' ||
-            $this->a === '&' || $this->a === '|' || $this->a === '?')) {
-
-          $this->output .= $this->a . $this->b;
-
-          for (;;) {
-            $this->a = $this->get();
-
-            if ($this->a === '/') {
-              break;
-            } elseif ($this->a === '\\') {
-              $this->output .= $this->a;
-              $this->a       = $this->get();
-            } elseif (ord($this->a) <= self::ORD_LF) {
-              throw new JSMinException('Unterminated regular expression '.
-                  'literal.');
-            }
-
-            $this->output .= $this->a;
-          }
-
-          $this->b = $this->next();
-        }
-    }
+	switch($d) {
+	  case 1:
+		$this->output .= $this->a;
+
+	  case 2:
+		$this->a = $this->b;
+
+		if ($this->a === "'" || $this->a === '"') {
+		  for (;;) {
+			$this->output .= $this->a;
+			$this->a       = $this->get();
+
+			if ($this->a === $this->b) {
+			  break;
+			}
+
+			if (ord($this->a) <= self::ORD_LF) {
+			  throw new JSMinException('Unterminated string literal.');
+			}
+
+			if ($this->a === '\\') {
+			  $this->output .= $this->a;
+			  $this->a       = $this->get();
+			}
+		  }
+		}
+
+	  case 3:
+		$this->b = $this->next();
+
+		if ($this->b === '/' && (
+			$this->a === '(' || $this->a === ',' || $this->a === '=' ||
+			$this->a === ':' || $this->a === '[' || $this->a === '!' ||
+			$this->a === '&' || $this->a === '|' || $this->a === '?')) {
+
+		  $this->output .= $this->a . $this->b;
+
+		  for (;;) {
+			$this->a = $this->get();
+
+			if ($this->a === '/') {
+			  break;
+			} elseif ($this->a === '\\') {
+			  $this->output .= $this->a;
+			  $this->a       = $this->get();
+			} elseif (ord($this->a) <= self::ORD_LF) {
+			  throw new JSMinException('Unterminated regular expression '.
+				  'literal.');
+			}
+
+			$this->output .= $this->a;
+		  }
+
+		  $this->b = $this->next();
+		}
+	}
   }
 
   protected function get() {
-    $c = $this->lookAhead;
-    $this->lookAhead = null;
-
-    if ($c === null) {
-      if ($this->inputIndex < $this->inputLength) {
-        $c = $this->input[$this->inputIndex];
-        $this->inputIndex += 1;
-      } else {
-        $c = null;
-      }
-    }
-
-    if ($c === "\r") {
-      return "\n";
-    }
-
-    if ($c === null || $c === "\n" || ord($c) >= self::ORD_SPACE) {
-      return $c;
-    }
-
-    return ' ';
+	$c = $this->lookAhead;
+	$this->lookAhead = null;
+
+	if ($c === null) {
+	  if ($this->inputIndex < $this->inputLength) {
+		$c = $this->input[$this->inputIndex];
+		$this->inputIndex += 1;
+	  } else {
+		$c = null;
+	  }
+	}
+
+	if ($c === "\r") {
+	  return "\n";
+	}
+
+	if ($c === null || $c === "\n" || ord($c) >= self::ORD_SPACE) {
+	  return $c;
+	}
+
+	return ' ';
   }
 
   protected function isAlphaNum($c) {
-    return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1;
+	return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1;
   }
 
   protected function min() {
-    $this->a = "\n";
-    $this->action(3);
-
-    while ($this->a !== null) {
-      switch ($this->a) {
-        case ' ':
-          if ($this->isAlphaNum($this->b)) {
-            $this->action(1);
-          } else {
-            $this->action(2);
-          }
-          break;
-
-        case "\n":
-          switch ($this->b) {
-            case '{':
-            case '[':
-            case '(':
-            case '+':
-            case '-':
-              $this->action(1);
-              break;
-
-            case ' ':
-              $this->action(3);
-              break;
-
-            default:
-              if ($this->isAlphaNum($this->b)) {
-                $this->action(1);
-              }
-              else {
-                $this->action(2);
-              }
-          }
-          break;
-
-        default:
-          switch ($this->b) {
-            case ' ':
-              if ($this->isAlphaNum($this->a)) {
-                $this->action(1);
-                break;
-              }
-
-              $this->action(3);
-              break;
-
-            case "\n":
-              switch ($this->a) {
-                case '}':
-                case ']':
-                case ')':
-                case '+':
-                case '-':
-                case '"':
-                case "'":
-                  $this->action(1);
-                  break;
-
-                default:
-                  if ($this->isAlphaNum($this->a)) {
-                    $this->action(1);
-                  }
-                  else {
-                    $this->action(3);
-                  }
-              }
-              break;
-
-            default:
-              $this->action(1);
-              break;
-          }
-      }
-    }
-
-    return $this->output;
+	$this->a = "\n";
+	$this->action(3);
+
+	while ($this->a !== null) {
+	  switch ($this->a) {
+		case ' ':
+		  if ($this->isAlphaNum($this->b)) {
+			$this->action(1);
+		  } else {
+			$this->action(2);
+		  }
+		  break;
+
+		case "\n":
+		  switch ($this->b) {
+			case '{':
+			case '[':
+			case '(':
+			case '+':
+			case '-':
+			  $this->action(1);
+			  break;
+
+			case ' ':
+			  $this->action(3);
+			  break;
+
+			default:
+			  if ($this->isAlphaNum($this->b)) {
+				$this->action(1);
+			  }
+			  else {
+				$this->action(2);
+			  }
+		  }
+		  break;
+
+		default:
+		  switch ($this->b) {
+			case ' ':
+			  if ($this->isAlphaNum($this->a)) {
+				$this->action(1);
+				break;
+			  }
+
+			  $this->action(3);
+			  break;
+
+			case "\n":
+			  switch ($this->a) {
+				case '}':
+				case ']':
+				case ')':
+				case '+':
+				case '-':
+				case '"':
+				case "'":
+				  $this->action(1);
+				  break;
+
+				default:
+				  if ($this->isAlphaNum($this->a)) {
+					$this->action(1);
+				  }
+				  else {
+					$this->action(3);
+				  }
+			  }
+			  break;
+
+			default:
+			  $this->action(1);
+			  break;
+		  }
+	  }
+	}
+
+	return $this->output;
   }
 
   protected function next() {
-    $c = $this->get();
-
-    if ($c === '/') {
-      switch($this->peek()) {
-        case '/':
-          for (;;) {
-            $c = $this->get();
-
-            if (ord($c) <= self::ORD_LF) {
-              return $c;
-            }
-          }
-
-        case '*':
-          $this->get();
-
-          for (;;) {
-            switch($this->get()) {
-              case '*':
-                if ($this->peek() === '/') {
-                  $this->get();
-                  return ' ';
-                }
-                break;
-
-              case null:
-                throw new JSMinException('Unterminated comment.');
-            }
-          }
-
-        default:
-          return $c;
-      }
-    }
-
-    return $c;
+	$c = $this->get();
+
+	if ($c === '/') {
+	  switch($this->peek()) {
+		case '/':
+		  for (;;) {
+			$c = $this->get();
+
+			if (ord($c) <= self::ORD_LF) {
+			  return $c;
+			}
+		  }
+
+		case '*':
+		  $this->get();
+
+		  for (;;) {
+			switch($this->get()) {
+			  case '*':
+				if ($this->peek() === '/') {
+				  $this->get();
+				  return ' ';
+				}
+				break;
+
+			  case null:
+				throw new JSMinException('Unterminated comment.');
+			}
+		  }
+
+		default:
+		  return $c;
+	  }
+	}
+
+	return $c;
   }
 
   protected function peek() {
-    $this->lookAhead = $this->get();
-    return $this->lookAhead;
+	$this->lookAhead = $this->get();
+	return $this->lookAhead;
   }
 }
\ No newline at end of file