iNextrix / ASTPP

web_interface/astpp/application/modules/animap/libraries/animap_form.php

Spacing +14 added lines, -14 removed lines

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

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

 

-if (!defined('BASEPATH'))

+if ( ! defined('BASEPATH'))

 	exit('No direct script access allowed');

 

 class Animap_form {

@@ -31,12 +31,12 @@ 
 	}

    

 	function get_animap_form_fields($edit_id) {

-   $id=$edit_id;

-		$form['forms'] = array(base_url() . 'animap/animap_save/', array('id' => 'animap_form', 'method' => 'POST', 'name' => 'animap_form'));

-  $val=$id > 0 ? 'ani_map.number.'.$id : 'ani_map.number';   

+   $id = $edit_id;

+		$form['forms'] = array(base_url().'animap/animap_save/', array('id' => 'animap_form', 'method' => 'POST', 'name' => 'animap_form'));

+  $val = $id > 0 ? 'ani_map.number.'.$id : 'ani_map.number';   

 		$form['Caller ID'] = array(

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

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

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

 			array('Caller ID', 'INPUT', array('name' => 'number', 'size' => '20', 'class' => "text field medium"), 'trim|required|is_unique['.$val.']|numeric|xss_clean', 'tOOL TIP', 'Please Enter ANI number'),

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

             

@@ -51,7 +51,7 @@ 
      

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

 		$form['Search'] = array(

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

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

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

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

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

@@ -67,16 +67,16 @@ 
 

 	function build_animap_list_for_admin() {

 		// array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);

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

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

-			array("Caller ID", "250", "number", "", "", "","","true","center"),

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

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

+			array("Caller ID", "250", "number", "", "", "", "", "true", "center"),

 			 /*

             ASTPP  3.0 

             creation field show in grid

             */

-			array("Status", "180", "status", "status", "ani_map", "get_status","","true","center"),

-			array("Created Date", "220", "creation_date", "creation_date", "creation_date", "convert_GMT_to","","true","center"),

-			array("Modified Date", "220", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to","","true","center"),

+			array("Status", "180", "status", "status", "ani_map", "get_status", "", "true", "center"),

+			array("Created Date", "220", "creation_date", "creation_date", "creation_date", "convert_GMT_to", "", "true", "center"),

+			array("Modified Date", "220", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to", "", "true", "center"),

            

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

 			array("Action", "100", "", "", "", array("EDIT" => array("url" => "animap/animap_edit/", "mode" => "popup", 'popup'),

@@ -86,8 +86,8 @@ 
 	}

 

 	function build_grid_buttons() {

-		$buttons_json = json_encode(array(array("Add" , "btn btn-line-warning btn" , "fa fa-plus-circle fa-lg", "button_action", "/animap/animap_add/", "popup"),

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

+		$buttons_json = json_encode(array(array("Add", "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/animap/animap_add/", "popup"),

+			array("Delete", "btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "/animap/animap_delete_multiple/")

 			));

 		return $buttons_json;

 	}

Braces +3 added lines, -2 removed lines

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

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

 

-if (!defined('BASEPATH'))

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

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

 class Animap_form {

 	  	function __construct($library_name = '') {

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

Spacing +6 added lines, -6 removed lines

@@ -30,8 +30,8 @@ 
 		$this->db_model->build_search('taxes_list_search');
 		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
 			$where = array("reseller_id"=>$this->session->userdata["accountinfo"]['id']);
-		}else{
-		$where =array("reseller_id"=>0);
+		} else {
+		$where = array("reseller_id"=>0);
 		}
 		if ($flag) {
 			$query = $this->db_model->select("*", "taxes", $where, "id", "ASC", $limit, $start);
@@ -46,8 +46,8 @@ 
 		$data["creation_date"] = date("Y-m-d H:i:s");
 		 if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
 	  $data['reseller_id'] = $this->session->userdata["accountinfo"]['id'];
-		 }else{
-	  $data['reseller_id'] =0;
+		 } else {
+	  $data['reseller_id'] = 0;
 		 }
 		$this->db->insert("taxes", $data);
 	}
@@ -60,8 +60,8 @@ 
 	}
 
 	function remove_taxes($id) {
-		$this->db->delete('taxes_to_accounts',array('taxes_id'=>$id));
-		return $this->db->delete("taxes",array('id'=>$id));
+		$this->db->delete('taxes_to_accounts', array('taxes_id'=>$id));
+		return $this->db->delete("taxes", array('id'=>$id));
 	}
 
 }

Braces +2 added lines, -2 removed lines

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

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

Spacing +7 added lines, -7 removed lines

@@ -33,7 +33,7 @@ 
 		$this->load->model('taxes_model');
 
 		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+			redirect(base_url().'/astpp/login');
 	}
 
 	function taxes_add() {
@@ -89,11 +89,11 @@ 
 
 	function taxes_delete($id) {
 		$this->db->select('taxes_description');
-		$this->db->where('id',$id);
-		$taxes_name=(array)$this->db->get('taxes')->first_row();
+		$this->db->where('id', $id);
+		$taxes_name = (array)$this->db->get('taxes')->first_row();
 		$this->taxes_model->remove_taxes($id);
 		$this->session->set_flashdata('astpp_notification', $taxes_name["taxes_description"].' Tax removed successfully!');
-		redirect(base_url() . 'taxes/taxes_list/');
+		redirect(base_url().'taxes/taxes_list/');
 	}
 
 	function taxes_list() {
@@ -109,7 +109,7 @@ 
 	function taxes_list_json() {
 		$json_data = array();
 		$count_all = $this->taxes_model->get_taxes_list(false);
-		$paging_data =  $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
 
 		$query = $this->taxes_model->get_taxes_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
@@ -131,7 +131,7 @@ 
 		$this->session->set_userdata('taxes_list_search', $this->input->post());
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'taxes/taxes_list/');
+			redirect(base_url().'taxes/taxes_list/');
 		}
 	}
 
@@ -143,7 +143,7 @@ 
 	function taxes_delete_multiple() {
 		$ids = $this->input->post("selected_ids", true);
 		$where = "id IN ($ids)";
-		$taxes_where="taxes_id IN(".$ids.")";
+		$taxes_where = "taxes_id IN(".$ids.")";
 		$this->db->where($taxes_where);
 		$this->db->delete('taxes_to_accounts');
 		$this->db->where($where);

Braces +3 added lines, -2 removed lines

@@ -32,8 +32,9 @@
 		$this->load->library('astpp/form');
 		$this->load->model('taxes_model');
 
-		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+		if ($this->session->userdata('user_login') == FALSE) {
+					redirect(base_url() . '/astpp/login');
+		}
 	}
 
 	function taxes_add() {

web_interface/astpp/application/modules/taxes/libraries/taxes_form.php

Spacing +15 added lines, -15 removed lines

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

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

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

-if (!defined('BASEPATH'))

+if ( ! defined('BASEPATH'))

 	exit('No direct script access allowed');

 

 class Taxes_form {

@@ -28,13 +28,13 @@ 
 		$this->CI = & get_instance();

 	}

 	function get_taxes_form_fields() {

-		$form['forms'] = array(base_url() . 'taxes/taxes_save/', array('id' => 'taxes_form', 'method' => 'POST', 'name' => 'taxes_form'));

+		$form['forms'] = array(base_url().'taxes/taxes_save/', array('id' => 'taxes_form', 'method' => 'POST', 'name' => 'taxes_form'));

 		$form['Tax Information'] = array(

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

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

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

 			array('Priority', 'INPUT', array('name' => 'taxes_priority', 'size' => '20', 'maxlength' => '5', 'class' => "text field medium"), 'trim|required|numeric', 'tOOL TIP', ''),

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

-			array('Rate(%)', 'INPUT', array('name' => 'taxes_rate', 'size' => '20','maxlength' => '20', 'class' => "text field medium"), 'trim|numeric|xss_clean', 'tOOL TIP', ''),

+			array('Rate(%)', 'INPUT', array('name' => 'taxes_rate', 'size' => '20', 'maxlength' => '20', 'class' => "text field medium"), 'trim|numeric|xss_clean', 'tOOL TIP', ''),

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

 

 		);

@@ -48,7 +48,7 @@ 
 		$form['Search'] = array(

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

 			array('Amount', 'INPUT', array('name' => 'taxes_amount[taxes_amount]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'taxes_amount[taxes_amount-integer]', '', '', '', 'search_int_type', ''),

-			array('Rate(%)', 'INPUT', array('name' => 'taxes_rate[taxes_rate]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'taxes_rate[taxes_rate-integer]', '', '', '', 'search_int_type', ''), array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_search_status', '', ''),   array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),

+			array('Rate(%)', 'INPUT', array('name' => 'taxes_rate[taxes_rate]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'taxes_rate[taxes_rate-integer]', '', '', '', 'search_int_type', ''), array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_search_status', '', ''), array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),

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

 		);

 		$form['button_search'] = array('name' => 'action', 'id' => "taxes_search_btn", 'content' => 'Search', 'value' => 'save', 'type' => 'button', 'class' => 'btn btn-line-parrot pull-right');

@@ -58,14 +58,14 @@ 
 

 	function build_taxes_list_for_admin() {

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

-		$currency_id=$account_info['currency_id'];

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

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

-			array("Name", "270", "taxes_description", "", "", "","","true","center"),

-			array("Priority", "145", "taxes_priority", "", "", "","","true","center"),

-			array("Amount($currency)", "260", "taxes_amount", "taxes_amount", "taxes_amount", "convert_to_currency","","true","right"),

-			array("Rate(%)", "230", "taxes_rate", "", "", "","","true","right"),

-			array("Status", "160", "status", "status", "taxes", "get_status","","true","center"),

+		$currency_id = $account_info['currency_id'];

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

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

+			array("Name", "270", "taxes_description", "", "", "", "", "true", "center"),

+			array("Priority", "145", "taxes_priority", "", "", "", "", "true", "center"),

+			array("Amount($currency)", "260", "taxes_amount", "taxes_amount", "taxes_amount", "convert_to_currency", "", "true", "right"),

+			array("Rate(%)", "230", "taxes_rate", "", "", "", "", "true", "right"),

+			array("Status", "160", "status", "status", "taxes", "get_status", "", "true", "center"),

 			array("Action", "175", "", "", "", array("EDIT" => array("url" => "taxes/taxes_edit/", "mode" => "popup"),

 					"DELETE" => array("url" => "taxes/taxes_delete/", "mode" => "single")))

 				));

@@ -73,8 +73,8 @@ 
 	}

 

 	function build_grid_buttons() {

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

-			array("Delete","btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "/taxes/taxes_delete_multiple/")));

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

+			array("Delete", "btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "/taxes/taxes_delete_multiple/")));

 		return $buttons_json;

 	}

 

Braces +3 added lines, -2 removed lines

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

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

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

-if (!defined('BASEPATH'))

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

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

 class Taxes_form {

 	function __construct() {

web_interface/astpp/application/modules/package/models/package_model.php

Spacing +60 added lines, -60 removed lines

@@ -41,20 +41,20 @@ 
 		}
 		return $query;
 	}
-	function get_reseller_package_list($flag,$accountid,$accounttype,$start = 0, $limit = 0){
-		 $instant_search=$this->session->userdata('left_panel_search_'.$accounttype.'_packages'); 
+	function get_reseller_package_list($flag, $accountid, $accounttype, $start = 0, $limit = 0) {
+		 $instant_search = $this->session->userdata('left_panel_search_'.$accounttype.'_packages'); 
 	 $instant_search_currency = $this->common_model->add_calculate_currency($instant_search, "", '', true, false);
-	 $like_str=!empty($instant_search) ? "(package_name like '%$instant_search%'  
-                                        OR includedseconds like '%$instant_search%')":null;
-	 $this->db->where('id',$accountid);
+	 $like_str = ! empty($instant_search) ? "(package_name like '%$instant_search%'  
+                                        OR includedseconds like '%$instant_search%')" : null;
+	 $this->db->where('id', $accountid);
 	 $this->db->select('pricelist_id');
-	 $account_info=(array)$this->db->get('accounts')->first_row();     
-	 $where=array('pricelist_id'=>$account_info['pricelist_id']);
-	  if(!empty($like_str))
+	 $account_info = (array)$this->db->get('accounts')->first_row();     
+	 $where = array('pricelist_id'=>$account_info['pricelist_id']);
+	  if ( ! empty($like_str))
 	  $this->db->where($like_str); 
 	 if ($flag) {
 	   $query = $this->db_model->select("*", "packages", $where, "id", "ASC", $limit, $start);
-	 }else {
+	 } else {
 	   $query = $this->db_model->countQuery("*", "packages", $where);
 	 }
 	  return $query;
@@ -68,7 +68,7 @@ 
 		/*
         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->db->insert("packages", $add_array);
 		return true;
@@ -79,7 +79,7 @@ 
 		/*
         ASTPP  3.0  add last modified field.
         */
-		$data['last_modified_date']=gmdate('Y-m-d H:i:s');
+		$data['last_modified_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");
@@ -94,7 +94,7 @@ 
 		/* ASTPP  3.0 
          * Remove Package information from table package_patterns as well.
         */
-		$this->db->where('package_id',$id);
+		$this->db->where('package_id', $id);
 		$this->db->delete('package_patterns');
 		/***************************************/
 		$this->db->where("id", $id);
@@ -105,89 +105,89 @@ 
 	function getpackage_counter_list($flag, $start = 0, $limit = 0) {
 		$where = array();
 	$accountinfo = $this->session->userdata('accountinfo');
-	$reseller_id=$accountinfo['type']== -1 ? 0 : $accountinfo['id'];
-	$this->db->where('reseller_id',$reseller_id);
+	$reseller_id = $accountinfo['type'] == -1 ? 0 : $accountinfo['id'];
+	$this->db->where('reseller_id', $reseller_id);
 	$this->db->select('id');
-	$result=$this->db->get('accounts');
+	$result = $this->db->get('accounts');
 	$this->db_model->build_search('package_list_search');	
-	if($this->session->userdata('advance_search')!= 1){
-	  if($result->num_rows() >0){
-	  $acc_arr=array();
-	  $result=$result->result_array();
-		foreach($result as $data){
-		  $acc_arr[]=$data['id'];
+	if ($this->session->userdata('advance_search') != 1) {
+	  if ($result->num_rows() > 0) {
+	  $acc_arr = array();
+	  $result = $result->result_array();
+		foreach ($result as $data) {
+		  $acc_arr[] = $data['id'];
 		}
-		$this->db->where_in('accountid',$acc_arr);
-		if($flag){
+		$this->db->where_in('accountid', $acc_arr);
+		if ($flag) {
 		  $this->db->select('*');
 		}
-		else{
+		else {
 		  $this->db->select('count(id) as count');
 		}
-		if($flag){
+		if ($flag) {
 		  $this->db->limit($limit, $start);
 		}
-			if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
-				$this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-			}else{
-				$this->db->order_by('seconds','desc');
+			if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined') {
+				$this->db->order_by($_GET['sortname'], ($_GET['sortorder'] == 'undefined') ? 'desc' : $_GET['sortorder']);
+			} else {
+				$this->db->order_by('seconds', 'desc');
 			}
-		$result=$this->db->get('counters');
+		$result = $this->db->get('counters');
 // 	    echo $this->db->last_query();exit;    
-		if($flag){
+		if ($flag) {
 		  return $result;
-		}else{
-		  $result=$result->result_array();
+		} else {
+		  $result = $result->result_array();
 		  return $result[0]['count'];
 		}
-	  }else{
-			if($flag){
-				$query=(object)array('num_rows'=>0);
+	  } else {
+			if ($flag) {
+				$query = (object)array('num_rows'=>0);
 			}
-			else{
-				$query=0;
+			else {
+				$query = 0;
 			}
 	  return $query;
 		}
-	}else{
+	} else {
           
-		 if($result->num_rows() >0){
-		$acc_arr=array();
-		$result=$result->result_array();
-		foreach($result as $data){
-		  $acc_arr[]=$data['id'];
+		 if ($result->num_rows() > 0) {
+		$acc_arr = array();
+		$result = $result->result_array();
+		foreach ($result as $data) {
+		  $acc_arr[] = $data['id'];
 		}
-		$this->db->where_in('accountid',$acc_arr);
+		$this->db->where_in('accountid', $acc_arr);
 	}
          
-		 if($flag){
+		 if ($flag) {
 	  $this->db->select('*');
 		 }
-		 else{
+		 else {
 		  $this->db->select('count(id) as count');
 		 }
-		 if($flag){
-	  $this->db->order_by('seconds','desc');
+		 if ($flag) {
+	  $this->db->order_by('seconds', 'desc');
 	  $this->db->limit($limit, $start);
 		 }
-		 $result=$this->db->get('counters');
+		 $result = $this->db->get('counters');
 //  	echo $this->db->last_query();exit;              
-		 if($result->num_rows() > 0){
-		  if($flag){
+		 if ($result->num_rows() > 0) {
+		  if ($flag) {
 	        
 		return $result;
-		  }else{
-		$result=$result->result_array();
+		  } else {
+		$result = $result->result_array();
 		
 		return $result[0]['count'];
 		  }
-		 }else{
-		  if($flag){
+		 } else {
+		  if ($flag) {
 	          
-		  $query=(object)array('num_rows'=>0);
+		  $query = (object)array('num_rows'=>0);
 		  }
-		  else{
-		  $query=0;
+		  else {
+		  $query = 0;
 		  }
 // 	echo $this->db->last_query();exit;    
 	return $query;
@@ -199,7 +199,7 @@ 
 		//echo "<pre>"; prit_r($data); exit;
 		$this->db->select("pattern,comment");
 		$this->db->where("id IN (".$data.")");
-		$result=$this->db->get("routes")->result_array();
+		$result = $this->db->get("routes")->result_array();
        
 		$tmp = array();
 		foreach ($result as $key => $data_value) {

Braces +14 added lines, -17 removed lines

@@ -50,11 +50,12 @@ 
 	 $this->db->select('pricelist_id');
 	 $account_info=(array)$this->db->get('accounts')->first_row();     
 	 $where=array('pricelist_id'=>$account_info['pricelist_id']);
-	  if(!empty($like_str))
-	  $this->db->where($like_str); 
+	  if(!empty($like_str)) {
+	  	  $this->db->where($like_str);
+	  }
 	 if ($flag) {
 	   $query = $this->db_model->select("*", "packages", $where, "id", "ASC", $limit, $start);
-	 }else {
+	 } else {
 	   $query = $this->db_model->countQuery("*", "packages", $where);
 	 }
 	  return $query;
@@ -120,8 +121,7 @@ 
 		$this->db->where_in('accountid',$acc_arr);
 		if($flag){
 		  $this->db->select('*');
-		}
-		else{
+		} else{
 		  $this->db->select('count(id) as count');
 		}
 		if($flag){
@@ -129,27 +129,26 @@ 
 		}
 			if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
 				$this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-			}else{
+			} else{
 				$this->db->order_by('seconds','desc');
 			}
 		$result=$this->db->get('counters');
 // 	    echo $this->db->last_query();exit;    
 		if($flag){
 		  return $result;
-		}else{
+		} else{
 		  $result=$result->result_array();
 		  return $result[0]['count'];
 		}
-	  }else{
+	  } else{
 			if($flag){
 				$query=(object)array('num_rows'=>0);
-			}
-			else{
+			} else{
 				$query=0;
 			}
 	  return $query;
 		}
-	}else{
+	} else{
           
 		 if($result->num_rows() >0){
 		$acc_arr=array();
@@ -162,8 +161,7 @@ 
          
 		 if($flag){
 	  $this->db->select('*');
-		 }
-		 else{
+		 } else{
 		  $this->db->select('count(id) as count');
 		 }
 		 if($flag){
@@ -176,17 +174,16 @@ 
 		  if($flag){
 	        
 		return $result;
-		  }else{
+		  } else{
 		$result=$result->result_array();
 		
 		return $result[0]['count'];
 		  }
-		 }else{
+		 } else{
 		  if($flag){
 	          
 		  $query=(object)array('num_rows'=>0);
-		  }
-		  else{
+		  } else{
 		  $query=0;
 		  }
 // 	echo $this->db->last_query();exit;    

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

Spacing +129 added lines, -129 removed lines

@@ -35,7 +35,7 @@ 
 		$this->load->library('csvreader');
 
 		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+			redirect(base_url().'/astpp/login');
 	}
 
    
@@ -66,12 +66,12 @@ 
 
 		echo json_encode($json_data);
 	}
-	function package_list_reseller($accountid,$accounttype){
+	function package_list_reseller($accountid, $accounttype) {
 	$json_data = array();
-		$count_all = $this->package_model->get_reseller_package_list(false,$accountid,$accounttype);
+		$count_all = $this->package_model->get_reseller_package_list(false, $accountid, $accounttype);
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
-		$query = $this->package_model->get_reseller_package_list(true,$accountid,$accounttype,$paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
+		$query = $this->package_model->get_reseller_package_list(true, $accountid, $accounttype, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
 		$grid_fields = json_decode($this->package_form->build_package_list_for_reseller());
 		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
 		echo json_encode($json_data);
@@ -87,7 +87,7 @@ 
 			$this->session->set_userdata('package_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'package/package_list/');
+			redirect(base_url().'package/package_list/');
 		}
 	}
     
@@ -105,30 +105,30 @@ 
 	function package_edit($edit_id = '') {
 		$data['page_title'] = 'Package Details';
 		$accountinfo = $this->session->userdata("accountinfo");
-		$reseller_id=$accountinfo['type'] == 1 ? $accountinfo['id']:0;
-		$package_result = $this->db_model->getSelect("*", " packages", array('id' => $edit_id,"reseller_id"=>$reseller_id));
+		$reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
+		$package_result = $this->db_model->getSelect("*", " packages", array('id' => $edit_id, "reseller_id"=>$reseller_id));
 		if ($package_result->num_rows > 0) {
-			$package_info=(array)$package_result->first_row();
+			$package_info = (array)$package_result->first_row();
 			$data['form'] = $this->form->build_form($this->package_form->get_package_form_fields($package_info['id']), $package_info);
-			$data['edit_id']=$package_info['id'];
+			$data['edit_id'] = $package_info['id'];
 			$this->load->view('view_packages_edit', $data);
 		} else {
-			redirect(base_url() . 'package/package_list/');
+			redirect(base_url().'package/package_list/');
 		}
 	}
 
-	function package_save($id="") {
+	function package_save($id = "") {
 		$add_array = $this->input->post();
 		$data['form'] = $this->form->build_form($this->package_form->get_package_form_fields($add_array['id']), $add_array);
 		if ($add_array['id'] != '') {
 			if ($this->form_validation->run() == FALSE) {
-				$data['edit_id']= $add_array['id'];
+				$data['edit_id'] = $add_array['id'];
 				$data['validation_errors'] = validation_errors();
 				$this->load->view('view_packages_edit', $data);
 			} else {
 				$this->package_model->edit_package($add_array, $add_array['id']);
 				$this->session->set_flashdata('astpp_errormsg', 'Package updated successfully!');
-				redirect(base_url() . 'package/package_list/');
+				redirect(base_url().'package/package_list/');
 				exit;
 			}
 		} else {
@@ -143,14 +143,14 @@ 
 ASTPP  3.0 
 For Email Broadcast when package is add
 **/
-		$accountinfo = $this->db_model->getSelect("*", "accounts", array("pricelist_id" => $add_array['pricelist_id'],"status"=>0, "deleted"=>0));
+		$accountinfo = $this->db_model->getSelect("*", "accounts", array("pricelist_id" => $add_array['pricelist_id'], "status"=>0, "deleted"=>0));
 		$accountinfo = $accountinfo->result_array();
 				$this->session->set_flashdata('astpp_errormsg', 'Package added successfully!');
-		foreach($accountinfo as $key => $value){
+		foreach ($accountinfo as $key => $value) {
 			$this->common->mail_to_users('add_package', $value);
 		}
 /**************************************/
-				redirect(base_url() . 'package/package_list/');
+				redirect(base_url().'package/package_list/');
 				exit;
 			}
 		}
@@ -166,14 +166,14 @@ 
 	$package_detail = $this->db_model->getSelect("*", "packages", array("id"=>$id));
 	$package_detail = $package_detail->result_array();
 	$package_detail = $package_detail[0];
-	$accountinfo = $this->db_model->getSelect("*", "accounts", array("pricelist_id" => $package_detail['pricelist_id'],"status"=>0, "deleted"=>0)); 
+	$accountinfo = $this->db_model->getSelect("*", "accounts", array("pricelist_id" => $package_detail['pricelist_id'], "status"=>0, "deleted"=>0)); 
 		$this->package_model->remove_package($id);
 		$this->session->set_flashdata('astpp_notification', 'Package removed successfully!');
-	foreach($accountinfo->result_array() as $key => $value){
+	foreach ($accountinfo->result_array() as $key => $value) {
 		$this->common->mail_to_users('remove_package', $value);
 	}	
 /******************************************/
-		redirect(base_url() . 'package/package_list/');
+		redirect(base_url().'package/package_list/');
 	}
     
 	function package_delete_multiple() {
@@ -183,28 +183,28 @@ 
 		echo $this->db->delete("packages");
 	}
 
-	function package_pattern_list($package_id){
+	function package_pattern_list($package_id) {
 		$data['page_title'] = 'Package Codes';
-		if(!empty($package_id)){
+		if ( ! empty($package_id)) {
 			$data['grid_fields'] = $this->package_form->build_pattern_list_for_customer($package_id);
 			$data['grid_buttons'] = $this->package_form->set_pattern_grid_buttons($package_id);
 			$data["edit_id"] = $package_id;
-			$this->load->view("view_package_pattern_list",$data);
-		}else{
+			$this->load->view("view_package_pattern_list", $data);
+		} else {
 			redirect(base_url()."package/package_list/");
 		}    
 	}
-	function package_pattern_list_json($package_id){
+	function package_pattern_list_json($package_id) {
 		$json_data = array();
-		$instant_search=$this->session->userdata('left_panel_search_package_pattern');
-		$like_str=!empty($instant_search) ? "(patterns like '%$instant_search%'  OR destination like '%$instant_search%' )" :null;
-		if(!empty($like_str))
+		$instant_search = $this->session->userdata('left_panel_search_package_pattern');
+		$like_str = ! empty($instant_search) ? "(patterns like '%$instant_search%'  OR destination like '%$instant_search%' )" : null;
+		if ( ! empty($like_str))
 		$this->db->where($like_str);
 		$where = array('package_id' => $package_id);
 		$count_all = $this->db_model->countQuery("*", "package_patterns", $where);
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
-		if(!empty($like_str))
+		if ( ! empty($like_str))
 		$this->db->where($like_str);
 		$pattern_data = $this->db_model->select("*", "package_patterns", $where, "id", "ASC", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
         
@@ -237,11 +237,11 @@ 
 
 		echo json_encode($json_data);
 	}
-	function package_counter_report_export(){
+	function package_counter_report_export() {
 		$query = $this->db_model->getSelect("*", "counters", '');
 		$outbound_array = array();
 		ob_clean();
-		$outbound_array[] = array("Package Name", "Account",  "Used Seconds");
+		$outbound_array[] = array("Package Name", "Account", "Used Seconds");
 		if ($query->num_rows() > 0) {
 
 			foreach ($query->result_array() as $row) {
@@ -253,10 +253,10 @@ 
 				}
 			}
 		$this->load->helper('csv');
-		array_to_csv($outbound_array, 'Usage_Report_' . date("Y-m-d") . '.csv');
+		array_to_csv($outbound_array, 'Usage_Report_'.date("Y-m-d").'.csv');
     
 	}
-	function package_pattern_json($package_id){
+	function package_pattern_json($package_id) {
 		$json_data = array();
 		$where = array('package_id' => $package_id);
 
@@ -283,37 +283,37 @@ 
 	function package_patterns_add_json($accountid) {
 		$this->load->module('rates/rates');
 		$json_data = array();
-		$count_all = $this->rates_model->getunblocked_package_pattern($accountid,false);
+		$count_all = $this->rates_model->getunblocked_package_pattern($accountid, false);
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
 
-		$query = $this->rates->rates_model->getunblocked_package_pattern($accountid,true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
+		$query = $this->rates->rates_model->getunblocked_package_pattern($accountid, true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
 		$grid_fields = json_decode($this->rates->rates_form->build_block_pattern_list_for_customer());
 		$json_data['rows'] = $this->rates->form->build_grid($query, $grid_fields);
 
 		echo json_encode($json_data);
 	}
 	function package_patterns_add_info($packageid) {	
-		$result = $this->package_model->insert_package_pattern($this->input->post('prefixies', true),$packageid);
+		$result = $this->package_model->insert_package_pattern($this->input->post('prefixies', true), $packageid);
 		unset($_POST);
 		echo $result;
 		exit;
 	}
 	function package_patterns_delete($packageid, $patternid) {
 		$this->db->delete("package_patterns", array("id" => $patternid));
-		redirect(base_url() . "package/package_pattern_list/$packageid");
+		redirect(base_url()."package/package_pattern_list/$packageid");
 	}
-	function package_patterns_selected_delete(){
+	function package_patterns_selected_delete() {
 		$ids = $this->input->post("selected_ids", true);
 		$where = "id IN ($ids)";
 		unset($_POST);
-		echo $this->db->delete("package_patterns",$where);
+		echo $this->db->delete("package_patterns", $where);
 	}
     
-	function package_quick_search($module_name){
+	function package_quick_search($module_name) {
 		$action = $this->input->post();
-		$this->session->set_userdata('left_panel_search_package_pattern',"");
-		if(!empty($action['left_panel_search'])){
+		$this->session->set_userdata('left_panel_search_package_pattern', "");
+		if ( ! empty($action['left_panel_search'])) {
 			$this->session->set_userdata('left_panel_search_package_pattern', $action['left_panel_search']);
 		}
 	}
@@ -322,22 +322,22 @@ 
 	function package_patterns_import($edit_id) {
 		//echo "nick";exit;
 		$data['page_title'] = 'Import Package Patterns';
-		$this->session->set_userdata('import_package_code_csv',"");
-		$error_data =  $this->session->userdata('import_package_code_csv_error');
+		$this->session->set_userdata('import_package_code_csv', "");
+		$error_data = $this->session->userdata('import_package_code_csv_error');
 		$full_path = $this->config->item('rates-file-path');
-		if(file_exists($full_path.$error_data) && $error_data != ""){
+		if (file_exists($full_path.$error_data) && $error_data != "") {
 			unlink($full_path.$error_data);
-			$this->session->set_userdata('import_package_code_csv_error',"");
+			$this->session->set_userdata('import_package_code_csv_error', "");
 		}
 		$data['edit_id'] = $edit_id;
 		$this->load->view('view_import_package_code', $data);
 	}
     
     
-	function package_patterns_download_sample_file($file_name){
+	function package_patterns_download_sample_file($file_name) {
 		$this->load->helper('download');
 		$full_path = base_url()."assets/Rates_File/".$file_name.".csv";
-		$arrContextOptions=array(
+		$arrContextOptions = array(
 			"ssl"=>array(
 			"verify_peer"=>false,
 			"verify_peer_name"=>false,
@@ -348,75 +348,75 @@ 
 	}
     
     
-	function package_patterns_preview_file($edit_id){
-	$invalid_flag= false;
-	$data=array();
+	function package_patterns_preview_file($edit_id) {
+	$invalid_flag = false;
+	$data = array();
 	$data['page_title'] = 'Import Package Patterns';
-	$check_header=$this->input->post('check_header',true);
-	if(empty($_FILES) || !isset($_FILES)){
+	$check_header = $this->input->post('check_header', true);
+	if (empty($_FILES) || ! isset($_FILES)) {
 	  redirect(base_url()."package/package_pattern_list/");
 	}
-	$get_extension=strpos($_FILES['package_code_import']['name'],'.');
+	$get_extension = strpos($_FILES['package_code_import']['name'], '.');
 	$new_final_arr_key = $this->config->item('package-code-field');
-	if(!$get_extension){
-		$data['error']= "Please Upload File Atleast";
+	if ( ! $get_extension) {
+		$data['error'] = "Please Upload File Atleast";
 		}
 		//echo "<pre>";print_r($_FILES);exit;
-		if (isset($_FILES['package_code_import']['name']) && $_FILES['package_code_import']['name'] != "" ) {
-			list($txt,$ext) = explode(".", $_FILES['package_code_import']['name']);
+		if (isset($_FILES['package_code_import']['name']) && $_FILES['package_code_import']['name'] != "") {
+			list($txt, $ext) = explode(".", $_FILES['package_code_import']['name']);
             
-			if($ext == "csv" && $_FILES['package_code_import']['size'] > 0){ 
+			if ($ext == "csv" && $_FILES['package_code_import']['size'] > 0) { 
 				$error = $_FILES['package_code_import']['error'];
 				if ($error == 0) {
 					$uploadedFile = $_FILES["package_code_import"]["tmp_name"];
-					$csv_data=$this->csvreader->parse_file($uploadedFile,$new_final_arr_key,$check_header);
-					if(!empty($csv_data)){
+					$csv_data = $this->csvreader->parse_file($uploadedFile, $new_final_arr_key, $check_header);
+					if ( ! empty($csv_data)) {
 			$full_path = $this->config->item('rates-file-path');
 			//echo "<pre>";print_r($full_path);exit;
-					$actual_file_name = "ASTPP-ORIGIN-RATES-".date("Y-m-d H:i:s"). "." . $ext;
+					$actual_file_name = "ASTPP-ORIGIN-RATES-".date("Y-m-d H:i:s").".".$ext;
 					//echo "<pre>";print_r($actual_file_name);exit;
-					if (move_uploaded_file($uploadedFile,$full_path.$actual_file_name)) {
-			$flag=false;
+					if (move_uploaded_file($uploadedFile, $full_path.$actual_file_name)) {
+			$flag = false;
 			//$data['trunkid']=isset($_POST['trunk_id']) && $_POST['trunk_id'] > 0 ? $_POST['trunk_id'] : 0;
 						$data['csv_tmp_data'] = $csv_data;
 						//$data['pricelistid'] = $_POST['pricelist_id'];
 						$data['page_title'] = "Package Patterns Preview";
-						$data['check_header']=$check_header;
-						$this->session->set_userdata('import_package_code_csv',$actual_file_name);
-					}else{
+						$data['check_header'] = $check_header;
+						$this->session->set_userdata('import_package_code_csv', $actual_file_name);
+					} else {
 						$data['error'] = "File Uploading Fail Please Try Again";
 					}
 				}
 			 }   
-			else{
-					$data['error']=="File Uploading Fail Please Try Again";
+			else {
+					$data['error'] == "File Uploading Fail Please Try Again";
 				}
 		   }
 		   else {
 				$data['error'] = "Invalid file format : Only CSV file allows to import records(Can't import empty file)";
 			}
-			}else{
-		$invalid_flag=true;
+			} else {
+		$invalid_flag = true;
 			}
 		if ($invalid_flag) {
 			$str = '';
 			if (empty($_FILES['package_code_import']['name'])) {
-				$str.= '<br/>Please Select File.';
+				$str .= '<br/>Please Select File.';
 			}
-			$data['error']=$str;
+			$data['error'] = $str;
 		}
 		 $data['edit_id'] = $edit_id;
 		$this->load->view('view_import_package_code', $data);
 	}
     
     
-	function package_patterns_import_file($edit_id,$check_header=false) {
+	function package_patterns_import_file($edit_id, $check_header = false) {
 		//echo $edit_id."===="; exit;
 	   $new_final_arr = array();
 		$invalid_array = array();
 		$new_final_arr_key = $this->config->item('package-code-field');
 	$screen_path = $this->config->item('screen_path');
-	$reseller_id=0;
+	$reseller_id = 0;
 		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
 			$reseller_id = $this->session->userdata["accountinfo"]['id'];
 		}
@@ -424,113 +424,113 @@ 
 		$full_path = $this->config->item('rates-file-path');
 		//echo "<pre>";print_r($full_path);exit;
 		$originationrate_file_name = $this->session->userdata('import_package_code_csv');	
-		$csv_tmp_data = $this->csvreader->parse_file($full_path.$originationrate_file_name,$new_final_arr_key,$check_header); 
+		$csv_tmp_data = $this->csvreader->parse_file($full_path.$originationrate_file_name, $new_final_arr_key, $check_header); 
 		//echo "<pre>";print_r($csv_tmp_data);exit;
-	$i=0; 
-		 $pattern_arr=array();
+	$i = 0; 
+		 $pattern_arr = array();
 		foreach ($csv_tmp_data as $key => $csv_data) {	
-	  if(isset($csv_data['patterns']) && $csv_data['patterns']!= '' && $i != 0){
-		$str=null;
-		$pattern=$csv_data['patterns'];
-		 if(!in_array($csv_data['patterns'],$pattern_arr)){
+	  if (isset($csv_data['patterns']) && $csv_data['patterns'] != '' && $i != 0) {
+		$str = null;
+		$pattern = $csv_data['patterns'];
+		 if ( ! in_array($csv_data['patterns'], $pattern_arr)) {
 			$this->db->select('count(id) as count');
-			$this->db->where('patterns',"^".$csv_data['patterns'].".*");
-			$this->db->where('package_id',$edit_id);
-			$pattern_res=(array)$this->db->get('package_patterns')->first_row();
-			if($pattern_res['count'] ==0){
-			$csv_data['destination']= isset($csv_data['destination'])? $csv_data['destination'] :'';
-			$str=$this->data_validate($csv_data);
-			if($str != ""){
-			$invalid_array[$i]=$csv_data;
+			$this->db->where('patterns', "^".$csv_data['patterns'].".*");
+			$this->db->where('package_id', $edit_id);
+			$pattern_res = (array)$this->db->get('package_patterns')->first_row();
+			if ($pattern_res['count'] == 0) {
+			$csv_data['destination'] = isset($csv_data['destination']) ? $csv_data['destination'] : '';
+			$str = $this->data_validate($csv_data);
+			if ($str != "") {
+			$invalid_array[$i] = $csv_data;
 			$invalid_array[$i]['error'] = $str;
 		}
-		else{
-		  $csv_data['patterns'] = "^" . $csv_data['patterns'] . ".*";
+		else {
+		  $csv_data['patterns'] = "^".$csv_data['patterns'].".*";
 		  $csv_data['package_id'] = $edit_id;
-		  $new_final_arr[$i]=$csv_data;
-		  $pattern_arr[$csv_data['patterns']]=$csv_data['patterns'];
+		  $new_final_arr[$i] = $csv_data;
+		  $pattern_arr[$csv_data['patterns']] = $csv_data['patterns'];
 		}
-		}else{
-			$invalid_array[$i]=$csv_data;
+		} else {
+			$invalid_array[$i] = $csv_data;
 			$invalid_array[$i]['error'] = "Duplicate pattern found from  database.";
 		 }
-	  }else{
-		  $invalid_array[$i]=$csv_data;
+	  } else {
+		  $invalid_array[$i] = $csv_data;
 		  $invalid_array[$i]['error'] = "Duplicate pattern found from import file";
 		  }
-		  $pattern_arr[$csv_data['patterns']]=$pattern;
+		  $pattern_arr[$csv_data['patterns']] = $pattern;
 	  }
 
 		  $i++;
 		}
-		  if(!empty($new_final_arr)){
+		  if ( ! empty($new_final_arr)) {
   		$result = $this->package_model->bulk_insert_package_pattern($new_final_arr);
 		  }
 	   //unlink($full_path.$originationrate_file_name);
-	 $count=count($invalid_array);
+	 $count = count($invalid_array);
 	 //echo "<pre>";print_r($count);exit;
-		if($count >0){
+		if ($count > 0) {
 			$session_id = "-1";
 			$fp = fopen($full_path.$session_id.'.csv', 'w');
-			foreach($new_final_arr_key as $key=>$value){
-		  $custom_array[0][$key]=ucfirst($key);
+			foreach ($new_final_arr_key as $key=>$value) {
+		  $custom_array[0][$key] = ucfirst($key);
 			}
-			$custom_array[0]['error']= "Error";
-			$invalid_array =array_merge($custom_array,$invalid_array);
-			foreach($invalid_array as $err_data){
-					fputcsv($fp,$err_data);
+			$custom_array[0]['error'] = "Error";
+			$invalid_array = array_merge($custom_array, $invalid_array);
+			foreach ($invalid_array as $err_data) {
+					fputcsv($fp, $err_data);
 			}
 			fclose($fp);
 		   $this->session->set_userdata('import_package_code_csv_error', $session_id.".csv");
 		   $data["error"] = $invalid_array;
 		   $data['packageid'] = $edit_id;
 		   $data['impoted_count'] = count($new_final_arr);
-		   $data['failure_count'] = count($invalid_array)-1;
+		   $data['failure_count'] = count($invalid_array) - 1;
 		   $data['page_title'] = 'Package Patterns Import Error';
 		   //print_r($data)	;exit;
-		   $this->load->view('view_import_error',$data);
-		 } else{
+		   $this->load->view('view_import_error', $data);
+		 } else {
 	   $this->session->set_flashdata('astpp_errormsg', 'Package patterns imported successfully!');
 	   //echo base_url()."package/package_pattern_list/" . $edit_id . "/";exit;
-		   redirect(base_url()."package/package_pattern_list/" . $edit_id . "/");
+		   redirect(base_url()."package/package_pattern_list/".$edit_id."/");
 		   }
 	}
     
-	  function data_validate($csvdata){
-		  $str=null;
+	  function data_validate($csvdata) {
+		  $str = null;
 	  $alpha_regex = "/^[a-z ,.'-]+$/i";
 	  $alpha_numeric_regex = "/^[a-z0-9 ,.'-]+$/i";
 	  $email_regex = "/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$/"; 
-	  $str.= $csvdata['patterns']!= '' ? null : 'Code,';
-	  $str=rtrim($str,',');
-	  if(!$str){
-		  $str.= is_numeric($csvdata['patterns']) ? null : 'Code,';
+	  $str .= $csvdata['patterns'] != '' ? null : 'Code,';
+	  $str = rtrim($str, ',');
+	  if ( ! $str) {
+		  $str .= is_numeric($csvdata['patterns']) ? null : 'Code,';
 
-			$str.= preg_match( $alpha_numeric_regex, $csvdata['destination'] ) ? null :'Destination,';
+			$str .= preg_match($alpha_numeric_regex, $csvdata['destination']) ? null : 'Destination,';
 	      
-		  if($str){
-		$str=rtrim($str,',');
-		$error_field=explode(',',$str);
+		  if ($str) {
+		$str = rtrim($str, ',');
+		$error_field = explode(',', $str);
 		$count = count($error_field);
-		$str.= $count > 1 ? ' are not valid' : ' is not Valid';
+		$str .= $count > 1 ? ' are not valid' : ' is not Valid';
 		return $str;
 		  }
-		  else{
+		  else {
 		  return false;
 		  }
 	  }
-	  else{
-	  $str=rtrim($str,',');
-		$error_field=explode(',',$str);
+	  else {
+	  $str = rtrim($str, ',');
+		$error_field = explode(',', $str);
 		$count = count($error_field);
-		$str.= $count > 1 ? ' are required' : ' is Required';
+		$str .= $count > 1 ? ' are required' : ' is Required';
 	return $str;
 	}
   }
     
-	function package_patterns_error_download(){
+	function package_patterns_error_download() {
 		$this->load->helper('download');
-		$error_data =  $this->session->userdata('import_package_code_csv_error');
+		$error_data = $this->session->userdata('import_package_code_csv_error');
 		$full_path = $this->config->item('rates-file-path');
 		$data = file_get_contents($full_path.$error_data);
 		force_download("Package_Code_error.csv", $data); 

Braces +19 added lines, -21 removed lines

@@ -34,8 +34,9 @@ 
 		$this->load->model('package_model');
 		$this->load->library('csvreader');
 
-		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+		if ($this->session->userdata('user_login') == FALSE) {
+					redirect(base_url() . '/astpp/login');
+		}
 	}
 
    
@@ -190,7 +191,7 @@ 
 			$data['grid_buttons'] = $this->package_form->set_pattern_grid_buttons($package_id);
 			$data["edit_id"] = $package_id;
 			$this->load->view("view_package_pattern_list",$data);
-		}else{
+		} else{
 			redirect(base_url()."package/package_list/");
 		}    
 	}
@@ -198,14 +199,16 @@ 
 		$json_data = array();
 		$instant_search=$this->session->userdata('left_panel_search_package_pattern');
 		$like_str=!empty($instant_search) ? "(patterns like '%$instant_search%'  OR destination like '%$instant_search%' )" :null;
-		if(!empty($like_str))
-		$this->db->where($like_str);
+		if(!empty($like_str)) {
+				$this->db->where($like_str);
+		}
 		$where = array('package_id' => $package_id);
 		$count_all = $this->db_model->countQuery("*", "package_patterns", $where);
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
-		if(!empty($like_str))
-		$this->db->where($like_str);
+		if(!empty($like_str)) {
+				$this->db->where($like_str);
+		}
 		$pattern_data = $this->db_model->select("*", "package_patterns", $where, "id", "ASC", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
         
 		$grid_fields = json_decode($this->package_form->build_pattern_list_for_customer($package_id));
@@ -383,19 +386,17 @@ 
 						$data['page_title'] = "Package Patterns Preview";
 						$data['check_header']=$check_header;
 						$this->session->set_userdata('import_package_code_csv',$actual_file_name);
-					}else{
+					} else{
 						$data['error'] = "File Uploading Fail Please Try Again";
 					}
 				}
-			 }   
-			else{
+			 } else{
 					$data['error']=="File Uploading Fail Please Try Again";
 				}
-		   }
-		   else {
+		   } else {
 				$data['error'] = "Invalid file format : Only CSV file allows to import records(Can't import empty file)";
 			}
-			}else{
+			} else{
 		$invalid_flag=true;
 			}
 		if ($invalid_flag) {
@@ -443,18 +444,17 @@ 
 			if($str != ""){
 			$invalid_array[$i]=$csv_data;
 			$invalid_array[$i]['error'] = $str;
-		}
-		else{
+		} else{
 		  $csv_data['patterns'] = "^" . $csv_data['patterns'] . ".*";
 		  $csv_data['package_id'] = $edit_id;
 		  $new_final_arr[$i]=$csv_data;
 		  $pattern_arr[$csv_data['patterns']]=$csv_data['patterns'];
 		}
-		}else{
+		} else{
 			$invalid_array[$i]=$csv_data;
 			$invalid_array[$i]['error'] = "Duplicate pattern found from  database.";
 		 }
-	  }else{
+	  } else{
 		  $invalid_array[$i]=$csv_data;
 		  $invalid_array[$i]['error'] = "Duplicate pattern found from import file";
 		  }
@@ -514,12 +514,10 @@ 
 		$count = count($error_field);
 		$str.= $count > 1 ? ' are not valid' : ' is not Valid';
 		return $str;
-		  }
-		  else{
+		  } else{
 		  return false;
 		  }
-	  }
-	  else{
+	  } else{
 	  $str=rtrim($str,',');
 		$error_field=explode(',',$str);
 		$count = count($error_field);

web_interface/astpp/application/modules/package/libraries/package_form.php

Spacing +28 added lines, -28 removed lines

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

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

 

-if (!defined('BASEPATH'))

+if ( ! defined('BASEPATH'))

 	exit('No direct script access allowed');

 

 class Package_form {

 

-	function get_package_form_fields($id='') {

-		$form['forms'] = array(base_url() . 'package/package_save/'.$id."/",array('id'=>'packeage_form','method'=>'POST','name'=>'packeage_form'));

+	function get_package_form_fields($id = '') {

+		$form['forms'] = array(base_url().'package/package_save/'.$id."/", array('id'=>'packeage_form', 'method'=>'POST', 'name'=>'packeage_form'));

 		$form['Package Information'] = array(

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

 			array('', 'HIDDEN', array('name' => 'status', 'value' => '1'), '', '', ''),

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

-			array('Rate Group', 'pricelist_id', 'SELECT', '', 'dropdown', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'pricelists', 'build_dropdown', 'where_arr', array("status" => "0","reseller_id" => "0")),

-			array('Included Seconds', 'INPUT', array('name' => 'includedseconds', 'size' => '20',  'class' => "text field medium"), 'trim|is_numeric|required|xss_clean', 'tOOL TIP', ''),

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

+			array('Rate Group', 'pricelist_id', 'SELECT', '', 'dropdown', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'pricelists', 'build_dropdown', 'where_arr', array("status" => "0", "reseller_id" => "0")),

+			array('Included Seconds', 'INPUT', array('name' => 'includedseconds', 'size' => '20', 'class' => "text field medium"), 'trim|is_numeric|required|xss_clean', 'tOOL TIP', ''),

 /**

 ASTPP  3.0 

 Add For Package Inbound or Outbound or both?

@@ -53,13 +53,13 @@ 
 		$form['forms'] = array("", array('id' => "package_search"));

 		$form['Search'] = array(

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

-			array('Rate Group', 'pricelist_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'pricelists', 'build_dropdown', 'where_arr', array("status" => "0","reseller_id" => "0")),

+			array('Rate Group', 'pricelist_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'pricelists', 'build_dropdown', 'where_arr', array("status" => "0", "reseller_id" => "0")),

 			array('Included Seconds', 'INPUT', array('name' => 'includedseconds[includedseconds]', 'value' => '', 'size' => '20', 'class' => "text field"), '', 'Tool tips info', '1', 'includedseconds[includedseconds-integer]', '', '', '', 'search_int_type', ''),

 /**

 ASTPP  3.0 

 Add For Package Inbound or Outbound or both?

 **/ 	    

- 		array('Applicable For?', 'applicable_for', 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'set_package_type', '',''),

+ 		array('Applicable For?', 'applicable_for', 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'set_package_type', '', ''),

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

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

             

@@ -75,28 +75,28 @@ 
 

 	function build_package_list_for_admin() {

 		// array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);

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

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

 /**

 ASTPP  3.0 

 For Package edit on Name

 **/ 

-			array("Name", "170", "package_name", "", "", "","EDITABLE","true","center"),

+			array("Name", "170", "package_name", "", "", "", "EDITABLE", "true", "center"),

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

-			array("Rate Group", "150", "pricelist_id", "name", "pricelists", "get_field_name","","true","center"),

-			array("Included Seconds", "160", "includedseconds", "", "", "","","true","center"),

+			array("Rate Group", "150", "pricelist_id", "name", "pricelists", "get_field_name", "", "true", "center"),

+			array("Included Seconds", "160", "includedseconds", "", "", "", "", "true", "center"),

 /**

 ASTPP  3.0 

 Add For Package Inbound or Outbound or both?

 **/	    

-		array("Applicable For?", "200", "applicable_for", "applicable_for", "applicable_for", "get_package_type","","true","center"),

+		array("Applicable For?", "200", "applicable_for", "applicable_for", "applicable_for", "get_package_type", "", "true", "center"),

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

 		/*

             ASTPP  3.0 

             Creation date,last modified date show in grid

             */

-			 array("Status", "140", "status", "status", "packages", "get_status","","true","center"),

-			array("Created Date", "120", "creation_date", "creation_date", "creation_date", "convert_GMT_to","","true","center"),

-			array("Modified Date", "140", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to","","true","center"),

+			 array("Status", "140", "status", "status", "packages", "get_status", "", "true", "center"),

+			array("Created Date", "120", "creation_date", "creation_date", "creation_date", "convert_GMT_to", "", "true", "center"),

+			array("Modified Date", "140", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to", "", "true", "center"),

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

 			/*

 	    ASTPP  3.0 

@@ -111,7 +111,7 @@ 
 	}

 

 	function build_grid_buttons() {

-		$buttons_json = json_encode(array(array("Create","btn btn-line-warning btn","fa fa-plus-circle fa-lg", "button_action", "/package/package_add/"),

+		$buttons_json = json_encode(array(array("Create", "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/package/package_add/"),

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

 			));

 		return $buttons_json;

@@ -121,15 +121,15 @@ 
 

 	function build_package_counter_list_for_admin() {

 	 // array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);

-		$grid_field_arr = json_encode(array(array("Package Name", "430", "package_id", "package_name", "packages", "get_field_name","","true","center"),

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

-			array("Used Seconds", "420", "seconds", "", "", "","","true","center"),

+		$grid_field_arr = json_encode(array(array("Package Name", "430", "package_id", "package_name", "packages", "get_field_name", "", "true", "center"),

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

+			array("Used Seconds", "420", "seconds", "", "", "", "", "true", "center"),

 				));

 		return $grid_field_arr;

 	}

 	function build_pattern_list_for_customer($packageid) {

 		$grid_field_arr = json_encode(array(

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

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

 			array("Code", "450", "patterns", "patterns", "", "get_only_numeric_val"),

 			array("Destination", "450", "destination", "", "", ""),

 			array("Action", "100", "", "", "", array("DELETE" => array("url" => "package/package_patterns_delete/$packageid/", "mode" => "single")))

@@ -137,7 +137,7 @@ 
 		return $grid_field_arr;

 	}

 	function set_pattern_grid_buttons($packageid) {

-		$buttons_json = json_encode(array(array("Create","btn btn-line-warning btn","fa fa-plus-circle fa-lg", "button_action", "/package/customer_add_patterns/$packageid", "popup")));

+		$buttons_json = json_encode(array(array("Create", "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/package/customer_add_patterns/$packageid", "popup")));

 		return $buttons_json;

 	}

 

@@ -145,17 +145,17 @@ 
 

 function build_package_counter_report() {

 		$buttons_json = json_encode(array(

-			array("Export","btn btn-xing" ," fa fa-download fa-lg", "button_action", "/package/package_counter_report_export/", 'single')

+			array("Export", "btn btn-xing", " fa fa-download fa-lg", "button_action", "/package/package_counter_report_export/", 'single')

             

 			));

 		return $buttons_json;

 	}

-	function build_package_list_for_reseller(){

+	function build_package_list_for_reseller() {

 			$grid_field_arr = json_encode(array(

-			array("Name", "310", "package_name", "", "", "","","true","center"),

-			array("Rate Group", "250", "pricelist_id", "name", "pricelists", "get_field_name","","true","center"),

-			array("Included Seconds", "260", "includedseconds", "", "", "","","true","center"),

-			array("Status", "160", "status", "status", "status", "get_status","","true","center"),

+			array("Name", "310", "package_name", "", "", "", "", "true", "center"),

+			array("Rate Group", "250", "pricelist_id", "name", "pricelists", "get_field_name", "", "true", "center"),

+			array("Included Seconds", "260", "includedseconds", "", "", "", "", "true", "center"),

+			array("Status", "160", "status", "status", "status", "get_status", "", "true", "center"),

 				));

 		return $grid_field_arr;

 	}

Braces +3 added lines, -2 removed lines

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

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

 

-if (!defined('BASEPATH'))

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

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

 class Package_form {

 

web_interface/astpp/application/modules/package/views/view_import_package_code.php

Spacing +13 added lines, -13 removed lines

@@ -2,20 +2,20 @@ 
 <? startblock('extra_head') ?>
 <? endblock() ?>
 <? startblock('page-title') ?>
-<?= $page_title;?>
+<?= $page_title; ?>
 <? endblock() ?>
 <? startblock('content') ?>        
-   <?php if(!isset($csv_tmp_data)){ ?>
+   <?php if ( ! isset($csv_tmp_data)) { ?>
    
 <section class="slice color-three padding-t-20">
 	<div class="w-section inverse no-padding">
     	<div class="container">
-    	 <form method="post" action="<?= base_url().'package/package_patterns_preview_file/'.$edit_id . "/"?>" enctype="multipart/form-data" id="package_code">
+    	 <form method="post" action="<?= base_url().'package/package_patterns_preview_file/'.$edit_id."/"?>" enctype="multipart/form-data" id="package_code">
         	<div class="row">
               <div class="col-md-12">
             	<div class="w-box">
                    <span  style="margin-left:10px; text-align: center;background-color: none;color:#DD191D;">
-                    <? if(isset($error) && !empty($error)) {
+                    <? if (isset($error) && ! empty($error)) {
 						echo $error;
 					}?>
                    </span>            	
@@ -35,9 +35,9 @@ 
                                </div>
                            </div>
 				<?
-				 $logintype=$this->session->userdata('userlevel_logintype');
+				 $logintype = $this->session->userdata('userlevel_logintype');
 					   // $trunk=null;
-				 if($logintype !=1) { ?>
+				 if ($logintype != 1) { ?>
                            <div class="col-md-12 no-padding">
                               
                                <div>
@@ -97,7 +97,7 @@ 
 <?}?>    
         
 <?php
-	if(isset($csv_tmp_data) && !empty($csv_tmp_data)){ ?>
+	if (isset($csv_tmp_data) && ! empty($csv_tmp_data)) { ?>
 
 <section class="slice color-three">
 	<div class="w-section inverse no-padding">
@@ -106,14 +106,14 @@ 
              <div class="col-md-12 margin-t-10">
             <form id="import_form" name="import_form" action="<?=base_url()?>package/package_patterns_import_file/<?=$edit_id?>/<?=$check_header?>/" method="POST">
             <table width="100%" border="1"  class="details_table table">
-                <?  $cnt =7;
-					foreach($csv_tmp_data as $csv_key => $csv_value){
-						if($csv_key <  15){
+                <?  $cnt = 7;
+					foreach ($csv_tmp_data as $csv_key => $csv_value) {
+						if ($csv_key < 15) {
 							echo "<tr>";
-							foreach($csv_value as $field_name => $field_val){
-								if($csv_key == 0){
+							foreach ($csv_value as $field_name => $field_val) {
+								if ($csv_key == 0) {
 									echo "<th>".ucfirst($field_name)."</th>";
-								}else{
+								} else {
 									echo "<td class='portlet-content'>".$field_val."</td>";   
 								}
 							}

Braces +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
 							foreach($csv_value as $field_name => $field_val){
 								if($csv_key == 0){
 									echo "<th>".ucfirst($field_name)."</th>";
-								}else{
+								} else{
 									echo "<td class='portlet-content'>".$field_val."</td>";   
 								}
 							}

web_interface/astpp/application/modules/package/views/view_package_add.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
         <div class="w-section inverse no-padding">
             <?php echo $form; ?>
              <?php
-				if(isset($validation_errors) && $validation_errors != ''){ ?>
+				if (isset($validation_errors) && $validation_errors != '') { ?>
                     <script>
                         var ERR_STR = '<?php echo $validation_errors; ?>';
                         print_error(ERR_STR);