pradosoft / prado

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/PO.php

Indentation +110 added lines, -110 removed lines

@@ -1,20 +1,20 @@ 
 <?php
 /**
- * TGettext_PO class file.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the BSD License.
- *
- * Copyright(c) 2004 by Qiang Xue. All rights reserved.
- *
- * To contact the author write to {@link mailto:qiang.xue@gmail.com Qiang Xue}
- * The latest version of PRADO can be obtained from:
- * {@link http://prado.sourceforge.net/}
- *
- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Revision: 1.2 $  $Date: 2005/01/05 03:15:14 $
- * @package System.I18N.core
- */
+	 * TGettext_PO class file.
+	 *
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the BSD License.
+	 *
+	 * Copyright(c) 2004 by Qiang Xue. All rights reserved.
+	 *
+	 * To contact the author write to {@link mailto:qiang.xue@gmail.com Qiang Xue}
+	 * The latest version of PRADO can be obtained from:
+	 * {@link http://prado.sourceforge.net/}
+	 *
+	 * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+	 * @version $Revision: 1.2 $  $Date: 2005/01/05 03:15:14 $
+	 * @package System.I18N.core
+	 */
 
 // +----------------------------------------------------------------------+
 // | PEAR :: File :: Gettext :: PO                                        |
@@ -51,110 +51,110 @@ 
  */
 class TGettext_PO extends TGettext
 {
-    /**
-     * Constructor
-     *
-     * @access  public
-     * @return  object      File_Gettext_PO
-     * @param   string      path to GNU PO file
-     */
-    function TGettext_PO($file = '')
-    {
-        $this->file = $file;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @access  public
+	 * @return  object      File_Gettext_PO
+	 * @param   string      path to GNU PO file
+	 */
+	function TGettext_PO($file = '')
+	{
+		$this->file = $file;
+	}
 
-    /**
-     * Load PO file
-     *
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   string  $file
-     */
-    function load($file = null)
-    {
-        if (!isset($file)) {
-            $file = $this->file;
-        }
+	/**
+	 * Load PO file
+	 *
+	 * @access  public
+	 * @return  mixed   Returns true on success or PEAR_Error on failure.
+	 * @param   string  $file
+	 */
+	function load($file = null)
+	{
+		if (!isset($file)) {
+			$file = $this->file;
+		}
 
-        // load file
-        if (!$contents = @file($file)) {
-            return false;
-        }
-        $contents = implode('', $contents);
+		// load file
+		if (!$contents = @file($file)) {
+			return false;
+		}
+		$contents = implode('', $contents);
 
-        // match all msgid/msgstr entries
-        $matched = preg_match_all(
-            '/(msgid\s+("([^"]|\\\\")*?"\s*)+)\s+' .
-            '(msgstr\s+("([^"]|\\\\")*?"\s*)+)/',
-            $contents, $matches
-        );
-        unset($contents);
+		// match all msgid/msgstr entries
+		$matched = preg_match_all(
+			'/(msgid\s+("([^"]|\\\\")*?"\s*)+)\s+' .
+			'(msgstr\s+("([^"]|\\\\")*?"\s*)+)/',
+			$contents, $matches
+		);
+		unset($contents);
 
-        if (!$matched) {
-            return false;
-        }
+		if (!$matched) {
+			return false;
+		}
 
-        // get all msgids and msgtrs
-        for ($i = 0; $i < $matched; $i++) {
-            $msgid = preg_replace(
-                '/\s*msgid\s*"(.*)"\s*/s', '\\1', $matches[1][$i]);
-            $msgstr= preg_replace(
-                '/\s*msgstr\s*"(.*)"\s*/s', '\\1', $matches[4][$i]);
-            $this->strings[parent::prepare($msgid)] = parent::prepare($msgstr);
-        }
+		// get all msgids and msgtrs
+		for ($i = 0; $i < $matched; $i++) {
+			$msgid = preg_replace(
+				'/\s*msgid\s*"(.*)"\s*/s', '\\1', $matches[1][$i]);
+			$msgstr= preg_replace(
+				'/\s*msgstr\s*"(.*)"\s*/s', '\\1', $matches[4][$i]);
+			$this->strings[parent::prepare($msgid)] = parent::prepare($msgstr);
+		}
 
-        // check for meta info
-        if (isset($this->strings[''])) {
-            $this->meta = parent::meta2array($this->strings['']);
-            unset($this->strings['']);
-        }
+		// check for meta info
+		if (isset($this->strings[''])) {
+			$this->meta = parent::meta2array($this->strings['']);
+			unset($this->strings['']);
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Save PO file
-     *
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   string  $file
-     */
-    function save($file = null)
-    {
-        if (!isset($file)) {
-            $file = $this->file;
-        }
+	/**
+	 * Save PO file
+	 *
+	 * @access  public
+	 * @return  mixed   Returns true on success or PEAR_Error on failure.
+	 * @param   string  $file
+	 */
+	function save($file = null)
+	{
+		if (!isset($file)) {
+			$file = $this->file;
+		}
 
-        // open PO file
-        if (!is_resource($fh = @fopen($file, 'w'))) {
-            return false;
-        }
+		// open PO file
+		if (!is_resource($fh = @fopen($file, 'w'))) {
+			return false;
+		}
 
-        // lock PO file exclusively
-        if (!flock($fh, LOCK_EX)) {
-            fclose($fh);
-            return false;
-        }
-        // write meta info
-        if (count($this->meta)) {
-            $meta = 'msgid ""' . "\nmsgstr " . '""' . "\n";
-            foreach ($this->meta as $k => $v) {
-                $meta .= '"' . $k . ': ' . $v . '\n"' . "\n";
-            }
-            fwrite($fh, $meta . "\n");
-        }
-        // write strings
-        foreach ($this->strings as $o => $t) {
-            fwrite($fh,
-                'msgid "'  . parent::prepare($o, true) . '"' . "\n" .
-                'msgstr "' . parent::prepare($t, true) . '"' . "\n\n"
-            );
-        }
+		// lock PO file exclusively
+		if (!flock($fh, LOCK_EX)) {
+			fclose($fh);
+			return false;
+		}
+		// write meta info
+		if (count($this->meta)) {
+			$meta = 'msgid ""' . "\nmsgstr " . '""' . "\n";
+			foreach ($this->meta as $k => $v) {
+				$meta .= '"' . $k . ': ' . $v . '\n"' . "\n";
+			}
+			fwrite($fh, $meta . "\n");
+		}
+		// write strings
+		foreach ($this->strings as $o => $t) {
+			fwrite($fh,
+				'msgid "'  . parent::prepare($o, true) . '"' . "\n" .
+				'msgstr "' . parent::prepare($t, true) . '"' . "\n\n"
+			);
+		}
 
-        //done
-        @flock($fh, LOCK_UN);
-        @fclose($fh);
-        chmod($file,PRADO_CHMOD);
-        return true;
-    }
+		//done
+		@flock($fh, LOCK_UN);
+		@fclose($fh);
+		chmod($file,PRADO_CHMOD);
+		return true;
+	}
 }

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;
 	}
 
 	/**

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))

framework/Caching/TMemCache.php

Indentation +62 added lines, -62 removed lines

@@ -104,30 +104,30 @@ 
 	/**
 	 * @var boolean controls the use of a persistent connection. Default to true.
 	 */
-    private $_persistence = true;
-    /**
-     * @var integer number of buckets to create for this server which in turn control its
-     * probability of it being selected. The probability is relative to the total weight
-     * of all servers.
-     */
-    private $_weight = 1;
+	private $_persistence = true;
+	/**
+	 * @var integer number of buckets to create for this server which in turn control its
+	 * probability of it being selected. The probability is relative to the total weight
+	 * of all servers.
+	 */
+	private $_weight = 1;
 
-    private $_timeout = 360;
+	private $_timeout = 360;
 
-    private $_retryInterval = 15;
+	private $_retryInterval = 15;
 	/**
-	* @var integer Controls the minimum value length before attempting to compress automatically.
-	*/
-    private $_threshold=0;
+	 * @var integer Controls the minimum value length before attempting to compress automatically.
+	 */
+	private $_threshold=0;
 
 	/**
-	* @var float Specifies the minimum amount of savings to actually store the value compressed. The supplied value must be between 0 and 1. Default value is 0.2 giving a minimum 20% compression savings.
-	*/
-    private $_minSavings=0.0;
+	 * @var float Specifies the minimum amount of savings to actually store the value compressed. The supplied value must be between 0 and 1. Default value is 0.2 giving a minimum 20% compression savings.
+	 */
+	private $_minSavings=0.0;
 
-    private $_status = true;
+	private $_status = true;
 
-    private $_failureCallback = null;
+	private $_failureCallback = null;
 
 	/**
 	 * @var boolean whether to use memcached or memcache as the underlying caching extension.
@@ -171,63 +171,63 @@ 
 		$this->_cache = $this->_useMemcached ? new Memcached : new Memcache;
 		$this->loadConfig($config);
 		if(count($this->_servers))
-        {
-            foreach($this->_servers as $server)
-            {
-                Prado::trace('Adding server '.$server['Host'].' from serverlist', 'System.Caching.TMemCache');
-                if($this->_cache->addServer($server['Host'],$server['Port'],$server['Persistent'],
-                    $server['Weight'],$server['Timeout'],$server['RetryInterval'])===false)
-                    throw new TConfigurationException('memcache_connection_failed',$server['Host'],$server['Port']);
-            }
-        }
-        else
-        {
-            Prado::trace('Adding server '.$this->_host, 'System.Caching.TMemCache');
-            if($this->_cache->addServer($this->_host,$this->_port)===false)
-                throw new TConfigurationException('memcache_connection_failed',$this->_host,$this->_port);
-        }
+		{
+			foreach($this->_servers as $server)
+			{
+				Prado::trace('Adding server '.$server['Host'].' from serverlist', 'System.Caching.TMemCache');
+				if($this->_cache->addServer($server['Host'],$server['Port'],$server['Persistent'],
+					$server['Weight'],$server['Timeout'],$server['RetryInterval'])===false)
+					throw new TConfigurationException('memcache_connection_failed',$server['Host'],$server['Port']);
+			}
+		}
+		else
+		{
+			Prado::trace('Adding server '.$this->_host, 'System.Caching.TMemCache');
+			if($this->_cache->addServer($this->_host,$this->_port)===false)
+				throw new TConfigurationException('memcache_connection_failed',$this->_host,$this->_port);
+		}
 		if($this->_threshold!==0)
-            $this->_cache->setCompressThreshold($this->_threshold,$this->_minSavings);
+			$this->_cache->setCompressThreshold($this->_threshold,$this->_minSavings);
 		$this->_initialized=true;
 		parent::init($config);
 	}
 
-    /**
+	/**
 	 * Loads configuration from an XML element
 	 * @param TXmlElement configuration node
 	 * @throws TConfigurationException if log route class or type is not specified
 	 */
 	private function loadConfig($xml)
 	{
-	    if($xml instanceof TXmlElement)
+		if($xml instanceof TXmlElement)
 		{
-    		foreach($xml->getElementsByTagName('server') as $serverConfig)
-    		{
-    			$properties=$serverConfig->getAttributes();
-    			if(($host=$properties->remove('Host'))===null)
-    				throw new TConfigurationException('memcache_serverhost_required');
-    			if(($port=$properties->remove('Port'))===null)
-        			throw new TConfigurationException('memcache_serverport_required');
-        		if(!is_numeric($port))
-        		    throw new TConfigurationException('memcache_serverport_invalid');
-        		$server = array('Host'=>$host,'Port'=>$port,'Weight'=>1,'Timeout'=>1800,'RetryInterval'=>15,'Persistent'=>true);
-        		$checks = array(
-        		    'Weight'=>'memcache_serverweight_invalid',
-        		    'Timeout'=>'memcache_servertimeout_invalid',
-        		    'RetryInterval'=>'memcach_serverretryinterval_invalid'
-        		);
-        		foreach($checks as $property=>$exception)
-        		{
-        		    $value=$properties->remove($property);
-        		    if($value!==null && is_numeric($value))
-        		        $server[$property]=$value;
-        		    else if($value!==null)
-        		        throw new TConfigurationException($exception);
-        		}
-        		$server['Persistent']= TPropertyValue::ensureBoolean($properties->remove('Persistent'));
-    			$this->_servers[]=$server;
-    		}
-	    }
+			foreach($xml->getElementsByTagName('server') as $serverConfig)
+			{
+				$properties=$serverConfig->getAttributes();
+				if(($host=$properties->remove('Host'))===null)
+					throw new TConfigurationException('memcache_serverhost_required');
+				if(($port=$properties->remove('Port'))===null)
+					throw new TConfigurationException('memcache_serverport_required');
+				if(!is_numeric($port))
+					throw new TConfigurationException('memcache_serverport_invalid');
+				$server = array('Host'=>$host,'Port'=>$port,'Weight'=>1,'Timeout'=>1800,'RetryInterval'=>15,'Persistent'=>true);
+				$checks = array(
+					'Weight'=>'memcache_serverweight_invalid',
+					'Timeout'=>'memcache_servertimeout_invalid',
+					'RetryInterval'=>'memcach_serverretryinterval_invalid'
+				);
+				foreach($checks as $property=>$exception)
+				{
+					$value=$properties->remove($property);
+					if($value!==null && is_numeric($value))
+						$server[$property]=$value;
+					else if($value!==null)
+						throw new TConfigurationException($exception);
+				}
+				$server['Persistent']= TPropertyValue::ensureBoolean($properties->remove('Persistent'));
+				$this->_servers[]=$server;
+			}
+		}
 	}
 
 	/**

framework/Web/Javascripts/JSMin.php

Indentation +198 added lines, -198 removed lines

@@ -60,229 +60,229 @@
   // -- 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;
   }
 }
 

framework/Web/Services/TFeedService.php

Indentation +3 added lines, -3 removed lines

@@ -139,9 +139,9 @@
 			$feed->init($feedConfig);
 
 			$content=$feed->getFeedContent();
-		    //$this->getResponse()->setContentType('application/rss+xml');
-		    $this->getResponse()->setContentType($feed->getContentType());
-		    $this->getResponse()->write($content);
+			//$this->getResponse()->setContentType('application/rss+xml');
+			$this->getResponse()->setContentType($feed->getContentType());
+			$this->getResponse()->write($content);
 		}
 		else
 			throw new THttpException(404,'feedservice_feed_unknown',$id);

framework/Web/UI/TCachePageStatePersister.php

Indentation +4 added lines, -4 removed lines

@@ -144,15 +144,15 @@
 	 */
 	public function getKeyPrefix()
 	{
-	    return $this->_prefix;
+		return $this->_prefix;
 	}
 
 	/**
-     * @param string prefix of cache variable name to avoid conflict with other cache data
-     */
+	 * @param string prefix of cache variable name to avoid conflict with other cache data
+	 */
 	public function setKeyPrefix($value)
 	{
-	    $this->_prefix=$value;
+		$this->_prefix=$value;
 	}
 
 	/**

framework/Web/UI/WebControls/TListControl.php

Indentation +47 added lines, -47 removed lines

@@ -334,8 +334,8 @@ 
 
 	/**
 	 * @return boolean a value indicating whether an automatic postback to the server
-     * will occur whenever the user makes change to the list control and then tabs out of it.
-     * Defaults to false.
+	 * will occur whenever the user makes change to the list control and then tabs out of it.
+	 * Defaults to false.
 	 */
 	public function getAutoPostBack()
 	{
@@ -591,23 +591,23 @@ 
 	 * @param string the value of the item to be selected.
 	 */
 	public function setSelectedValue($value)
-    {
-	    if($this->_items)
-	    {
-		    if($value===null)
-		    	$this->clearSelection();
-		    else if(($item=$this->_items->findItemByValue($value))!==null)
-	    	{
-		    	$this->clearSelection();
-		    	$item->setSelected(true);
-	    	}
-	    	else
+	{
+		if($this->_items)
+		{
+			if($value===null)
+				$this->clearSelection();
+			else if(($item=$this->_items->findItemByValue($value))!==null)
+			{
+				$this->clearSelection();
+				$item->setSelected(true);
+			}
+			else
 				$this->clearSelection();
-    	}
-    	$this->_cachedSelectedValue=$value;
+		}
+		$this->_cachedSelectedValue=$value;
 		if($this->getAdapter() instanceof IListControlAdapter)
 			$this->getAdapter()->setSelectedValue($value);
-    }
+	}
 
 
 	/**
@@ -655,36 +655,36 @@ 
 			$this->getAdapter()->setSelectedValues($values);
 	}
 
-    /**
-     * @return string selected value
-     */
-    public function getText()
-    {
-	    return $this->getSelectedValue();
-    }
-
-    /**
-     * @param string value to be selected
-     */
-    public function setText($value)
-    {
-	    $this->setSelectedValue($value);
-    }
-
-    /**
-     * Clears all existing selections.
-     */
-    public function clearSelection()
-    {
-	    if($this->_items)
-	    {
-		    foreach($this->_items as $item)
-		    	$item->setSelected(false);
-	    }
+	/**
+	 * @return string selected value
+	 */
+	public function getText()
+	{
+		return $this->getSelectedValue();
+	}
+
+	/**
+	 * @param string value to be selected
+	 */
+	public function setText($value)
+	{
+		$this->setSelectedValue($value);
+	}
+
+	/**
+	 * Clears all existing selections.
+	 */
+	public function clearSelection()
+	{
+		if($this->_items)
+		{
+			foreach($this->_items as $item)
+				$item->setSelected(false);
+		}
 
 		if($this->getAdapter() instanceof IListControlAdapter)
 			$this->getAdapter()->clearSelection();
-    }
+	}
 
 	/**
 	 * @return string the group of validators which the list control causes validation upon postback
@@ -914,10 +914,10 @@ 
 	 */
 	public function setSelectedValues($values);
 
-    /**
-     * Clears all existing selections on the client side.
-     */
-    public function clearSelection();
+	/**
+	 * Clears all existing selections on the client side.
+	 */
+	public function clearSelection();
 }