iNextrix / ASTPP

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

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');
+}
 /**
  * CodeIgniter
  *

web_interface/astpp/system/core/URI.php

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

web_interface/astpp/system/core/Loader.php

Braces +17 added lines, -29 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
  *
@@ -695,8 +697,7 @@ 
 			$void = array_shift($this->_ci_helper_paths);
 			$void = array_shift($this->_ci_view_paths);
 			$void = array_shift($config->_config_paths);
-		}
-		else
+		} else
 		{
 			$path = rtrim($path, '/').'/';
 			foreach (array('_ci_library_paths', '_ci_model_paths', '_ci_helper_paths') as $var)
@@ -753,8 +754,7 @@ 
 		{
 			$_ci_x = explode('/', $_ci_path);
 			$_ci_file = end($_ci_x);
-		}
-		else
+		} else
 		{
 			$_ci_ext = pathinfo($_ci_view, PATHINFO_EXTENSION);
 			$_ci_file = ($_ci_ext == '') ? $_ci_view.'.php' : $_ci_view;
@@ -827,8 +827,7 @@ 
 		if ((bool) @ini_get('short_open_tag') === FALSE AND config_item('rewrite_short_tags') == TRUE)
 		{
 			echo eval('?>'.preg_replace("/;*\s*\?>/", "; ?>", str_replace('<?=', '<?php echo ', file_get_contents($_ci_path))));
-		}
-		else
+		} else
 		{
 			include($_ci_path); // include() vs include_once() allows for multiple views with the same name
 		}
@@ -856,8 +855,7 @@ 
 		if (ob_get_level() > $this->_ci_ob_level + 1)
 		{
 			ob_end_flush();
-		}
-		else
+		} else
 		{
 			$_ci_CI->output->append_output(ob_get_contents());
 			@ob_end_clean();
@@ -1025,18 +1023,15 @@ 
 					{
 						include($path .'config/'.ENVIRONMENT.'/'.strtolower($class).'.php');
 						break;
-					}
-					elseif (defined('ENVIRONMENT') AND file_exists($path .'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
+					} elseif (defined('ENVIRONMENT') AND file_exists($path .'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
 					{
 						include($path .'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php');
 						break;
-					}
-					elseif (file_exists($path .'config/'.strtolower($class).'.php'))
+					} elseif (file_exists($path .'config/'.strtolower($class).'.php'))
 					{
 						include($path .'config/'.strtolower($class).'.php');
 						break;
-					}
-					elseif (file_exists($path .'config/'.ucfirst(strtolower($class)).'.php'))
+					} elseif (file_exists($path .'config/'.ucfirst(strtolower($class)).'.php'))
 					{
 						include($path .'config/'.ucfirst(strtolower($class)).'.php');
 						break;
@@ -1050,17 +1045,14 @@ 
 			if (class_exists('CI_'.$class))
 			{
 				$name = 'CI_'.$class;
-			}
-			elseif (class_exists(config_item('subclass_prefix').$class))
+			} elseif (class_exists(config_item('subclass_prefix').$class))
 			{
 				$name = config_item('subclass_prefix').$class;
-			}
-			else
+			} else
 			{
 				$name = $class;
 			}
-		}
-		else
+		} else
 		{
 			$name = $prefix.$class;
 		}
@@ -1079,8 +1071,7 @@ 
 		if (is_null($object_name))
 		{
 			$classvar = ( ! isset($this->_ci_varmap[$class])) ? $class : $this->_ci_varmap[$class];
-		}
-		else
+		} else
 		{
 			$classvar = $object_name;
 		}
@@ -1093,8 +1084,7 @@ 
 		if ($config !== NULL)
 		{
 			$CI->$classvar = new $name($config);
-		}
-		else
+		} else
 		{
 			$CI->$classvar = new $name;
 		}
@@ -1116,8 +1106,7 @@ 
 		if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/autoload.php'))
 		{
 			include(APPPATH.'config/'.ENVIRONMENT.'/autoload.php');
-		}
-		else
+		} else
 		{
 			include(APPPATH.'config/autoload.php');
 		}
@@ -1231,8 +1220,7 @@ 
 		if ( ! is_array($filename))
 		{
 			return array(strtolower(str_replace('.php', '', str_replace($extension, '', $filename)).$extension));
-		}
-		else
+		} else
 		{
 			foreach ($filename as $key => $val)
 			{

web_interface/astpp/system/core/Exceptions.php

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');
+}
 /**
  * CodeIgniter
  *

web_interface/astpp/system/core/Controller.php

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');
+}
 /**
  * CodeIgniter
  *

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

Braces +56 added lines, -79 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
  *
@@ -237,13 +239,11 @@ 
 				if (is_array($value[0]))
 				{
 					$temp = new XML_RPC_Values($value['0'], 'array');
-				}
-				else
+				} else
 				{
 					$temp = new XML_RPC_Values($value['0'], 'string');
 				}
-			}
-			elseif (is_array($value['0']) && ($value['1'] == 'struct' OR $value['1'] == 'array'))
+			} elseif (is_array($value['0']) && ($value['1'] == 'struct' OR $value['1'] == 'array'))
 			{
 				while (list($k) = each($value['0']))
 				{
@@ -251,13 +251,11 @@ 
 				}
 
 				$temp = new XML_RPC_Values($value['0'], $value['1']);
-			}
-			else
+			} else
 			{
 				$temp = new XML_RPC_Values($value['0'], $value['1']);
 			}
-		}
-		else
+		} else
 		{
 			$temp = new XML_RPC_Values($value, 'string');
 		}
@@ -280,8 +278,7 @@ 
 		{
 			$this->error = $this->result->errstr;
 			return FALSE;
-		}
-		elseif ( ! is_object($this->result->val))
+		} elseif ( ! is_object($this->result->val))
 		{
 			$this->error = $this->result->errstr;
 			return FALSE;
@@ -443,14 +440,12 @@ 
 			// error
 			$this->errno = $code;
 			$this->errstr = htmlentities($fstr);
-		}
-		else if ( ! is_object($val))
+		} else if ( ! is_object($val))
 		{
 			// programmer error, not an object
 			error_log("Invalid type '" . gettype($val) . "' (value: $val) passed to XML_RPC_Response.  Defaulting to empty value.");
 			$this->val = new XML_RPC_Values();
-		}
-		else
+		} else
 		{
 			$this->val = $val;
 		}
@@ -490,8 +485,7 @@ 
 		</struct>
 	</value>
 </fault>';
-		}
-		else
+		} else
 		{
 			$result .= "<params>\n<param>\n" .
 					$this->val->serialize_class() .
@@ -512,24 +506,21 @@ 
 				if (is_array($array[$key]))
 				{
 					$array[$key] = $this->decode($array[$key]);
-				}
-				else
+				} else
 				{
 					$array[$key] = ($this->xss_clean) ? $CI->security->xss_clean($array[$key]) : $array[$key];
 				}
 			}
 
 			$result = $array;
-		}
-		else
+		} else
 		{
 			$result = $this->xmlrpc_decoder($this->val);
 
 			if (is_array($result))
 			{
 				$result = $this->decode($result);
-			}
-			else
+			} else
 			{
 				$result = ($this->xss_clean) ? $CI->security->xss_clean($result) : $result;
 			}
@@ -551,8 +542,7 @@ 
 		if ($kind == 'scalar')
 		{
 			return $xmlrpc_val->scalarval();
-		}
-		elseif ($kind == 'array')
+		} elseif ($kind == 'array')
 		{
 			reset($xmlrpc_val->me);
 			list($a,$b) = each($xmlrpc_val->me);
@@ -565,8 +555,7 @@ 
 				$arr[] = $this->xmlrpc_decoder($xmlrpc_val->me['array'][$i]);
 			}
 			return $arr;
-		}
-		elseif ($kind == 'struct')
+		} elseif ($kind == 'struct')
 		{
 			reset($xmlrpc_val->me['struct']);
 			$arr = array();
@@ -764,8 +753,7 @@ 
 
 			$r = new XML_RPC_Response(0, $this->xmlrpcerr['invalid_return'],$this->xmlrpcstr['invalid_return'].' '.$this->xh[$parser]['isf_reason']);
 			return $r;
-		}
-		elseif ( ! is_object($this->xh[$parser]['value']))
+		} elseif ( ! is_object($this->xh[$parser]['value']))
 		{
 			$r = new XML_RPC_Response(0, $this->xmlrpcerr['invalid_return'],$this->xmlrpcstr['invalid_return'].' '.$this->xh[$parser]['isf_reason']);
 			return $r;
@@ -815,8 +803,7 @@ 
 			}
 
 			$r = new XML_RPC_Response($v, $errno, $errstr_v->scalarval());
-		}
-		else
+		} else
 		{
 			$r = new XML_RPC_Response($v);
 		}
@@ -846,7 +833,9 @@ 
 	function open_tag($the_parser, $name, $attrs)
 	{
 		// If invalid nesting, then return
-		if ($this->xh[$the_parser]['isf'] > 1) return;
+		if ($this->xh[$the_parser]['isf'] > 1) {
+			return;
+		}
 
 		// Evaluate and check for correct nesting of XML elements
 
@@ -858,8 +847,7 @@ 
 				$this->xh[$the_parser]['isf_reason'] = 'Top level XML-RPC element is missing';
 				return;
 			}
-		}
-		else
+		} else
 		{
 			// not top level element: see if parent is OK
 			if ( ! in_array($this->xh[$the_parser]['stack'][0], $this->valid_parents[$name], TRUE))
@@ -936,7 +924,9 @@ 
 		// Add current element name to stack, to allow validation of nesting
 		array_unshift($this->xh[$the_parser]['stack'], $name);
 
-		if ($name != 'VALUE') $this->xh[$the_parser]['lv'] = 0;
+		if ($name != 'VALUE') {
+			$this->xh[$the_parser]['lv'] = 0;
+		}
 	}
 	// END
 
@@ -947,7 +937,9 @@ 
 
 	function closing_tag($the_parser, $name)
 	{
-		if ($this->xh[$the_parser]['isf'] > 1) return;
+		if ($this->xh[$the_parser]['isf'] > 1) {
+			return;
+		}
 
 		// Remove current element from stack and set variable
 		// NOTE: If the XML validates, then we do not have to worry about
@@ -979,50 +971,42 @@ 
 				if ($name == 'STRING')
 				{
 					$this->xh[$the_parser]['value'] = $this->xh[$the_parser]['ac'];
-				}
-				elseif ($name=='DATETIME.ISO8601')
+				} elseif ($name=='DATETIME.ISO8601')
 				{
 					$this->xh[$the_parser]['vt']	= $this->xmlrpcDateTime;
 					$this->xh[$the_parser]['value'] = $this->xh[$the_parser]['ac'];
-				}
-				elseif ($name=='BASE64')
+				} elseif ($name=='BASE64')
 				{
 					$this->xh[$the_parser]['value'] = base64_decode($this->xh[$the_parser]['ac']);
-				}
-				elseif ($name=='BOOLEAN')
+				} elseif ($name=='BOOLEAN')
 				{
 					// Translated BOOLEAN values to TRUE AND FALSE
 					if ($this->xh[$the_parser]['ac'] == '1')
 					{
 						$this->xh[$the_parser]['value'] = TRUE;
-					}
-					else
+					} else
 					{
 						$this->xh[$the_parser]['value'] = FALSE;
 					}
-				}
-				elseif ($name=='DOUBLE')
+				} elseif ($name=='DOUBLE')
 				{
 					// we have a DOUBLE
 					// we must check that only 0123456789-.<space> are characters here
 					if ( ! preg_match('/^[+-]?[eE0-9\t \.]+$/', $this->xh[$the_parser]['ac']))
 					{
 						$this->xh[$the_parser]['value'] = 'ERROR_NON_NUMERIC_FOUND';
-					}
-					else
+					} else
 					{
 						$this->xh[$the_parser]['value'] = (double)$this->xh[$the_parser]['ac'];
 					}
-				}
-				else
+				} else
 				{
 					// we have an I4/INT
 					// we must check that only 0123456789-<space> are characters here
 					if ( ! preg_match('/^[+-]?[0-9\t ]+$/', $this->xh[$the_parser]['ac']))
 					{
 						$this->xh[$the_parser]['value'] = 'ERROR_NON_NUMERIC_FOUND';
-					}
-					else
+					} else
 					{
 						$this->xh[$the_parser]['value'] = (int)$this->xh[$the_parser]['ac'];
 					}
@@ -1045,8 +1029,7 @@ 
 				{
 					// Array
 					$this->xh[$the_parser]['valuestack'][0]['values'][] = $temp;
-				}
-				else
+				} else
 				{
 					// Struct
 					$this->xh[$the_parser]['value'] = $temp;
@@ -1091,7 +1074,10 @@ 
 
 	function character_data($the_parser, $data)
 	{
-		if ($this->xh[$the_parser]['isf'] > 1) return; // XML Fault found already
+		if ($this->xh[$the_parser]['isf'] > 1) {
+			return;
+		}
+		// XML Fault found already
 
 		// If a value has not been found
 		if ($this->xh[$the_parser]['lv'] != 3)
@@ -1124,8 +1110,7 @@ 
 				if (is_array($array[$key]))
 				{
 					$array[$key] = $this->output_parameters($array[$key]);
-				}
-				else
+				} else
 				{
 					// 'bits' is for the MetaWeblog API image bits
 					// @todo - this needs to be made more general purpose
@@ -1134,8 +1119,7 @@ 
 			}
 
 			$parameters = $array;
-		}
-		else
+		} else
 		{
 			$parameters = array();
 
@@ -1146,8 +1130,7 @@ 
 				if (is_array($a_param))
 				{
 					$parameters[] = $this->output_parameters($a_param);
-				}
-				else
+				} else
 				{
 					$parameters[] = ($this->xss_clean) ? $CI->security->xss_clean($a_param) : $a_param;
 				}
@@ -1165,8 +1148,7 @@ 
 		if ($kind == 'scalar')
 		{
 			return $param->scalarval();
-		}
-		elseif ($kind == 'array')
+		} elseif ($kind == 'array')
 		{
 			reset($param->me);
 			list($a,$b) = each($param->me);
@@ -1179,8 +1161,7 @@ 
 			}
 
 			return $arr;
-		}
-		elseif ($kind == 'struct')
+		} elseif ($kind == 'struct')
 		{
 			reset($param->me['struct']);
 
@@ -1222,12 +1203,10 @@ 
 			if ($this->xmlrpcTypes[$type] == 1)
 			{
 				$this->addScalar($val,$type);
-			}
-			elseif ($this->xmlrpcTypes[$type] == 2)
+			} elseif ($this->xmlrpcTypes[$type] == 2)
 			{
 				$this->addArray($val);
-			}
-			elseif ($this->xmlrpcTypes[$type] == 3)
+			} elseif ($this->xmlrpcTypes[$type] == 3)
 			{
 				$this->addStruct($val);
 			}
@@ -1255,8 +1234,7 @@ 
 			if (strcasecmp($val,'true')==0 OR $val==1 OR ($val==true && strcasecmp($val,'false')))
 			{
 				$val = 1;
-			}
-			else
+			} else
 			{
 				$val=0;
 			}
@@ -1268,8 +1246,7 @@ 
 			$ar = $this->me['array'];
 			$ar[] = new XML_RPC_Values($val, $type);
 			$this->me['array'] = $ar;
-		}
-		else
+		} else
 		{
 			// a scalar, so set the value and remember we're scalar
 			$this->me[$type] = $val;
@@ -1405,13 +1382,13 @@ 
 		if ($utc == 1)
 		{
 			$t = strftime("%Y%m%dT%H:%i:%s", $time);
-		}
-		else
+		} else
 		{
-			if (function_exists('gmstrftime'))
-				$t = gmstrftime("%Y%m%dT%H:%i:%s", $time);
-			else
-				$t = strftime("%Y%m%dT%H:%i:%s", $time - date('Z'));
+			if (function_exists('gmstrftime')) {
+							$t = gmstrftime("%Y%m%dT%H:%i:%s", $time);
+			} else {
+							$t = strftime("%Y%m%dT%H:%i:%s", $time - date('Z'));
+			}
 		}
 		return $t;
 	}

web_interface/astpp/system/libraries/Parser.php

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