iNextrix / ASTPP

web_interface/astpp/index.php

Indentation +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
  * NOTE: If you change these, also change the error_reporting() code below
  *
  */
-        ini_set("date.timezone", "UTC");
+		ini_set("date.timezone", "UTC");
 	define('ENVIRONMENT', 'development');
 /*
  *---------------------------------------------------------------
@@ -68,7 +68,7 @@ 
  * as this file.
  *
  */
-       $assets_path='assets';
+	   $assets_path='assets';
 /*
  *---------------------------------------------------------------
  * APPLICATION FOLDER NAME

Braces +1 added lines, -2 removed lines

@@ -193,8 +193,7 @@
 	if (is_dir($application_folder))
 	{
 		define('APPPATH', $application_folder.'/');
-	}
-	else
+	} else
 	{
 		if ( ! is_dir(BASEPATH.$application_folder.'/'))
 		{

web_interface/astpp/system/core/Output.php

Indentation +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 		// Get mime types for later
 		if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'))
 		{
-		    include APPPATH.'config/'.ENVIRONMENT.'/mimes.php';
+			include APPPATH.'config/'.ENVIRONMENT.'/mimes.php';
 		}
 		else
 		{

Braces +8 added lines, -11 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -97,8 +99,7 @@ 
 		if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'))
 		{
 		    include APPPATH.'config/'.ENVIRONMENT.'/mimes.php';
-		}
-		else
+		} else
 		{
 			include APPPATH.'config/mimes.php';
 		}
@@ -158,8 +159,7 @@ 
 		if ($this->final_output == '')
 		{
 			$this->final_output = $output;
-		}
-		else
+		} else
 		{
 			$this->final_output .= $output;
 		}
@@ -425,8 +425,7 @@ 
 				$output  = preg_replace("|</body>.*?</html>|is", '', $output);
 				$output .= $CI->profiler->run();
 				$output .= '</body></html>';
-			}
-			else
+			} else
 			{
 				$output .= $CI->profiler->run();
 			}
@@ -439,8 +438,7 @@ 
 		if (method_exists($CI, '_output'))
 		{
 			$CI->_output($output);
-		}
-		else
+		} else
 		{
 			echo $output;  // Send it to the browser!
 		}
@@ -489,8 +487,7 @@ 
 		{
 			fwrite($fp, $expire.'TS--->'.$output);
 			flock($fp, LOCK_UN);
-		}
-		else
+		} else
 		{
 			log_message('error', "Unable to secure a file lock for file at: ".$cache_path);
 			return;

web_interface/astpp/system/core/Config.php

Indentation +1 added lines, -1 removed lines

@@ -316,7 +316,7 @@
 				$uri = $str;
 			}
 		}
-	    return $uri;
+		return $uri;
 	}
 
 	// --------------------------------------------------------------------

Braces +9 added lines, -14 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -71,9 +73,7 @@ 
 				$base_url = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off' ? 'https' : 'http';
 				$base_url .= '://'. $_SERVER['HTTP_HOST'];
 				$base_url .= str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']);
-			}
-
-			else
+			} else
 			{
 				$base_url = 'http://localhost/';
 			}
@@ -143,13 +143,11 @@ 
 				if (isset($this->config[$file]))
 				{
 					$this->config[$file] = array_merge($this->config[$file], $config);
-				}
-				else
+				} else
 				{
 					$this->config[$file] = $config;
 				}
-			}
-			else
+			} else
 			{
 				$this->config = array_merge($this->config, $config);
 			}
@@ -196,8 +194,7 @@ 
 			}
 
 			$pref = $this->config[$item];
-		}
-		else
+		} else
 		{
 			if ( ! isset($this->config[$index]))
 			{
@@ -260,8 +257,7 @@ 
 		{
 			$suffix = ($this->item('url_suffix') == FALSE) ? '' : $this->item('url_suffix');
 			return $this->slash_item('base_url').$this->slash_item('index_page').$this->_uri_string($uri).$suffix;
-		}
-		else
+		} else
 		{
 			return $this->slash_item('base_url').$this->item('index_page').'?'.$this->_uri_string($uri);
 		}
@@ -300,8 +296,7 @@ 
 				$uri = implode('/', $uri);
 			}
 			$uri = trim($uri, '/');
-		}
-		else
+		} else
 		{
 			if (is_array($uri))
 			{

web_interface/astpp/system/core/CodeIgniter.php

Braces +7 added lines, -9 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -58,8 +60,7 @@ 
 	if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/constants.php'))
 	{
 		require(APPPATH.'config/'.ENVIRONMENT.'/constants.php');
-	}
-	else
+	} else
 	{
 		require(APPPATH.'config/constants.php');
 	}
@@ -283,8 +284,7 @@ 
 
 				include_once(APPPATH.'controllers/'.$class.'.php');
 			}
-		}
-		else
+		} else
 		{
 			show_404("{$class}/{$method}");
 		}
@@ -323,8 +323,7 @@ 
 	if (method_exists($CI, '_remap'))
 	{
 		$CI->_remap($method, array_slice($URI->rsegments, 2));
-	}
-	else
+	} else
 	{
 		// is_callable() returns TRUE on some versions of PHP 5 for private and protected
 		// methods, so we'll use this workaround for consistent behavior
@@ -347,8 +346,7 @@ 
 					unset($CI);
 					$CI = new $class();
 				}
-			}
-			else
+			} else
 			{
 				show_404("{$class}/{$method}");
 			}

web_interface/astpp/system/core/Common.php

Indentation +1 added lines, -1 removed lines

@@ -254,7 +254,7 @@
 			}
 		}
 		$_config[0] =& $config;
-                return $_config[0];
+				return $_config[0];
 
 	}
 }

Braces +7 added lines, -9 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -92,8 +94,7 @@ 
 			@chmod($file, DIR_WRITE_MODE);
 			@unlink($file);
 			return TRUE;
-		}
-		elseif ( ! is_file($file) OR ($fp = @fopen($file, FOPEN_WRITE_CREATE)) === FALSE)
+		} elseif ( ! is_file($file) OR ($fp = @fopen($file, FOPEN_WRITE_CREATE)) === FALSE)
 		{
 			return FALSE;
 		}
@@ -437,12 +438,10 @@ 
 		if (substr(php_sapi_name(), 0, 3) == 'cgi')
 		{
 			header("Status: {$code} {$text}", TRUE);
-		}
-		elseif ($server_protocol == 'HTTP/1.1' OR $server_protocol == 'HTTP/1.0')
+		} elseif ($server_protocol == 'HTTP/1.1' OR $server_protocol == 'HTTP/1.0')
 		{
 			header($server_protocol." {$code} {$text}", TRUE, $code);
-		}
-		else
+		} else
 		{
 			header("HTTP/1.1 {$code} {$text}", TRUE, $code);
 		}
@@ -553,8 +552,7 @@ 
 		if (is_array($var))
 		{
 			return array_map('html_escape', $var);
-		}
-		else
+		} else
 		{
 			return htmlspecialchars($var, ENT_QUOTES, config_item('charset'));
 		}

web_interface/astpp/system/core/Input.php

Indentation +100 added lines, -100 removed lines

@@ -134,13 +134,13 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Fetch an item from the GET array
-	*
-	* @access	public
-	* @param	string
-	* @param	bool
-	* @return	string
-	*/
+	 * Fetch an item from the GET array
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	bool
+	 * @return	string
+	 */
 	function get($index = NULL, $xss_clean = FALSE)
 	{
 		// Check if a field has been provided
@@ -162,13 +162,13 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Fetch an item from the POST array
-	*
-	* @access	public
-	* @param	string
-	* @param	bool
-	* @return	string
-	*/
+	 * Fetch an item from the POST array
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	bool
+	 * @return	string
+	 */
 	function post($index = NULL, $xss_clean = FALSE)
 	{
 		// Check if a field has been provided
@@ -191,13 +191,13 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Fetch an item from either the GET array or the POST
-	*
-	* @access	public
-	* @param	string	The index key
-	* @param	bool	XSS cleaning
-	* @return	string
-	*/
+	 * Fetch an item from either the GET array or the POST
+	 *
+	 * @access	public
+	 * @param	string	The index key
+	 * @param	bool	XSS cleaning
+	 * @return	string
+	 */
 	function get_post($index = '', $xss_clean = FALSE)
 	{
 		if ( ! isset($_POST[$index]) )
@@ -213,13 +213,13 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Fetch an item from the COOKIE array
-	*
-	* @access	public
-	* @param	string
-	* @param	bool
-	* @return	string
-	*/
+	 * Fetch an item from the COOKIE array
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	bool
+	 * @return	string
+	 */
 	function cookie($index = '', $xss_clean = FALSE)
 	{
 		return $this->_fetch_from_array($_COOKIE, $index, $xss_clean);
@@ -228,21 +228,21 @@ 
 	// ------------------------------------------------------------------------
 
 	/**
-	* Set cookie
-	*
-	* Accepts six parameter, or you can submit an associative
-	* array in the first parameter containing all the values.
-	*
-	* @access	public
-	* @param	mixed
-	* @param	string	the value of the cookie
-	* @param	string	the number of seconds until expiration
-	* @param	string	the cookie domain.  Usually:  .yourdomain.com
-	* @param	string	the cookie path
-	* @param	string	the cookie prefix
-	* @param	bool	true makes the cookie secure
-	* @return	void
-	*/
+	 * Set cookie
+	 *
+	 * Accepts six parameter, or you can submit an associative
+	 * array in the first parameter containing all the values.
+	 *
+	 * @access	public
+	 * @param	mixed
+	 * @param	string	the value of the cookie
+	 * @param	string	the number of seconds until expiration
+	 * @param	string	the cookie domain.  Usually:  .yourdomain.com
+	 * @param	string	the cookie path
+	 * @param	string	the cookie prefix
+	 * @param	bool	true makes the cookie secure
+	 * @return	void
+	 */
 	function set_cookie($name = '', $value = '', $expire = '', $domain = '', $path = '/', $prefix = '', $secure = FALSE)
 	{
 		if (is_array($name))
@@ -289,13 +289,13 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Fetch an item from the SERVER array
-	*
-	* @access	public
-	* @param	string
-	* @param	bool
-	* @return	string
-	*/
+	 * Fetch an item from the SERVER array
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	bool
+	 * @return	string
+	 */
 	function server($index = '', $xss_clean = FALSE)
 	{
 		return $this->_fetch_from_array($_SERVER, $index, $xss_clean);
@@ -304,11 +304,11 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Fetch the IP Address
-	*
-	* @access	public
-	* @return	string
-	*/
+	 * Fetch the IP Address
+	 *
+	 * @access	public
+	 * @return	string
+	 */
 	function ip_address()
 	{
 		if ($this->ip_address !== FALSE)
@@ -363,14 +363,14 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Validate IP Address
-	*
-	* Updated version suggested by Geert De Deckere
-	*
-	* @access	public
-	* @param	string
-	* @return	string
-	*/
+	 * Validate IP Address
+	 *
+	 * Updated version suggested by Geert De Deckere
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	string
+	 */
 	function valid_ip($ip)
 	{
 		$ip_segments = explode('.', $ip);
@@ -402,11 +402,11 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* User Agent
-	*
-	* @access	public
-	* @return	string
-	*/
+	 * User Agent
+	 *
+	 * @access	public
+	 * @return	string
+	 */
 	function user_agent()
 	{
 		if ($this->user_agent !== FALSE)
@@ -422,19 +422,19 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Sanitize Globals
-	*
-	* This function does the following:
-	*
-	* Unsets $_GET data (if query strings are not enabled)
-	*
-	* Unsets all globals if register_globals is enabled
-	*
-	* Standardizes newline characters to \n
-	*
-	* @access	private
-	* @return	void
-	*/
+	 * Sanitize Globals
+	 *
+	 * This function does the following:
+	 *
+	 * Unsets $_GET data (if query strings are not enabled)
+	 *
+	 * Unsets all globals if register_globals is enabled
+	 *
+	 * Standardizes newline characters to \n
+	 *
+	 * @access	private
+	 * @return	void
+	 */
 	function _sanitize_globals()
 	{
 		// It would be "wrong" to unset any of these GLOBALS.
@@ -527,15 +527,15 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Clean Input Data
-	*
-	* This is a helper function. It escapes data and
-	* standardizes newline characters to \n
-	*
-	* @access	private
-	* @param	string
-	* @return	string
-	*/
+	 * Clean Input Data
+	 *
+	 * This is a helper function. It escapes data and
+	 * standardizes newline characters to \n
+	 *
+	 * @access	private
+	 * @param	string
+	 * @return	string
+	 */
 	function _clean_input_data($str)
 	{
 		if (is_array($str))
@@ -588,16 +588,16 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Clean Keys
-	*
-	* This is a helper function. To prevent malicious users
-	* from trying to exploit keys we make sure that keys are
-	* only named with alpha-numeric text and a few other items.
-	*
-	* @access	private
-	* @param	string
-	* @return	string
-	*/
+	 * Clean Keys
+	 *
+	 * This is a helper function. To prevent malicious users
+	 * from trying to exploit keys we make sure that keys are
+	 * only named with alpha-numeric text and a few other items.
+	 *
+	 * @access	private
+	 * @param	string
+	 * @return	string
+	 */
 	function _clean_input_keys($str)
 	{
 		if ( ! preg_match("/^[a-z0-9:_\/-]+$/i", $str))

Braces +12 added lines, -19 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -203,8 +205,7 @@ 
 		if ( ! isset($_POST[$index]) )
 		{
 			return $this->get($index, $xss_clean);
-		}
-		else
+		} else
 		{
 			return $this->post($index, $xss_clean);
 		}
@@ -277,8 +278,7 @@ 
 		if ( ! is_numeric($expire))
 		{
 			$expire = time() - 86500;
-		}
-		else
+		} else
 		{
 			$expire = ($expire > 0) ? time() + $expire : 0;
 		}
@@ -322,20 +322,16 @@ 
 			$proxies = is_array($proxies) ? $proxies : array($proxies);
 
 			$this->ip_address = in_array($_SERVER['REMOTE_ADDR'], $proxies) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : $_SERVER['REMOTE_ADDR'];
-		}
-		elseif ($this->server('REMOTE_ADDR') AND $this->server('HTTP_CLIENT_IP'))
+		} elseif ($this->server('REMOTE_ADDR') AND $this->server('HTTP_CLIENT_IP'))
 		{
 			$this->ip_address = $_SERVER['HTTP_CLIENT_IP'];
-		}
-		elseif ($this->server('REMOTE_ADDR'))
+		} elseif ($this->server('REMOTE_ADDR'))
 		{
 			$this->ip_address = $_SERVER['REMOTE_ADDR'];
-		}
-		elseif ($this->server('HTTP_CLIENT_IP'))
+		} elseif ($this->server('HTTP_CLIENT_IP'))
 		{
 			$this->ip_address = $_SERVER['HTTP_CLIENT_IP'];
-		}
-		elseif ($this->server('HTTP_X_FORWARDED_FOR'))
+		} elseif ($this->server('HTTP_X_FORWARDED_FOR'))
 		{
 			$this->ip_address = $_SERVER['HTTP_X_FORWARDED_FOR'];
 		}
@@ -454,8 +450,7 @@ 
 					global $$global;
 					$$global = NULL;
 				}
-			}
-			else
+			} else
 			{
 				foreach ($global as $key => $val)
 				{
@@ -472,8 +467,7 @@ 
 		if ($this->_allow_get_array == FALSE)
 		{
 			$_GET = array();
-		}
-		else
+		} else
 		{
 			if (is_array($_GET) AND count($_GET) > 0)
 			{
@@ -631,8 +625,7 @@ 
 		if (function_exists('apache_request_headers'))
 		{
 			$headers = apache_request_headers();
-		}
-		else
+		} else
 		{
 			$headers['Content-Type'] = (isset($_SERVER['CONTENT_TYPE'])) ? $_SERVER['CONTENT_TYPE'] : @getenv('CONTENT_TYPE');
 

web_interface/astpp/system/core/Hooks.php

Indentation +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
 
 		if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/hooks.php'))
 		{
-		    include(APPPATH.'config/'.ENVIRONMENT.'/hooks.php');
+			include(APPPATH.'config/'.ENVIRONMENT.'/hooks.php');
 		}
 		elseif (is_file(APPPATH.'config/hooks.php'))
 		{

Braces +6 added lines, -7 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -83,8 +85,7 @@ 
 		if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/hooks.php'))
 		{
 		    include(APPPATH.'config/'.ENVIRONMENT.'/hooks.php');
-		}
-		elseif (is_file(APPPATH.'config/hooks.php'))
+		} elseif (is_file(APPPATH.'config/hooks.php'))
 		{
 			include(APPPATH.'config/hooks.php');
 		}
@@ -123,8 +124,7 @@ 
 			{
 				$this->_run_hook($val);
 			}
-		}
-		else
+		} else
 		{
 			$this->_run_hook($this->hooks[$which]);
 		}
@@ -225,8 +225,7 @@ 
 
 			$HOOK = new $class;
 			$HOOK->$function($params);
-		}
-		else
+		} else
 		{
 			if ( ! function_exists($function))
 			{

web_interface/astpp/system/core/Router.php

Braces +9 added lines, -13 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -132,8 +134,7 @@ 
 		if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/routes.php'))
 		{
 			include(APPPATH.'config/'.ENVIRONMENT.'/routes.php');
-		}
-		elseif (is_file(APPPATH.'config/routes.php'))
+		} elseif (is_file(APPPATH.'config/routes.php'))
 		{
 			include(APPPATH.'config/routes.php');
 		}
@@ -195,8 +196,7 @@ 
 			$this->set_class($x[0]);
 			$this->set_method($x[1]);
 			$this->_set_request($x);
-		}
-		else
+		} else
 		{
 			$this->set_class($this->default_controller);
 			$this->set_method('index');
@@ -237,8 +237,7 @@ 
 		{
 			// A standard method request
 			$this->set_method($segments[1]);
-		}
-		else
+		} else
 		{
 			// This lets the "routed" segment array identify that the default
 			// index method is being used.
@@ -295,14 +294,12 @@ 
 						$this->set_method(isset($x[1]) ? $x[1] : 'index');
 
 						return $x;
-					}
-					else
+					} else
 					{
 						show_404($this->fetch_directory().$segments[0]);
 					}
 				}
-			}
-			else
+			} else
 			{
 				// Is the method being specified in the route?
 				if (strpos($this->default_controller, '/') !== FALSE)
@@ -311,8 +308,7 @@ 
 
 					$this->set_class($x[0]);
 					$this->set_method($x[1]);
-				}
-				else
+				} else
 				{
 					$this->set_class($this->default_controller);
 					$this->set_method('index');

web_interface/astpp/system/core/URI.php

Indentation +2 added lines, -2 removed lines

@@ -162,13 +162,13 @@
 //================ITPL=======================
   $pos = strpos($str, "_json");
  if($pos > 0 && !isset($_SERVER['HTTP_X_REQUESTED_WITH'])){
-       $this->uri_string = str_replace('_json', '', trim($str, '/'));
+	   $this->uri_string = str_replace('_json', '', trim($str, '/'));
  }else{
 		// If the URI contains only a slash we'll kill it
 		$this->uri_string = ($str == '/') ? '' : $str;
 }
 /*===============================*/	
-        }
+		}
 
 	// --------------------------------------------------------------------
 

Braces +10 added lines, -14 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -135,8 +137,7 @@ 
 		{
 			$this->_set_uri_string($this->_detect_uri());
 			return;
-		}
-		elseif ($uri == 'CLI')
+		} elseif ($uri == 'CLI')
 		{
 			$this->_set_uri_string($this->_parse_cli_args());
 			return;
@@ -163,7 +164,7 @@ 
   $pos = strpos($str, "_json");
  if($pos > 0 && !isset($_SERVER['HTTP_X_REQUESTED_WITH'])){
        $this->uri_string = str_replace('_json', '', trim($str, '/'));
- }else{
+ } else{
 		// If the URI contains only a slash we'll kill it
 		$this->uri_string = ($str == '/') ? '' : $str;
 }
@@ -192,8 +193,7 @@ 
 		if (strpos($uri, $_SERVER['SCRIPT_NAME']) === 0)
 		{
 			$uri = substr($uri, strlen($_SERVER['SCRIPT_NAME']));
-		}
-		elseif (strpos($uri, dirname($_SERVER['SCRIPT_NAME'])) === 0)
+		} elseif (strpos($uri, dirname($_SERVER['SCRIPT_NAME'])) === 0)
 		{
 			$uri = substr($uri, strlen(dirname($_SERVER['SCRIPT_NAME'])));
 		}
@@ -210,8 +210,7 @@ 
 		{
 			$_SERVER['QUERY_STRING'] = $parts[1];
 			parse_str($_SERVER['QUERY_STRING'], $_GET);
-		}
-		else
+		} else
 		{
 			$_SERVER['QUERY_STRING'] = '';
 			$_GET = array();
@@ -426,8 +425,7 @@ 
 		{
 			$total_segments = 'total_segments';
 			$segment_array = 'segment_array';
-		}
-		else
+		} else
 		{
 			$total_segments = 'total_rsegments';
 			$segment_array = 'rsegment_array';
@@ -468,8 +466,7 @@ 
 			if ($i % 2)
 			{
 				$retval[$lastval] = $seg;
-			}
-			else
+			} else
 			{
 				$retval[$seg] = FALSE;
 				$lastval = $seg;
@@ -565,8 +562,7 @@ 
 		if ($where == 'trailing')
 		{
 			$leading	= '';
-		}
-		elseif ($where == 'leading')
+		} elseif ($where == 'leading')
 		{
 			$trailing	= '';
 		}