iNextrix / ASTPP

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

Doc Comments +5 added lines

@@ -314,6 +314,11 @@
       }         
 	redirect(base_url() . 'user/user/');
     }
+
+    /**
+     * @param integer $last_invoice_ID
+     * @param string $due_date
+     */
     function generate_receipt($accountid,$amount,$accountinfo,$last_invoice_ID,$invoice_prefix,$due_date){
 		$invoice_data = array("accountid"=>$accountid,"invoice_prefix" =>$invoice_prefix,"invoiceid"=>'0000'.$last_invoice_ID,"reseller_id"=>$accountinfo['reseller_id'],"invoice_date"=>gmdate("Y-m-d H:i:s"),"from_date"=>  gmdate("Y-m-d H:i:s"),"to_date"=>gmdate("Y-m-d H:i:s"),"due_date"=>$due_date,"status"=>1,"balance"=>$accountinfo['balance'],"amount"=>$amount,"type"=>'R',"confirm"=>'1');            
         $this->db->insert("invoices",$invoice_data);

Indentation +157 added lines, -157 removed lines

@@ -22,16 +22,16 @@ 
 ###############################################################################
 class Login extends MX_Controller {
 
-    function Login() {
-        parent::__construct();
-        $this->load->helper('form');
-        $this->load->library('astpp/permission');
-        $this->load->library('encrypt');        
-        $this->load->model('Auth_model');
-        $this->load->model('db_model');
-    }
+	function Login() {
+		parent::__construct();
+		$this->load->helper('form');
+		$this->load->library('astpp/permission');
+		$this->load->library('encrypt');        
+		$this->load->model('Auth_model');
+		$this->load->model('db_model');
+	}
     
-    function set_lang_global($post=false){ 
+	function set_lang_global($post=false){ 
 	if(!is_array($post)){
 		$str=trim($post);
 		$new_arr[$str]=$str;
@@ -51,25 +51,25 @@ 
 	} 
 	$this->locale->set_lang();
 	return true;
-    }
+	}
 
-    function index() {
-        if ($this->session->userdata('user_login') == FALSE) {
-            if (!empty($_POST) && trim($_POST['username']) != '' && trim($_POST['password']) != '') {
-	        $_POST['password']=$this->common->encode($_POST['password']);
-                $user_valid = $this->Auth_model->verify_login($_POST['username'], $_POST['password']);
+	function index() {
+		if ($this->session->userdata('user_login') == FALSE) {
+			if (!empty($_POST) && trim($_POST['username']) != '' && trim($_POST['password']) != '') {
+			$_POST['password']=$this->common->encode($_POST['password']);
+				$user_valid = $this->Auth_model->verify_login($_POST['username'], $_POST['password']);
                 
-                if ($user_valid == 1) {
-                    $this->session->set_userdata('user_login', TRUE);
-		    $where = "number = '".$this->db->escape_str($_POST['username'])."' OR email = '".$this->db->escape_str($_POST['username'])."'";
-                    $result = $this->db_model->getSelect("*", "accounts",$where);
-                    $result = $result->result_array();
-                    $result = $result[0];
-                     $logintype=$result['type']== -1 ? 2: $result['type'];
-                    $this->session->set_userdata('logintype', $logintype);
-                    $this->session->set_userdata('userlevel_logintype', $result['type']);
-                    $this->session->set_userdata('username', $_POST['username']);
-                    $this->session->set_userdata('accountinfo', $result);
+				if ($user_valid == 1) {
+					$this->session->set_userdata('user_login', TRUE);
+			$where = "number = '".$this->db->escape_str($_POST['username'])."' OR email = '".$this->db->escape_str($_POST['username'])."'";
+					$result = $this->db_model->getSelect("*", "accounts",$where);
+					$result = $result->result_array();
+					$result = $result[0];
+					 $logintype=$result['type']== -1 ? 2: $result['type'];
+					$this->session->set_userdata('logintype', $logintype);
+					$this->session->set_userdata('userlevel_logintype', $result['type']);
+					$this->session->set_userdata('username', $_POST['username']);
+					$this->session->set_userdata('accountinfo', $result);
 		/*
 		*
 		* Purpose : Display logo based on domain name
@@ -115,24 +115,24 @@ 
 		$this->session->set_userdata('user_footer', $data['user_footer']);
 		//                      echo $data['user_header'];exit;
 		/***************************************************************************************/
-                    if ($result['type'] == 0 || $result['type'] == 1) {
-                        $menu_list = $this->permission->get_module_access($result['type']);
-                        $this->session->set_userdata('mode_cur', 'user');
-                        if($result['type'] == 1){
-                            redirect(base_url() . 'dashboard/');
-                        }else{
-                            redirect(base_url() . 'user/user/');
-                        }
-                    } else {
-                        $menu_list = $this->permission->get_module_access($result['type']);
-                        $this->session->set_userdata('mode_cur', 'admin');
-                        redirect(base_url() . 'dashboard/');
-                    }
-                } else {
+					if ($result['type'] == 0 || $result['type'] == 1) {
+						$menu_list = $this->permission->get_module_access($result['type']);
+						$this->session->set_userdata('mode_cur', 'user');
+						if($result['type'] == 1){
+							redirect(base_url() . 'dashboard/');
+						}else{
+							redirect(base_url() . 'user/user/');
+						}
+					} else {
+						$menu_list = $this->permission->get_module_access($result['type']);
+						$this->session->set_userdata('mode_cur', 'admin');
+						redirect(base_url() . 'dashboard/');
+					}
+				} else {
 		   
-                        $data['astpp_notification'] = "Login Failed! Try Again..";
-                }
-            }
+						$data['astpp_notification'] = "Login Failed! Try Again..";
+				}
+			}
 	/*
 	* Purpose : Display logo based on domain name
 	*/
@@ -148,10 +148,10 @@ 
 	$this->session->set_userdata('user_footer', $data['website_footer']);
 	//              echo $data['user_logo'];exit;
 	/***************************************************************************************/
-            $this->session->set_userdata('user_login', FALSE);
-            $data['app_name'] = 'ASTPP - Open Source Billing Solution';
-            $this->load->view('view_login', $data);
-        }else {
+			$this->session->set_userdata('user_login', FALSE);
+			$data['app_name'] = 'ASTPP - Open Source Billing Solution';
+			$this->load->view('view_login', $data);
+		}else {
 	/*
 	*
 	* Purpose : Display logo based on domain name
@@ -172,79 +172,79 @@ 
 		$this->session->set_userdata('user_footer', $data['user_footer']);
 	//              echo $data['user_logo'];exit;
 /***************************************************************************************/
-	    if ($this->session->userdata('logintype') == '2') {
+		if ($this->session->userdata('logintype') == '2') {
 		redirect(base_url() . 'dashboard/');
-	    } else {
+		} else {
 		redirect(base_url().'user/user/');
-	    }
-        }
-    }
+		}
+		}
+	}
 
-    function logout() {
-        $this->session->sess_destroy();
-        redirect(base_url());
-    }
+	function logout() {
+		$this->session->sess_destroy();
+		redirect(base_url());
+	}
   function paypal_response(){
-      if(count($_POST)>0)
-      {
-        $response_arr=$_POST;
-	    $fp=fopen("/var/log/astpp/astpp_payment.log","w+");
-    	$date = date("Y-m-d H:i:s");
-	    fwrite($fp,"====================".$date."===============================\n");
-	    foreach($response_arr as $key => $value){	  
-		    fwrite($fp,$key.":::>".$value."\n");
-	    }
-    	$payment_check = $this->db_model->countQuery("txn_id", "payments", array("txn_id" => $response_arr['txn_id']));
-        if( ($response_arr["payment_status"] == "Pending" || $response_arr["payment_status"] == "Complete" || $response_arr["payment_status"] == "Completed" ) && $payment_check == 0){
+	  if(count($_POST)>0)
+	  {
+		$response_arr=$_POST;
+		$fp=fopen("/var/log/astpp/astpp_payment.log","w+");
+		$date = date("Y-m-d H:i:s");
+		fwrite($fp,"====================".$date."===============================\n");
+		foreach($response_arr as $key => $value){	  
+			fwrite($fp,$key.":::>".$value."\n");
+		}
+		$payment_check = $this->db_model->countQuery("txn_id", "payments", array("txn_id" => $response_arr['txn_id']));
+		if( ($response_arr["payment_status"] == "Pending" || $response_arr["payment_status"] == "Complete" || $response_arr["payment_status"] == "Completed" ) && $payment_check == 0){
 
-            $paypal_tax = (array)$this->db->get_where("system", array("name" => "paypal_tax","group_title"=>"paypal"))->first_row();
-            $paypal_tax =$paypal_tax['value'];
-            $balance_amt = $actual_amount = $response_arr["custom"];
-            $paypal_fee = (array)$this->db->get_where("system", array("name" => "paypal_fee","group_title"=>"paypal"))->first_row();
-            $paypal_fee = $paypal_fee['value'];
-            $paypalfee = ($paypal_fee == 0)?'0':$response_arr["mc_gross"];
-            $account_data = (array)$this->db->get_where("accounts", array("id" => $response_arr["item_number"]))->first_row();
-            $currency = (array)$this->db->get_where('currency', array("id"=>$account_data["currency_id"]))->first_row();
-            $date = date('Y-m-d H:i:s');
-            $payment_trans_array = array("accountid"=>$response_arr["item_number"],
-            				"amount"=>$response_arr["payment_gross"],
-	                                "tax"=>"1",
-	                                "payment_method"=>"Paypal",
-	                                "actual_amount"=>$actual_amount,
-	                                "paypal_fee"=>$paypalfee,
-                			"user_currency"=>$currency["currency"],
-                			"currency_rate"=>$currency["currencyrate"],
-                			"transaction_details"=>json_encode($response_arr),
-                			"date"=>$date);
-             $paymentid=$this->db->insert('payment_transaction',$payment_trans_array);
-    	     $parent_id =$account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : '-1';
-	     $payment_arr = array("accountid"=> $response_arr["item_number"],
-	     		"payment_mode"=>"1","credit"=>$balance_amt,
-	    		"type"=>"PAYPAL",
-	    		"payment_by"=>$parent_id,
-	    		"notes"=>"Payment Made by Paypal on date:-".$date,
-	    		"paypalid"=>$paymentid,
-		    	"txn_id"=>$response_arr["txn_id"],
-		    	'payment_date'=>gmdate('Y-m-d H:i:s',strtotime($response_arr['payment_date'])));
-	     $this->db->insert('payments', $payment_arr);
-	     $this->db->select('invoiceid');
-	     $this->db->order_by('id','desc');
-	     $this->db->limit(1);
- 	     $last_invoice_result=(array)$this->db->get('invoices')->first_row();
- 	     $last_invoice_ID=isset($last_invoice_result['invoiceid'] ) && $last_invoice_result['invoiceid'] > 0 ?$last_invoice_result['invoiceid'] : 1;
- 	     $reseller_id=$account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : 0;
-	     $where="accountid IN ('".$reseller_id."','1')";
-	     $this->db->where($where);
-	     $this->db->select('*');
-	     $this->db->order_by('accountid', 'desc');
-	     $this->db->limit(1);
-             $invoiceconf = $this->db->get('invoice_conf');
-             $invoiceconf = (array)$invoiceconf->first_row();
-	     $invoice_prefix=$invoiceconf['invoice_prefix'];
+			$paypal_tax = (array)$this->db->get_where("system", array("name" => "paypal_tax","group_title"=>"paypal"))->first_row();
+			$paypal_tax =$paypal_tax['value'];
+			$balance_amt = $actual_amount = $response_arr["custom"];
+			$paypal_fee = (array)$this->db->get_where("system", array("name" => "paypal_fee","group_title"=>"paypal"))->first_row();
+			$paypal_fee = $paypal_fee['value'];
+			$paypalfee = ($paypal_fee == 0)?'0':$response_arr["mc_gross"];
+			$account_data = (array)$this->db->get_where("accounts", array("id" => $response_arr["item_number"]))->first_row();
+			$currency = (array)$this->db->get_where('currency', array("id"=>$account_data["currency_id"]))->first_row();
+			$date = date('Y-m-d H:i:s');
+			$payment_trans_array = array("accountid"=>$response_arr["item_number"],
+							"amount"=>$response_arr["payment_gross"],
+									"tax"=>"1",
+									"payment_method"=>"Paypal",
+									"actual_amount"=>$actual_amount,
+									"paypal_fee"=>$paypalfee,
+							"user_currency"=>$currency["currency"],
+							"currency_rate"=>$currency["currencyrate"],
+							"transaction_details"=>json_encode($response_arr),
+							"date"=>$date);
+			 $paymentid=$this->db->insert('payment_transaction',$payment_trans_array);
+			 $parent_id =$account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : '-1';
+		 $payment_arr = array("accountid"=> $response_arr["item_number"],
+		 		"payment_mode"=>"1","credit"=>$balance_amt,
+				"type"=>"PAYPAL",
+				"payment_by"=>$parent_id,
+				"notes"=>"Payment Made by Paypal on date:-".$date,
+				"paypalid"=>$paymentid,
+				"txn_id"=>$response_arr["txn_id"],
+				'payment_date'=>gmdate('Y-m-d H:i:s',strtotime($response_arr['payment_date'])));
+		 $this->db->insert('payments', $payment_arr);
+		 $this->db->select('invoiceid');
+		 $this->db->order_by('id','desc');
+		 $this->db->limit(1);
+ 		 $last_invoice_result=(array)$this->db->get('invoices')->first_row();
+ 		 $last_invoice_ID=isset($last_invoice_result['invoiceid'] ) && $last_invoice_result['invoiceid'] > 0 ?$last_invoice_result['invoiceid'] : 1;
+ 		 $reseller_id=$account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : 0;
+		 $where="accountid IN ('".$reseller_id."','1')";
+		 $this->db->where($where);
+		 $this->db->select('*');
+		 $this->db->order_by('accountid', 'desc');
+		 $this->db->limit(1);
+			 $invoiceconf = $this->db->get('invoice_conf');
+			 $invoiceconf = (array)$invoiceconf->first_row();
+		 $invoice_prefix=$invoiceconf['invoice_prefix'];
 
-	     $due_date = gmdate("Y-m-d H:i:s",strtotime(gmdate("Y-m-d H:i:s")." +".$invoiceconf['interval']." days"));  
-	     $invoice_id=$this->generate_receipt($account_data['id'],$balance_amt,$account_data,$last_invoice_ID+1,$invoice_prefix,$due_date);
-	     $details_insert=array(
+		 $due_date = gmdate("Y-m-d H:i:s",strtotime(gmdate("Y-m-d H:i:s")." +".$invoiceconf['interval']." days"));  
+		 $invoice_id=$this->generate_receipt($account_data['id'],$balance_amt,$account_data,$last_invoice_ID+1,$invoice_prefix,$due_date);
+		 $details_insert=array(
 			'created_date'=>$date,
 			'credit'=>$balance_amt,
 			'debit'=>'-',
@@ -253,45 +253,45 @@ 
 			'invoiceid'=>$invoice_id,
 			'description'=>"Payment Made by Paypal on date:-".$date,
 			'item_type'=>'PAYMENT',
-	  	        'before_balance'=>$account_data['balance'],
+	  			'before_balance'=>$account_data['balance'],
 			'after_balance'=>$account_data['balance']+$balance_amt,
 			);
 		$this->db->insert("invoice_details", $details_insert); 
 		$this->db_model->update_balance($balance_amt,$account_data["id"],"credit");            
 		if($parent_id > 0){
-		      $reseller_ids=$this->common->get_parent_info($parent_id,0);
-		      $reseller_ids=rtrim($reseller_ids,",");
-		      $reseller_arr=explode(",",$reseller_ids);
-		      if(!empty($reseller_arr)){
+			  $reseller_ids=$this->common->get_parent_info($parent_id,0);
+			  $reseller_ids=rtrim($reseller_ids,",");
+			  $reseller_arr=explode(",",$reseller_ids);
+			  if(!empty($reseller_arr)){
 			foreach($reseller_arr as $key=>$reseller_id){
 			  $account_data = (array)$this->db->get_where("accounts", array("id" => $reseller_id))->first_row();
 			  $this->db->select('invoiceid');
-		          $this->db->order_by('id','desc');
-		          $this->db->limit(1);
- 	                  $last_invoice_result=(array)$this->db->get('invoices')->first_row();
- 	                  $last_invoice_ID=$last_invoice_result['invoiceid'];
- 	     		  $reseller_id=$account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : 0;
-	                  $where="accountid IN ('".$reseller_id."','1')";
-	                  $this->db->where($where);
-		          $this->db->select('*');
-		          $this->db->order_by('accountid', 'desc');
-		          $this->db->limit(1);
-		          $invoiceconf = $this->db->get('invoice_conf');
-		          $invoiceconf = (array)$invoiceconf->first_row();
-	                  $invoice_prefix=$invoiceconf['invoice_prefix'];
-	     		  $due_date = gmdate("Y-m-d H:i:s",strtotime(gmdate("Y-m-d H:i:s")." +".$invoiceconf['interval']." days"));
-	     		  $invoice_id=$this->generate_receipt($account_data['id'],$balance_amt,$account_data,$last_invoice_ID+1,$invoice_prefix,$due_date);
+				  $this->db->order_by('id','desc');
+				  $this->db->limit(1);
+ 					  $last_invoice_result=(array)$this->db->get('invoices')->first_row();
+ 					  $last_invoice_ID=$last_invoice_result['invoiceid'];
+ 		 		  $reseller_id=$account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : 0;
+					  $where="accountid IN ('".$reseller_id."','1')";
+					  $this->db->where($where);
+				  $this->db->select('*');
+				  $this->db->order_by('accountid', 'desc');
+				  $this->db->limit(1);
+				  $invoiceconf = $this->db->get('invoice_conf');
+				  $invoiceconf = (array)$invoiceconf->first_row();
+					  $invoice_prefix=$invoiceconf['invoice_prefix'];
+		 		  $due_date = gmdate("Y-m-d H:i:s",strtotime(gmdate("Y-m-d H:i:s")." +".$invoiceconf['interval']." days"));
+		 		  $invoice_id=$this->generate_receipt($account_data['id'],$balance_amt,$account_data,$last_invoice_ID+1,$invoice_prefix,$due_date);
 			  $parent_id=$account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : -1;
 			  $payment_arr = array("accountid"=> $account_data["id"],
-	     					"payment_mode"=>"1",
-	     					"credit"=>$balance_amt,
-				    		"type"=>"PAYPAL",
-	    					"payment_by"=>$parent_id,
-	    					"notes"=>"Your account has been credited due to your customer account recharge done by paypal",
-				    		"paypalid"=>$paymentid,
-		    				"txn_id"=>$response_arr["txn_id"],
-		    				'payment_date'=>gmdate('Y-m-d H:i:s',strtotime($response_arr['payment_date'])));
-	 	          $this->db->insert('payments', $payment_arr);
+		 					"payment_mode"=>"1",
+		 					"credit"=>$balance_amt,
+							"type"=>"PAYPAL",
+							"payment_by"=>$parent_id,
+							"notes"=>"Your account has been credited due to your customer account recharge done by paypal",
+							"paypalid"=>$paymentid,
+							"txn_id"=>$response_arr["txn_id"],
+							'payment_date'=>gmdate('Y-m-d H:i:s',strtotime($response_arr['payment_date'])));
+	 			  $this->db->insert('payments', $payment_arr);
 			  $details_insert=array(
 				'created_date'=>$date,
 				'credit'=>$balance_amt,
@@ -301,29 +301,29 @@ 
 				'invoiceid'=>$invoice_id,
 				'description'=>"Your account has been credited due to your customer account recharge done by paypal",
 				'item_type'=>'PAYMENT',
-		  	        'before_balance'=>$account_data['balance'],
+		  			'before_balance'=>$account_data['balance'],
 				'after_balance'=>$account_data['balance']+$balance_amt,
 			   );
-		          $this->db->insert("invoice_details", $details_insert); 
-	          	  $this->db_model->update_balance($balance_amt,$account_data["id"],"credit");  			         
+				  $this->db->insert("invoice_details", $details_insert); 
+			  	  $this->db_model->update_balance($balance_amt,$account_data["id"],"credit");  			         
 			}
-		      }
+			  }
 		}
 		redirect(base_url() . 'user/user/');
-        }
-      }         
+		}
+	  }         
 	redirect(base_url() . 'user/user/');
-    }
-    function generate_receipt($accountid,$amount,$accountinfo,$last_invoice_ID,$invoice_prefix,$due_date){
+	}
+	function generate_receipt($accountid,$amount,$accountinfo,$last_invoice_ID,$invoice_prefix,$due_date){
 		$invoice_data = array("accountid"=>$accountid,"invoice_prefix" =>$invoice_prefix,"invoiceid"=>'0000'.$last_invoice_ID,"reseller_id"=>$accountinfo['reseller_id'],"invoice_date"=>gmdate("Y-m-d H:i:s"),"from_date"=>  gmdate("Y-m-d H:i:s"),"to_date"=>gmdate("Y-m-d H:i:s"),"due_date"=>$due_date,"status"=>1,"balance"=>$accountinfo['balance'],"amount"=>$amount,"type"=>'R',"confirm"=>'1');            
-        $this->db->insert("invoices",$invoice_data);
-        $invoiceid = $this->db->insert_id();    
-        return  $invoiceid;  
-    }
+		$this->db->insert("invoices",$invoice_data);
+		$invoiceid = $this->db->insert_id();    
+		return  $invoiceid;  
+	}
     
-    function get_language_text(){
+	function get_language_text(){
    // echo '<pre>'; print_r($_POST); exit;
-      echo gettext($_POST['display']); 
+	  echo gettext($_POST['display']); 
  	}  
     
 }

Spacing +98 added lines, -98 removed lines

@@ -31,23 +31,23 @@ 
         $this->load->model('db_model');
     }
     
-    function set_lang_global($post=false){ 
-	if(!is_array($post)){
-		$str=trim($post);
-		$new_arr[$str]=$str;
-		$post=$new_arr;
+    function set_lang_global($post = false) { 
+	if ( ! is_array($post)) {
+		$str = trim($post);
+		$new_arr[$str] = $str;
+		$post = $new_arr;
 	}
-	if(isset($post['fr_FR'])){
-	 $language=$post['fr_FR'];
+	if (isset($post['fr_FR'])) {
+	 $language = $post['fr_FR'];
 	 $this->session->set_userdata('user_language', $language);
 	}
-	if(isset($post['es_ES'])){
-	 $language=$post['es_ES'];
+	if (isset($post['es_ES'])) {
+	 $language = $post['es_ES'];
 	 $this->session->set_userdata('user_language', $language);         
 	}       
-	if(isset($post['en_EN'])){
-	 $language=$post['en_EN'];
-	 $this->session->unset_userdata('user_language',$language);
+	if (isset($post['en_EN'])) {
+	 $language = $post['en_EN'];
+	 $this->session->unset_userdata('user_language', $language);
 	} 
 	$this->locale->set_lang();
 	return true;
@@ -55,17 +55,17 @@ 
 
     function index() {
         if ($this->session->userdata('user_login') == FALSE) {
-            if (!empty($_POST) && trim($_POST['username']) != '' && trim($_POST['password']) != '') {
-	        $_POST['password']=$this->common->encode($_POST['password']);
+            if ( ! empty($_POST) && trim($_POST['username']) != '' && trim($_POST['password']) != '') {
+	        $_POST['password'] = $this->common->encode($_POST['password']);
                 $user_valid = $this->Auth_model->verify_login($_POST['username'], $_POST['password']);
                 
                 if ($user_valid == 1) {
                     $this->session->set_userdata('user_login', TRUE);
 		    $where = "number = '".$this->db->escape_str($_POST['username'])."' OR email = '".$this->db->escape_str($_POST['username'])."'";
-                    $result = $this->db_model->getSelect("*", "accounts",$where);
+                    $result = $this->db_model->getSelect("*", "accounts", $where);
                     $result = $result->result_array();
                     $result = $result[0];
-                     $logintype=$result['type']== -1 ? 2: $result['type'];
+                     $logintype = $result['type'] == -1 ? 2 : $result['type'];
                     $this->session->set_userdata('logintype', $logintype);
                     $this->session->set_userdata('userlevel_logintype', $result['type']);
                     $this->session->set_userdata('username', $_POST['username']);
@@ -76,40 +76,40 @@ 
 		*
 		*/
 		$this->db->select("*");
-		if($result['type'] == '2' || $result['type'] == '-1'){
+		if ($result['type'] == '2' || $result['type'] == '-1') {
 			$this->db->where(array("accountid"=>$result["id"]));
-		}else if($result['type'] == '0'){
-			if($result['reseller_id'] == 0){
+		} else if ($result['type'] == '0') {
+			if ($result['reseller_id'] == 0) {
 				$this->db->where(array("accountid"=>"1"));
-			}else{
+			} else {
 				$this->db->where(array("accountid"=>$result["reseller_id"]));
 			}
-		}else if($result['type'] == '1'){
-			if($result['reseller_id'] == 0){
-				$result_invoice = $this->common->get_field_name('id','invoice_conf', array("accountid" => $result['id']));
+		} else if ($result['type'] == '1') {
+			if ($result['reseller_id'] == 0) {
+				$result_invoice = $this->common->get_field_name('id', 'invoice_conf', array("accountid" => $result['id']));
 				
-				if($result_invoice){
+				if ($result_invoice) {
 					$this->db->where(array("accountid"=>$result["id"]));
-				}else{
+				} else {
 					$this->db->where(array("accountid"=>"1"));
 				}
 				
-			}else{
-				$result_invoice = $this->common->get_field_name('id','invoice_conf', array("accountid" => $result['reseller_id']));
-				if($result_invoice){
+			} else {
+				$result_invoice = $this->common->get_field_name('id', 'invoice_conf', array("accountid" => $result['reseller_id']));
+				if ($result_invoice) {
 					$this->db->where(array("accountid"=>$result["reseller_id"]));
-				}else{
+				} else {
 					$this->db->where(array("accountid"=>"1"));
 				}
 			}
-		}else {
+		} else {
 			$this->db->where(array("accountid"=>"1"));
 		}
 		$res = $this->db->get("invoice_conf");
 		$logo_arr = $res->result();
-	$data['user_logo'] = (isset($logo_arr[0]->logo) && $logo_arr[0]->logo != "" ) ? $logo_arr[0]->accountid."_".$logo_arr[0]->logo:"logo.png" ;
-		$data['user_header'] = (isset($logo_arr[0]->website_title) && $logo_arr[0]->website_title != "" ) ? $logo_arr[0]->website_title:"ASTPP - Open Source Voip Billing Solution" ;
-		$data['user_footer'] = (isset($logo_arr[0]->website_footer) && $logo_arr[0]->website_footer != "" ) ? $logo_arr[0]->website_footer:"Inextrix Technologies Pvt. Ltd All Rights Reserved." ;
+	$data['user_logo'] = (isset($logo_arr[0]->logo) && $logo_arr[0]->logo != "") ? $logo_arr[0]->accountid."_".$logo_arr[0]->logo : "logo.png";
+		$data['user_header'] = (isset($logo_arr[0]->website_title) && $logo_arr[0]->website_title != "") ? $logo_arr[0]->website_title : "ASTPP - Open Source Voip Billing Solution";
+		$data['user_footer'] = (isset($logo_arr[0]->website_footer) && $logo_arr[0]->website_footer != "") ? $logo_arr[0]->website_footer : "Inextrix Technologies Pvt. Ltd All Rights Reserved.";
 		$this->session->set_userdata('user_logo', $data['user_logo']);
 		$this->session->set_userdata('user_header', $data['user_header']);
 		$this->session->set_userdata('user_footer', $data['user_footer']);
@@ -118,15 +118,15 @@ 
                     if ($result['type'] == 0 || $result['type'] == 1) {
                         $menu_list = $this->permission->get_module_access($result['type']);
                         $this->session->set_userdata('mode_cur', 'user');
-                        if($result['type'] == 1){
-                            redirect(base_url() . 'dashboard/');
-                        }else{
-                            redirect(base_url() . 'user/user/');
+                        if ($result['type'] == 1) {
+                            redirect(base_url().'dashboard/');
+                        } else {
+                            redirect(base_url().'user/user/');
                         }
                     } else {
                         $menu_list = $this->permission->get_module_access($result['type']);
                         $this->session->set_userdata('mode_cur', 'admin');
-                        redirect(base_url() . 'dashboard/');
+                        redirect(base_url().'dashboard/');
                     }
                 } else {
 		   
@@ -140,9 +140,9 @@ 
 	$this->db->where(array("domain"=>$_SERVER["HTTP_HOST"]));
 	$res = $this->db->get("invoice_conf");
 	$logo_arr = $res->result();
-	$data['user_logo'] = (isset($logo_arr[0]->logo) && $logo_arr[0]->logo != "" ) ? $logo_arr[0]->accountid."_".$logo_arr[0]->logo:"logo.png" ;
-	$data['website_header'] = (isset($logo_arr[0]->website_title) && $logo_arr[0]->website_title != "" ) ? $logo_arr[0]->website_title:"ASTPP - Open Source Voip Billing Solution" ;
-	$data['website_footer'] = (isset($logo_arr[0]->website_footer) && $logo_arr[0]->website_footer != "" ) ? $logo_arr[0]->website_footer:"Inextrix Technologies Pvt. Ltd All Rights Reserved." ;
+	$data['user_logo'] = (isset($logo_arr[0]->logo) && $logo_arr[0]->logo != "") ? $logo_arr[0]->accountid."_".$logo_arr[0]->logo : "logo.png";
+	$data['website_header'] = (isset($logo_arr[0]->website_title) && $logo_arr[0]->website_title != "") ? $logo_arr[0]->website_title : "ASTPP - Open Source Voip Billing Solution";
+	$data['website_footer'] = (isset($logo_arr[0]->website_footer) && $logo_arr[0]->website_footer != "") ? $logo_arr[0]->website_footer : "Inextrix Technologies Pvt. Ltd All Rights Reserved.";
 	$this->session->set_userdata('user_logo', $data['user_logo']);
 	$this->session->set_userdata('user_header', $data['website_header']);
 	$this->session->set_userdata('user_footer', $data['website_footer']);
@@ -151,7 +151,7 @@ 
             $this->session->set_userdata('user_login', FALSE);
             $data['app_name'] = 'ASTPP - Open Source Billing Solution';
             $this->load->view('view_login', $data);
-        }else {
+        } else {
 	/*
 	*
 	* Purpose : Display logo based on domain name
@@ -163,9 +163,9 @@ 
 		  $logo_arr = $res->result();
 //print_r( $logo_arr );exit;
 
-	$data['user_logo'] = (isset($logo_arr[0]->logo) && $logo_arr[0]->logo != "" ) ? $logo_arr[0]->accountid."_".$logo_arr[0]->logo:"logo.png" ;
-		 $data['user_header'] = (isset($logo_arr[0]->website_title) && $logo_arr[0]->website_title != "" ) ? $logo_arr[0]->website_title:"ASTPP - Open Source Voip Billing Solution" ;
- $data['user_footer'] = (isset($logo_arr[0]->website_footer) && $logo_arr[0]->website_footer != "" ) ? $logo_arr[0]->website_footer:"Inextrix Technologies Pvt. Ltd All Rights Reserved." ;
+	$data['user_logo'] = (isset($logo_arr[0]->logo) && $logo_arr[0]->logo != "") ? $logo_arr[0]->accountid."_".$logo_arr[0]->logo : "logo.png";
+		 $data['user_header'] = (isset($logo_arr[0]->website_title) && $logo_arr[0]->website_title != "") ? $logo_arr[0]->website_title : "ASTPP - Open Source Voip Billing Solution";
+ $data['user_footer'] = (isset($logo_arr[0]->website_footer) && $logo_arr[0]->website_footer != "") ? $logo_arr[0]->website_footer : "Inextrix Technologies Pvt. Ltd All Rights Reserved.";
 		
 		$this->session->set_userdata('user_logo', $data['user_logo']);
 		 $this->session->set_userdata('user_header', $data['user_header']);
@@ -173,7 +173,7 @@ 
 	//              echo $data['user_logo'];exit;
 /***************************************************************************************/
 	    if ($this->session->userdata('logintype') == '2') {
-		redirect(base_url() . 'dashboard/');
+		redirect(base_url().'dashboard/');
 	    } else {
 		redirect(base_url().'user/user/');
 	    }
@@ -184,25 +184,25 @@ 
         $this->session->sess_destroy();
         redirect(base_url());
     }
-  function paypal_response(){
-      if(count($_POST)>0)
+  function paypal_response() {
+      if (count($_POST) > 0)
       {
-        $response_arr=$_POST;
-	    $fp=fopen("/var/log/astpp/astpp_payment.log","w+");
+        $response_arr = $_POST;
+	    $fp = fopen("/var/log/astpp/astpp_payment.log", "w+");
     	$date = date("Y-m-d H:i:s");
-	    fwrite($fp,"====================".$date."===============================\n");
-	    foreach($response_arr as $key => $value){	  
-		    fwrite($fp,$key.":::>".$value."\n");
+	    fwrite($fp, "====================".$date."===============================\n");
+	    foreach ($response_arr as $key => $value) {	  
+		    fwrite($fp, $key.":::>".$value."\n");
 	    }
     	$payment_check = $this->db_model->countQuery("txn_id", "payments", array("txn_id" => $response_arr['txn_id']));
-        if( ($response_arr["payment_status"] == "Pending" || $response_arr["payment_status"] == "Complete" || $response_arr["payment_status"] == "Completed" ) && $payment_check == 0){
+        if (($response_arr["payment_status"] == "Pending" || $response_arr["payment_status"] == "Complete" || $response_arr["payment_status"] == "Completed") && $payment_check == 0) {
 
-            $paypal_tax = (array)$this->db->get_where("system", array("name" => "paypal_tax","group_title"=>"paypal"))->first_row();
-            $paypal_tax =$paypal_tax['value'];
+            $paypal_tax = (array)$this->db->get_where("system", array("name" => "paypal_tax", "group_title"=>"paypal"))->first_row();
+            $paypal_tax = $paypal_tax['value'];
             $balance_amt = $actual_amount = $response_arr["custom"];
-            $paypal_fee = (array)$this->db->get_where("system", array("name" => "paypal_fee","group_title"=>"paypal"))->first_row();
+            $paypal_fee = (array)$this->db->get_where("system", array("name" => "paypal_fee", "group_title"=>"paypal"))->first_row();
             $paypal_fee = $paypal_fee['value'];
-            $paypalfee = ($paypal_fee == 0)?'0':$response_arr["mc_gross"];
+            $paypalfee = ($paypal_fee == 0) ? '0' : $response_arr["mc_gross"];
             $account_data = (array)$this->db->get_where("accounts", array("id" => $response_arr["item_number"]))->first_row();
             $currency = (array)$this->db->get_where('currency', array("id"=>$account_data["currency_id"]))->first_row();
             $date = date('Y-m-d H:i:s');
@@ -216,35 +216,35 @@ 
                 			"currency_rate"=>$currency["currencyrate"],
                 			"transaction_details"=>json_encode($response_arr),
                 			"date"=>$date);
-             $paymentid=$this->db->insert('payment_transaction',$payment_trans_array);
-    	     $parent_id =$account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : '-1';
+             $paymentid = $this->db->insert('payment_transaction', $payment_trans_array);
+    	     $parent_id = $account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : '-1';
 	     $payment_arr = array("accountid"=> $response_arr["item_number"],
-	     		"payment_mode"=>"1","credit"=>$balance_amt,
+	     		"payment_mode"=>"1", "credit"=>$balance_amt,
 	    		"type"=>"PAYPAL",
 	    		"payment_by"=>$parent_id,
 	    		"notes"=>"Payment Made by Paypal on date:-".$date,
 	    		"paypalid"=>$paymentid,
 		    	"txn_id"=>$response_arr["txn_id"],
-		    	'payment_date'=>gmdate('Y-m-d H:i:s',strtotime($response_arr['payment_date'])));
+		    	'payment_date'=>gmdate('Y-m-d H:i:s', strtotime($response_arr['payment_date'])));
 	     $this->db->insert('payments', $payment_arr);
 	     $this->db->select('invoiceid');
-	     $this->db->order_by('id','desc');
+	     $this->db->order_by('id', 'desc');
 	     $this->db->limit(1);
- 	     $last_invoice_result=(array)$this->db->get('invoices')->first_row();
- 	     $last_invoice_ID=isset($last_invoice_result['invoiceid'] ) && $last_invoice_result['invoiceid'] > 0 ?$last_invoice_result['invoiceid'] : 1;
- 	     $reseller_id=$account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : 0;
-	     $where="accountid IN ('".$reseller_id."','1')";
+ 	     $last_invoice_result = (array)$this->db->get('invoices')->first_row();
+ 	     $last_invoice_ID = isset($last_invoice_result['invoiceid']) && $last_invoice_result['invoiceid'] > 0 ? $last_invoice_result['invoiceid'] : 1;
+ 	     $reseller_id = $account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : 0;
+	     $where = "accountid IN ('".$reseller_id."','1')";
 	     $this->db->where($where);
 	     $this->db->select('*');
 	     $this->db->order_by('accountid', 'desc');
 	     $this->db->limit(1);
              $invoiceconf = $this->db->get('invoice_conf');
              $invoiceconf = (array)$invoiceconf->first_row();
-	     $invoice_prefix=$invoiceconf['invoice_prefix'];
+	     $invoice_prefix = $invoiceconf['invoice_prefix'];
 
-	     $due_date = gmdate("Y-m-d H:i:s",strtotime(gmdate("Y-m-d H:i:s")." +".$invoiceconf['interval']." days"));  
-	     $invoice_id=$this->generate_receipt($account_data['id'],$balance_amt,$account_data,$last_invoice_ID+1,$invoice_prefix,$due_date);
-	     $details_insert=array(
+	     $due_date = gmdate("Y-m-d H:i:s", strtotime(gmdate("Y-m-d H:i:s")." +".$invoiceconf['interval']." days"));  
+	     $invoice_id = $this->generate_receipt($account_data['id'], $balance_amt, $account_data, $last_invoice_ID + 1, $invoice_prefix, $due_date);
+	     $details_insert = array(
 			'created_date'=>$date,
 			'credit'=>$balance_amt,
 			'debit'=>'-',
@@ -254,34 +254,34 @@ 
 			'description'=>"Payment Made by Paypal on date:-".$date,
 			'item_type'=>'PAYMENT',
 	  	        'before_balance'=>$account_data['balance'],
-			'after_balance'=>$account_data['balance']+$balance_amt,
+			'after_balance'=>$account_data['balance'] + $balance_amt,
 			);
 		$this->db->insert("invoice_details", $details_insert); 
-		$this->db_model->update_balance($balance_amt,$account_data["id"],"credit");            
-		if($parent_id > 0){
-		      $reseller_ids=$this->common->get_parent_info($parent_id,0);
-		      $reseller_ids=rtrim($reseller_ids,",");
-		      $reseller_arr=explode(",",$reseller_ids);
-		      if(!empty($reseller_arr)){
-			foreach($reseller_arr as $key=>$reseller_id){
+		$this->db_model->update_balance($balance_amt, $account_data["id"], "credit");            
+		if ($parent_id > 0) {
+		      $reseller_ids = $this->common->get_parent_info($parent_id, 0);
+		      $reseller_ids = rtrim($reseller_ids, ",");
+		      $reseller_arr = explode(",", $reseller_ids);
+		      if ( ! empty($reseller_arr)) {
+			foreach ($reseller_arr as $key=>$reseller_id) {
 			  $account_data = (array)$this->db->get_where("accounts", array("id" => $reseller_id))->first_row();
 			  $this->db->select('invoiceid');
-		          $this->db->order_by('id','desc');
+		          $this->db->order_by('id', 'desc');
 		          $this->db->limit(1);
- 	                  $last_invoice_result=(array)$this->db->get('invoices')->first_row();
- 	                  $last_invoice_ID=$last_invoice_result['invoiceid'];
- 	     		  $reseller_id=$account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : 0;
-	                  $where="accountid IN ('".$reseller_id."','1')";
+ 	                  $last_invoice_result = (array)$this->db->get('invoices')->first_row();
+ 	                  $last_invoice_ID = $last_invoice_result['invoiceid'];
+ 	     		  $reseller_id = $account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : 0;
+	                  $where = "accountid IN ('".$reseller_id."','1')";
 	                  $this->db->where($where);
 		          $this->db->select('*');
 		          $this->db->order_by('accountid', 'desc');
 		          $this->db->limit(1);
 		          $invoiceconf = $this->db->get('invoice_conf');
 		          $invoiceconf = (array)$invoiceconf->first_row();
-	                  $invoice_prefix=$invoiceconf['invoice_prefix'];
-	     		  $due_date = gmdate("Y-m-d H:i:s",strtotime(gmdate("Y-m-d H:i:s")." +".$invoiceconf['interval']." days"));
-	     		  $invoice_id=$this->generate_receipt($account_data['id'],$balance_amt,$account_data,$last_invoice_ID+1,$invoice_prefix,$due_date);
-			  $parent_id=$account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : -1;
+	                  $invoice_prefix = $invoiceconf['invoice_prefix'];
+	     		  $due_date = gmdate("Y-m-d H:i:s", strtotime(gmdate("Y-m-d H:i:s")." +".$invoiceconf['interval']." days"));
+	     		  $invoice_id = $this->generate_receipt($account_data['id'], $balance_amt, $account_data, $last_invoice_ID + 1, $invoice_prefix, $due_date);
+			  $parent_id = $account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : -1;
 			  $payment_arr = array("accountid"=> $account_data["id"],
 	     					"payment_mode"=>"1",
 	     					"credit"=>$balance_amt,
@@ -290,9 +290,9 @@ 
 	    					"notes"=>"Your account has been credited due to your customer account recharge done by paypal",
 				    		"paypalid"=>$paymentid,
 		    				"txn_id"=>$response_arr["txn_id"],
-		    				'payment_date'=>gmdate('Y-m-d H:i:s',strtotime($response_arr['payment_date'])));
+		    				'payment_date'=>gmdate('Y-m-d H:i:s', strtotime($response_arr['payment_date'])));
 	 	          $this->db->insert('payments', $payment_arr);
-			  $details_insert=array(
+			  $details_insert = array(
 				'created_date'=>$date,
 				'credit'=>$balance_amt,
 				'debit'=>'-',
@@ -302,26 +302,26 @@ 
 				'description'=>"Your account has been credited due to your customer account recharge done by paypal",
 				'item_type'=>'PAYMENT',
 		  	        'before_balance'=>$account_data['balance'],
-				'after_balance'=>$account_data['balance']+$balance_amt,
+				'after_balance'=>$account_data['balance'] + $balance_amt,
 			   );
 		          $this->db->insert("invoice_details", $details_insert); 
-	          	  $this->db_model->update_balance($balance_amt,$account_data["id"],"credit");  			         
+	          	  $this->db_model->update_balance($balance_amt, $account_data["id"], "credit");  			         
 			}
 		      }
 		}
-		redirect(base_url() . 'user/user/');
+		redirect(base_url().'user/user/');
         }
       }         
-	redirect(base_url() . 'user/user/');
+	redirect(base_url().'user/user/');
     }
-    function generate_receipt($accountid,$amount,$accountinfo,$last_invoice_ID,$invoice_prefix,$due_date){
-		$invoice_data = array("accountid"=>$accountid,"invoice_prefix" =>$invoice_prefix,"invoiceid"=>'0000'.$last_invoice_ID,"reseller_id"=>$accountinfo['reseller_id'],"invoice_date"=>gmdate("Y-m-d H:i:s"),"from_date"=>  gmdate("Y-m-d H:i:s"),"to_date"=>gmdate("Y-m-d H:i:s"),"due_date"=>$due_date,"status"=>1,"balance"=>$accountinfo['balance'],"amount"=>$amount,"type"=>'R',"confirm"=>'1');            
-        $this->db->insert("invoices",$invoice_data);
+    function generate_receipt($accountid, $amount, $accountinfo, $last_invoice_ID, $invoice_prefix, $due_date) {
+		$invoice_data = array("accountid"=>$accountid, "invoice_prefix" =>$invoice_prefix, "invoiceid"=>'0000'.$last_invoice_ID, "reseller_id"=>$accountinfo['reseller_id'], "invoice_date"=>gmdate("Y-m-d H:i:s"), "from_date"=>  gmdate("Y-m-d H:i:s"), "to_date"=>gmdate("Y-m-d H:i:s"), "due_date"=>$due_date, "status"=>1, "balance"=>$accountinfo['balance'], "amount"=>$amount, "type"=>'R', "confirm"=>'1');            
+        $this->db->insert("invoices", $invoice_data);
         $invoiceid = $this->db->insert_id();    
         return  $invoiceid;  
     }
     
-    function get_language_text(){
+    function get_language_text() {
    // echo '<pre>'; print_r($_POST); exit;
       echo gettext($_POST['display']); 
  	}  

Braces +9 added lines, -9 removed lines

@@ -78,31 +78,31 @@ 
 		$this->db->select("*");
 		if($result['type'] == '2' || $result['type'] == '-1'){
 			$this->db->where(array("accountid"=>$result["id"]));
-		}else if($result['type'] == '0'){
+		} else if($result['type'] == '0'){
 			if($result['reseller_id'] == 0){
 				$this->db->where(array("accountid"=>"1"));
-			}else{
+			} else{
 				$this->db->where(array("accountid"=>$result["reseller_id"]));
 			}
-		}else if($result['type'] == '1'){
+		} else if($result['type'] == '1'){
 			if($result['reseller_id'] == 0){
 				$result_invoice = $this->common->get_field_name('id','invoice_conf', array("accountid" => $result['id']));
 				
 				if($result_invoice){
 					$this->db->where(array("accountid"=>$result["id"]));
-				}else{
+				} else{
 					$this->db->where(array("accountid"=>"1"));
 				}
 				
-			}else{
+			} else{
 				$result_invoice = $this->common->get_field_name('id','invoice_conf', array("accountid" => $result['reseller_id']));
 				if($result_invoice){
 					$this->db->where(array("accountid"=>$result["reseller_id"]));
-				}else{
+				} else{
 					$this->db->where(array("accountid"=>"1"));
 				}
 			}
-		}else {
+		} else {
 			$this->db->where(array("accountid"=>"1"));
 		}
 		$res = $this->db->get("invoice_conf");
@@ -120,7 +120,7 @@ 
                         $this->session->set_userdata('mode_cur', 'user');
                         if($result['type'] == 1){
                             redirect(base_url() . 'dashboard/');
-                        }else{
+                        } else{
                             redirect(base_url() . 'user/user/');
                         }
                     } else {
@@ -151,7 +151,7 @@ 
             $this->session->set_userdata('user_login', FALSE);
             $data['app_name'] = 'ASTPP - Open Source Billing Solution';
             $this->load->view('view_login', $data);
-        }else {
+        } else {
 	/*
 	*
 	* Purpose : Display logo based on domain name

web_interface/astpp/application/modules/rates/models/rates_model.php

Doc Comments +3 added lines

@@ -332,6 +332,9 @@
 ASTPP  3.0
 Rate insert
 *************/
+    /**
+     * @param string $table_name
+     */
     function insert_if_not_exitst($add_array,$table_name){
         $insert_str = "Insert into $table_name (";
         $insert_key = "";

Indentation +260 added lines, -260 removed lines

@@ -22,97 +22,97 @@ 
 ###############################################################################
 class rates_model extends CI_Model {
 
-    function rates_model() {
-        parent::__construct();
-    }
+	function rates_model() {
+		parent::__construct();
+	}
 
-    function get_termination_rates_list($flag, $start = 0, $limit = 0) {
-        $this->db_model->build_search('termination_rates_list_search');
+	function get_termination_rates_list($flag, $start = 0, $limit = 0) {
+		$this->db_model->build_search('termination_rates_list_search');
 /********
 ASTPP  3.0 
 Batch Delete
 ********/
-        if($this->session->userdata('advance_batch_delete') == 1){
-           $this->db->where(array("trunk_id >"=>"0"));
-           $this->db->delete("outbound_routes");
-           $this->session->set_userdata('advance_batch_delete','0');
-	       $this->session->unset_userdata('advance_batch_delete');
+		if($this->session->userdata('advance_batch_delete') == 1){
+		   $this->db->where(array("trunk_id >"=>"0"));
+		   $this->db->delete("outbound_routes");
+		   $this->session->set_userdata('advance_batch_delete','0');
+		   $this->session->unset_userdata('advance_batch_delete');
 	   }
 /**************/
-        if ($flag) {
-            $query = $this->db_model->select("*", "outbound_routes", "", "id", "ASC", $limit, $start);
-        } else {
-            $query = $this->db_model->countQuery("*", "outbound_routes", "");
-        }
-        return $query;
-    }
-    function get_termination_rate($flag, $start = 0, $limit = 0, $export = true) {
-        $this->db_model->build_search('termination_rates_list_search');
-        $this->db->from('outbound_routes');
-        if ($flag) {
-            if ($export)
-                $this->db->limit($limit, $start);
-            $result = $this->db->get();
-        }else {
-            $result = $this->db->count_all_results();
-        }
-        return $result;
-    }
+		if ($flag) {
+			$query = $this->db_model->select("*", "outbound_routes", "", "id", "ASC", $limit, $start);
+		} else {
+			$query = $this->db_model->countQuery("*", "outbound_routes", "");
+		}
+		return $query;
+	}
+	function get_termination_rate($flag, $start = 0, $limit = 0, $export = true) {
+		$this->db_model->build_search('termination_rates_list_search');
+		$this->db->from('outbound_routes');
+		if ($flag) {
+			if ($export)
+				$this->db->limit($limit, $start);
+			$result = $this->db->get();
+		}else {
+			$result = $this->db->count_all_results();
+		}
+		return $result;
+	}
 
-    function get_origination_rate($flag, $start = 0, $limit = 0, $export = true) {
-        $this->db_model->build_search('origination_rate_list_search');
-	    if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
-            $account_data = $this->session->userdata("accountinfo");
-            $reseller = $account_data['id'];
-            $where = array("reseller_id" => $reseller);
-        } else {
-            $where = array('reseller_id'=>'0');
-        }
+	function get_origination_rate($flag, $start = 0, $limit = 0, $export = true) {
+		$this->db_model->build_search('origination_rate_list_search');
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			$account_data = $this->session->userdata("accountinfo");
+			$reseller = $account_data['id'];
+			$where = array("reseller_id" => $reseller);
+		} else {
+			$where = array('reseller_id'=>'0');
+		}
        
-	    $this->db_model->build_search('origination_rate_list_search');
-        if ($flag) {
-            if ($export)
-                $this->db->limit($limit, $start);
-            $result = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
-        }else {
-            $result = $this->db_model->countQuery("*", "routes", $where);
-        }
+		$this->db_model->build_search('origination_rate_list_search');
+		if ($flag) {
+			if ($export)
+				$this->db->limit($limit, $start);
+			$result = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
+		}else {
+			$result = $this->db_model->countQuery("*", "routes", $where);
+		}
 // 	echo "<pre>";print_r($result->result());exit;
-        return $result;
-    }
+		return $result;
+	}
 
-    function get_origination_rate_for_user($flag, $start = 0, $limit = 0,$export = true) {
-        $this->db_model->build_search('origination_rate_list_search');
+	function get_origination_rate_for_user($flag, $start = 0, $limit = 0,$export = true) {
+		$this->db_model->build_search('origination_rate_list_search');
 
-        $account_data = $this->session->userdata("accountinfo");
+		$account_data = $this->session->userdata("accountinfo");
 
-        $where = array("pricelist_id" => $account_data["pricelist_id"]);
+		$where = array("pricelist_id" => $account_data["pricelist_id"]);
 
-        $this->db_model->build_search('origination_rate_list_search');
-        if ($flag) {
-            if ($export)
-                $this->db->limit($limit, $start);
-            $result = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
-        }else {
-            $result = $this->db_model->countQuery("*", "routes", $where);
-        }
-        return $result;
-    }
+		$this->db_model->build_search('origination_rate_list_search');
+		if ($flag) {
+			if ($export)
+				$this->db->limit($limit, $start);
+			$result = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
+		}else {
+			$result = $this->db_model->countQuery("*", "routes", $where);
+		}
+		return $result;
+	}
 // ==============================================
-    function get_origination_rate_list($flag, $start = 0, $limit = 0) {
-        $this->db_model->build_search('origination_rate_list_search');
-        if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
-            $account_data = $this->session->userdata("accountinfo");
-            $where = array("reseller_id" => $account_data['id']);
-        } else {
-            $where = array('reseller_id'=>'0');
-        }        
+	function get_origination_rate_list($flag, $start = 0, $limit = 0) {
+		$this->db_model->build_search('origination_rate_list_search');
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			$account_data = $this->session->userdata("accountinfo");
+			$where = array("reseller_id" => $account_data['id']);
+		} else {
+			$where = array('reseller_id'=>'0');
+		}        
 /***********
 ASTPP  3.0 
 Batch delete
 ************/
-        if($this->session->userdata('advance_batch_delete') == 1){
-            $this->db->where($where);
+		if($this->session->userdata('advance_batch_delete') == 1){
+			$this->db->where($where);
 			$this->db->delete("routes");
 			//echo $this->db->last_query(); exit;
 			$this->session->set_userdata('advance_batch_delete','0');
@@ -122,232 +122,232 @@ 
 		$this->db_model->build_search('origination_rate_list_search');
 /***********************/
 
-        if ($flag) {
-            $query = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
-        } else {
-            $query = $this->db_model->countQuery("*", "routes", $where);
+		if ($flag) {
+			$query = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
+		} else {
+			$query = $this->db_model->countQuery("*", "routes", $where);
             
-        }
-        //echo $this->db->last_query();
-        return $query;
-    }
-    function getunblocked_pattern_list($accountid,$flag, $start = 0, $limit = 0) {
-        $this->db_model->build_search('origination_rate_list_search');
-        if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
-            $account_data = $this->session->userdata("accountinfo");
-            $reseller = $account_data['id'];
-            $where = array("reseller_id" => $reseller, "status" => "0");
-        } else {
-            $where = array("status" => "0",'reseller_id'=>'0');
-        }
-        $where1 = '(pattern NOT IN (select blocked_patterns from block_patterns where accountid = "'.$accountid.'"))';
-        $this->db->where($where1);        
-        if ($flag) {
-            $query = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
+		}
+		//echo $this->db->last_query();
+		return $query;
+	}
+	function getunblocked_pattern_list($accountid,$flag, $start = 0, $limit = 0) {
+		$this->db_model->build_search('origination_rate_list_search');
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			$account_data = $this->session->userdata("accountinfo");
+			$reseller = $account_data['id'];
+			$where = array("reseller_id" => $reseller, "status" => "0");
+		} else {
+			$where = array("status" => "0",'reseller_id'=>'0');
+		}
+		$where1 = '(pattern NOT IN (select blocked_patterns from block_patterns where accountid = "'.$accountid.'"))';
+		$this->db->where($where1);        
+		if ($flag) {
+			$query = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
 //             echo "<pre>"; print_r($query); exit;
-        } else {
-            $query = $this->db_model->countQuery("*", "routes", $where);
-        }
-        return $query;
-    }
-    function getunblocked_package_pattern($accountid,$flag, $start = 0, $limit = 0) {
-        $this->db_model->build_search('origination_rate_list_search');
-        if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
-            $account_data = $this->session->userdata("accountinfo");
-            $reseller = $account_data['id'];
-            $where = array("reseller_id" => $reseller, "status" => "0");
-        } else {
-            $where = array("status" => "0",'reseller_id'=>'0');
-        }
-        $where1 = '(pattern NOT IN (select DISTINCT patterns from package_patterns where package_id = "'.$accountid.'"))';
-        $this->db->where($where1);       
-        if ($flag) {
-            $query = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
-        } else {
-            $query = $this->db_model->countQuery("*", "routes", $where);
-        }
-        return $query;
-    }
+		} else {
+			$query = $this->db_model->countQuery("*", "routes", $where);
+		}
+		return $query;
+	}
+	function getunblocked_package_pattern($accountid,$flag, $start = 0, $limit = 0) {
+		$this->db_model->build_search('origination_rate_list_search');
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			$account_data = $this->session->userdata("accountinfo");
+			$reseller = $account_data['id'];
+			$where = array("reseller_id" => $reseller, "status" => "0");
+		} else {
+			$where = array("status" => "0",'reseller_id'=>'0');
+		}
+		$where1 = '(pattern NOT IN (select DISTINCT patterns from package_patterns where package_id = "'.$accountid.'"))';
+		$this->db->where($where1);       
+		if ($flag) {
+			$query = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
+		} else {
+			$query = $this->db_model->countQuery("*", "routes", $where);
+		}
+		return $query;
+	}
 
-    function get_origination_rate_list_for_user($flag, $start = 0, $limit = 0) {
-        $this->db_model->build_search('user_rates_list_search');
+	function get_origination_rate_list_for_user($flag, $start = 0, $limit = 0) {
+		$this->db_model->build_search('user_rates_list_search');
 
-        $account_data = $this->session->userdata("accountinfo");
-        $where = array("pricelist_id" => $account_data["pricelist_id"],"status" => '0');
+		$account_data = $this->session->userdata("accountinfo");
+		$where = array("pricelist_id" => $account_data["pricelist_id"],"status" => '0');
 
-        $this->db_model->build_search('origination_rate_list_search');
-        if ($flag) {
-            $query = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
-        } else {
-            $query = $this->db_model->countQuery("*", "routes", $where);
-        }
-        return $query;
-    }
+		$this->db_model->build_search('origination_rate_list_search');
+		if ($flag) {
+			$query = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
+		} else {
+			$query = $this->db_model->countQuery("*", "routes", $where);
+		}
+		return $query;
+	}
 
 
-    function add_termination_rate($add_array) {
-        unset($add_array["action"]);
-        if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
-            $account_data = $this->session->userdata("accountinfo");
-            $reseller = $account_data['id'];
-            $add_array['reseller_id'] = $reseller;
-        }
-        $add_array['pattern'] = "^" . $add_array['pattern'] . ".*";
-        $add_array['prepend'] = $add_array['prepend'];
-        /*
+	function add_termination_rate($add_array) {
+		unset($add_array["action"]);
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			$account_data = $this->session->userdata("accountinfo");
+			$reseller = $account_data['id'];
+			$add_array['reseller_id'] = $reseller;
+		}
+		$add_array['pattern'] = "^" . $add_array['pattern'] . ".*";
+		$add_array['prepend'] = $add_array['prepend'];
+		/*
         ASTPP  3.0 
          add creation date.
         */
-        $add_array['creation_date']=gmdate('Y-m-d H:i:s');
-        /*******************************************************/
-        $this->insert_if_not_exitst($add_array,"outbound_routes");
-        //$this->db->insert("outbound_routes", $add_array);
-        return true;
-    }
+		$add_array['creation_date']=gmdate('Y-m-d H:i:s');
+		/*******************************************************/
+		$this->insert_if_not_exitst($add_array,"outbound_routes");
+		//$this->db->insert("outbound_routes", $add_array);
+		return true;
+	}
 
-    function edit_termination_rate($data, $id) {
-        unset($data["action"]);
-        /*
+	function edit_termination_rate($data, $id) {
+		unset($data["action"]);
+		/*
         ASTPP  3.0
          Edit time last modified date
         */
-        $data['last_modified_date']=gmdate('Y-m-d H:i:s');
-        /***************************************************/
-        $data['pattern'] = "^" . $data['pattern'] . ".*";
-        $this->db->where("id", $id);
-        $this->db->update("outbound_routes", $data);
-    }
+		$data['last_modified_date']=gmdate('Y-m-d H:i:s');
+		/***************************************************/
+		$data['pattern'] = "^" . $data['pattern'] . ".*";
+		$this->db->where("id", $id);
+		$this->db->update("outbound_routes", $data);
+	}
 
-    function remove_termination_rate($id) {
-        $this->db->where("id", $id);
-        $this->db->delete("outbound_routes");
-        return true;
-    }
+	function remove_termination_rate($id) {
+		$this->db->where("id", $id);
+		$this->db->delete("outbound_routes");
+		return true;
+	}
 
-    function add_origination_rate($add_array) {
+	function add_origination_rate($add_array) {
 		
-        unset($add_array["action"]);
-        /*
+		unset($add_array["action"]);
+		/*
         ASTPP  3.0 
         ADD time put creation date in routes table 
         */
-        $add_array['creation_date']=gmdate('Y-m-d H:i:s');
-        /**********************************************/
-        if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
-            $account_data = $this->session->userdata("accountinfo");
-            $reseller = $account_data['id'];
-            $add_array['reseller_id'] = $reseller;
-        }
+		$add_array['creation_date']=gmdate('Y-m-d H:i:s');
+		/**********************************************/
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			$account_data = $this->session->userdata("accountinfo");
+			$reseller = $account_data['id'];
+			$add_array['reseller_id'] = $reseller;
+		}
 	
-        $add_array['pattern'] = "^" . $add_array['pattern'] . ".*";
+		$add_array['pattern'] = "^" . $add_array['pattern'] . ".*";
 /*************
 ASTPP  3.0 
 Rate insert
 *************/
-        $this->insert_if_not_exitst($add_array,"routes");
+		$this->insert_if_not_exitst($add_array,"routes");
 //        $this->db->insert("routes", $add_array);
 /*******************************/
-        return true;
-    }
+		return true;
+	}
 
-    function edit_origination_rate($data, $id) {
-        unset($data["action"]);
-        /*
+	function edit_origination_rate($data, $id) {
+		unset($data["action"]);
+		/*
         ASTPP  3.0
          Edit tile last modified date update
         */
-        $data['last_modified_date']=gmdate('Y-m-d H:i:s');
-        /********************************************************/
-        $data['pattern'] = "^" . $data['pattern'] . ".*";
-        $this->db->where("id", $id);
-        $this->db->update("routes", $data);
-    }
+		$data['last_modified_date']=gmdate('Y-m-d H:i:s');
+		/********************************************************/
+		$data['pattern'] = "^" . $data['pattern'] . ".*";
+		$this->db->where("id", $id);
+		$this->db->update("routes", $data);
+	}
 
-    function remove_origination_rate($id) {
-        $this->db->where("id", $id);
-        $this->db->delete("routes");
-        return true;
-    }
+	function remove_origination_rate($id) {
+		$this->db->where("id", $id);
+		$this->db->delete("routes");
+		return true;
+	}
 
-    function get_trunk_name($field_value) {
-        $this->db->where("name", $field_value);
-        $query = $this->db->get('trunks');
-        $data = $query->result();
-        if ($query->num_rows > 0)
-            return $data[0]->id;
-        else
-            return '';
-    }
+	function get_trunk_name($field_value) {
+		$this->db->where("name", $field_value);
+		$query = $this->db->get('trunks');
+		$data = $query->result();
+		if ($query->num_rows > 0)
+			return $data[0]->id;
+		else
+			return '';
+	}
 
-    function bulk_insert_termination_rate($field_value) {
-        //$this->db->insert_batch('outbound_routes', $field_value);
-        $this->db->insert_on_duplicate_update_batch('outbound_routes', $field_value);
-        $affected_row = $this->db->affected_rows();
-        return $affected_row;
-    }
+	function bulk_insert_termination_rate($field_value) {
+		//$this->db->insert_batch('outbound_routes', $field_value);
+		$this->db->insert_on_duplicate_update_batch('outbound_routes', $field_value);
+		$affected_row = $this->db->affected_rows();
+		return $affected_row;
+	}
 
-    function bulk_insert_origination_rate($inserted_array) {
-        //$this->db->insert_batch('routes', $inserted_array);
-        $this->db->insert_on_duplicate_update_batch('routes', $inserted_array);
-        $affected_row = $this->db->affected_rows();
-        return $affected_row;
-    }
-    function termination_rate_batch_update($update_array){
-        $this->db_model->build_search('termination_rates_list_search');
-        if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
-            $account_data = $this->session->userdata("accountinfo");
-            $this->db->where("reseller_id",$account_data['id']);
-        }
+	function bulk_insert_origination_rate($inserted_array) {
+		//$this->db->insert_batch('routes', $inserted_array);
+		$this->db->insert_on_duplicate_update_batch('routes', $inserted_array);
+		$affected_row = $this->db->affected_rows();
+		return $affected_row;
+	}
+	function termination_rate_batch_update($update_array){
+		$this->db_model->build_search('termination_rates_list_search');
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			$account_data = $this->session->userdata("accountinfo");
+			$this->db->where("reseller_id",$account_data['id']);
+		}
         
-        $updateflg = $this->db_model->build_batch_update_array($update_array);
-        if($updateflg)
-            return $this->db->update("outbound_routes");
-        else
-            return false;
-    }
-    function origination_rate_batch_update($update_array){
-        $this->db_model->build_search('origination_rate_list_search');
-        if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
-            $account_data = $this->session->userdata("accountinfo");
-            $this->db->where("reseller_id",$account_data['id']);
-        }
-        $updateflg = $this->db_model->build_batch_update_array($update_array);
-        if($updateflg)
-            return $this->db->update("routes");
-        else
-            return false;
-    }
-    function getreseller_rates_list($flag, $start = 0, $limit = 0,$export=false) {
-        $this->db_model->build_search('resellerrates_list_search');
-        $account_data = $this->session->userdata("accountinfo");
-        $where = array("status"=>"0","pricelist_id" => $account_data["pricelist_id"]);
-        if ($flag) {
-            $query = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);            
-        } else {
-            $query = $this->db_model->countQuery("*", "routes", $where);
-        }
-        return $query;
-    }
+		$updateflg = $this->db_model->build_batch_update_array($update_array);
+		if($updateflg)
+			return $this->db->update("outbound_routes");
+		else
+			return false;
+	}
+	function origination_rate_batch_update($update_array){
+		$this->db_model->build_search('origination_rate_list_search');
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			$account_data = $this->session->userdata("accountinfo");
+			$this->db->where("reseller_id",$account_data['id']);
+		}
+		$updateflg = $this->db_model->build_batch_update_array($update_array);
+		if($updateflg)
+			return $this->db->update("routes");
+		else
+			return false;
+	}
+	function getreseller_rates_list($flag, $start = 0, $limit = 0,$export=false) {
+		$this->db_model->build_search('resellerrates_list_search');
+		$account_data = $this->session->userdata("accountinfo");
+		$where = array("status"=>"0","pricelist_id" => $account_data["pricelist_id"]);
+		if ($flag) {
+			$query = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);            
+		} else {
+			$query = $this->db_model->countQuery("*", "routes", $where);
+		}
+		return $query;
+	}
 /*************
 ASTPP  3.0
 Rate insert
 *************/
-    function insert_if_not_exitst($add_array,$table_name){
-        $insert_str = "Insert into $table_name (";
-        $insert_key = "";
-        $insert_value = "";
-        $update_str = "";
-        foreach($add_array as $key => $value){
-           if($key != 'id'){
-                   $insert_key .= $key.",";
-                   $insert_value .= "'$value',";   
-                   $update_str .= $key." = '$value',";
-           }
-        }
-        $insert_key = rtrim($insert_key,",");
-        $insert_value = rtrim($insert_value,",");
-        $update_str = rtrim($update_str,",");
-        $insert_str .= $insert_key.") values"."(".$insert_value.")  ON DUPLICATE KEY UPDATE $update_str";
-        $this->db->query($insert_str);
-    }   
+	function insert_if_not_exitst($add_array,$table_name){
+		$insert_str = "Insert into $table_name (";
+		$insert_key = "";
+		$insert_value = "";
+		$update_str = "";
+		foreach($add_array as $key => $value){
+		   if($key != 'id'){
+				   $insert_key .= $key.",";
+				   $insert_value .= "'$value',";   
+				   $update_str .= $key." = '$value',";
+		   }
+		}
+		$insert_key = rtrim($insert_key,",");
+		$insert_value = rtrim($insert_value,",");
+		$update_str = rtrim($update_str,",");
+		$insert_str .= $insert_key.") values"."(".$insert_value.")  ON DUPLICATE KEY UPDATE $update_str";
+		$this->db->query($insert_str);
+	}   
 }

Spacing +37 added lines, -37 removed lines

@@ -32,10 +32,10 @@ 
 ASTPP  3.0 
 Batch Delete
 ********/
-        if($this->session->userdata('advance_batch_delete') == 1){
+        if ($this->session->userdata('advance_batch_delete') == 1) {
            $this->db->where(array("trunk_id >"=>"0"));
            $this->db->delete("outbound_routes");
-           $this->session->set_userdata('advance_batch_delete','0');
+           $this->session->set_userdata('advance_batch_delete', '0');
 	       $this->session->unset_userdata('advance_batch_delete');
 	   }
 /**************/
@@ -53,7 +53,7 @@ 
             if ($export)
                 $this->db->limit($limit, $start);
             $result = $this->db->get();
-        }else {
+        } else {
             $result = $this->db->count_all_results();
         }
         return $result;
@@ -74,14 +74,14 @@ 
             if ($export)
                 $this->db->limit($limit, $start);
             $result = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
-        }else {
+        } else {
             $result = $this->db_model->countQuery("*", "routes", $where);
         }
 // 	echo "<pre>";print_r($result->result());exit;
         return $result;
     }
 
-    function get_origination_rate_for_user($flag, $start = 0, $limit = 0,$export = true) {
+    function get_origination_rate_for_user($flag, $start = 0, $limit = 0, $export = true) {
         $this->db_model->build_search('origination_rate_list_search');
 
         $account_data = $this->session->userdata("accountinfo");
@@ -93,7 +93,7 @@ 
             if ($export)
                 $this->db->limit($limit, $start);
             $result = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
-        }else {
+        } else {
             $result = $this->db_model->countQuery("*", "routes", $where);
         }
         return $result;
@@ -111,11 +111,11 @@ 
 ASTPP  3.0 
 Batch delete
 ************/
-        if($this->session->userdata('advance_batch_delete') == 1){
+        if ($this->session->userdata('advance_batch_delete') == 1) {
             $this->db->where($where);
 			$this->db->delete("routes");
 			//echo $this->db->last_query(); exit;
-			$this->session->set_userdata('advance_batch_delete','0');
+			$this->session->set_userdata('advance_batch_delete', '0');
 			$this->session->unset_userdata('advance_batch_delete');
 			
 		}
@@ -131,14 +131,14 @@ 
         //echo $this->db->last_query();
         return $query;
     }
-    function getunblocked_pattern_list($accountid,$flag, $start = 0, $limit = 0) {
+    function getunblocked_pattern_list($accountid, $flag, $start = 0, $limit = 0) {
         $this->db_model->build_search('origination_rate_list_search');
         if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
             $account_data = $this->session->userdata("accountinfo");
             $reseller = $account_data['id'];
             $where = array("reseller_id" => $reseller, "status" => "0");
         } else {
-            $where = array("status" => "0",'reseller_id'=>'0');
+            $where = array("status" => "0", 'reseller_id'=>'0');
         }
         $where1 = '(pattern NOT IN (select blocked_patterns from block_patterns where accountid = "'.$accountid.'"))';
         $this->db->where($where1);        
@@ -150,14 +150,14 @@ 
         }
         return $query;
     }
-    function getunblocked_package_pattern($accountid,$flag, $start = 0, $limit = 0) {
+    function getunblocked_package_pattern($accountid, $flag, $start = 0, $limit = 0) {
         $this->db_model->build_search('origination_rate_list_search');
         if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
             $account_data = $this->session->userdata("accountinfo");
             $reseller = $account_data['id'];
             $where = array("reseller_id" => $reseller, "status" => "0");
         } else {
-            $where = array("status" => "0",'reseller_id'=>'0');
+            $where = array("status" => "0", 'reseller_id'=>'0');
         }
         $where1 = '(pattern NOT IN (select DISTINCT patterns from package_patterns where package_id = "'.$accountid.'"))';
         $this->db->where($where1);       
@@ -173,7 +173,7 @@ 
         $this->db_model->build_search('user_rates_list_search');
 
         $account_data = $this->session->userdata("accountinfo");
-        $where = array("pricelist_id" => $account_data["pricelist_id"],"status" => '0');
+        $where = array("pricelist_id" => $account_data["pricelist_id"], "status" => '0');
 
         $this->db_model->build_search('origination_rate_list_search');
         if ($flag) {
@@ -192,15 +192,15 @@ 
             $reseller = $account_data['id'];
             $add_array['reseller_id'] = $reseller;
         }
-        $add_array['pattern'] = "^" . $add_array['pattern'] . ".*";
+        $add_array['pattern'] = "^".$add_array['pattern'].".*";
         $add_array['prepend'] = $add_array['prepend'];
         /*
         ASTPP  3.0 
          add creation date.
         */
-        $add_array['creation_date']=gmdate('Y-m-d H:i:s');
+        $add_array['creation_date'] = gmdate('Y-m-d H:i:s');
         /*******************************************************/
-        $this->insert_if_not_exitst($add_array,"outbound_routes");
+        $this->insert_if_not_exitst($add_array, "outbound_routes");
         //$this->db->insert("outbound_routes", $add_array);
         return true;
     }
@@ -211,9 +211,9 @@ 
         ASTPP  3.0
          Edit time last modified date
         */
-        $data['last_modified_date']=gmdate('Y-m-d H:i:s');
+        $data['last_modified_date'] = gmdate('Y-m-d H:i:s');
         /***************************************************/
-        $data['pattern'] = "^" . $data['pattern'] . ".*";
+        $data['pattern'] = "^".$data['pattern'].".*";
         $this->db->where("id", $id);
         $this->db->update("outbound_routes", $data);
     }
@@ -231,7 +231,7 @@ 
         ASTPP  3.0 
         ADD time put creation date in routes table 
         */
-        $add_array['creation_date']=gmdate('Y-m-d H:i:s');
+        $add_array['creation_date'] = gmdate('Y-m-d H:i:s');
         /**********************************************/
         if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
             $account_data = $this->session->userdata("accountinfo");
@@ -239,12 +239,12 @@ 
             $add_array['reseller_id'] = $reseller;
         }
 	
-        $add_array['pattern'] = "^" . $add_array['pattern'] . ".*";
+        $add_array['pattern'] = "^".$add_array['pattern'].".*";
 /*************
 ASTPP  3.0 
 Rate insert
 *************/
-        $this->insert_if_not_exitst($add_array,"routes");
+        $this->insert_if_not_exitst($add_array, "routes");
 //        $this->db->insert("routes", $add_array);
 /*******************************/
         return true;
@@ -256,9 +256,9 @@ 
         ASTPP  3.0
          Edit tile last modified date update
         */
-        $data['last_modified_date']=gmdate('Y-m-d H:i:s');
+        $data['last_modified_date'] = gmdate('Y-m-d H:i:s');
         /********************************************************/
-        $data['pattern'] = "^" . $data['pattern'] . ".*";
+        $data['pattern'] = "^".$data['pattern'].".*";
         $this->db->where("id", $id);
         $this->db->update("routes", $data);
     }
@@ -292,35 +292,35 @@ 
         $affected_row = $this->db->affected_rows();
         return $affected_row;
     }
-    function termination_rate_batch_update($update_array){
+    function termination_rate_batch_update($update_array) {
         $this->db_model->build_search('termination_rates_list_search');
         if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
             $account_data = $this->session->userdata("accountinfo");
-            $this->db->where("reseller_id",$account_data['id']);
+            $this->db->where("reseller_id", $account_data['id']);
         }
         
         $updateflg = $this->db_model->build_batch_update_array($update_array);
-        if($updateflg)
+        if ($updateflg)
             return $this->db->update("outbound_routes");
         else
             return false;
     }
-    function origination_rate_batch_update($update_array){
+    function origination_rate_batch_update($update_array) {
         $this->db_model->build_search('origination_rate_list_search');
         if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
             $account_data = $this->session->userdata("accountinfo");
-            $this->db->where("reseller_id",$account_data['id']);
+            $this->db->where("reseller_id", $account_data['id']);
         }
         $updateflg = $this->db_model->build_batch_update_array($update_array);
-        if($updateflg)
+        if ($updateflg)
             return $this->db->update("routes");
         else
             return false;
     }
-    function getreseller_rates_list($flag, $start = 0, $limit = 0,$export=false) {
+    function getreseller_rates_list($flag, $start = 0, $limit = 0, $export = false) {
         $this->db_model->build_search('resellerrates_list_search');
         $account_data = $this->session->userdata("accountinfo");
-        $where = array("status"=>"0","pricelist_id" => $account_data["pricelist_id"]);
+        $where = array("status"=>"0", "pricelist_id" => $account_data["pricelist_id"]);
         if ($flag) {
             $query = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);            
         } else {
@@ -332,21 +332,21 @@ 
 ASTPP  3.0
 Rate insert
 *************/
-    function insert_if_not_exitst($add_array,$table_name){
+    function insert_if_not_exitst($add_array, $table_name) {
         $insert_str = "Insert into $table_name (";
         $insert_key = "";
         $insert_value = "";
         $update_str = "";
-        foreach($add_array as $key => $value){
-           if($key != 'id'){
+        foreach ($add_array as $key => $value) {
+           if ($key != 'id') {
                    $insert_key .= $key.",";
                    $insert_value .= "'$value',";   
                    $update_str .= $key." = '$value',";
            }
         }
-        $insert_key = rtrim($insert_key,",");
-        $insert_value = rtrim($insert_value,",");
-        $update_str = rtrim($update_str,",");
+        $insert_key = rtrim($insert_key, ",");
+        $insert_value = rtrim($insert_value, ",");
+        $update_str = rtrim($update_str, ",");
         $insert_str .= $insert_key.") values"."(".$insert_value.")  ON DUPLICATE KEY UPDATE $update_str";
         $this->db->query($insert_str);
     }   

Braces +27 added lines, -21 removed lines

@@ -50,10 +50,11 @@ 
         $this->db_model->build_search('termination_rates_list_search');
         $this->db->from('outbound_routes');
         if ($flag) {
-            if ($export)
-                $this->db->limit($limit, $start);
+            if ($export) {
+                            $this->db->limit($limit, $start);
+            }
             $result = $this->db->get();
-        }else {
+        } else {
             $result = $this->db->count_all_results();
         }
         return $result;
@@ -71,10 +72,11 @@ 
        
 	    $this->db_model->build_search('origination_rate_list_search');
         if ($flag) {
-            if ($export)
-                $this->db->limit($limit, $start);
+            if ($export) {
+                            $this->db->limit($limit, $start);
+            }
             $result = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
-        }else {
+        } else {
             $result = $this->db_model->countQuery("*", "routes", $where);
         }
 // 	echo "<pre>";print_r($result->result());exit;
@@ -90,10 +92,11 @@ 
 
         $this->db_model->build_search('origination_rate_list_search');
         if ($flag) {
-            if ($export)
-                $this->db->limit($limit, $start);
+            if ($export) {
+                            $this->db->limit($limit, $start);
+            }
             $result = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
-        }else {
+        } else {
             $result = $this->db_model->countQuery("*", "routes", $where);
         }
         return $result;
@@ -273,10 +276,11 @@ 
         $this->db->where("name", $field_value);
         $query = $this->db->get('trunks');
         $data = $query->result();
-        if ($query->num_rows > 0)
-            return $data[0]->id;
-        else
-            return '';
+        if ($query->num_rows > 0) {
+                    return $data[0]->id;
+        } else {
+                    return '';
+        }
     }
 
     function bulk_insert_termination_rate($field_value) {
@@ -300,10 +304,11 @@ 
         }
         
         $updateflg = $this->db_model->build_batch_update_array($update_array);
-        if($updateflg)
-            return $this->db->update("outbound_routes");
-        else
-            return false;
+        if($updateflg) {
+                    return $this->db->update("outbound_routes");
+        } else {
+                    return false;
+        }
     }
     function origination_rate_batch_update($update_array){
         $this->db_model->build_search('origination_rate_list_search');
@@ -312,10 +317,11 @@ 
             $this->db->where("reseller_id",$account_data['id']);
         }
         $updateflg = $this->db_model->build_batch_update_array($update_array);
-        if($updateflg)
-            return $this->db->update("routes");
-        else
-            return false;
+        if($updateflg) {
+                    return $this->db->update("routes");
+        } else {
+                    return false;
+        }
     }
     function getreseller_rates_list($flag, $start = 0, $limit = 0,$export=false) {
         $this->db_model->build_search('resellerrates_list_search');

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

Doc Comments +3 added lines

@@ -426,6 +426,9 @@
         }
     }
 
+    /**
+     * @param string $temp_name
+     */
     function send_mail($account_id, $temp_name, $user_data) {
 		
 		

Indentation +422 added lines, -422 removed lines

@@ -24,464 +24,464 @@
 
 class Signup extends MX_Controller {
 
-    function signup() {
-        parent::__construct();
-        $this->load->model('signup_model');
-        $this->load->helper('captcha');
-        $this->load->helper('template_inheritance');
-        //$this->load->library('form_validation');
-        $this->load->library('astpp/common');
-        $this->load->library('astpp/email_lib');
-        $this->load->model('db_model');
-        $this->load->model('common_model');
-        $this->load->library('session');
-        $this->load->library('encrypt');
-        $this->load->model('Astpp_common');
-
-        error_reporting(-1);
-        ini_set('display_errors', 'On');
-
-        $data['row'] = $this->signup_model->get_rate();
-    }
-
-    function index($key = "") {
-
-        if (Common_model::$global_config['system_config']['enable_signup'] == 1)
+	function signup() {
+		parent::__construct();
+		$this->load->model('signup_model');
+		$this->load->helper('captcha');
+		$this->load->helper('template_inheritance');
+		//$this->load->library('form_validation');
+		$this->load->library('astpp/common');
+		$this->load->library('astpp/email_lib');
+		$this->load->model('db_model');
+		$this->load->model('common_model');
+		$this->load->library('session');
+		$this->load->library('encrypt');
+		$this->load->model('Astpp_common');
+
+		error_reporting(-1);
+		ini_set('display_errors', 'On');
+
+		$data['row'] = $this->signup_model->get_rate();
+	}
+
+	function index($key = "") {
+
+		if (Common_model::$global_config['system_config']['enable_signup'] == 1)
 		{
-    		redirect(base_url());
+			redirect(base_url());
 		}
 
-        $userCaptcha = $this->input->post('userCaptcha');
-        $random_number = substr(number_format(time() * rand(), 0, '', ''), 0, 6);
-        $accountinfo=(array)$this->db->get_where('accounts',array('type'=>-1))->first_row();
-        $data['timezone_id'] = (!$accountinfo['timezone_id']) ? 1 : $accountinfo['timezone_id'];
-        $data['currency_id'] = (!$accountinfo['currency_id']) ? 1 : $accountinfo['currency_id'];
-        $data['country_id'] = (!$accountinfo['country_id']) ? 1 : $accountinfo['country_id'];
-
-        $vals = array(
-            'word' => $random_number,
-            'img_path' => getcwd() . '/assets/captcha/',
-            'img_url' => base_url() . 'assets/captcha/',
-            //'font_path' => './fonts/impact.ttf',
-            'img_width' => '243',
-            'img_height' => '50',
-            'expiration' => '3600'
-        );
-
-        if (isset($key) && $key != '') {
-            $data['key_unique'] = $key;
-        } else {
-            $data['key_unique'] = "admin";
-        }
-        $unique = $data['key_unique'];
-
-        if ($unique != "admin") {
-            $unique = $this->common->decode_params(trim($unique));
-            $decoded_str = $this->common->decode($unique);
-            $unique = $decoded_str;
-            $query = $this->db_model->getSelect("*", 'accounts', array('id' => $unique, "deleted" => "0"));
-            if ($query->num_rows() == 0) {
-                redirect(base_url() . "signup/signup_inactive");
-            }
-            if ($query->num_rows() > 0) {
-                $query = $query->result_array();
-                $query = $query[0];
-
-                if ($query['status'] != 0) {
-                    redirect(base_url() . "signup/signup_inactive");
-                }
-            }
-        }
-        $data['captcha'] = create_captcha($vals);
-        $this->session->set_userdata('captchaWord', $data['captcha']['word']);
-        $this->load->view('view_signup', $data);
-    }
-
-    public function check_captcha($str) {
-        $word = $this->session->userdata('captchaWord');
-        if (strcmp(strtoupper($str), strtoupper($word)) == 0) {
-            return true;
-        } else {
-            $this->form_validation->set_message('check_captcha', 'Please enter correct words!');
-            return false;
-        }
-    }
-
-    function terms_check() {
-        if (isset($_POST['agreeCheck']))
-            return true;
-        $this->form_validation->set_message('terms_check', 'THIS IS SOOOOO REQUIRED, DUDE!');
-        return false;
-    }
-
-     function signup_save($id = "") {
-        if (empty($_POST)) {
-            redirect(base_url() . "signup/");
-        } else {
-            $post_values = $this->input->post();
-            $userCaptcha = $this->input->post('userCaptcha');
-            $cnt_result = $this->db_model->countQuery("*", 'accounts', array('email' => $post_values['email']));
-
-            if ($userCaptcha != $this->session->userdata('captchaWord') || !filter_var($this->input->post('email'), FILTER_VALIDATE_EMAIL) || $cnt_result > 0) {
-                if (!filter_var($this->input->post('email'), FILTER_VALIDATE_EMAIL)) {
-                    $data['error']['email'] = "<div style='color: red;'> Please enter proper email </div>";
-                }
-                if ($userCaptcha != $this->session->userdata('captchaWord')) {
-                    $data['error']['userCaptcha'] = "<div style='color: red;'>Please enter valid Captcha code</div>";
-                }
-                if ($cnt_result > 0) {
-                    $data['error']['email'] = "<div style='color: red;'>Email Address already exists</div>";
-                }
-                $random_number = substr(number_format(time() * rand(), 0, '', ''), 0, 6);
-                $vals = array(
-                    'word' => $random_number,
-                    'img_path' => getcwd() . '/assets/captcha/',
-                    'img_url' => base_url() . 'assets/captcha/',
-                    //'font_path' => './fonts/impact.ttf',
-                    'img_width' => '243',
-                    'img_height' => '50',
-                    'expiration' => '3600'
-                );
-                //echo "<pre>"; print_r($_POST); exit;
-                if (isset($_POST['key_unique']) && $_POST['key_unique'] == "admin") {
-                    $data['key_unique'] = $_POST['key_unique'];
-                }
+		$userCaptcha = $this->input->post('userCaptcha');
+		$random_number = substr(number_format(time() * rand(), 0, '', ''), 0, 6);
+		$accountinfo=(array)$this->db->get_where('accounts',array('type'=>-1))->first_row();
+		$data['timezone_id'] = (!$accountinfo['timezone_id']) ? 1 : $accountinfo['timezone_id'];
+		$data['currency_id'] = (!$accountinfo['currency_id']) ? 1 : $accountinfo['currency_id'];
+		$data['country_id'] = (!$accountinfo['country_id']) ? 1 : $accountinfo['country_id'];
+
+		$vals = array(
+			'word' => $random_number,
+			'img_path' => getcwd() . '/assets/captcha/',
+			'img_url' => base_url() . 'assets/captcha/',
+			//'font_path' => './fonts/impact.ttf',
+			'img_width' => '243',
+			'img_height' => '50',
+			'expiration' => '3600'
+		);
+
+		if (isset($key) && $key != '') {
+			$data['key_unique'] = $key;
+		} else {
+			$data['key_unique'] = "admin";
+		}
+		$unique = $data['key_unique'];
+
+		if ($unique != "admin") {
+			$unique = $this->common->decode_params(trim($unique));
+			$decoded_str = $this->common->decode($unique);
+			$unique = $decoded_str;
+			$query = $this->db_model->getSelect("*", 'accounts', array('id' => $unique, "deleted" => "0"));
+			if ($query->num_rows() == 0) {
+				redirect(base_url() . "signup/signup_inactive");
+			}
+			if ($query->num_rows() > 0) {
+				$query = $query->result_array();
+				$query = $query[0];
+
+				if ($query['status'] != 0) {
+					redirect(base_url() . "signup/signup_inactive");
+				}
+			}
+		}
+		$data['captcha'] = create_captcha($vals);
+		$this->session->set_userdata('captchaWord', $data['captcha']['word']);
+		$this->load->view('view_signup', $data);
+	}
+
+	public function check_captcha($str) {
+		$word = $this->session->userdata('captchaWord');
+		if (strcmp(strtoupper($str), strtoupper($word)) == 0) {
+			return true;
+		} else {
+			$this->form_validation->set_message('check_captcha', 'Please enter correct words!');
+			return false;
+		}
+	}
+
+	function terms_check() {
+		if (isset($_POST['agreeCheck']))
+			return true;
+		$this->form_validation->set_message('terms_check', 'THIS IS SOOOOO REQUIRED, DUDE!');
+		return false;
+	}
+
+	 function signup_save($id = "") {
+		if (empty($_POST)) {
+			redirect(base_url() . "signup/");
+		} else {
+			$post_values = $this->input->post();
+			$userCaptcha = $this->input->post('userCaptcha');
+			$cnt_result = $this->db_model->countQuery("*", 'accounts', array('email' => $post_values['email']));
+
+			if ($userCaptcha != $this->session->userdata('captchaWord') || !filter_var($this->input->post('email'), FILTER_VALIDATE_EMAIL) || $cnt_result > 0) {
+				if (!filter_var($this->input->post('email'), FILTER_VALIDATE_EMAIL)) {
+					$data['error']['email'] = "<div style='color: red;'> Please enter proper email </div>";
+				}
+				if ($userCaptcha != $this->session->userdata('captchaWord')) {
+					$data['error']['userCaptcha'] = "<div style='color: red;'>Please enter valid Captcha code</div>";
+				}
+				if ($cnt_result > 0) {
+					$data['error']['email'] = "<div style='color: red;'>Email Address already exists</div>";
+				}
+				$random_number = substr(number_format(time() * rand(), 0, '', ''), 0, 6);
+				$vals = array(
+					'word' => $random_number,
+					'img_path' => getcwd() . '/assets/captcha/',
+					'img_url' => base_url() . 'assets/captcha/',
+					//'font_path' => './fonts/impact.ttf',
+					'img_width' => '243',
+					'img_height' => '50',
+					'expiration' => '3600'
+				);
+				//echo "<pre>"; print_r($_POST); exit;
+				if (isset($_POST['key_unique']) && $_POST['key_unique'] == "admin") {
+					$data['key_unique'] = $_POST['key_unique'];
+				}
 
 				$accountinfo=(array)$this->db->get_where('accounts',array('type'=>-1))->first_row();
 				$data['timezone_id'] = (!$accountinfo['timezone_id']) ? 1 : $accountinfo['timezone_id'];
 				$data['currency_id'] = (!$accountinfo['currency_id']) ? 1 : $accountinfo['currency_id'];
 				$data['country_id'] = (!$accountinfo['country_id']) ? 1 : $accountinfo['country_id'];
 
-                $data['timezone_id'] = (!$data['timezone_id']) ? 1 : $data['timezone_id'];
-                $data['currency_id'] = (!$data['currency_id']) ? 1 : $data['currency_id'];
-                $data['country_id'] = (!$data['country_id']) ? 1 : $data['country_id'];
+				$data['timezone_id'] = (!$data['timezone_id']) ? 1 : $data['timezone_id'];
+				$data['currency_id'] = (!$data['currency_id']) ? 1 : $data['currency_id'];
+				$data['country_id'] = (!$data['country_id']) ? 1 : $data['country_id'];
 
-                $data['value'] = $post_values;
-                $data['captcha'] = create_captcha($vals);
+				$data['value'] = $post_values;
+				$data['captcha'] = create_captcha($vals);
 
-                $this->session->set_userdata('captchaWord', $data['captcha']['word']);
-                $data['key_unique'] = $_POST['key_unique'];
-                $this->load->view('view_signup', $data);
-            } else {
-                //AVTLATP		
-                $user_data = $this->input->post();
+				$this->session->set_userdata('captchaWord', $data['captcha']['word']);
+				$data['key_unique'] = $_POST['key_unique'];
+				$this->load->view('view_signup', $data);
+			} else {
+				//AVTLATP		
+				$user_data = $this->input->post();
                
-                if (!isset($_POST['key_unique']) || !isset($_POST['email'])) {
-                    redirect(base_url() . "signup/");
-                }
-                $reseller_id = 0;
-                if (isset($_POST['key_unique']) && $_POST['key_unique'] != "admin") {
-                    $_POST['key_unique'] = $this->common->decode_params(trim($_POST['key_unique']));
-                    $decoded_str = $this->common->decode($_POST['key_unique']);
-                    $_POST['key_unique'] = $decoded_str;
-                    $user_data['key_unique'] = $_POST['key_unique'];
-                    $reseller_id = $user_data['key_unique'];
-                }
-                //echo "<pre>"; print_r($_POST); exit;
-                //AVTLATP
-                //Data want to insert or update
-                $user_data['status'] = "1";
-                $user_data['number'] = $this->common->find_uniq_rendno_customer(common_model::$global_config['system_config']['cardlength'], 'number', 'accounts');
-
-                $user_data['password'] = $this->common->encode($this->common->generate_password());
-                $user_data['pin'] = $this->common->generate_password();
-                $user_data['reseller_id'] = $reseller_id;
-                $user_data['posttoexternal'] = "0";
-
-                unset($user_data['userCaptcha']);
-                unset($user_data['action']);
-
-                $system_config = common_model::$global_config['system_config'];
-                $balance = $system_config["balance"];
-
-                /* $query = $this->db_model->getSelect("*", 'invoice_conf ', array('id' => $unique ,"deleted" => "0"));
+				if (!isset($_POST['key_unique']) || !isset($_POST['email'])) {
+					redirect(base_url() . "signup/");
+				}
+				$reseller_id = 0;
+				if (isset($_POST['key_unique']) && $_POST['key_unique'] != "admin") {
+					$_POST['key_unique'] = $this->common->decode_params(trim($_POST['key_unique']));
+					$decoded_str = $this->common->decode($_POST['key_unique']);
+					$_POST['key_unique'] = $decoded_str;
+					$user_data['key_unique'] = $_POST['key_unique'];
+					$reseller_id = $user_data['key_unique'];
+				}
+				//echo "<pre>"; print_r($_POST); exit;
+				//AVTLATP
+				//Data want to insert or update
+				$user_data['status'] = "1";
+				$user_data['number'] = $this->common->find_uniq_rendno_customer(common_model::$global_config['system_config']['cardlength'], 'number', 'accounts');
+
+				$user_data['password'] = $this->common->encode($this->common->generate_password());
+				$user_data['pin'] = $this->common->generate_password();
+				$user_data['reseller_id'] = $reseller_id;
+				$user_data['posttoexternal'] = "0";
+
+				unset($user_data['userCaptcha']);
+				unset($user_data['action']);
+
+				$system_config = common_model::$global_config['system_config'];
+				$balance = $system_config["balance"];
+
+				/* $query = $this->db_model->getSelect("*", 'invoice_conf ', array('id' => $unique ,"deleted" => "0"));
                   $query = $query->result_array(); */
 
-                $company_website = $system_config["company_website"];
-                $company_name = $system_config["company_name"];
+				$company_website = $system_config["company_website"];
+				$company_name = $system_config["company_name"];
 
-                //echo $company_name; exit;
-                $selection_rategroup_signup = $system_config["default_signup_rategroup"];
+				//echo $company_name; exit;
+				$selection_rategroup_signup = $system_config["default_signup_rategroup"];
 
-                if ($reseller_id != 0) {
-                    $result = $this->db_model->getSelect("*", "pricelists", array("reseller_id" => $reseller_id), "ASC");
-                    $result_arr = $result->result_array();
-                    $selection_rategroup_signup = $result_arr[0]['id'];
-                    $user_data['pricelist_id'] = (isset($selection_rategroup_signup) && $selection_rategroup_signup > 0 ) ? $selection_rategroup_signup : 0;
-                } else {
-                    $pricelist_id = $this->common->get_field_name('id', 'pricelists', array('name' => $selection_rategroup_signup));
-                    /* if($pricelis_id != "")
+				if ($reseller_id != 0) {
+					$result = $this->db_model->getSelect("*", "pricelists", array("reseller_id" => $reseller_id), "ASC");
+					$result_arr = $result->result_array();
+					$selection_rategroup_signup = $result_arr[0]['id'];
+					$user_data['pricelist_id'] = (isset($selection_rategroup_signup) && $selection_rategroup_signup > 0 ) ? $selection_rategroup_signup : 0;
+				} else {
+					$pricelist_id = $this->common->get_field_name('id', 'pricelists', array('name' => $selection_rategroup_signup));
+					/* if($pricelis_id != "")
                       $user_data['pricelist_id'] = $pricelis_id;
                       else
                       $user_data['pricelist_id'] = 0; */
-                    $user_data['pricelist_id'] = ($pricelist_id != "") ? $pricelist_id : 0;
-                }
-                $last_id='0';
-                //Insert or Update record
-                $signup_sipdevice_flag = $system_config['create_sipdevice'];
-                $last_id = $this->signup_model->add_user($user_data);
-                if ($last_id == "") {
-                    redirect(base_url() . "signup/signup_inactive");
-                }
-                if ($signup_sipdevice_flag == '0') {
-                    $query = $this->db_model->select("*", "sip_profiles", array('name' => "default"), "id", "ASC", '1', '0');
-                    $sip_id = $query->result_array();
-                    if($reseller_id > 0){
+					$user_data['pricelist_id'] = ($pricelist_id != "") ? $pricelist_id : 0;
+				}
+				$last_id='0';
+				//Insert or Update record
+				$signup_sipdevice_flag = $system_config['create_sipdevice'];
+				$last_id = $this->signup_model->add_user($user_data);
+				if ($last_id == "") {
+					redirect(base_url() . "signup/signup_inactive");
+				}
+				if ($signup_sipdevice_flag == '0') {
+					$query = $this->db_model->select("*", "sip_profiles", array('name' => "default"), "id", "ASC", '1', '0');
+					$sip_id = $query->result_array();
+					if($reseller_id > 0){
 						$reseller_id = $reseller_id;
 					}else{
 						$reseller_id = '0';
 					}
-                    $free_switch_array = array('fs_username' => $user_data['number'],
-                        'fs_password' => $user_data['password'],
-                        'context' => 'default',
-                        'effective_caller_id_name' => $user_data['number'],
-                        'effective_caller_id_number' => $user_data['number'],
-                        'sip_profile_id' => $sip_id[0]['id'],
-                        'reseller_id' => $reseller_id,
-                        'pricelist_id' => $user_data['pricelist_id'],
-                        'accountcode' => $last_id,
-                        'status' => $user_data['status'],
-                        'voicemail_enabled'=>true,
-                        'voicemail_password'=>'',
-                        'voicemail_mail_to'=>'',
-                        'voicemail_attach_file'=>true,
-                        'vm_keep_local_after_email'=>true,
-                        'vm_send_all_message'=>true,
-                        );
-                    $user_custom_array=array_merge($user_data,$free_switch_array);
-                    $user_custom_array['id']=$last_id;
-                    $user_custom_array['email']=$user_data['email'];
+					$free_switch_array = array('fs_username' => $user_data['number'],
+						'fs_password' => $user_data['password'],
+						'context' => 'default',
+						'effective_caller_id_name' => $user_data['number'],
+						'effective_caller_id_number' => $user_data['number'],
+						'sip_profile_id' => $sip_id[0]['id'],
+						'reseller_id' => $reseller_id,
+						'pricelist_id' => $user_data['pricelist_id'],
+						'accountcode' => $last_id,
+						'status' => $user_data['status'],
+						'voicemail_enabled'=>true,
+						'voicemail_password'=>'',
+						'voicemail_mail_to'=>'',
+						'voicemail_attach_file'=>true,
+						'vm_keep_local_after_email'=>true,
+						'vm_send_all_message'=>true,
+						);
+					$user_custom_array=array_merge($user_data,$free_switch_array);
+					$user_custom_array['id']=$last_id;
+					$user_custom_array['email']=$user_data['email'];
                    
-                    $this->load->model('freeswitch/freeswitch_model');
-                    $this->freeswitch_model->add_freeswith($user_custom_array);
-                }
-             // echo "<pre>"; print_r ($user_data); exit;
-                $activation = $this->encrypt->encode($user_data['number']);
-                $message = base_url() . 'signup/signup_confirm?email=' . urlencode($user_data['email']) . "&key=" . urlencode($activation);
-                $user_data['confirm'] = $message;
-
-                $this->send_mail($last_id, 'email_signup_confirmation', $user_data);
-                redirect(base_url() . "signup/signup_success");
-            }
-        }
-    }
-
-    function signup_confirm() {
-        if (!empty($_GET)) {
-
-            $system_config = common_model::$global_config['system_config'];
-            $balance = $system_config["balance"];
-            $accno = $this->encrypt->decode($_GET['key']);
-            $email = $_GET['email'];
-            $success = $this->signup_model->check_user($accno, $email, $balance);
-            $query = $this->db_model->getSelect("*", "accounts", array('number' => $accno));
-            $data = $query->result_array();
-            $user_data = $data[0];
-            $user_data['accountid'] = $user_data['id'];
-            $user_data['success'] = $success;
-            $user_data['balance'] = $balance;
-            $user_data['confirm'] = base_url();
-            $this->active($user_data, $success);
-        } else {
-            redirect(base_url());
-        }
-    }
-
-    function signup_success() {
-        $this->load->view('view_signup_success');
-    }
-
-    function signup_inactive() {
-        $this->load->view('view_signup_inactive');
-    }
-
-    function active($user_data, $success) {
-        $data['user_data'] = $user_data;
-        $data['user_data']['success'] = $success;
-
-        if ($user_data['success']) {
+					$this->load->model('freeswitch/freeswitch_model');
+					$this->freeswitch_model->add_freeswith($user_custom_array);
+				}
+			 // echo "<pre>"; print_r ($user_data); exit;
+				$activation = $this->encrypt->encode($user_data['number']);
+				$message = base_url() . 'signup/signup_confirm?email=' . urlencode($user_data['email']) . "&key=" . urlencode($activation);
+				$user_data['confirm'] = $message;
+
+				$this->send_mail($last_id, 'email_signup_confirmation', $user_data);
+				redirect(base_url() . "signup/signup_success");
+			}
+		}
+	}
+
+	function signup_confirm() {
+		if (!empty($_GET)) {
+
+			$system_config = common_model::$global_config['system_config'];
+			$balance = $system_config["balance"];
+			$accno = $this->encrypt->decode($_GET['key']);
+			$email = $_GET['email'];
+			$success = $this->signup_model->check_user($accno, $email, $balance);
+			$query = $this->db_model->getSelect("*", "accounts", array('number' => $accno));
+			$data = $query->result_array();
+			$user_data = $data[0];
+			$user_data['accountid'] = $user_data['id'];
+			$user_data['success'] = $success;
+			$user_data['balance'] = $balance;
+			$user_data['confirm'] = base_url();
+			$this->active($user_data, $success);
+		} else {
+			redirect(base_url());
+		}
+	}
+
+	function signup_success() {
+		$this->load->view('view_signup_success');
+	}
+
+	function signup_inactive() {
+		$this->load->view('view_signup_inactive');
+	}
+
+	function active($user_data, $success) {
+		$data['user_data'] = $user_data;
+		$data['user_data']['success'] = $success;
+
+		if ($user_data['success']) {
 			$user_data['password'] = $this->common->decode($user_data['password']);
-            $this->send_mail($user_data['id'], 'email_add_user', $user_data);
-        }
-        $this->load->view('view_signup_active', $data);
-    }
-
-    function forgotpassword() {
-        $this->load->view('view_forgotpassword');
-    }
-
-    function confirmpassword() {
-        $email = $_POST['email'];       
-        unset($_POST['action']);        
-        $where = array('email' => $email);
-        $this->db->where($where);
-        $this->db->or_where('number',$email);
-        $cnt_result = $this->db_model->countQuery("*", 'accounts', "");
-        if (!empty($email)) {
-            $names = array('0', '1', '3');
-            $this->db->where_in('type', $names);
-            $where_arr = array("email" => $email);
-            $this->db->where($where_arr);
+			$this->send_mail($user_data['id'], 'email_add_user', $user_data);
+		}
+		$this->load->view('view_signup_active', $data);
+	}
+
+	function forgotpassword() {
+		$this->load->view('view_forgotpassword');
+	}
+
+	function confirmpassword() {
+		$email = $_POST['email'];       
+		unset($_POST['action']);        
+		$where = array('email' => $email);
+		$this->db->where($where);
+		$this->db->or_where('number',$email);
+		$cnt_result = $this->db_model->countQuery("*", 'accounts', "");
+		if (!empty($email)) {
+			$names = array('0', '1', '3');
+			$this->db->where_in('type', $names);
+			$where_arr = array("email" => $email);
+			$this->db->where($where_arr);
 			$this->db->or_where('number',$email);
-            $acountdata = $this->db_model->getSelect("*", "accounts", "");
-            if ($acountdata->num_rows() > 0) {
-                $user_data = $acountdata->result_array();
-                $user_data = $user_data[0];
-                if ($user_data['status'] > 0) {
-                    $data['error']['email'] = "<div id='error_mail' style='color:red; margin: 1% 22%; float: left;'>This account is not Active.</div>";
-                    $this->load->view('view_forgotpassword', $data);
-                    exit;
-                }
-            }            
-            if ($acountdata->num_rows() == 0 && !filter_var($email, FILTER_VALIDATE_EMAIL)) {
-                if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
-                    $data['error']['email'] = "<div id='error_mail' style='color: red; margin: 2% 22%; float: left; width:100%;'>Please enter proper Username or Email.</div>";
-
-                    $this->load->view('view_forgotpassword', $data);
-                } else {
-                    $data['error']['email'] = "<div id='error_mail' style='color: red; margin: 2% 22%; float: left;width:100%;'>This Username or Email is not valid</div>";
-
-                    $this->load->view('view_forgotpassword', $data);
-                }
-            } else if($acountdata->num_rows() == 0){
-                    $data['error']['email'] = "<div id='error_mail' style='color: red; margin: 2% 22%; float: left; width:100%;'>Please enter proper Username or Email.</div>";
-                    $this->load->view('view_forgotpassword', $data);
-            } else {
-                $acountdata = $acountdata->result_array();
-                $user_data = $acountdata[0];
+			$acountdata = $this->db_model->getSelect("*", "accounts", "");
+			if ($acountdata->num_rows() > 0) {
+				$user_data = $acountdata->result_array();
+				$user_data = $user_data[0];
+				if ($user_data['status'] > 0) {
+					$data['error']['email'] = "<div id='error_mail' style='color:red; margin: 1% 22%; float: left;'>This account is not Active.</div>";
+					$this->load->view('view_forgotpassword', $data);
+					exit;
+				}
+			}            
+			if ($acountdata->num_rows() == 0 && !filter_var($email, FILTER_VALIDATE_EMAIL)) {
+				if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
+					$data['error']['email'] = "<div id='error_mail' style='color: red; margin: 2% 22%; float: left; width:100%;'>Please enter proper Username or Email.</div>";
+
+					$this->load->view('view_forgotpassword', $data);
+				} else {
+					$data['error']['email'] = "<div id='error_mail' style='color: red; margin: 2% 22%; float: left;width:100%;'>This Username or Email is not valid</div>";
+
+					$this->load->view('view_forgotpassword', $data);
+				}
+			} else if($acountdata->num_rows() == 0){
+					$data['error']['email'] = "<div id='error_mail' style='color: red; margin: 2% 22%; float: left; width:100%;'>Please enter proper Username or Email.</div>";
+					$this->load->view('view_forgotpassword', $data);
+			} else {
+				$acountdata = $acountdata->result_array();
+				$user_data = $acountdata[0];
                 
-                $email = $this->encrypt->encode($user_data['email']);
-                $activation = $this->encrypt->encode($user_data['number']);
-                $message = base_url() . 'confirm_pass?email=' . urlencode($email) . "&key=" . urlencode($activation);
-                $user_data['confirm'] = $message;
-                $where = array("email" => $user_data['email']);
-                $data = array("pass_link_status" => 1);
-                $this->db->where($where);
-                $this->db->update('accounts', $data);
-                $system_config = common_model::$global_config['system_config'];
-                $balance = $system_config["balance"];
-                $this->send_mail($user_data['id'], 'email_forgot_confirmation', $user_data);
-                $this->load->view('view_forgot_success');
-            }
-        } else {
-            redirect(base_url());
-        }
-    }
-
-    function confirm_pass() {
-        $confirm_pass = $_GET;
-        $accno = '';
-        $balance = '';
-        $email1 = $this->encrypt->decode($confirm_pass['email']);
-        $success = $this->signup_model->check_user($accno, $email1, $balance);
-        if (!empty($confirm_pass)) {
-            $where_arr = array("email" => $email1, "status" => 0);
-            $acountdata = $this->db_model->getSelect("*", "accounts", $where_arr);
-            if ($acountdata->num_rows() > 0) {
-                $acountdata = $acountdata->result_array();
-                $user_data = $acountdata[0];
-                $updateArr = array("pass_link_status" => 0);
-                $this->db->where(array("email" => $email1));
-                $this->db->update("accounts", $updateArr);
-                if ($user_data['pass_link_status'] == '0') {
-                    $user_data['success'] = $success;
-                    $data['user_data'] = $user_data;
-                    $this->active($user_data, $success);
-                } else {
-                    $data['email'] = $_GET['email'];
-                    $this->load->view('view_confirmpassword', $data);
-                }
-            }
-        }
-    }
-
-    function confirmpass() {
-        $passwordconf = $_POST;
-        $email1 = $this->encrypt->decode($passwordconf['email']);
-        if (!empty($passwordconf)) {
-            $acountdata = $this->db_model->getSelect("*", "accounts", array("email" => $email1));
-            //echo $this->db->last_query();exit;
-            if ($acountdata->num_rows() > 0) {
-                $acountdata = $acountdata->result_array();
-                $user_data = $acountdata[0];
-            }
-            $user_data['password'] = $this->common->encode($passwordconf['password']);
-            $updateArr = array("password" => $user_data['password']);
-            $where_arr = array("email" => $email1, "status" => 0);
-            $this->db->where($where_arr);
-            $this->db->update("accounts", $updateArr);
-            //$activation = $this->encrypt->encode($user_data['number']);
-            $message = base_url();
-            $user_data['confirm'] = $message;
-            $user_data['password'] = $passwordconf['password'];
-
-
-
-            $system_config = common_model::$global_config['system_config'];
-            $balance = $system_config["balance"];
-
-            $this->send_mail($user_data['id'], 'email_forgot_user', $user_data);
-
-            $this->successpassword();
-        }
-    }
-
-    function send_mail($account_id, $temp_name, $user_data) {
+				$email = $this->encrypt->encode($user_data['email']);
+				$activation = $this->encrypt->encode($user_data['number']);
+				$message = base_url() . 'confirm_pass?email=' . urlencode($email) . "&key=" . urlencode($activation);
+				$user_data['confirm'] = $message;
+				$where = array("email" => $user_data['email']);
+				$data = array("pass_link_status" => 1);
+				$this->db->where($where);
+				$this->db->update('accounts', $data);
+				$system_config = common_model::$global_config['system_config'];
+				$balance = $system_config["balance"];
+				$this->send_mail($user_data['id'], 'email_forgot_confirmation', $user_data);
+				$this->load->view('view_forgot_success');
+			}
+		} else {
+			redirect(base_url());
+		}
+	}
+
+	function confirm_pass() {
+		$confirm_pass = $_GET;
+		$accno = '';
+		$balance = '';
+		$email1 = $this->encrypt->decode($confirm_pass['email']);
+		$success = $this->signup_model->check_user($accno, $email1, $balance);
+		if (!empty($confirm_pass)) {
+			$where_arr = array("email" => $email1, "status" => 0);
+			$acountdata = $this->db_model->getSelect("*", "accounts", $where_arr);
+			if ($acountdata->num_rows() > 0) {
+				$acountdata = $acountdata->result_array();
+				$user_data = $acountdata[0];
+				$updateArr = array("pass_link_status" => 0);
+				$this->db->where(array("email" => $email1));
+				$this->db->update("accounts", $updateArr);
+				if ($user_data['pass_link_status'] == '0') {
+					$user_data['success'] = $success;
+					$data['user_data'] = $user_data;
+					$this->active($user_data, $success);
+				} else {
+					$data['email'] = $_GET['email'];
+					$this->load->view('view_confirmpassword', $data);
+				}
+			}
+		}
+	}
+
+	function confirmpass() {
+		$passwordconf = $_POST;
+		$email1 = $this->encrypt->decode($passwordconf['email']);
+		if (!empty($passwordconf)) {
+			$acountdata = $this->db_model->getSelect("*", "accounts", array("email" => $email1));
+			//echo $this->db->last_query();exit;
+			if ($acountdata->num_rows() > 0) {
+				$acountdata = $acountdata->result_array();
+				$user_data = $acountdata[0];
+			}
+			$user_data['password'] = $this->common->encode($passwordconf['password']);
+			$updateArr = array("password" => $user_data['password']);
+			$where_arr = array("email" => $email1, "status" => 0);
+			$this->db->where($where_arr);
+			$this->db->update("accounts", $updateArr);
+			//$activation = $this->encrypt->encode($user_data['number']);
+			$message = base_url();
+			$user_data['confirm'] = $message;
+			$user_data['password'] = $passwordconf['password'];
+
+
+
+			$system_config = common_model::$global_config['system_config'];
+			$balance = $system_config["balance"];
+
+			$this->send_mail($user_data['id'], 'email_forgot_user', $user_data);
+
+			$this->successpassword();
+		}
+	}
+
+	function send_mail($account_id, $temp_name, $user_data) {
 		
 		
-        $system_config = common_model::$global_config['system_config'];
-        //$screen_path = getcwd()."/cron";
-        //$screen_filename = "Email_Broadcast_".strtotime('now');
-        //$command = "cd ".$screen_path." && /usr/bin/screen -d -m -S  $screen_filename php cron.php BroadcastEmail";
-        //exec($command);
+		$system_config = common_model::$global_config['system_config'];
+		//$screen_path = getcwd()."/cron";
+		//$screen_filename = "Email_Broadcast_".strtotime('now');
+		//$command = "cd ".$screen_path." && /usr/bin/screen -d -m -S  $screen_filename php cron.php BroadcastEmail";
+		//exec($command);
         
         
      
         
-        $where = array('name' => $temp_name);
-        $EmailTemplate = $this->db_model->getSelect("*", "default_templates", $where);
-        $reseller_id = ($user_data['reseller_id'] >0) ? $user_data['reseller_id'] : 1;
-        $where="accountid IN ('".$reseller_id."','1')";
-        $this->db->where($where);
-        $this->db->select('*');
-        $this->db->order_by('accountid', 'desc');
-        $this->db->limit(1);
-        $invoiceconf = $this->db->get('invoice_conf');
-        $invoiceconf = (array)$invoiceconf->first_row();
-        $company_email = $invoiceconf['emailaddress'];
-        $company_website = $invoiceconf["website"];
-        $company_name = $invoiceconf["company_name"];
+		$where = array('name' => $temp_name);
+		$EmailTemplate = $this->db_model->getSelect("*", "default_templates", $where);
+		$reseller_id = ($user_data['reseller_id'] >0) ? $user_data['reseller_id'] : 1;
+		$where="accountid IN ('".$reseller_id."','1')";
+		$this->db->where($where);
+		$this->db->select('*');
+		$this->db->order_by('accountid', 'desc');
+		$this->db->limit(1);
+		$invoiceconf = $this->db->get('invoice_conf');
+		$invoiceconf = (array)$invoiceconf->first_row();
+		$company_email = $invoiceconf['emailaddress'];
+		$company_website = $invoiceconf["website"];
+		$company_name = $invoiceconf["company_name"];
         
-        $TemplateData = array();
+		$TemplateData = array();
         
         
-        foreach ($EmailTemplate->result_array() as $value) {
-            $TemplateData = $value;
-            $TemplateData['subject'] = str_replace('#NAME#', $user_data['first_name'] . " " . $user_data['last_name'], $TemplateData['subject']);
-            $TemplateData['template'] = str_replace('#NAME#', $user_data['first_name'] . " " . $user_data['last_name'], $TemplateData['template']);
-            $TemplateData['template'] = str_replace('#NUMBER#', $user_data['number'], $TemplateData['template']);
-            $TemplateData['template'] = str_replace('#PASSWORD#', $user_data['password'], $TemplateData['template']);
-            $TemplateData['template'] = str_replace('#COMPANY_WEBSITE#', $company_website, $TemplateData['template']);
-            $TemplateData['template'] = str_replace('#LINK#', $user_data['confirm'], $TemplateData['template']);
-            $TemplateData['template'] = str_replace('#COMPANY_EMAIL#', $company_email, $TemplateData['template']);
-            $TemplateData['template'] = str_replace('#COMPANY_NAME#', $company_name, $TemplateData['template']);
-        }
-        $email_array = array('accountid' => $account_id,
-            'subject' => $TemplateData['subject'],
-            'body' => $TemplateData['template'],
-            'from' => $invoiceconf['emailaddress'],
-            'to' => $user_data['email'],
-            'status' => "1",
-            //'attachment'=> $Filenm,
-            'template' => '');
-        //echo "<pre>"; print_r($TemplateData); exit;
-        $this->db->insert("mail_details", $email_array);
-        return true;
-    }
-
-    function successpassword() {
-        $this->load->view('view_successpassword');
-    }
+		foreach ($EmailTemplate->result_array() as $value) {
+			$TemplateData = $value;
+			$TemplateData['subject'] = str_replace('#NAME#', $user_data['first_name'] . " " . $user_data['last_name'], $TemplateData['subject']);
+			$TemplateData['template'] = str_replace('#NAME#', $user_data['first_name'] . " " . $user_data['last_name'], $TemplateData['template']);
+			$TemplateData['template'] = str_replace('#NUMBER#', $user_data['number'], $TemplateData['template']);
+			$TemplateData['template'] = str_replace('#PASSWORD#', $user_data['password'], $TemplateData['template']);
+			$TemplateData['template'] = str_replace('#COMPANY_WEBSITE#', $company_website, $TemplateData['template']);
+			$TemplateData['template'] = str_replace('#LINK#', $user_data['confirm'], $TemplateData['template']);
+			$TemplateData['template'] = str_replace('#COMPANY_EMAIL#', $company_email, $TemplateData['template']);
+			$TemplateData['template'] = str_replace('#COMPANY_NAME#', $company_name, $TemplateData['template']);
+		}
+		$email_array = array('accountid' => $account_id,
+			'subject' => $TemplateData['subject'],
+			'body' => $TemplateData['template'],
+			'from' => $invoiceconf['emailaddress'],
+			'to' => $user_data['email'],
+			'status' => "1",
+			//'attachment'=> $Filenm,
+			'template' => '');
+		//echo "<pre>"; print_r($TemplateData); exit;
+		$this->db->insert("mail_details", $email_array);
+		return true;
+	}
+
+	function successpassword() {
+		$this->load->view('view_successpassword');
+	}
 
 }
 ?>

Spacing +46 added lines, -46 removed lines

@@ -53,15 +53,15 @@ 
 
         $userCaptcha = $this->input->post('userCaptcha');
         $random_number = substr(number_format(time() * rand(), 0, '', ''), 0, 6);
-        $accountinfo=(array)$this->db->get_where('accounts',array('type'=>-1))->first_row();
-        $data['timezone_id'] = (!$accountinfo['timezone_id']) ? 1 : $accountinfo['timezone_id'];
-        $data['currency_id'] = (!$accountinfo['currency_id']) ? 1 : $accountinfo['currency_id'];
-        $data['country_id'] = (!$accountinfo['country_id']) ? 1 : $accountinfo['country_id'];
+        $accountinfo = (array)$this->db->get_where('accounts', array('type'=>-1))->first_row();
+        $data['timezone_id'] = ( ! $accountinfo['timezone_id']) ? 1 : $accountinfo['timezone_id'];
+        $data['currency_id'] = ( ! $accountinfo['currency_id']) ? 1 : $accountinfo['currency_id'];
+        $data['country_id'] = ( ! $accountinfo['country_id']) ? 1 : $accountinfo['country_id'];
 
         $vals = array(
             'word' => $random_number,
-            'img_path' => getcwd() . '/assets/captcha/',
-            'img_url' => base_url() . 'assets/captcha/',
+            'img_path' => getcwd().'/assets/captcha/',
+            'img_url' => base_url().'assets/captcha/',
             //'font_path' => './fonts/impact.ttf',
             'img_width' => '243',
             'img_height' => '50',
@@ -81,14 +81,14 @@ 
             $unique = $decoded_str;
             $query = $this->db_model->getSelect("*", 'accounts', array('id' => $unique, "deleted" => "0"));
             if ($query->num_rows() == 0) {
-                redirect(base_url() . "signup/signup_inactive");
+                redirect(base_url()."signup/signup_inactive");
             }
             if ($query->num_rows() > 0) {
                 $query = $query->result_array();
                 $query = $query[0];
 
                 if ($query['status'] != 0) {
-                    redirect(base_url() . "signup/signup_inactive");
+                    redirect(base_url()."signup/signup_inactive");
                 }
             }
         }
@@ -116,14 +116,14 @@ 
 
      function signup_save($id = "") {
         if (empty($_POST)) {
-            redirect(base_url() . "signup/");
+            redirect(base_url()."signup/");
         } else {
             $post_values = $this->input->post();
             $userCaptcha = $this->input->post('userCaptcha');
             $cnt_result = $this->db_model->countQuery("*", 'accounts', array('email' => $post_values['email']));
 
-            if ($userCaptcha != $this->session->userdata('captchaWord') || !filter_var($this->input->post('email'), FILTER_VALIDATE_EMAIL) || $cnt_result > 0) {
-                if (!filter_var($this->input->post('email'), FILTER_VALIDATE_EMAIL)) {
+            if ($userCaptcha != $this->session->userdata('captchaWord') || ! filter_var($this->input->post('email'), FILTER_VALIDATE_EMAIL) || $cnt_result > 0) {
+                if ( ! filter_var($this->input->post('email'), FILTER_VALIDATE_EMAIL)) {
                     $data['error']['email'] = "<div style='color: red;'> Please enter proper email </div>";
                 }
                 if ($userCaptcha != $this->session->userdata('captchaWord')) {
@@ -135,8 +135,8 @@ 
                 $random_number = substr(number_format(time() * rand(), 0, '', ''), 0, 6);
                 $vals = array(
                     'word' => $random_number,
-                    'img_path' => getcwd() . '/assets/captcha/',
-                    'img_url' => base_url() . 'assets/captcha/',
+                    'img_path' => getcwd().'/assets/captcha/',
+                    'img_url' => base_url().'assets/captcha/',
                     //'font_path' => './fonts/impact.ttf',
                     'img_width' => '243',
                     'img_height' => '50',
@@ -147,14 +147,14 @@ 
                     $data['key_unique'] = $_POST['key_unique'];
                 }
 
-				$accountinfo=(array)$this->db->get_where('accounts',array('type'=>-1))->first_row();
-				$data['timezone_id'] = (!$accountinfo['timezone_id']) ? 1 : $accountinfo['timezone_id'];
-				$data['currency_id'] = (!$accountinfo['currency_id']) ? 1 : $accountinfo['currency_id'];
-				$data['country_id'] = (!$accountinfo['country_id']) ? 1 : $accountinfo['country_id'];
+				$accountinfo = (array)$this->db->get_where('accounts', array('type'=>-1))->first_row();
+				$data['timezone_id'] = ( ! $accountinfo['timezone_id']) ? 1 : $accountinfo['timezone_id'];
+				$data['currency_id'] = ( ! $accountinfo['currency_id']) ? 1 : $accountinfo['currency_id'];
+				$data['country_id'] = ( ! $accountinfo['country_id']) ? 1 : $accountinfo['country_id'];
 
-                $data['timezone_id'] = (!$data['timezone_id']) ? 1 : $data['timezone_id'];
-                $data['currency_id'] = (!$data['currency_id']) ? 1 : $data['currency_id'];
-                $data['country_id'] = (!$data['country_id']) ? 1 : $data['country_id'];
+                $data['timezone_id'] = ( ! $data['timezone_id']) ? 1 : $data['timezone_id'];
+                $data['currency_id'] = ( ! $data['currency_id']) ? 1 : $data['currency_id'];
+                $data['country_id'] = ( ! $data['country_id']) ? 1 : $data['country_id'];
 
                 $data['value'] = $post_values;
                 $data['captcha'] = create_captcha($vals);
@@ -166,8 +166,8 @@ 
                 //AVTLATP		
                 $user_data = $this->input->post();
                
-                if (!isset($_POST['key_unique']) || !isset($_POST['email'])) {
-                    redirect(base_url() . "signup/");
+                if ( ! isset($_POST['key_unique']) || ! isset($_POST['email'])) {
+                    redirect(base_url()."signup/");
                 }
                 $reseller_id = 0;
                 if (isset($_POST['key_unique']) && $_POST['key_unique'] != "admin") {
@@ -207,7 +207,7 @@ 
                     $result = $this->db_model->getSelect("*", "pricelists", array("reseller_id" => $reseller_id), "ASC");
                     $result_arr = $result->result_array();
                     $selection_rategroup_signup = $result_arr[0]['id'];
-                    $user_data['pricelist_id'] = (isset($selection_rategroup_signup) && $selection_rategroup_signup > 0 ) ? $selection_rategroup_signup : 0;
+                    $user_data['pricelist_id'] = (isset($selection_rategroup_signup) && $selection_rategroup_signup > 0) ? $selection_rategroup_signup : 0;
                 } else {
                     $pricelist_id = $this->common->get_field_name('id', 'pricelists', array('name' => $selection_rategroup_signup));
                     /* if($pricelis_id != "")
@@ -216,19 +216,19 @@ 
                       $user_data['pricelist_id'] = 0; */
                     $user_data['pricelist_id'] = ($pricelist_id != "") ? $pricelist_id : 0;
                 }
-                $last_id='0';
+                $last_id = '0';
                 //Insert or Update record
                 $signup_sipdevice_flag = $system_config['create_sipdevice'];
                 $last_id = $this->signup_model->add_user($user_data);
                 if ($last_id == "") {
-                    redirect(base_url() . "signup/signup_inactive");
+                    redirect(base_url()."signup/signup_inactive");
                 }
                 if ($signup_sipdevice_flag == '0') {
                     $query = $this->db_model->select("*", "sip_profiles", array('name' => "default"), "id", "ASC", '1', '0');
                     $sip_id = $query->result_array();
-                    if($reseller_id > 0){
+                    if ($reseller_id > 0) {
 						$reseller_id = $reseller_id;
-					}else{
+					} else {
 						$reseller_id = '0';
 					}
                     $free_switch_array = array('fs_username' => $user_data['number'],
@@ -248,26 +248,26 @@ 
                         'vm_keep_local_after_email'=>true,
                         'vm_send_all_message'=>true,
                         );
-                    $user_custom_array=array_merge($user_data,$free_switch_array);
-                    $user_custom_array['id']=$last_id;
-                    $user_custom_array['email']=$user_data['email'];
+                    $user_custom_array = array_merge($user_data, $free_switch_array);
+                    $user_custom_array['id'] = $last_id;
+                    $user_custom_array['email'] = $user_data['email'];
                    
                     $this->load->model('freeswitch/freeswitch_model');
                     $this->freeswitch_model->add_freeswith($user_custom_array);
                 }
              // echo "<pre>"; print_r ($user_data); exit;
                 $activation = $this->encrypt->encode($user_data['number']);
-                $message = base_url() . 'signup/signup_confirm?email=' . urlencode($user_data['email']) . "&key=" . urlencode($activation);
+                $message = base_url().'signup/signup_confirm?email='.urlencode($user_data['email'])."&key=".urlencode($activation);
                 $user_data['confirm'] = $message;
 
                 $this->send_mail($last_id, 'email_signup_confirmation', $user_data);
-                redirect(base_url() . "signup/signup_success");
+                redirect(base_url()."signup/signup_success");
             }
         }
     }
 
     function signup_confirm() {
-        if (!empty($_GET)) {
+        if ( ! empty($_GET)) {
 
             $system_config = common_model::$global_config['system_config'];
             $balance = $system_config["balance"];
@@ -315,14 +315,14 @@ 
         unset($_POST['action']);        
         $where = array('email' => $email);
         $this->db->where($where);
-        $this->db->or_where('number',$email);
+        $this->db->or_where('number', $email);
         $cnt_result = $this->db_model->countQuery("*", 'accounts', "");
-        if (!empty($email)) {
+        if ( ! empty($email)) {
             $names = array('0', '1', '3');
             $this->db->where_in('type', $names);
             $where_arr = array("email" => $email);
             $this->db->where($where_arr);
-			$this->db->or_where('number',$email);
+			$this->db->or_where('number', $email);
             $acountdata = $this->db_model->getSelect("*", "accounts", "");
             if ($acountdata->num_rows() > 0) {
                 $user_data = $acountdata->result_array();
@@ -333,8 +333,8 @@ 
                     exit;
                 }
             }            
-            if ($acountdata->num_rows() == 0 && !filter_var($email, FILTER_VALIDATE_EMAIL)) {
-                if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
+            if ($acountdata->num_rows() == 0 && ! filter_var($email, FILTER_VALIDATE_EMAIL)) {
+                if ( ! filter_var($email, FILTER_VALIDATE_EMAIL)) {
                     $data['error']['email'] = "<div id='error_mail' style='color: red; margin: 2% 22%; float: left; width:100%;'>Please enter proper Username or Email.</div>";
 
                     $this->load->view('view_forgotpassword', $data);
@@ -343,7 +343,7 @@ 
 
                     $this->load->view('view_forgotpassword', $data);
                 }
-            } else if($acountdata->num_rows() == 0){
+            } else if ($acountdata->num_rows() == 0) {
                     $data['error']['email'] = "<div id='error_mail' style='color: red; margin: 2% 22%; float: left; width:100%;'>Please enter proper Username or Email.</div>";
                     $this->load->view('view_forgotpassword', $data);
             } else {
@@ -352,7 +352,7 @@ 
                 
                 $email = $this->encrypt->encode($user_data['email']);
                 $activation = $this->encrypt->encode($user_data['number']);
-                $message = base_url() . 'confirm_pass?email=' . urlencode($email) . "&key=" . urlencode($activation);
+                $message = base_url().'confirm_pass?email='.urlencode($email)."&key=".urlencode($activation);
                 $user_data['confirm'] = $message;
                 $where = array("email" => $user_data['email']);
                 $data = array("pass_link_status" => 1);
@@ -374,7 +374,7 @@ 
         $balance = '';
         $email1 = $this->encrypt->decode($confirm_pass['email']);
         $success = $this->signup_model->check_user($accno, $email1, $balance);
-        if (!empty($confirm_pass)) {
+        if ( ! empty($confirm_pass)) {
             $where_arr = array("email" => $email1, "status" => 0);
             $acountdata = $this->db_model->getSelect("*", "accounts", $where_arr);
             if ($acountdata->num_rows() > 0) {
@@ -398,7 +398,7 @@ 
     function confirmpass() {
         $passwordconf = $_POST;
         $email1 = $this->encrypt->decode($passwordconf['email']);
-        if (!empty($passwordconf)) {
+        if ( ! empty($passwordconf)) {
             $acountdata = $this->db_model->getSelect("*", "accounts", array("email" => $email1));
             //echo $this->db->last_query();exit;
             if ($acountdata->num_rows() > 0) {
@@ -440,8 +440,8 @@ 
         
         $where = array('name' => $temp_name);
         $EmailTemplate = $this->db_model->getSelect("*", "default_templates", $where);
-        $reseller_id = ($user_data['reseller_id'] >0) ? $user_data['reseller_id'] : 1;
-        $where="accountid IN ('".$reseller_id."','1')";
+        $reseller_id = ($user_data['reseller_id'] > 0) ? $user_data['reseller_id'] : 1;
+        $where = "accountid IN ('".$reseller_id."','1')";
         $this->db->where($where);
         $this->db->select('*');
         $this->db->order_by('accountid', 'desc');
@@ -457,8 +457,8 @@ 
         
         foreach ($EmailTemplate->result_array() as $value) {
             $TemplateData = $value;
-            $TemplateData['subject'] = str_replace('#NAME#', $user_data['first_name'] . " " . $user_data['last_name'], $TemplateData['subject']);
-            $TemplateData['template'] = str_replace('#NAME#', $user_data['first_name'] . " " . $user_data['last_name'], $TemplateData['template']);
+            $TemplateData['subject'] = str_replace('#NAME#', $user_data['first_name']." ".$user_data['last_name'], $TemplateData['subject']);
+            $TemplateData['template'] = str_replace('#NAME#', $user_data['first_name']." ".$user_data['last_name'], $TemplateData['template']);
             $TemplateData['template'] = str_replace('#NUMBER#', $user_data['number'], $TemplateData['template']);
             $TemplateData['template'] = str_replace('#PASSWORD#', $user_data['password'], $TemplateData['template']);
             $TemplateData['template'] = str_replace('#COMPANY_WEBSITE#', $company_website, $TemplateData['template']);

Braces +4 added lines, -3 removed lines

@@ -108,8 +108,9 @@ 
     }
 
     function terms_check() {
-        if (isset($_POST['agreeCheck']))
-            return true;
+        if (isset($_POST['agreeCheck'])) {
+                    return true;
+        }
         $this->form_validation->set_message('terms_check', 'THIS IS SOOOOO REQUIRED, DUDE!');
         return false;
     }
@@ -228,7 +229,7 @@ 
                     $sip_id = $query->result_array();
                     if($reseller_id > 0){
 						$reseller_id = $reseller_id;
-					}else{
+					} else{
 						$reseller_id = '0';
 					}
                     $free_switch_array = array('fs_username' => $user_data['number'],

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

Doc Comments +10 added lines

@@ -73,6 +73,9 @@ 
         echo json_encode($json_data);
     }
 
+    /**
+     * @param string $entity
+     */
     function summary_column_arr($entity) {
         $new_column_arr = array();
         $total_width = '322';
@@ -126,6 +129,10 @@ 
         return $new_column_arr;
     }
 
+    /**
+     * @param string $entity
+     * @param string $purpose
+     */
     function summary_report_grid($search_arr, $query, $entity, $purpose) {
         $export_arr = array();
         $db_field_name = $entity == 'provider' ? 'provider_id' : 'accountid';
@@ -330,6 +337,9 @@ 
         redirect(base_url() . 'summary/customer/');
     }
 
+    /**
+     * @param string $entity
+     */
     function summary_search_info($entity) {
         $group_by_str = null;
         $select_str = null;

Indentation +510 added lines, -510 removed lines

@@ -24,569 +24,569 @@
 
 class Summary extends MX_Controller {
 
-    function Summary() {
-        parent::__construct();
+	function Summary() {
+		parent::__construct();
 
-        $this->load->helper('template_inheritance');
+		$this->load->helper('template_inheritance');
 
-        $this->load->library('session');
-        $this->load->library('astpp/form');
-        $this->load->library("summary_form");
-        $this->load->model('summary_model');
-        $this->load->library('fpdf');
-        $this->load->library('pdf');
-        $this->fpdf = new PDF('P', 'pt');
-        $this->fpdf->initialize('P', 'mm', 'A4');
+		$this->load->library('session');
+		$this->load->library('astpp/form');
+		$this->load->library("summary_form");
+		$this->load->model('summary_model');
+		$this->load->library('fpdf');
+		$this->load->library('pdf');
+		$this->fpdf = new PDF('P', 'pt');
+		$this->fpdf->initialize('P', 'mm', 'A4');
 
-        if ($this->session->userdata('user_login') == FALSE)
-            redirect(base_url() . '/astpp/login');
-    }
-    function customer() {
-        $data['page_title'] = 'Customer Summary Report';
-        $data['search_flag'] = true;
-        $session_info = $this->session->userdata('customersummary_reports_search');
-        $accountinfo = $this->session->userdata('accountinfo');
-        $reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
-        $accountlist = $this->db_model->build_dropdown_deleted('id,IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'where_arr', array('reseller_id' => $reseller_id, "type" => "GLOBAL"));
-        $data['accountlist'] = $accountlist;
-        $data['session_info'] = $session_info;
-        $data['search_string_type'] = $this->common->search_string_type();
-        $data['search_report'] = $this->common->search_report_in();
-        $new_column_arr = $this->summary_column_arr('customer');
-        $data['grid_fields'] = $this->summary_form->build_customersummary($new_column_arr);
-        $data["grid_buttons"] = $this->summary_form->build_grid_buttons_customersummary();
-        $data['groupby_field'] = $this->common->set_summarycustomer_groupby();
-        $data['groupby_time'] = $this->common->group_by_time();
-        $this->load->view('view_customersummary_report', $data);
-    }
+		if ($this->session->userdata('user_login') == FALSE)
+			redirect(base_url() . '/astpp/login');
+	}
+	function customer() {
+		$data['page_title'] = 'Customer Summary Report';
+		$data['search_flag'] = true;
+		$session_info = $this->session->userdata('customersummary_reports_search');
+		$accountinfo = $this->session->userdata('accountinfo');
+		$reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
+		$accountlist = $this->db_model->build_dropdown_deleted('id,IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'where_arr', array('reseller_id' => $reseller_id, "type" => "GLOBAL"));
+		$data['accountlist'] = $accountlist;
+		$data['session_info'] = $session_info;
+		$data['search_string_type'] = $this->common->search_string_type();
+		$data['search_report'] = $this->common->search_report_in();
+		$new_column_arr = $this->summary_column_arr('customer');
+		$data['grid_fields'] = $this->summary_form->build_customersummary($new_column_arr);
+		$data["grid_buttons"] = $this->summary_form->build_grid_buttons_customersummary();
+		$data['groupby_field'] = $this->common->set_summarycustomer_groupby();
+		$data['groupby_time'] = $this->common->group_by_time();
+		$this->load->view('view_customersummary_report', $data);
+	}
 
-    function customer_json() {
-        $search_arr = $this->summary_search_info('customer');
-        $count_all = $this->summary_model->get_customersummary_report_list(false, 0, 0, $search_arr['group_by_str'], $search_arr['select_str'],$search_arr['order_str'],false);
-        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
-        $query = $this->summary_model->get_customersummary_report_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], $search_arr['group_by_str'], $search_arr['select_str'],$search_arr['order_str'], false);
-        if ($query->num_rows() > 0) {
-            $json_data['rows'] = $this->summary_report_grid($search_arr, $query, 'customer', 'grid');
-        }
-        $this->session->set_userdata('customersummary_reports_export', $search_arr);
-        echo json_encode($json_data);
-    }
+	function customer_json() {
+		$search_arr = $this->summary_search_info('customer');
+		$count_all = $this->summary_model->get_customersummary_report_list(false, 0, 0, $search_arr['group_by_str'], $search_arr['select_str'],$search_arr['order_str'],false);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
+		$query = $this->summary_model->get_customersummary_report_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], $search_arr['group_by_str'], $search_arr['select_str'],$search_arr['order_str'], false);
+		if ($query->num_rows() > 0) {
+			$json_data['rows'] = $this->summary_report_grid($search_arr, $query, 'customer', 'grid');
+		}
+		$this->session->set_userdata('customersummary_reports_export', $search_arr);
+		echo json_encode($json_data);
+	}
 
-    function summary_column_arr($entity) {
-        $new_column_arr = array();
-        $total_width = '322';
-        $column_name = 'accountid';
-        if ($this->session->userdata('advance_search') == '1') {
-            $search_array = $this->session->userdata($entity . 'summary_reports_search');
-            if(isset($search_array['time']) && !empty($search_array['time'])){
-                   $new_column_arr[]=array(ucfirst(strtolower($search_array['time'])), "58", $search_array['time']."(callstart)", "", "", "");
-            }
-            if (isset($search_array['groupby_1']) && !empty($search_array['groupby_1'])) {
-                $first_column_groupby = $search_array['groupby_1'];
+	function summary_column_arr($entity) {
+		$new_column_arr = array();
+		$total_width = '322';
+		$column_name = 'accountid';
+		if ($this->session->userdata('advance_search') == '1') {
+			$search_array = $this->session->userdata($entity . 'summary_reports_search');
+			if(isset($search_array['time']) && !empty($search_array['time'])){
+				   $new_column_arr[]=array(ucfirst(strtolower($search_array['time'])), "58", $search_array['time']."(callstart)", "", "", "");
+			}
+			if (isset($search_array['groupby_1']) && !empty($search_array['groupby_1'])) {
+				$first_column_groupby = $search_array['groupby_1'];
 
-                if ($first_column_groupby == 'accountid') {
-                    $new_column_arr[] = array("Account", "105",'accountid', "first_name,last_name,number", "accounts", "build_concat_string");
-                } elseif ($first_column_groupby == 'pattern') {
-                    $new_column_arr[] = array("Code", "45", "pattern", "pattern", "", "get_only_numeric_val");
-                    $new_column_arr[] = array("Destination", "59", "notes", "", "", "");
-                } elseif($first_column_groupby =='package_id'){
-		    $new_column_arr[] = array("Package", "105",'package_id', "package_name", "packages", "get_field_name");
-                }
-            }
-            if (isset($search_array['groupby_2']) && !empty($search_array['groupby_2'])) {
-                $third_column_groupby = $search_array['groupby_2'];
-                if ($third_column_groupby == 'accountid') {
-                    $new_column_arr[] = array("Account", "105", 'accountid', "first_name,last_name,number", "accounts", "build_concat_string");
-                } elseif ($third_column_groupby == 'pattern') {
-                    $new_column_arr[] = array("Code", "45", "pattern", "pattern", "", "get_only_numeric_val");
-                    $new_column_arr[] = array("Destination", "59", "notes", "", "", "");
-                } elseif($third_column_groupby	 =='package_id'){
-		    $new_column_arr[] = array("Package", "105",'package_id', "package_name", "packages", "get_field_name");
-                }
-            }
-            if (isset($search_array['groupby_3']) && !empty($search_array['groupby_3'])) {
-                $fifth_column_groupby = $search_array['groupby_3'];
-                if ($fifth_column_groupby == 'accountid') {
-                    $new_column_arr[] = array("Account", "105", 'accountid', "first_name,last_name,number", "accounts", "build_concat_string");
-                } elseif ($fifth_column_groupby == 'pattern') {
-                    $new_column_arr[] = array("Code", "45", "pattern", "pattern", "", "get_only_numeric_val");
-                    $new_column_arr[] = array("Destination", "59", "notes", "", "", "");
-                } elseif($fifth_column_groupby	 =='package_id'){
-		    $new_column_arr[] = array("Package", "105",'package_id', "package_name", "packages", "get_field_name");
-                }
-            }
-            if (empty($new_column_arr)) {
-                $new_column_arr[] = array("Account", '322', 'accountid', "first_name,last_name,number", "accounts", "build_concat_string");
-            }
-        } else {
-            $new_column_arr[] = array("Account", '322', 'accountid', "first_name,last_name,number", "accounts", "build_concat_string");
-        }
+				if ($first_column_groupby == 'accountid') {
+					$new_column_arr[] = array("Account", "105",'accountid', "first_name,last_name,number", "accounts", "build_concat_string");
+				} elseif ($first_column_groupby == 'pattern') {
+					$new_column_arr[] = array("Code", "45", "pattern", "pattern", "", "get_only_numeric_val");
+					$new_column_arr[] = array("Destination", "59", "notes", "", "", "");
+				} elseif($first_column_groupby =='package_id'){
+			$new_column_arr[] = array("Package", "105",'package_id', "package_name", "packages", "get_field_name");
+				}
+			}
+			if (isset($search_array['groupby_2']) && !empty($search_array['groupby_2'])) {
+				$third_column_groupby = $search_array['groupby_2'];
+				if ($third_column_groupby == 'accountid') {
+					$new_column_arr[] = array("Account", "105", 'accountid', "first_name,last_name,number", "accounts", "build_concat_string");
+				} elseif ($third_column_groupby == 'pattern') {
+					$new_column_arr[] = array("Code", "45", "pattern", "pattern", "", "get_only_numeric_val");
+					$new_column_arr[] = array("Destination", "59", "notes", "", "", "");
+				} elseif($third_column_groupby	 =='package_id'){
+			$new_column_arr[] = array("Package", "105",'package_id', "package_name", "packages", "get_field_name");
+				}
+			}
+			if (isset($search_array['groupby_3']) && !empty($search_array['groupby_3'])) {
+				$fifth_column_groupby = $search_array['groupby_3'];
+				if ($fifth_column_groupby == 'accountid') {
+					$new_column_arr[] = array("Account", "105", 'accountid', "first_name,last_name,number", "accounts", "build_concat_string");
+				} elseif ($fifth_column_groupby == 'pattern') {
+					$new_column_arr[] = array("Code", "45", "pattern", "pattern", "", "get_only_numeric_val");
+					$new_column_arr[] = array("Destination", "59", "notes", "", "", "");
+				} elseif($fifth_column_groupby	 =='package_id'){
+			$new_column_arr[] = array("Package", "105",'package_id', "package_name", "packages", "get_field_name");
+				}
+			}
+			if (empty($new_column_arr)) {
+				$new_column_arr[] = array("Account", '322', 'accountid', "first_name,last_name,number", "accounts", "build_concat_string");
+			}
+		} else {
+			$new_column_arr[] = array("Account", '322', 'accountid', "first_name,last_name,number", "accounts", "build_concat_string");
+		}
         
-        return $new_column_arr;
-    }
+		return $new_column_arr;
+	}
 
-    function summary_report_grid($search_arr, $query, $entity, $purpose) {
-        $export_arr = array();
-        $db_field_name = $entity == 'provider' ? 'provider_id' : 'accountid';
-        $show_seconds = (!empty($search_arr['search_in'])) ? $search_arr['search_in'] : 'minutes';
-        $currency_info =$this->common->get_currency_info();
-        foreach ($query->result_array() as $row1) {
-            $atmpt = $row1['attempts'];
-            $cmplt = ($row1['completed'] != 0) ? $row1['completed'] : 0;
-            $acd = ($row1['completed'] > 0 ) ? round($row1['billable'] / $row1['completed']) : 0;
-            $mcd = $row1['mcd'];
-            if ($show_seconds == 'minutes') {
-                $avgsec = $acd > 0 ? sprintf('%02d',$acd / 60) . ":" . sprintf('%02d',($acd % 60)) : "00:00";
-                $maxsec = $mcd > 0 ? sprintf('%02d',$mcd / 60) . ":" . sprintf('%02d',($mcd % 60))  : "00:00";
-                $duration = ($row1['duration'] > 0 ) ? sprintf('%02d',$row1['duration'] / 60) . ":" . sprintf('%02d',($row1['duration'] % 60)) : "00:00";
-                $billsec = ($row1['billable'] > 0 ) ? sprintf('%02d',$row1['billable'] / 60) . ":" . sprintf('%02d',($row1['billable'] % 60)) : "00:00";
-            } else {
-                $duration = sprintf('%02d',$row1['duration']);
-                $avgsec = $acd;
-                $maxsec = $mcd;
-                $billsec = sprintf('%02d',$row1['billable']);
-            }
-            if ($entity != 'provider') {
-                $profit = $this->common->calculate_currency_manually($currency_info,$row1['debit'] - $row1['cost'],false);
-                $debit  = $this->common->calculate_currency_manually($currency_info,$row1['debit'],false);
-            }
-            $cost  = $this->common->calculate_currency_manually($currency_info,$row1['cost'],false);
-            $asr = ($atmpt > 0 ) ? (round(($cmplt / $atmpt) * 100,2)) : '0.00' ;
-            $new_arr = array();
-            if ($this->session->userdata('advance_search') == 1) {
-                if (!empty($search_arr['groupby_time'])) {
-                       $time =$row1[$search_arr['groupby_time']];
-                       if($search_arr['groupby_time']== "HOUR"|| $search_arr['groupby_time']== "DAY"){
+	function summary_report_grid($search_arr, $query, $entity, $purpose) {
+		$export_arr = array();
+		$db_field_name = $entity == 'provider' ? 'provider_id' : 'accountid';
+		$show_seconds = (!empty($search_arr['search_in'])) ? $search_arr['search_in'] : 'minutes';
+		$currency_info =$this->common->get_currency_info();
+		foreach ($query->result_array() as $row1) {
+			$atmpt = $row1['attempts'];
+			$cmplt = ($row1['completed'] != 0) ? $row1['completed'] : 0;
+			$acd = ($row1['completed'] > 0 ) ? round($row1['billable'] / $row1['completed']) : 0;
+			$mcd = $row1['mcd'];
+			if ($show_seconds == 'minutes') {
+				$avgsec = $acd > 0 ? sprintf('%02d',$acd / 60) . ":" . sprintf('%02d',($acd % 60)) : "00:00";
+				$maxsec = $mcd > 0 ? sprintf('%02d',$mcd / 60) . ":" . sprintf('%02d',($mcd % 60))  : "00:00";
+				$duration = ($row1['duration'] > 0 ) ? sprintf('%02d',$row1['duration'] / 60) . ":" . sprintf('%02d',($row1['duration'] % 60)) : "00:00";
+				$billsec = ($row1['billable'] > 0 ) ? sprintf('%02d',$row1['billable'] / 60) . ":" . sprintf('%02d',($row1['billable'] % 60)) : "00:00";
+			} else {
+				$duration = sprintf('%02d',$row1['duration']);
+				$avgsec = $acd;
+				$maxsec = $mcd;
+				$billsec = sprintf('%02d',$row1['billable']);
+			}
+			if ($entity != 'provider') {
+				$profit = $this->common->calculate_currency_manually($currency_info,$row1['debit'] - $row1['cost'],false);
+				$debit  = $this->common->calculate_currency_manually($currency_info,$row1['debit'],false);
+			}
+			$cost  = $this->common->calculate_currency_manually($currency_info,$row1['cost'],false);
+			$asr = ($atmpt > 0 ) ? (round(($cmplt / $atmpt) * 100,2)) : '0.00' ;
+			$new_arr = array();
+			if ($this->session->userdata('advance_search') == 1) {
+				if (!empty($search_arr['groupby_time'])) {
+					   $time =$row1[$search_arr['groupby_time']];
+					   if($search_arr['groupby_time']== "HOUR"|| $search_arr['groupby_time']== "DAY"){
 			  $time=sprintf('%02d',$time);
-                       }
-                       if($search_arr['groupby_time']== "MONTH"){
+					   }
+					   if($search_arr['groupby_time']== "MONTH"){
 			  $dateObj   = DateTime::createFromFormat('!m',$time);
 			  $time= $dateObj->format('F');
-                       }
-                    $new_arr[] = $time;
-                }
-                if ($search_arr['groupby_1'] == $db_field_name) {
-                    $new_arr[] = $this->common->build_concat_string("first_name,last_name,number", "accounts", $row1[$db_field_name]);
-                } elseif ($search_arr['groupby_1'] == 'pattern') {
-                    $new_arr[] = filter_var($row1['pattern'], FILTER_SANITIZE_NUMBER_INT);
-                    $new_arr[] = $row1['notes'];
-                } elseif ($search_arr['groupby_1'] == 'trunk_id') {
-                    $new_arr[] = $this->common->get_field_name('name', 'trunks', $row1['trunk_id']);
-                } elseif($search_arr['groupby_1'] == 'package_id'){
-		    $new_arr[] = $this->common->get_field_name('package_name', 'packages', $row1['package_id']);
-                }
+					   }
+					$new_arr[] = $time;
+				}
+				if ($search_arr['groupby_1'] == $db_field_name) {
+					$new_arr[] = $this->common->build_concat_string("first_name,last_name,number", "accounts", $row1[$db_field_name]);
+				} elseif ($search_arr['groupby_1'] == 'pattern') {
+					$new_arr[] = filter_var($row1['pattern'], FILTER_SANITIZE_NUMBER_INT);
+					$new_arr[] = $row1['notes'];
+				} elseif ($search_arr['groupby_1'] == 'trunk_id') {
+					$new_arr[] = $this->common->get_field_name('name', 'trunks', $row1['trunk_id']);
+				} elseif($search_arr['groupby_1'] == 'package_id'){
+			$new_arr[] = $this->common->get_field_name('package_name', 'packages', $row1['package_id']);
+				}
                 
-                if ($search_arr['groupby_2'] == $db_field_name) {
-                    $new_arr[] = $this->common->build_concat_string("first_name,last_name,number", "accounts", $row1[$db_field_name]);
-                } elseif ($search_arr['groupby_2'] == 'pattern') {
-                    $new_arr[] = filter_var($row1['pattern'], FILTER_SANITIZE_NUMBER_INT);
-                    $new_arr[] = $row1['notes'];
-                } elseif ($search_arr['groupby_2'] == 'trunk_id') {
-                    $new_arr[] = $this->common->get_field_name('name', 'trunks', $row1['trunk_id']);
-                } elseif($search_arr['groupby_2'] == 'package_id'){
-		    $new_arr[] = $this->common->get_field_name('package_name', 'packages', $row1['package_id']);
-                }
+				if ($search_arr['groupby_2'] == $db_field_name) {
+					$new_arr[] = $this->common->build_concat_string("first_name,last_name,number", "accounts", $row1[$db_field_name]);
+				} elseif ($search_arr['groupby_2'] == 'pattern') {
+					$new_arr[] = filter_var($row1['pattern'], FILTER_SANITIZE_NUMBER_INT);
+					$new_arr[] = $row1['notes'];
+				} elseif ($search_arr['groupby_2'] == 'trunk_id') {
+					$new_arr[] = $this->common->get_field_name('name', 'trunks', $row1['trunk_id']);
+				} elseif($search_arr['groupby_2'] == 'package_id'){
+			$new_arr[] = $this->common->get_field_name('package_name', 'packages', $row1['package_id']);
+				}
                 
-                if ($search_arr['groupby_3'] == $db_field_name) {
-                    $new_arr[] = $this->common->build_concat_string("first_name,last_name,number", "accounts", $row1[$db_field_name]);
-                } elseif ($search_arr['groupby_3'] == 'pattern') {
-                    $new_arr[] = filter_var($row1['pattern'], FILTER_SANITIZE_NUMBER_INT);
-                    $new_arr[] = $row1['notes'];
-                } elseif ($search_arr['groupby_3'] == 'trunk_id') {
-                    $new_arr[] = $this->common->get_field_name('name', 'trunks', $row1['trunk_id']);
-                }  elseif($search_arr['groupby_3'] == 'package_id'){
-		    $new_arr[] = $this->common->get_field_name('package_name', 'packages', $row1['package_id']);
-                }
-                if (empty($new_arr)) {
-                    $new_arr[] = $this->common->build_concat_string("first_name,last_name,number", "accounts", $row1[$db_field_name]);
-                }
-            } else {
-                $new_arr[] = $this->common->build_concat_string("first_name,last_name,number", "accounts", $row1[$db_field_name]);
-            }
-            if ($entity != 'provider') {
-                $custom_array = array(
-                    $atmpt,
-                    $cmplt,
-                    $duration,
-                    round($asr, 2),
-                    $avgsec,
-                    $maxsec,
-                    $billsec,
-                    $debit,
-                    $cost,
-                    $profit);
-            } else {
-                $custom_array = array(
-                    $atmpt,
-                    $cmplt,
-                    $duration,
-                    round($asr, 2),
-                    $avgsec,
-                    $maxsec,
-                    $billsec,
-                    $cost
-                );
-            }
-            $final_array = array_merge($new_arr, $custom_array);
-            $json_data[] = array('cell' => $final_array);
-            $export_arr[] = $final_array;
-        }
-        $function_name = 'get_' . $entity . 'summary_report_list';
-        $total_info = $this->summary_model->$function_name(true, '', '', '', $search_arr['select_str'],  $search_arr['order_str'],true);
-        $total_info = $total_info->result_array();
-        $total_info = $total_info[0];
-        $total_asr = ($total_info['attempts'] > 0 ) ? round(($total_info['completed'] / $total_info['attempts']) * 100, 2) : 0;
-        $total_acd = ($total_info['completed']> 0 ) ?round($total_info['billable'] / $total_info['completed']) : 0 ;
-        if ($show_seconds == 'minutes') {
-            $total_info['duration'] = $total_info['duration'] > 0 ? sprintf('%02d',$total_info['duration'] / 60) . ":" . sprintf('%02d',($total_info['duration'] % 60)) : "00:00";
-            $total_info['billable'] = $total_info['billable'] > 0 ? sprintf('%02d',$total_info['billable'] / 60) . ":" . sprintf('%02d',($total_info['billable'] % 60)) : "00:00";
-            $total_acd = $total_acd > 0 ? sprintf('%02d',$total_acd / 60) . ":" .  sprintf('%02d',($total_acd % 60)) : "00:00";
-            $total_info['mcd'] = $total_info['mcd'] > 0 ? sprintf('%02d',$total_info['mcd'] / 60) . ":" .  sprintf('%02d',($total_info['mcd'] % 60)) : "00:00";
-        }
-        if ($entity != 'provider') {
-            $total_profit =   $this->common->calculate_currency_manually($currency_info,$total_info['debit'] - $total_info['cost'],false);
-            $total_debit =   $this->common->calculate_currency_manually($currency_info,$total_info['debit'],false);
-        }
-        $total_cost =   $this->common->calculate_currency_manually($currency_info,$total_info['cost'],false);
-        if ($entity != 'provider') {
-            $last_array = array(
-                "<b>".$total_info['attempts']."</b>",
-                "<b>".$total_info['completed']."</b>",
-                "<b>".$total_info['duration']."</b>",
-                "<b>".$total_asr."</b>",
+				if ($search_arr['groupby_3'] == $db_field_name) {
+					$new_arr[] = $this->common->build_concat_string("first_name,last_name,number", "accounts", $row1[$db_field_name]);
+				} elseif ($search_arr['groupby_3'] == 'pattern') {
+					$new_arr[] = filter_var($row1['pattern'], FILTER_SANITIZE_NUMBER_INT);
+					$new_arr[] = $row1['notes'];
+				} elseif ($search_arr['groupby_3'] == 'trunk_id') {
+					$new_arr[] = $this->common->get_field_name('name', 'trunks', $row1['trunk_id']);
+				}  elseif($search_arr['groupby_3'] == 'package_id'){
+			$new_arr[] = $this->common->get_field_name('package_name', 'packages', $row1['package_id']);
+				}
+				if (empty($new_arr)) {
+					$new_arr[] = $this->common->build_concat_string("first_name,last_name,number", "accounts", $row1[$db_field_name]);
+				}
+			} else {
+				$new_arr[] = $this->common->build_concat_string("first_name,last_name,number", "accounts", $row1[$db_field_name]);
+			}
+			if ($entity != 'provider') {
+				$custom_array = array(
+					$atmpt,
+					$cmplt,
+					$duration,
+					round($asr, 2),
+					$avgsec,
+					$maxsec,
+					$billsec,
+					$debit,
+					$cost,
+					$profit);
+			} else {
+				$custom_array = array(
+					$atmpt,
+					$cmplt,
+					$duration,
+					round($asr, 2),
+					$avgsec,
+					$maxsec,
+					$billsec,
+					$cost
+				);
+			}
+			$final_array = array_merge($new_arr, $custom_array);
+			$json_data[] = array('cell' => $final_array);
+			$export_arr[] = $final_array;
+		}
+		$function_name = 'get_' . $entity . 'summary_report_list';
+		$total_info = $this->summary_model->$function_name(true, '', '', '', $search_arr['select_str'],  $search_arr['order_str'],true);
+		$total_info = $total_info->result_array();
+		$total_info = $total_info[0];
+		$total_asr = ($total_info['attempts'] > 0 ) ? round(($total_info['completed'] / $total_info['attempts']) * 100, 2) : 0;
+		$total_acd = ($total_info['completed']> 0 ) ?round($total_info['billable'] / $total_info['completed']) : 0 ;
+		if ($show_seconds == 'minutes') {
+			$total_info['duration'] = $total_info['duration'] > 0 ? sprintf('%02d',$total_info['duration'] / 60) . ":" . sprintf('%02d',($total_info['duration'] % 60)) : "00:00";
+			$total_info['billable'] = $total_info['billable'] > 0 ? sprintf('%02d',$total_info['billable'] / 60) . ":" . sprintf('%02d',($total_info['billable'] % 60)) : "00:00";
+			$total_acd = $total_acd > 0 ? sprintf('%02d',$total_acd / 60) . ":" .  sprintf('%02d',($total_acd % 60)) : "00:00";
+			$total_info['mcd'] = $total_info['mcd'] > 0 ? sprintf('%02d',$total_info['mcd'] / 60) . ":" .  sprintf('%02d',($total_info['mcd'] % 60)) : "00:00";
+		}
+		if ($entity != 'provider') {
+			$total_profit =   $this->common->calculate_currency_manually($currency_info,$total_info['debit'] - $total_info['cost'],false);
+			$total_debit =   $this->common->calculate_currency_manually($currency_info,$total_info['debit'],false);
+		}
+		$total_cost =   $this->common->calculate_currency_manually($currency_info,$total_info['cost'],false);
+		if ($entity != 'provider') {
+			$last_array = array(
+				"<b>".$total_info['attempts']."</b>",
+				"<b>".$total_info['completed']."</b>",
+				"<b>".$total_info['duration']."</b>",
+				"<b>".$total_asr."</b>",
 		"<b>".$total_acd."</b>",
 		"<b>".$total_info['mcd']."</b>",
 		"<b>".$total_info['billable']."</b>",
 		"<b>".$total_debit."</b>",
 		"<b>".$total_cost."</b>",
 		"<b>".$total_profit."</b>"
-            );
-        } else {
-            $last_array = array(
-                 "<b>".$total_info['attempts']."</b>",
-                 "<b>".$total_info['completed']."</b>",
-                 "<b>".$total_info['duration']."</b>",
-                 "<b>".$total_asr."</b>",
-                 "<b>".$total_acd."</b>",
-                 "<b>".$total_info['mcd']."</b>",
-                 "<b>".$total_info['billable']."</b>",
-                 "<b>".$total_cost."</b>",
-            );
-        }
-        if ($purpose == 'export') {
-            $search_arr['custom_total_array'][0] = "Grand Total";
-        }
-        $new_export_array=array();
-        foreach($last_array as $key=>$value){
+			);
+		} else {
+			$last_array = array(
+				 "<b>".$total_info['attempts']."</b>",
+				 "<b>".$total_info['completed']."</b>",
+				 "<b>".$total_info['duration']."</b>",
+				 "<b>".$total_asr."</b>",
+				 "<b>".$total_acd."</b>",
+				 "<b>".$total_info['mcd']."</b>",
+				 "<b>".$total_info['billable']."</b>",
+				 "<b>".$total_cost."</b>",
+			);
+		}
+		if ($purpose == 'export') {
+			$search_arr['custom_total_array'][0] = "Grand Total";
+		}
+		$new_export_array=array();
+		foreach($last_array as $key=>$value){
 	  $value=str_replace("<b>","",$value);
 	  $value=str_replace("</b>",'',$value);
 	  if($key == 7 || $key ==8 || $key ==9){
-	      $value = sprintf("%.".$currency_info['decimalpoints']."f",floatval(preg_replace('/[^\d.]/', '', $value)));
+		  $value = sprintf("%.".$currency_info['decimalpoints']."f",floatval(preg_replace('/[^\d.]/', '', $value)));
 	  }
 	  $new_export_array[$key]=$value;
-        }
-        $total_array = array_merge($search_arr['custom_total_array'], $last_array);
-        $custom_export_arr =array_merge($search_arr['custom_total_array'],$new_export_array);
-        $export_arr[] = $custom_export_arr;
-        $json_data[] = array('cell' => $total_array);
-        return $purpose == 'grid' ? $json_data : $export_arr;
-    }
+		}
+		$total_array = array_merge($search_arr['custom_total_array'], $last_array);
+		$custom_export_arr =array_merge($search_arr['custom_total_array'],$new_export_array);
+		$export_arr[] = $custom_export_arr;
+		$json_data[] = array('cell' => $total_array);
+		return $purpose == 'grid' ? $json_data : $export_arr;
+	}
 
-    function customer_export_csv() {
+	function customer_export_csv() {
 		$account_info = $accountinfo = $this->session->userdata('accountinfo');
 		$currency_id=$account_info['currency_id'];
 		$currency=$this->common->get_field_name('currency', 'currency', $currency_id);
-        $search_arr = $this->session->userdata('customersummary_reports_export');
-        $data_arr = array();
-        $query = $this->summary_model->get_customersummary_report_list(true, '', '', $search_arr['group_by_str'], $search_arr['select_str'],$search_arr['order_str'], true);
-        $search_header = explode(",", $search_arr['export_str']);
-        ob_clean();
-        $fixed_header = array('Attempted Calls','Completed Calls','Duration', 'ASR', 'ACD','MCD','Billable', 'Debit('.$currency.')','Cost('.$currency.')','Profit');
-        $header_arr[] = array_merge($search_header, $fixed_header);
-        if ($query->num_rows() > 0) {
-            $data_arr = $this->summary_report_grid($search_arr, $query, 'customer', 'export');
-        } 
-        $customer_array = array_merge($header_arr, $data_arr);
+		$search_arr = $this->session->userdata('customersummary_reports_export');
+		$data_arr = array();
+		$query = $this->summary_model->get_customersummary_report_list(true, '', '', $search_arr['group_by_str'], $search_arr['select_str'],$search_arr['order_str'], true);
+		$search_header = explode(",", $search_arr['export_str']);
+		ob_clean();
+		$fixed_header = array('Attempted Calls','Completed Calls','Duration', 'ASR', 'ACD','MCD','Billable', 'Debit('.$currency.')','Cost('.$currency.')','Profit');
+		$header_arr[] = array_merge($search_header, $fixed_header);
+		if ($query->num_rows() > 0) {
+			$data_arr = $this->summary_report_grid($search_arr, $query, 'customer', 'export');
+		} 
+		$customer_array = array_merge($header_arr, $data_arr);
 
-        $this->load->helper('csv');
-        array_to_csv($customer_array, 'Customer_Summary_Report_' . date("Y-m-d") . '.csv');
-    }
+		$this->load->helper('csv');
+		array_to_csv($customer_array, 'Customer_Summary_Report_' . date("Y-m-d") . '.csv');
+	}
 
-    function customer_search() {
-        if ($this->input->post('advance_search', TRUE) == 1) {
-            $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
-            unset($_POST['action']);
-            unset($_POST['advance_search']);
-            $this->session->set_userdata('customersummary_reports_search', $this->input->post());
-        }
-        redirect(base_url() . 'summary/customer/');
-    }
+	function customer_search() {
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			unset($_POST['action']);
+			unset($_POST['advance_search']);
+			$this->session->set_userdata('customersummary_reports_search', $this->input->post());
+		}
+		redirect(base_url() . 'summary/customer/');
+	}
 
-    function customer_clearsearchfilter() {
-        $this->session->set_userdata('advance_search', 0);
-        $this->session->set_userdata('customersummary_reports_search', "");
-        $this->session->set_userdata('customersummary_reports_export', "");
-        redirect(base_url() . 'summary/customer/');
-    }
+	function customer_clearsearchfilter() {
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('customersummary_reports_search', "");
+		$this->session->set_userdata('customersummary_reports_export', "");
+		redirect(base_url() . 'summary/customer/');
+	}
 
-    function summary_search_info($entity) {
-        $group_by_str = null;
-        $select_str = null;
-        $group_by_time=null;
-        $group_by_1 = null;
-        $group_by_2 = null;
-        $group_by_3 = null;
-        $order_str=null;
-        $custom_total_array = array();
-        $custom_search = array();
-        $export_select_str = null;
-        $new_arr['search_in'] = 'minutes';
-        $i = 0;
-        $db_field_name = $entity == 'provider' ? 'provider_id' : 'accountid';
-        if ($this->session->userdata('advance_search') == 1) {
-            $custom_search = $this->session->userdata($entity . 'summary_reports_search');
-            if (isset($custom_search['time']) && !empty($custom_search['time'])) {
-                $group_by_str.=$custom_search['time'] . "(callstart),";
-                $select_str.=$custom_search['time'] . "(callstart) as ".$custom_search['time'].",";
-                $order_str.=$custom_search['time'].",";
-                $group_by_time = $custom_search['time'];
-                $export_select_str.=$custom_search['time'].",";
-                $custom_total_array[$i] = null;
-                $i++;
-            }
-            if (isset($custom_search['groupby_1']) && !empty($custom_search['groupby_1'])) {
-                $group_by_str.=$custom_search['groupby_1'] . ",";
-                $select_str.=$custom_search['groupby_1'] . ",";
-                $order_str.=$custom_search['groupby_1'] . ",";
-                $group_by_1 = $custom_search['groupby_1'];
-                if ($custom_search['groupby_1'] == $db_field_name) {
-                    $export_select_str.='Account,';
-                } elseif ($custom_search['groupby_1'] == 'trunk_id') {
-                    $export_select_str.='Trunk,';
-                } elseif ($custom_search['groupby_1'] == 'pattern') {
-                    $select_str.='notes,';
-                    $order_str.='notes,';
-                    $export_select_str.="Code,Destination,";
-                    $custom_total_array[$i] = null;
-                    $i++;
-                } elseif($custom_search['groupby_1'] =='package_id'){
-		    $export_select_str.='Package,';
-                }
-                $custom_total_array[$i] = null;
-                $i++;
-            }
+	function summary_search_info($entity) {
+		$group_by_str = null;
+		$select_str = null;
+		$group_by_time=null;
+		$group_by_1 = null;
+		$group_by_2 = null;
+		$group_by_3 = null;
+		$order_str=null;
+		$custom_total_array = array();
+		$custom_search = array();
+		$export_select_str = null;
+		$new_arr['search_in'] = 'minutes';
+		$i = 0;
+		$db_field_name = $entity == 'provider' ? 'provider_id' : 'accountid';
+		if ($this->session->userdata('advance_search') == 1) {
+			$custom_search = $this->session->userdata($entity . 'summary_reports_search');
+			if (isset($custom_search['time']) && !empty($custom_search['time'])) {
+				$group_by_str.=$custom_search['time'] . "(callstart),";
+				$select_str.=$custom_search['time'] . "(callstart) as ".$custom_search['time'].",";
+				$order_str.=$custom_search['time'].",";
+				$group_by_time = $custom_search['time'];
+				$export_select_str.=$custom_search['time'].",";
+				$custom_total_array[$i] = null;
+				$i++;
+			}
+			if (isset($custom_search['groupby_1']) && !empty($custom_search['groupby_1'])) {
+				$group_by_str.=$custom_search['groupby_1'] . ",";
+				$select_str.=$custom_search['groupby_1'] . ",";
+				$order_str.=$custom_search['groupby_1'] . ",";
+				$group_by_1 = $custom_search['groupby_1'];
+				if ($custom_search['groupby_1'] == $db_field_name) {
+					$export_select_str.='Account,';
+				} elseif ($custom_search['groupby_1'] == 'trunk_id') {
+					$export_select_str.='Trunk,';
+				} elseif ($custom_search['groupby_1'] == 'pattern') {
+					$select_str.='notes,';
+					$order_str.='notes,';
+					$export_select_str.="Code,Destination,";
+					$custom_total_array[$i] = null;
+					$i++;
+				} elseif($custom_search['groupby_1'] =='package_id'){
+			$export_select_str.='Package,';
+				}
+				$custom_total_array[$i] = null;
+				$i++;
+			}
             
-            if (isset($custom_search['groupby_2']) && !empty($custom_search['groupby_2'])) {
-                $group_by_str.=$custom_search['groupby_2'] . ",";
-                $select_str.=$custom_search['groupby_2'] . ",";
-                $order_str.=$custom_search['groupby_2'] . ",";
-                $group_by_2 = $custom_search['groupby_2'];
-                if ($custom_search['groupby_2'] == $db_field_name) {
-                    $export_select_str.='Account,';
-                } elseif ($custom_search['groupby_2'] == 'trunk_id') {
-                    $export_select_str.='Trunk,';
-                } elseif ($custom_search['groupby_2'] == 'pattern') {
-                    $select_str.='notes,';
-                    $order_str.='notes,';
-                    $export_select_str.="Code,Destination,";
-                    $custom_total_array[$i] = null;
-                    $i++;
-                } elseif($custom_search['groupby_2'] =='package_id'){
-		    $export_select_str.='Package,';
-                }
-                $custom_total_array[$i] = null;
-                $i++;
-            }
+			if (isset($custom_search['groupby_2']) && !empty($custom_search['groupby_2'])) {
+				$group_by_str.=$custom_search['groupby_2'] . ",";
+				$select_str.=$custom_search['groupby_2'] . ",";
+				$order_str.=$custom_search['groupby_2'] . ",";
+				$group_by_2 = $custom_search['groupby_2'];
+				if ($custom_search['groupby_2'] == $db_field_name) {
+					$export_select_str.='Account,';
+				} elseif ($custom_search['groupby_2'] == 'trunk_id') {
+					$export_select_str.='Trunk,';
+				} elseif ($custom_search['groupby_2'] == 'pattern') {
+					$select_str.='notes,';
+					$order_str.='notes,';
+					$export_select_str.="Code,Destination,";
+					$custom_total_array[$i] = null;
+					$i++;
+				} elseif($custom_search['groupby_2'] =='package_id'){
+			$export_select_str.='Package,';
+				}
+				$custom_total_array[$i] = null;
+				$i++;
+			}
 
-            if (isset($custom_search['groupby_3']) && !empty($custom_search['groupby_3'])) {
-                $group_by_str.=$custom_search['groupby_3'] . ",";
-                $select_str.=$custom_search['groupby_3'] . ",";
-                $order_str.=$custom_search['groupby_3'] . ",";
-                $group_by_3 = $custom_search['groupby_3'];
-                if ($custom_search['groupby_3'] == 'accountid' || $custom_search['groupby_3'] == 'provider_id') {
-                    $export_select_str.='Account,';
-                } elseif ($custom_search['groupby_3'] == 'trunk_id') {
-                    $export_select_str.='Trunk,';
-                } elseif ($custom_search['groupby_3'] == 'pattern') {
-                    $select_str.='notes,';
-                    $order_str.='notes,';
-                    $export_select_str.="Code,Destination,";
-                    $custom_total_array[$i] = null;
-                    $i++;
-                } elseif($custom_search['groupby_3'] =='package_id'){
-		    $export_select_str.='Package,';
-                }
-                $custom_total_array[$i] = null;
-                $i++;
-            }
-            $new_arr['search_in'] = (isset($custom_search['search_in']) && !empty($custom_search['search_in'])) ? $custom_search['search_in'] : 'minutes';
-            unset($custom_search['groupby_1'], $custom_search['groupby_2'], $custom_search['groupby_3'], $custom_search['search_in']);
-            $this->session->set_userdata('summary_' . $entity . '_search', $custom_search);
-        }
-        if (!empty($group_by_str)) {
-            $group_by_str = rtrim($group_by_str, ",");
-            $select_str = rtrim($select_str, ",");
-            $order_str = rtrim($order_str, ",");
-            $export_select_str = rtrim($export_select_str, ",");
-        } else {
-            $select_str = $db_field_name;
-            $order_str = $db_field_name;
-            $group_by_str = $db_field_name;
-            $export_select_str = "Account";
-        }
+			if (isset($custom_search['groupby_3']) && !empty($custom_search['groupby_3'])) {
+				$group_by_str.=$custom_search['groupby_3'] . ",";
+				$select_str.=$custom_search['groupby_3'] . ",";
+				$order_str.=$custom_search['groupby_3'] . ",";
+				$group_by_3 = $custom_search['groupby_3'];
+				if ($custom_search['groupby_3'] == 'accountid' || $custom_search['groupby_3'] == 'provider_id') {
+					$export_select_str.='Account,';
+				} elseif ($custom_search['groupby_3'] == 'trunk_id') {
+					$export_select_str.='Trunk,';
+				} elseif ($custom_search['groupby_3'] == 'pattern') {
+					$select_str.='notes,';
+					$order_str.='notes,';
+					$export_select_str.="Code,Destination,";
+					$custom_total_array[$i] = null;
+					$i++;
+				} elseif($custom_search['groupby_3'] =='package_id'){
+			$export_select_str.='Package,';
+				}
+				$custom_total_array[$i] = null;
+				$i++;
+			}
+			$new_arr['search_in'] = (isset($custom_search['search_in']) && !empty($custom_search['search_in'])) ? $custom_search['search_in'] : 'minutes';
+			unset($custom_search['groupby_1'], $custom_search['groupby_2'], $custom_search['groupby_3'], $custom_search['search_in']);
+			$this->session->set_userdata('summary_' . $entity . '_search', $custom_search);
+		}
+		if (!empty($group_by_str)) {
+			$group_by_str = rtrim($group_by_str, ",");
+			$select_str = rtrim($select_str, ",");
+			$order_str = rtrim($order_str, ",");
+			$export_select_str = rtrim($export_select_str, ",");
+		} else {
+			$select_str = $db_field_name;
+			$order_str = $db_field_name;
+			$group_by_str = $db_field_name;
+			$export_select_str = "Account";
+		}
 
-        array_pop($custom_total_array);
-        array_unshift($custom_total_array, '<b>Grand Total</b>');
-        $new_arr['export_str'] = $export_select_str;
-        $new_arr['select_str'] = $select_str;
-        $new_arr['order_str'] = $order_str;
-        $new_arr['group_by_str'] = $group_by_str;
-        $new_arr['groupby_1'] = $group_by_1;
-        $new_arr['groupby_2'] = $group_by_2;
-        $new_arr['groupby_3'] = $group_by_3;
-        $new_arr['groupby_time']=$group_by_time;
-        $new_arr['custom_total_array'] = $custom_total_array;
-        return $new_arr;
-    }
+		array_pop($custom_total_array);
+		array_unshift($custom_total_array, '<b>Grand Total</b>');
+		$new_arr['export_str'] = $export_select_str;
+		$new_arr['select_str'] = $select_str;
+		$new_arr['order_str'] = $order_str;
+		$new_arr['group_by_str'] = $group_by_str;
+		$new_arr['groupby_1'] = $group_by_1;
+		$new_arr['groupby_2'] = $group_by_2;
+		$new_arr['groupby_3'] = $group_by_3;
+		$new_arr['groupby_time']=$group_by_time;
+		$new_arr['custom_total_array'] = $custom_total_array;
+		return $new_arr;
+	}
 
-    function provider() {
-        $data['page_title'] = 'Provider Summary Report';
-        $data['search_flag'] = true;
-        $session_info = $this->session->userdata('providersummary_reports_search');
-        $accountlist = $this->db_model->build_dropdown_deleted('id,IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'where_arr', array("type" => "3"));
-        $trunklist = $this->db_model->build_dropdown('id,name', 'trunks', '', array());
-        $data['trunklist'] = $trunklist;
-        $data['accountlist'] = $accountlist;
-        $data['session_info'] = $session_info;
-        $data['seconds'] = $this->session->userdata('provider_seconds');
-        $data['search_report'] = $this->common->search_report_in();
-        $data['grid_fields'] = $this->summary_form->build_providersummary();
-        $data["grid_buttons"] = $this->summary_form->build_grid_buttons_providersummary();
-        $data['search_string_type'] = $this->common->search_string_type();
-        $data['groupby_field'] = $this->common->set_summaryprovider_groupby();
-        $data['groupby_time'] = $this->common->group_by_time();
-        $this->load->view('view_providersummary_report', $data);
-    }
+	function provider() {
+		$data['page_title'] = 'Provider Summary Report';
+		$data['search_flag'] = true;
+		$session_info = $this->session->userdata('providersummary_reports_search');
+		$accountlist = $this->db_model->build_dropdown_deleted('id,IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'where_arr', array("type" => "3"));
+		$trunklist = $this->db_model->build_dropdown('id,name', 'trunks', '', array());
+		$data['trunklist'] = $trunklist;
+		$data['accountlist'] = $accountlist;
+		$data['session_info'] = $session_info;
+		$data['seconds'] = $this->session->userdata('provider_seconds');
+		$data['search_report'] = $this->common->search_report_in();
+		$data['grid_fields'] = $this->summary_form->build_providersummary();
+		$data["grid_buttons"] = $this->summary_form->build_grid_buttons_providersummary();
+		$data['search_string_type'] = $this->common->search_string_type();
+		$data['groupby_field'] = $this->common->set_summaryprovider_groupby();
+		$data['groupby_time'] = $this->common->group_by_time();
+		$this->load->view('view_providersummary_report', $data);
+	}
 
-    function provider_json() {
-        $search_arr = $this->summary_search_info('provider');
-        $count_all = $this->summary_model->get_providersummary_report_list(false,'','', $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'],false);
-        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
-        $query = $this->summary_model->get_providersummary_report_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], $search_arr['group_by_str'], $search_arr['select_str'],$search_arr['order_str'], false);
-        if ($query->num_rows() > 0) {
-            $json_data['rows'] = $this->summary_report_grid($search_arr, $query, 'provider', 'grid');
-        }
-        $this->session->set_userdata('providersummary_reports_export', $search_arr);
-        echo json_encode($json_data);
-    }
+	function provider_json() {
+		$search_arr = $this->summary_search_info('provider');
+		$count_all = $this->summary_model->get_providersummary_report_list(false,'','', $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'],false);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
+		$query = $this->summary_model->get_providersummary_report_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], $search_arr['group_by_str'], $search_arr['select_str'],$search_arr['order_str'], false);
+		if ($query->num_rows() > 0) {
+			$json_data['rows'] = $this->summary_report_grid($search_arr, $query, 'provider', 'grid');
+		}
+		$this->session->set_userdata('providersummary_reports_export', $search_arr);
+		echo json_encode($json_data);
+	}
 
-    function provider_export_csv() {
+	function provider_export_csv() {
 		$account_info = $accountinfo = $this->session->userdata('accountinfo');
 		$currency_id=$account_info['currency_id'];
 		$currency=$this->common->get_field_name('currency', 'currency', $currency_id);
-        $search_arr = $this->session->userdata('providersummary_reports_export');
-        $data_arr = array();
-        $query = $this->summary_model->get_providersummary_report_list(true, '', '', $search_arr['group_by_str'], $search_arr['select_str'],$search_arr['order_str'], true);
-        $search_header = explode(",", $search_arr['export_str']);
-        ob_clean();
-        $fixed_header = array("Attempted Calls", "Completed Calls", "Duration", "ASR", "ACD", "MCD", "Billable", "Cost($currency)");
-        $header_arr[] = array_merge($search_header, $fixed_header);
-        if ($query->num_rows() > 0) {
-            $data_arr = $this->summary_report_grid($search_arr, $query, 'provider', 'export');
-        }
-        $provider_array = array_merge($header_arr, $data_arr);
+		$search_arr = $this->session->userdata('providersummary_reports_export');
+		$data_arr = array();
+		$query = $this->summary_model->get_providersummary_report_list(true, '', '', $search_arr['group_by_str'], $search_arr['select_str'],$search_arr['order_str'], true);
+		$search_header = explode(",", $search_arr['export_str']);
+		ob_clean();
+		$fixed_header = array("Attempted Calls", "Completed Calls", "Duration", "ASR", "ACD", "MCD", "Billable", "Cost($currency)");
+		$header_arr[] = array_merge($search_header, $fixed_header);
+		if ($query->num_rows() > 0) {
+			$data_arr = $this->summary_report_grid($search_arr, $query, 'provider', 'export');
+		}
+		$provider_array = array_merge($header_arr, $data_arr);
 
-        $this->load->helper('csv');
-        array_to_csv($provider_array, 'Provider_Summary_Report_' . date("Y-m-d") . '.csv');
-    }
+		$this->load->helper('csv');
+		array_to_csv($provider_array, 'Provider_Summary_Report_' . date("Y-m-d") . '.csv');
+	}
 
-    function provider_search() {
-        if ($this->input->post('advance_search', TRUE) == 1) {
-            $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
-            unset($_POST['action'], $_POST['advance_search']);
-            $this->session->set_userdata('providersummary_reports_search', $this->input->post());
-        }
-        redirect(base_url() . 'summary/provider/');
-    }
+	function provider_search() {
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			unset($_POST['action'], $_POST['advance_search']);
+			$this->session->set_userdata('providersummary_reports_search', $this->input->post());
+		}
+		redirect(base_url() . 'summary/provider/');
+	}
 
-    function provider_clearsearchfilter() {
-        $this->session->set_userdata('advance_search', 0);
-        $this->session->set_userdata('providersummary_reports_search', "");
-        $this->session->set_userdata('providersummary_reports_export', "");
-        redirect(base_url() . "summary/provider/");
-    }
+	function provider_clearsearchfilter() {
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('providersummary_reports_search', "");
+		$this->session->set_userdata('providersummary_reports_export', "");
+		redirect(base_url() . "summary/provider/");
+	}
 
-    function reseller() {
-        $data['username'] = $this->session->userdata('user_name');
-        $data['page_title'] = 'Reseller Summary Report';
-        $data['search_flag'] = true;
-        $session_info = $this->session->userdata('resellersummary_reports_search');
-        $accountinfo = $this->session->userdata('accountinfo');
-        $reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
-        $accountlist = $this->db_model->build_dropdown_deleted('id,IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'where_arr', array('reseller_id' => $reseller_id, "type" => "1"));
-        $data['accountlist'] = $accountlist;
-        $data['seconds'] = $this->session->userdata('reseller_seconds');
-        $data['session_info'] = $session_info;
-        $data['search_report'] = $this->common->search_report_in();
-        $data['search_string_type'] = $this->common->search_string_type();
-        $new_column_arr = $this->summary_column_arr('reseller');
-        $data['grid_fields'] = $this->summary_form->build_resellersummary($new_column_arr);
-        $data["grid_buttons"] = $this->summary_form->build_grid_buttons_resellersummary();
-        $data['groupby_field'] = $this->common->set_summarycustomer_groupby();
-        $data['groupby_time'] = $this->common->group_by_time();
-        $this->load->view('view_resellersummary_report', $data);
-    }
+	function reseller() {
+		$data['username'] = $this->session->userdata('user_name');
+		$data['page_title'] = 'Reseller Summary Report';
+		$data['search_flag'] = true;
+		$session_info = $this->session->userdata('resellersummary_reports_search');
+		$accountinfo = $this->session->userdata('accountinfo');
+		$reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
+		$accountlist = $this->db_model->build_dropdown_deleted('id,IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'where_arr', array('reseller_id' => $reseller_id, "type" => "1"));
+		$data['accountlist'] = $accountlist;
+		$data['seconds'] = $this->session->userdata('reseller_seconds');
+		$data['session_info'] = $session_info;
+		$data['search_report'] = $this->common->search_report_in();
+		$data['search_string_type'] = $this->common->search_string_type();
+		$new_column_arr = $this->summary_column_arr('reseller');
+		$data['grid_fields'] = $this->summary_form->build_resellersummary($new_column_arr);
+		$data["grid_buttons"] = $this->summary_form->build_grid_buttons_resellersummary();
+		$data['groupby_field'] = $this->common->set_summarycustomer_groupby();
+		$data['groupby_time'] = $this->common->group_by_time();
+		$this->load->view('view_resellersummary_report', $data);
+	}
 
-    function reseller_json() {
-        $search_arr = $this->summary_search_info('reseller');
-        $count_all = $this->summary_model->get_resellersummary_report_list(false, 0, 0, $search_arr['group_by_str'], $search_arr['select_str'],$search_arr['order_str'],false);
-        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
-        $query = $this->summary_model->get_resellersummary_report_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], $search_arr['group_by_str'], $search_arr['select_str'],$search_arr['order_str'], false);
-        if ($query->num_rows() > 0) {
-            $json_data['rows'] = $this->summary_report_grid($search_arr, $query, 'reseller', 'grid');
-        }
-        $this->session->set_userdata('resellersummary_reports_export', $search_arr);
-        echo json_encode($json_data);
-    }
+	function reseller_json() {
+		$search_arr = $this->summary_search_info('reseller');
+		$count_all = $this->summary_model->get_resellersummary_report_list(false, 0, 0, $search_arr['group_by_str'], $search_arr['select_str'],$search_arr['order_str'],false);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
+		$query = $this->summary_model->get_resellersummary_report_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], $search_arr['group_by_str'], $search_arr['select_str'],$search_arr['order_str'], false);
+		if ($query->num_rows() > 0) {
+			$json_data['rows'] = $this->summary_report_grid($search_arr, $query, 'reseller', 'grid');
+		}
+		$this->session->set_userdata('resellersummary_reports_export', $search_arr);
+		echo json_encode($json_data);
+	}
 
-    function reseller_search() {
-        if ($this->input->post('advance_search', TRUE) == 1) {
-            $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
-            unset($_POST['action'], $_POST['advance_search']);
-            $this->session->set_userdata('resellersummary_reports_search', $this->input->post());
-        }
-        redirect(base_url() . "summary/reseller/");
-    }
+	function reseller_search() {
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			unset($_POST['action'], $_POST['advance_search']);
+			$this->session->set_userdata('resellersummary_reports_search', $this->input->post());
+		}
+		redirect(base_url() . "summary/reseller/");
+	}
 
-    function reseller_clearsearchfilter() {
-        $this->session->set_userdata('advance_search', 0);
-        $this->session->set_userdata('resellersummary_reports_search', "");
-        $this->session->set_userdata('resellersummary_reports_export', "");
-        redirect(base_url() . "summary/reseller/");
-    }
+	function reseller_clearsearchfilter() {
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('resellersummary_reports_search', "");
+		$this->session->set_userdata('resellersummary_reports_export', "");
+		redirect(base_url() . "summary/reseller/");
+	}
 
-    function reseller_export_csv() {
+	function reseller_export_csv() {
 		 $account_info = $accountinfo = $this->session->userdata('accountinfo');
 		$currency_id=$account_info['currency_id'];
 		$currency=$this->common->get_field_name('currency', 'currency', $currency_id);
 		
-        $search_arr = $this->session->userdata('resellersummary_reports_export');
-        $data_arr = array();
-        $query = $this->summary_model->get_resellersummary_report_list(true, '', '', $search_arr['group_by_str'], $search_arr['select_str'],$search_arr['order_str'],true);
-        $search_header = explode(",", $search_arr['export_str']);
-        ob_clean();
-        $fixed_header = array("Attempted Calls", "Completed Calls", "Duration", "ASR", "ACD", "MCD", "Billable", "Debit($currency)", "Cost($currency)", "Profit");
-        $header_arr[] = array_merge($search_header, $fixed_header);
-        if ($query->num_rows() > 0) {
-            $data_arr = $this->summary_report_grid($search_arr, $query, 'reseller', 'export');
-        }
-        $reseller_array = array_merge($header_arr, $data_arr);
-        $this->load->helper('csv');
-        array_to_csv($reseller_array, 'Reseller_Summary_Report_' . date("Y-m-d") . '.csv');
-    }
+		$search_arr = $this->session->userdata('resellersummary_reports_export');
+		$data_arr = array();
+		$query = $this->summary_model->get_resellersummary_report_list(true, '', '', $search_arr['group_by_str'], $search_arr['select_str'],$search_arr['order_str'],true);
+		$search_header = explode(",", $search_arr['export_str']);
+		ob_clean();
+		$fixed_header = array("Attempted Calls", "Completed Calls", "Duration", "ASR", "ACD", "MCD", "Billable", "Debit($currency)", "Cost($currency)", "Profit");
+		$header_arr[] = array_merge($search_header, $fixed_header);
+		if ($query->num_rows() > 0) {
+			$data_arr = $this->summary_report_grid($search_arr, $query, 'reseller', 'export');
+		}
+		$reseller_array = array_merge($header_arr, $data_arr);
+		$this->load->helper('csv');
+		array_to_csv($reseller_array, 'Reseller_Summary_Report_' . date("Y-m-d") . '.csv');
+	}
 
 }
 ?>

Spacing +126 added lines, -126 removed lines

@@ -39,7 +39,7 @@ 
         $this->fpdf->initialize('P', 'mm', 'A4');
 
         if ($this->session->userdata('user_login') == FALSE)
-            redirect(base_url() . '/astpp/login');
+            redirect(base_url().'/astpp/login');
     }
     function customer() {
         $data['page_title'] = 'Customer Summary Report';
@@ -62,10 +62,10 @@ 
 
     function customer_json() {
         $search_arr = $this->summary_search_info('customer');
-        $count_all = $this->summary_model->get_customersummary_report_list(false, 0, 0, $search_arr['group_by_str'], $search_arr['select_str'],$search_arr['order_str'],false);
+        $count_all = $this->summary_model->get_customersummary_report_list(false, 0, 0, $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], false);
         $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
         $json_data = $paging_data["json_paging"];
-        $query = $this->summary_model->get_customersummary_report_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], $search_arr['group_by_str'], $search_arr['select_str'],$search_arr['order_str'], false);
+        $query = $this->summary_model->get_customersummary_report_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], false);
         if ($query->num_rows() > 0) {
             $json_data['rows'] = $this->summary_report_grid($search_arr, $query, 'customer', 'grid');
         }
@@ -78,42 +78,42 @@ 
         $total_width = '322';
         $column_name = 'accountid';
         if ($this->session->userdata('advance_search') == '1') {
-            $search_array = $this->session->userdata($entity . 'summary_reports_search');
-            if(isset($search_array['time']) && !empty($search_array['time'])){
-                   $new_column_arr[]=array(ucfirst(strtolower($search_array['time'])), "58", $search_array['time']."(callstart)", "", "", "");
+            $search_array = $this->session->userdata($entity.'summary_reports_search');
+            if (isset($search_array['time']) && ! empty($search_array['time'])) {
+                   $new_column_arr[] = array(ucfirst(strtolower($search_array['time'])), "58", $search_array['time']."(callstart)", "", "", "");
             }
-            if (isset($search_array['groupby_1']) && !empty($search_array['groupby_1'])) {
+            if (isset($search_array['groupby_1']) && ! empty($search_array['groupby_1'])) {
                 $first_column_groupby = $search_array['groupby_1'];
 
                 if ($first_column_groupby == 'accountid') {
-                    $new_column_arr[] = array("Account", "105",'accountid', "first_name,last_name,number", "accounts", "build_concat_string");
+                    $new_column_arr[] = array("Account", "105", 'accountid', "first_name,last_name,number", "accounts", "build_concat_string");
                 } elseif ($first_column_groupby == 'pattern') {
                     $new_column_arr[] = array("Code", "45", "pattern", "pattern", "", "get_only_numeric_val");
                     $new_column_arr[] = array("Destination", "59", "notes", "", "", "");
-                } elseif($first_column_groupby =='package_id'){
-		    $new_column_arr[] = array("Package", "105",'package_id', "package_name", "packages", "get_field_name");
+                } elseif ($first_column_groupby == 'package_id') {
+		    $new_column_arr[] = array("Package", "105", 'package_id', "package_name", "packages", "get_field_name");
                 }
             }
-            if (isset($search_array['groupby_2']) && !empty($search_array['groupby_2'])) {
+            if (isset($search_array['groupby_2']) && ! empty($search_array['groupby_2'])) {
                 $third_column_groupby = $search_array['groupby_2'];
                 if ($third_column_groupby == 'accountid') {
                     $new_column_arr[] = array("Account", "105", 'accountid', "first_name,last_name,number", "accounts", "build_concat_string");
                 } elseif ($third_column_groupby == 'pattern') {
                     $new_column_arr[] = array("Code", "45", "pattern", "pattern", "", "get_only_numeric_val");
                     $new_column_arr[] = array("Destination", "59", "notes", "", "", "");
-                } elseif($third_column_groupby	 =='package_id'){
-		    $new_column_arr[] = array("Package", "105",'package_id', "package_name", "packages", "get_field_name");
+                } elseif ($third_column_groupby == 'package_id') {
+		    $new_column_arr[] = array("Package", "105", 'package_id', "package_name", "packages", "get_field_name");
                 }
             }
-            if (isset($search_array['groupby_3']) && !empty($search_array['groupby_3'])) {
+            if (isset($search_array['groupby_3']) && ! empty($search_array['groupby_3'])) {
                 $fifth_column_groupby = $search_array['groupby_3'];
                 if ($fifth_column_groupby == 'accountid') {
                     $new_column_arr[] = array("Account", "105", 'accountid', "first_name,last_name,number", "accounts", "build_concat_string");
                 } elseif ($fifth_column_groupby == 'pattern') {
                     $new_column_arr[] = array("Code", "45", "pattern", "pattern", "", "get_only_numeric_val");
                     $new_column_arr[] = array("Destination", "59", "notes", "", "", "");
-                } elseif($fifth_column_groupby	 =='package_id'){
-		    $new_column_arr[] = array("Package", "105",'package_id', "package_name", "packages", "get_field_name");
+                } elseif ($fifth_column_groupby == 'package_id') {
+		    $new_column_arr[] = array("Package", "105", 'package_id', "package_name", "packages", "get_field_name");
                 }
             }
             if (empty($new_column_arr)) {
@@ -129,40 +129,40 @@ 
     function summary_report_grid($search_arr, $query, $entity, $purpose) {
         $export_arr = array();
         $db_field_name = $entity == 'provider' ? 'provider_id' : 'accountid';
-        $show_seconds = (!empty($search_arr['search_in'])) ? $search_arr['search_in'] : 'minutes';
-        $currency_info =$this->common->get_currency_info();
+        $show_seconds = ( ! empty($search_arr['search_in'])) ? $search_arr['search_in'] : 'minutes';
+        $currency_info = $this->common->get_currency_info();
         foreach ($query->result_array() as $row1) {
             $atmpt = $row1['attempts'];
             $cmplt = ($row1['completed'] != 0) ? $row1['completed'] : 0;
-            $acd = ($row1['completed'] > 0 ) ? round($row1['billable'] / $row1['completed']) : 0;
+            $acd = ($row1['completed'] > 0) ? round($row1['billable'] / $row1['completed']) : 0;
             $mcd = $row1['mcd'];
             if ($show_seconds == 'minutes') {
-                $avgsec = $acd > 0 ? sprintf('%02d',$acd / 60) . ":" . sprintf('%02d',($acd % 60)) : "00:00";
-                $maxsec = $mcd > 0 ? sprintf('%02d',$mcd / 60) . ":" . sprintf('%02d',($mcd % 60))  : "00:00";
-                $duration = ($row1['duration'] > 0 ) ? sprintf('%02d',$row1['duration'] / 60) . ":" . sprintf('%02d',($row1['duration'] % 60)) : "00:00";
-                $billsec = ($row1['billable'] > 0 ) ? sprintf('%02d',$row1['billable'] / 60) . ":" . sprintf('%02d',($row1['billable'] % 60)) : "00:00";
+                $avgsec = $acd > 0 ? sprintf('%02d', $acd / 60).":".sprintf('%02d', ($acd % 60)) : "00:00";
+                $maxsec = $mcd > 0 ? sprintf('%02d', $mcd / 60).":".sprintf('%02d', ($mcd % 60)) : "00:00";
+                $duration = ($row1['duration'] > 0) ? sprintf('%02d', $row1['duration'] / 60).":".sprintf('%02d', ($row1['duration'] % 60)) : "00:00";
+                $billsec = ($row1['billable'] > 0) ? sprintf('%02d', $row1['billable'] / 60).":".sprintf('%02d', ($row1['billable'] % 60)) : "00:00";
             } else {
-                $duration = sprintf('%02d',$row1['duration']);
+                $duration = sprintf('%02d', $row1['duration']);
                 $avgsec = $acd;
                 $maxsec = $mcd;
-                $billsec = sprintf('%02d',$row1['billable']);
+                $billsec = sprintf('%02d', $row1['billable']);
             }
             if ($entity != 'provider') {
-                $profit = $this->common->calculate_currency_manually($currency_info,$row1['debit'] - $row1['cost'],false);
-                $debit  = $this->common->calculate_currency_manually($currency_info,$row1['debit'],false);
+                $profit = $this->common->calculate_currency_manually($currency_info, $row1['debit'] - $row1['cost'], false);
+                $debit  = $this->common->calculate_currency_manually($currency_info, $row1['debit'], false);
             }
-            $cost  = $this->common->calculate_currency_manually($currency_info,$row1['cost'],false);
-            $asr = ($atmpt > 0 ) ? (round(($cmplt / $atmpt) * 100,2)) : '0.00' ;
+            $cost = $this->common->calculate_currency_manually($currency_info, $row1['cost'], false);
+            $asr = ($atmpt > 0) ? (round(($cmplt / $atmpt) * 100, 2)) : '0.00';
             $new_arr = array();
             if ($this->session->userdata('advance_search') == 1) {
-                if (!empty($search_arr['groupby_time'])) {
-                       $time =$row1[$search_arr['groupby_time']];
-                       if($search_arr['groupby_time']== "HOUR"|| $search_arr['groupby_time']== "DAY"){
-			  $time=sprintf('%02d',$time);
+                if ( ! empty($search_arr['groupby_time'])) {
+                       $time = $row1[$search_arr['groupby_time']];
+                       if ($search_arr['groupby_time'] == "HOUR" || $search_arr['groupby_time'] == "DAY") {
+			  $time = sprintf('%02d', $time);
                        }
-                       if($search_arr['groupby_time']== "MONTH"){
-			  $dateObj   = DateTime::createFromFormat('!m',$time);
-			  $time= $dateObj->format('F');
+                       if ($search_arr['groupby_time'] == "MONTH") {
+			  $dateObj = DateTime::createFromFormat('!m', $time);
+			  $time = $dateObj->format('F');
                        }
                     $new_arr[] = $time;
                 }
@@ -173,7 +173,7 @@ 
                     $new_arr[] = $row1['notes'];
                 } elseif ($search_arr['groupby_1'] == 'trunk_id') {
                     $new_arr[] = $this->common->get_field_name('name', 'trunks', $row1['trunk_id']);
-                } elseif($search_arr['groupby_1'] == 'package_id'){
+                } elseif ($search_arr['groupby_1'] == 'package_id') {
 		    $new_arr[] = $this->common->get_field_name('package_name', 'packages', $row1['package_id']);
                 }
                 
@@ -184,7 +184,7 @@ 
                     $new_arr[] = $row1['notes'];
                 } elseif ($search_arr['groupby_2'] == 'trunk_id') {
                     $new_arr[] = $this->common->get_field_name('name', 'trunks', $row1['trunk_id']);
-                } elseif($search_arr['groupby_2'] == 'package_id'){
+                } elseif ($search_arr['groupby_2'] == 'package_id') {
 		    $new_arr[] = $this->common->get_field_name('package_name', 'packages', $row1['package_id']);
                 }
                 
@@ -195,7 +195,7 @@ 
                     $new_arr[] = $row1['notes'];
                 } elseif ($search_arr['groupby_3'] == 'trunk_id') {
                     $new_arr[] = $this->common->get_field_name('name', 'trunks', $row1['trunk_id']);
-                }  elseif($search_arr['groupby_3'] == 'package_id'){
+                }  elseif ($search_arr['groupby_3'] == 'package_id') {
 		    $new_arr[] = $this->common->get_field_name('package_name', 'packages', $row1['package_id']);
                 }
                 if (empty($new_arr)) {
@@ -232,23 +232,23 @@ 
             $json_data[] = array('cell' => $final_array);
             $export_arr[] = $final_array;
         }
-        $function_name = 'get_' . $entity . 'summary_report_list';
-        $total_info = $this->summary_model->$function_name(true, '', '', '', $search_arr['select_str'],  $search_arr['order_str'],true);
+        $function_name = 'get_'.$entity.'summary_report_list';
+        $total_info = $this->summary_model->$function_name(true, '', '', '', $search_arr['select_str'], $search_arr['order_str'], true);
         $total_info = $total_info->result_array();
         $total_info = $total_info[0];
-        $total_asr = ($total_info['attempts'] > 0 ) ? round(($total_info['completed'] / $total_info['attempts']) * 100, 2) : 0;
-        $total_acd = ($total_info['completed']> 0 ) ?round($total_info['billable'] / $total_info['completed']) : 0 ;
+        $total_asr = ($total_info['attempts'] > 0) ? round(($total_info['completed'] / $total_info['attempts']) * 100, 2) : 0;
+        $total_acd = ($total_info['completed'] > 0) ? round($total_info['billable'] / $total_info['completed']) : 0;
         if ($show_seconds == 'minutes') {
-            $total_info['duration'] = $total_info['duration'] > 0 ? sprintf('%02d',$total_info['duration'] / 60) . ":" . sprintf('%02d',($total_info['duration'] % 60)) : "00:00";
-            $total_info['billable'] = $total_info['billable'] > 0 ? sprintf('%02d',$total_info['billable'] / 60) . ":" . sprintf('%02d',($total_info['billable'] % 60)) : "00:00";
-            $total_acd = $total_acd > 0 ? sprintf('%02d',$total_acd / 60) . ":" .  sprintf('%02d',($total_acd % 60)) : "00:00";
-            $total_info['mcd'] = $total_info['mcd'] > 0 ? sprintf('%02d',$total_info['mcd'] / 60) . ":" .  sprintf('%02d',($total_info['mcd'] % 60)) : "00:00";
+            $total_info['duration'] = $total_info['duration'] > 0 ? sprintf('%02d', $total_info['duration'] / 60).":".sprintf('%02d', ($total_info['duration'] % 60)) : "00:00";
+            $total_info['billable'] = $total_info['billable'] > 0 ? sprintf('%02d', $total_info['billable'] / 60).":".sprintf('%02d', ($total_info['billable'] % 60)) : "00:00";
+            $total_acd = $total_acd > 0 ? sprintf('%02d', $total_acd / 60).":".sprintf('%02d', ($total_acd % 60)) : "00:00";
+            $total_info['mcd'] = $total_info['mcd'] > 0 ? sprintf('%02d', $total_info['mcd'] / 60).":".sprintf('%02d', ($total_info['mcd'] % 60)) : "00:00";
         }
         if ($entity != 'provider') {
-            $total_profit =   $this->common->calculate_currency_manually($currency_info,$total_info['debit'] - $total_info['cost'],false);
-            $total_debit =   $this->common->calculate_currency_manually($currency_info,$total_info['debit'],false);
+            $total_profit = $this->common->calculate_currency_manually($currency_info, $total_info['debit'] - $total_info['cost'], false);
+            $total_debit = $this->common->calculate_currency_manually($currency_info, $total_info['debit'], false);
         }
-        $total_cost =   $this->common->calculate_currency_manually($currency_info,$total_info['cost'],false);
+        $total_cost = $this->common->calculate_currency_manually($currency_info, $total_info['cost'], false);
         if ($entity != 'provider') {
             $last_array = array(
                 "<b>".$total_info['attempts']."</b>",
@@ -277,17 +277,17 @@ 
         if ($purpose == 'export') {
             $search_arr['custom_total_array'][0] = "Grand Total";
         }
-        $new_export_array=array();
-        foreach($last_array as $key=>$value){
-	  $value=str_replace("<b>","",$value);
-	  $value=str_replace("</b>",'',$value);
-	  if($key == 7 || $key ==8 || $key ==9){
-	      $value = sprintf("%.".$currency_info['decimalpoints']."f",floatval(preg_replace('/[^\d.]/', '', $value)));
+        $new_export_array = array();
+        foreach ($last_array as $key=>$value) {
+	  $value = str_replace("<b>", "", $value);
+	  $value = str_replace("</b>", '', $value);
+	  if ($key == 7 || $key == 8 || $key == 9) {
+	      $value = sprintf("%.".$currency_info['decimalpoints']."f", floatval(preg_replace('/[^\d.]/', '', $value)));
 	  }
-	  $new_export_array[$key]=$value;
+	  $new_export_array[$key] = $value;
         }
         $total_array = array_merge($search_arr['custom_total_array'], $last_array);
-        $custom_export_arr =array_merge($search_arr['custom_total_array'],$new_export_array);
+        $custom_export_arr = array_merge($search_arr['custom_total_array'], $new_export_array);
         $export_arr[] = $custom_export_arr;
         $json_data[] = array('cell' => $total_array);
         return $purpose == 'grid' ? $json_data : $export_arr;
@@ -295,14 +295,14 @@ 
 
     function customer_export_csv() {
 		$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);
         $search_arr = $this->session->userdata('customersummary_reports_export');
         $data_arr = array();
-        $query = $this->summary_model->get_customersummary_report_list(true, '', '', $search_arr['group_by_str'], $search_arr['select_str'],$search_arr['order_str'], true);
+        $query = $this->summary_model->get_customersummary_report_list(true, '', '', $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], true);
         $search_header = explode(",", $search_arr['export_str']);
         ob_clean();
-        $fixed_header = array('Attempted Calls','Completed Calls','Duration', 'ASR', 'ACD','MCD','Billable', 'Debit('.$currency.')','Cost('.$currency.')','Profit');
+        $fixed_header = array('Attempted Calls', 'Completed Calls', 'Duration', 'ASR', 'ACD', 'MCD', 'Billable', 'Debit('.$currency.')', 'Cost('.$currency.')', 'Profit');
         $header_arr[] = array_merge($search_header, $fixed_header);
         if ($query->num_rows() > 0) {
             $data_arr = $this->summary_report_grid($search_arr, $query, 'customer', 'export');
@@ -310,7 +310,7 @@ 
         $customer_array = array_merge($header_arr, $data_arr);
 
         $this->load->helper('csv');
-        array_to_csv($customer_array, 'Customer_Summary_Report_' . date("Y-m-d") . '.csv');
+        array_to_csv($customer_array, 'Customer_Summary_Report_'.date("Y-m-d").'.csv');
     }
 
     function customer_search() {
@@ -320,24 +320,24 @@ 
             unset($_POST['advance_search']);
             $this->session->set_userdata('customersummary_reports_search', $this->input->post());
         }
-        redirect(base_url() . 'summary/customer/');
+        redirect(base_url().'summary/customer/');
     }
 
     function customer_clearsearchfilter() {
         $this->session->set_userdata('advance_search', 0);
         $this->session->set_userdata('customersummary_reports_search', "");
         $this->session->set_userdata('customersummary_reports_export', "");
-        redirect(base_url() . 'summary/customer/');
+        redirect(base_url().'summary/customer/');
     }
 
     function summary_search_info($entity) {
         $group_by_str = null;
         $select_str = null;
-        $group_by_time=null;
+        $group_by_time = null;
         $group_by_1 = null;
         $group_by_2 = null;
         $group_by_3 = null;
-        $order_str=null;
+        $order_str = null;
         $custom_total_array = array();
         $custom_search = array();
         $export_select_str = null;
@@ -345,86 +345,86 @@ 
         $i = 0;
         $db_field_name = $entity == 'provider' ? 'provider_id' : 'accountid';
         if ($this->session->userdata('advance_search') == 1) {
-            $custom_search = $this->session->userdata($entity . 'summary_reports_search');
-            if (isset($custom_search['time']) && !empty($custom_search['time'])) {
-                $group_by_str.=$custom_search['time'] . "(callstart),";
-                $select_str.=$custom_search['time'] . "(callstart) as ".$custom_search['time'].",";
-                $order_str.=$custom_search['time'].",";
+            $custom_search = $this->session->userdata($entity.'summary_reports_search');
+            if (isset($custom_search['time']) && ! empty($custom_search['time'])) {
+                $group_by_str .= $custom_search['time']."(callstart),";
+                $select_str .= $custom_search['time']."(callstart) as ".$custom_search['time'].",";
+                $order_str .= $custom_search['time'].",";
                 $group_by_time = $custom_search['time'];
-                $export_select_str.=$custom_search['time'].",";
+                $export_select_str .= $custom_search['time'].",";
                 $custom_total_array[$i] = null;
                 $i++;
             }
-            if (isset($custom_search['groupby_1']) && !empty($custom_search['groupby_1'])) {
-                $group_by_str.=$custom_search['groupby_1'] . ",";
-                $select_str.=$custom_search['groupby_1'] . ",";
-                $order_str.=$custom_search['groupby_1'] . ",";
+            if (isset($custom_search['groupby_1']) && ! empty($custom_search['groupby_1'])) {
+                $group_by_str .= $custom_search['groupby_1'].",";
+                $select_str .= $custom_search['groupby_1'].",";
+                $order_str .= $custom_search['groupby_1'].",";
                 $group_by_1 = $custom_search['groupby_1'];
                 if ($custom_search['groupby_1'] == $db_field_name) {
-                    $export_select_str.='Account,';
+                    $export_select_str .= 'Account,';
                 } elseif ($custom_search['groupby_1'] == 'trunk_id') {
-                    $export_select_str.='Trunk,';
+                    $export_select_str .= 'Trunk,';
                 } elseif ($custom_search['groupby_1'] == 'pattern') {
-                    $select_str.='notes,';
-                    $order_str.='notes,';
-                    $export_select_str.="Code,Destination,";
+                    $select_str .= 'notes,';
+                    $order_str .= 'notes,';
+                    $export_select_str .= "Code,Destination,";
                     $custom_total_array[$i] = null;
                     $i++;
-                } elseif($custom_search['groupby_1'] =='package_id'){
-		    $export_select_str.='Package,';
+                } elseif ($custom_search['groupby_1'] == 'package_id') {
+		    $export_select_str .= 'Package,';
                 }
                 $custom_total_array[$i] = null;
                 $i++;
             }
             
-            if (isset($custom_search['groupby_2']) && !empty($custom_search['groupby_2'])) {
-                $group_by_str.=$custom_search['groupby_2'] . ",";
-                $select_str.=$custom_search['groupby_2'] . ",";
-                $order_str.=$custom_search['groupby_2'] . ",";
+            if (isset($custom_search['groupby_2']) && ! empty($custom_search['groupby_2'])) {
+                $group_by_str .= $custom_search['groupby_2'].",";
+                $select_str .= $custom_search['groupby_2'].",";
+                $order_str .= $custom_search['groupby_2'].",";
                 $group_by_2 = $custom_search['groupby_2'];
                 if ($custom_search['groupby_2'] == $db_field_name) {
-                    $export_select_str.='Account,';
+                    $export_select_str .= 'Account,';
                 } elseif ($custom_search['groupby_2'] == 'trunk_id') {
-                    $export_select_str.='Trunk,';
+                    $export_select_str .= 'Trunk,';
                 } elseif ($custom_search['groupby_2'] == 'pattern') {
-                    $select_str.='notes,';
-                    $order_str.='notes,';
-                    $export_select_str.="Code,Destination,";
+                    $select_str .= 'notes,';
+                    $order_str .= 'notes,';
+                    $export_select_str .= "Code,Destination,";
                     $custom_total_array[$i] = null;
                     $i++;
-                } elseif($custom_search['groupby_2'] =='package_id'){
-		    $export_select_str.='Package,';
+                } elseif ($custom_search['groupby_2'] == 'package_id') {
+		    $export_select_str .= 'Package,';
                 }
                 $custom_total_array[$i] = null;
                 $i++;
             }
 
-            if (isset($custom_search['groupby_3']) && !empty($custom_search['groupby_3'])) {
-                $group_by_str.=$custom_search['groupby_3'] . ",";
-                $select_str.=$custom_search['groupby_3'] . ",";
-                $order_str.=$custom_search['groupby_3'] . ",";
+            if (isset($custom_search['groupby_3']) && ! empty($custom_search['groupby_3'])) {
+                $group_by_str .= $custom_search['groupby_3'].",";
+                $select_str .= $custom_search['groupby_3'].",";
+                $order_str .= $custom_search['groupby_3'].",";
                 $group_by_3 = $custom_search['groupby_3'];
                 if ($custom_search['groupby_3'] == 'accountid' || $custom_search['groupby_3'] == 'provider_id') {
-                    $export_select_str.='Account,';
+                    $export_select_str .= 'Account,';
                 } elseif ($custom_search['groupby_3'] == 'trunk_id') {
-                    $export_select_str.='Trunk,';
+                    $export_select_str .= 'Trunk,';
                 } elseif ($custom_search['groupby_3'] == 'pattern') {
-                    $select_str.='notes,';
-                    $order_str.='notes,';
-                    $export_select_str.="Code,Destination,";
+                    $select_str .= 'notes,';
+                    $order_str .= 'notes,';
+                    $export_select_str .= "Code,Destination,";
                     $custom_total_array[$i] = null;
                     $i++;
-                } elseif($custom_search['groupby_3'] =='package_id'){
-		    $export_select_str.='Package,';
+                } elseif ($custom_search['groupby_3'] == 'package_id') {
+		    $export_select_str .= 'Package,';
                 }
                 $custom_total_array[$i] = null;
                 $i++;
             }
-            $new_arr['search_in'] = (isset($custom_search['search_in']) && !empty($custom_search['search_in'])) ? $custom_search['search_in'] : 'minutes';
+            $new_arr['search_in'] = (isset($custom_search['search_in']) && ! empty($custom_search['search_in'])) ? $custom_search['search_in'] : 'minutes';
             unset($custom_search['groupby_1'], $custom_search['groupby_2'], $custom_search['groupby_3'], $custom_search['search_in']);
-            $this->session->set_userdata('summary_' . $entity . '_search', $custom_search);
+            $this->session->set_userdata('summary_'.$entity.'_search', $custom_search);
         }
-        if (!empty($group_by_str)) {
+        if ( ! empty($group_by_str)) {
             $group_by_str = rtrim($group_by_str, ",");
             $select_str = rtrim($select_str, ",");
             $order_str = rtrim($order_str, ",");
@@ -445,7 +445,7 @@ 
         $new_arr['groupby_1'] = $group_by_1;
         $new_arr['groupby_2'] = $group_by_2;
         $new_arr['groupby_3'] = $group_by_3;
-        $new_arr['groupby_time']=$group_by_time;
+        $new_arr['groupby_time'] = $group_by_time;
         $new_arr['custom_total_array'] = $custom_total_array;
         return $new_arr;
     }
@@ -471,10 +471,10 @@ 
 
     function provider_json() {
         $search_arr = $this->summary_search_info('provider');
-        $count_all = $this->summary_model->get_providersummary_report_list(false,'','', $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'],false);
+        $count_all = $this->summary_model->get_providersummary_report_list(false, '', '', $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], false);
         $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
         $json_data = $paging_data["json_paging"];
-        $query = $this->summary_model->get_providersummary_report_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], $search_arr['group_by_str'], $search_arr['select_str'],$search_arr['order_str'], false);
+        $query = $this->summary_model->get_providersummary_report_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], false);
         if ($query->num_rows() > 0) {
             $json_data['rows'] = $this->summary_report_grid($search_arr, $query, 'provider', 'grid');
         }
@@ -484,11 +484,11 @@ 
 
     function provider_export_csv() {
 		$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);
         $search_arr = $this->session->userdata('providersummary_reports_export');
         $data_arr = array();
-        $query = $this->summary_model->get_providersummary_report_list(true, '', '', $search_arr['group_by_str'], $search_arr['select_str'],$search_arr['order_str'], true);
+        $query = $this->summary_model->get_providersummary_report_list(true, '', '', $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], true);
         $search_header = explode(",", $search_arr['export_str']);
         ob_clean();
         $fixed_header = array("Attempted Calls", "Completed Calls", "Duration", "ASR", "ACD", "MCD", "Billable", "Cost($currency)");
@@ -499,7 +499,7 @@ 
         $provider_array = array_merge($header_arr, $data_arr);
 
         $this->load->helper('csv');
-        array_to_csv($provider_array, 'Provider_Summary_Report_' . date("Y-m-d") . '.csv');
+        array_to_csv($provider_array, 'Provider_Summary_Report_'.date("Y-m-d").'.csv');
     }
 
     function provider_search() {
@@ -508,14 +508,14 @@ 
             unset($_POST['action'], $_POST['advance_search']);
             $this->session->set_userdata('providersummary_reports_search', $this->input->post());
         }
-        redirect(base_url() . 'summary/provider/');
+        redirect(base_url().'summary/provider/');
     }
 
     function provider_clearsearchfilter() {
         $this->session->set_userdata('advance_search', 0);
         $this->session->set_userdata('providersummary_reports_search', "");
         $this->session->set_userdata('providersummary_reports_export', "");
-        redirect(base_url() . "summary/provider/");
+        redirect(base_url()."summary/provider/");
     }
 
     function reseller() {
@@ -541,10 +541,10 @@ 
 
     function reseller_json() {
         $search_arr = $this->summary_search_info('reseller');
-        $count_all = $this->summary_model->get_resellersummary_report_list(false, 0, 0, $search_arr['group_by_str'], $search_arr['select_str'],$search_arr['order_str'],false);
+        $count_all = $this->summary_model->get_resellersummary_report_list(false, 0, 0, $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], false);
         $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
         $json_data = $paging_data["json_paging"];
-        $query = $this->summary_model->get_resellersummary_report_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], $search_arr['group_by_str'], $search_arr['select_str'],$search_arr['order_str'], false);
+        $query = $this->summary_model->get_resellersummary_report_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], false);
         if ($query->num_rows() > 0) {
             $json_data['rows'] = $this->summary_report_grid($search_arr, $query, 'reseller', 'grid');
         }
@@ -558,24 +558,24 @@ 
             unset($_POST['action'], $_POST['advance_search']);
             $this->session->set_userdata('resellersummary_reports_search', $this->input->post());
         }
-        redirect(base_url() . "summary/reseller/");
+        redirect(base_url()."summary/reseller/");
     }
 
     function reseller_clearsearchfilter() {
         $this->session->set_userdata('advance_search', 0);
         $this->session->set_userdata('resellersummary_reports_search', "");
         $this->session->set_userdata('resellersummary_reports_export', "");
-        redirect(base_url() . "summary/reseller/");
+        redirect(base_url()."summary/reseller/");
     }
 
     function reseller_export_csv() {
 		 $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);
 		
         $search_arr = $this->session->userdata('resellersummary_reports_export');
         $data_arr = array();
-        $query = $this->summary_model->get_resellersummary_report_list(true, '', '', $search_arr['group_by_str'], $search_arr['select_str'],$search_arr['order_str'],true);
+        $query = $this->summary_model->get_resellersummary_report_list(true, '', '', $search_arr['group_by_str'], $search_arr['select_str'], $search_arr['order_str'], true);
         $search_header = explode(",", $search_arr['export_str']);
         ob_clean();
         $fixed_header = array("Attempted Calls", "Completed Calls", "Duration", "ASR", "ACD", "MCD", "Billable", "Debit($currency)", "Cost($currency)", "Profit");
@@ -585,7 +585,7 @@ 
         }
         $reseller_array = array_merge($header_arr, $data_arr);
         $this->load->helper('csv');
-        array_to_csv($reseller_array, 'Reseller_Summary_Report_' . date("Y-m-d") . '.csv');
+        array_to_csv($reseller_array, 'Reseller_Summary_Report_'.date("Y-m-d").'.csv');
     }
 
 }

Braces +4 added lines, -3 removed lines

@@ -38,8 +38,9 @@ 
         $this->fpdf = new PDF('P', 'pt');
         $this->fpdf->initialize('P', 'mm', 'A4');
 
-        if ($this->session->userdata('user_login') == FALSE)
-            redirect(base_url() . '/astpp/login');
+        if ($this->session->userdata('user_login') == FALSE) {
+                    redirect(base_url() . '/astpp/login');
+        }
     }
     function customer() {
         $data['page_title'] = 'Customer Summary Report';
@@ -195,7 +196,7 @@ 
                     $new_arr[] = $row1['notes'];
                 } elseif ($search_arr['groupby_3'] == 'trunk_id') {
                     $new_arr[] = $this->common->get_field_name('name', 'trunks', $row1['trunk_id']);
-                }  elseif($search_arr['groupby_3'] == 'package_id'){
+                } elseif($search_arr['groupby_3'] == 'package_id'){
 		    $new_arr[] = $this->common->get_field_name('package_name', 'packages', $row1['package_id']);
                 }
                 if (empty($new_arr)) {

web_interface/astpp/system/core/Benchmark.php

Doc Comments +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 	 * @param	string	a particular marked point
 	 * @param	string	a particular marked point
 	 * @param	integer	the number of decimal places
-	 * @return	mixed
+	 * @return	string
 	 */
 	function elapsed_time($point1 = '', $point2 = '', $decimals = 4)
 	{

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /*
 | -------------------------------------------------------------------
 | AUTO-LOADER

web_interface/astpp/system/core/Common.php

Doc Comments +3 added lines

@@ -467,6 +467,9 @@
 */
 if ( ! function_exists('_exception_handler'))
 {
+	/**
+	 * @param integer $severity
+	 */
 	function _exception_handler($severity, $message, $filepath, $line)
 	{
 		 // We don't bother with "strict" notices since they tend to fill up

Indentation +1 added lines, -1 removed lines

@@ -254,7 +254,7 @@
 			}
 		}
 		$_config[0] =& $config;
-                return $_config[0];
+				return $_config[0];
 
 	}
 }

Spacing +10 added lines, -10 removed lines

@@ -81,7 +81,7 @@ 
 		// write a file then read it.  Bah...
 		if (is_dir($file))
 		{
-			$file = rtrim($file, '/').'/'.md5(mt_rand(1,100).mt_rand(1,100));
+			$file = rtrim($file, '/').'/'.md5(mt_rand(1, 100).mt_rand(1, 100));
 
 			if (($fp = @fopen($file, FOPEN_WRITE_CREATE)) === FALSE)
 			{
@@ -253,7 +253,7 @@ 
 				}
 			}
 		}
-		$_config[0] =& $config;
+		$_config[0] = & $config;
                 return $_config[0];
 
 	}
@@ -275,7 +275,7 @@ 
 
 		if ( ! isset($_config_item[$item]))
 		{
-			$config =& get_config();
+			$config = & get_config();
 
 			if ( ! isset($config[$item]))
 			{
@@ -306,7 +306,7 @@ 
 {
 	function show_error($message, $status_code = 500, $heading = 'An Error Was Encountered')
 	{
-		$_error =& load_class('Exceptions', 'core');
+		$_error = & load_class('Exceptions', 'core');
 		echo $_error->show_error($heading, $message, 'error_general', $status_code);
 		exit;
 	}
@@ -328,7 +328,7 @@ 
 {
 	function show_404($page = '', $log_error = TRUE)
 	{
-		$_error =& load_class('Exceptions', 'core');
+		$_error = & load_class('Exceptions', 'core');
 		$_error->show_404($page, $log_error);
 		exit;
 	}
@@ -356,7 +356,7 @@ 
 			return;
 		}
 
-		$_log =& load_class('Log');
+		$_log = & load_class('Log');
 		$_log->write_log($level, $message, $php_error);
 	}
 }
@@ -479,7 +479,7 @@ 
 			return;
 		}
 
-		$_error =& load_class('Exceptions', 'core');
+		$_error = & load_class('Exceptions', 'core');
 
 		// Should we display the error? We'll get the current error_reporting
 		// level and add its bits with the severity bits to find out.
@@ -521,11 +521,11 @@ 
 		
 		if ($url_encoded)
 		{
-			$non_displayables[] = '/%0[0-8bcef]/';	// url encoded 00-08, 11, 12, 14, 15
-			$non_displayables[] = '/%1[0-9a-f]/';	// url encoded 16-31
+			$non_displayables[] = '/%0[0-8bcef]/'; // url encoded 00-08, 11, 12, 14, 15
+			$non_displayables[] = '/%1[0-9a-f]/'; // url encoded 16-31
 		}
 		
-		$non_displayables[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S';	// 00-08, 11, 12, 14-31, 127
+		$non_displayables[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S'; // 00-08, 11, 12, 14-31, 127
 
 		do
 		{

Braces +7 added lines, -9 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -92,8 +94,7 @@ 
 			@chmod($file, DIR_WRITE_MODE);
 			@unlink($file);
 			return TRUE;
-		}
-		elseif ( ! is_file($file) OR ($fp = @fopen($file, FOPEN_WRITE_CREATE)) === FALSE)
+		} elseif ( ! is_file($file) OR ($fp = @fopen($file, FOPEN_WRITE_CREATE)) === FALSE)
 		{
 			return FALSE;
 		}
@@ -437,12 +438,10 @@ 
 		if (substr(php_sapi_name(), 0, 3) == 'cgi')
 		{
 			header("Status: {$code} {$text}", TRUE);
-		}
-		elseif ($server_protocol == 'HTTP/1.1' OR $server_protocol == 'HTTP/1.0')
+		} elseif ($server_protocol == 'HTTP/1.1' OR $server_protocol == 'HTTP/1.0')
 		{
 			header($server_protocol." {$code} {$text}", TRUE, $code);
-		}
-		else
+		} else
 		{
 			header("HTTP/1.1 {$code} {$text}", TRUE, $code);
 		}
@@ -553,8 +552,7 @@ 
 		if (is_array($var))
 		{
 			return array_map('html_escape', $var);
-		}
-		else
+		} else
 		{
 			return htmlspecialchars($var, ENT_QUOTES, config_item('charset'));
 		}

web_interface/astpp/system/core/Config.php

Doc Comments +3 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
 	 * @param   string	the config file name
 	 * @param   boolean  if configuration values should be loaded into their own section
 	 * @param   boolean  true if errors should just return false, false if an error message should be displayed
-	 * @return  boolean  if the file was successfully loaded or not
+	 * @return  boolean|null  if the file was successfully loaded or not
 	 */
 	function __construct()
 	{
@@ -223,6 +223,7 @@ 
 	 * @access	public
 	 * @param	string	the config item name
 	 * @param	bool
+	 * @param string $item
 	 * @return	string
 	 */
 	function slash_item($item)
@@ -288,7 +289,7 @@ 
 	 * Build URI string for use in Config::site_url() and Config::base_url()
 	 *
 	 * @access protected
-	 * @param  $uri
+	 * @param  string $uri
 	 * @return string
 	 */
 	protected function _uri_string($uri)

Indentation +1 added lines, -1 removed lines

@@ -316,7 +316,7 @@
 				$uri = $str;
 			}
 		}
-	    return $uri;
+		return $uri;
 	}
 
 	// --------------------------------------------------------------------

Spacing +4 added lines, -4 removed lines

@@ -60,7 +60,7 @@ 
 	 */
 	function __construct()
 	{
-		$this->config =& get_config();
+		$this->config = & get_config();
 		log_message('debug', "Config Class Initialized");
 
 		// Set the base_url automatically if none was provided
@@ -69,7 +69,7 @@ 
 			if (isset($_SERVER['HTTP_HOST']))
 			{
 				$base_url = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off' ? 'https' : 'http';
-				$base_url .= '://'. $_SERVER['HTTP_HOST'];
+				$base_url .= '://'.$_SERVER['HTTP_HOST'];
 				$base_url .= str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']);
 			}
 
@@ -231,7 +231,7 @@ 
 		{
 			return FALSE;
 		}
-		if( trim($this->config[$item]) == '')
+		if (trim($this->config[$item]) == '')
 		{
 			return '';
 		}
@@ -279,7 +279,7 @@ 
 	 */
 	function base_url($uri = '')
 	{
-		return $this->slash_item('base_url').ltrim($this->_uri_string($uri),'/');
+		return $this->slash_item('base_url').ltrim($this->_uri_string($uri), '/');
 	}
 
 	// -------------------------------------------------------------

Braces +9 added lines, -14 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -71,9 +73,7 @@ 
 				$base_url = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off' ? 'https' : 'http';
 				$base_url .= '://'. $_SERVER['HTTP_HOST'];
 				$base_url .= str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']);
-			}
-
-			else
+			} else
 			{
 				$base_url = 'http://localhost/';
 			}
@@ -143,13 +143,11 @@ 
 				if (isset($this->config[$file]))
 				{
 					$this->config[$file] = array_merge($this->config[$file], $config);
-				}
-				else
+				} else
 				{
 					$this->config[$file] = $config;
 				}
-			}
-			else
+			} else
 			{
 				$this->config = array_merge($this->config, $config);
 			}
@@ -196,8 +194,7 @@ 
 			}
 
 			$pref = $this->config[$item];
-		}
-		else
+		} else
 		{
 			if ( ! isset($this->config[$index]))
 			{
@@ -260,8 +257,7 @@ 
 		{
 			$suffix = ($this->item('url_suffix') == FALSE) ? '' : $this->item('url_suffix');
 			return $this->slash_item('base_url').$this->slash_item('index_page').$this->_uri_string($uri).$suffix;
-		}
-		else
+		} else
 		{
 			return $this->slash_item('base_url').$this->item('index_page').'?'.$this->_uri_string($uri);
 		}
@@ -300,8 +296,7 @@ 
 				$uri = implode('/', $uri);
 			}
 			$uri = trim($uri, '/');
-		}
-		else
+		} else
 		{
 			if (is_array($uri))
 			{

web_interface/astpp/system/core/Exceptions.php

Doc Comments +2 added lines

@@ -130,6 +130,8 @@
 	 * @param	string	the message
 	 * @param	string	the template name
 	 * @param 	int		the status code
+	 * @param string $heading
+	 * @param string $message
 	 * @return	string
 	 */
 	function show_error($heading, $message, $template = 'error_general', $status_code = 500)

Spacing +2 added lines, -2 removed lines

@@ -88,7 +88,7 @@ 
 	{
 		$severity = ( ! isset($this->levels[$severity])) ? $severity : $this->levels[$severity];
 
-		log_message('error', 'Severity: '.$severity.'  --> '.$message. ' '.$filepath.' '.$line, TRUE);
+		log_message('error', 'Severity: '.$severity.'  --> '.$message.' '.$filepath.' '.$line, TRUE);
 	}
 
 	// --------------------------------------------------------------------
@@ -171,7 +171,7 @@ 
 		if (FALSE !== strpos($filepath, '/'))
 		{
 			$x = explode('/', $filepath);
-			$filepath = $x[count($x)-2].'/'.end($x);
+			$filepath = $x[count($x) - 2].'/'.end($x);
 		}
 
 		if (ob_get_level() > $this->ob_level + 1)

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /*
 | -------------------------------------------------------------------
 | AUTO-LOADER

web_interface/astpp/system/core/Hooks.php

Doc Comments +2 added lines, -2 removed lines

@@ -108,7 +108,7 @@ 
 	 *
 	 * @access	private
 	 * @param	string	the hook name
-	 * @return	mixed
+	 * @return	boolean
 	 */
 	function _call_hook($which = '')
 	{
@@ -141,7 +141,7 @@ 
 	 *
 	 * @access	private
 	 * @param	array	the hook details
-	 * @return	bool
+	 * @return	null|boolean
 	 */
 	function _run_hook($data)
 	{

Indentation +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
 
 		if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/hooks.php'))
 		{
-		    include(APPPATH.'config/'.ENVIRONMENT.'/hooks.php');
+			include(APPPATH.'config/'.ENVIRONMENT.'/hooks.php');
 		}
 		elseif (is_file(APPPATH.'config/hooks.php'))
 		{

Spacing +8 added lines, -8 removed lines

@@ -33,19 +33,19 @@ 
 	 *
 	 * @var bool
 	 */
-	var $enabled		= FALSE;
+	var $enabled = FALSE;
 	/**
 	 * List of all hooks set in config/hooks.php
 	 *
 	 * @var array
 	 */
-	var $hooks			= array();
+	var $hooks = array();
 	/**
 	 * Determines wether hook is in progress, used to prevent infinte loops
 	 *
 	 * @var bool
 	 */
-	var $in_progress	= FALSE;
+	var $in_progress = FALSE;
 
 	/**
 	 * Constructor
@@ -67,7 +67,7 @@ 
 	 */
 	function _initialize()
 	{
-		$CFG =& load_class('Config', 'core');
+		$CFG = & load_class('Config', 'core');
 
 		// If hooks are not enabled in the config file
 		// there is nothing else to do
@@ -95,7 +95,7 @@ 
 			return;
 		}
 
-		$this->hooks =& $hook;
+		$this->hooks = & $hook;
 		$this->enabled = TRUE;
 	}
 
@@ -182,9 +182,9 @@ 
 		// Set class/function name
 		// -----------------------------------
 
-		$class		= FALSE;
-		$function	= FALSE;
-		$params		= '';
+		$class = FALSE;
+		$function = FALSE;
+		$params = '';
 
 		if (isset($data['class']) AND $data['class'] != '')
 		{

Braces +6 added lines, -7 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -83,8 +85,7 @@ 
 		if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/hooks.php'))
 		{
 		    include(APPPATH.'config/'.ENVIRONMENT.'/hooks.php');
-		}
-		elseif (is_file(APPPATH.'config/hooks.php'))
+		} elseif (is_file(APPPATH.'config/hooks.php'))
 		{
 			include(APPPATH.'config/hooks.php');
 		}
@@ -123,8 +124,7 @@ 
 			{
 				$this->_run_hook($val);
 			}
-		}
-		else
+		} else
 		{
 			$this->_run_hook($this->hooks[$which]);
 		}
@@ -225,8 +225,7 @@ 
 
 			$HOOK = new $class;
 			$HOOK->$function($params);
-		}
-		else
+		} else
 		{
 			if ( ! function_exists($function))
 			{