iNextrix / ASTPP

web_interface/astpp/system/libraries/Profiler.php

Braces +10 added lines, -15 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
  *
@@ -213,8 +215,7 @@ 
 			if (count($db->queries) == 0)
 			{
 				$output .= "<tr><td style='width:100%;color:#0000FF;font-weight:normal;background-color:#eee;padding:5px;'>".$this->CI->lang->line('profiler_no_queries')."</td></tr>\n";
-			}
-			else
+			} else
 			{
 				foreach ($db->queries as $key => $val)
 				{
@@ -258,8 +259,7 @@ 
 		if (count($_GET) == 0)
 		{
 			$output .= "<div style='color:#cd6e00;font-weight:normal;padding:4px 0 4px 0'>".$this->CI->lang->line('profiler_no_get')."</div>";
-		}
-		else
+		} else
 		{
 			$output .= "\n\n<table style='width:100%; border:none'>\n";
 
@@ -274,8 +274,7 @@ 
 				if (is_array($val))
 				{
 					$output .= "<pre>" . htmlspecialchars(stripslashes(print_r($val, true))) . "</pre>";
-				}
-				else
+				} else
 				{
 					$output .= htmlspecialchars(stripslashes($val));
 				}
@@ -307,8 +306,7 @@ 
 		if (count($_POST) == 0)
 		{
 			$output .= "<div style='color:#009900;font-weight:normal;padding:4px 0 4px 0'>".$this->CI->lang->line('profiler_no_post')."</div>";
-		}
-		else
+		} else
 		{
 			$output .= "\n\n<table style='width:100%'>\n";
 
@@ -323,8 +321,7 @@ 
 				if (is_array($val))
 				{
 					$output .= "<pre>" . htmlspecialchars(stripslashes(print_r($val, TRUE))) . "</pre>";
-				}
-				else
+				} else
 				{
 					$output .= htmlspecialchars(stripslashes($val));
 				}
@@ -356,8 +353,7 @@ 
 		if ($this->CI->uri->uri_string == '')
 		{
 			$output .= "<div style='color:#000;font-weight:normal;padding:4px 0 4px 0'>".$this->CI->lang->line('profiler_no_uri')."</div>";
-		}
-		else
+		} else
 		{
 			$output .= "<div style='color:#000;font-weight:normal;padding:4px 0 4px 0'>".$this->CI->uri->uri_string."</div>";
 		}
@@ -409,8 +405,7 @@ 
 		if (function_exists('memory_get_usage') && ($usage = memory_get_usage()) != '')
 		{
 			$output .= "<div style='color:#5a0099;font-weight:normal;padding:4px 0 4px 0'>".number_format($usage).' bytes</div>';
-		}
-		else
+		} else
 		{
 			$output .= "<div style='color:#5a0099;font-weight:normal;padding:4px 0 4px 0'>".$this->CI->lang->line('profiler_no_memory')."</div>";
 		}

web_interface/astpp/system/libraries/Unit_test.php

Braces +11 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
  *
@@ -95,13 +97,13 @@ 
 			$expected = str_replace('is_float', 'is_double', $expected);
 			$result = ($expected($test)) ? TRUE : FALSE;
 			$extype = str_replace(array('true', 'false'), 'bool', str_replace('is_', '', $expected));
-		}
-		else
+		} else
 		{
-			if ($this->strict == TRUE)
-				$result = ($test === $expected) ? TRUE : FALSE;
-			else
-				$result = ($test == $expected) ? TRUE : FALSE;
+			if ($this->strict == TRUE) {
+							$result = ($test === $expected) ? TRUE : FALSE;
+			} else {
+							$result = ($test == $expected) ? TRUE : FALSE;
+			}
 
 			$extype = gettype($expected);
 		}
@@ -157,8 +159,7 @@ 
 					if ($val == $CI->lang->line('ut_passed'))
 					{
 						$val = '<span style="color: #0C0;">'.$val.'</span>';
-					}
-					elseif ($val == $CI->lang->line('ut_failed'))
+					} elseif ($val == $CI->lang->line('ut_failed'))
 					{
 						$val = '<span style="color: #C00;">'.$val.'</span>';
 					}
@@ -249,8 +250,7 @@ 
 						}
 						$temp[$CI->lang->line('ut_'.$k)] = $v;
 					}
-				}
-				else
+				} else
 				{
 					if (FALSE !== ($line = $CI->lang->line(strtolower('ut_'.$val))))
 					{

web_interface/astpp/system/libraries/Sha1.php

Braces +17 added lines, -17 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
  *
@@ -93,8 +95,7 @@ 
 				if ($j < 16)
 				{
 					$w[$j] = $x[$i + $j];
-				}
-				else
+				} else
 				{
 					$w[$j] = $this->_rol($w[$j - 3] ^ $w[$j - 8] ^ $w[$j - 14] ^ $w[$j - 16], 1);
 				}
@@ -149,12 +150,15 @@ 
 	 */
 	function _ft($t, $b, $c, $d)
 	{
-		if ($t < 20)
-			return ($b & $c) | ((~$b) & $d);
-		if ($t < 40)
-			return $b ^ $c ^ $d;
-		if ($t < 60)
-			return ($b & $c) | ($b & $d) | ($c & $d);
+		if ($t < 20) {
+					return ($b & $c) | ((~$b) & $d);
+		}
+		if ($t < 40) {
+					return $b ^ $c ^ $d;
+		}
+		if ($t < 60) {
+					return ($b & $c) | ($b & $d) | ($c & $d);
+		}
 
 		return $b ^ $c ^ $d;
 	}
@@ -172,16 +176,13 @@ 
 		if ($t < 20)
 		{
 			return 1518500249;
-		}
-		else if ($t < 40)
+		} else if ($t < 40)
 		{
 			return 1859775393;
-		}
-		else if ($t < 60)
+		} else if ($t < 60)
 		{
 			return -1894007588;
-		}
-		else
+		} else
 		{
 			return -899497514;
 		}
@@ -231,8 +232,7 @@ 
 		if (strlen($bin) < $b)
 		{
 			$bin = 0;
-		}
-		else
+		} else
 		{
 			$bin = substr($bin, 0, strlen($bin) - $b);
 		}

web_interface/astpp/system/libraries/Session.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
  *
@@ -106,8 +108,7 @@ 
 		if ( ! $this->sess_read())
 		{
 			$this->sess_create();
-		}
-		else
+		} else
 		{
 			$this->sess_update();
 		}
@@ -148,8 +149,7 @@ 
 		if ($this->sess_encrypt_cookie == TRUE)
 		{
 			$session = $this->CI->encrypt->decode($session);
-		}
-		else
+		} else
 		{
 			// encryption was not used, so we need to check the md5 hash
 			$hash	 = substr($session, strlen($session)-32); // get last 32 chars
@@ -277,8 +277,7 @@ 
 		if (count($custom_userdata) === 0)
 		{
 			$custom_userdata = '';
-		}
-		else
+		} else
 		{
 			// Serialize the custom data array so we can store it
 			$custom_userdata = $this->_serialize($custom_userdata);
@@ -622,8 +621,7 @@ 
 		{
 			$now = time();
 			$time = mktime(gmdate("H", $now), gmdate("i", $now), gmdate("s", $now), gmdate("m", $now), gmdate("d", $now), gmdate("Y", $now));
-		}
-		else
+		} else
 		{
 			$time = time();
 		}
@@ -652,8 +650,7 @@ 
 		if ($this->sess_encrypt_cookie == TRUE)
 		{
 			$cookie_data = $this->CI->encrypt->encode($cookie_data);
-		}
-		else
+		} else
 		{
 			// if encryption is not used, we provide an md5 hash to prevent userside tampering
 			$cookie_data = $cookie_data.md5($cookie_data.$this->encryption_key);
@@ -695,8 +692,7 @@ 
 					$data[$key] = str_replace('\\', '{{slash}}', $val);
 				}
 			}
-		}
-		else
+		} else
 		{
 			if (is_string($data))
 			{

web_interface/astpp/system/libraries/font/courieri.php

Braces +3 added lines, -2 removed lines

@@ -3,6 +3,7 @@
 $name = 'Courier-Oblique';

 $up = -100;

 $ut = 50;

-for($i=0;$i<=255;$i++)

-	$cw[chr($i)] = 600;

+for($i=0;$i<=255;$i++) {
+	$cw[chr($i)] = 600;
+}
 ?>

web_interface/astpp/system/libraries/Xmlrpcs.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
  *
@@ -219,12 +221,10 @@ 
 				xml_error_string(xml_get_error_code($parser)),
 				xml_get_current_line_number($parser)));
 			xml_parser_free($parser);
-		}
-		elseif ($parser_object->xh[$parser]['isf'])
+		} elseif ($parser_object->xh[$parser]['isf'])
 		{
 			return new XML_RPC_Response(0, $this->xmlrpcerr['invalid_return'], $this->xmlrpcstr['invalid_return']);
-		}
-		else
+		} else
 		{
 			xml_parser_free($parser);
 
@@ -306,14 +306,12 @@ 
 			{
 				return new XML_RPC_Response(0, $this->xmlrpcerr['unknown_method'], $this->xmlrpcstr['unknown_method']);
 			}
-		}
-		else
+		} else
 		{
 			if ($objectCall && ! is_callable(array($method_parts['0'],$method_parts['1'])))
 			{
 				return new XML_RPC_Response(0, $this->xmlrpcerr['unknown_method'], $this->xmlrpcstr['unknown_method']);
-			}
-			elseif ( ! $objectCall && ! is_callable($this->methods[$methName]['function']))
+			} elseif ( ! $objectCall && ! is_callable($this->methods[$methName]['function']))
 			{
 				return new XML_RPC_Response(0, $this->xmlrpcerr['unknown_method'], $this->xmlrpcstr['unknown_method']);
 			}
@@ -361,22 +359,19 @@ 
 			if ($method_parts[0] == "this" && $system_call == TRUE)
 			{
 				return call_user_func(array($this, $method_parts[1]), $m);
-			}
-			else
+			} else
 			{
 				if ($this->object === FALSE)
 				{
 					$CI =& get_instance();
 					return $CI->$method_parts['1']($m);
-				}
-				else
+				} else
 				{
 					return $this->object->$method_parts['1']($m);
 					//return call_user_func(array(&$method_parts['0'],$method_parts['1']), $m);
 				}
 			}
-		}
-		else
+		} else
 		{
 			return call_user_func($this->methods[$methName]['function'], $m);
 		}
@@ -442,13 +437,11 @@ 
 					$sigs[]= new XML_RPC_Values($cursig, 'array');
 				}
 				$r = new XML_RPC_Response(new XML_RPC_Values($sigs, 'array'));
-			}
-			else
+			} else
 			{
 				$r = new XML_RPC_Response(new XML_RPC_Values('undef', 'string'));
 			}
-		}
-		else
+		} else
 		{
 			$r = new XML_RPC_Response(0,$this->xmlrpcerr['introspect_unknown'], $this->xmlrpcstr['introspect_unknown']);
 		}
@@ -474,8 +467,7 @@ 
 			$docstring = isset($this->methods[$method_name]['docstring']) ? $this->methods[$method_name]['docstring'] : '';
 
 			return new XML_RPC_Response(new XML_RPC_Values($docstring, 'string'));
-		}
-		else
+		} else
 		{
 			return new XML_RPC_Response(0, $this->xmlrpcerr['introspect_unknown'], $this->xmlrpcstr['introspect_unknown']);
 		}
@@ -559,8 +551,7 @@ 
 		if ($call->kindOf() != 'struct')
 		{
 			return $this->multicall_error('notstruct');
-		}
-		elseif ( ! $methName = $call->me['struct']['methodName'])
+		} elseif ( ! $methName = $call->me['struct']['methodName'])
 		{
 			return $this->multicall_error('nomethod');
 		}
@@ -571,16 +562,13 @@ 
 		if ($methName->kindOf() != 'scalar' OR $scalar_type != 'string')
 		{
 			return $this->multicall_error('notstring');
-		}
-		elseif ($scalar_value == 'system.multicall')
+		} elseif ($scalar_value == 'system.multicall')
 		{
 			return $this->multicall_error('recursion');
-		}
-		elseif ( ! $params = $call->me['struct']['params'])
+		} elseif ( ! $params = $call->me['struct']['params'])
 		{
 			return $this->multicall_error('noparams');
-		}
-		elseif ($params->kindOf() != 'array')
+		} elseif ($params->kindOf() != 'array')
 		{
 			return $this->multicall_error('notarray');
 		}

web_interface/astpp/system/libraries/Javascript.php

Braces +14 added lines, -23 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
  *
@@ -639,8 +641,7 @@ 
 		if ($external_file !== '')
 		{
 			$this->_javascript_location = $external_file;
-		}
-		else
+		} else
 		{
 			if ($this->CI->config->item('javascript_location') != '')
 			{
@@ -651,12 +652,10 @@ 
 		if ($relative === TRUE OR strncmp($external_file, 'http://', 7) == 0 OR strncmp($external_file, 'https://', 8) == 0)
 		{
 			$str = $this->_open_script($external_file);
-		}
-		elseif (strpos($this->_javascript_location, 'http://') !== FALSE)
+		} elseif (strpos($this->_javascript_location, 'http://') !== FALSE)
 		{
 			$str = $this->_open_script($this->_javascript_location.$external_file);
-		}
-		else
+		} else
 		{
 			$str = $this->_open_script($this->CI->config->slash_item('base_url').$this->_javascript_location.$external_file);
 		}
@@ -763,17 +762,14 @@ 
 			if (is_object($result))
 			{
 				$json_result = $result->result_array();
-			}
-			elseif (is_array($result))
+			} elseif (is_array($result))
 			{
 				$json_result = $result;
-			}
-			else
+			} else
 			{
 				return $this->_prep_args($result);
 			}
-		}
-		else
+		} else
 		{
 			return 'null';
 		}
@@ -784,8 +780,7 @@ 
 		if ( ! is_array($json_result) AND empty($json_result))
 		{
 			show_error("Generate JSON Failed - Illegal key, value pair.");
-		}
-		elseif ($match_array_type)
+		} elseif ($match_array_type)
 		{
 			$_is_assoc = $this->_is_associative_array($json_result);
 		}
@@ -795,8 +790,7 @@ 
 			if ($_is_assoc)
 			{
 				$json[] = $this->_prep_args($k, TRUE).':'.$this->generate_json($v, $match_array_type);
-			}
-			else
+			} else
 			{
 				$json[] = $this->generate_json($v, $match_array_type);
 			}
@@ -848,16 +842,13 @@ 
 		if (is_null($result))
 		{
 			return 'null';
-		}
-		elseif (is_bool($result))
+		} elseif (is_bool($result))
 		{
 			return ($result === TRUE) ? 'true' : 'false';
-		}
-		elseif (is_string($result) OR $is_key)
+		} elseif (is_string($result) OR $is_key)
 		{
 			return '"'.str_replace(array('\\', "\t", "\n", "\r", '"', '/'), array('\\\\', '\\t', '\\n', "\\r", '\"', '\/'), $result).'"';			
-		}
-		elseif (is_scalar($result))
+		} elseif (is_scalar($result))
 		{
 			return $result;
 		}

web_interface/astpp/system/libraries/Encrypt.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
  *
@@ -120,8 +122,7 @@ 
 		if ($this->_mcrypt_exists === TRUE)
 		{
 			$enc = $this->mcrypt_encode($string, $key);
-		}
-		else
+		} else
 		{
 			$enc = $this->_xor_encode($string, $key);
 		}
@@ -158,8 +159,7 @@ 
 			{
 				return FALSE;
 			}
-		}
-		else
+		} else
 		{
 			$dec = $this->_xor_decode($dec, $key);
 		}
@@ -527,13 +527,11 @@ 
 				require_once(BASEPATH.'libraries/Sha1.php');
 				$SH = new CI_SHA;
 				return $SH->generate($str);
-			}
-			else
+			} else
 			{
 				return bin2hex(mhash(MHASH_SHA1, $str));
 			}
-		}
-		else
+		} else
 		{
 			return sha1($str);
 		}

web_interface/astpp/system/database/drivers/mysql/mysql_driver.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
  *
@@ -144,8 +146,7 @@ 
 		if ($this->use_set_names === TRUE)
 		{
 			return @mysql_query("SET NAMES '".$this->escape_str($charset)."' COLLATE '".$this->escape_str($collation)."'", $this->conn_id);
-		}
-		else
+		} else
 		{
 			return @mysql_set_charset($charset, $this->conn_id);
 		}
@@ -313,16 +314,13 @@ 
 		if (function_exists('mysql_real_escape_string') AND is_resource($this->conn_id))
 		{
 			$str = mysql_real_escape_string($str, $this->conn_id);
-		}
-		elseif (function_exists('mysql_real_escape_string'))
+		} elseif (function_exists('mysql_real_escape_string'))
 		{
 			$str = mysql_real_escape_string($str);
-		}
-		elseif (function_exists('mysql_escape_string'))
+		} elseif (function_exists('mysql_escape_string'))
 		{
 			$str = mysql_escape_string($str);
-		}
-		else
+		} else
 		{
 			$str = addslashes($str);
 		}
@@ -506,8 +504,7 @@ 
 		if (strpos($item, '.') !== FALSE)
 		{
 			$str = $this->_escape_char.str_replace('.', $this->_escape_char.'.'.$this->_escape_char, $item).$this->_escape_char;
-		}
-		else
+		} else
 		{
 			$str = $this->_escape_char.$item.$this->_escape_char;
 		}
@@ -753,8 +750,7 @@ 
 		if ($offset == 0)
 		{
 			$offset = '';
-		}
-		else
+		} else
 		{
 			$offset .= ", ";
 		}