iNextrix / ASTPP

web_interface/astpp/application/modules/summary/models/summary_model.php

Braces +9 added lines, -6 removed lines

@@ -39,8 +39,9 @@ 
 			$where['callstart <=']=date('Y-m-d') . " 23:59:59";
 		}
 		$this->db->where($where);
-		if(!empty($group_by))
-			$this->db->group_by($group_by);
+		if(!empty($group_by)) {
+					$this->db->group_by($group_by);
+		}
 		if ($flag) {
 			if ($export) {
 				$result = $this->db_model->select($select . ",COUNT(*) AS attempts, AVG(billseconds) AS acd,MAX(billseconds) AS mcd,SUM(billseconds) AS duration,SUM(CASE WHEN calltype !='free' THEN billseconds ELSE 0 END) as billable,SUM(CASE WHEN billseconds > 0 THEN 1 ELSE 0 END) as completed,SUM(debit) AS debit,SUM(cost) AS cost", "reseller_cdrs", '', $order, 'asc', '', '', '');
@@ -66,8 +67,9 @@ 
 			$where['callstart <=']=date('Y-m-d') . " 23:59:59";
 		}
 		$this->db->where($where);
-		if(!empty($group_by))
-			$this->db->group_by($group_by);
+		if(!empty($group_by)) {
+					$this->db->group_by($group_by);
+		}
 		if ($flag) {
 			if ($export) {
 				$result = $this->db_model->select($select . ",COUNT(*) AS attempts, AVG(billseconds) AS acd,MAX(billseconds) AS mcd,SUM(billseconds) AS duration,SUM(CASE WHEN calltype !='free' THEN billseconds ELSE 0 END) as billable,SUM(CASE WHEN billseconds > 0 THEN 1 ELSE 0 END) as completed,SUM(cost) AS cost", "cdrs", '', $order, 'asc', '', '', '');
@@ -96,8 +98,9 @@ 
 			$where['callstart <=']=date('Y-m-d') . " 23:59:59";
 		}
 		$this->db->where($where);
-		if(!empty($group_by))
-			$this->db->group_by($group_by);
+		if(!empty($group_by)) {
+					$this->db->group_by($group_by);
+		}
 		if ($flag) {
 			if ($export) {
 				$result = $this->db_model->select($select . ",COUNT(*) AS attempts, AVG(billseconds) AS acd,MAX(billseconds) AS mcd,SUM(billseconds) AS duration,SUM(CASE WHEN calltype !='free' THEN billseconds ELSE 0 END) as billable,SUM(CASE WHEN billseconds > 0 THEN 1 ELSE 0 END) as completed,SUM(debit) AS debit,SUM(cost) AS cost", "cdrs", '', $order, 'asc', '', '', '');

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

Braces +4 added lines, -3 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 customer() {
         $data['page_title'] = 'Customer Summary Report';
@@ -202,7 +203,7 @@ 
                     $new_arr[] = $row1['notes'];
                 } elseif ($search_arr['groupby_3'] == 'trunk_id') {
                     $new_arr[] = $this->common->get_field_name('name', 'trunks', $row1['trunk_id']);
-                }  elseif ($search_arr['groupby_3'] == 'package_id') {
+                } elseif ($search_arr['groupby_3'] == 'package_id') {
 		    $new_arr[] = $this->common->get_field_name('package_name', 'packages', $row1['package_id']);
                 }
                 if (empty($new_arr)) {

web_interface/astpp/application/modules/summary/libraries/summary_form.php

Braces +6 added lines, -4 removed lines

@@ -20,8 +20,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 Summary_form {

 	function __construct() {

@@ -96,8 +97,9 @@ 
 					}

 				}

 	}

-		if(empty($new_arr))

-			$new_arr[]=array("Account", "453", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string");

+		if(empty($new_arr)) {
+					$new_arr[]=array("Account", "453", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string");
+		}
 		$fixed_arr = array(

 			array("Attempted Calls", "130", "attempted_calls", "", "", ""),

 			array("Completed Calls", "130", "description", "", "", ""),

web_interface/astpp/application/modules/ipmap/models/ipmap_model.php

Braces +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
  	 *******/
 		if( $accountinfo['type'] == '0'){
 		$where=array('accountid'=>$accountinfo['id']);
-		}else{
+		} else{
 		$where='';
 		}
 		/**************************************************************************************************************/

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

Braces +6 added lines, -6 removed lines

@@ -31,8 +31,9 @@ 
 		$this->load->library("ipmap_form");
 		$this->load->library('astpp/form');
 		$this->load->model('ipmap_model');
-		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 ipmap_add() {
 		$data['username'] = $this->session->userdata('user_name');
@@ -66,8 +67,7 @@ 
 		$ip = $add_array['ip'];
 		if (strpos($ip,'/') !== false) {
 		   $add_array['ip']=$add_array['ip'];
-		}
-		else{
+		} else{
 		   $add_array['ip']=$add_array['ip'].'/32';
 		}
 		$data['form'] = $this->form->build_form($this->ipmap_form->get_ipmap_form_fields(), $add_array);
@@ -126,7 +126,7 @@ 
    	$accountdata=$this->session->userdata['accountinfo'];
 		if($accountdata['type'] == '0'){
 		redirect(base_url() . 'user/user_ipmap_detail/');
-		}else{
+		} else{
 		redirect(base_url() . 'ipmap/ipmap_detail/');
 		}
 		/*********************************************************************/
@@ -190,7 +190,7 @@ 
 		 $ret_url,
          
 		  ));
-		 }else{
+		 } else{
 		 $ret_url = '<a href="'. base_url() .'ipmap/ipmap_edit/'.$value['id'].'" class="btn btn-royelblue btn-sm"  rel="facebox" title="Edit">&nbsp;<i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;<a href="'. base_url() .'ipmap/ipmap_delete/' . $value['id'].'" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();">&nbsp;<i class="fa fa-trash fa-fw"></i></a>';
 		 $account_name =$this->common->build_concat_string("first_name,last_name,number", "accounts",$value['accountid']);
 		 $json_data['rows'][] = array('cell' => array(

web_interface/astpp/application/modules/ipmap/libraries/ipmap_form.php

Braces +6 added lines, -5 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 Ipmap_form {

 	  	function __construct($library_name = '') {

@@ -42,7 +43,7 @@ 
 	   if($account_type == '0' || $logintype == '0'){

 		$account=null;

 		$form['forms'] = array(base_url() . 'user/user_ipmap_save/', array('id' => 'ipmap_form', 'method' => 'POST', 'name' => 'ipmap_form'));

-	   }else{

+	   } else{

 	   $account=array('Account', '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"));

 		$form['forms'] = array(base_url() . 'ipmap/ipmap_save/', array('id' => 'ipmap_form', 'method' => 'POST', 'name' => 'ipmap_form'));

 	   }

@@ -79,7 +80,7 @@ 
    	    *****************************************/

 	 if($account_data =='0'){

 		   $account=null;

-		}else{

+		} else{

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

 		}

 		/***************************************************************************************/

@@ -127,7 +128,7 @@ 
 			array("Action", "205", "", "", "", array("EDIT" => array("url" => "ipmap/ipmap_edit/", "mode" => "popup", 'popup'),

 					"DELETE" => array("url" => "ipmap/ipmap_delete/", "mode" => "single")))

 				));

-			}else{

+			} else{

 		   $grid_field_arr = json_encode(array(

 		   array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "","","","false","center"),

 		   array("Account", "200", "accountid", "first_name,last_name,number", "accounts", "get_field_name_coma_new","","true","center"),

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/controllers/did.php

Braces +22 added lines, -18 removed lines

@@ -34,8 +34,9 @@ 
 		$this->load->model('did_model');
 		$this->load->library('csvreader');
 
-		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 did_add() {
@@ -163,7 +164,7 @@ 
 		$this->db->where('note',$did_info['number']);
 		$this->db->delete("reseller_pricing");
 	  }
-	  }else{
+	  } else{
 	  $reseller_ids=$this->common->get_subreseller_info($accountinfo['id']);
 	  $reseller_ids=rtrim($reseller_ids,",");
 	  $where="parent_id IN ($reseller_ids)";
@@ -172,7 +173,7 @@ 
 	  }
 	  if($accountinfo['type']==1){
 		  $update_array = array('parent_id' => $accountinfo['id'], 'accountid' => 0, 'assign_date' => '0000-00-00 00:00:00', "charge_upto" => "0000-00-00 00:00:00","last_modified_date"=>gmdate("Y-m-d H:i:s"));
-	  }else{
+	  } else{
 	  $update_array = array('parent_id' => 0, 'accountid' => 0, 'assign_date' => '0000-00-00 00:00:00', "charge_upto" => "0000-00-00 00:00:00","last_modified_date"=>gmdate("Y-m-d H:i:s"));
 	  }
 	  $where = array('id' => $id);
@@ -181,7 +182,7 @@ 
 	  $accountid=$did_info['accountid'] > 0 ? $did_info['accountid']:0;
 	  if($did_info['accountid'] > 0 ){
 	   $email_user_id=$did_info['accountid'];
-	  }elseif($did_info['parent_id'] > 0){
+	  } elseif($did_info['parent_id'] > 0){
 	$email_user_id=$did_info['parent_id'];
 	  }
 	  $accountinfo=(array)$this->db->get_where('accounts',array("id"=>$email_user_id))->first_row();
@@ -208,7 +209,7 @@ 
 		$accountinfo = $this->session->userdata('accountinfo');
 		if($accountinfo['reseller_id'] > 0){
 		  $dids_array=$this->db->query("SELECT a.id AS id,a.number as number, b.monthlycost, b.setup FROM dids AS a, reseller_pricing AS b WHERE a.number = b.note AND b.reseller_id = ".$accountinfo['reseller_id']." AND a.parent_id =".$accountinfo['reseller_id'])->result_array();
-			}else{
+			} else{
 			  $this->db->select('id,monthlycost,setup,number');
 			  $this->db->where('accountid',0);
 			  $this->db->where('parent_id',0);
@@ -332,8 +333,9 @@ 
 					OR  a.connectcost like '%$instant_search%'
 					    )" :null;
 		if ($account_arr['reseller_id'] != 0) {
-		if(!empty($like_str))
-			$this->db->where($like_str);
+		if(!empty($like_str)) {
+					$this->db->where($like_str);
+		}
 			if($accounttype=='reseller'){
 		  $this->db->where('a.note','b.number',false);
 		  $this->db->where('a.reseller_id',$account_arr['id']);
@@ -348,13 +350,13 @@ 
 		  $this->db->select('a . * , b.id, a.reseller_id AS accountid,a.note as number,b.country_id as country_id');
 		  $this->db->limit($paging_data["paging"]["page_no"],$paging_data["paging"]["start"]);
 		  $query=$this->db->get('reseller_pricing as a,dids as b');
-		  }else{
+		  } else{
 		  $count_result=(array)$this->db->query('select count(id) as count from dids where accountid='.$accountid." AND parent_id =".$account_arr['reseller_id'])->first_row();
 			  $paging_data = $this->form->load_grid_config($count_result['count'], $_GET['rp'], $_GET['page']);
 		  $json_data = $paging_data["json_paging"];
 			  $query=$this->db->query("SELECT a . * ,a.note as number,b.country_id as country_id,b.id FROM reseller_pricing AS a, dids AS b WHERE b.accountid =".$account_arr['id']." AND a.note = b.number AND a.reseller_id =".$account_arr['reseller_id']);
 		  }
-		}else{
+		} else{
 						$like_str=!empty($instant_search) ? 
 												"(dids.number like '%$instant_search%'
                                                     OR dids.inc like '%$instant_search%'
@@ -364,14 +366,16 @@ 
                                                     OR dids.monthlycost like '%$instant_search%'
                                                     OR dids.connectcost like '%$instant_search%'
                                                         )" :null;
-			if(!empty($like_str))
-			$this->db->where($like_str);
+			if(!empty($like_str)) {
+						$this->db->where($like_str);
+			}
 			$where = array($field_name => $accountid);
 			$count_all = $this->db_model->countQuery("*", "dids", $where);
 			$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->db_model->select("*", "dids", $where, "id", "ASC", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
 		}
 		$did_grid_fields = json_decode($this->did_form->build_did_list_for_customer($accountid, $accounttype));
@@ -714,21 +718,21 @@ 
 					 unset($reseller_array['number'],$csv_data['accountid'],$reseller_array['accountid'],$reseller_array['country_id'],$reseller_array['init_inc']);
 					 $csv_data['accountid']=0;
 					 $final_reseller_array[$i]=$reseller_array;
-					}else{
+					} else{
 					  $csv_data['parent_id']=0;
 					}
 					$csv_data['assign_date']=gmdate("Y-m-d H:i:s");
 					$new_final_arr[$i] = $csv_data;
 					$this->common->mail_to_users('email_add_did', $account_info);
-					  }else{
+					  } else{
 					$invalid_array[$i] = $csv_data;
 					$invalid_array[$i]['error'] = 'Account have not sufficient amount to purchase this DID.';
 					  }
-				  }else{
+				  } else{
 				$invalid_array[$i] = $csv_data;
 				$invalid_array[$i]['error'] = 'Account not found or assign to invalid account';
 				  }
-							}else{
+							} else{
 				  $csv_data['setup'] = $this->common_model->add_calculate_currency($csv_data['setup'], '', '', false, false);
 				  $csv_data['monthlycost'] = $this->common_model->add_calculate_currency($csv_data['monthlycost'], '', '', false, false);
 				  $csv_data['cost'] = $this->common_model->add_calculate_currency($csv_data['cost'], '', '', false, false);