Inspection of "Merge pull request #133 from iNextrix/scrutinizer-..." - iNextrix/ASTPP - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — v3.0 ( e28df5...5be1a9 )

by Samir

created 2016-10-22 06:32 UTC

Status

Braces +1 added lines, -1 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

web_interface/astpp/application/modules/did/language/english/did_lang.php 1 patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

		@@ -1,4 +1,6 @@
		block discarded – undo
1		-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
	1	+<?php if ( ! defined('BASEPATH')) {
	2	+ exit('No direct script access allowed');
	3	+}
2	4
3	5	$_doctypes = array(
4	6	'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',

Please login to merge, or discard this patch.

web_interface/astpp/application/modules/did/language/spanish/did_lang.php 1 patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

		@@ -1,4 +1,6 @@
		block discarded – undo
1		-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
	1	+<?php if ( ! defined('BASEPATH')) {
	2	+ exit('No direct script access allowed');
	3	+}
2	4
3	5	$_doctypes = array(
4	6	'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',

Please login to merge, or discard this patch.

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

Braces +19 added lines, -15 removed lines patch added patch discarded remove patch

@@ -46,14 +46,15 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 		$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);
 		}

Please login to merge, or discard this patch.

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

Braces +26 added lines, -19 removed lines patch added patch discarded remove patch

@@ -38,8 +38,9 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 				"",
 				"",
 			);
-			}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 @@  discard block
 block discarded – undo
 										   :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 @@  discard block
 block discarded – undo
 							$after_balance,
 							$description,
 									));
-	}else{
+	} else{
 			$json_data['rows'][] = array('cell' => array(
 							$date,
 							$invoice_num,
@@ -833,7 +836,7 @@  discard block
 block discarded – undo
 	}
 		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 @@  discard block
 block discarded – undo
                                             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 @@  discard block
 block discarded – undo
 							$after_balance,
 							$description,
 									));
-	}else{
+	} else{
 			$json_data['rows'][] = array('cell' => array(
 							$date,
 							$invoice_num,
@@ -955,7 +960,7 @@  discard block
 block discarded – undo
 	}
 		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 @@  discard block
 block discarded – undo
                                             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);

Please login to merge, or discard this patch.

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

Braces +7 added lines, -8 removed lines patch added patch discarded remove patch

@@ -20,8 +20,9 @@  discard block
 block discarded – undo
 # 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 @@  discard block
 block discarded – undo
 			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 @@  discard block
 block discarded – undo
 				$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 @@  discard block
 block discarded – undo
 			$account_data = $this->CI->session->userdata("accountinfo");
 			$loginid = $account_data['id'];
 
-		}else{
+		} else{
 			$loginid = "0";
 		}
 		if($logintype==0 || $logintype==3){
@@ -535,7 +534,7 @@  discard block
 block discarded – undo
 		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"),

Please login to merge, or discard this patch.

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

Braces +8 added lines, -9 removed lines patch added patch discarded remove patch

@@ -38,7 +38,7 @@  discard block
 block discarded – undo
 			$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 @@  discard block
 block discarded – undo
                                             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 @@  discard block
 block discarded – undo
 		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 @@  discard block
 block discarded – undo
 			$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");

Please login to merge, or discard this patch.

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

Braces +11 added lines, -10 removed lines patch added patch discarded remove patch

@@ -33,8 +33,9 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 						$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 @@  discard block
 block discarded – undo
 						$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 @@  discard block
 block discarded – undo
 				$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 @@  discard block
 block discarded – undo
 				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 @@  discard block
 block discarded – undo
 				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;

Please login to merge, or discard this patch.

astpp/application/modules/opensips/libraries/opensips_form.php 1 patch

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch

@@ -21,8 +21,9 @@
 block discarded – undo
 # 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 Opensips_form {
 

Please login to merge, or discard this patch.

		@@ -101,7 +101,7 @@
		block discarded – undo
101	101	if($csv_key == 0){
102	102	$cnt++;
103	103	echo "<th>".ucfirst($field_name)."</th>";
104		- }else{
	104	+ } else{
105	105	echo "<td class='portlet-content'>".$field_val."</td>";
106	106	}
107	107	}

		@@ -46,14 +46,15 @@ discard block
		block discarded – undo
46	46	$this->db->where($where);
47	47	if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
48	48	$this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
49		- }else{
	49	+ } else{
50	50	$this->db->order_by("callstart desc");
51	51	}
52	52	if ($flag) {
53		- if (!$export)
54		- $this->db->limit($limit, $start);
	53	+ if (!$export) {
	54	+ $this->db->limit($limit, $start);
	55	+ }
55	56	$this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,debit,cost,accountid,pricelist_id,calltype,is_recording,trunk_id,uniqueid');
56		- }else {
	57	+ } else {
57	58	$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');
58	59	}
59	60	$result = $this->db->get('cdrs');
		@@ -74,12 +75,13 @@ discard block
		block discarded – undo
74	75	$this->db->where($where);
75	76	if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
76	77	$this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
77		- }else{
	78	+ } else{
78	79	$this->db->order_by("callstart desc");
79	80	}
80	81	if ($flag) {
81		- if (!$export)
82		- $this->db->limit($limit, $start);
	82	+ if (!$export) {
	83	+ $this->db->limit($limit, $start);
	84	+ }
83	85	$this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,debit,cost,accountid,pricelist_id,calltype');
84	86	} else {
85	87	$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 @@ discard block
		block discarded – undo
105	107	$this->db->where($where);
106	108	if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
107	109	$this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
108		- }else{
	110	+ } else{
109	111	$this->db->order_by("callstart desc");
110	112	}
111	113	if ($flag) {
112		- if (!$export)
113		- $this->db->limit($limit, $start);
	114	+ if (!$export) {
	115	+ $this->db->limit($limit, $start);
	116	+ }
114	117	$this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,provider_call_cost,disposition,provider_id,cost');
115		- }else {
	118	+ } else {
116	119	$this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(cost) as total_cost');
117	120	}
118	121	$result = $this->db->get('cdrs');
		@@ -159,10 +162,11 @@ discard block
		block discarded – undo
159	162	$accountinfo = $this->session->userdata('accountinfo');
160	163	$where['payment_by']=$accountinfo['type']==1 ? $accountinfo['id']:-1;
161	164	if ($flag) {
162		- if($export)
163		- $query = $this->db_model->select("*", "payments", $where, "payment_date", "DESC","","");
164		- else
165		- $query = $this->db_model->select("*", "payments", $where, "payment_date", "DESC", $limit, $start);
	165	+ if($export) {
	166	+ $query = $this->db_model->select("*", "payments", $where, "payment_date", "DESC","","");
	167	+ } else {
	168	+ $query = $this->db_model->select("*", "payments", $where, "payment_date", "DESC", $limit, $start);
	169	+ }
166	170	} else {
167	171	$query = $this->db_model->countQuery("*", "payments", $where);
168	172	}

		@@ -38,8 +38,9 @@ discard block
		block discarded – undo
38	38	$this->fpdf = new PDF('P', 'pt');
39	39	$this->fpdf->initialize('P', 'mm', 'A4');
40	40
41		- if ($this->session->userdata('user_login') == FALSE)
42		- redirect(base_url() . '/astpp/login');
	41	+ if ($this->session->userdata('user_login') == FALSE) {
	42	+ redirect(base_url() . '/astpp/login');
	43	+ }
43	44	}
44	45
45	46	function customerReport() {
		@@ -272,7 +273,7 @@ discard block
		block discarded – undo
272	273	"",
273	274	"",
274	275	);
275		- }else{
	276	+ } else{
276	277	$customer_array[] = array("Date", "CallerID", "Called Number", "Code", "Destination", "Duration", "Debit($currency)", "Cost($currency)", "Disposition", "Account","Rate Group", "Call Type");
277	278	foreach ($query->result_array() as $value) {
278	279	$duration = ($show_seconds == 'minutes') ? ($value['billseconds'] > 0 ) ?
		@@ -642,13 +643,15 @@ discard block
		block discarded – undo
642	643	:null;
643	644
644	645	$json_data = array();
645		- if(!empty($like_str))
646		- $this->db->where($like_str);
	646	+ if(!empty($like_str)) {
	647	+ $this->db->where($like_str);
	648	+ }
647	649	$count_all = $this->reports_model->users_cdrs_list(false, $accountid, $accounttype, "", "");
648	650	$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
649	651	$json_data = $paging_data["json_paging"];
650		- if(!empty($like_str))
651		- $this->db->where($like_str);
	652	+ if(!empty($like_str)) {
	653	+ $this->db->where($like_str);
	654	+ }
652	655	$query = $this->reports_model->users_cdrs_list(true, $accountid, $accounttype, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
653	656	$grid_fields = json_decode($this->reports_form->build_report_list_for_user($accounttype));
654	657	$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
		@@ -806,7 +809,7 @@ discard block
		block discarded – undo
806	809	$after_balance,
807	810	$description,
808	811	));
809		- }else{
	812	+ } else{
810	813	$json_data['rows'][] = array('cell' => array(
811	814	$date,
812	815	$invoice_num,
		@@ -833,7 +836,7 @@ discard block
		block discarded – undo
833	836	}
834	837	if ($this->session->userdata('logintype') == 1) {
835	838	$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>','-','-');
836		- }else{
	839	+ } else{
837	840	$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>','-','-');
838	841
839	842	}
		@@ -870,14 +873,16 @@ discard block
		block discarded – undo
870	873	OR 'credit' like '%$instant_search%'
871	874	OR 'description' like '%$instant_search%')"
872	875	:null;
873		- if(!empty($like_str))
874		- $this->db->where($like_str);
	876	+ if(!empty($like_str)) {
	877	+ $this->db->where($like_str);
	878	+ }
875	879	$count_all = $this->reports_model->get_customer_charge_list(false,$accountid);
876	880
877	881	$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
878	882	$json_data = $paging_data["json_paging"];
879		- if(!empty($like_str))
880		- $this->db->where($like_str);
	883	+ if(!empty($like_str)) {
	884	+ $this->db->where($like_str);
	885	+ }
881	886	$query = $this->reports_model->get_customer_charge_list(true,$accountid,$paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
882	887	$result= $query->result_array();
883	888	$query1 = $this->reports_model->get_customer_charge_list(true,$accountid,'','');
		@@ -929,7 +934,7 @@ discard block
		block discarded – undo
929	934	$after_balance,
930	935	$description,
931	936	));
932		- }else{
	937	+ } else{
933	938	$json_data['rows'][] = array('cell' => array(
934	939	$date,
935	940	$invoice_num,
		@@ -955,7 +960,7 @@ discard block
		block discarded – undo
955	960	}
956	961	if ($this->session->userdata('logintype') == 1) {
957	962	$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>','-','-');
958		- }else{
	963	+ } else{
959	964	$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>','-','-');
960	965
961	966	}
		@@ -971,13 +976,15 @@ discard block
		block discarded – undo
971	976	OR notes like '%$instant_search%'
972	977	)"
973	978	:null;
974		- if(!empty($like_str))
975		- $this->db->where($like_str);
	979	+ if(!empty($like_str)) {
	980	+ $this->db->where($like_str);
	981	+ }
976	982	$count_all = $this->reports_model->get_customer_refillreport(false,$accountid);
977	983	$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
978	984	$json_data = $paging_data["json_paging"];
979		- if(!empty($like_str))
980		- $this->db->where($like_str);
	985	+ if(!empty($like_str)) {
	986	+ $this->db->where($like_str);
	987	+ }
981	988	$query = $this->reports_model->get_customer_refillreport(true,$accountid,$paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
982	989	$grid_fields = json_decode($this->reports_form->build_refillreport_for_customer());
983	990	$json_data['rows'] = $this->form->build_grid($query, $grid_fields);

		@@ -20,8 +20,9 @@ discard block
		block discarded – undo
20	20	# You should have received a copy of the GNU Affero General Public License
21	21	# along with this program. If not, see <http://www.gnu.org/licenses/>.
22	22	###############################################################################
23		-if (!defined('BASEPATH'))
24		- exit('No direct script access allowed');
	23	+if (!defined('BASEPATH')) {
	24	+ exit('No direct script access allowed');
	25	+}
25	26
26	27	class Reports_form {
27	28	function __construct() {
		@@ -56,8 +57,7 @@ discard block
		block discarded – undo
56	57	array('Call Type', 'calltype', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_calltype'),
57	58	array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),
58	59	array('', 'HIDDEN', 'advance_search', '1', '', '', ''));
59		- }
60		- else
	60	+ } else
61	61	{
62	62	$form['forms'] = array("", array('id' => "cdr_customer_search"));
63	63	$form['Search'] = array(
		@@ -190,8 +190,7 @@ discard block
		block discarded – undo
190	190	$recording,
191	191	));
192	192
193		- }
194		- else{
	193	+ } else{
195	194	$account_info = $accountinfo = $this->CI->session->userdata('accountinfo');
196	195	$currency_id=$account_info['currency_id'];
197	196	$currency=$this->CI->common->get_field_name('currency', 'currency', $currency_id);
		@@ -348,7 +347,7 @@ discard block
		block discarded – undo
348	347	$account_data = $this->CI->session->userdata("accountinfo");
349	348	$loginid = $account_data['id'];
350	349
351		- }else{
	350	+ } else{
352	351	$loginid = "0";
353	352	}
354	353	if($logintype==0 \|\| $logintype==3){
		@@ -535,7 +534,7 @@ discard block
		block discarded – undo
535	534	array("After Balance<br/>($currency)", "120", "after_balance", "after_balance", "after_balance", "convert_to_currency","","true","right"),
536	535	array(gettext("Description"), "300", "description", "", "", "","","true","center"),
537	536	));
538		- }else{
	537	+ } else{
539	538	$grid_field_arr = json_encode(array(
540	539	array("Created Date", "120", "created_date", "", "", "","","true","center"),
541	540	array("Invoice Number", "120", "created_date", "", "", "","","true","center"),

		@@ -38,7 +38,7 @@ discard block
		block discarded – undo
38	38	$this->opensips_db->limit($limit,$start);
39	39	if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
40	40	$this->opensips_db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
41		- }else{
	41	+ } else{
42	42	$this->opensips_db->order_by('username','asc');
43	43	}
44	44	$query = $this->opensips_db->get("subscriber");
		@@ -62,8 +62,9 @@ discard block
		block discarded – undo
62	62	OR effective_caller_id_number like '%$instant_search%'
63	63	)"
64	64	:null;
65		- if(!empty($like_str))
66		- $this->opensips_db->where($like_str);
	65	+ if(!empty($like_str)) {
	66	+ $this->opensips_db->where($like_str);
	67	+ }
67	68	$this->opensips_db->where($where);
68	69	if ($flag) {
69	70	$this->opensips_db->limit($limit,$start);
		@@ -72,15 +73,13 @@ discard block
		block discarded – undo
72	73	if($result->num_rows() > 0){
73	74	if($flag){
74	75	return $result;
75		- }
76		- else{
	76	+ } else{
77	77	return $result->num_rows();
78	78	}
79		- }else{
	79	+ } else{
80	80	if($flag){
81	81	$result=(object)array('num_rows'=>0);
82		- }
83		- else{
	82	+ } else{
84	83	$result=0;
85	84	}
86	85	return $result;
		@@ -93,7 +92,7 @@ discard block
		block discarded – undo
93	92	$this->opensips_db->limit( $limit,$start);
94	93	if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
95	94	$this->opensips_db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
96		- }else{
	95	+ } else{
97	96	$this->opensips_db->order_by('setid','asc');
98	97	}
99	98	$query = $this->opensips_db->get("dispatcher");

		@@ -33,8 +33,9 @@ discard block
		block discarded – undo
33	33	$db_config = Common_model::$global_config['system_config'];
34	34	$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=";
35	35	$this->opensips_db = $this->load->database($opensipdsn, true);
36		- if ($this->session->userdata('user_login') == FALSE)
37		- redirect(base_url() . '/astpp/login');
	36	+ if ($this->session->userdata('user_login') == FALSE) {
	37	+ redirect(base_url() . '/astpp/login');
	38	+ }
38	39	}
39	40
40	41	function opensips_add() {
		@@ -92,7 +93,7 @@ discard block
		block discarded – undo
92	93	$this->opensips_model->edit_opensipsdevices($add_array, $add_array['id']);
93	94	echo json_encode(array("SUCCESS"=> " OpenSips updated successfully!"));
94	95	exit;
95		- }else{
	96	+ } else{
96	97	echo json_encode($auth_flag);
97	98	exit;
98	99	}
		@@ -109,7 +110,7 @@ discard block
		block discarded – undo
109	110	$this->opensips_model->add_opensipsdevices($add_array);
110	111	echo json_encode(array("SUCCESS"=> "OpenSips added successfully!"));
111	112	exit;
112		- }else{
	113	+ } else{
113	114	echo json_encode($auth_flag);
114	115	exit;
115	116	}
		@@ -131,10 +132,10 @@ discard block
		block discarded – undo
131	132	$auth_flag = $auth_flag->num_rows();
132	133	if($auth_flag == 0){
133	134	return "TRUE";
134		- }else{
	135	+ } else{
135	136	return array("username_error"=>"Duplicate Email Address Found Email Must Be Unique.");
136	137	}
137		- }else{
	138	+ } else{
138	139	return array("username_error"=>"User name is required field.");
139	140	}
140	141	return "0";
		@@ -155,13 +156,13 @@ discard block
		block discarded – undo
155	156	echo json_encode(array("SUCCESS"=> "Opensips Updated Successfully!"));
156	157	exit;
157	158	}
158		- }else{
	159	+ } else{
159	160	$data['page_title'] = 'Add Opensips';
160	161	if ($this->form_validation->run() == FALSE) {
161	162	$data['validation_errors'] = validation_errors();
162	163	echo $data['validation_errors'];
163	164	exit;
164		- }else{
	165	+ } else{
165	166	$this->opensips_model->add_opensipsdevices($array_add);
166	167	echo json_encode(array("SUCCESS"=> "Opensips Added Successfully!"));
167	168	exit;
		@@ -184,13 +185,13 @@ discard block
		block discarded – undo
184	185	echo json_encode(array("SUCCESS"=> "OpenSips Updated Successfully!"));
185	186	exit;
186	187	}
187		- }else{
	188	+ } else{
188	189	$data['page_title'] = 'Add Opensips';
189	190	if ($this->form_validation->run() == FALSE) {
190	191	$data['validation_errors'] = validation_errors();
191	192	echo $data['validation_errors'];
192	193	exit;
193		- }else{
	194	+ } else{
194	195	$this->opensips_model->add_opensipsdevices($add_array);
195	196	echo json_encode(array("SUCCESS"=> "OpenSips Added Successfully!"));
196	197	exit;

		@@ -21,8 +21,9 @@
		block discarded – undo
21	21	# along with this program. If not, see <http://www.gnu.org/licenses/>.
22	22	###############################################################################
23	23
24		-if (!defined('BASEPATH'))
25		- exit('No direct script access allowed');
	24	+if (!defined('BASEPATH')) {
	25	+ exit('No direct script access allowed');
	26	+}
26	27
27	28	class Opensips_form {
28	29

iNextrix / ASTPP

Push — v3.0 ( e28df5...5be1a9 )

Status

Category

Braces +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Braces +19 added lines, -15 removed lines patch added patch discarded remove patch

Braces +26 added lines, -19 removed lines patch added patch discarded remove patch

Braces +7 added lines, -8 removed lines patch added patch discarded remove patch

Braces +8 added lines, -9 removed lines patch added patch discarded remove patch

Braces +11 added lines, -10 removed lines patch added patch discarded remove patch

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch