iNextrix / ASTPP

web_interface/astpp/application/modules/summary/views/view_resellersummary_report.php

Spacing +19 added lines, -19 removed lines

@@ -38,18 +38,18 @@ 
                                 <legend><b>Search</b></legend>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">From Date</label>
-                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][0]) ? $session_info['callstart'][0] : date("Y-m-d") . " 00:00:00"; ?>" id="reseller_from_date" size="20" class="col-md-5 form-control text field "  />
+                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][0]) ? $session_info['callstart'][0] : date("Y-m-d")." 00:00:00"; ?>" id="reseller_from_date" size="20" class="col-md-5 form-control text field "  />
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">To Date</label>
-                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][1]) ? $session_info['callstart'][1] : date("Y-m-d") . " 23:59:59"; ?>" id="reseller_to_date" size="20" class="col-md-5 form-control text field "  />
+                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][1]) ? $session_info['callstart'][1] : date("Y-m-d")." 23:59:59"; ?>" id="reseller_to_date" size="20" class="col-md-5 form-control text field "  />
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">Account</label>
 
                                     <select name="accountid" class='col-md-5 form-control selectpicker' data-live-search='true'>
                                         <option value=''>--Select--</option>
-                                        <?php if (!empty($accountlist)) {
+                                        <?php if ( ! empty($accountlist)) {
                                             foreach ($accountlist as $key => $value) {
                                                 ?>
                                                 <optgroup label="<?php echo $key ?>">
@@ -71,13 +71,13 @@ 
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">Code </label>
-                                    <input type="text" name="pattern[pattern]" value="<?php echo (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && !empty($session_info['pattern']['pattern'])) ? $session_info['pattern']['pattern'] : ''; ?>" size="20" maxlength="15" class="col-md-5 form-control text field "/>
+                                    <input type="text" name="pattern[pattern]" value="<?php echo (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && ! empty($session_info['pattern']['pattern'])) ? $session_info['pattern']['pattern'] : ''; ?>" size="20" maxlength="15" class="col-md-5 form-control text field "/>
                                     <select name="pattern[pattern-string]" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                         <?php
-                                        if (!empty($search_string_type)) {
+                                        if ( ! empty($search_string_type)) {
                                             foreach ($search_string_type as $key => $value) {
                                                 $selected = null;
-                                                if (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && !empty($session_info['pattern']['pattern']) && $session_info['pattern']['pattern-string'] == $key) {
+                                                if (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && ! empty($session_info['pattern']['pattern']) && $session_info['pattern']['pattern-string'] == $key) {
                                                     $selected = "selected";
                                                 }
                                                 ?>
@@ -89,13 +89,13 @@ 
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">Destination </label>
-                                    <input type="text" name="notes[notes]" value="<?php echo (isset($session_info['notes']) && isset($session_info['notes']['notes']) && !empty($session_info['notes']['notes'])) ? $session_info['notes']['notes'] : ''; ?>" size="20" class="col-md-5 form-control text field "  />
+                                    <input type="text" name="notes[notes]" value="<?php echo (isset($session_info['notes']) && isset($session_info['notes']['notes']) && ! empty($session_info['notes']['notes'])) ? $session_info['notes']['notes'] : ''; ?>" size="20" class="col-md-5 form-control text field "  />
                                     <select name="notes[notes-string]" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                         <?php
-                                        if (!empty($search_string_type)) {
+                                        if ( ! empty($search_string_type)) {
                                             foreach ($search_string_type as $key => $value) {
                                                 $selected = null;
-                                                if (isset($session_info['notes']) && isset($session_info['notes']['notes']) && !empty($session_info['notes']['notes']) && $session_info['notes']['notes-string'] == $key) {
+                                                if (isset($session_info['notes']) && isset($session_info['notes']['notes']) && ! empty($session_info['notes']['notes']) && $session_info['notes']['notes-string'] == $key) {
                                                     $selected = "selected";
                                                 }
                                                 ?>
@@ -120,10 +120,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #time</label>
                                     <select name="time" class='col-md-5 form-control' style='margin-left:5px; selectpicker' data-live-search='true'>
                                         <?php
-                                        if (!empty($groupby_time)) {
+                                        if ( ! empty($groupby_time)) {
                                             foreach ($groupby_time as $key => $value) {
                                                 $selected = null;
-                                                if (isset($session_info['time']) && !empty($session_info['time']) && $session_info['time'] == $key) {
+                                                if (isset($session_info['time']) && ! empty($session_info['time']) && $session_info['time'] == $key) {
                                                     $selected = "selected";
                                                 }
                                                 ?>
@@ -137,10 +137,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #1</label>
                                     <select name="groupby_1" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                     <?php
-                                    if (!empty($groupby_field)) {
+                                    if ( ! empty($groupby_field)) {
                                         foreach ($groupby_field as $key => $value) {
                                             $selected = null;
-                                            if (isset($session_info['groupby_1']) && !empty($session_info['groupby_1']) && $session_info['groupby_1'] == $key) {
+                                            if (isset($session_info['groupby_1']) && ! empty($session_info['groupby_1']) && $session_info['groupby_1'] == $key) {
                                                 $selected = "selected";
                                             }
                                             ?>
@@ -154,10 +154,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #2</label>
                                     <select name="groupby_2" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                         <?php
-                                        if (!empty($groupby_field)) {
+                                        if ( ! empty($groupby_field)) {
                                             foreach ($groupby_field as $key => $value) {
                                                 $selected = null;
-                                                if (isset($session_info['groupby_2']) && !empty($session_info['groupby_2']) && $session_info['groupby_2'] == $key) {
+                                                if (isset($session_info['groupby_2']) && ! empty($session_info['groupby_2']) && $session_info['groupby_2'] == $key) {
                                                     $selected = "selected";
                                                 }
                                                 ?>
@@ -171,10 +171,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #3</label>
                                     <select name="groupby_3" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                     <?php
-                                    if (!empty($groupby_field)) {
+                                    if ( ! empty($groupby_field)) {
                                         foreach ($groupby_field as $key => $value) {
                                             $selected = null;
-                                            if (isset($session_info['groupby_3']) && !empty($session_info['groupby_3']) && $session_info['groupby_3'] == $key) {
+                                            if (isset($session_info['groupby_3']) && ! empty($session_info['groupby_3']) && $session_info['groupby_3'] == $key) {
                                                 $selected = "selected";
                                             }
                                             ?>
@@ -193,10 +193,10 @@ 
                                     <label class="search_label col-md-6" style="font-size:17px;text-align:right;">Display records in </label>
                                     <select name="search_in" class='col-md-5 form-control selectpicker' style='background: #ddd; width: 23% !important;' data-live-search='true'>
 <?php
-if (!empty($search_report)) {
+if ( ! empty($search_report)) {
     foreach ($search_report as $key => $value) {
         $selected = null;
-        if (isset($session_info['search_in']) && isset($session_info['search_in']) && !empty($session_info['search_in']) && $session_info['search_in'] == $key) {
+        if (isset($session_info['search_in']) && isset($session_info['search_in']) && ! empty($session_info['search_in']) && $session_info['search_in'] == $key) {
             //echo $key;exit;
             $selected = "selected";
         }

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

Spacing +24 added lines, -24 removed lines

@@ -28,24 +28,24 @@ 
         parent::__construct();
     }
 
-    function get_resellersummary_report_list($flag, $start = 0, $limit = 0,$group_by, $select,$order, $export = false) {
+    function get_resellersummary_report_list($flag, $start = 0, $limit = 0, $group_by, $select, $order, $export = false) {
 
         $this->db_model->build_search('summary_reseller_search');
-        $accountinfo=$this->session->userdata('accountinfo');
+        $accountinfo = $this->session->userdata('accountinfo');
         $reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
-        $where['reseller_id']=$reseller_id;
+        $where['reseller_id'] = $reseller_id;
         if ($this->session->userdata('advance_search') != 1) {
-            $where['callstart >=']=date('Y-m-d') . " 00:00:00";
-            $where['callstart <=']=date('Y-m-d') . " 23:59:59";
+            $where['callstart >='] = date('Y-m-d')." 00:00:00";
+            $where['callstart <='] = date('Y-m-d')." 23:59:59";
         }
         $this->db->where($where);
-        if(!empty($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', '', '', '');
+                $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', '', '', '');
             } else {
-                $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', $limit, $start, '');
+                $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', $limit, $start, '');
             }
         } else {
             $result = $this->db_model->getSelect("count(*) as total_count", "reseller_cdrs", '');
@@ -58,21 +58,21 @@ 
         return $result;
     }
 
-    function get_providersummary_report_list($flag, $start = 0, $limit = 0, $group_by, $select,$order, $export = false) {
+    function get_providersummary_report_list($flag, $start = 0, $limit = 0, $group_by, $select, $order, $export = false) {
         $this->db_model->build_search('summary_provider_search');
-        $where['provider_id >']=0;
+        $where['provider_id >'] = 0;
         if ($this->session->userdata('advance_search') != 1) {
-            $where['callstart >=']=date('Y-m-d') . " 00:00:00";
-            $where['callstart <=']=date('Y-m-d') . " 23:59:59";
+            $where['callstart >='] = date('Y-m-d')." 00:00:00";
+            $where['callstart <='] = date('Y-m-d')." 23:59:59";
         }
         $this->db->where($where);
-        if(!empty($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', '', '', '');
+                $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', '', '', '');
             } else {
-                $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', $limit, $start, '');
+                $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', $limit, $start, '');
             }
         } else {
             $result = $this->db_model->getSelect("count(*) as total_count", "cdrs", '');
@@ -85,24 +85,24 @@ 
         return $result;
     }
 
-    function get_customersummary_report_list($flag, $start = 0, $limit = 0, $group_by, $select,$order, $export) {
+    function get_customersummary_report_list($flag, $start = 0, $limit = 0, $group_by, $select, $order, $export) {
         $this->db_model->build_search('summary_customer_search');
-        $accountinfo=$this->session->userdata('accountinfo');
+        $accountinfo = $this->session->userdata('accountinfo');
         $reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
-        $where['reseller_id']=$reseller_id;
-        $where['type']=0;
+        $where['reseller_id'] = $reseller_id;
+        $where['type'] = 0;
         if ($this->session->userdata('advance_search') != 1) {
-            $where['callstart >=']=date('Y-m-d') . " 00:00:00";
-            $where['callstart <=']=date('Y-m-d') . " 23:59:59";
+            $where['callstart >='] = date('Y-m-d')." 00:00:00";
+            $where['callstart <='] = date('Y-m-d')." 23:59:59";
         }
         $this->db->where($where);
-        if(!empty($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', '', '', '');
+                $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', '', '', '');
             } else {
-                $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', $limit, $start, '');
+                $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', $limit, $start, '');
             }
         } else {
             $result = $this->db_model->getSelect("count(*) as total_count", "cdrs", '');

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

Spacing +141 added lines, -141 removed lines

@@ -38,217 +38,217 @@
     function index() 
     {
         if ($this->session->userdata('user_login') == FALSE) 
-            redirect(base_url() . 'login/login');
+            redirect(base_url().'login/login');
             $data['page_title'] = 'Dashboard';
         if ($this->session->userdata('logintype') == 0) 
 	{
             $this->load->view('view_user_dashboard', $data);
         } else {
-	    $gmtoffset=$this->common->get_timezone_offset();	    
+	    $gmtoffset = $this->common->get_timezone_offset();	    
             $this->load->view('view_dashboard', $data);
         }
     }
-    function user_recent_payments(){
+    function user_recent_payments() {
       $this->customerReport_recent_payments();
     }     
     function customerReport_recent_payments() 
     {
-	$accountinfo=$this->session->userdata('accountinfo');
-	$currency=$this->common->get_field_name('currency','currency',array("id"=>$accountinfo['currency_id']));
+	$accountinfo = $this->session->userdata('accountinfo');
+	$currency = $this->common->get_field_name('currency', 'currency', array("id"=>$accountinfo['currency_id']));
         $json_data = array();
-	$i=1;
+	$i = 1;
 	$result = $this->dashboard_model->get_recent_recharge();
-	$gmtoffset=$this->common->get_timezone_offset();
-        if($result->num_rows() > 0)
+	$gmtoffset = $this->common->get_timezone_offset();
+        if ($result->num_rows() > 0)
 	{
-		 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts','');
-		 $json_data[0]['accountid']='Accounts';
-		 $json_data[0]['credit']='Amount('.$currency.")";
-		 $json_data[0]['payment_date']='Date';
-		 foreach($result->result_array() as $key=>$data){
-		      $current_timestamp=strtotime($data['payment_date']);
-		      $modified_date=$current_timestamp+$gmtoffset;
-          	      $data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] :"Anonymous";
-		      $json_data[$i]['accountid']=$data['accountid'];
-		      $json_data[$i]['credit']=$this->common_model->calculate_currency($data['credit'],'','',true,false);
-		      $json_data[$i]['payment_date']=date('Y-m-d H:i:s',strtotime($data['payment_date'])+$gmtoffset);
+		 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts', '');
+		 $json_data[0]['accountid'] = 'Accounts';
+		 $json_data[0]['credit'] = 'Amount('.$currency.")";
+		 $json_data[0]['payment_date'] = 'Date';
+		 foreach ($result->result_array() as $key=>$data) {
+		      $current_timestamp = strtotime($data['payment_date']);
+		      $modified_date = $current_timestamp + $gmtoffset;
+          	      $data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] : "Anonymous";
+		      $json_data[$i]['accountid'] = $data['accountid'];
+		      $json_data[$i]['credit'] = $this->common_model->calculate_currency($data['credit'], '', '', true, false);
+		      $json_data[$i]['payment_date'] = date('Y-m-d H:i:s', strtotime($data['payment_date']) + $gmtoffset);
 		      $i++;
           	}
           }
          echo json_encode($json_data); 
     }
-    function  user_call_statistics_with_profit(){
+    function  user_call_statistics_with_profit() {
       $this->customerReport_call_statistics_with_profit();
      }
     function customerReport_call_statistics_with_profit() {
-        $post=$this->input->post();
-        $year=isset($post['year']) && $post['year'] >0 ? $post['year']:date("Y");
-        $month=isset($post['month'])&& $post['month'] >0 ? $post['month']:date("m");
+        $post = $this->input->post();
+        $year = isset($post['year']) && $post['year'] > 0 ? $post['year'] : date("Y");
+        $month = isset($post['month']) && $post['month'] > 0 ? $post['month'] : date("m");
 	$json_data = array();
-	$start_date=date($year.'-'.$month.'-01');
-        $end_day= $year==date("Y") && $month ==date("m") ? date("d") :cal_days_in_month(CAL_GREGORIAN, $month, $year);
-	$gmtoffset=$this->common->get_timezone_offset();
-	$end_date=date($year."-".$month."-".$end_day.' H:i:s');
-	$end_date=date('Y-m-d',strtotime($end_date)+$gmtoffset);
-	$current_date=(int)date("d");
-        $count=0;
-        $i=0;
+	$start_date = date($year.'-'.$month.'-01');
+        $end_day = $year == date("Y") && $month == date("m") ? date("d") : cal_days_in_month(CAL_GREGORIAN, $month, $year);
+	$gmtoffset = $this->common->get_timezone_offset();
+	$end_date = date($year."-".$month."-".$end_day.' H:i:s');
+	$end_date = date('Y-m-d', strtotime($end_date) + $gmtoffset);
+	$current_date = (int)date("d");
+        $count = 0;
+        $i = 0;
         $begin = new DateTime($start_date);
 	$end = new DateTime($end_date);
-	$end=$end->modify('+1 day');
+	$end = $end->modify('+1 day');
 	$daterange = new DatePeriod($begin, new DateInterval('P1D'), $end);
-	$records_date=array();
-	$accountinfo=$this->session->userdata('accountinfo');
-	$parent_id= ($accountinfo['type'] == 1) ? $accountinfo['id'] : 0;
-        $customerresult = $this->dashboard_model->get_call_statistics('cdrs',$parent_id,$start_date,$end_date);
-        $resellerresult = $this->dashboard_model->get_call_statistics('reseller_cdrs',$parent_id,$start_date,$end_date);
+	$records_date = array();
+	$accountinfo = $this->session->userdata('accountinfo');
+	$parent_id = ($accountinfo['type'] == 1) ? $accountinfo['id'] : 0;
+        $customerresult = $this->dashboard_model->get_call_statistics('cdrs', $parent_id, $start_date, $end_date);
+        $resellerresult = $this->dashboard_model->get_call_statistics('reseller_cdrs', $parent_id, $start_date, $end_date);
         $acc_arr = array();
 	foreach ($customerresult->result_array() as $data) {
 	  $acc_arr[$data['day']] = $data;
 	}
-	foreach($resellerresult->result_array() as $data){
-	  $reseller_arr[$data['day']]=$data;
-	  if(isset($acc_arr[$data['day']])){
-	    $acc_arr[$data['day']]['sum']= $data['sum']+$acc_arr[$data['day']]['sum'];
-	    $acc_arr[$data['day']]['answered']= $data['answered']+$acc_arr[$data['day']]['answered'];
-	    $acc_arr[$data['day']]['failed']= $data['failed']+$acc_arr[$data['day']]['failed'];
-	    $acc_arr[$data['day']]['profit']= $data['profit']+$acc_arr[$data['day']]['profit'];
-            $acc_arr[$data['day']]['completed']= $data['completed']+$acc_arr[$data['day']]['completed'];
-            $acc_arr[$data['day']]['duration'] = $data['duration']+$acc_arr[$data['day']]['duration'];
-            $acc_arr[$data['day']]['mcd'] =$data['mcd'] > $acc_arr[$data['day']]['mcd'] ? $data['mcd']: $acc_arr[$data['day']]['mcd'];
-	  }else{
-	    $acc_arr[$data['day']]=$data;
+	foreach ($resellerresult->result_array() as $data) {
+	  $reseller_arr[$data['day']] = $data;
+	  if (isset($acc_arr[$data['day']])) {
+	    $acc_arr[$data['day']]['sum'] = $data['sum'] + $acc_arr[$data['day']]['sum'];
+	    $acc_arr[$data['day']]['answered'] = $data['answered'] + $acc_arr[$data['day']]['answered'];
+	    $acc_arr[$data['day']]['failed'] = $data['failed'] + $acc_arr[$data['day']]['failed'];
+	    $acc_arr[$data['day']]['profit'] = $data['profit'] + $acc_arr[$data['day']]['profit'];
+            $acc_arr[$data['day']]['completed'] = $data['completed'] + $acc_arr[$data['day']]['completed'];
+            $acc_arr[$data['day']]['duration'] = $data['duration'] + $acc_arr[$data['day']]['duration'];
+            $acc_arr[$data['day']]['mcd'] = $data['mcd'] > $acc_arr[$data['day']]['mcd'] ? $data['mcd'] : $acc_arr[$data['day']]['mcd'];
+	  } else {
+	    $acc_arr[$data['day']] = $data;
 	  }
 	}
-	if(!empty($acc_arr)){
-	    foreach($daterange as $date){
-		$json_data['date'][]=$date->format("d");
-		$day = (int) $date->format("d");
-		if(isset($acc_arr[$day])){
-                  $asr= ($acc_arr[$day]['sum'] > 0 ) ? (round(($acc_arr[$day]['completed'] / $acc_arr[$day]['sum']) * 100,2)) : 0;
-                  $acd= ($acc_arr[$day]['completed'] > 0 ) ? round($acc_arr[$day]['duration'] / $acc_arr[$day]['completed'],2) : 0;
-		  $json_data['total'][]=  array((string)$acc_arr[$day]['day'],(int) $acc_arr[$day]['sum']);
-		  $json_data['answered'][]=  array((string)$acc_arr[$day]['day'],(int) $acc_arr[$day]['answered']);
-		  $json_data['failed'][]=  array((string)$acc_arr[$day]['day'],(int) $acc_arr[$day]['failed']);
-		  $json_data['profit'][]=  array((string)$acc_arr[$day]['day'],(float)  str_replace(",", "", $this->common_model->calculate_currency($acc_arr[$day]['profit'])));
-                  $json_data['acd'][]=array((string)$acc_arr[$day]['day'],(float)$acd);
-                  $json_data['mcd'][]=array((string)$acc_arr[$day]['day'],(float)$acc_arr[$day]['mcd']);
-                  $json_data['asr'][]=array((string)$acc_arr[$day]['day'],(float)$asr);
-		}else{
-		  $json_data['total'][]=  array($date->format("d"), 0);
-		  $json_data['answered'][]=  array($date->format("d"), 0);
-		  $json_data['failed'][]=  array($date->format("d"), 0);
-		  $json_data['profit'][]=  array($date->format("d"), 0);
-                  $json_data['acd'][]=array($date->format("d"), 0);
-                  $json_data['mcd'][]=array($date->format("d"), 0);
-                  $json_data['asr'][]=array($date->format("d"),0);
+	if ( ! empty($acc_arr)) {
+	    foreach ($daterange as $date) {
+		$json_data['date'][] = $date->format("d");
+		$day = (int)$date->format("d");
+		if (isset($acc_arr[$day])) {
+                  $asr = ($acc_arr[$day]['sum'] > 0) ? (round(($acc_arr[$day]['completed'] / $acc_arr[$day]['sum']) * 100, 2)) : 0;
+                  $acd = ($acc_arr[$day]['completed'] > 0) ? round($acc_arr[$day]['duration'] / $acc_arr[$day]['completed'], 2) : 0;
+		  $json_data['total'][] = array((string)$acc_arr[$day]['day'], (int)$acc_arr[$day]['sum']);
+		  $json_data['answered'][] = array((string)$acc_arr[$day]['day'], (int)$acc_arr[$day]['answered']);
+		  $json_data['failed'][] = array((string)$acc_arr[$day]['day'], (int)$acc_arr[$day]['failed']);
+		  $json_data['profit'][] = array((string)$acc_arr[$day]['day'], (float)str_replace(",", "", $this->common_model->calculate_currency($acc_arr[$day]['profit'])));
+                  $json_data['acd'][] = array((string)$acc_arr[$day]['day'], (float)$acd);
+                  $json_data['mcd'][] = array((string)$acc_arr[$day]['day'], (float)$acc_arr[$day]['mcd']);
+                  $json_data['asr'][] = array((string)$acc_arr[$day]['day'], (float)$asr);
+		} else {
+		  $json_data['total'][] = array($date->format("d"), 0);
+		  $json_data['answered'][] = array($date->format("d"), 0);
+		  $json_data['failed'][] = array($date->format("d"), 0);
+		  $json_data['profit'][] = array($date->format("d"), 0);
+                  $json_data['acd'][] = array($date->format("d"), 0);
+                  $json_data['mcd'][] = array($date->format("d"), 0);
+                  $json_data['asr'][] = array($date->format("d"), 0);
 		}
 		
 	    }
 	}
-	else{
-	foreach($daterange as $date){
-		$json_data['date'][]=$date->format("d");
-		$day = (int) $date->format("d");
-		$json_data['total'][]=  array($date->format("d"), 0);
-		$json_data['answered'][]=  array($date->format("d"), 0);
-		$json_data['failed'][]=  array($date->format("d"), 0);
-		$json_data['profit'][]=  array($date->format("d"), 0);
-                $json_data['acd'][]=array($date->format("d"), 0);
-                $json_data['mcd'][]=array($date->format("d"), 0);
-                $json_data['asr'][]=array($date->format("d"), 0);
+	else {
+	foreach ($daterange as $date) {
+		$json_data['date'][] = $date->format("d");
+		$day = (int)$date->format("d");
+		$json_data['total'][] = array($date->format("d"), 0);
+		$json_data['answered'][] = array($date->format("d"), 0);
+		$json_data['failed'][] = array($date->format("d"), 0);
+		$json_data['profit'][] = array($date->format("d"), 0);
+                $json_data['acd'][] = array($date->format("d"), 0);
+                $json_data['mcd'][] = array($date->format("d"), 0);
+                $json_data['asr'][] = array($date->format("d"), 0);
 	}
 	}
-        $customer_total_result = $this->dashboard_model->get_call_statistics('cdrs',$parent_id,$start_date,$end_date,false);
-        $reseller_total_result = $this->dashboard_model->get_call_statistics('reseller_cdrs',$parent_id,$start_date,$end_date,false);
-        $customer_total_result=(array)$customer_total_result->first_row();
-        $reseller_total_result=(array)$reseller_total_result->first_row();
-	$json_data['total_count']['sum']=$reseller_total_result['sum']+$customer_total_result['sum'];
-        $json_data['total_count']['debit']=$this->common_model->to_calculate_currency($reseller_total_result['debit']+$customer_total_result['debit'],'','',true,true);
-        $json_data['total_count']['cost']=$this->common_model->to_calculate_currency($reseller_total_result['cost']+$customer_total_result['cost'],'','',true,true);
-        $json_data['total_count']['profit']=$this->common_model->to_calculate_currency($reseller_total_result['profit']+$customer_total_result['profit'],'','',true,true);
-        $json_data['total_count']['completed']=$reseller_total_result['completed']+$customer_total_result['completed'];
-        $json_data['total_count']['duration']=$reseller_total_result['duration']+$customer_total_result['duration'];
-        $json_data['total_count']['acd']=$json_data['total_count']['completed'] > 0 ? round($json_data['total_count']['duration']/$json_data['total_count']['completed'],2):0;
-        $json_data['total_count']['mcd']=($customer_total_result['mcd'] > 0 || $reseller_total_result['mcd'] > 0 ) ? ($customer_total_result['mcd'] > $reseller_total_result['mcd'] ? $customer_total_result['mcd']:$reseller_total_result['mcd']) : 0;
-        $json_data['total_count']['asr']=($json_data['total_count']['sum'] > 0 ) ? (round(($json_data['total_count']['completed'] / $json_data['total_count']['sum']) * 100,2)) : 0;
-        $json_data['total_count']['asr']=$this->common_model->format_currency($json_data['total_count']['asr']);
+        $customer_total_result = $this->dashboard_model->get_call_statistics('cdrs', $parent_id, $start_date, $end_date, false);
+        $reseller_total_result = $this->dashboard_model->get_call_statistics('reseller_cdrs', $parent_id, $start_date, $end_date, false);
+        $customer_total_result = (array)$customer_total_result->first_row();
+        $reseller_total_result = (array)$reseller_total_result->first_row();
+	$json_data['total_count']['sum'] = $reseller_total_result['sum'] + $customer_total_result['sum'];
+        $json_data['total_count']['debit'] = $this->common_model->to_calculate_currency($reseller_total_result['debit'] + $customer_total_result['debit'], '', '', true, true);
+        $json_data['total_count']['cost'] = $this->common_model->to_calculate_currency($reseller_total_result['cost'] + $customer_total_result['cost'], '', '', true, true);
+        $json_data['total_count']['profit'] = $this->common_model->to_calculate_currency($reseller_total_result['profit'] + $customer_total_result['profit'], '', '', true, true);
+        $json_data['total_count']['completed'] = $reseller_total_result['completed'] + $customer_total_result['completed'];
+        $json_data['total_count']['duration'] = $reseller_total_result['duration'] + $customer_total_result['duration'];
+        $json_data['total_count']['acd'] = $json_data['total_count']['completed'] > 0 ? round($json_data['total_count']['duration'] / $json_data['total_count']['completed'], 2) : 0;
+        $json_data['total_count']['mcd'] = ($customer_total_result['mcd'] > 0 || $reseller_total_result['mcd'] > 0) ? ($customer_total_result['mcd'] > $reseller_total_result['mcd'] ? $customer_total_result['mcd'] : $reseller_total_result['mcd']) : 0;
+        $json_data['total_count']['asr'] = ($json_data['total_count']['sum'] > 0) ? (round(($json_data['total_count']['completed'] / $json_data['total_count']['sum']) * 100, 2)) : 0;
+        $json_data['total_count']['asr'] = $this->common_model->format_currency($json_data['total_count']['asr']);
 	echo json_encode($json_data);
 }
 
-     function user_maximum_callminutes(){
+     function user_maximum_callminutes() {
       $this->customerReport_maximum_callminutes();
     }
      function customerReport_maximum_callminutes()
      {
-        $post=$this->input->post();
-        $year=isset($post['year']) && $post['year'] >0 ? $post['year']:date("Y");
-        $month=isset($post['month'])&& $post['month'] >0 ? $post['month']:date("m");
-	$start_date=date($year.'-'.$month.'-01');
-        $end_day= $year==date("Y") && $month ==date("m") ? date("d") :cal_days_in_month(CAL_GREGORIAN, $month, $year);
-	$gmtoffset=$this->common->get_timezone_offset();
-	$end_date=date($year."-".$month."-".$end_day.' H:i:s');
-	$end_date=date('Y-m-d',strtotime($end_date)+$gmtoffset);
+        $post = $this->input->post();
+        $year = isset($post['year']) && $post['year'] > 0 ? $post['year'] : date("Y");
+        $month = isset($post['month']) && $post['month'] > 0 ? $post['month'] : date("m");
+	$start_date = date($year.'-'.$month.'-01');
+        $end_day = $year == date("Y") && $month == date("m") ? date("d") : cal_days_in_month(CAL_GREGORIAN, $month, $year);
+	$gmtoffset = $this->common->get_timezone_offset();
+	$end_date = date($year."-".$month."-".$end_day.' H:i:s');
+	$end_date = date('Y-m-d', strtotime($end_date) + $gmtoffset);
      	$json_data = array();
- 	$result = $this->dashboard_model->get_customer_maximum_callminutes($start_date,$end_date);
-	$i=0;
-	$accountinfo=$this->session->userdata('accountinfo');
-	$reseller_id=$accountinfo['type']== -1 ? 0 : $accountinfo['id'];
-	if($this->session->userdata('userlevel_logintype')!= 0 && $this->session->userdata('userlevel_logintype')!= 3){
-	  $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts',array('reseller_id'=>$reseller_id));
+ 	$result = $this->dashboard_model->get_customer_maximum_callminutes($start_date, $end_date);
+	$i = 0;
+	$accountinfo = $this->session->userdata('accountinfo');
+	$reseller_id = $accountinfo['type'] == -1 ? 0 : $accountinfo['id'];
+	if ($this->session->userdata('userlevel_logintype') != 0 && $this->session->userdata('userlevel_logintype') != 3) {
+	  $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts', array('reseller_id'=>$reseller_id));
 	} 
-	else{
-	 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts',array('id'=>$reseller_id));
+	else {
+	 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts', array('id'=>$reseller_id));
 	}
-    	if($result->num_rows() > 0 )
+    	if ($result->num_rows() > 0)
 	{	
-           foreach ($result->result_array() as $data){
-            $data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] :"Anonymous";
-            $json_data[$i][]= $data['accountid'];
-            $json_data[$i][]= round($data['billseconds']/60,0);
+           foreach ($result->result_array() as $data) {
+            $data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] : "Anonymous";
+            $json_data[$i][] = $data['accountid'];
+            $json_data[$i][] = round($data['billseconds'] / 60, 0);
             $i++;
            } 
-    	}else{
+    	} else {
 	  $json_data[] = array();
       	}
      	echo json_encode($json_data);
      }
 
-     function user_maximum_callcount(){
+     function user_maximum_callcount() {
        $this->customerReport_maximum_callcount();
      }
      function customerReport_maximum_callcount()
      {
-     	$post=$this->input->post();
-        $year=isset($post['year']) && $post['year'] >0 ? $post['year']:date("Y");
-        $month=isset($post['month'])&& $post['month'] >0 ? $post['month']:date("m");
-	$start_date=date($year.'-'.$month.'-01');
-        $end_day= $year==date("Y") && $month ==date("m") ? date("d") :cal_days_in_month(CAL_GREGORIAN, $month, $year);
-	$gmtoffset=$this->common->get_timezone_offset();
-	$end_date=date($year."-".$month."-".$end_day.' H:i:s');
-	$end_date=date('Y-m-d',strtotime($end_date)+$gmtoffset);
+     	$post = $this->input->post();
+        $year = isset($post['year']) && $post['year'] > 0 ? $post['year'] : date("Y");
+        $month = isset($post['month']) && $post['month'] > 0 ? $post['month'] : date("m");
+	$start_date = date($year.'-'.$month.'-01');
+        $end_day = $year == date("Y") && $month == date("m") ? date("d") : cal_days_in_month(CAL_GREGORIAN, $month, $year);
+	$gmtoffset = $this->common->get_timezone_offset();
+	$end_date = date($year."-".$month."-".$end_day.' H:i:s');
+	$end_date = date('Y-m-d', strtotime($end_date) + $gmtoffset);
      	$json_data = array();
-	$result = $this->dashboard_model->get_customer_maximum_callcount($start_date,$end_date);
-	$accountinfo=$this->session->userdata('accountinfo');
-	$reseller_id=$accountinfo['type']== -1 ? 0 : $accountinfo['id'];
-	if($this->session->userdata('userlevel_logintype')!= 0 && $this->session->userdata('userlevel_logintype')!= 3){
-	  $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts',array('reseller_id'=>$reseller_id));
+	$result = $this->dashboard_model->get_customer_maximum_callcount($start_date, $end_date);
+	$accountinfo = $this->session->userdata('accountinfo');
+	$reseller_id = $accountinfo['type'] == -1 ? 0 : $accountinfo['id'];
+	if ($this->session->userdata('userlevel_logintype') != 0 && $this->session->userdata('userlevel_logintype') != 3) {
+	  $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts', array('reseller_id'=>$reseller_id));
 	} 
-	else{
-	 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts',array('id'=>$reseller_id));
+	else {
+	 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts', array('id'=>$reseller_id));
 	}
-	$i=0;
-    	if($result->num_rows() > 0 )
+	$i = 0;
+    	if ($result->num_rows() > 0)
 	{
 	    foreach ($result->result_array() as $data) 
 	    {
-		        $data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] :"Anonymous";
-		        $json_data[$i][]= $data['accountid'];
-		        $json_data[$i][]= (int)$data['call_count'];
+		        $data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] : "Anonymous";
+		        $json_data[$i][] = $data['accountid'];
+		        $json_data[$i][] = (int)$data['call_count'];
 		        $i++;
             }
     	    
-        }else{
+        } else {
     	        $json_data[] = array();
      	     }
 	echo json_encode($json_data);

web_interface/astpp/application/modules/dashboard/views/view_dashboard.php

Spacing +3 added lines, -3 removed lines

@@ -355,7 +355,7 @@ 
 

                                           <div class='col-sm-11 no-padding'>

 											   <div style="font-size: 13px; width: auto; background:rgba(243, 236, 49, 0.34) none repeat scroll 0% 0% !important;" class="pull-left back_strip panel_padding" >

-													<div id="month_year_name" class='pull-left'><?=date('F');?></div>

+													<div id="month_year_name" class='pull-left'><?=date('F'); ?></div>

 	                                           </div>

 											   <div style="width: 91%; font-size: 13px;" class="pull-left back_strip panel_padding">

 												    <div id="month_total_info" style="color:#FFFC00;font-weight: 500;" class="pull-left"></div>

@@ -375,7 +375,7 @@ 
                                             $yearArray = range($start_year, $end_year);

                                             foreach ($yearArray as $year) {

                                                 $selected = ($year == $currentyear) ? 'selected' : '';

-                                                echo '<option ' . $selected . ' value="' . $year . '">' . $year . '</option>';

+                                                echo '<option '.$selected.' value="'.$year.'">'.$year.'</option>';

                                             }

                                             ?>

                                         </select>

@@ -388,7 +388,7 @@ 
                                                 $monthPadding = str_pad($month, 2, "0", STR_PAD_LEFT);

                                                 $fdate = date("F", strtotime($monthPadding));

                                                 $selected = (date("m") == $monthPadding) ? 'selected' : null;

-                                                echo '<option value="' . $monthPadding . '" ' . $selected . '>' . date("F", mktime(null, null, null, $monthPadding, 1)) . '</option>';

+                                                echo '<option value="'.$monthPadding.'" '.$selected.'>'.date("F", mktime(null, null, null, $monthPadding, 1)).'</option>';

                                             }

                                             ?>

                                         </select>

web_interface/astpp/application/modules/dashboard/models/dashboard_model.php

Spacing +34 added lines, -34 removed lines

@@ -31,23 +31,23 @@ 
 
     function get_recent_recharge()
     {
-	$accountinfo=$this->session->userdata('accountinfo');
-	$userlevel_logintype=$this->session->userdata('userlevel_logintype');
+	$accountinfo = $this->session->userdata('accountinfo');
+	$userlevel_logintype = $this->session->userdata('userlevel_logintype');
 	
-	$where_arr=array('payment_by'=>-1);
-	if($userlevel_logintype == 1){
-	  $where_arr=array('payment_by'=>$accountinfo['id']);
+	$where_arr = array('payment_by'=>-1);
+	if ($userlevel_logintype == 1) {
+	  $where_arr = array('payment_by'=>$accountinfo['id']);
 	}
-	if($userlevel_logintype == 0 || $userlevel_logintype == 3){
-	  $where_arr=array('accountid'=>$accountinfo['id']);
+	if ($userlevel_logintype == 0 || $userlevel_logintype == 3) {
+	  $where_arr = array('accountid'=>$accountinfo['id']);
 	}
         $this->db->where($where_arr);
         $this->db->select('id,accountid,credit,payment_date');
         $this->db->limit(12);
-        $this->db->order_by('payment_date','desc');
+        $this->db->order_by('payment_date', 'desc');
 	return $this->db->get('payments');
     }
-     function get_call_statistics($table,$parent_id,$start_date='',$end_date='',$group_flag=true) 
+     function get_call_statistics($table, $parent_id, $start_date = '', $end_date = '', $group_flag = true) 
     {
         $this->db->select("count(uniqueid) as sum,
                            count(CASE WHEN billseconds > 0 THEN 1 END) as answered,
@@ -59,44 +59,44 @@ 
                            sum(cost) as cost,
                            SUM(CASE WHEN billseconds > 0 THEN 1 ELSE 0 END) as completed,
                            DAY(callstart) as day",false);
-        $this->db->where('callstart >=',$start_date." 00:00:00");
-        $this->db->where('callstart <=',$end_date." 23:59:59");
-        $this->db->where('reseller_id',$parent_id);
-        if($group_flag)
+        $this->db->where('callstart >=', $start_date." 00:00:00");
+        $this->db->where('callstart <=', $end_date." 23:59:59");
+        $this->db->where('reseller_id', $parent_id);
+        if ($group_flag)
         $this->db->group_by("DAY(callstart)");
-        $result=$this->db->get($table);
+        $result = $this->db->get($table);
 	return $result;
     }
-    function get_customer_maximum_callminutes($start_date,$end_date)
+    function get_customer_maximum_callminutes($start_date, $end_date)
     {
-	$start_date=$start_date." 00:00:00";
-	$end_date=$end_date." 23:59:59";
-	$accountinfo=$this->session->userdata('accountinfo');
-	$parent_id= ($accountinfo['type'] == 1) ? $accountinfo['id']:0;
-	if($this->session->userdata('userlevel_logintype')!= 0 && $this->session->userdata('userlevel_logintype')!= 3)
-	 $where ="reseller_id ='$parent_id'";
+	$start_date = $start_date." 00:00:00";
+	$end_date = $end_date." 23:59:59";
+	$accountinfo = $this->session->userdata('accountinfo');
+	$parent_id = ($accountinfo['type'] == 1) ? $accountinfo['id'] : 0;
+	if ($this->session->userdata('userlevel_logintype') != 0 && $this->session->userdata('userlevel_logintype') != 3)
+	 $where = "reseller_id ='$parent_id'";
 	else
-	 $where ="accountid ='$parent_id'";
-	$where= $where." AND callstart >= '".$start_date."' AND  callstart <= '".$end_date."'";
-	$select_query= "(SELECT sum( billseconds ) AS billseconds,accountid FROM (cdrs) WHERE $where group by accountid order by sum(billseconds) desc limit 10)
+	 $where = "accountid ='$parent_id'";
+	$where = $where." AND callstart >= '".$start_date."' AND  callstart <= '".$end_date."'";
+	$select_query = "(SELECT sum( billseconds ) AS billseconds,accountid FROM (cdrs) WHERE $where group by accountid order by sum(billseconds) desc limit 10)
 			union
 			(SELECT sum( billseconds ) AS billseconds,accountid FROM (reseller_cdrs) WHERE $where 
 			group by accountid order by sum(billseconds) desc limit 10 ) ORDER BY billseconds DESC LIMIT 10 ";
 	return $this->db->query($select_query);
     }
 
-    function get_customer_maximum_callcount($start_date,$end_date)
+    function get_customer_maximum_callcount($start_date, $end_date)
     {
-	$start_date=$start_date." 00:00:00";
-	$end_date=$end_date." 23:59:59";
-	$accountinfo=$this->session->userdata('accountinfo');
-	$parent_id= ($accountinfo['type'] == 1) ? $accountinfo['id']:0;
-	  if($this->session->userdata('userlevel_logintype')!= 0 && $this->session->userdata('userlevel_logintype')!= 3)
-	  $where ="reseller_id ='$parent_id'";
+	$start_date = $start_date." 00:00:00";
+	$end_date = $end_date." 23:59:59";
+	$accountinfo = $this->session->userdata('accountinfo');
+	$parent_id = ($accountinfo['type'] == 1) ? $accountinfo['id'] : 0;
+	  if ($this->session->userdata('userlevel_logintype') != 0 && $this->session->userdata('userlevel_logintype') != 3)
+	  $where = "reseller_id ='$parent_id'";
 	else
-	  $where ="accountid ='$parent_id'";
-	  $where= $where." AND callstart >= '".$start_date."' AND  callstart <= '".$end_date."'";
-	  $select_query="(SELECT count(uniqueid) as call_count, `accountid` FROM (`cdrs`) WHERE $where GROUP BY `accountid` ORDER BY `call_count` desc LIMIT 10)
+	  $where = "accountid ='$parent_id'";
+	  $where = $where." AND callstart >= '".$start_date."' AND  callstart <= '".$end_date."'";
+	  $select_query = "(SELECT count(uniqueid) as call_count, `accountid` FROM (`cdrs`) WHERE $where GROUP BY `accountid` ORDER BY `call_count` desc LIMIT 10)
 	  UNION
 	  (SELECT count(uniqueid) as call_count,accountid FROM (reseller_cdrs) WHERE $where GROUP BY `accountid` ORDER BY `call_count` desc LIMIT 10)
 	  ORDER BY call_count desc limit 10";

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

Spacing +22 added lines, -22 removed lines

@@ -33,7 +33,7 @@ 
         $this->load->model('trunk_model');
 
         if ($this->session->userdata('user_login') == FALSE)
-            redirect(base_url() . '/astpp/login');
+            redirect(base_url().'/astpp/login');
     }
 
     function trunk_list() {
@@ -50,7 +50,7 @@ 
     function trunk_list_json() {
         $json_data = array();
         $count_all = $this->trunk_model->gettrunk_list(false);
-        $paging_data = $this->form->load_grid_config($count_all,$_GET['rp'], $_GET['page']);
+        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
         $json_data = $paging_data["json_paging"];
         $query = $this->trunk_model->gettrunk_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
         $grid_fields = json_decode($this->trunk_form->build_trunk_list_for_admin());
@@ -117,7 +117,7 @@ 
             $this->session->set_userdata('trunk_list_search', $action);
         }
         if (@$ajax_search != 1) {
-            redirect(base_url() . 'trunk/trunk_list/');
+            redirect(base_url().'trunk/trunk_list/');
         }
     }
 
@@ -128,9 +128,9 @@ 
 
     function trunk_remove($id) {
         $this->trunk_model->remove_trunk($id);
-	$this->db->delete("routing",array("trunk_id"=>$id));
+	$this->db->delete("routing", array("trunk_id"=>$id));
         $this->session->set_flashdata('astpp_notification', 'Trunk removed successfully!');
-        redirect(base_url() . 'trunk/trunk_list/');
+        redirect(base_url().'trunk/trunk_list/');
     }
 
     function trunk_delete_multiple() {
@@ -144,34 +144,34 @@ 
             $this->db->update('trunks', $update_data);
             echo TRUE;
         } else {
-            $trunk_arr=array();
+            $trunk_arr = array();
             $this->db->select('id,name');
             $this->db->where('id '.$where);
-            $trunk_res=$this->db->get('trunks');
-            $trunk_res=$trunk_res->result_array();
-            foreach($trunk_res as $value){
-                $trunk_arr[$value['id']]['name']=$value['name'];
+            $trunk_res = $this->db->get('trunks');
+            $trunk_res = $trunk_res->result_array();
+            foreach ($trunk_res as $value) {
+                $trunk_arr[$value['id']]['name'] = $value['name'];
             }
             $this->db->where('trunk_id '.$where);
             $this->db->select('count(id) as cnt,trunk_id');
             $this->db->group_by('trunk_id');
-            $outbound_routes_res=$this->db->get('outbound_routes');
-            if($outbound_routes_res->num_rows() > 0){
-             $outbound_routes_res=$outbound_routes_res->result_array();
-             foreach($outbound_routes_res as $key=>$value){
-                $trunk_arr[$value['trunk_id']]['outbound_routes']=$value['cnt'];
+            $outbound_routes_res = $this->db->get('outbound_routes');
+            if ($outbound_routes_res->num_rows() > 0) {
+             $outbound_routes_res = $outbound_routes_res->result_array();
+             foreach ($outbound_routes_res as $key=>$value) {
+                $trunk_arr[$value['trunk_id']]['outbound_routes'] = $value['cnt'];
              }
             }
-            $str=null;
-            foreach($trunk_arr as $key=>$value){
-                 if(isset($value['outbound_routes'])){
-                     $str.= $value['name']."trunk using by ".$value['outbound_routes']." termination rates \n";
+            $str = null;
+            foreach ($trunk_arr as $key=>$value) {
+                 if (isset($value['outbound_routes'])) {
+                     $str .= $value['name']."trunk using by ".$value['outbound_routes']." termination rates \n";
                  }
             } 
-            if(!empty($str)){
-                $data['str']=$str;
+            if ( ! empty($str)) {
+                $data['str'] = $str;
             }
-            $data['selected_ids']=$add_array['selected_ids'];
+            $data['selected_ids'] = $add_array['selected_ids'];
             echo json_encode($data);
         }
     }

web_interface/astpp/application/modules/trunk/libraries/trunk_form.php

Spacing +22 added lines, -22 removed lines

@@ -20,25 +20,25 @@ 
 # 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'))

+if ( ! defined('BASEPATH'))

     exit('No direct script access allowed');

 

 class trunk_form {

 

     function get_trunk_form_fields() {

-        $form['forms'] = array(base_url() . 'trunk/trunk_save/', array('id' => 'trunks_form', 'method' => 'POST', 'name' => 'trunks_form'));

+        $form['forms'] = array(base_url().'trunk/trunk_save/', array('id' => 'trunks_form', 'method' => 'POST', 'name' => 'trunks_form'));

         $form['Information'] = array(

             array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),

             array('Name', 'INPUT', array('name' => 'name', 'size' => '20', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

-			array('Provider', 'provider_id', 'SELECT', '', 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr',array('type'=>3,"deleted"=>"0","status"=>"0")),

-            array('Gateway Name', 'gateway_id', 'SELECT', '', 'trim|required|xss_clean', 'tOOL TIP', 'Please select gateway first', 'id', 'name', 'gateways', 'build_dropdown','where_arr', array("status" => "0")),

+			array('Provider', 'provider_id', 'SELECT', '', 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array('type'=>3, "deleted"=>"0", "status"=>"0")),

+            array('Gateway Name', 'gateway_id', 'SELECT', '', 'trim|required|xss_clean', 'tOOL TIP', 'Please select gateway first', 'id', 'name', 'gateways', 'build_dropdown', 'where_arr', array("status" => "0")),

 			array('Failover GW Name #1', 'failover_gateway_id', 'SELECT', '', '', 'tOOL TIP', 'Please select gateway first', 'id', 'name', 'gateways', 'build_dropdown', 'where_arr', array("status" => "0")),

 			array('Failover GW Name #2', 'failover_gateway_id1', 'SELECT', '', '', 'tOOL TIP', 'Please select gateway first', 'id', 'name', 'gateways', 'build_dropdown', 'where_arr', array("status" => "0")),            

-            array('CC', 'INPUT', array('name' => 'maxchannels', 'value' => '0' , 'size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', ''));

+            array('CC', 'INPUT', array('name' => 'maxchannels', 'value' => '0', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''));

         $form['Settings'] = array(  

-            array('Number Translation', 'INPUT', array('name' => 'dialed_modify', 'size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', ''),

+            array('Number Translation', 'INPUT', array('name' => 'dialed_modify', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),

 			array('Codecs', 'INPUT', array('name' => 'codec', 'size' => '20', 'class' => "text field medium"), 'trim|xss_clean', 'tOOL TIP', ''),

-            array('Priority', 'INPUT', array('name' => 'precedence', 'size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', ''),

+            array('Priority', 'INPUT', array('name' => 'precedence', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),

             array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Select Status', '', '', '', 'set_status'),

         );

         $form['button_cancel'] = array('name' => 'action', 'content' => 'Close', 'value' => 'cancel', 'type' => 'button', 'class' => 'btn btn-line-sky margin-x-10', 'onclick' => 'return redirect_page(\'NULL\')');

@@ -50,8 +50,8 @@ 
         $form['forms'] = array("", array('id' => "trunk_search"));

         $form['Search'] = array(

             array('Name', 'INPUT', array('name' => 'name[name]', '', 'size' => '20', 'class' => "text field"), '', 'tOOL TIP', '1', 'name[name-string]', '', '', '', 'search_string_type', ''),

-            array('Provider', 'provider_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr',array('type'=>3, "status"=>0, "deleted" => 0)),

-            array('Gateway Name', 'gateway_id', 'SELECT', '', '', 'tOOL TIP', 'Please select gateway first', 'id', 'name', 'gateways', 'build_dropdown','where_arr', array("status" => "0")),

+            array('Provider', 'provider_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array('type'=>3, "status"=>0, "deleted" => 0)),

+            array('Gateway Name', 'gateway_id', 'SELECT', '', '', 'tOOL TIP', 'Please select gateway first', 'id', 'name', 'gateways', 'build_dropdown', 'where_arr', array("status" => "0")),

 			array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_search_status', '', ''),

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

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

@@ -63,26 +63,26 @@ 
 

     function build_trunk_list_for_admin() {

         

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

-            array("Name", "100", "name", "", "", "","EDITABLE","true","center"),

-            array("Provider", "110", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string","","true","center"),

-            array("Gateway Name", "100", "gateway_id", "name", "gateways", "get_field_name","","true","center"),

-			array("Failover <br>GW Name #1", "130", "failover_gateway_id","name", "gateways", "get_field_name","","true","center"),

-            array("Failover<br> GW Name #2", "130", "failover_gateway_id1","name", "gateways", "get_field_name","","true","center"),

-			array("CC", "90", "maxchannels", "", "", "","","true","center"),

-            array("Codecs", "90", "codec", "", "", "","","true","center"),

-			array("Rate<br>Count", "70", "id", "trunk_id", "outbound_routes", "get_field_count","","true","center"),

-            array("Status", "100", "status", "status", "trunks", "get_status","","true","center"),

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

+            array("Name", "100", "name", "", "", "", "EDITABLE", "true", "center"),

+            array("Provider", "110", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string", "", "true", "center"),

+            array("Gateway Name", "100", "gateway_id", "name", "gateways", "get_field_name", "", "true", "center"),

+			array("Failover <br>GW Name #1", "130", "failover_gateway_id", "name", "gateways", "get_field_name", "", "true", "center"),

+            array("Failover<br> GW Name #2", "130", "failover_gateway_id1", "name", "gateways", "get_field_name", "", "true", "center"),

+			array("CC", "90", "maxchannels", "", "", "", "", "true", "center"),

+            array("Codecs", "90", "codec", "", "", "", "", "true", "center"),

+			array("Rate<br>Count", "70", "id", "trunk_id", "outbound_routes", "get_field_count", "", "true", "center"),

+            array("Status", "100", "status", "status", "trunks", "get_status", "", "true", "center"),

             array("Created Date", "110", "creation_date", "creation_date", "creation_date", "convert_GMT_to"),

-            array("Modified <br/>Date", "105", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to","","true","center"),

-			array("Action", "100", "", "", "", array("EDIT" => array("url" => "trunk/trunk_edit/", "mode" => "popup","layout"=>"medium"),

+            array("Modified <br/>Date", "105", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to", "", "true", "center"),

+			array("Action", "100", "", "", "", array("EDIT" => array("url" => "trunk/trunk_edit/", "mode" => "popup", "layout"=>"medium"),

                     "DELETE" => array("url" => "trunk/trunk_remove/", "mode" => "single")))

                 ));

 			return $grid_field_arr;

     }

 

     function build_grid_buttons() {

-        $buttons_json = json_encode(array(array("Create","btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/trunk/trunk_add/", "popup","medium"),

+        $buttons_json = json_encode(array(array("Create", "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/trunk/trunk_add/", "popup", "medium"),

             array("Delete", "btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "/trunk/trunk_delete_multiple/")

             ));

         return $buttons_json;

web_interface/astpp/application/modules/trunk/models/trunk_model.php

Spacing +3 added lines, -3 removed lines

@@ -39,14 +39,14 @@ 
 
     function add_trunk($add_array) {
         unset($add_array["action"]);
-        $add_array['creation_date']=gmdate('Y-m-d H:i:s');
+        $add_array['creation_date'] = gmdate('Y-m-d H:i:s');
         $this->db->insert("trunks", $add_array);
         return true;
     }
 
     function edit_trunk($data, $id) {
         unset($data["action"]);
-		$data['last_modified_date']=gmdate('Y-m-d H:i:s');
+		$data['last_modified_date'] = gmdate('Y-m-d H:i:s');
         $this->db->where("id", $id);
         $this->db->update("trunks", $data);
     }
@@ -54,7 +54,7 @@ 
     function remove_trunk($id) {
         $this->db->where("id", $id);
         $this->db->update("trunks", array("status" => 2));
-        $this->db->where('trunk_id',$id);
+        $this->db->where('trunk_id', $id);
         $this->db->delete('outbound_routes');
         return true;
     }

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

Spacing +221 added lines, -221 removed lines

@@ -32,10 +32,10 @@ 
         $this->load->library('astpp/form');
         $this->load->model('rates_model');
         $this->load->library('csvreader');
-	ini_set("memory_limit","2048M");
-	ini_set("max_execution_time","259200");
+	ini_set("memory_limit", "2048M");
+	ini_set("max_execution_time", "259200");
         if ($this->session->userdata('user_login') == FALSE)
-            redirect(base_url() . '/astpp/login');
+            redirect(base_url().'/astpp/login');
     }
 
     function termination_rates_list() {
@@ -72,70 +72,70 @@ 
 
         echo json_encode($json_data);
     }
-      function termination_rates_list_delete($flag='') {
+      function termination_rates_list_delete($flag = '') {
         $json_data = array();
-        $this->session->set_userdata('advance_batch_data_delete',1);
+        $this->session->set_userdata('advance_batch_data_delete', 1);
         $count_all = $this->rates_model->get_termination_rates_list(false);
 	echo $count_all; 
     } 
 /****************/
      function termination_rate_import() {
         $data['page_title'] = 'Import Termination Rates';
-        $this->session->set_userdata('import_termination_rate_csv',"");
-        $this->session->set_userdata('import_termination_rate_csv_error',"");
+        $this->session->set_userdata('import_termination_rate_csv', "");
+        $this->session->set_userdata('import_termination_rate_csv_error', "");
         $this->load->view('view_import_termination_rate', $data);
     }
-    function termination_rate_preview_file(){
-    	$invalid_flag= false;
-	$check_header=$this->input->post('check_header',true);
+    function termination_rate_preview_file() {
+    	$invalid_flag = false;
+	$check_header = $this->input->post('check_header', true);
 	$data['page_title'] = 'Import Termination Rates';
         $new_final_arr_key = $this->config->item('Termination-rates-field');
-        if(empty($_FILES) || !isset($_FILES)){
+        if (empty($_FILES) || ! isset($_FILES)) {
 	  redirect(base_url()."rates/termination_rates_list/");
 	}
-        if (isset($_FILES['termination_rate_import']['name']) && $_FILES['termination_rate_import']['name'] != "" &&  isset($_POST['trunk_id']) && $_POST['trunk_id'] != '') {
+        if (isset($_FILES['termination_rate_import']['name']) && $_FILES['termination_rate_import']['name'] != "" && isset($_POST['trunk_id']) && $_POST['trunk_id'] != '') {
             list($txt, $ext) = explode(".", $_FILES['termination_rate_import']['name']);
-            if($ext == "csv" && $_FILES['termination_rate_import']['size'] > 0){ 
+            if ($ext == "csv" && $_FILES['termination_rate_import']['size'] > 0) { 
                 $error = $_FILES['termination_rate_import']['error'];
-                if ($error == 0 ) {
+                if ($error == 0) {
                     $uploadedFile = $_FILES["termination_rate_import"]["tmp_name"];
-                    $csv_data=$this->csvreader->parse_file($uploadedFile,$new_final_arr_key,$check_header);
-		    if(!empty($csv_data)){
+                    $csv_data = $this->csvreader->parse_file($uploadedFile, $new_final_arr_key, $check_header);
+		    if ( ! empty($csv_data)) {
 			$full_path = $this->config->item('rates-file-path');
-			$actual_file_name = "ASTPP-TERMINATION-RATES-".date("Y-m-d H:i:s"). "." . $ext;
-			if (move_uploaded_file($uploadedFile,$full_path.$actual_file_name)) {
+			$actual_file_name = "ASTPP-TERMINATION-RATES-".date("Y-m-d H:i:s").".".$ext;
+			if (move_uploaded_file($uploadedFile, $full_path.$actual_file_name)) {
 			  $data['csv_tmp_data'] = $csv_data;
 			  $data['trunkid'] = $_POST['trunk_id'];
-			  $data['check_header']=$check_header;
+			  $data['check_header'] = $check_header;
 			  $data['page_title'] = 'Termination Rates Preview';
-			  $this->session->set_userdata('import_termination_rate_csv',$actual_file_name);
-			}else{
+			  $this->session->set_userdata('import_termination_rate_csv', $actual_file_name);
+			} else {
 			  $data['error'] = "File Uploading Fail Please Try Again";
 			}
                     }
                 }
-                else{
-                    $data['error']=="File Uploading Fail Please Try Again";
+                else {
+                    $data['error'] == "File Uploading Fail Please Try Again";
                 }
-            }else {
+            } else {
                 $data['error'] = "Invalid file format : Only CSV file allows to import records(Can't import empty file)";
             }
-        }else{
-		$invalid_flag=true;
+        } else {
+		$invalid_flag = true;
         }
         if ($invalid_flag) {
             $str = '';
-            if (!isset($_POST['trunk_id']) || empty($_POST['trunk_id'])) {
-                $str.= '<br/>Please Create Trunk.';
+            if ( ! isset($_POST['trunk_id']) || empty($_POST['trunk_id'])) {
+                $str .= '<br/>Please Create Trunk.';
             }
             if (empty($_FILES['termination_rate_import']['name'])) {
-                $str.= '<br/>Please Select  File.';
+                $str .= '<br/>Please Select  File.';
             }
-            $data['error']=$str;
+            $data['error'] = $str;
         }
         $this->load->view('view_import_termination_rate', $data);
     }
-    function termination_rate_rates_import($trunkID,$check_header=false) {
+    function termination_rate_rates_import($trunkID, $check_header = false) {
         $new_final_arr = array();
         $invalid_array = array();
         $new_final_arr_key = $this->config->item('Termination-rates-field');
@@ -145,65 +145,65 @@ 
         }
 	$full_path = $this->config->item('rates-file-path');
         $terminationrate_file_name = $this->session->userdata('import_termination_rate_csv');	
-        $csv_tmp_data = $this->csvreader->parse_file($full_path.$terminationrate_file_name,$new_final_arr_key,$check_header); 
-	$i=0;
+        $csv_tmp_data = $this->csvreader->parse_file($full_path.$terminationrate_file_name, $new_final_arr_key, $check_header); 
+	$i = 0;
         foreach ($csv_tmp_data as $key => $csv_data) {
-	 if(isset($csv_data['pattern']) && $csv_data['pattern']!= '' && $i != 0){
-	    $str=null;
-	    $csv_data['prepend']= isset($csv_data['prepend'])? $csv_data['prepend'] :'';
-	    $csv_data['comment']= isset($csv_data['comment'])? $csv_data['comment'] :'';
-	    $csv_data['connectcost']= isset($csv_data['connectcost']) ? $csv_data['connectcost'] :0;
-	    $csv_data['includedseconds']= isset($csv_data['includedseconds']) ? $csv_data['includedseconds'] :0;
-	    $csv_data['cost']= !empty($csv_data['cost']) && is_numeric( $csv_data['cost']) ? $csv_data['cost'] :0;
-	    $csv_data['inc']= isset($csv_data['inc']) ? $csv_data['inc'] :0;
-	    $csv_data['precedence']= isset($csv_data['precedence']) ? $csv_data['precedence'] :'';
-	    $csv_data['strip']= isset($csv_data['strip']) ? $csv_data['strip'] :'';
+	 if (isset($csv_data['pattern']) && $csv_data['pattern'] != '' && $i != 0) {
+	    $str = null;
+	    $csv_data['prepend'] = isset($csv_data['prepend']) ? $csv_data['prepend'] : '';
+	    $csv_data['comment'] = isset($csv_data['comment']) ? $csv_data['comment'] : '';
+	    $csv_data['connectcost'] = isset($csv_data['connectcost']) ? $csv_data['connectcost'] : 0;
+	    $csv_data['includedseconds'] = isset($csv_data['includedseconds']) ? $csv_data['includedseconds'] : 0;
+	    $csv_data['cost'] = ! empty($csv_data['cost']) && is_numeric($csv_data['cost']) ? $csv_data['cost'] : 0;
+	    $csv_data['inc'] = isset($csv_data['inc']) ? $csv_data['inc'] : 0;
+	    $csv_data['precedence'] = isset($csv_data['precedence']) ? $csv_data['precedence'] : '';
+	    $csv_data['strip'] = isset($csv_data['strip']) ? $csv_data['strip'] : '';
 	    $csv_data['last_modified_date'] = date("Y-m-d H:i:s");
-	    $str=$this->data_validate($csv_data);
-	    if($str != ""){
-	      $invalid_array[$i]=$csv_data;
+	    $str = $this->data_validate($csv_data);
+	    if ($str != "") {
+	      $invalid_array[$i] = $csv_data;
 	      $invalid_array[$i]['error'] = $str;
 	    }
-	    else{
-	      $csv_data['trunk_id']=$trunkID;
-	      $csv_data['pattern'] = "^" . $csv_data['pattern'] . ".*";
-	      $new_final_arr[$i]=$csv_data;
+	    else {
+	      $csv_data['trunk_id'] = $trunkID;
+	      $csv_data['pattern'] = "^".$csv_data['pattern'].".*";
+	      $new_final_arr[$i] = $csv_data;
 	    }
 	  }
           $i++;
         }
-         if(!empty($new_final_arr)){
+         if ( ! empty($new_final_arr)) {
  	    $result = $this->rates_model->bulk_insert_termination_rate($new_final_arr);
          }
           unlink($full_path.$terminationrate_file_name);
-	  $count=count($invalid_array);
-        if($count >0){
+	  $count = count($invalid_array);
+        if ($count > 0) {
             $session_id = "-1";
             $fp = fopen($full_path.$session_id.'.csv', 'w');
-            foreach($new_final_arr_key as $key=>$value){
-	      $custom_array[0][$key]=ucfirst($key);
+            foreach ($new_final_arr_key as $key=>$value) {
+	      $custom_array[0][$key] = ucfirst($key);
             }
-            $custom_array[0]['error']= "Error";
-            $invalid_array =array_merge($custom_array,$invalid_array);
-            foreach($invalid_array as $err_data){
-                    fputcsv($fp,$err_data);
+            $custom_array[0]['error'] = "Error";
+            $invalid_array = array_merge($custom_array, $invalid_array);
+            foreach ($invalid_array as $err_data) {
+                    fputcsv($fp, $err_data);
             }
            fclose($fp);
            $this->session->set_userdata('import_termination_rate_csv_error', $session_id.".csv");
            $data["error"] = $invalid_array;
            $data['trunkid'] = $trunkID;
            $data['impoted_count'] = count($new_final_arr);
-           $data['failure_count'] = count($invalid_array)-1;
+           $data['failure_count'] = count($invalid_array) - 1;
            $data['page_title'] = 'Termination Rates Import Error';	
-           $this->load->view('view_import_error',$data);
-         } else{
+           $this->load->view('view_import_error', $data);
+         } else {
 	  $this->session->set_flashdata('astpp_errormsg', 'Total '.count($new_final_arr).' Termination rates imported successfully!');
            redirect(base_url()."rates/termination_rates_list/");
          }        
     }
-    function termination_rate_error_download(){
+    function termination_rate_error_download() {
         $this->load->helper('download');
-        $error_data =  $this->session->userdata('import_termination_rate_csv_error');
+        $error_data = $this->session->userdata('import_termination_rate_csv_error');
         $full_path = $this->config->item('rates-file-path');
         $data = file_get_contents($full_path.$error_data);
         force_download("Termination_rate_error.csv", $data); 
@@ -211,182 +211,182 @@ 
     }  
     function origination_rate_import() {
         $data['page_title'] = 'Import Origination Rates';
-        $this->session->set_userdata('import_origination_rate_csv',"");
-        $error_data =  $this->session->userdata('import_origination_rate_csv_error');
+        $this->session->set_userdata('import_origination_rate_csv', "");
+        $error_data = $this->session->userdata('import_origination_rate_csv_error');
         $full_path = $this->config->item('rates-file-path');
-        if(file_exists($full_path.$error_data) && $error_data != ""){
+        if (file_exists($full_path.$error_data) && $error_data != "") {
             unlink($full_path.$error_data);
-            $this->session->set_userdata('import_origination_rate_csv_error',"");
+            $this->session->set_userdata('import_origination_rate_csv_error', "");
         }
         $this->load->view('view_import_origination_rate', $data);
     }
-    function origination_rate_preview_file(){
-	$invalid_flag= false;
-	$data=array();
+    function origination_rate_preview_file() {
+	$invalid_flag = false;
+	$data = array();
 	$data['page_title'] = 'Import Origination Rates';
-	$check_header=$this->input->post('check_header',true);
-	if(empty($_FILES) || !isset($_FILES)){
+	$check_header = $this->input->post('check_header', true);
+	if (empty($_FILES) || ! isset($_FILES)) {
 	  redirect(base_url()."rates/origination_rate_list/");
 	}
-	$get_extension=strpos($_FILES['origination_rate_import']['name'],'.');
+	$get_extension = strpos($_FILES['origination_rate_import']['name'], '.');
 	$new_final_arr_key = $this->config->item('Origination-rates-field');
-	if(!$get_extension){
-		$data['error']= "Please Upload File Atleast";
+	if ( ! $get_extension) {
+		$data['error'] = "Please Upload File Atleast";
         }
         if (isset($_FILES['origination_rate_import']['name']) && $_FILES['origination_rate_import']['name'] != "" && isset($_POST['pricelist_id']) && $_POST['pricelist_id'] != '') {
-            list($txt,$ext) = explode(".", $_FILES['origination_rate_import']['name']);
+            list($txt, $ext) = explode(".", $_FILES['origination_rate_import']['name']);
             
-            if($ext == "csv" && $_FILES['origination_rate_import']['size'] > 0){ 
+            if ($ext == "csv" && $_FILES['origination_rate_import']['size'] > 0) { 
                 $error = $_FILES['origination_rate_import']['error'];
                 if ($error == 0) {
                     $uploadedFile = $_FILES["origination_rate_import"]["tmp_name"];
-                    $csv_data=$this->csvreader->parse_file($uploadedFile,$new_final_arr_key,$check_header);
-                    if(!empty($csv_data)){
+                    $csv_data = $this->csvreader->parse_file($uploadedFile, $new_final_arr_key, $check_header);
+                    if ( ! empty($csv_data)) {
 		    $full_path = $this->config->item('rates-file-path');
-                    $actual_file_name = "ASTPP-ORIGIN-RATES-".date("Y-m-d H:i:s"). "." . $ext;
-                    if (move_uploaded_file($uploadedFile,$full_path.$actual_file_name)) {
-			$flag=false;
-			$data['trunkid']=isset($_POST['trunk_id']) && $_POST['trunk_id'] > 0 ? $_POST['trunk_id'] : 0;
+                    $actual_file_name = "ASTPP-ORIGIN-RATES-".date("Y-m-d H:i:s").".".$ext;
+                    if (move_uploaded_file($uploadedFile, $full_path.$actual_file_name)) {
+			$flag = false;
+			$data['trunkid'] = isset($_POST['trunk_id']) && $_POST['trunk_id'] > 0 ? $_POST['trunk_id'] : 0;
                         $data['csv_tmp_data'] = $csv_data;
                         $data['pricelistid'] = $_POST['pricelist_id'];
                         $data['page_title'] = "Origination Rates Preview";
-                        $data['check_header']=$check_header;
-                        $this->session->set_userdata('import_origination_rate_csv',$actual_file_name);
-                    }else{
+                        $data['check_header'] = $check_header;
+                        $this->session->set_userdata('import_origination_rate_csv', $actual_file_name);
+                    } else {
                         $data['error'] = "File Uploading Fail Please Try Again";
                     }
                 }
              }   
-            else{
-                    $data['error']=="File Uploading Fail Please Try Again";
+            else {
+                    $data['error'] == "File Uploading Fail Please Try Again";
                 }
            }
            else {
                 $data['error'] = "Invalid file format : Only CSV file allows to import records(Can't import empty file)";
             }
-            }else{
-		$invalid_flag=true;
+            } else {
+		$invalid_flag = true;
             }
         if ($invalid_flag) {
             $str = '';
-            if (!isset($_POST['pricelist_id']) || empty($_POST['pricelist_id'])) {
-                $str.= '<br/>Please Create Rate Group.';
+            if ( ! isset($_POST['pricelist_id']) || empty($_POST['pricelist_id'])) {
+                $str .= '<br/>Please Create Rate Group.';
             }
             if (empty($_FILES['origination_rate_import']['name'])) {
-                $str.= '<br/>Please Select File.';
+                $str .= '<br/>Please Select File.';
             }
-            $data['error']=$str;
+            $data['error'] = $str;
         }
         $this->load->view('view_import_origination_rate', $data);
     }
-    function origination_rate_import_file($pricelistID,$trunkid,$check_header=false) {
+    function origination_rate_import_file($pricelistID, $trunkid, $check_header = false) {
        $new_final_arr = array();
         $invalid_array = array();
         $new_final_arr_key = $this->config->item('Origination-rates-field');
 	$screen_path = $this->config->item('screen_path');
-	$reseller_id=0;
+	$reseller_id = 0;
         if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
             $reseller_id = $this->session->userdata["accountinfo"]['id'];
         }
         
 		$full_path = $this->config->item('rates-file-path');
         $originationrate_file_name = $this->session->userdata('import_origination_rate_csv');	
-        $csv_tmp_data = $this->csvreader->parse_file($full_path.$originationrate_file_name,$new_final_arr_key,$check_header); 
+        $csv_tmp_data = $this->csvreader->parse_file($full_path.$originationrate_file_name, $new_final_arr_key, $check_header); 
         //echo "<pre>";print_r($csv_tmp_data);exit;
-	$i=0;
+	$i = 0;
         foreach ($csv_tmp_data as $key => $csv_data) {	
-	  if(isset($csv_data['pattern']) && $csv_data['pattern']!= '' && $i != 0){
-	    $str=null;
-	    $csv_data['comment']= isset($csv_data['comment'])? $csv_data['comment'] :'';
-	    $csv_data['connectcost']= isset($csv_data['connectcost']) ? $csv_data['connectcost'] :0;
-	    $csv_data['includedseconds']= isset($csv_data['includedseconds']) ? $csv_data['includedseconds'] :0;
-	    $csv_data['cost']= !empty($csv_data['cost']) && is_numeric( $csv_data['cost']) ? $csv_data['cost'] :0;
-	    $csv_data['inc']= isset($csv_data['inc']) ? $csv_data['inc'] :0;
-	    $csv_data['precedence']= isset($csv_data['precedence']) ? $csv_data['precedence'] :'';
+	  if (isset($csv_data['pattern']) && $csv_data['pattern'] != '' && $i != 0) {
+	    $str = null;
+	    $csv_data['comment'] = isset($csv_data['comment']) ? $csv_data['comment'] : '';
+	    $csv_data['connectcost'] = isset($csv_data['connectcost']) ? $csv_data['connectcost'] : 0;
+	    $csv_data['includedseconds'] = isset($csv_data['includedseconds']) ? $csv_data['includedseconds'] : 0;
+	    $csv_data['cost'] = ! empty($csv_data['cost']) && is_numeric($csv_data['cost']) ? $csv_data['cost'] : 0;
+	    $csv_data['inc'] = isset($csv_data['inc']) ? $csv_data['inc'] : 0;
+	    $csv_data['precedence'] = isset($csv_data['precedence']) ? $csv_data['precedence'] : '';
 	    $csv_data['last_modified_date'] = date("Y-m-d H:i:s");
-	    $str=$this->data_validate($csv_data);
-	    if($str != ""){
-	      $invalid_array[$i]=$csv_data;
+	    $str = $this->data_validate($csv_data);
+	    if ($str != "") {
+	      $invalid_array[$i] = $csv_data;
 	      $invalid_array[$i]['error'] = $str;
 	    }
-	    else{
-	      $csv_data['pricelist_id']=$pricelistID;
-	      $csv_data['trunk_id']=$trunkid;
-	      $csv_data['pattern'] = "^" . $csv_data['pattern'] . ".*";
-	      $csv_data['reseller_id']= $reseller_id;
+	    else {
+	      $csv_data['pricelist_id'] = $pricelistID;
+	      $csv_data['trunk_id'] = $trunkid;
+	      $csv_data['pattern'] = "^".$csv_data['pattern'].".*";
+	      $csv_data['reseller_id'] = $reseller_id;
 	      $csv_data['creation_date'] = gmdate('Y-m-d H:i:s');
-	      $new_final_arr[$i]=$csv_data;
+	      $new_final_arr[$i] = $csv_data;
 	    }
 	  }
           $i++;
         }
-          if(!empty($new_final_arr)){
+          if ( ! empty($new_final_arr)) {
   	    $result = $this->rates_model->bulk_insert_origination_rate($new_final_arr);
           }
           unlink($full_path.$originationrate_file_name);
-	 $count=count($invalid_array);
-        if($count >0){
+	 $count = count($invalid_array);
+        if ($count > 0) {
             $session_id = "-1";
             $fp = fopen($full_path.$session_id.'.csv', 'w');
-            foreach($new_final_arr_key as $key=>$value){
-	      $custom_array[0][$key]=ucfirst($key);
+            foreach ($new_final_arr_key as $key=>$value) {
+	      $custom_array[0][$key] = ucfirst($key);
             }
-            $custom_array[0]['error']= "Error";
-            $invalid_array =array_merge($custom_array,$invalid_array);
-            foreach($invalid_array as $err_data){
-                    fputcsv($fp,$err_data);
+            $custom_array[0]['error'] = "Error";
+            $invalid_array = array_merge($custom_array, $invalid_array);
+            foreach ($invalid_array as $err_data) {
+                    fputcsv($fp, $err_data);
             }
             fclose($fp);
            $this->session->set_userdata('import_origination_rate_csv_error', $session_id.".csv");
            $data["error"] = $invalid_array;
            $data['pricelistid'] = $pricelistID;
            $data['impoted_count'] = count($new_final_arr);
-           $data['failure_count'] = count($invalid_array)-1;
+           $data['failure_count'] = count($invalid_array) - 1;
            $data['page_title'] = 'Origination Rates Import Error';	
-           $this->load->view('view_import_error',$data);
-         } else{
+           $this->load->view('view_import_error', $data);
+         } else {
 	   $this->session->set_flashdata('astpp_errormsg', 'Total '.count($new_final_arr).' Origination rates imported successfully!');
            redirect(base_url()."rates/origination_rates_list/");
            }
     }
-     function data_validate($csvdata){
-          $str=null;
+     function data_validate($csvdata) {
+          $str = null;
 	  $alpha_regex = "/^[a-z ,.'-]+$/i";
 	  $alpha_numeric_regex = "/^[a-z0-9 ,.'-]+$/i";
 	  $email_regex = "/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$/"; 
-	  $str.= $csvdata['pattern']!= '' ? null : 'Code,';
-	  $str=rtrim($str,',');
-	  if(!$str){
-	      $str.= is_numeric($csvdata['pattern']) ? null : 'Code,';
+	  $str .= $csvdata['pattern'] != '' ? null : 'Code,';
+	  $str = rtrim($str, ',');
+	  if ( ! $str) {
+	      $str .= is_numeric($csvdata['pattern']) ? null : 'Code,';
 
-	      $str.= !empty($csvdata['connectcost']) && is_numeric( $csvdata['connectcost']) ? null :( empty($csvdata['connectcost']) ? null : 'Connect Cost,');
-	      $str.= !empty($csvdata['includedseconds']) && is_numeric( $csvdata['includedseconds']) ? null :( empty($csvdata['includedseconds']) ? null : 'Included Seconds,');
+	      $str .= ! empty($csvdata['connectcost']) && is_numeric($csvdata['connectcost']) ? null : (empty($csvdata['connectcost']) ? null : 'Connect Cost,');
+	      $str .= ! empty($csvdata['includedseconds']) && is_numeric($csvdata['includedseconds']) ? null : (empty($csvdata['includedseconds']) ? null : 'Included Seconds,');
 
-	      $str.= !empty($csvdata['inc']) && is_numeric( $csvdata['inc']) ? null :( empty($csvdata['inc']) ? null : 'Increment,');
-	      $str.= !empty($csvdata['precedence']) && is_numeric( $csvdata['precedence']) ? null :( empty($csvdata['precedence']) ? null : 'Precedence,');
-	      $str.= (isset($csvdata['strip']) && !empty($csvdata['strip'])) ? (is_numeric($csvdata['strip']) ? null :'Strip,') : null;
-	      if($str){
-		$str=rtrim($str,',');
-		$error_field=explode(',',$str);
+	      $str .= ! empty($csvdata['inc']) && is_numeric($csvdata['inc']) ? null : (empty($csvdata['inc']) ? null : 'Increment,');
+	      $str .= ! empty($csvdata['precedence']) && is_numeric($csvdata['precedence']) ? null : (empty($csvdata['precedence']) ? null : 'Precedence,');
+	      $str .= (isset($csvdata['strip']) && ! empty($csvdata['strip'])) ? (is_numeric($csvdata['strip']) ? null : 'Strip,') : null;
+	      if ($str) {
+		$str = rtrim($str, ',');
+		$error_field = explode(',', $str);
 		$count = count($error_field);
-		$str.= $count > 1 ? ' are not valid' : ' is not Valid';
+		$str .= $count > 1 ? ' are not valid' : ' is not Valid';
 		return $str;
 	      }
-	      else{
+	      else {
 	      return false;
 	      }
 	  }
-	  else{
-	  $str=rtrim($str,',');
-	    $error_field=explode(',',$str);
+	  else {
+	  $str = rtrim($str, ',');
+	    $error_field = explode(',', $str);
 	    $count = count($error_field);
-	    $str.= $count > 1 ? ' are required' : ' is Required';
+	    $str .= $count > 1 ? ' are required' : ' is Required';
     return $str;
     }
     }
-    function origination_rate_error_download(){
+    function origination_rate_error_download() {
         $this->load->helper('download');
-        $error_data =  $this->session->userdata('import_origination_rate_csv_error');
+        $error_data = $this->session->userdata('import_origination_rate_csv_error');
         $full_path = $this->config->item('rates-file-path');
         $data = file_get_contents($full_path.$error_data);
         force_download("Origination_rate_error.csv", $data); 
@@ -416,13 +416,13 @@ 
                 $edit_data = $value;
             }
             $edit_data['connectcost'] = $this->common_model->to_calculate_currency($edit_data['connectcost'], '', '', true, false);
-            $edit_data['cost'] = $this->common_model->to_calculate_currency($edit_data['cost'], '', '',true, false);
+            $edit_data['cost'] = $this->common_model->to_calculate_currency($edit_data['cost'], '', '', true, false);
             $edit_data['pattern'] = filter_var($edit_data['pattern'], FILTER_SANITIZE_NUMBER_INT);
 
             $data['form'] = $this->form->build_form($this->rates_form->get_origination_rate_form_fields(), $edit_data);
             $this->load->view('view_origination_rate_add_edit', $data);
         } else {
-            redirect(base_url() . 'rates/origination_rate_list/');
+            redirect(base_url().'rates/origination_rate_list/');
         }
     }
 
@@ -470,7 +470,7 @@ 
             $this->session->set_userdata('origination_rate_list_search', $action);
         }
         if (@$ajax_search != 1) {
-            redirect(base_url() . 'rates/origination_rates_list/');
+            redirect(base_url().'rates/origination_rates_list/');
         }
     }
 
@@ -482,13 +482,13 @@ 
     function termination_rate_delete($id) {
         $this->rates_model->remove_termination_rate($id);
         $this->session->set_flashdata('astpp_notification', 'Termination removed successfully!');
-        redirect(base_url() . '/rates/termination_rates_list/');
+        redirect(base_url().'/rates/termination_rates_list/');
     }
 
     function origination_rate_delete($id) {
         $this->rates_model->remove_origination_rate($id);
         $this->session->set_flashdata('astpp_notification', 'Origination rate removed successfully!');
-        redirect(base_url() . 'rates/origination_rates_list/');
+        redirect(base_url().'rates/origination_rates_list/');
     }
 
     function origination_rates_list() {
@@ -527,9 +527,9 @@ 
         echo json_encode($json_data);
     }
 
-      function origination_rates_list_delete($flag='') {
+      function origination_rates_list_delete($flag = '') {
         $json_data = array();
-        $this->session->set_userdata('advance_batch_data_delete',1);
+        $this->session->set_userdata('advance_batch_data_delete', 1);
         $count_all = $this->rates_model->get_origination_rate_list(false);
 		echo $count_all; 
     } 
@@ -603,7 +603,7 @@ 
             $this->session->set_userdata('termination_rates_list_search', $action);
         }
         if (@$ajax_search != 1) {
-            redirect(base_url() . 'rates/termination_rates_list/');
+            redirect(base_url().'rates/termination_rates_list/');
         }
     }
 
@@ -612,20 +612,20 @@ 
         $this->session->set_userdata('account_search', "");
     }
 
-    function customer_block_pattern_list($accountid,$accounttype) {
+    function customer_block_pattern_list($accountid, $accounttype) {
         $json_data = array();
         $where = array('accountid' => $accountid);
-        $instant_search=$this->session->userdata('left_panel_search_'.$accounttype.'_pattern'); 
-        $like_str=!empty($instant_search) ? "(blocked_patterns like '%$instant_search%'  OR  destination like '%$instant_search%' )" :null;
-        if(!empty($like_str))
+        $instant_search = $this->session->userdata('left_panel_search_'.$accounttype.'_pattern'); 
+        $like_str = ! empty($instant_search) ? "(blocked_patterns like '%$instant_search%'  OR  destination like '%$instant_search%' )" : null;
+        if ( ! empty($like_str))
         $this->db->where($like_str);
         $count_all = $this->db_model->countQuery("*", "block_patterns", $where);
         $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
         $json_data = $paging_data["json_paging"];
-        if(!empty($like_str))
+        if ( ! empty($like_str))
         $this->db->where($like_str);
         $pattern_data = $this->db_model->getSelect("*", "block_patterns", $where, "id", "ASC", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
-        $grid_fields = json_decode($this->rates_form->build_pattern_list_for_customer($accountid,$accounttype));
+        $grid_fields = json_decode($this->rates_form->build_pattern_list_for_customer($accountid, $accounttype));
         $json_data['rows'] = $this->form->build_grid($pattern_data, $grid_fields);
         echo json_encode($json_data);
     }
@@ -648,7 +648,7 @@ 
         $json_data = array();
         $account_data = $this->session->userdata("accountinfo");
         $markup = $this->common->get_field_name('markup', 'pricelists', array('id'=>$account_data["pricelist_id"]));
-        $markup = ($markup > 0)?$markup:1;
+        $markup = ($markup > 0) ? $markup : 1;
 
         $count_all = $this->rates_model->get_origination_rate_list_for_user(false);
         $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
@@ -658,11 +658,11 @@ 
         $grid_fields = json_decode($this->rates_form->build_origination_rate_list_for_user());
         foreach ($query->result_array() as $key => $value) {
             $json_data['rows'][] = array('cell' => array(
-                    $this->common->get_only_numeric_val("","",$value["pattern"]),
+                    $this->common->get_only_numeric_val("", "", $value["pattern"]),
                     $value['comment'],
                     $value['inc'],
-                    $this->common_model->calculate_currency(($value['cost'] + ($value['cost']*$markup)/100),'','','',true),
-                    $this->common_model->calculate_currency($value['connectcost'],'','','',true),
+                    $this->common_model->calculate_currency(($value['cost'] + ($value['cost'] * $markup) / 100), '', '', '', true),
+                    $this->common_model->calculate_currency($value['connectcost'], '', '', '', true),
                     $value['includedseconds']                    
             ));
         }
@@ -681,7 +681,7 @@ 
             $this->session->set_userdata('origination_rate_list_search', $action);
         }
         if (@$ajax_search != 1) {
-            redirect(base_url() . 'user/user_rates_list/');
+            redirect(base_url().'user/user_rates_list/');
         }
     }
 
@@ -689,10 +689,10 @@ 
         $this->session->set_userdata('advance_search', 0);
         $this->session->set_userdata('account_search', "");
     }
-    function customer_rates_download_sample_file($file_name){
+    function customer_rates_download_sample_file($file_name) {
         $this->load->helper('download');
 		$full_path = base_url()."assets/Rates_File/".$file_name.".csv";
-		$arrContextOptions=array(
+		$arrContextOptions = array(
 			"ssl"=>array(
 			"verify_peer"=>false,
 			"verify_peer_name"=>false,
@@ -701,19 +701,19 @@ 
         $file = file_get_contents($full_path, false, stream_context_create($arrContextOptions));
         force_download("samplefile.csv", $file); 
     }
-    function termination_rate_batch_update(){
+    function termination_rate_batch_update() {
         $batch_update_arr = $this->input->post();
-	$batch_update_arr["cost"]["cost"] = isset($batch_update_arr["cost"]["cost"])?$this->common_model->add_calculate_currency($batch_update_arr["cost"]["cost"], '', '', true, false):"0.0000";
-	$batch_update_arr["connectcost"]["connectcost"] = isset($batch_update_arr["connectcost"]["connectcost"])?$this->common_model->add_calculate_currency($batch_update_arr["connectcost"]["connectcost"], '', '', true, false):"0.0000";
+	$batch_update_arr["cost"]["cost"] = isset($batch_update_arr["cost"]["cost"]) ? $this->common_model->add_calculate_currency($batch_update_arr["cost"]["cost"], '', '', true, false) : "0.0000";
+	$batch_update_arr["connectcost"]["connectcost"] = isset($batch_update_arr["connectcost"]["connectcost"]) ? $this->common_model->add_calculate_currency($batch_update_arr["connectcost"]["connectcost"], '', '', true, false) : "0.0000";
 //        $batch_update_arr = array("inc"=> array("inc"=>"1","operator"=>"3"),"cost"=> array("cost"=>"1","operator"=>"4"));
         $result = $this->rates_model->termination_rate_batch_update($batch_update_arr);
         echo json_encode(array("SUCCESS"=> "Termination rates batch updated successfully!"));
         exit;
     }
     
-    function origination_rate_batch_update(){
+    function origination_rate_batch_update() {
         $batch_update_arr = $this->input->post();
-	     $batch_update_arr["cost"]["cost"] = isset($batch_update_arr["cost"]["cost"])?$this->common_model->add_calculate_currency($batch_update_arr["cost"]["cost"], '', '', true, false):"0.0000";
+	     $batch_update_arr["cost"]["cost"] = isset($batch_update_arr["cost"]["cost"]) ? $this->common_model->add_calculate_currency($batch_update_arr["cost"]["cost"], '', '', true, false) : "0.0000";
 //        $batch_update_arr = array("inc"=> array("inc"=>"1","operator"=>"3"),"cost"=> array("cost"=>"1","operator"=>"4"));
         $result = $this->rates_model->origination_rate_batch_update($batch_update_arr);
         echo json_encode(array("SUCCESS"=> "Origination rates batch updated successfully!"));
@@ -722,23 +722,23 @@ 
 
     function termination_rate_export_cdr_xls() {
 		$account_info = $accountinfo = $this->session->userdata('accountinfo');
-		$currency_id=$account_info['currency_id'];
-		$currency=$this->common->get_field_name('currency', 'currency', $currency_id);
+		$currency_id = $account_info['currency_id'];
+		$currency = $this->common->get_field_name('currency', 'currency', $currency_id);
         $query = $this->rates_model->get_termination_rate(true, '', '', false);
         $outbound_array = array();
         ob_clean();
-        $outbound_array[] = array("Code", "Destination",  "Connect Cost($currency)", "Included Seconds","Per Minute Cost($currency)","Initial Increment", "Increment","Priority","Strip","Prepend","Trunk","Status","Created Date");
+        $outbound_array[] = array("Code", "Destination", "Connect Cost($currency)", "Included Seconds", "Per Minute Cost($currency)", "Initial Increment", "Increment", "Priority", "Strip", "Prepend", "Trunk", "Status", "Created Date");
         if ($query->num_rows() > 0) {
 
             foreach ($query->result_array() as $row) {
 				//echo"<pre>";print_r($row);exit;
                     $outbound_array[] = array(
-                        $row['pattern']=$this->common->get_only_numeric_val("","",$row["pattern"]),
+                        $row['pattern'] = $this->common->get_only_numeric_val("", "", $row["pattern"]),
                         $row['comment'],
-                        $this->common_model->calculate_currency($row['connectcost'],'','',TRUE,false),
+                        $this->common_model->calculate_currency($row['connectcost'], '', '', TRUE, false),
                         
                         $row['includedseconds'],
-			$this->common_model->calculate_currency($row['cost'],'','',TRUE,false),
+			$this->common_model->calculate_currency($row['cost'], '', '', TRUE, false),
 /**
 ASTPP  3.0 
 For Add Initial Increment field
@@ -750,7 +750,7 @@ 
                         $row['strip'],
                         $row['prepend'],
                         //$row['trunk_id'],
-                        $this->common->get_field_name('name','trunks',$row["trunk_id"]),
+                        $this->common->get_field_name('name', 'trunks', $row["trunk_id"]),
                         $this->common->get_status('export', '', $row['status']),
                         $row['creation_date'],
                         
@@ -759,7 +759,7 @@ 
             }
         $this->load->helper('csv');
         
-        array_to_csv($outbound_array, 'Termination_Rates_' . date("Y-m-d") . '.csv');
+        array_to_csv($outbound_array, 'Termination_Rates_'.date("Y-m-d").'.csv');
        
     }
 
@@ -770,13 +770,13 @@ 
         $this->load->library('pdf');
         $this->fpdf = new PDF('P', 'pt');
         $this->fpdf->initialize('P', 'mm', 'A4');
-        $this->fpdf->tablewidths = array(20, 30, 20, 20, 20, 20, 20,20,20);
-        $outbound_array[] = array("Code", "Destination",  "Connect Cost","Included Seconds","Per Minute Cost","Initial Increment", "Increment","Precedence","Prepend","Strip");
+        $this->fpdf->tablewidths = array(20, 30, 20, 20, 20, 20, 20, 20, 20);
+        $outbound_array[] = array("Code", "Destination", "Connect Cost", "Included Seconds", "Per Minute Cost", "Initial Increment", "Increment", "Precedence", "Prepend", "Strip");
         if ($query->num_rows() > 0) {
 
             foreach ($query->result_array() as $row) {
                     $outbound_array[] = array(
-			$row['pattern']=$this->common->get_only_numeric_val("","",$row["pattern"]),
+			$row['pattern'] = $this->common->get_only_numeric_val("", "", $row["pattern"]),
                         $row['comment'],
                         $row['connectcost'],
                         $row['includedseconds'],
@@ -799,7 +799,7 @@ 
 
         $this->fpdf->SetFont('Arial', '', 15);
         $this->fpdf->SetXY(60, 5);
-        $this->fpdf->Cell(100, 10, "Outbound Rates Report " . date('Y-m-d'));
+        $this->fpdf->Cell(100, 10, "Outbound Rates Report ".date('Y-m-d'));
 
         $this->fpdf->SetY(20);
         $this->fpdf->SetFont('Arial', '', 7);
@@ -807,29 +807,29 @@ 
         $this->fpdf->lMargin = 2;
 
         $dimensions = $this->fpdf->export_pdf($outbound_array, "7");
-        $this->fpdf->Output('Termination_Rate_' . date("Y-m-d") . '.pdf', "D");
+        $this->fpdf->Output('Termination_Rate_'.date("Y-m-d").'.pdf', "D");
     }
     
 
     function origination_rate_export_cdr_xls() {
 		$account_info = $accountinfo = $this->session->userdata('accountinfo');
-		$currency_id=$account_info['currency_id'];
-		$currency=$this->common->get_field_name('currency', 'currency', $currency_id);
+		$currency_id = $account_info['currency_id'];
+		$currency = $this->common->get_field_name('currency', 'currency', $currency_id);
         $query = $this->rates_model->get_origination_rate(true, '', '', false);
 	//echo "<pre>";print_r($query);exit;
         $inbound_array = array();
         ob_clean();
-        $inbound_array[] = array("Code", "Destination","Connect Cost($currency)","Included Seconds","Per Minute Cost($currency)", "Initial Increment", "Increment","Rate Group","Status","Created Date");
+        $inbound_array[] = array("Code", "Destination", "Connect Cost($currency)", "Included Seconds", "Per Minute Cost($currency)", "Initial Increment", "Increment", "Rate Group", "Status", "Created Date");
         if ($query->num_rows() > 0) {
 
             foreach ($query->result_array() as $row) {
 				//echo"<pre>";print_r($row);exit;
                     $inbound_array[] = array(
-                        $row['pattern']=$this->common->get_only_numeric_val("","",$row["pattern"]),
+                        $row['pattern'] = $this->common->get_only_numeric_val("", "", $row["pattern"]),
                         $row['comment'],
-                        $this->common_model->calculate_currency($row['connectcost'],'','',TRUE,false),
+                        $this->common_model->calculate_currency($row['connectcost'], '', '', TRUE, false),
                         $row['includedseconds'],
-                        $this->common_model->calculate_currency($row['cost'],'','',TRUE,false),
+                        $this->common_model->calculate_currency($row['cost'], '', '', TRUE, false),
 /**
 ASTPP  3.0 
 For Add Initial Increment field
@@ -845,7 +845,7 @@ 
                 }
             }
         $this->load->helper('csv');
-        array_to_csv($inbound_array, 'Origination_Rates_' . date("Y-m-d") . '.csv');
+        array_to_csv($inbound_array, 'Origination_Rates_'.date("Y-m-d").'.csv');
     }
     function origination_rate_export_cdr_pdf() {
         $query = $this->rates_model->get_origination_rate(true, '', '', false);
@@ -856,15 +856,15 @@ 
         $this->fpdf = new PDF('P', 'pt');
         $this->fpdf->initialize('P', 'mm', 'A4');
         $this->fpdf->tablewidths = array(20, 20, 20, 20, 20, 20);
-	$inbound_array[] = array("Code", "Destination","Connect Cost","Included Seconds","Per Minute Cost","Initial Increment","Increment");
+	$inbound_array[] = array("Code", "Destination", "Connect Cost", "Included Seconds", "Per Minute Cost", "Initial Increment", "Increment");
         if ($query->num_rows() > 0) {
             foreach ($query->result_array() as $row) {
                     $inbound_array[] = array(
-                       $row['pattern']=$this->common->get_only_numeric_val("","",$row["pattern"]),
+                       $row['pattern'] = $this->common->get_only_numeric_val("", "", $row["pattern"]),
                         $row['comment'],
                         $row['connectcost'],
                         $row['includedseconds'],
-                        $this->common_model->calculate_currency($row['cost'],'','','',false),
+                        $this->common_model->calculate_currency($row['cost'], '', '', '', false),
 /**
 ASTPP  3.0 
 For Add Initial Increment field
@@ -880,7 +880,7 @@ 
 
         $this->fpdf->SetFont('Arial', '', 15);
         $this->fpdf->SetXY(60, 5);
-        $this->fpdf->Cell(100, 10, "Origination Rates Report " . date('Y-m-d'));
+        $this->fpdf->Cell(100, 10, "Origination Rates Report ".date('Y-m-d'));
 
         $this->fpdf->SetY(20);
         $this->fpdf->SetFont('Arial', '', 7);
@@ -888,7 +888,7 @@ 
         $this->fpdf->lMargin = 2;
 
         $dimensions = $this->fpdf->export_pdf($inbound_array, "5");
-        $this->fpdf->Output('Origination_Rate_' . date("Y-m-d") . '.pdf', "D");
+        $this->fpdf->Output('Origination_Rate_'.date("Y-m-d").'.pdf', "D");
     }
 
   
@@ -900,14 +900,14 @@ 
         $this->fpdf = new PDF('P', 'pt');
         $this->fpdf->initialize('P', 'mm', 'A4');
 	$this->fpdf->tablewidths = array(20, 20, 20, 20, 20, 20);
-        $inbound_array[] = array("Code", "Destination", "Increment","Cost Per Minutes",  "Connect Charge", "Included Seconds");
+        $inbound_array[] = array("Code", "Destination", "Increment", "Cost Per Minutes", "Connect Charge", "Included Seconds");
         if ($query->num_rows() > 0) {
             foreach ($query->result_array() as $row) {
                     $inbound_array[] = array(
-                       $row['pattern']=$this->common->get_only_numeric_val("","",$row["pattern"]),
+                       $row['pattern'] = $this->common->get_only_numeric_val("", "", $row["pattern"]),
                         $row['comment'],
                         $row['inc'],
-			$this->common_model->calculate_currency($row['cost'],'','','',false),
+			$this->common_model->calculate_currency($row['cost'], '', '', '', false),
                         $row['connectcost'],
                         $row['includedseconds']
                     );
@@ -919,7 +919,7 @@ 
 
         $this->fpdf->SetFont('Arial', '', 15);
         $this->fpdf->SetXY(60, 5);
-        $this->fpdf->Cell(100, 10, "Rates Report " . date('Y-m-d'));
+        $this->fpdf->Cell(100, 10, "Rates Report ".date('Y-m-d'));
 
         $this->fpdf->SetY(20);
         $this->fpdf->SetFont('Arial', '', 7);
@@ -927,12 +927,12 @@ 
         $this->fpdf->lMargin = 2;
 
         $dimensions = $this->fpdf->export_pdf($inbound_array, "5");
-        $this->fpdf->Output('Rates_' . date("Y-m-d") . '.pdf', "D");
+        $this->fpdf->Output('Rates_'.date("Y-m-d").'.pdf', "D");
     }
-    function resellersrates_list(){
-	$accountinfo=$this->session->userdata('accountinfo');
+    function resellersrates_list() {
+	$accountinfo = $this->session->userdata('accountinfo');
 	$data['username'] = $this->session->userdata('user_name');
-        $data['page_title'] = 'My Rates' ;
+        $data['page_title'] = 'My Rates';
         $data['search_flag'] = true;
         $this->session->set_userdata('advance_search', 0);
         $data['grid_fields'] = $this->rates_form->build_rates_list_for_reseller();
@@ -952,11 +952,11 @@ 
         $grid_fields = json_decode($this->rates_form->build_rates_list_for_reseller());
         foreach ($query->result_array() as $key => $value) {
             $json_data['rows'][] = array('cell' => array(
-                    $this->common->get_only_numeric_val("","",$value["pattern"]),
+                    $this->common->get_only_numeric_val("", "", $value["pattern"]),
                     $value['comment'],
-                    $this->common_model->calculate_currency($value['connectcost'],'','','true',true),
+                    $this->common_model->calculate_currency($value['connectcost'], '', '', 'true', true),
                     $value['includedseconds'],
-                    $this->common_model->calculate_currency(($value['cost'] + ($value['cost']*$markup)/100),'','','true',true),
+                    $this->common_model->calculate_currency(($value['cost'] + ($value['cost'] * $markup) / 100), '', '', 'true', true),
                     $value['inc'],
                     $value['precedence'],
             ));
@@ -976,7 +976,7 @@ 
             $this->session->set_userdata('resellerrates_list_search', $action);
         }
         if (@$ajax_search != 1) {
-            redirect(base_url() . 'rates/resellersrates_list/');
+            redirect(base_url().'rates/resellersrates_list/');
         }
     }
     function resellersrates_list_clearsearchfilter() {
@@ -986,13 +986,13 @@ 
     function resellersrates_xls()
     {
 		$account_info = $accountinfo = $this->session->userdata('accountinfo');
-		$currency_id=$account_info['currency_id'];
-		$currency=$this->common->get_field_name('currency', 'currency', $currency_id);
-	$query = $this->rates_model->getreseller_rates_list(true,'0','0','1');
+		$currency_id = $account_info['currency_id'];
+		$currency = $this->common->get_field_name('currency', 'currency', $currency_id);
+	$query = $this->rates_model->getreseller_rates_list(true, '0', '0', '1');
 	$customer_array = array();
 	ob_clean();
 
-	$customer_array[] = array("Code", "Destination","Connect Cost($currency)","Included Seconds","Per Minute Cost($currency)","Increment","Precedence");
+	$customer_array[] = array("Code", "Destination", "Connect Cost($currency)", "Included Seconds", "Per Minute Cost($currency)", "Increment", "Precedence");
 
 
 	if ($query->num_rows() > 0) {
@@ -1000,7 +1000,7 @@ 
             foreach ($query->result_array() as $row) {
                 
                     $customer_array[] = array(
-                        $row['pattern']=$this->common->get_only_numeric_val("","",$row["pattern"]),
+                        $row['pattern'] = $this->common->get_only_numeric_val("", "", $row["pattern"]),
                         $row['comment'],
                         $row['connectcost'],
 			$row['includedseconds'],
@@ -1012,7 +1012,7 @@ 
             }
         }
         $this->load->helper('csv');
-        array_to_csv($customer_array, 'My_Own_Rate_' . date("Y-m-d") . '.csv');
+        array_to_csv($customer_array, 'My_Own_Rate_'.date("Y-m-d").'.csv');
         exit;
     }
 /***********
@@ -1029,7 +1029,7 @@ 
             $this->session->set_userdata('termination_rates_list_search', $action);
         }
         if (@$ajax_search != 1) {
-            redirect(base_url() . 'rates/termination_rates_list/');
+            redirect(base_url().'rates/termination_rates_list/');
         }
     }
     function origination_rates_list_batch_delete() {
@@ -1042,7 +1042,7 @@ 
             $this->session->set_userdata('origination_rate_list_search', $action);
         }
         if (@$ajax_search != 1) {
-            redirect(base_url() . 'rates/origination_rates_list/');
+            redirect(base_url().'rates/origination_rates_list/');
         }
     }
 /*************************/