iNextrix / ASTPP

web_interface/astpp/index.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
  * as this file.
  *
  */
-	   $assets_path='assets';
+	   $assets_path = 'assets';
 /*
  *---------------------------------------------------------------
  * APPLICATION FOLDER NAME

web_interface/astpp/system/core/Loader.php

Braces +3 added lines, -6 removed lines

@@ -1025,18 +1025,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;

web_interface/astpp/system/core/Input.php

Indentation +24 added lines, -24 removed lines

@@ -136,14 +136,14 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Fetch an item from the GET array
-	*
-	* @access	public
-	* @param	string
-	* @param	bool
-	* @param string $index
-	* @return	string
-	*/
+	 * Fetch an item from the GET array
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	bool
+	 * @param string $index
+	 * @return	string
+	 */
 	function get($index = NULL, $xss_clean = FALSE)
 	{
 		// Check if a field has been provided
@@ -165,14 +165,14 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Fetch an item from the POST array
-	*
-	* @access	public
-	* @param	string
-	* @param	bool
-	* @param string $index
-	* @return	string
-	*/
+	 * Fetch an item from the POST array
+	 *
+	 * @access	public
+	 * @param	string
+	 * @param	bool
+	 * @param string $index
+	 * @return	string
+	 */
 	function post($index = NULL, $xss_clean = FALSE)
 	{
 		// Check if a field has been provided
@@ -361,14 +361,14 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Validate IP Address
-	*
-	* Updated version suggested by Geert De Deckere
-	*
-	* @access	public
-	* @param	string
-	* @return	boolean
-	*/
+	 * Validate IP Address
+	 *
+	 * Updated version suggested by Geert De Deckere
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	boolean
+	 */
 	function valid_ip($ip)
 	{
 		$ip_segments = explode('.', $ip);

web_interface/astpp/system/core/Output.php

Braces +1 added lines, -2 removed lines

@@ -99,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';
 		}

web_interface/astpp/system/core/URI.php

Spacing +2 added lines, -2 removed lines

@@ -162,9 +162,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;
 }

Braces +2 added lines, -3 removed lines

@@ -164,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;
 }
@@ -562,8 +562,7 @@ 
 		if ($where == 'trailing')
 		{
 			$leading = '';
-		}
-		elseif ($where == 'leading')
+		} elseif ($where == 'leading')
 		{
 			$trailing = '';
 		}

web_interface/astpp/system/core/Common.php

Spacing +1 added lines, -1 removed lines

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

web_interface/astpp/system/core/Hooks.php

Braces +1 added lines, -2 removed lines

@@ -85,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');
 		}

web_interface/astpp/system/libraries/Email.php

Braces +3 added lines, -6 removed lines

@@ -674,16 +674,13 @@
 		if ($this->mailtype == 'html' && count($this->_attach_name) == 0)
 		{
 			return 'html';
-		}
-		elseif ($this->mailtype == 'html' && count($this->_attach_name) > 0)
+		} elseif ($this->mailtype == 'html' && count($this->_attach_name) > 0)
 		{
 			return 'html-attach';
-		}
-		elseif ($this->mailtype == 'text' && count($this->_attach_name) > 0)
+		} elseif ($this->mailtype == 'text' && count($this->_attach_name) > 0)
 		{
 			return 'plain-attach';
-		}
-		else
+		} else
 		{
 			return 'plain';
 		}

web_interface/astpp/system/libraries/Form_validation.php

Spacing +41 added lines, -41 removed lines

@@ -640,13 +640,13 @@ 
 					// Users can use any native PHP function call that has one param.
 					if (function_exists($rule))
 					{
-					  $str=null;
-					  if(is_array($postdata)){
-						foreach($postdata as $key=>$value){
-						  $str.=$value.",";
+					  $str = null;
+					  if (is_array($postdata)) {
+						foreach ($postdata as $key=>$value) {
+						  $str .= $value.",";
 						}
-						$str=rtrim($str,',');
-						$postdata=$str;  
+						$str = rtrim($str, ',');
+						$postdata = $str;  
 					  }
 						$result = $rule($postdata);
 
@@ -974,20 +974,20 @@ 
 	 */
 	public function is_unique($str, $field)
 	{
-				$id='';
-		$data =explode('.', $field);
-				$table=$data[0];
-				$field=$data[1];
-				if(isset($data[2]))
-				$id=$data[2];
-				$where=array($field => $str);
-				if($id != ''){
-				 $where['id !=']=$id;
+				$id = '';
+		$data = explode('.', $field);
+				$table = $data[0];
+				$field = $data[1];
+				if (isset($data[2]))
+				$id = $data[2];
+				$where = array($field => $str);
+				if ($id != '') {
+				 $where['id !='] = $id;
 				}
-				if($table == 'accounts'){
-		  $where['deleted']=0;
+				if ($table == 'accounts') {
+		  $where['deleted'] = 0;
 				}
-				$query = $this->CI->db->limit(1)->get_where($table,$where );
+				$query = $this->CI->db->limit(1)->get_where($table, $where);
 		return $query->num_rows() > 0 ? FALSE : TRUE;
 		 }
 
@@ -1421,54 +1421,54 @@ 
 	{
 			return ( ! preg_match("/^([.a-z0-9])+$/i", $str)) ? FALSE : TRUE;
 	}
-	public function valid_decimal($str){
-			return (bool) preg_match('#^\d+(?:\.\d{1,5})?$#', $str);
+	public function valid_decimal($str) {
+			return (bool)preg_match('#^\d+(?:\.\d{1,5})?$#', $str);
 		}
 		public function alpha_numeric_space($str)
 	{
 		return ( ! preg_match("/^[A-Za-z0-9\s]+$/", $str)) ? FALSE : TRUE;
 	}
-		public function alpha_space($str){
+		public function alpha_space($str) {
 		return ( ! preg_match("/^[A-Za-z\s]+$/", $str)) ? FALSE : TRUE;
 //                return ( ! preg_match("/^([-a-z0-9_-\s])+$/i", $str)) ? FALSE : TRUE;
 	}
-		public function currency_decimal($str){
-			return (bool) preg_match('#^\d{0,5}+(?:\.\d{1,5})?$#', $str);
+		public function currency_decimal($str) {
+			return (bool)preg_match('#^\d{0,5}+(?:\.\d{1,5})?$#', $str);
 //            test(num)
 		}
 		/* ASTPP  3.0 
          * For Old Password checking
          */
-		public function password_check($str,$table){
+		public function password_check($str, $table) {
 		  $this->CI->db->select('password');
-		  $this->CI->db->where('id',$_POST['id']);
-		  $result=$this->CI->db->get($table);
-		  if($result->num_rows() > 0 ){
-			  $result=(array)$result->first_row();
-			  $password=$this->CI->common->decode($result['password']);
-			  if($password && $password == $str){
+		  $this->CI->db->where('id', $_POST['id']);
+		  $result = $this->CI->db->get($table);
+		  if ($result->num_rows() > 0) {
+			  $result = (array)$result->first_row();
+			  $password = $this->CI->common->decode($result['password']);
+			  if ($password && $password == $str) {
 				  return true;
-			  }else{
+			  } else {
 				  return false;
 			  }
-		  }else{
+		  } else {
 			  return false;
 		  }
 		}
-		public function did_account_checking($str){
-		  $post_array=$this->CI->input->post();
-		  if($str > 0){
-		  $this->CI->db->where("id",$str);
+		public function did_account_checking($str) {
+		  $post_array = $this->CI->input->post();
+		  if ($str > 0) {
+		  $this->CI->db->where("id", $str);
 		  $this->CI->db->select('posttoexternal,balance,credit_limit');
-		  $acc_result=$this->CI->db->get('accounts');
-		  $customer_info=(array)$acc_result->first_row();
+		  $acc_result = $this->CI->db->get('accounts');
+		  $customer_info = (array)$acc_result->first_row();
 		  $available_bal = ($customer_info["balance"]) + $customer_info["posttoexternal"] * ($customer_info["credit_limit"]);
-		  if($available_bal >= $post_array['setup']){
+		  if ($available_bal >= $post_array['setup']) {
 		   return TRUE;
-		  }else{
+		  } else {
 		   return FALSE;
 		  }
-		  }else{
+		  } else {
 		   return TRUE;
 		  }
 		}

Braces +10 added lines, -12 removed lines

@@ -412,13 +412,11 @@ 
 				if (isset($array[$keys[$i]]))
 				{
 					$array = $this->_reduce_array($array[$keys[$i]], $keys, ($i + 1));
-				}
-				else
+				} else
 				{
 					return NULL;
 				}
-			}
-			else
+			} else
 			{
 				return $array;
 			}
@@ -456,8 +454,7 @@ 
 					if (count($row['keys']) == 1)
 					{
 						$post_ref = & $post_ref[current($row['keys'])];
-					}
-					else
+					} else
 					{
 						foreach ($row['keys'] as $val)
 						{
@@ -978,8 +975,9 @@ 
 		$data =explode('.', $field);
 				$table=$data[0];
 				$field=$data[1];
-				if(isset($data[2]))
-				$id=$data[2];
+				if(isset($data[2])) {
+								$id=$data[2];
+				}
 				$where=array($field => $str);
 				if($id != ''){
 				 $where['id !=']=$id;
@@ -1448,10 +1446,10 @@ 
 			  $password=$this->CI->common->decode($result['password']);
 			  if($password && $password == $str){
 				  return true;
-			  }else{
+			  } else{
 				  return false;
 			  }
-		  }else{
+		  } else{
 			  return false;
 		  }
 		}
@@ -1465,10 +1463,10 @@ 
 		  $available_bal = ($customer_info["balance"]) + $customer_info["posttoexternal"] * ($customer_info["credit_limit"]);
 		  if($available_bal >= $post_array['setup']){
 		   return TRUE;
-		  }else{
+		  } else{
 		   return FALSE;
 		  }
-		  }else{
+		  } else{
 		   return TRUE;
 		  }
 		}