iNextrix / ASTPP

web_interface/astpp/system/libraries/Zip.php

Doc Comments +5 added lines, -2 removed lines

@@ -103,6 +103,7 @@ 
 	 *
 	 * @access	private
 	 * @param	string	the directory name
+	 * @param integer $file_mdate
 	 * @return	void
 	 */
 	function _add_dir($dir, $file_mtime, $file_mdate)
@@ -156,6 +157,7 @@ 
 	 * @access	public
 	 * @param	mixed
 	 * @param	string
+	 * @param string $data
 	 * @return	void
 	 */
 	function add_data($filepath, $data = NULL)
@@ -185,6 +187,7 @@ 
 	 * @access	private
 	 * @param	string	the file name/path
 	 * @param	string	the data to be encoded
+	 * @param integer $file_mdate
 	 * @return	void
 	 */
 	function _add_data($filepath, $data, $file_mtime, $file_mdate)
@@ -323,7 +326,7 @@ 
 	 * Get the Zip file
 	 *
 	 * @access	public
-	 * @return	binary string
+	 * @return	false|string string
 	 */
 	function get_zip()
 	{
@@ -378,7 +381,7 @@ 
 	 * @access	public
 	 * @param	string	the file name
 	 * @param	string	the data to be encoded
-	 * @return	bool
+	 * @return	boolean|null
 	 */
 	function download($filename = 'backup.zip')
 	{

Spacing +9 added lines, -9 removed lines

@@ -30,12 +30,12 @@ 
  * @author		ExpressionEngine Dev Team
  * @link		http://codeigniter.com/user_guide/libraries/zip.html
  */
-class CI_Zip  {
+class CI_Zip {
 
 	var $zipdata	= '';
-	var $directory	= '';
+	var $directory = '';
 	var $entries	= 0;
-	var $file_num	= 0;
+	var $file_num = 0;
 	var $offset		= 0;
 	var $now;
 
@@ -128,9 +128,9 @@ 
 			"\x50\x4b\x01\x02\x00\x00\x0a\x00\x00\x00\x00\x00"
 			.pack('v', $file_mtime)
 			.pack('v', $file_mdate)
-			.pack('V',0) // crc32
-			.pack('V',0) // compressed filesize
-			.pack('V',0) // uncompressed filesize
+			.pack('V', 0) // crc32
+			.pack('V', 0) // compressed filesize
+			.pack('V', 0) // uncompressed filesize
 			.pack('v', strlen($dir)) // length of pathname
 			.pack('v', 0) // extra field length
 			.pack('v', 0) // file comment length
@@ -387,12 +387,12 @@ 
 			$filename .= '.zip';
 		}
 
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$CI->load->helper('download');
 
 		$get_zip = $this->get_zip();
 
-		$zip_content =& $get_zip;
+		$zip_content = & $get_zip;
 
 		force_download($filename, $zip_content);
 	}
@@ -414,7 +414,7 @@ 
 		$this->directory	= '';
 		$this->entries		= 0;
 		$this->file_num		= 0;
-		$this->offset		= 0;
+		$this->offset = 0;
 	}
 
 }

Braces +5 added lines, -5 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');
+}
 /**
  * Code Igniter
  *
@@ -115,8 +117,7 @@ 
 		if ($primary === TRUE)
 		{
 			$this->primary_keys[] = $key;
-		}
-		else
+		} else
 		{
 			$this->keys[] = $key;
 		}
@@ -150,8 +151,7 @@ 
 													)
 								));
 				$this->add_key('id', TRUE);
-			}
-			else
+			} else
 			{
 				if (strpos($field, ' ') === FALSE)
 				{

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

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
  * as this file.
  *
  */
-       $assets_path='assets';
+       $assets_path = 'assets';
 /*
  *---------------------------------------------------------------
  * APPLICATION FOLDER NAME
@@ -187,7 +187,7 @@ 
 	define('SYSDIR', trim(strrchr(trim(BASEPATH, '/'), '/'), '/'));
 	
 	//Name of the "assets folder'
-	define('ASSETSDIR',realpath($assets_path).'/');
+	define('ASSETSDIR', realpath($assets_path).'/');
 	
 	// The path to the "application" folder
 	if (is_dir($application_folder))

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

Spacing +10 added lines, -10 removed lines

@@ -112,7 +112,7 @@ 
  *  Start the timer... tick tock tick tock...
  * ------------------------------------------------------
  */
-	$BM =& load_class('Benchmark', 'core');
+	$BM = & load_class('Benchmark', 'core');
 	$BM->mark('total_execution_time_start');
 	$BM->mark('loading_time:_base_classes_start');
 
@@ -121,7 +121,7 @@ 
  *  Instantiate the hooks class
  * ------------------------------------------------------
  */
-	$EXT =& load_class('Hooks', 'core');
+	$EXT = & load_class('Hooks', 'core');
 
 /*
  * ------------------------------------------------------
@@ -135,7 +135,7 @@ 
  *  Instantiate the config class
  * ------------------------------------------------------
  */
-	$CFG =& load_class('Config', 'core');
+	$CFG = & load_class('Config', 'core');
 
 	// Do we have any manually set config items in the index.php file?
 	if (isset($assign_to_config))
@@ -155,21 +155,21 @@ 
  *
  */
 
-	$UNI =& load_class('Utf8', 'core');
+	$UNI = & load_class('Utf8', 'core');
 
 /*
  * ------------------------------------------------------
  *  Instantiate the URI class
  * ------------------------------------------------------
  */
-	$URI =& load_class('URI', 'core');
+	$URI = & load_class('URI', 'core');
 
 /*
  * ------------------------------------------------------
  *  Instantiate the routing class and set the routing
  * ------------------------------------------------------
  */
-	$RTR =& load_class('Router', 'core');
+	$RTR = & load_class('Router', 'core');
 	$RTR->_set_routing();
 
 	// Set any routing overrides that may exist in the main index file
@@ -183,7 +183,7 @@ 
  *  Instantiate the output class
  * ------------------------------------------------------
  */
-	$OUT =& load_class('Output', 'core');
+	$OUT = & load_class('Output', 'core');
 
 /*
  * ------------------------------------------------------
@@ -203,21 +203,21 @@ 
  * Load the security class for xss and csrf support
  * -----------------------------------------------------
  */
-	$SEC =& load_class('Security', 'core');
+	$SEC = & load_class('Security', 'core');
 
 /*
  * ------------------------------------------------------
  *  Load the Input class and sanitize globals
  * ------------------------------------------------------
  */
-	$IN	=& load_class('Input', 'core');
+	$IN = & load_class('Input', 'core');
 
 /*
  * ------------------------------------------------------
  *  Load the Language class
  * ------------------------------------------------------
  */
-	$LANG =& load_class('Lang', 'core');
+	$LANG = & load_class('Lang', 'core');
 
 /*
  * ------------------------------------------------------

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

Spacing +3 added lines, -3 removed lines

@@ -31,13 +31,13 @@ 
 	 *
 	 * @var array
 	 */
-	var $language	= array();
+	var $language = array();
 	/**
 	 * List of loaded language files
 	 *
 	 * @var array
 	 */
-	var $is_loaded	= array();
+	var $is_loaded = array();
 
 	/**
 	 * Constructor
@@ -78,7 +78,7 @@ 
 			return;
 		}
 
-		$config =& get_config();
+		$config = & get_config();
 
 		if ($idiom == '')
 		{

Braces +4 added lines, -3 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');
+}
 
 // ------------------------------------------------------------------------
 
@@ -59,8 +61,7 @@ 
 		if ($download == "")
 		{
 			return $str;	
-		}
-		else
+		} else
 		{	
 			echo $str;
 		}		

web_interface/astpp/system/core/Router.php

Spacing +7 added lines, -7 removed lines

@@ -41,35 +41,35 @@ 
 	 * @var array
 	 * @access public
 	 */
-	var $routes			= array();
+	var $routes = array();
 	/**
 	 * List of error routes
 	 *
 	 * @var array
 	 * @access public
 	 */
-	var $error_routes	= array();
+	var $error_routes = array();
 	/**
 	 * Current class name
 	 *
 	 * @var string
 	 * @access public
 	 */
-	var $class			= '';
+	var $class = '';
 	/**
 	 * Current method name
 	 *
 	 * @var string
 	 * @access public
 	 */
-	var $method			= 'index';
+	var $method = 'index';
 	/**
 	 * Sub-directory that contains the requested controller class
 	 *
 	 * @var string
 	 * @access public
 	 */
-	var $directory		= '';
+	var $directory = '';
 	/**
 	 * Default controller (and method if specific)
 	 *
@@ -85,8 +85,8 @@ 
 	 */
 	function __construct()
 	{
-		$this->config =& load_class('Config', 'core');
-		$this->uri =& load_class('URI', 'core');
+		$this->config = & load_class('Config', 'core');
+		$this->uri = & load_class('URI', 'core');
 		log_message('debug', "Router Class Initialized");
 	}
 

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

Spacing +15 added lines, -15 removed lines

@@ -34,7 +34,7 @@ 
 	 * @var array
 	 * @access public
 	 */
-	var	$keyval			= array();
+	var	$keyval = array();
 	/**
 	 * Current uri string
 	 *
@@ -48,7 +48,7 @@ 
 	 * @var array
 	 * @access public
 	 */
-	var $segments		= array();
+	var $segments = array();
 	/**
 	 * Re-indexed list of uri segments
 	 * Starts at 1 instead of 0
@@ -56,7 +56,7 @@ 
 	 * @var array
 	 * @access public
 	 */
-	var $rsegments		= array();
+	var $rsegments = array();
 
 	/**
 	 * Constructor
@@ -69,7 +69,7 @@ 
 	 */
 	function __construct()
 	{
-		$this->config =& load_class('Config', 'core');
+		$this->config = & load_class('Config', 'core');
 		log_message('debug', "URI Class Initialized");
 	}
 
@@ -110,7 +110,7 @@ 
 			}
 
 			// No PATH_INFO?... What about QUERY_STRING?
-			$path =  (isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : @getenv('QUERY_STRING');
+			$path = (isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : @getenv('QUERY_STRING');
 			if (trim($path, '/') != '')
 			{
 				$this->_set_uri_string($path);
@@ -161,9 +161,9 @@ 
 		$str = remove_invisible_characters($str, FALSE);
 //================ITPL=======================
   $pos = strpos($str, "_json");
- if($pos > 0 && !isset($_SERVER['HTTP_X_REQUESTED_WITH'])){
+ 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;
 }
@@ -242,7 +242,7 @@ 
 	{
 		$args = array_slice($_SERVER['argv'], 1);
 
-		return $args ? '/' . implode('/', $args) : '';
+		return $args ? '/'.implode('/', $args) : '';
 	}
 
 	// --------------------------------------------------------------------
@@ -267,8 +267,8 @@ 
 		}
 
 		// Convert programatic characters to entities
-		$bad	= array('$',		'(',		')',		'%28',		'%29');
-		$good	= array('$',	'(',	')',	'(',	')');
+		$bad = array('$', '(', ')', '%28', '%29');
+		$good = array('$', '(', ')', '(', ')');
 
 		return str_replace($bad, $good, $str);
 	}
@@ -283,7 +283,7 @@ 
 	 */
 	function _remove_url_suffix()
 	{
-		if  ($this->config->item('url_suffix') != "")
+		if ($this->config->item('url_suffix') != "")
 		{
 			$this->uri_string = preg_replace("|".preg_quote($this->config->item('url_suffix'))."$|", "", $this->uri_string);
 		}
@@ -559,16 +559,16 @@ 
 	 */
 	function _slash_segment($n, $where = 'trailing', $which = 'segment')
 	{
-		$leading	= '/';
-		$trailing	= '/';
+		$leading = '/';
+		$trailing = '/';
 
 		if ($where == 'trailing')
 		{
-			$leading	= '';
+			$leading = '';
 		}
 		elseif ($where == 'leading')
 		{
-			$trailing	= '';
+			$trailing = '';
 		}
 
 		return $leading.$this->$which($n).$trailing;

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	= '';
 		}

Doc Comments +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 	 * and "_end" respectively).  It then compiles the execution times for
 	 * all points and returns it as an array
 	 *
-	 * @return	array
+	 * @return	string
 	 */
 	protected function _compile_benchmarks()
 	{

web_interface/astpp/system/core/Controller.php

Spacing +3 added lines, -3 removed lines

@@ -36,17 +36,17 @@
 	 */
 	public function __construct()
 	{
-		self::$instance =& $this;
+		self::$instance = & $this;
 		
 		// Assign all the class objects that were instantiated by the
 		// bootstrap file (CodeIgniter.php) to local class variables
 		// so that CI can run as one big super object.
 		foreach (is_loaded() as $var => $class)
 		{
-			$this->$var =& load_class($class);
+			$this->$var = & load_class($class);
 		}
 
-		$this->load =& load_class('Loader', 'core');
+		$this->load = & load_class('Loader', 'core');
 
 		$this->load->initialize();
 		

Braces +3 added lines, -1 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');
+}
 /*
 | -------------------------------------------------------------------
 | AUTO-LOADER

web_interface/astpp/system/core/Utf8.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,13 +60,11 @@ 
 			{
 				define('MB_ENABLED', TRUE);
 				mb_internal_encoding('UTF-8');
-			}
-			else
+			} else
 			{
 				define('MB_ENABLED', FALSE);
 			}
-		}
-		else
+		} else
 		{
 			log_message('debug', "UTF-8 Support Disabled");
 			define('UTF8_ENABLED', FALSE);
@@ -127,12 +127,10 @@ 
 		if (function_exists('iconv'))
 		{
 			$str = @iconv($encoding, 'UTF-8', $str);
-		}
-		elseif (function_exists('mb_convert_encoding'))
+		} elseif (function_exists('mb_convert_encoding'))
 		{
 			$str = @mb_convert_encoding($str, 'UTF-8', $encoding);
-		}
-		else
+		} else
 		{
 			return FALSE;
 		}

web_interface/astpp/system/libraries/Parser.php

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
 	 */
 	public function parse($template, $data, $return = FALSE)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$template = $CI->load->view($template, $data, TRUE);
 
 		return $this->_parse($template, $data, $return);
@@ -104,7 +104,7 @@ 
 
 		if ($return == FALSE)
 		{
-			$CI =& get_instance();
+			$CI = & get_instance();
 			$CI->output->append_output($template);
 		}
 
@@ -197,7 +197,7 @@ 
 	 */
 	function _match_pair($string, $variable)
 	{
-		if ( ! preg_match("|" . preg_quote($this->l_delim) . $variable . preg_quote($this->r_delim) . "(.+?)". preg_quote($this->l_delim) . '/' . $variable . preg_quote($this->r_delim) . "|s", $string, $match))
+		if ( ! preg_match("|".preg_quote($this->l_delim).$variable.preg_quote($this->r_delim)."(.+?)".preg_quote($this->l_delim).'/'.$variable.preg_quote($this->r_delim)."|s", $string, $match))
 		{
 			return FALSE;
 		}

Braces +5 added lines, -5 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
  *
@@ -95,8 +97,7 @@ 
 			if (is_array($val))
 			{
 				$template = $this->_parse_pair($key, $val, $template);
-			}
-			else
+			} else
 			{
 				$template = $this->_parse_single($key, (string)$val, $template);
 			}
@@ -172,8 +173,7 @@ 
 				if ( ! is_array($val))
 				{
 					$temp = $this->_parse_single($key, $val, $temp);
-				}
-				else
+				} else
 				{
 					$temp = $this->_parse_pair($key, $val, $temp);
 				}