iNextrix / ASTPP

web_interface/astpp/application/modules/user/models/user_model.php

Braces +13 added lines, -13 removed lines

@@ -93,7 +93,7 @@ 
         if ($flag) {
            if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
             $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-           }else{
+           } else{
             $this->db->order_by('invoice_date', 'desc');
            }
         }
@@ -307,10 +307,11 @@ 
         $this->db->where($where);
         $this->db->order_by("callstart desc");
         if ($flag) {
-            if (!$export)
-                $this->db->limit($limit, $start);
+            if (!$export) {
+                            $this->db->limit($limit, $start);
+            }
             $this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,debit,cost,accountid,pricelist_id,calltype,is_recording,trunk_id,uniqueid');
-        }else {
+        } else {
             $this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(debit) as total_debit,sum(cost) as total_cost,group_concat(distinct(pricelist_id)) as pricelist_ids,group_concat(distinct(trunk_id)) as trunk_ids');
         }
         $result = $this->db->get($table_name);
@@ -387,15 +388,13 @@ 
         if($result->num_rows() > 0){
 	  if($flag){
 	    return $result;
-	  }
-	  else{
+	  } else{
 	    return $result->num_rows();
 	  }
-        }else{
+        } else{
          if($flag){
 	      $result=(object)array('num_rows'=>0);
-	  }
-	  else{
+	  } else{
 	      $result=0;
 	  }
 	  return $result;
@@ -452,7 +451,7 @@ 
         if ($logintype == 1 || $logintype == 5) {
           
 		$where = array("accountid" => $this->session->userdata["accountinfo"]['id']);
-        }else{
+        } else{
        		 $where=array('id'=> $accountid);
 	}      
         $query = $this->db_model->getSelect("*","invoice_conf",$where);
@@ -475,10 +474,11 @@ 
         $this->db->where($where);
         $this->db->order_by("callstart","desc");
         if ($flag) {
-            if (!$export)
-                $this->db->limit($limit, $start);
+            if (!$export) {
+                            $this->db->limit($limit, $start);
+            }
             $this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,cost,accountid,pricelist_id,calltype,is_recording,trunk_id,uniqueid');
-        }else {
+        } else {
             $this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(cost) as total_cost,group_concat(distinct(trunk_id)) as trunk_ids');
         }
         $result = $this->db->get('cdrs');

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

Braces +10 added lines, -10 removed lines

@@ -33,8 +33,9 @@ 
         $this->load->model('system_model');
         $this->load->dbutil();
 
-        if ($this->session->userdata('user_login') == FALSE)
-            redirect(base_url() . '/astpp/login');
+        if ($this->session->userdata('user_login') == FALSE) {
+                    redirect(base_url() . '/astpp/login');
+        }
     }
 
     function configuration_edit($edit_id = '') {
@@ -106,7 +107,7 @@ 
 		}
             	$this->session->set_flashdata('astpp_errormsg', ucfirst($group_title).' Settings updated sucessfully!');
 	    	redirect(base_url() . 'systems/configuration/'.$group_title);
-        }else{
+        } else{
 	 	$this->load->view('view_systemconf', $data);
 	}
     }
@@ -167,8 +168,7 @@ 
              $account_data = $this->session->userdata("accountinfo");
 			 $reseller = $account_data['id'];
              $this->resellertemplate_save($add_array,$reseller);
-        }
-        else
+        } else
         {
             $this->admintemplate_save($add_array);
         }
@@ -494,12 +494,12 @@ 
       $data['page_title'] = 'Database Backup';
       if($add_array['id'] != ''){
       
-      }else{
+      } else{
            if($this->form_validation->run() == FALSE) {
                 $data['validation_errors'] = validation_errors();
                 echo $data['validation_errors'];
                 exit;
-          }else{
+          } else{
              $db_name     = $this->db->database;
              $db_username = $this->db->username;
              $db_password = $this->db->password;
@@ -524,7 +524,7 @@ 
               $this->system_model->backup_insert($add_array);
               echo json_encode(array("SUCCESS"=> $add_array['backup_name']." backup exported successfully!"));
               exit;
-           }else{
+           } else{
                 echo 'An error occur when the system tried to backup of the database. Please check yours system settings for the backup section';
                 exit;
            }
@@ -572,7 +572,7 @@ 
               exec($run_restore);
               $this->session->set_flashdata('astpp_errormsg', 'Database Restore successfully.');
               redirect(base_url() . 'systems/database_restore/');
-            }else{
+            } else{
               $this->session->set_flashdata('astpp_notification', 'File not exists!');
               redirect(base_url() . 'systems/database_restore/');
             }
@@ -623,7 +623,7 @@ 
             $query = $this->system_model->import_database($filename,$_FILES['userfile']['name']);
             $this->session->set_flashdata('astpp_errormsg',"The file ".  basename( $_FILES['userfile']['name'])." has been uploaded");
             redirect(base_url()."systems/database_restore/");            
-        }else{
+        } else{
             $this->session->set_flashdata('astpp_notification',"There is a some issue or invalid file format.");
             redirect(base_url()."systems/database_restore/");            
         }

web_interface/astpp/application/modules/systems/models/system_model.php

Braces +3 added lines, -5 removed lines

@@ -71,8 +71,7 @@ 
 		$this->db->where('reseller_id',$reseller);
 		$this->db->or_where('reseller_id',0);
 		$this->db->where($where);
-            }
-            else
+            } else
             {
                $this->db->where('reseller_id',0);
             }
@@ -80,13 +79,12 @@ 
             if($flag) {
 
 		$query = $this->db_model->select("*", "default_templates","", "id", "ASC", $limit, $start);
-	     }else {
+	     } else {
 
 		$query = $this->db_model->countQuery("*", "default_templates","");
 		
 	     }
-	  } 
-	  else {
+	  } else {
           
             $where = array('reseller_id' => 0);
             $this->db->where($where);

web_interface/astpp/application/modules/taxes/models/taxes_model.php

Braces +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
         $this->db_model->build_search('taxes_list_search');
         if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
             $where = array("reseller_id"=>$this->session->userdata["accountinfo"]['id']);
-        }else{
+        } else{
 	    $where =array("reseller_id"=>0);
         }
         if ($flag) {
@@ -46,7 +46,7 @@ 
         $data["creation_date"] = date("Y-m-d H:i:s");
          if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
 	  $data['reseller_id'] = $this->session->userdata["accountinfo"]['id'];
-         }else{
+         } else{
 	  $data['reseller_id'] =0;
          }
         $this->db->insert("taxes", $data);

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

Braces +10 added lines, -11 removed lines

@@ -35,8 +35,9 @@ 
         $this->load->model('email_model');
         $this->load->library('csvreader');
 	$this->load->library('astpp/email_lib');
-        if ($this->session->userdata('user_login') == FALSE)
-            redirect(base_url() . '/astpp/login');
+        if ($this->session->userdata('user_login') == FALSE) {
+                    redirect(base_url() . '/astpp/login');
+        }
     }
 
     function email_edit($edit_id = '') {
@@ -203,7 +204,7 @@ 
             }  
 			if($edit_data['status'] == 1){
 				$edit_data['status']='Not Sent';
-			}else{
+			} else{
 				$edit_data['status']='Sent';
 			}
             $data['form'] = $this->form->build_form($this->email_form->get_form_fields_email_view(), $edit_data);
@@ -246,8 +247,9 @@ 
     }
     function email_mass() {
         $account_data = $this->session->userdata("accountinfo");
-        if ($account_data['type'] == '1' || $account_data['type']== 0 || $account_data['type']==3)
-            redirect(base_url() . '/astpp/dashboard/');
+        if ($account_data['type'] == '1' || $account_data['type']== 0 || $account_data['type']==3) {
+                    redirect(base_url() . '/astpp/dashboard/');
+        }
 	$data['username'] = $this->session->userdata('user_name');	
         $data['page_title'] = 'Email Mass';
         $data['form'] = $this->form->build_form($this->email_form->build_list_for_email_client_area(), '');
@@ -264,8 +266,7 @@ 
 			$str.="<a href='".$link."' title='".$val."' class='btn btn-royelblue btn-sm'><i class='fa fa-paperclip fa-fw'></i></a>&nbsp;&nbsp;";
 		}
 		return $str;
-	}
-	else{
+	} else{
 		return "";
 	}
     }
@@ -292,8 +293,7 @@ 
 			       $path =$dir_path.$actual_file_name;
 			       if (move_uploaded_file($uploadedFile1,$path)) {
 				   $this->session->set_flashdata('astpp_errormsg', 'files added successfully!');
-			       }
-			       else{
+			       } else{
 				    $this->session->set_flashdata('astpp_errormsg', 'Please try again   !');
 			       }
 		       }
@@ -316,8 +316,7 @@ 
         if($add_array['temp'] == ''){
 	 	$subject = '';
 		$body ='';	
-             }
-		else{
+             } else{
                 $where = array('id' => $add_array['temp']);
 		$account = $this->db_model->getSelect("subject,template", "default_templates", $where);
 		$account_data =$account->result_array();

web_interface/astpp/application/modules/email/libraries/email_form.php

Braces +5 added lines, -5 removed lines

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

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

 

-if (!defined('BASEPATH'))

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

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

 class Email_form {

     function __construct($library_name = '') {

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

             $loginid = $account_data['id'];

 

-        }else{

+        } else{

             $loginid = "0";

         }

          $form['forms'] = array(base_url() . 'email/email_client_area/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

@@ -176,8 +177,7 @@ 
     function get_form_fields_email_view_client($add_arr) {

 	if($add_arr['type'] == ''){

 	   $email_add = array('To','email', 'SELECT', '', '', 'tOOL TIP', 'Please Enter receipent Email', 'email', 'email', 'accounts', 'build_dropdown', 'where_arr',array('status'=>$add_arr['status'],'posttoexternal'=>$add_arr['posttoexternal'],'pricelist_id'=>$add_arr['pricelist_id']), 'multi');

-	}

-	else{

+	} else{

 	 $email_add = array('To','email', 'SELECT', '', '', 'tOOL TIP', 'Please Enter receipent Email', 'email', 'email', 'accounts', 'build_dropdown', 'where_arr',array('status'=>$add_arr['status'],'posttoexternal'=>$add_arr['posttoexternal'],'pricelist_id'=>$add_arr['pricelist_id'],'type'=>$add_arr['type']), 'multi');

 	}

 

web_interface/astpp/application/modules/email/models/email_model.php

Braces +3 added lines, -5 removed lines

@@ -50,7 +50,7 @@ 
 
 	  if(empty($email_address)){
 		$this->db->or_where('accountid',0);
-	  }else{
+	  } else{
 		$this->db->where('reseller_id',$account_id);
 	  }
 	  }
@@ -93,8 +93,7 @@ 
     function get_email_client_data($data, $start = 0, $limit = 0){
 	if($data['type'] == ''){
 		$where = array('pricelist_id'=>$data['pricelist_id'],'posttoexternal'=>$data['posttoexternal'],'status'=>$data['status'],'deleted'=>'0');
-	}
-	else{
+	} else{
 		$where = array('pricelist_id'=>$data['pricelist_id'],'posttoexternal'=>$data['posttoexternal'],'status'=>$data['status'],'type'=>$data['type'],'deleted'=>'0');
 	}
 	
@@ -118,8 +117,7 @@ 
 			{
 				$account_info['email']=$val;
 				$account_info['accountid']='0';
-			}
-			else{
+			} else{
 				$res_data = $act_details->result_array();
 				$account_info=$res_data[0];
 				$account_info['accountid']=$account_info['id'];

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

Braces +33 added lines, -26 removed lines

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

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

Braces +7 added lines, -8 removed lines

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

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

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

-if (!defined('BASEPATH'))

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

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

 class Reports_form {

     function __construct() {

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

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

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

-             }

-		else

+             } else

 		{

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

         $form['Search'] = array(

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

                 ));

                 

-                }

-                else{

+                } else{

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

 		$currency_id=$account_info['currency_id'];

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

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

             $loginid = $account_data['id'];

 

-        }else{

+        } else{

             $loginid = "0";

         }

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

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

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

                 ));

-	}else{

+	} else{

         $grid_field_arr = json_encode(array(

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

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