iNextrix / ASTPP

web_interface/astpp/system/libraries/Form_validation.php

Indentation +3 added lines, -3 removed lines

@@ -1478,9 +1478,9 @@
 		  }
 		}
 		public function phn_number($str)
-	        {
-		        return (!preg_match('/^[0-9 +-]+$/', $str)) ? FALSE : TRUE;
-	        }
+			{
+				return (!preg_match('/^[0-9 +-]+$/', $str)) ? FALSE : TRUE;
+			}
 
 }
 // END Form Validation Class

Spacing +43 added lines, -43 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;
 		 }
 
@@ -1119,8 +1119,8 @@ 
 	 */
 	public function valid_ip($ip)
 	{
-		$explode_ip = explode('/',$ip);
-		$ip = (isset($explode_ip[0]) && $explode_ip[0] != '')?$explode_ip[0]:$ip;
+		$explode_ip = explode('/', $ip);
+		$ip = (isset($explode_ip[0]) && $explode_ip[0] != '') ? $explode_ip[0] : $ip;
 		return $this->CI->input->valid_ip($ip);
 	}
 
@@ -1433,53 +1433,53 @@ 
 	{
 		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,15}+(?:\.\d{0,5})?$#', $str);
+		public function currency_decimal($str) {
+			return (bool)preg_match('#^\d{0,15}+(?:\.\d{0,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();
-		  $available_bal = ($customer_info["posttoexternal"] == 1) ? ($customer_info["credit_limit"] - $customer_info["balance"]) :($customer_info["balance"]);
-		  if($available_bal >= $post_array['setup']){
+		  $acc_result = $this->CI->db->get('accounts');
+		  $customer_info = (array)$acc_result->first_row();
+		  $available_bal = ($customer_info["posttoexternal"] == 1) ? ($customer_info["credit_limit"] - $customer_info["balance"]) : ($customer_info["balance"]);
+		  if ($available_bal >= $post_array['setup']) {
 		   return TRUE;
-		  }else{
+		  } else {
 		   return FALSE;
 		  }
-		  }else{
+		  } else {
 		   return TRUE;
 		  }
 		}
 		public function phn_number($str)
 	        {
-		        return (!preg_match('/^[0-9 +-]+$/', $str)) ? FALSE : TRUE;
+		        return ( ! preg_match('/^[0-9 +-]+$/', $str)) ? FALSE : 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;
@@ -1453,10 +1451,10 @@ 
 			  $password=$this->CI->common->decode($result['password']);
 			  if($password && $password == $str){
 				  return true;
-			  }else{
+			  } else{
 				  return false;
 			  }
-		  }else{
+		  } else{
 			  return false;
 		  }
 		}
@@ -1470,10 +1468,10 @@ 
 		  $available_bal = ($customer_info["posttoexternal"] == 1) ? ($customer_info["credit_limit"] - $customer_info["balance"]) :($customer_info["balance"]);
 		  if($available_bal >= $post_array['setup']){
 		   return TRUE;
-		  }else{
+		  } else{
 		   return FALSE;
 		  }
-		  }else{
+		  } else{
 		   return TRUE;
 		  }
 		}

web_interface/astpp/system/libraries/Session.php

Indentation +1 added lines, -1 removed lines

@@ -758,7 +758,7 @@
 		if ((rand() % 100) < $this->gc_probability)
 		{
 			$expire = $this->now - $this->sess_expiration;
-                        $expire = $expire - 60*60*12*1;
+						$expire = $expire - 60*60*12*1;
 			$this->CI->db->where("last_activity < {$expire}");
 			$this->CI->db->delete($this->sess_table_name);
 

Spacing +1 added lines, -1 removed lines

@@ -758,7 +758,7 @@
 		if ((rand() % 100) < $this->gc_probability)
 		{
 			$expire = $this->now - $this->sess_expiration;
-                        $expire = $expire - 60*60*12*1;
+                        $expire = $expire - 60 * 60 * 12 * 1;
 			$this->CI->db->where("last_activity < {$expire}");
 			$this->CI->db->delete($this->sess_table_name);
 

web_interface/astpp/system/libraries/Email.php

Indentation +19 added lines, -19 removed lines

@@ -1959,26 +1959,26 @@
 		$msg = '';
 		$msg .= "Date : ".date("F j, Y, g:i a")."\n From :".$data['from']."\n To :".$data['to']."\n Subject :".$data['subject']."\n Attachment :".implode(',',$data['attachment'])."\n";
 		$msg .= "Error : \n" ;
-                if($this->_get_protocol() == "smtp"){
+				if($this->_get_protocol() == "smtp"){
 			if (count($this->_debug_msg) > 0)
-		        {
-			        foreach ($this->_debug_msg as $key=>$val)
-			        {
-				        if(in_array($key,array(1,2,3,4,5,6,7,8,9,10,11,12,15,16,17,18))){
-				                $msg .= $val;
-				        }
-			        }
-		        }       
-                }else{
-                        if (count($this->_debug_msg) > 0)
-		        {
-			        foreach ($this->_debug_msg as $key=>$val)
-			        {
-				        $msg .= $val;
-			        }
-		        }
-
-                }
+				{
+					foreach ($this->_debug_msg as $key=>$val)
+					{
+						if(in_array($key,array(1,2,3,4,5,6,7,8,9,10,11,12,15,16,17,18))){
+								$msg .= $val;
+						}
+					}
+				}       
+				}else{
+						if (count($this->_debug_msg) > 0)
+				{
+					foreach ($this->_debug_msg as $key=>$val)
+					{
+						$msg .= $val;
+					}
+				}
+
+				}
 		$fp = fopen($log_path."astpp_email.log", "a+");
 		fwrite($fp,$msg);
 		fclose($fp);

Spacing +7 added lines, -7 removed lines

@@ -1953,23 +1953,23 @@ 
 		$msg .= "<pre>".$this->_header_str."\n".htmlspecialchars($this->_subject)."\n".htmlspecialchars($this->_finalbody).'</pre>';
 		return $msg;
 	}
-	public function print_debugger_email($data = '',$log_path)
+	public function print_debugger_email($data = '', $log_path)
 	{
 	
 		$msg = '';
-		$msg .= "Date : ".date("F j, Y, g:i a")."\n From :".$data['from']."\n To :".$data['to']."\n Subject :".$data['subject']."\n Attachment :".implode(',',$data['attachment'])."\n";
-		$msg .= "Error : \n" ;
-                if($this->_get_protocol() == "smtp"){
+		$msg .= "Date : ".date("F j, Y, g:i a")."\n From :".$data['from']."\n To :".$data['to']."\n Subject :".$data['subject']."\n Attachment :".implode(',', $data['attachment'])."\n";
+		$msg .= "Error : \n";
+                if ($this->_get_protocol() == "smtp") {
 			if (count($this->_debug_msg) > 0)
 		        {
 			        foreach ($this->_debug_msg as $key=>$val)
 			        {
-				        if(in_array($key,array(1,2,3,4,5,6,7,8,9,10,11,12,15,16,17,18))){
+				        if (in_array($key, array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 15, 16, 17, 18))) {
 				                $msg .= $val;
 				        }
 			        }
 		        }       
-                }else{
+                } else {
                         if (count($this->_debug_msg) > 0)
 		        {
 			        foreach ($this->_debug_msg as $key=>$val)
@@ -1980,7 +1980,7 @@ 
 
                 }
 		$fp = fopen($log_path."astpp_email.log", "a+");
-		fwrite($fp,$msg);
+		fwrite($fp, $msg);
 		fclose($fp);
 		return $msg;
 	}

Braces +4 added lines, -7 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';
 		}
@@ -1969,7 +1966,7 @@ 
 				        }
 			        }
 		        }       
-                }else{
+                } else{
                         if (count($this->_debug_msg) > 0)
 		        {
 			        foreach ($this->_debug_msg as $key=>$val)

web_interface/astpp/index.php

Spacing +25 added lines, -25 removed lines

@@ -17,8 +17,8 @@ 
  * NOTE: If you change these, also change the error_reporting() code below
  *
  */
-ini_set ( "date.timezone", "UTC" );
-define ( 'ENVIRONMENT', 'production' );
+ini_set("date.timezone", "UTC");
+define('ENVIRONMENT', 'production');
 /*
  * ---------------------------------------------------------------
  * ERROR REPORTING
@@ -28,19 +28,19 @@ 
  * By default development will show errors but testing and live will hide them.
  */
 
-if (defined ( 'ENVIRONMENT' )) {
+if (defined('ENVIRONMENT')) {
 	switch (ENVIRONMENT) {
 		case 'development' :
-			error_reporting ( E_ALL );
+			error_reporting(E_ALL);
 			break;
 		
 		case 'testing' :
 		case 'production' :
-			error_reporting ( 0 );
+			error_reporting(0);
 			break;
 		
 		default :
-			exit ( 'The application environment is not set correctly.' );
+			exit ('The application environment is not set correctly.');
 	}
 }
 
@@ -140,20 +140,20 @@ 
  */
 
 // Set the current directory correctly for CLI requests
-if (defined ( 'STDIN' )) {
-	chdir ( dirname ( __FILE__ ) );
+if (defined('STDIN')) {
+	chdir(dirname(__FILE__));
 }
 
-if (realpath ( $system_path ) !== FALSE) {
-	$system_path = realpath ( $system_path ) . '/';
+if (realpath($system_path) !== FALSE) {
+	$system_path = realpath($system_path).'/';
 }
 
 // ensure there's a trailing slash
-$system_path = rtrim ( $system_path, '/' ) . '/';
+$system_path = rtrim($system_path, '/').'/';
 
 // Is the system path correct?
-if (! is_dir ( $system_path )) {
-	exit ( "Your system folder path does not appear to be set correctly. Please open the following file and correct this: " . pathinfo ( __FILE__, PATHINFO_BASENAME ) );
+if ( ! is_dir($system_path)) {
+	exit ("Your system folder path does not appear to be set correctly. Please open the following file and correct this: ".pathinfo(__FILE__, PATHINFO_BASENAME));
 }
 
 /*
@@ -162,33 +162,33 @@ 
  * -------------------------------------------------------------------
  */
 // The name of THIS file
-define ( 'SELF', pathinfo ( __FILE__, PATHINFO_BASENAME ) );
+define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME));
 
 // The PHP file extension
 // this global constant is deprecated.
-define ( 'EXT', '.php' );
+define('EXT', '.php');
 
 // Path to the system folder
-define ( 'BASEPATH', str_replace ( "\\", "/", $system_path ) );
+define('BASEPATH', str_replace("\\", "/", $system_path));
 
 // Path to the front controller (this file)
-define ( 'FCPATH', str_replace ( SELF, '', __FILE__ ) );
+define('FCPATH', str_replace(SELF, '', __FILE__));
 
 // Name of the "system folder"
-define ( 'SYSDIR', trim ( strrchr ( trim ( BASEPATH, '/' ), '/' ), '/' ) );
+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 )) {
-	define ( 'APPPATH', $application_folder . '/' );
+if (is_dir($application_folder)) {
+	define('APPPATH', $application_folder.'/');
 } else {
-	if (! is_dir ( BASEPATH . $application_folder . '/' )) {
-		exit ( "Your application folder path does not appear to be set correctly. Please open the following file and correct this: " . SELF );
+	if ( ! is_dir(BASEPATH.$application_folder.'/')) {
+		exit ("Your application folder path does not appear to be set correctly. Please open the following file and correct this: ".SELF);
 	}
 	
-	define ( 'APPPATH', BASEPATH . $application_folder . '/' );
+	define('APPPATH', BASEPATH.$application_folder.'/');
 }
 
 /*
@@ -199,7 +199,7 @@ 
  * And away we go...
  *
  */
-require_once BASEPATH . 'core/CodeIgniter.php';
+require_once BASEPATH.'core/CodeIgniter.php';
 
 /* End of file index.php */
 /* Location: ./index.php */