iNextrix / ASTPP

web_interface/astpp/application/modules/login/controllers/login.php

Braces +2 added lines, -2 removed lines

@@ -120,7 +120,7 @@ 
 						$this->session->set_userdata('mode_cur', 'user');
 						if($result['type'] == 1){
 							redirect(base_url() . 'dashboard/');
-						}else{
+						} else{
 							redirect(base_url() . 'user/user/');
 						}
 					} else {
@@ -151,7 +151,7 @@ 
 			$this->session->set_userdata('user_login', FALSE);
 			$data['app_name'] = 'ASTPP - Open Source Billing Solution';
 			$this->load->view('view_login', $data);
-		}else {
+		} else {
 	/*
 	*
 	* Purpose : Display logo based on domain name

web_interface/astpp/application/modules/did/models/did_model.php

Braces +12 added lines, -12 removed lines

@@ -113,8 +113,7 @@ 
 			  }
 			  $this->db->limit($limit, $start);
 			  $query=$this->db->query("SELECT a.note AS number,a.*,IF((SELECT COUNT( id ) AS count FROM reseller_pricing AS b WHERE b.parent_id =".$accountinfo['id']." AND a.note = b.note ) >0,(SELECT reseller_id AS accountid FROM reseller_pricing AS c WHERE c.note = a.note AND c.parent_id =".$accountinfo['id']."), (SELECT accountid from dids as d where d.parent_id = ".$accountinfo['id']." AND d.number=a.note)) AS accountid FROM reseller_pricing AS a where a.reseller_id=".$accountinfo['id']." AND a.parent_id =".$accountinfo['reseller_id'].$search_string);
-		  }
-		  else{
+		  } else{
 			$this->db_model->build_search('did_list_search');
 			$query = $this->db_model->select("*,note as number,IF((SELECT COUNT( id ) AS count FROM reseller_pricing AS b WHERE b.parent_id =".$accountinfo['id']." AND reseller_pricing.note = b.note ) >0,(SELECT reseller_id AS accountid FROM reseller_pricing AS c WHERE c.note = reseller_pricing.note AND c.parent_id =".$accountinfo['id']."), (SELECT accountid from dids as d where d.parent_id = ".$accountinfo['id']." AND d.number=reseller_pricing.note)) AS accountid", "reseller_pricing", $where, "note", "desc", $limit, $start);
 		  }
@@ -123,8 +122,7 @@ 
 		  $query = $this->db_model->countQuery("*", "reseller_pricing", $where);
 		}
 
-		}
-		else
+		} else
 		{	
 		  $this->db_model->build_search('did_list_search');
 		  if ($flag) {
@@ -175,10 +173,11 @@ 
 		$this->db->where("country", ucfirst($field_value));
 		$query = $this->db->get('countrycode');
 		$data = $query->result();
-		if ($query->num_rows > 0)
-			return $data[0]->id;
-		else
-			return '';
+		if ($query->num_rows > 0) {
+					return $data[0]->id;
+		} else {
+					return '';
+		}
 	}
 
 	function bulk_insert_dids($field_value) {
@@ -250,10 +249,11 @@ 
 		$this->db->where("id", $number);
 		$this->db->or_where("number", $number);
 		$query = $this->db->get("dids");
-		if ($query->num_rows() > 0)
-			return $query->row_array();
-		else
-			return false;
+		if ($query->num_rows() > 0) {
+					return $query->row_array();
+		} else {
+					return false;
+		}
 	}
    function edit_did_reseller($did_id,$post) {
 		$accountinfo = $this->session->userdata('accountinfo');

web_interface/astpp/application/modules/did/libraries/did_form.php

Braces +5 added lines, -5 removed lines

@@ -22,8 +22,9 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

 ###############################################################################

 

-if (!defined('BASEPATH'))

-	exit('No direct script access allowed');

+if (!defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 

 class did_form {

 

@@ -35,11 +36,10 @@ 
 	if ($id != 0){

 	  if($parent_id > 0){

 	  $account_dropdown =  array('Reseller',  array('name' => 'parent_id', 'disabled' => 'disabled','class' => 'accountid', 'id' => 'accountid'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0","type"=>"1", "deleted" => "0","status" => "0"));                

-	  }else{

+	  } else{

 	  if($account_id > 0){

 		$account_dropdown =  array('Account ',  array('name' => 'accountid', 'disabled' => 'disabled','class' => 'accountid', 'id' => 'accountid'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0","type"=>"0,3", "deleted" => "0","status" => "0"));

-	  }

-	  else{

+	  } else{

 		$account_dropdown = array('Account', 'accountid', 'SELECT', '',array("name"=>"accountid","rules"=>"did_account_checking"), 'tOOL TIP', 'Please Enter account number', 'id',  'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0", "type" => "0,3","deleted" => "0","status" => "0" ));

 	  }

 	  }

web_interface/astpp/application/modules/did/views/view_import_did.php

Braces +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
 								if($csv_key == 0){
 					$cnt++;
 									echo "<th>".ucfirst($field_name)."</th>";
-								}else{
+								} else{
 									echo "<td class='portlet-content'>".$field_val."</td>";   
 								}
 							}

web_interface/astpp/application/modules/reports/models/reports_model.php

Braces +19 added lines, -15 removed lines

@@ -46,14 +46,15 @@ 
 		$this->db->where($where);
 		if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
 		  $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-		}else{
+		} else{
 		   $this->db->order_by("callstart desc");
 		}
 		if ($flag) {
-			if (!$export)
-				$this->db->limit($limit, $start);
+			if (!$export) {
+							$this->db->limit($limit, $start);
+			}
 			$this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,debit,cost,accountid,pricelist_id,calltype,is_recording,trunk_id,uniqueid');
-		}else {
+		} else {
 			$this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(debit) as total_debit,sum(cost) as total_cost,group_concat(distinct(pricelist_id)) as pricelist_ids,group_concat(distinct(trunk_id)) as trunk_ids,group_concat(distinct(accountid)) as accounts_ids');
 		}
 		$result = $this->db->get('cdrs');
@@ -74,12 +75,13 @@ 
 		$this->db->where($where);
 		if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
 		  $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-		}else{
+		} else{
 		   $this->db->order_by("callstart desc");
 		}
 		if ($flag) {
-			if (!$export)
-				$this->db->limit($limit, $start);
+			if (!$export) {
+							$this->db->limit($limit, $start);
+			}
 				$this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,debit,cost,accountid,pricelist_id,calltype');
 		} else {
 		   $this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(debit) as total_debit,sum(cost) as total_cost,group_concat(distinct(pricelist_id)) as pricelist_ids');
@@ -105,14 +107,15 @@ 
 		$this->db->where($where);
 		if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
 		  $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-		}else{
+		} else{
 		   $this->db->order_by("callstart desc");
 		}
 		if ($flag) {
-			if (!$export)
-				$this->db->limit($limit, $start);
+			if (!$export) {
+							$this->db->limit($limit, $start);
+			}
 			$this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,provider_call_cost,disposition,provider_id,cost');
-		}else {
+		} else {
 			$this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(cost) as total_cost');
 		}
 		$result = $this->db->get('cdrs');
@@ -159,10 +162,11 @@ 
 		$accountinfo = $this->session->userdata('accountinfo');
 		$where['payment_by']=$accountinfo['type']==1 ? $accountinfo['id']:-1;
 		if ($flag) {
-			if($export)
-		  $query = $this->db_model->select("*", "payments", $where, "payment_date", "DESC","","");
-			else
-		   $query = $this->db_model->select("*", "payments", $where, "payment_date", "DESC", $limit, $start);
+			if($export) {
+					  $query = $this->db_model->select("*", "payments", $where, "payment_date", "DESC","","");
+			} else {
+					   $query = $this->db_model->select("*", "payments", $where, "payment_date", "DESC", $limit, $start);
+			}
 		} else {
 			$query = $this->db_model->countQuery("*", "payments", $where);
 		}

web_interface/astpp/application/modules/reports/controllers/reports.php

Braces +26 added lines, -19 removed lines

@@ -38,8 +38,9 @@ 
 		$this->fpdf = new PDF('P', 'pt');
 		$this->fpdf->initialize('P', 'mm', 'A4');
 
-		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+		if ($this->session->userdata('user_login') == FALSE) {
+					redirect(base_url() . '/astpp/login');
+		}
 	}
 
 	function customerReport() {
@@ -272,7 +273,7 @@ 
 				"",
 				"",
 			);
-			}else{
+			} else{
 							$customer_array[] = array("Date", "CallerID", "Called Number", "Code", "Destination", "Duration", "Debit($currency)", "Cost($currency)", "Disposition", "Account","Rate Group", "Call Type");
 			   foreach ($query->result_array() as $value) {
 				   $duration = ($show_seconds == 'minutes') ? ($value['billseconds'] > 0 ) ?
@@ -642,13 +643,15 @@ 
 										   :null;
         
 		$json_data = array();
-		if(!empty($like_str))
-		$this->db->where($like_str);
+		if(!empty($like_str)) {
+				$this->db->where($like_str);
+		}
 		$count_all = $this->reports_model->users_cdrs_list(false, $accountid, $accounttype, "", "");
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
-		if(!empty($like_str))
-		$this->db->where($like_str);
+		if(!empty($like_str)) {
+				$this->db->where($like_str);
+		}
 		$query = $this->reports_model->users_cdrs_list(true, $accountid, $accounttype, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
 		$grid_fields = json_decode($this->reports_form->build_report_list_for_user($accounttype));
 		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
@@ -806,7 +809,7 @@ 
 							$after_balance,
 							$description,
 									));
-	}else{
+	} else{
 			$json_data['rows'][] = array('cell' => array(
 							$date,
 							$invoice_num,
@@ -833,7 +836,7 @@ 
 	}
 		if ($this->session->userdata('logintype') == 1) {
 			$json_data['rows'][$count_all]['cell']=array('<b>Total</b>','-','-','-','-','<b>'.$this->common->convert_to_currency('','',$debit_sum).'</b>','<b>'.$this->common->convert_to_currency('','',$credit_sum).'</b>','-','-');
-	}else{
+	} else{
 			$json_data['rows'][$count_all]['cell']=array('<b>Total</b>','-','-','-','-','<b>'.$this->common->convert_to_currency('','',$debit_sum).'</b>','<b>'.$this->common->convert_to_currency('','',$credit_sum).'</b>','-','-');
 
 	}
@@ -870,14 +873,16 @@ 
                                             OR 'credit' like '%$instant_search%'
                                             OR  'description' like '%$instant_search%')"
 											:null;
-		if(!empty($like_str))
-		$this->db->where($like_str);
+		if(!empty($like_str)) {
+				$this->db->where($like_str);
+		}
 		$count_all = $this->reports_model->get_customer_charge_list(false,$accountid);
 
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
-		if(!empty($like_str))
-		$this->db->where($like_str);
+		if(!empty($like_str)) {
+				$this->db->where($like_str);
+		}
 		$query = $this->reports_model->get_customer_charge_list(true,$accountid,$paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
 	$result= $query->result_array();
 		$query1 = $this->reports_model->get_customer_charge_list(true,$accountid,'','');
@@ -929,7 +934,7 @@ 
 							$after_balance,
 							$description,
 									));
-	}else{
+	} else{
 			$json_data['rows'][] = array('cell' => array(
 							$date,
 							$invoice_num,
@@ -955,7 +960,7 @@ 
 	}
 		if ($this->session->userdata('logintype') == 1) {
 			$json_data['rows'][$count_all]['cell']=array('<b>Total</b>','-','-','-','<b>'.$this->common->convert_to_currency('','',$debit_sum).'</b>','<b>'.$this->common->convert_to_currency('','',$credit_sum).'</b>','-','-');
-	}else{
+	} else{
 			$json_data['rows'][$count_all]['cell']=array('<b>Total</b>','-','-','-','<b>'.$this->common->convert_to_currency('','',$debit_sum).'</b>','<b>'.$this->common->convert_to_currency('','',$credit_sum).'</b>','-','-');
 
 	}
@@ -971,13 +976,15 @@ 
                                             OR  notes like '%$instant_search%'
                                                 )"
 										   :null;
-		if(!empty($like_str))
-		$this->db->where($like_str);
+		if(!empty($like_str)) {
+				$this->db->where($like_str);
+		}
 		$count_all = $this->reports_model->get_customer_refillreport(false,$accountid);
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
-		if(!empty($like_str))
-		$this->db->where($like_str);
+		if(!empty($like_str)) {
+				$this->db->where($like_str);
+		}
 		$query = $this->reports_model->get_customer_refillreport(true,$accountid,$paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
 		$grid_fields = json_decode($this->reports_form->build_refillreport_for_customer());
 		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);

web_interface/astpp/application/modules/reports/libraries/reports_form.php

Braces +7 added lines, -8 removed lines

@@ -20,8 +20,9 @@ 
 # You should have received a copy of the GNU Affero General Public License

 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

 ###############################################################################

-if (!defined('BASEPATH'))

-	exit('No direct script access allowed');

+if (!defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 

 class Reports_form {

 	function __construct() {

@@ -56,8 +57,7 @@ 
 			array('Call Type', 'calltype', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_calltype'),

 			array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),

 			array('', 'HIDDEN', 'advance_search', '1', '', '', ''));

-			 }

-		else

+			 } else

 		{

 		$form['forms'] = array("", array('id' => "cdr_customer_search"));

 		$form['Search'] = array(

@@ -190,8 +190,7 @@ 
 				$recording,

 				));

                 

-				}

-				else{

+				} else{

 		$account_info = $accountinfo = $this->CI->session->userdata('accountinfo');

 		$currency_id=$account_info['currency_id'];

 		$currency=$this->CI->common->get_field_name('currency', 'currency', $currency_id);

@@ -348,7 +347,7 @@ 
 			$account_data = $this->CI->session->userdata("accountinfo");

 			$loginid = $account_data['id'];

 

-		}else{

+		} else{

 			$loginid = "0";

 		}

 		if($logintype==0 || $logintype==3){

@@ -535,7 +534,7 @@ 
 		array("After Balance<br/>($currency)", "120", "after_balance", "after_balance", "after_balance", "convert_to_currency","","true","right"),	

 			array(gettext("Description"), "300", "description", "", "", "","","true","center"),

 				));

-	}else{

+	} else{

 		$grid_field_arr = json_encode(array(

 			array("Created Date", "120", "created_date", "", "", "","","true","center"),

 			array("Invoice Number", "120", "created_date", "", "", "","","true","center"),

web_interface/astpp/application/modules/opensips/models/opensips_model.php

Braces +8 added lines, -9 removed lines

@@ -38,7 +38,7 @@ 
 			$this->opensips_db->limit($limit,$start);
 			if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
 		$this->opensips_db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-		}else{
+		} else{
 			$this->opensips_db->order_by('username','asc');
 		}
 			$query = $this->opensips_db->get("subscriber");
@@ -62,8 +62,9 @@ 
                                             OR  effective_caller_id_number like '%$instant_search%'
                                                 )"
 										   :null;
-		if(!empty($like_str))
-		$this->opensips_db->where($like_str);
+		if(!empty($like_str)) {
+				$this->opensips_db->where($like_str);
+		}
 		$this->opensips_db->where($where);
 		if ($flag) {
 		  $this->opensips_db->limit($limit,$start);            
@@ -72,15 +73,13 @@ 
 		if($result->num_rows() > 0){
 	  if($flag){
 		return $result;
-	  }
-	  else{
+	  } else{
 		return $result->num_rows();
 	  }
-		}else{
+		} else{
 		 if($flag){
 		  $result=(object)array('num_rows'=>0);
-	  }
-	  else{
+	  } else{
 		  $result=0;
 	  }
 	  return $result;
@@ -93,7 +92,7 @@ 
 			$this->opensips_db->limit( $limit,$start);
 			if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
 		$this->opensips_db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-		}else{
+		} else{
 			$this->opensips_db->order_by('setid','asc');
 		}
 			$query = $this->opensips_db->get("dispatcher");

web_interface/astpp/application/modules/opensips/controllers/opensips.php

Braces +11 added lines, -10 removed lines

@@ -33,8 +33,9 @@ 
 		$db_config = Common_model::$global_config['system_config'];
 		$opensipdsn = "mysql://" . $db_config['opensips_dbuser'] . ":" . $db_config['opensips_dbpass'] . "@" . $db_config['opensips_dbhost'] . "/" . $db_config['opensips_dbname'] . "?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
 		$this->opensips_db = $this->load->database($opensipdsn, true);
-		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+		if ($this->session->userdata('user_login') == FALSE) {
+					redirect(base_url() . '/astpp/login');
+		}
 	}
 
 	function opensips_add() {
@@ -92,7 +93,7 @@ 
 						$this->opensips_model->edit_opensipsdevices($add_array, $add_array['id']);
 						echo json_encode(array("SUCCESS"=> " OpenSips updated successfully!"));
 						exit;
-				}else{
+				} else{
 					   echo json_encode($auth_flag);
 					   exit;
 				}
@@ -109,7 +110,7 @@ 
 						$this->opensips_model->add_opensipsdevices($add_array);
 						echo json_encode(array("SUCCESS"=> "OpenSips added successfully!"));
 						exit;
-				}else{
+				} else{
 					   echo json_encode($auth_flag);
 						exit;
 				}
@@ -131,10 +132,10 @@ 
 				$auth_flag = $auth_flag->num_rows();
 				if($auth_flag == 0){
 					return "TRUE";
-				}else{
+				} else{
 					return array("username_error"=>"Duplicate Email Address Found Email Must Be Unique.");
 				}
-		}else{
+		} else{
 		  return array("username_error"=>"User name is required field.");
 		}
 		return "0";
@@ -155,13 +156,13 @@ 
 				echo json_encode(array("SUCCESS"=> "Opensips Updated Successfully!"));
 				exit;
 			}
-		}else{
+		} else{
 		  $data['page_title'] = 'Add Opensips';
 		  if ($this->form_validation->run() == FALSE) {
 				$data['validation_errors'] = validation_errors();
 				echo $data['validation_errors'];
 				exit;
-			}else{
+			} else{
 		$this->opensips_model->add_opensipsdevices($array_add);
 				echo json_encode(array("SUCCESS"=> "Opensips Added Successfully!"));
 				exit;
@@ -184,13 +185,13 @@ 
 				echo json_encode(array("SUCCESS"=> "OpenSips Updated Successfully!"));
 				exit;
 			}
-		}else{
+		} else{
 			  $data['page_title'] = 'Add Opensips';
 		  if ($this->form_validation->run() == FALSE) {
 				$data['validation_errors'] = validation_errors();
 				echo $data['validation_errors'];
 				exit;
-			 }else{
+			 } else{
 		$this->opensips_model->add_opensipsdevices($add_array);
 				echo json_encode(array("SUCCESS"=> "OpenSips Added Successfully!"));
 				exit;