iNextrix / ASTPP

web_interface/astpp/application/modules/signup/views/view_signup_inactive.php

Spacing +7 added lines, -7 removed lines

@@ -6,17 +6,17 @@ 
 <meta http-equiv="X-UA-Compatible" content="IE=edge">    
 <title>
 	<?php       
-        $this->db->where('domain',$_SERVER['HTTP_HOST']);
+        $this->db->where('domain', $_SERVER['HTTP_HOST']);
         $this->db->select('*');
         $this->db->order_by('accountid', 'desc');
         $this->db->limit(1);
         $invoiceconf = $this->db->get('invoice_conf');
         $invoiceconf = (array)$invoiceconf->first_row();
-	if(isset($invoiceconf['website_title']) && $invoiceconf['website_title']!='') {
+	if (isset($invoiceconf['website_title']) && $invoiceconf['website_title'] != '') {
 	?>
 	Signup | <?php echo $invoiceconf['website_title']; ?>
 	<?php
-		}else{ 
+		} else { 
 	?>
 	Signup | ASTPP - Open Source Voip Billing Solution
 	<?php
@@ -70,18 +70,18 @@ 
              <div class="w-box dark sign-in-wr box_shadow margin-b-10">
 		    	<div class="col-md-12 no-padding">
 					  <?php
-						if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
+						if (isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != "") {
 						$logo = $this->session->userdata['user_logo'];
-						}else{
+						} else {
 						$logo = 'logo.png';
 						}
 
 						if ($this->session->userdata('userlevel_logintype') != '0') {?>
 						<a class="col-md-12" style="padding:0px 0px 10px 0px" href="<?php echo base_url(); ?>">
-						<img style="height: 44px; width:216px;" id="logo" alt="dashboard" src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">
+						<img style="height: 44px; width:216px;" id="logo" alt="dashboard" src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">
 						<? } else {?> 
 						<a class="col-md-12" style="padding:0px 0px 20px 0px" href="<?php echo base_url(); ?>">
-						<img style="height: 44px; width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='ASTPP - Open Source Voip Billing Solution' src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">
+						<img style="height: 44px; width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='ASTPP - Open Source Voip Billing Solution' src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">
 						<? }?>	
 						</a>
 

web_interface/astpp/application/modules/signup/views/view_signup_active.php

Spacing +9 added lines, -9 removed lines

@@ -6,17 +6,17 @@ 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>
 	<?php       
-        $this->db->where('domain',$_SERVER['HTTP_HOST']);
+        $this->db->where('domain', $_SERVER['HTTP_HOST']);
         $this->db->select('*');
         $this->db->order_by('accountid', 'desc');
         $this->db->limit(1);
         $invoiceconf = $this->db->get('invoice_conf');
         $invoiceconf = (array)$invoiceconf->first_row();
-	if(isset($invoiceconf['website_title']) && $invoiceconf['website_title']!='') {
+	if (isset($invoiceconf['website_title']) && $invoiceconf['website_title'] != '') {
 	?>
 	Signup | <?php echo $invoiceconf['website_title']; ?>
 	<?php
-		}else{ 
+		} else { 
 	?>
 	Signup | ASTPP - Open Source Voip Billing Solution
 	<?php
@@ -53,9 +53,9 @@ 
             <div class="row">
 
 			<div class="col-md-4 col-md-offset-4">&nbsp;<span class="login_error">
-                        <?php if (isset($astpp_notification)){ ?>
+                        <?php if (isset($astpp_notification)) { ?>
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
-                    <?php }else{
+                    <?php } else {
 						 echo "&nbsp;";
 					} 
 			$astpp_err_msg = $this->session->flashdata('astpp_signupmsg');
@@ -76,18 +76,18 @@ 
                           <div class="">
                           <div class="col-md-9">
                            	<?php
-							if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
+							if (isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != "") {
 							$logo = $this->session->userdata['user_logo'];
-							}else{
+							} else {
 							$logo = 'logo.png';
 							}
 
 							if ($this->session->userdata('userlevel_logintype') != '0') {?>
 							<a class="col-md-12" style="padding:0px 0px 10px 0px" href="<?php echo base_url(); ?>">
-							<img style="height: 44px; width:216px;" id="logo" alt="dashboard" src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">
+							<img style="height: 44px; width:216px;" id="logo" alt="dashboard" src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">
 							<? } else {?> 
 							<a class="col-md-12" style="padding:0px 0px 20px 0px" href="<?php echo base_url(); ?>">
-							<img style="height: 44px; width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='ASTPP - Open Source Voip Billing Solution' src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">
+							<img style="height: 44px; width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='ASTPP - Open Source Voip Billing Solution' src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">
 							<? }?>	
                             	</a>
                            </div>

web_interface/astpp/application/modules/signup/views/view_signup.php

Spacing +9 added lines, -9 removed lines

@@ -6,17 +6,17 @@ 
 <meta http-equiv="X-UA-Compatible" content="IE=edge">    

 <title>

 	<?php       

-        $this->db->where('domain',$_SERVER['HTTP_HOST']);

+        $this->db->where('domain', $_SERVER['HTTP_HOST']);

         $this->db->select('*');

         $this->db->order_by('accountid', 'desc');

         $this->db->limit(1);

         $invoiceconf = $this->db->get('invoice_conf');

         $invoiceconf = (array)$invoiceconf->first_row();

-	if(isset($invoiceconf['website_title']) && $invoiceconf['website_title']!='') {

+	if (isset($invoiceconf['website_title']) && $invoiceconf['website_title'] != '') {

 	?>

 	Signup | <?php echo $invoiceconf['website_title']; ?>

 	<?php

-		}else{ 

+		} else { 

 	?>

 	Signup | ASTPP - Open Source Voip Billing Solution

 	<?php

@@ -113,9 +113,9 @@ 
             <div class="row">

                 <div class="col-md-4 col-md-offset-4">&nbsp;

 					<span class="login_error">

-                        <?php if (isset($astpp_notification)){ ?>

+                        <?php if (isset($astpp_notification)) { ?>

                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.

-						<?php }else{

+						<?php } else {

 						 echo "&nbsp;";

 						} ?>

                     </span>

@@ -132,18 +132,18 @@ 
 											<!-- Header Start-->

 												<div class="col-md-12">

 													 <?php

-														if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){

+														if (isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != "") {

 															$logo = $this->session->userdata['user_logo'];

-														}else{

+														} else {

 															$logo = 'logo.png';

 														}

 														

 													if ($this->session->userdata('userlevel_logintype') != '0') {?>

 															<a class="col-md-10" style="padding:0px 0px 10px 0px" href="<?php echo base_url(); ?>">

-																<img style="height: 44px; width:216px;" id="logo" alt="dashboard" src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">

+																<img style="height: 44px; width:216px;" id="logo" alt="dashboard" src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">

 														<? } else {?> 

 																<a class="col-md-10" style="padding:0px 0px 20px 0px" href="<?php echo base_url(); ?>">

-																<img style="height: 44px; width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='ASTPP - Open Source Voip Billing Solution' src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">

+																<img style="height: 44px; width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='ASTPP - Open Source Voip Billing Solution' src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">

 														<? }?>

 															</a>

 												<div class="col-md-2">

web_interface/astpp/application/modules/signup/views/view_signup_success.php

Spacing +9 added lines, -9 removed lines

@@ -6,17 +6,17 @@ 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">

    <title>

 	<?php       

-        $this->db->where('domain',$_SERVER['HTTP_HOST']);

+        $this->db->where('domain', $_SERVER['HTTP_HOST']);

         $this->db->select('*');

         $this->db->order_by('accountid', 'desc');

         $this->db->limit(1);

         $invoiceconf = $this->db->get('invoice_conf');

         $invoiceconf = (array)$invoiceconf->first_row();

-	if(isset($invoiceconf['website_title']) && $invoiceconf['website_title']!='') {

+	if (isset($invoiceconf['website_title']) && $invoiceconf['website_title'] != '') {

 	?>

 	Signup | <?php echo $invoiceconf['website_title']; ?>

 	<?php

-		}else{ 

+		} else { 

 	?>

 	Signup | ASTPP - Open Source Voip Billing Solution

 	<?php

@@ -53,9 +53,9 @@ 
             <div class="row">

 

 			<div class="col-md-4 col-md-offset-4">&nbsp;<span class="login_error">

-                        <?php if (isset($astpp_notification)){ ?>

+                        <?php if (isset($astpp_notification)) { ?>

                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.

-                    <?php }else{

+                    <?php } else {

 						 echo "&nbsp;";

 					} 

 			$astpp_err_msg = $this->session->flashdata('astpp_signupmsg');

@@ -75,18 +75,18 @@ 
                           

                             	

                             	<?php

-							if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){

+							if (isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != "") {

 							$logo = $this->session->userdata['user_logo'];

-							}else{

+							} else {

 							$logo = 'logo.png';

 							}

 

 							if ($this->session->userdata('userlevel_logintype') != '0') {?>

 							<a class="col-md-12" style="padding:0px 0px 10px 0px" href="<?php echo base_url(); ?>">

-							<img style="height: 44px; width:216px;" id="logo" alt="dashboard" src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">

+							<img style="height: 44px; width:216px;" id="logo" alt="dashboard" src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">

 							<? } else {?> 

 							<a class="col-md-12" style="padding:0px 0px 20px 0px" href="<?php echo base_url(); ?>">

-							<img style="height: 44px; width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='ASTPP - Open Source Voip Billing Solution' src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">

+							<img style="height: 44px; width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='ASTPP - Open Source Voip Billing Solution' src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">

 							<? }?>	

                             	</a>

                             	<div class="col-md-12 no-padding"></div>

web_interface/astpp/application/modules/signup/views/view_forgot_success.php

Spacing +9 added lines, -9 removed lines

@@ -6,17 +6,17 @@ 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>
 	<?php       
-        $this->db->where('domain',$_SERVER['HTTP_HOST']);
+        $this->db->where('domain', $_SERVER['HTTP_HOST']);
         $this->db->select('*');
         $this->db->order_by('accountid', 'desc');
         $this->db->limit(1);
         $invoiceconf = $this->db->get('invoice_conf');
         $invoiceconf = (array)$invoiceconf->first_row();
-	if(isset($invoiceconf['website_title']) && $invoiceconf['website_title']!='') {
+	if (isset($invoiceconf['website_title']) && $invoiceconf['website_title'] != '') {
 	?>
 	Forgot Password | <?php echo $invoiceconf['website_title']; ?>
 	<?php
-		}else{ 
+		} else { 
 	?>
 	Forgot Password | ASTPP - Open Source Voip Billing Solution
 	<?php
@@ -55,9 +55,9 @@ 
             <div class="row">
 
 			<div class="col-md-4 col-md-offset-4">&nbsp;<span class="login_error">
-                        <?php if (isset($astpp_notification)){ ?>
+                        <?php if (isset($astpp_notification)) { ?>
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
-                    <?php }else{
+                    <?php } else {
 						 echo "&nbsp;";
 					} 
 			$astpp_err_msg = $this->session->flashdata('astpp_signupmsg');
@@ -74,18 +74,18 @@ 
                         	<h2 class="text-center">
                           
                             	<?php
-							if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
+							if (isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != "") {
 							$logo = $this->session->userdata['user_logo'];
-							}else{
+							} else {
 							$logo = 'logo.png';
 							}
 
 							if ($this->session->userdata('userlevel_logintype') != '0') {?>
 							<a class="col-md-12" style="padding:0px 0px 10px 0px" href="<?php echo base_url(); ?>">
-							<img style="height: 44px; width:216px;" id="logo" alt="dashboard" src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">
+							<img style="height: 44px; width:216px;" id="logo" alt="dashboard" src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">
 							<? } else {?> 
 							<a class="col-md-12" style="padding:0px 0px 20px 0px" href="<?php echo base_url(); ?>">
-							<img style="height: 44px; width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='ASTPP - Open Source Voip Billing Solution' src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">
+							<img style="height: 44px; width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='ASTPP - Open Source Voip Billing Solution' src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">
 							<? }?>	
                             	</a>
                             	<div class="col-md-12 no-padding"></div>

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

Spacing +228 added lines, -228 removed lines

@@ -38,7 +38,7 @@ 
 		$this->load->model('Astpp_common');
 		$this->protected_pages = array('account_list');
 		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/login/login');
+			redirect(base_url().'/login/login');
 	}
 
 	function customer_list() {
@@ -97,7 +97,7 @@ 
 			$this->session->set_userdata('customer_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'accounts/customer_list/');
+			redirect(base_url().'accounts/customer_list/');
 		}
 	}
 
@@ -108,11 +108,11 @@ 
 
 	function customer_export_cdr_xls() {
 	$account_info = $accountinfo = $this->session->userdata('accountinfo');
-	$currency_id=$account_info['currency_id'];
-	 $currency=$this->common->get_field_name('currency', 'currency', $currency_id);
+	$currency_id = $account_info['currency_id'];
+	 $currency = $this->common->get_field_name('currency', 'currency', $currency_id);
 		$query = $this->accounts_model->get_customer_Account_list(true, '', '', true);
 		ob_clean();
-		$customer_array[] = array("Account", "First Name", "Last Name", "Company", "Rate Group ", "Balance ($currency)", "Credit Limit ($currency)", "First Used", "Expiry Date","CC","Status","Created Date");
+		$customer_array[] = array("Account", "First Name", "Last Name", "Company", "Rate Group ", "Balance ($currency)", "Credit Limit ($currency)", "First Used", "Expiry Date", "CC", "Status", "Created Date");
 		if ($query->num_rows() > 0) {
 
 			foreach ($query->result_array() as $row) {
@@ -133,7 +133,7 @@ 
 			}
 		}
 		$this->load->helper('csv');
-		array_to_csv($customer_array, 'Customers_' . date("Y-m-d") . '.csv');
+		array_to_csv($customer_array, 'Customers_'.date("Y-m-d").'.csv');
 	}
 
 	function provider_add() {
@@ -154,20 +154,20 @@ 
 		$entity_type = strtolower($this->common->get_entity_type('', '', $type));
 		$data['username'] = $this->session->userdata('user_name');
 		$data['flag'] = 'create';
-		$data['page_title'] = 'Create ' . $entity_type;
+		$data['page_title'] = 'Create '.$entity_type;
 		$data['back_flag'] = true;
 		$data['country_id'] = $accountinfo['country_id'];
 		$data['callingcard'] = Common_model::$global_config['system_config']['pinlength'];
 		$data['currency_id'] = $accountinfo['currency_id'];
 		$data['timezone_id'] = $accountinfo['timezone_id'];
 		$data['form'] = $this->form->build_form($this->accounts_form->get_customer_form_fields($entity_type), '');
-		if (!$data['timezone_id']) {
+		if ( ! $data['timezone_id']) {
 			$data['timezone_id'] = 1;
 		}
-		if (!$data['currency_id']) {
+		if ( ! $data['currency_id']) {
 			$data['currency_id'] = 1;
 		}
-		if (!$data['country_id']) {
+		if ( ! $data['country_id']) {
 			$data['country_id'] = 1;
 		}
 		$data['entity_name'] = $entity_type;
@@ -182,9 +182,9 @@ 
 		$where = array('id' => $edit_id, "reseller_id" => $reseller_id);
 		$account = $this->db_model->getSelect("*", "accounts", $where);
 		if ($account->num_rows > 0) {
-			$account_data = (array) $account->first_row();
+			$account_data = (array)$account->first_row();
 			$entity_name = strtolower($this->common->get_entity_type('', '', $account_data['type']));
-			$data['page_title'] =ucfirst($entity_name) . " Profile";
+			$data['page_title'] = ucfirst($entity_name)." Profile";
 			$data['invoice_date'] = $account_data['invoice_day'];
 			$data["account_data"] = $account_data;
 			 $data['callingcard'] = Common_model::$global_config['system_config']['pinlength'];
@@ -202,10 +202,10 @@ 
 			$account_data['password'] = $this->common->decode($account_data['password']);
 			/*             * ********************** */
 			$data['form'] = $this->form->build_form($this->accounts_form->get_customer_form_fields($entity_name, $edit_id), $account_data);
-			$data['edit_id']=$edit_id;
+			$data['edit_id'] = $edit_id;
 			$this->load->view('view_customer_details', $data);
 		} else {
-			redirect(base_url() . 'accounts/customer_list/');
+			redirect(base_url().'accounts/customer_list/');
 		}
 	}
 
@@ -217,10 +217,10 @@ 
 		$data['currency_id'] = $add_array['currency_id'];
 		$data['entity_name'] = $entity_name;
 		$data['callingcard'] = Common_model::$global_config['system_config']['pinlength'];
-		$data['edit_id']=$add_array['id'];
+		$data['edit_id'] = $add_array['id'];
 		$data['form'] = $this->form->build_form($this->accounts_form->get_customer_form_fields($entity_name, $add_array['id']), $add_array);
 		if ($add_array['id'] != '') {
-			$data['page_title'] = 'Edit ' . $this->common->get_entity_type('', '', $add_array['type']);
+			$data['page_title'] = 'Edit '.$this->common->get_entity_type('', '', $add_array['type']);
 			if ($this->form_validation->run() == FALSE) {
 				$data['validation_errors'] = validation_errors();
 			} else {
@@ -245,16 +245,16 @@ 
 					unset($add_array['tax_id']);
 				}
 				//Completed
-				unset($add_array['posttoexternal'],$add_array['number'],$add_array['balance']);
+				unset($add_array['posttoexternal'], $add_array['number'], $add_array['balance']);
 				$this->accounts_model->edit_account($add_array, $add_array['id']);
-				$this->session->set_flashdata('astpp_errormsg', ucfirst($entity_name) . ' updated successfully!');
-				redirect(base_url() . 'accounts/customer_list/');
+				$this->session->set_flashdata('astpp_errormsg', ucfirst($entity_name).' updated successfully!');
+				redirect(base_url().'accounts/customer_list/');
 				exit;
 			}
 			$data["account_data"]["0"] = $add_array;
 			$this->load->view('view_customer_details', $data);
 		} else {
-			$data['page_title'] = 'Create ' . $entity_name;
+			$data['page_title'] = 'Create '.$entity_name;
 			if ($this->form_validation->run() == FALSE) {
 				$data['validation_errors'] = validation_errors();
 			} else {
@@ -277,8 +277,8 @@ 
 					}
 					unset($add_array['tax_id']);
 				}
-				$this->session->set_flashdata('astpp_errormsg', ucfirst($entity_name) . ' added successfully!');
-				redirect(base_url() . 'accounts/customer_list/');
+				$this->session->set_flashdata('astpp_errormsg', ucfirst($entity_name).' added successfully!');
+				redirect(base_url().'accounts/customer_list/');
 				exit;
 			}
 			$this->load->view('view_accounts_create', $data);
@@ -299,7 +299,7 @@ 
 		$account = $this->db_model->getSelect("*", "accounts", $where);
 
 		if ($account->num_rows > 0) {
-			$account_data = (array) $account->first_row();
+			$account_data = (array)$account->first_row();
 			$accounttype = strtolower($this->common->get_entity_type('', '', $account_data['type']));
 			$data['page_title'] = 'Speed Dial';
 			$data['accounttype'] = $accounttype;
@@ -318,7 +318,7 @@ 
 			$data['form'] = $this->form->build_form($this->accounts_form->get_customer_form_fields($accounttype, $edit_id), $account_data);
 			$this->load->view('view_customer_speed_dial', $data);
 		} else {
-			redirect(base_url() . 'accounts/customer_list/');
+			redirect(base_url().'accounts/customer_list/');
 		}
 	}
 
@@ -352,7 +352,7 @@ 
 
 	function customer_ipmap($edit_id) {
 		$data['page_title'] = "IP Settings";
-		$data['add_form']=true;
+		$data['add_form'] = true;
 		//Get Account information from session.
 		$accountinfo = $this->session->userdata('accountinfo');
 		//Get Parent informartion
@@ -360,14 +360,14 @@ 
 		$where = array('id' => $edit_id, "reseller_id" => $reseller_id);
 		$account_res = $this->db_model->getSelect("type", "accounts", $where);
 		if ($account_res->num_rows > 0) {
-			$account_data = (array) $account_res->first_row();
+			$account_data = (array)$account_res->first_row();
 			$accounttype = strtolower($this->common->get_entity_type('', '', $account_data['type']));
 			$data["grid_fields"] = $this->accounts_form->build_ip_list_for_customer($edit_id, $accounttype);
 			$data['edit_id'] = $edit_id;
 			$data['accounttype'] = $accounttype;
 			$this->load->view('view_customer_ipmap', $data);
 		} else {
-			redirect(base_url() . 'accounts/customer_list/');
+			redirect(base_url().'accounts/customer_list/');
 			exit;
 		}
 	}
@@ -375,14 +375,14 @@ 
 	function customer_ipmap_json($accountid, $accounttype) {
 		$json_data = array();
 		$where = array("accountid" => $accountid);
-		$instant_search=$this->session->userdata('left_panel_search_'.$accounttype.'_ipmap');
-		$like_str=!empty($instant_search) ? "(name like '%$instant_search%'  OR ip like '%$instant_search%' OR prefix like '%$instant_search%' OR created_date like '%$instant_search%' )" :null;
-		if(!empty($like_str))
+		$instant_search = $this->session->userdata('left_panel_search_'.$accounttype.'_ipmap');
+		$like_str = ! empty($instant_search) ? "(name like '%$instant_search%'  OR ip like '%$instant_search%' OR prefix like '%$instant_search%' OR created_date like '%$instant_search%' )" : null;
+		if ( ! empty($like_str))
 		$this->db->where($like_str);
 		$count_all = $this->db_model->countQuery("*", "ip_map", $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);
 		$query = $this->db_model->select("*", "ip_map", $where, "id", "ASC", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
 		$grid_fields = json_decode($this->accounts_form->build_ip_list_for_customer($accountid, $accounttype));
@@ -403,7 +403,7 @@ 
 				if (strpos($ip, '/') !== false) {
 					$add_array['ip'] = $add_array['ip'];
 				} else {
-					$add_array['ip'] = $add_array['ip'] . '/32';
+					$add_array['ip'] = $add_array['ip'].'/32';
 				}
 				$where = array("ip" => trim($add_array['ip']), "prefix" => trim($add_array['prefix']));
 				$getdata = $this->db_model->countQuery("*", "ip_map", $where);
@@ -438,7 +438,7 @@ 
 			}
 			$this->session->set_flashdata('astpp_notification', 'IP removed sucessfully.');
 		}
-		redirect(base_url() . "accounts/" . $accounttype . "_ipmap/" . $accountid . "/");
+		redirect(base_url()."accounts/".$accounttype."_ipmap/".$accountid."/");
 	}
 
 	//This function using for provider t
@@ -456,30 +456,30 @@ 
 		$where = array('id' => $edit_id, "reseller_id" => $reseller_id);
 		$account_res = $this->db_model->getSelect("type", "accounts", $where);
 		if ($account_res->num_rows > 0) {
-			$account_data = (array) $account_res->first_row();
+			$account_data = (array)$account_res->first_row();
 			$accounttype = strtolower($this->common->get_entity_type('', '', $account_data['type']));
 			$data["grid_fields"] = $this->accounts_form->build_animap_list_for_customer($edit_id, $accounttype);
 			$data['edit_id'] = $edit_id;
 			$data['accounttype'] = $accounttype;
 			$this->load->view('view_customer_animap', $data);
 		} else {
-			redirect(base_url() . 'accounts/customer_list/');
+			redirect(base_url().'accounts/customer_list/');
 			exit;
 		}
 	}
 
 	function customer_animap_json($accountid, $accounttype) {
 		$json_data = array();
-		$instant_search=$this->session->userdata('left_panel_search_'.$accounttype.'_animap'); 
-		$like_str=!empty($instant_search) ? "(number like '%$instant_search%'  OR  creation_date like '%$instant_search%' )" :null;
-		if(!empty($like_str))
+		$instant_search = $this->session->userdata('left_panel_search_'.$accounttype.'_animap'); 
+		$like_str = ! empty($instant_search) ? "(number like '%$instant_search%'  OR  creation_date like '%$instant_search%' )" : null;
+		if ( ! empty($like_str))
 		$this->db->where($like_str);
 		$where = array("accountid" => $accountid);
 		$count_all = $this->db_model->countQuery("*", "ani_map", $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);
 		$query = $this->db_model->select("*", "ani_map", $where, "id", "ASC", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
 
@@ -497,7 +497,7 @@ 
 	function customer_animap_action($action, $accountid, $aniid = "") {
 		$entity_type = $this->common->get_field_name('type', 'accounts', array('id' => $accountid));
 		$entity_type = strtolower($this->common->get_entity_type('', '', $entity_type));
-		$url = "accounts/" . $entity_type . "_animap/$accountid/";
+		$url = "accounts/".$entity_type."_animap/$accountid/";
 		if ($action == "add") {
 			$ani = $this->input->post();
 			$this->db->where('number', $ani['number']);
@@ -527,7 +527,7 @@ 
 			$this->session->set_flashdata('astpp_notification', 'Caller ID removed sucessfully!');
 			$this->db_model->delete("ani_map", array("id" => $aniid));
 		}
-		redirect(base_url() . $url);
+		redirect(base_url().$url);
 	}
 
 	//This function using by Customer/Provider edit tab
@@ -548,7 +548,7 @@ 
 		}
 		if ($module == "invoices") {
 			$this->load->module('invoices/invoices');
-			$this->invoices->customer_invoices($accountid,$entity_type, false);
+			$this->invoices->customer_invoices($accountid, $entity_type, false);
 		}
 		if ($module == "subscription") {
 			$this->load->module('charges/charges');
@@ -560,11 +560,11 @@ 
 		}
 		if ($module == "charges") {
 			$this->load->module('reports/reports');
-			$this->reports->customer_charge_history($accountid,$entity_type);
+			$this->reports->customer_charge_history($accountid, $entity_type);
 		}
 		if ($module == "refill") {
 			$this->load->module('reports/reports');
-			$this->reports->customer_refillreport($accountid,$entity_type);
+			$this->reports->customer_refillreport($accountid, $entity_type);
 		}
 		if ($module == "emailhistory") {
 			$this->load->module('email/email');
@@ -572,13 +572,13 @@ 
 		}
 		if ($module == "opensips") {
 			$this->load->module('opensips/opensips');
-			$this->opensips->customer_opensips_json($accountid,$entity_type);
+			$this->opensips->customer_opensips_json($accountid, $entity_type);
 		}
 	}
-	function customer_details_search($module_name){
+	function customer_details_search($module_name) {
 		$action = $this->input->post();
-		$this->session->set_userdata('left_panel_search_'.$module_name,"");
-		if(!empty($action['left_panel_search'])){
+		$this->session->set_userdata('left_panel_search_'.$module_name, "");
+		if ( ! empty($action['left_panel_search'])) {
 			$this->session->set_userdata('left_panel_search_'.$module_name, $action['left_panel_search']);
 		}
 	}
@@ -595,7 +595,7 @@ 
 		$where = array('id' => $edit_id, "reseller_id" => $reseller_id);
 		$account_res = $this->db_model->getSelect("type", "accounts", $where);
 		if ($account_res->num_rows > 0) {
-			$account_data = (array) $account_res->first_row();
+			$account_data = (array)$account_res->first_row();
 			$accounttype = strtolower($this->common->get_entity_type('', '', $account_data['type']));
 			$this->load->module('freeswitch/freeswitch');
 			$data["grid_buttons"] = $this->freeswitch->freeswitch_form->fsdevices_build_grid_buttons($edit_id, $accounttype);
@@ -604,7 +604,7 @@ 
 			$data['accounttype'] = $accounttype;
 			$this->load->view('view_customer_sipdevices', $data);
 		} else {
-			redirect(base_url() . 'accounts/customer_list/');
+			redirect(base_url().'accounts/customer_list/');
 			exit;
 		}
 	}
@@ -620,7 +620,7 @@ 
 		if ($action == "delete") {
 			$this->freeswitch->freeswitch_model->delete_freeswith_devices($id);
 			$this->session->set_flashdata('astpp_notification', 'Sip Device removed successfully!');
-			redirect(base_url() . "accounts/" . $entity_type . "_sipdevices/$accountid/");
+			redirect(base_url()."accounts/".$entity_type."_sipdevices/$accountid/");
 		}
 		if ($action == "edit") {
 			$this->freeswitch->customer_fssipdevices_edit($id, $accountid);
@@ -641,7 +641,7 @@ 
 		$where = array('id' => $edit_id, "reseller_id" => $reseller_id);
 		$account_res = $this->db_model->getSelect("type", "accounts", $where);
 		if ($account_res->num_rows > 0) {
-			$account_data = (array) $account_res->first_row();
+			$account_data = (array)$account_res->first_row();
 			$accounttype = strtolower($this->common->get_entity_type('', '', $account_data['type']));
 			$this->load->module('freeswitch/freeswitch');
 			$this->load->module('opensips/opensips');
@@ -651,7 +651,7 @@ 
 			$data['accounttype'] = $accounttype;
 			$this->load->view('view_customer_opensips_devices', $data);
 		} else {
-			redirect(base_url() . 'accounts/customer_list/');
+			redirect(base_url().'accounts/customer_list/');
 			exit;
 		}
 	}
@@ -659,12 +659,12 @@ 
 	function customer_opensips_action($action, $accountid, $id) {
 		$entity_type = $this->common->get_field_name('type', 'accounts', array('id' => $accountid));
 		$entity_type = strtolower($this->common->get_entity_type('', '', $entity_type));
-		$url = "accounts/" . $entity_type . "_opensips/$accountid/";
+		$url = "accounts/".$entity_type."_opensips/$accountid/";
 		$this->load->module('opensips/opensips');
 		if ($action == "delete") {
 			$this->opensips->opensips_model->remove_opensips($id);
 			$this->session->set_flashdata('astpp_notification', 'Opensips removed successfully!');
-			redirect(base_url() . $url);
+			redirect(base_url().$url);
 		}
 		if ($action == "edit") {
 			$this->opensips->customer_opensips_edit($accountid, $id);
@@ -689,7 +689,7 @@ 
 		$where = array('id' => $edit_id, "reseller_id" => $reseller_id);
 		$account_res = $this->db_model->getSelect("type", "accounts", $where);
 		if ($account_res->num_rows > 0) {
-			$account_data = (array) $account_res->first_row();
+			$account_data = (array)$account_res->first_row();
 			$accounttype = strtolower($this->common->get_entity_type('', '', $account_data['type']));
 			$data['chargelist'] = form_dropdown('applayable_charge', $this->Astpp_common->list_applyable_charges($edit_id), '');
 			$this->load->module('reports/reports');
@@ -698,7 +698,7 @@ 
 			$data['accounttype'] = $accounttype;
 			$this->load->view('view_customer_charges', $data);
 		} else {
-			redirect(base_url() . 'accounts/customer_list/');
+			redirect(base_url().'accounts/customer_list/');
 			exit;
 		}
 	}
@@ -720,7 +720,7 @@ 
 		$where = array('id' => $edit_id, "reseller_id" => $reseller_id);
 		$account_res = $this->db_model->getSelect("type", "accounts", $where);
 		if ($account_res->num_rows > 0) {
-			$account_data = (array) $account_res->first_row();
+			$account_data = (array)$account_res->first_row();
 			$accounttype = strtolower($this->common->get_entity_type('', '', $account_data['type']));
 			$data['chargelist'] = form_dropdown_all(array("name" => 'applayable_charge', 'id' => 'applayable_charge', 'class' => ""), $this->Astpp_common->list_applyable_charges($edit_id), '');
 			$this->load->module('charges/charges');
@@ -729,7 +729,7 @@ 
 			$data['accounttype'] = $accounttype;
 			$this->load->view('view_customer_subscriptions', $data);
 		} else {
-			redirect(base_url() . 'accounts/customer_list/');
+			redirect(base_url().'accounts/customer_list/');
 			exit;
 		}
 	}
@@ -749,7 +749,7 @@ 
           For Email Broadcast when Subscription Add - Delete
 		 * */
 		$accountinfo = $this->db_model->getSelect("*", "accounts", array("id" => $accountid));
-		$accountinfo = (array) $accountinfo->first_row();
+		$accountinfo = (array)$accountinfo->first_row();
 		/*         * ****************************** */
 		if ($action == "add") {
 			$charge_id = $this->input->post("applayable_charge", true);
@@ -771,7 +771,7 @@ 
 		 * */
 		$this->common->mail_to_users($template_name, $accountinfo);
 		/*         * ********************************* */
-		redirect(base_url() . "accounts/" . $accounttype . "_subscription/$accountid/");
+		redirect(base_url()."accounts/".$accounttype."_subscription/$accountid/");
 	}
 
 	function provider_dids($edit_id) {
@@ -787,7 +787,7 @@ 
 		$where = array('id' => $edit_id, "reseller_id" => $reseller_id);
 		$account_res = $this->db_model->getSelect("type,country_id", "accounts", $where);
 		if ($account_res->num_rows > 0) {
-			$account_data = (array) $account_res->first_row();
+			$account_data = (array)$account_res->first_row();
 			$accounttype = strtolower($this->common->get_entity_type('', '', $account_data['type']));
 			$this->load->module('did/did');
 			$data['grid_fields'] = $this->did->did_form->build_did_list_for_customer($edit_id, $accounttype);
@@ -799,7 +799,7 @@ 
 			$data['country_id'] = $account_data['country_id'];
 			$this->load->view('view_customer_dids', $data);
 		} else {
-			redirect(base_url() . 'accounts/customer_list/');
+			redirect(base_url().'accounts/customer_list/');
 			exit;
 		}
 	}
@@ -820,16 +820,16 @@ 
 		$did_id = empty($did_id) ? $this->input->post("free_didlist", true) : $did_id;
 		if ($did_id != "") {
 			$account_arr = (array)$this->db->get_where("accounts", array("id" => $accountid))->first_row();
-			$did_arr = (array) $this->db->get_where("dids", array("id" => $did_id))->first_row();
-			$field_name = $account_arr['type'] ==1 ? "parent_id" : 'accountid';
+			$did_arr = (array)$this->db->get_where("dids", array("id" => $did_id))->first_row();
+			$field_name = $account_arr['type'] == 1 ? "parent_id" : 'accountid';
 			if ($action == "add") {
 				if ($did_arr['accountid'] == 0 && $did_arr['parent_id'] == $reseller_id) {
 					if ($accountinfo['type'] == 1) {
 						//for getting reseller setup price if reseller customer purchase
 						$reseller_pricing_query = $this->db_model->getSelect("*", "reseller_pricing", array("note" => $did_arr['number'], 'reseller_id' => $reseller_id));
 						if ($reseller_pricing_query->num_rows() > 0) {
-							$reseller_pricing = (array) $reseller_pricing_query->first_row();
-							$did_arr=array_merge($did_arr,$reseller_pricing);
+							$reseller_pricing = (array)$reseller_pricing_query->first_row();
+							$did_arr = array_merge($did_arr, $reseller_pricing);
 						}
 					}
 					$available_bal = $this->db_model->get_available_bal($account_arr);
@@ -867,12 +867,12 @@ 
 					$this->db->where('note', $did_arr['number']);
 					$this->db->delete('reseller_pricing');
 				}
-				$account_arr['did_number']=$did_arr['number'];
+				$account_arr['did_number'] = $did_arr['number'];
 				$this->common->mail_to_users('email_remove_did', $account_arr);
 				$this->session->set_flashdata('astpp_notification', 'Did Removed Successfully.');
 			}
 		}
-		redirect(base_url() . "accounts/" . $accounttype . "_dids/$accountid/");
+		redirect(base_url()."accounts/".$accounttype."_dids/$accountid/");
 	}
 
 	function provider_invoices($edit_id) {
@@ -892,7 +892,7 @@ 
 		$where = array('id' => $edit_id, "reseller_id" => $reseller_id);
 		$account_res = $this->db_model->getSelect("type", "accounts", $where);
 		if ($account_res->num_rows > 0) {
-			$account_data = (array) $account_res->first_row();
+			$account_data = (array)$account_res->first_row();
 			$accounttype = strtolower($this->common->get_entity_type('', '', $account_data['type']));
 			$this->load->module('invoices/invoices');
 			$data['grid_fields'] = $this->invoices->invoices_form->build_invoices_list_for_customer_admin(false);
@@ -900,7 +900,7 @@ 
 			$data['accounttype'] = $accounttype;
 			$this->load->view('view_customer_invoices', $data);
 		} else {
-			redirect(base_url() . 'accounts/customer_list/');
+			redirect(base_url().'accounts/customer_list/');
 			exit;
 		}
 	}
@@ -918,7 +918,7 @@ 
 		$where = array('id' => $edit_id, "reseller_id" => $reseller_id);
 		$account_res = $this->db_model->getSelect("type", "accounts", $where);
 		if ($account_res->num_rows > 0) {
-			$account_data = (array) $account_res->first_row();
+			$account_data = (array)$account_res->first_row();
 			$accounttype = strtolower($this->common->get_entity_type('', '', $account_data['type']));
 			$this->load->module('rates/rates');
 			$data['grid_fields'] = $this->rates->rates_form->build_pattern_list_for_customer($edit_id, $accounttype);
@@ -927,7 +927,7 @@ 
 			$data['accounttype'] = $accounttype;
 			$this->load->view('view_customer_blocked_prefixes', $data);
 		} else {
-			redirect(base_url() . 'accounts/customer_list/');
+			redirect(base_url().'accounts/customer_list/');
 			exit;
 		}
 	}
@@ -968,16 +968,16 @@ 
 	function customer_delete_block_pattern($accountid, $patternid) {
 		$entity_type = $this->common->get_field_name('type', 'accounts', array('id' => $accountid));
 		$entity_type = strtolower($this->common->get_entity_type('', '', $entity_type));
-		$url = "accounts/" . $entity_type . "_blocked_prefixes/$accountid";
+		$url = "accounts/".$entity_type."_blocked_prefixes/$accountid";
 		$this->db_model->delete("block_patterns", array("id" => $patternid));
 		$this->session->set_flashdata('astpp_notification', 'Block Code Removed Sucessfully!');
         
-		redirect(base_url() . $url);
+		redirect(base_url().$url);
 	}
-	function customer_blockedprefixes_delete_multiple(){
+	function customer_blockedprefixes_delete_multiple() {
 		$ids = $this->input->post("selected_ids", true);
 		$where = "id IN ($ids)";
-		$this->db->delete("block_patterns",$where);
+		$this->db->delete("block_patterns", $where);
 		echo TRUE;
 	}
 
@@ -1012,7 +1012,7 @@ 
 		$where = array('id' => $edit_id, "reseller_id" => $reseller_id);
 		$account_res = $this->db_model->getSelect("type", "accounts", $where);
 		if ($account_res->num_rows > 0) {
-			$account_data = (array) $account_res->first_row();
+			$account_data = (array)$account_res->first_row();
 			$accounttype = strtolower($this->common->get_entity_type('', '', $account_data['type']));
 			$this->load->module('reports/reports');
 			$data['grid_fields'] = $this->reports->reports_form->build_report_list_for_user($accounttype);
@@ -1020,7 +1020,7 @@ 
 			$data['accounttype'] = $accounttype;
 			$this->load->view('view_customer_cdrs_list', $data);
 		} else {
-			redirect(base_url() . 'accounts/customer_list/');
+			redirect(base_url().'accounts/customer_list/');
 			exit;
 		}
 	}
@@ -1029,27 +1029,27 @@ 
 	/* ASTPP  3.0 
      * Using for provider refillreporttab.
      */
-	function reseller_packages($edit_id){
+	function reseller_packages($edit_id) {
 	   $data['page_title'] = "Packages";
 	   $accountinfo = $this->session->userdata('accountinfo');
 	   $reseller_id = ($accountinfo['type'] == 1 || $accountinfo['type'] == 5) ? $accountinfo['id'] : 0;
 	   $where = array('id' => $edit_id, "reseller_id" => $reseller_id);
 	   $account_res = $this->db_model->getSelect("type", "accounts", $where);
 	   if ($account_res->num_rows > 0) {
-			$account_data = (array) $account_res->first_row();
+			$account_data = (array)$account_res->first_row();
 			$accounttype = strtolower($this->common->get_entity_type('', '', $account_data['type']));
 			$this->load->module('package/package');
 			$data['grid_fields'] = $this->package->package_form->build_package_list_for_reseller();
 			$data['edit_id'] = $edit_id;
 			$data['accounttype'] = $accounttype;
 			$this->load->view('view_reseller_package_list', $data);
-	   }else {
-			redirect(base_url() . 'accounts/reseller_list/');
+	   } else {
+			redirect(base_url().'accounts/reseller_list/');
 			exit;
 	   }
 	} 
      
-	function reseller_refillreport($edit_id){
+	function reseller_refillreport($edit_id) {
 	  $this->customer_refillreport($edit_id);
 	}
 	function provider_refillreport($edit_id) {
@@ -1070,7 +1070,7 @@ 
 		$where = array('id' => $edit_id, "reseller_id" => $reseller_id);
 		$account_res = $this->db_model->getSelect("type", "accounts", $where);
 		if ($account_res->num_rows > 0) {
-			$account_data = (array) $account_res->first_row();
+			$account_data = (array)$account_res->first_row();
 			$accounttype = strtolower($this->common->get_entity_type('', '', $account_data['type']));
 			$this->load->module('reports/reports');
 			$data['grid_fields'] = $this->reports->reports_form->build_refillreport_for_customer();
@@ -1078,7 +1078,7 @@ 
 			$data['accounttype'] = $accounttype;
 			$this->load->view('view_customer_refill_report', $data);
 		} else {
-			redirect(base_url() . 'accounts/customer_list/');
+			redirect(base_url().'accounts/customer_list/');
 			exit;
 		}
 	}
@@ -1108,7 +1108,7 @@ 
 		$where = array('id' => $edit_id, "reseller_id" => $reseller_id);
 		$account_res = $this->db_model->getSelect("type", "accounts", $where);
 		if ($account_res->num_rows > 0) {
-			$account_data = (array) $account_res->first_row();
+			$account_data = (array)$account_res->first_row();
 			$accounttype = strtolower($this->common->get_entity_type('', '', $account_data['type']));
 			$this->load->module('email/email');
 			$data['grid_fields'] = $this->email->email_form->build_list_for_email_customer($edit_id, $accounttype);
@@ -1116,7 +1116,7 @@ 
 			$data['accounttype'] = $accounttype;
 			$this->load->view('view_customer_email_history', $data);
 		} else {
-			redirect(base_url() . 'accounts/customer_list/');
+			redirect(base_url().'accounts/customer_list/');
 			exit;
 		}
 	}
@@ -1147,7 +1147,7 @@ 
 		$where = array('id' => $edit_id, "reseller_id" => $reseller_id);
 		$account_res = $this->db_model->getSelect("notify_credit_limit,notify_flag,notify_email,type,id", "accounts", $where);
 		if ($account_res->num_rows > 0) {
-			$account_data = (array) $account_res->first_row();
+			$account_data = (array)$account_res->first_row();
 			$accounttype = strtolower($this->common->get_entity_type('', '', $account_data['type']));
 			unset($account_data['type']);
 			$data['form'] = $this->form->build_form($this->accounts_form->customer_alert_threshold($accounttype), $account_data);
@@ -1155,7 +1155,7 @@ 
 			$data['accounttype'] = $accounttype;
 			$this->load->view('view_customer_alert_threshold', $data);
 		} else {
-			redirect(base_url() . 'accounts/customer_list/');
+			redirect(base_url().'accounts/customer_list/');
 			exit;
 		}
 	}
@@ -1168,7 +1168,7 @@ 
 
 	function customer_alert_threshold_save($entity_type) {
 		$add_array = $this->input->post();
-		if (isset($add_array['id']) && !empty($add_array['id'])) {
+		if (isset($add_array['id']) && ! empty($add_array['id'])) {
 			$data['page_title'] = "Alert Threshold";
 			$data['form'] = $this->form->build_form($this->accounts_form->customer_alert_threshold($entity_type), $add_array);
 			$data['edit_id'] = $add_array['id'];
@@ -1184,38 +1184,38 @@ 
 					$data['validation_errors'] = validation_errors();
 				} else {
 					$this->db->where('id', $add_array['id']);
-					$id=$add_array['id'];
+					$id = $add_array['id'];
 					unset($add_array['id'], $add_array['action']);
 					$this->db->update('accounts', $add_array);
-					$this->session->set_flashdata('astpp_errormsg','Alert threshold updated successfully!');
-					redirect(base_url() . 'accounts/'.$entity_type.'_alert_threshold/'.$id."/");
+					$this->session->set_flashdata('astpp_errormsg', 'Alert threshold updated successfully!');
+					redirect(base_url().'accounts/'.$entity_type.'_alert_threshold/'.$id."/");
 					exit;
 				}
 			} else {
-				redirect(base_url() . 'accounts/'.$entity_type.'_list/');
+				redirect(base_url().'accounts/'.$entity_type.'_list/');
 				exit;
 			}
 			$this->load->view('view_customer_alert_threshold', $data);
 		} else {
-			redirect(base_url() . 'accounts/customer_list/');
+			redirect(base_url().'accounts/customer_list/');
 			exit;
 		}
 	}
 
 	function customer_bulk_creation() {
-		$type=0;
+		$type = 0;
 		$data['entity_name'] = strtolower($this->common->get_entity_type('', '', $type));
 		$data['page_title'] = 'Mass Customer';
 		$data['country_id'] = Common_model::$global_config['system_config']['country'];
 		$data['currency_id'] = $this->common->get_field_name('id', 'currency', array('currency' => Common_model::$global_config['system_config']['base_currency']));
 		$data['timezone_id'] = Common_model::$global_config['system_config']['default_timezone'];
-		if (!$data['timezone_id']) {
+		if ( ! $data['timezone_id']) {
 			$data['timezone_id'] = 1;
 		}
-		if (!$data['currency_id']) {
+		if ( ! $data['currency_id']) {
 			$data['currency_id'] = 1;
 		}
-		if (!$data['country_id']) {
+		if ( ! $data['country_id']) {
 			$data['country_id'] = 1;
 		}
 		$data['form'] = $this->form->build_form($this->accounts_form->customer_bulk_generate_form(), '');
@@ -1225,17 +1225,17 @@ 
 	function customer_bulk_save() {
 		$data['page_title'] = 'Create Bulk Customer';
 		$add_array = $this->input->post();
-		if (!empty($add_array) && isset($add_array)) {
+		if ( ! empty($add_array) && isset($add_array)) {
 			$currentlength = $this->accounts_model->get_max_limit($add_array);
 			$account_data = $this->session->userdata("accountinfo");
-			$add_array['reseller_id'] = $account_data['type']==1 ? $account_data['id']:0;
+			$add_array['reseller_id'] = $account_data['type'] == 1 ? $account_data['id'] : 0;
 			$data['form'] = $this->form->build_form($this->accounts_form->customer_bulk_generate_form(), $add_array);
 			if ($this->form_validation->run() == FALSE) {
 				$data['validation_errors'] = validation_errors();
 				echo $data['validation_errors'];
 				exit;
 			}
-			if($currentlength <= 0){
+			if ($currentlength <= 0) {
 		echo json_encode(array("prefix_error" => "Your Account Limit has been reached.Please Change Your Prefix."));
 				exit;
 			}
@@ -1244,7 +1244,7 @@ 
 				exit;
 			}
 			if ($currentlength > 0 && $add_array['count'] > $currentlength) {
-				echo json_encode(array("count_error" => "You Can Create Maximum " . $currentlength . " accounts with " . $add_array['prefix'] . " prefix"));
+				echo json_encode(array("count_error" => "You Can Create Maximum ".$currentlength." accounts with ".$add_array['prefix']." prefix"));
 				exit;
 			} else {
 				$this->accounts_model->bulk_insert_accounts($add_array);
@@ -1252,7 +1252,7 @@ 
 				exit;
 			}
 		} else {
-			redirect(base_url() . "accounts/customer_list/");
+			redirect(base_url()."accounts/customer_list/");
 		}
 	}
 
@@ -1269,13 +1269,13 @@ 
 
 	function customer_did_country() {
 		$country_id = $_POST['country_id'];
-		$accountid= $this->input->post('accountid',true);
+		$accountid = $this->input->post('accountid', true);
 		$accountinfo = $this->session->userdata("accountinfo");
-		$entity_info=(array)$this->db->get_where('accounts',array("id"=>$accountid))->first_row();
+		$entity_info = (array)$this->db->get_where('accounts', array("id"=>$accountid))->first_row();
 		$reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
 		if ($entity_info['reseller_id'] > 0) {
 			$parent_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : $accountinfo['reseller_id'];
-			$query = 'select dids.id as id,dids.number as number,reseller_pricing.setup as setup, reseller_pricing.monthlycost as monthlycost from dids,reseller_pricing where dids.number= reseller_pricing.note and reseller_pricing.reseller_id =' . $parent_id . " and dids.accountid=0 and dids.country_id =" . $country_id;
+			$query = 'select dids.id as id,dids.number as number,reseller_pricing.setup as setup, reseller_pricing.monthlycost as monthlycost from dids,reseller_pricing where dids.number= reseller_pricing.note and reseller_pricing.reseller_id ='.$parent_id." and dids.accountid=0 and dids.country_id =".$country_id;
 			$did_list = $this->db->query($query);
 		} else {
 			$did_list = $this->db_model->getSelect("id,number,setup,monthlycost", "dids", array('country_id' => $country_id, 'accountid' => '0', 'parent_id' => $reseller_id));
@@ -1284,7 +1284,7 @@ 
 		if ($did_list->num_rows > 0) {
 			$did_data = $did_list->result_array();
 			foreach ($did_data as $key => $value) {
-				$did_arr[$value['id']] = $value['number'] . " (Setup Cost : " . $this->common_model->calculate_currency($value['setup'], '', '', true) . ") (Monthly cost : " . $this->common_model->calculate_currency($value['monthlycost'], '', '', true) . ")";
+				$did_arr[$value['id']] = $value['number']." (Setup Cost : ".$this->common_model->calculate_currency($value['setup'], '', '', true).") (Monthly cost : ".$this->common_model->calculate_currency($value['monthlycost'], '', '', true).")";
 			}
 		}
 		$did_info = array("name" => "free_didlist", "id" => "free_didlist", "class" => "free_didlist");
@@ -1319,28 +1319,28 @@ 
 			$username = $this->session->userdata('username');
 		$login_user_data = $this->session->userdata("accountinfo");
 			$accountinfo = $this->accounts_model->get_account_by_number($post_array['id']);
-			if($accountinfo['reseller_id'] == 0){
+			if ($accountinfo['reseller_id'] == 0) {
 			   $where = array("accountid"=> 1);
-		}else{
+		} else {
 			$where = array("accountid"=> $accountinfo['id']);    
 		}
 		$query = $this->db_model->getSelect("*", "invoice_conf", $where);
-		if($query->num_rows >0){
+		if ($query->num_rows > 0) {
 			$invoice_conf = $query->result_array();
 			$invoice_conf = $invoice_conf[0];
-		}else{
-			$query = $this->db_model->getSelect("*", "invoice_conf",array("accountid"=> 1));
+		} else {
+			$query = $this->db_model->getSelect("*", "invoice_conf", array("accountid"=> 1));
 			$invoice_conf = $query->result_array();
 			$invoice_conf = $invoice_conf[0];            
 		}
-		 $last_invoice_ID = $this->get_invoice_date("invoiceid",$accountinfo["id"]);
-		 $invoice_prefix=$invoice_conf['invoice_prefix'];
-		  $due_date = gmdate("Y-m-d H:i:s",strtotime(gmdate("Y-m-d H:i:s")." +".$invoice_conf['interval']." days"));
+		 $last_invoice_ID = $this->get_invoice_date("invoiceid", $accountinfo["id"]);
+		 $invoice_prefix = $invoice_conf['invoice_prefix'];
+		  $due_date = gmdate("Y-m-d H:i:s", strtotime(gmdate("Y-m-d H:i:s")." +".$invoice_conf['interval']." days"));
 				$response = $this->accounts_model->account_process_payment($post_array);
 
-				if($post_array['payment_type']== 1 ){
+				if ($post_array['payment_type'] == 1) {
 			$this->load->module('invoices/invoices');
-			$invoice_id=$this->invoices->invoices->generate_receipt($post_array['id'],$post_array['credit'],$accountinfo,$last_invoice_ID+1,$invoice_prefix,$due_date);
+			$invoice_id = $this->invoices->invoices->generate_receipt($post_array['id'], $post_array['credit'], $accountinfo, $last_invoice_ID + 1, $invoice_prefix, $due_date);
 		$account_balance = $this->common->get_field_name('balance', 'accounts', $post_array['id']);
 			$insert_arr = array("accountid" => $post_array['id'],
 					  "description" => trim($post_array['notes']),
@@ -1351,13 +1351,13 @@ 
 					  "reseller_id"=>'0',
 					  "item_type"=>'POSTCHARG',
 					  "item_id"=>'0',
-  					  'before_balance'=>$account_balance+$post_array['credit'],
+  					  'before_balance'=>$account_balance + $post_array['credit'],
 					  'after_balance'=>$account_balance,
 					);
 			$this->db->insert("invoice_details", $insert_arr);
-				}else{
+				} else {
 			$this->load->module('invoices/invoices');
-			$invoice_id=$this->invoices->invoices->generate_receipt($post_array['id'],$post_array['credit'],$accountinfo,$last_invoice_ID+1,$invoice_prefix,$due_date);
+			$invoice_id = $this->invoices->invoices->generate_receipt($post_array['id'], $post_array['credit'], $accountinfo, $last_invoice_ID + 1, $invoice_prefix, $due_date);
 			$account_balance = $this->common->get_field_name('balance', 'accounts', $post_array['id']);
 			$insert_arr = array("accountid" => $post_array['id'],
 					  "description" => trim($post_array['notes']),
@@ -1368,22 +1368,22 @@ 
 					  "reseller_id"=>$accountinfo['reseller_id'],
 					  "item_type"=>'Refill',
 					  "item_id"=>'0',
-  					  'before_balance'=>$account_balance-$post_array['credit'],
+  					  'before_balance'=>$account_balance - $post_array['credit'],
 					  'after_balance'=>$account_balance,
 					);
 			$this->db->insert("invoice_details", $insert_arr);
-			if($login_user_data['type'] ==1){
-			  $reseller_ids=$this->common->get_parent_info($login_user_data['id'],0);
-			  $reseller_ids=rtrim($reseller_ids,",");
-			  $reseller_arr=explode(",",$reseller_ids);
-			  if(!empty($reseller_arr)){
-			 $custom_array=$post_array;
-			foreach($reseller_arr as $key=>$reseller_id){
-			  $custom_array['id']=$reseller_id;
+			if ($login_user_data['type'] == 1) {
+			  $reseller_ids = $this->common->get_parent_info($login_user_data['id'], 0);
+			  $reseller_ids = rtrim($reseller_ids, ",");
+			  $reseller_arr = explode(",", $reseller_ids);
+			  if ( ! empty($reseller_arr)) {
+			 $custom_array = $post_array;
+			foreach ($reseller_arr as $key=>$reseller_id) {
+			  $custom_array['id'] = $reseller_id;
 			  $response = $this->accounts_model->account_process_payment($custom_array);
-			  $reseller_info=(array)$this->db->get_where('accounts',array("id"=>$reseller_id))->first_row();
-			  $last_invoice_ID = $this->get_invoice_date("invoiceid",$reseller_info["id"]);
-			  $invoice_id=$this->invoices->invoices->generate_receipt($reseller_info['id'],$custom_array['credit'],$reseller_info,$last_invoice_ID+1,$invoice_prefix,$due_date);
+			  $reseller_info = (array)$this->db->get_where('accounts', array("id"=>$reseller_id))->first_row();
+			  $last_invoice_ID = $this->get_invoice_date("invoiceid", $reseller_info["id"]);
+			  $invoice_id = $this->invoices->invoices->generate_receipt($reseller_info['id'], $custom_array['credit'], $reseller_info, $last_invoice_ID + 1, $invoice_prefix, $due_date);
 			  $account_balance = $this->common->get_field_name('balance', 'accounts', $reseller_info['id']);
 			  $insert_arr = array("accountid" => $reseller_info['id'],
 				      "description" => trim($custom_array['notes']),
@@ -1414,11 +1414,11 @@ 
     /**
      * @param string $select
      */
-    function get_invoice_date($select,$accountid){
-	$query = $this->db_model->select($select, "invoices", '',"id","DESC","1","0");
-	if($query->num_rows >0){
+    function get_invoice_date($select, $accountid) {
+	$query = $this->db_model->select($select, "invoices", '', "id", "DESC", "1", "0");
+	if ($query->num_rows > 0) {
 		$invoiceid = $query->result_array();
-		$invoice_date=$invoiceid[0][$select];
+		$invoice_date = $invoiceid[0][$select];
 		return  $invoice_date;
 	}
 	return false;
@@ -1455,7 +1455,7 @@ 
 		$data['form'] = $this->form->build_form($this->accounts_form->get_customer_callerid_fields(), $data);
 		$post_array = $this->input->post();
         
-		if (!empty($post_array)) {
+		if ( ! empty($post_array)) {
 			if ($this->form_validation->run() == FALSE) {
 				$data['validation_errors'] = validation_errors();
 				echo $data['validation_errors'];
@@ -1484,13 +1484,13 @@ 
 		$data['country_id'] = $accountinfo['country_id'];
 		$data['currency_id'] = $accountinfo['currency_id'];
 		$data['timezone_id'] = $accountinfo['timezone_id'];
-		if (!$data['timezone_id']) {
+		if ( ! $data['timezone_id']) {
 			$data['timezone_id'] = 1;
 		}
-		if (!$data['currency_id']) {
+		if ( ! $data['currency_id']) {
 			$data['currency_id'] = 1;
 		}
-		if (!$data['country_id']) {
+		if ( ! $data['country_id']) {
 			$data['country_id'] = 1;
 		}
 
@@ -1518,17 +1518,17 @@ 
 		 * */
 		$encrypted_string = $this->common->encode($edit_data['id']);
 		$encrypt = $this->common->encode_params($encrypted_string);
-		$edit_data['registration_url'] = base_url() . "signup/" . $encrypt;
+		$edit_data['registration_url'] = base_url()."signup/".$encrypt;
 		/*         * *********************************************************** */
 		/*         * ***
           ASTPP  3.0 
           Password decode
          * **** */
 		$edit_data['password'] = $this->common->decode($edit_data['password']);
-		$edit_data['credit_limit']=$this->common_model->calculate_currency(($edit_data['credit_limit']),'','',true,false);
+		$edit_data['credit_limit'] = $this->common_model->calculate_currency(($edit_data['credit_limit']), '', '', true, false);
 		$entity_name = strtolower($this->common->get_entity_type('', '', $edit_data['type']));
-		$data['edit_id']=$edit_id;
-		$data['page_title'] =ucfirst($entity_name)." Profile";
+		$data['edit_id'] = $edit_id;
+		$data['page_title'] = ucfirst($entity_name)." Profile";
 		$data['entity_name'] = $entity_name;
 		/*         * ********************** */
 		$data['form'] = $this->form->build_form($this->accounts_form->get_form_reseller_fields($edit_id), $edit_data);
@@ -1544,7 +1544,7 @@ 
 		$data['timezone_id'] = $add_array['timezone_id'];
 		$data['currency_id'] = $add_array['currency_id'];
 		$data['entity_name'] = $entity_name;
-		$data['edit_id']=$add_array['id'];
+		$data['edit_id'] = $add_array['id'];
 		$data['form'] = $this->form->build_form($this->accounts_form->get_form_reseller_fields($add_array['id']), $add_array);
 		if ($add_array['id'] != '') {
 			$data['page_title'] = 'Edit Reseller';
@@ -1569,11 +1569,11 @@ 
 					}
 					unset($add_array['tax_id']);
 				}
-				unset($add_array['number'],$add_array['registration_url']);
+				unset($add_array['number'], $add_array['registration_url']);
 				$this->accounts_model->edit_account($add_array, $add_array['id']);
 				$this->session->set_flashdata('astpp_errormsg', 'Reseller updated successfully!');
 
-				redirect(base_url() . 'accounts/reseller_list/');
+				redirect(base_url().'accounts/reseller_list/');
 				exit;
 			}
 			$data["account_data"]["0"] = $add_array;
@@ -1621,7 +1621,7 @@ 
 					unset($add_array['tax_id']);
 				}
 				$this->session->set_flashdata('astpp_errormsg', 'Reseller added successfully!');
-				redirect(base_url() . 'accounts/reseller_list/');
+				redirect(base_url().'accounts/reseller_list/');
 				exit;
 			}
 			$this->load->view('view_accounts_create', $data);
@@ -1636,7 +1636,7 @@ 
 		echo $this->common->generate_password();
 	}
 
-	function customer_generate_number($digit='') {
+	function customer_generate_number($digit = '') {
        
 		echo $this->common->find_uniq_rendno($digit, 'number', 'accounts');
 	}
@@ -1647,19 +1647,19 @@ 
 		$entitytype = str_replace(' ', '', $entity_type);
 		$data['username'] = $this->session->userdata('user_name');
 		$data['flag'] = 'create';
-		$data['page_title'] = 'Create ' . ucfirst($entity_type);
+		$data['page_title'] = 'Create '.ucfirst($entity_type);
 		$data['back_flag'] = true;
 		$data['form'] = $this->form->build_form($this->accounts_form->get_form_admin_fields($entitytype), '');
 		$data['country_id'] = $accountinfo['country_id'];
 		$data['currency_id'] = $accountinfo['currency_id'];
 		$data['timezone_id'] = $accountinfo['timezone_id'];
-		if (!$data['timezone_id']) {
+		if ( ! $data['timezone_id']) {
 			$data['timezone_id'] = 1;
 		}
-		if (!$data['currency_id']) {
+		if ( ! $data['currency_id']) {
 			$data['currency_id'] = 1;
 		}
-		if (!$data['country_id']) {
+		if ( ! $data['country_id']) {
 			$data['country_id'] = 1;
 		}
 		$data['entity_name'] = $entity_type;
@@ -1668,13 +1668,13 @@ 
 
 	function admin_edit($edit_id = '') {
 	$data['back_flag'] = true;
-		$accountinfo=(array)$this->db->get_where('accounts',array("id"=>$edit_id))->first_row();
+		$accountinfo = (array)$this->db->get_where('accounts', array("id"=>$edit_id))->first_row();
 		$type = $accountinfo['type'] == -1 ? 2 : $accountinfo['type'];
 		$entity_type = strtolower($this->common->get_entity_type('', '', $type));
 		$entitytype = str_replace(' ', '', $entity_type);
 		$accountinfo['password'] = $this->common->decode($accountinfo['password']);
 		$data['form'] = $this->form->build_form($this->accounts_form->get_form_admin_fields($entitytype, $edit_id), $accountinfo);
-		$data['page_title'] = 'Edit ' . ucfirst($entity_type);
+		$data['page_title'] = 'Edit '.ucfirst($entity_type);
 		$this->load->view('view_admin_details', $data);
         
 		}
@@ -1687,10 +1687,10 @@ 
 		$entitytype = str_replace(' ', '', $entity_type);
 		$data['username'] = $this->session->userdata('user_name');
 		$data['flag'] = 'create';
-		$data['page_title'] = 'Create ' . $entity_type;
+		$data['page_title'] = 'Create '.$entity_type;
 		$data['form'] = $this->form->build_form($this->accounts_form->get_form_admin_fields($entitytype, $add_array['id']), $add_array);
 		if ($add_array['id'] != '') {
-			$data['page_title'] = 'Edit ' . $entity_type;
+			$data['page_title'] = 'Edit '.$entity_type;
 			if ($this->form_validation->run() == FALSE) {
 				$data['validation_errors'] = validation_errors();
 			} else {
@@ -1719,13 +1719,13 @@ 
 					$result = $result->result_array();
 					$this->session->set_userdata('accountinfo', $result[0]);
 				}
-				$this->session->set_flashdata('astpp_errormsg', ucfirst($entity_type) . ' updated successfully!');
-				redirect(base_url() . 'accounts/admin_list/');
+				$this->session->set_flashdata('astpp_errormsg', ucfirst($entity_type).' updated successfully!');
+				redirect(base_url().'accounts/admin_list/');
 				exit;
 			}
 			$this->load->view('view_admin_details', $data);
 		} else {
-			$data['page_title'] = 'Create ' . ucfirst($entity_type);
+			$data['page_title'] = 'Create '.ucfirst($entity_type);
 			if ($this->form_validation->run() == FALSE) {
 				$data['validation_errors'] = validation_errors();
 			} else {
@@ -1743,8 +1743,8 @@ 
 				}
 				$add_array['credit_limit'] = $this->common_model->add_calculate_currency($add_array['credit_limit'], '', '', false, false);
 
-				$this->session->set_flashdata('astpp_errormsg', ucfirst($entity_type) . ' added successfully!');
-				redirect(base_url() . 'accounts/admin_list/');
+				$this->session->set_flashdata('astpp_errormsg', ucfirst($entity_type).' added successfully!');
+				redirect(base_url().'accounts/admin_list/');
 				exit;
 			}$this->load->view('view_accounts_create', $data);
 		}
@@ -1895,12 +1895,12 @@ 
 				$action['balance']['balance'] = $this->common_model->add_calculate_currency($action['balance']['balance'], "", '', true, false);
 			}
 			if (isset($action['credit_limit']['credit_limit']) && $action['credit_limit']['credit_limit'] != '') {
-				$action['credit_limit']['credit_limit'] = $this->common_model->add_calculate_currency($action['credit_limit']['credit_limit'], "", '',true, false);
+				$action['credit_limit']['credit_limit'] = $this->common_model->add_calculate_currency($action['credit_limit']['credit_limit'], "", '', true, false);
 			}
 			$this->session->set_userdata('reseller_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'accounts/reseller_list/');
+			redirect(base_url().'accounts/reseller_list/');
 		}
 	}
 
@@ -1926,7 +1926,7 @@ 
 			$this->session->set_userdata('admin_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'accounts/admin_list/');
+			redirect(base_url().'accounts/admin_list/');
 		}
 	}
 
@@ -1939,13 +1939,13 @@ 
 	function customer_delete($id) {
 		$this->common->customer_delete_dependencies($id);
 		$this->session->set_flashdata('astpp_notification', 'Customer removed successfully!');
-		redirect(base_url() . 'accounts/customer_list/');
+		redirect(base_url().'accounts/customer_list/');
 	}
 
 	function reseller_delete($id) {
 		$this->common->subreseller_list($id);
 		$this->session->set_flashdata('astpp_notification', 'Reseller removed successfully!');
-		redirect(base_url() . 'accounts/reseller_list/');
+		redirect(base_url().'accounts/reseller_list/');
 	}
 
 	function free_customer_did($accountid) {
@@ -1976,19 +1976,19 @@ 
 	function provider_delete($id) {
 		$this->accounts_model->remove_customer($id);
 		$this->session->set_flashdata('astpp_notification', 'Provider removed successfully!');
-		redirect(base_url() . 'accounts/customer_list/');
+		redirect(base_url().'accounts/customer_list/');
 	}
 
 	function admin_delete($id) {
 		$this->accounts_model->remove_customer($id);
 		$this->session->set_flashdata('astpp_notification', 'Admin removed successfully!');
-		redirect(base_url() . 'accounts/admin_list/');
+		redirect(base_url().'accounts/admin_list/');
 	}
 
 	function subadmin_delete($id) {
 		$this->accounts_model->remove_customer($id);
 		$this->session->set_flashdata('astpp_notification', 'Sub admin removed successfully!');
-		redirect(base_url() . 'accounts/admin_list/');
+		redirect(base_url().'accounts/admin_list/');
 	}
     
 	function reseller_details_json($module, $accountid) {
@@ -1999,13 +1999,13 @@ 
 		}
 		if ($module == "invoices") {
 			$this->load->module('invoices/invoices');
-			$this->invoices->customer_invoices($accountid,"reseller");
+			$this->invoices->customer_invoices($accountid, "reseller");
 		}
 		if ($module == "charges") {
 			$this->load->module('charges/charges');
 			$this->charges->customer_charge_list($accountid, "reseller");
 		}
-		if($module =='packages'){
+		if ($module == 'packages') {
 	  $this->load->module('package/package');
 	  $this->package->package_list_reseller($accountid, "reseller");
 		}
@@ -2028,9 +2028,9 @@ 
 			$this->db->insert("invoice_item", $insert_arr);
 
 			$this->accounts_model->update_balance($charge, $accountid, "debit");
-			redirect(base_url() . "accounts/" . $accounttype . "_edit/$accountid#packages");
+			redirect(base_url()."accounts/".$accounttype."_edit/$accountid#packages");
 		} else {
-			redirect(base_url() . "accounts/" . $accounttype . "_edit/$accountid#packages");
+			redirect(base_url()."accounts/".$accounttype."_edit/$accountid#packages");
 		}
 	}
 
@@ -2048,9 +2048,9 @@ 
 				$this->did->did_model->add_reseller_pricing($accountid, $did_id);
 
 				$this->session->set_flashdata('astpp_errormsg', 'DID added successfully.');
-				redirect(base_url() . "accounts/" . $accounttype . "_edit/$accountid#did");
+				redirect(base_url()."accounts/".$accounttype."_edit/$accountid#did");
 			} else {
-				redirect(base_url() . "accounts/" . $accounttype . "_edit/$accountid#did");
+				redirect(base_url()."accounts/".$accounttype."_edit/$accountid#did");
 			}
 		}
 		if ($action == "delete") {
@@ -2079,14 +2079,14 @@ 
 			} else {
 				$this->session->set_flashdata('astpp_notification', 'DID already removed before.');
 			}
-			redirect(base_url() . "accounts/" . $accounttype . "_edit/$accountid#did");
+			redirect(base_url()."accounts/".$accounttype."_edit/$accountid#did");
 		}
 	}
 
 	function customer_selected_delete() {
 		$ids = $this->input->post("selected_ids", true);
-		$customer_ids=explode(",",$ids);
-		foreach($customer_ids as $customer_id){
+		$customer_ids = explode(",", $ids);
+		foreach ($customer_ids as $customer_id) {
 			$customer_id = str_replace("'", "", $customer_id);
 			$this->common->customer_delete_dependencies($customer_id);
 		}
@@ -2154,7 +2154,7 @@ 
 					}
 				}
 				$this->session->set_flashdata('astpp_errormsg', 'Account tax added successfully!');
-				redirect(base_url() . 'accounts/customer_list/');
+				redirect(base_url().'accounts/customer_list/');
 			}
 			$data['id'] = array();
 			$data['taxesList'] = $this->common_model->get_list_taxes();
@@ -2186,9 +2186,9 @@ 
 					}
 				}
 				if ($accountinfo['type'] == '0') {
-					$link = base_url() . '/accounts/customer_list/';
+					$link = base_url().'/accounts/customer_list/';
 				} else {
-					$link = base_url() . '/accounts/reseller_list/';
+					$link = base_url().'/accounts/reseller_list/';
 				}
 				$this->session->set_flashdata('astpp_errormsg', 'Account tax added successfully!');
 				redirect($link);
@@ -2198,7 +2198,7 @@ 
 		} elseif ($action == 'delete') {
 			$this->accounting_model->remove_account_tax($id);
 			$this->session->set_flashdata('astpp_notification', 'Account tax removed successfully!');
-			redirect(base_url() . 'accounting/account_taxes/');
+			redirect(base_url().'accounting/account_taxes/');
 		}
 	}
 
@@ -2209,7 +2209,7 @@ 
 	 */
 	function valid_account_tax() {
 		$tax_id = '';
-		if (!empty($_POST['username'])) {
+		if ( ! empty($_POST['username'])) {
 
 			$account_num = mysql_real_escape_string($_POST['username']);
 			$row = $this->accounts_model->check_account_num($account_num);
@@ -2217,11 +2217,11 @@ 
 				$taxes_id = $this->accounts_model->get_accounttax_by_id($row['accountid']);
 				if ($taxes_id) {
 					foreach ($taxes_id as $id) {
-						$tax_id.=$id['taxes_id'] . ",";
+						$tax_id .= $id['taxes_id'].",";
 					}
 
 					$tax_id = rtrim($tax_id, ",");
-					echo $row['accountid'] . ',' . $tax_id;
+					echo $row['accountid'].','.$tax_id;
 				} else {
 					echo $row['accountid'];
 				}
@@ -2247,7 +2247,7 @@ 
 					$this->session->set_userdata('accountinfo', $result[0]);
 				}
 				$this->session->set_flashdata('astpp_errormsg', 'Reseller updated successfully!');
-				redirect(base_url() . '/dashboard/');
+				redirect(base_url().'/dashboard/');
 			}
 			$this->load->view('view_reseller_edit_details_own', $data);
 		} else {
@@ -2304,7 +2304,7 @@ 
 			echo "2";
 			exit;
 		}
-		if (isset($add_array['number']) && !empty($add_array['number'])) {
+		if (isset($add_array['number']) && ! empty($add_array['number'])) {
 			if (isset($add_array['id']) && $add_array['id'] != '') {
 				unset($add_array['animap_id']);
 				$response = $this->accounts_model->edit_animap($add_array, $add_array['id']);
@@ -2338,7 +2338,7 @@ 
 		}
 		$value_edit = '';
 		foreach ($edit_data as $key => $value) {
-			$value_edit.=$value . ",";
+			$value_edit .= $value.",";
 		}
 		echo rtrim($value_edit, ',');
 		exit;
@@ -2357,11 +2357,11 @@ 
 
 	function reseller_export_cdr_xls() {
 	$account_info = $accountinfo = $this->session->userdata('accountinfo');
-	$currency_id=$account_info['currency_id'];
-	$currency=$this->common->get_field_name('currency', 'currency', $currency_id);
+	$currency_id = $account_info['currency_id'];
+	$currency = $this->common->get_field_name('currency', 'currency', $currency_id);
 	ob_clean();
 		$query = $this->accounts_model->get_reseller_Account_list(true, '', '', true);
-		$customer_array[] = array("Account", "First Name", "Last Name", "Company", "Rate Group ", "Account type", "Balance($currency)", "Credit Limit($currency)", "Status","Created Date");
+		$customer_array[] = array("Account", "First Name", "Last Name", "Company", "Rate Group ", "Account type", "Balance($currency)", "Credit Limit($currency)", "Status", "Created Date");
 		if ($query->num_rows() > 0) {
 
 			foreach ($query->result_array() as $row) {
@@ -2372,40 +2372,40 @@ 
 					$row['company_name'],
 					$this->common->get_field_name('name', 'pricelists', $row['pricelist_id']),
 					$this->common->get_account_type('', '', $row['posttoexternal']),
-					$this->common_model->calculate_currency($row['balance'],false,false),
-					$this->common_model->calculate_currency($row['credit_limit'],false,false),
+					$this->common_model->calculate_currency($row['balance'], false, false),
+					$this->common_model->calculate_currency($row['credit_limit'], false, false),
 					$this->common->get_status('export', '', $row['status']),
 					$row['creation'],
 				);
 			}
 		}
 		$this->load->helper('csv');
-		array_to_csv($customer_array, 'Resellers_' . date("Y-m-d") . '.csv');
+		array_to_csv($customer_array, 'Resellers_'.date("Y-m-d").'.csv');
 	}
-	function customer_validate_ip(){
-	 $add_array=$this->input->post();
-	 if(!empty($add_array)){
+	function customer_validate_ip() {
+	 $add_array = $this->input->post();
+	 if ( ! empty($add_array)) {
 	   $ip = $add_array['ip'];
 	   if (strpos($ip, '/') !== false) {
 		 $add_array['ip'] = $add_array['ip'];
 	   } else {
-		 $add_array['ip'] = $add_array['ip'] . '/32';
+		 $add_array['ip'] = $add_array['ip'].'/32';
 	   }
-	   $this->db->where('ip',$add_array['ip']);
-	   $this->db->where('prefix',$add_array['prefix']);
+	   $this->db->where('ip', $add_array['ip']);
+	   $this->db->where('prefix', $add_array['prefix']);
 	   $this->db->select('count(ip) as count');
-	   $ip_map_result=(array)$this->db->get('ip_map')->first_row();
-	   if($ip_map_result['count'] > 0 ){
+	   $ip_map_result = (array)$this->db->get('ip_map')->first_row();
+	   if ($ip_map_result['count'] > 0) {
 		 echo 'FALSE';
-	   }else{
+	   } else {
 		 echo 'TRUE';
 	   }
-	 }else{
+	 } else {
 	  echo 'FALSE';
 	 }
     
 	}
-function reseller_invoice_config($id=''){
+function reseller_invoice_config($id = '') {
 		$data['page_title'] = 'Company Profile';
 		$accountinfo = $this->session->userdata("accountinfo");
 		$add_array = $this->input->post();
@@ -2415,30 +2415,30 @@ 
 				$this->load->module('invoices/invoices');
 				$this->load->model("invoices_model");
 				$invoiceconf = $this->invoices_model->get_invoiceconf();
-				$file_name=($invoiceconf['logo'] != '') ? $invoiceconf['logo'] : '';
+				$file_name = ($invoiceconf['logo'] != '') ? $invoiceconf['logo'] : '';
 			}
 			if (isset($_FILES['file']['name']) && $_FILES['file']['name'] != '') {
 				$files = $_FILES['file'];
 				if ($files['size'] < 0) {
 					$this->session->set_flashdata('astpp_notification', 'PLease upload maximum file');
-				redirect(base_url() . "accounts/reseller_invoice_config/". $add_array['accountid']."/");
+				redirect(base_url()."accounts/reseller_invoice_config/".$add_array['accountid']."/");
 				}
 				$file = $_FILES['file'];
 				$uploadedFile = $file["tmp_name"];
 				$file_name = $file['name'];
 				$file_type = $file['type'];
 				if ($file_type == 'image/jpg' || $file_type == 'image/png' || $file_type == 'image/jpeg') {
-					$dir_path = FCPATH. "upload/";
-					$path = $dir_path . $add_array['accountid']."_".$file['name'];
+					$dir_path = FCPATH."upload/";
+					$path = $dir_path.$add_array['accountid']."_".$file['name'];
 					if (move_uploaded_file($uploadedFile, $path)) {
 						$this->session->set_flashdata('astpp_errormsg', gettext('files added successfully!'));
 					} else {
 						$this->session->set_flashdata('astpp_notification', "File Uploading Fail Please Try Again");
-					redirect(base_url() . "accounts/reseller_invoice_config/". $add_array['accountid']."/");
+					redirect(base_url()."accounts/reseller_invoice_config/".$add_array['accountid']."/");
 					}
 				} else {
 					$this->session->set_flashdata('astpp_notification', 'Please upload only image!');
-				redirect(base_url() . "accounts/reseller_invoice_config/". $add_array['accountid']."/");
+				redirect(base_url()."accounts/reseller_invoice_config/".$add_array['accountid']."/");
 				}
 			}
 			$add_array['logo'] = $file_name;
@@ -2449,30 +2449,30 @@ 
 				$this->accounts_model->edit_invoice_config($add_array, $add_array['id']);
 			}
 			$this->session->set_flashdata('astpp_errormsg', 'Invoice config updated successfully!');
-			redirect(base_url() . "accounts/reseller_invoice_config/". $add_array['accountid']."/");
+			redirect(base_url()."accounts/reseller_invoice_config/".$add_array['accountid']."/");
 		} else {
-			$data["account_data"] =(array)$this->db->get_where('invoice_conf',array("accountid"=>$id))->first_row();
-		$data["accounttype"]='Reseller';
-		$data["edit_id"]=$id;
-			if(isset($data["account_data"]['logo'])){
-				$data["account_data"]['file']=$id."_".$data["account_data"]['logo'];
+			$data["account_data"] = (array)$this->db->get_where('invoice_conf', array("accountid"=>$id))->first_row();
+		$data["accounttype"] = 'Reseller';
+		$data["edit_id"] = $id;
+			if (isset($data["account_data"]['logo'])) {
+				$data["account_data"]['file'] = $id."_".$data["account_data"]['logo'];
 		}
 			$this->load->view('view_reseller_invoices_config', $data);
 		}
 }
      
-	 function reseller_invoice_logo_delete($accountid){
-		 $invoiceconf  = $this->db_model->getSelect("*", "invoice_conf", array("accountid"=> $accountid));
-		 $result=$invoiceconf->result_array();
-		 $logo=$result[0]['logo'];
-		 $post_arr=array('logo'=>'');
-		 $where_arr=array('logo'=>$logo);
+	 function reseller_invoice_logo_delete($accountid) {
+		 $invoiceconf = $this->db_model->getSelect("*", "invoice_conf", array("accountid"=> $accountid));
+		 $result = $invoiceconf->result_array();
+		 $logo = $result[0]['logo'];
+		 $post_arr = array('logo'=>'');
+		 $where_arr = array('logo'=>$logo);
 		 $this->db->where($where_arr);
-		 $this->db->update('invoice_conf',$post_arr);
+		 $this->db->update('invoice_conf', $post_arr);
 	 }
      
      
-	 function customer_global_grid_list(){
+	 function customer_global_grid_list() {
 	  echo gettext($_POST['display']); 
  	}
  	

web_interface/astpp/application/modules/rates/libraries/rates_form.php

Spacing +95 added lines, -95 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 rates_form {

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

 	}

 	function get_termination_rate_form_fields() {

-		$form['forms'] = array(base_url() . 'rates/termination_rate_save/', array('id' => 'termination_rate_form', 'method' => 'POST', 'name' => 'termination_rate_form'));

+		$form['forms'] = array(base_url().'rates/termination_rate_save/', array('id' => 'termination_rate_form', 'method' => 'POST', 'name' => 'termination_rate_form'));

 		$form['Rate Information'] = array(

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

 			array('Trunk', 'trunk_id', 'SELECT', '', 'dropdown', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', 'where_arr', array("status" => "0")),     

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

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

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

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

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

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

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

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

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

             

         

 );

 		$form['Billing Information'] = array(

-			array('Connect Cost', 'INPUT', array('name' => 'connectcost', 'size' => '20',  'class' => "text field medium"), 'trim|numeric|currency_decimal|xss_clean', 'tOOL TIP', ''),

+			array('Connect Cost', 'INPUT', array('name' => 'connectcost', 'size' => '20', 'class' => "text field medium"), 'trim|numeric|currency_decimal|xss_clean', 'tOOL TIP', ''),

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

 			 array('Per Minute Cost', 'INPUT', array('name' => 'cost', 'size' => '20', 'class' => "text field medium"), 'trim|numeric|currency_decimal|xss_clean', 'tOOL TIP', ''),

 /**

 ASTPP  3.0 

 For Add Initial Increment field

 **/

-		array('Initial Increment', 'INPUT', array('name' => 'init_inc', 'size' => '20',  'class' => "text field medium"), 'trim|numeric|xss_clean', 'tOOL TIP', ''),

+		array('Initial Increment', 'INPUT', array('name' => 'init_inc', 'size' => '20', 'class' => "text field medium"), 'trim|numeric|xss_clean', 'tOOL TIP', ''),

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

-			array('Increment', 'INPUT', array('name' => 'inc', 'size' => '20',  'class' => "text field medium"), 'trim|numeric|xss_clean', 'tOOL TIP', ''),

+			array('Increment', 'INPUT', array('name' => 'inc', 'size' => '20', 'class' => "text field medium"), 'trim|numeric|xss_clean', 'tOOL TIP', ''),

 			array('Priority', 'INPUT', array('name' => 'precedence', 'size' => '20', 'class' => "text field medium"), 'trim|numeric|xss_clean', 'tOOL TIP', ''));

 	

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

@@ -60,14 +60,14 @@ 
 	}

 

 	function get_origination_rate_form_fields() {

-	 $logintype=$this->CI->session->userdata('userlevel_logintype');

-		$trunk=null;

-		if($logintype !=1)

+	 $logintype = $this->CI->session->userdata('userlevel_logintype');

+		$trunk = null;

+		if ($logintype != 1)

 	  $trunk = array('Force Trunk', 'trunk_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', 'where_arr', array("status" => "0"));

-		$form['forms'] = array(base_url() . 'rates/origination_rate_save/', array('id' => 'origination_rate_form', 'method' => 'POST', 'name' => 'origination_rate_form'));

+		$form['forms'] = array(base_url().'rates/origination_rate_save/', array('id' => 'origination_rate_form', 'method' => 'POST', 'name' => 'origination_rate_form'));

 		$form['Rate Information'] = array(

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

-			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('Code', 'INPUT', array('name' => 'pattern', 'size' => '20', 'class' => "text field medium"), 'trim|required|numeric|xss_clean', 'tOOL TIP', ''),

 			array('Destination', 'INPUT', array('name' => 'comment', 'size' => '20', 'class' => "text field medium"), 'tOOL TIP', ''),

 			//array('Priority', 'INPUT', array('name' => 'precedence', 'size' => '20',  'class' => "text field medium"), 'trim|numeric|xss_clean', 'tOOL TIP', ''),

@@ -75,9 +75,9 @@ 
         

 );

 		$form['Billing Information'] = array(

-			array('Connect Cost', 'INPUT', array('name' => 'connectcost', 'size' => '20',  'class' => "text field medium"), 'trim|numeric|currency_decimal|xss_clean', 'tOOL TIP', ''),

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

-			 array('Per Minute Cost', 'INPUT', array('name' => 'cost', 'size' => '20',  'class' => "text field medium"), 'trim|numeric|currency_decimal|xss_clean', 'tOOL TIP', ''),

+			array('Connect Cost', 'INPUT', array('name' => 'connectcost', 'size' => '20', 'class' => "text field medium"), 'trim|numeric|currency_decimal|xss_clean', 'tOOL TIP', ''),

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

+			 array('Per Minute Cost', 'INPUT', array('name' => 'cost', 'size' => '20', 'class' => "text field medium"), 'trim|numeric|currency_decimal|xss_clean', 'tOOL TIP', ''),

 /**

 ASTPP  3.0 

 For Add Initial Increment field

@@ -113,7 +113,7 @@ 
 /***************************************************************/

 		array('Increment', 'INPUT', array('name' => 'inc[inc]', '', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'inc[inc-integer]', '', '', '', 'search_int_type', ''),

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

-			array('Trunk', 'trunk_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', 'where_arr', array("status" => "0")),array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),

+			array('Trunk', 'trunk_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', 'where_arr', array("status" => "0")), array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),

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

  /******

 ASTPP  3.0 

@@ -129,14 +129,14 @@ 
 ASTPP  3.0 

 Batch Delete

 ******/

-		$form['button_search_delete'] = array('name' => 'action', 'id' => "termination_rate_batch_dlt",'onclick'=>"check_btn();", 'content' => 'Delete Search Record','style'=>'display:none;', 'value' => 'submit', 'type' => 'button', 'class' => 'btn pull-right btn btn-line-danger ');

+		$form['button_search_delete'] = array('name' => 'action', 'id' => "termination_rate_batch_dlt", 'onclick'=>"check_btn();", 'content' => 'Delete Search Record', 'style'=>'display:none;', 'value' => 'submit', 'type' => 'button', 'class' => 'btn pull-right btn btn-line-danger ');

 

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

 /******

 ASTPP  3.0 

 Batch Delete

 ******/

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

+		$form['button_search'] = array('name' => 'action', 'id' => "termination_rate_search_btn", 'onclick'=>'search_btn();', 'content' => 'Search', 'value' => 'save', 'type' => 'button', 'class' => 'btn btn-line-parrot pull-right margin-x-10');

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

 		$form['button_reset'] = array('name' => 'action', 'id' => "id_reset", 'content' => 'Clear', 'value' => 'cancel', 'type' => 'reset', 'class' => 'btn btn-line-sky pull-right margin-x-10');

 

@@ -147,14 +147,14 @@ 
 	function termination_rate_batch_update_form() {

 		$form['forms'] = array("rates/termination_rate_batch_update/", array('id' => "termination_rate_batch_update"));

 		$form['Batch Update'] = array(

-		array('Connect Cost', 'INPUT', array('name' => 'connectcost[connectcost]','id'=>'connectcost', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', array('name'=>'connectcost[operator]','class'=>'update_drp'), '', '', '', 'update_int_type', ''),

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

-		array('Per Minute Cost', 'INPUT', array('name' => 'cost[cost]','id'=>'cost', 'value' => '', 'size' => '20',  'class' => "text field "), '', 'Tool tips info', '1', array('name'=>'cost[operator]','class'=>'update_drp'), '', '', '', 'update_int_type', ''),

+		array('Connect Cost', 'INPUT', array('name' => 'connectcost[connectcost]', 'id'=>'connectcost', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', array('name'=>'connectcost[operator]', 'class'=>'update_drp'), '', '', '', 'update_int_type', ''),

+		array('Included Seconds', 'INPUT', array('name' => 'includedseconds[includedseconds]', 'id'=>'includedseconds', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', array('name'=>'includedseconds[operator]', 'class'=>'update_drp'), '', '', '', 'update_int_type', ''),

+		array('Per Minute Cost', 'INPUT', array('name' => 'cost[cost]', 'id'=>'cost', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', array('name'=>'cost[operator]', 'class'=>'update_drp'), '', '', '', 'update_int_type', ''),

             

-		array('Increment', 'INPUT', array('name' => 'inc[inc]','id'=>'inc', 'size' => '20',  'class' => "text field "), '', 'tOOL TIP', '1', array('name'=>'inc[operator]','class'=>'update_drp'), '', '', '', 'update_int_type', ''),

-		array('Priority', 'INPUT', array('name' => 'precedence[precedence]','id'=>'precedence', 'size' => '20',  'class' => "text field "), '', 'tOOL TIP', '1', array('name'=>'precedence[operator]','class'=>'update_drp'), '', '', '', 'update_drp_type', ''),

-		array('Prepand', 'INPUT', array('name' => 'prepend[prepend]','id'=>'prepend', 'size' => '20',  'class' => "text field "), '', 'tOOL TIP', '1', array('name'=>'prepend[operator]','class'=>'update_drp'), '', '', '', 'update_drp_type', ''),

-			array('Trunk', array('name'=> 'trunk_id[trunk_id]','id'=>'trunk_id'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', 'where_arr', array("status" => "0"),array('name'=>'trunk_id[operator]','class'=>'update_drp'), 'update_drp_type'),

+		array('Increment', 'INPUT', array('name' => 'inc[inc]', 'id'=>'inc', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', array('name'=>'inc[operator]', 'class'=>'update_drp'), '', '', '', 'update_int_type', ''),

+		array('Priority', 'INPUT', array('name' => 'precedence[precedence]', 'id'=>'precedence', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', array('name'=>'precedence[operator]', 'class'=>'update_drp'), '', '', '', 'update_drp_type', ''),

+		array('Prepand', 'INPUT', array('name' => 'prepend[prepend]', 'id'=>'prepend', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', array('name'=>'prepend[operator]', 'class'=>'update_drp'), '', '', '', 'update_drp_type', ''),

+			array('Trunk', array('name'=> 'trunk_id[trunk_id]', 'id'=>'trunk_id'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', 'where_arr', array("status" => "0"), array('name'=>'trunk_id[operator]', 'class'=>'update_drp'), 'update_drp_type'),

 		);

 

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

@@ -163,17 +163,17 @@ 
 		return $form;

 	}

 	function origination_rate_batch_update_form() {

-	$logintype=$this->CI->session->userdata('userlevel_logintype');

-			$trunk=null;

-		if($logintype !=1)

-	  $trunk = array('Force Trunk', array('name'=> 'trunk_id[trunk_id]','id'=>'trunk_id'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', 'where_arr', array("status" => "0"),array('name'=>'trunk_id[operator]','class'=>'update_drp'), 'update_drp_type');

-		$form['forms'] = array("rates/origination_rate_batch_update/",array('id' => "origination_rate_batch_update"));        

+	$logintype = $this->CI->session->userdata('userlevel_logintype');

+			$trunk = null;

+		if ($logintype != 1)

+	  $trunk = array('Force Trunk', array('name'=> 'trunk_id[trunk_id]', 'id'=>'trunk_id'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', 'where_arr', array("status" => "0"), array('name'=>'trunk_id[operator]', 'class'=>'update_drp'), 'update_drp_type');

+		$form['forms'] = array("rates/origination_rate_batch_update/", array('id' => "origination_rate_batch_update"));        

 		$form['Batch Update'] = array(

-			array('Connect Cost', 'INPUT', array('name' => 'connectcost[connectcost]','id'=>'connectcost', 'value' => '', 'size' => '20',  'class' => "text field "), '', 'Tool tips info', '1', array('name'=>'connectcost[operator]','class'=>'update_drp'), '', '', '', 'update_int_type', ''),

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

-			array('Per Minute Cost', 'INPUT', array('name' => 'cost[cost]', 'id'=>'cost', 'value' => '', 'size' => '20',  'class' => "text field "), '', 'Tool tips info', '1',array('name'=>'cost[operator]','class'=>'update_drp'), '', '', '', 'update_int_type', ''),

-			array('Increment', 'INPUT', array('name' => 'inc[inc]', 'id'=>'inc', 'size' => '20',  'class' => "text field "), '', 'tOOL TIP', '1', array('name'=>'inc[operator]','class'=>'update_drp'), '', '', '', 'update_int_type', ''),

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

+			array('Connect Cost', 'INPUT', array('name' => 'connectcost[connectcost]', 'id'=>'connectcost', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', array('name'=>'connectcost[operator]', 'class'=>'update_drp'), '', '', '', 'update_int_type', ''),

+			array('Included Seconds', 'INPUT', array('name' => 'includedseconds[includedseconds]', 'id'=>'includedseconds', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', array('name'=>'includedseconds[operator]', 'class'=>'update_drp'), '', '', '', 'update_int_type', ''),

+			array('Per Minute Cost', 'INPUT', array('name' => 'cost[cost]', 'id'=>'cost', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', array('name'=>'cost[operator]', 'class'=>'update_drp'), '', '', '', 'update_int_type', ''),

+			array('Increment', 'INPUT', array('name' => 'inc[inc]', 'id'=>'inc', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', array('name'=>'inc[operator]', 'class'=>'update_drp'), '', '', '', 'update_int_type', ''),

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

 		   $trunk,

 		);

 

@@ -186,21 +186,21 @@ 
 		 function build_rates_list_for_reseller() {

 			 

 $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);			 

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

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

 			 

-		$grid_field_arr = json_encode(array(array('Code', "140", "pattern", "pattern", "", "get_only_numeric_val","","true","center"),

+		$grid_field_arr = json_encode(array(array('Code', "140", "pattern", "pattern", "", "get_only_numeric_val", "", "true", "center"),

 			array('Destination', "240", "comment", "", "", ""),

-			array('Connection Cost('.$currency.')', "210", "connectcost", "connectcost", "connectcost", "convert_to_currency","","true","right"),

-			array('Included Seconds', "180", "includedseconds", "", "", "","","true","center"),

-			array('Per Minute Cost('.$currency.')', "180", "cost", "cost", "cost", "convert_to_currency","","true","right"),

-			array('Increment', "140", "inc", "", "", "","","true","center"),

-			array('Priority', "155", "precedence", "", "", "","","true","center"),

+			array('Connection Cost('.$currency.')', "210", "connectcost", "connectcost", "connectcost", "convert_to_currency", "", "true", "right"),

+			array('Included Seconds', "180", "includedseconds", "", "", "", "", "true", "center"),

+			array('Per Minute Cost('.$currency.')', "180", "cost", "cost", "cost", "convert_to_currency", "", "true", "right"),

+			array('Increment', "140", "inc", "", "", "", "", "true", "center"),

+			array('Priority', "155", "precedence", "", "", "", "", "true", "center"),

 				));

 		return $grid_field_arr;

 	}

 	function get_reseller_origination_rate_search_form() {

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

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

 	

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

 		$form['Search My Rates'] = array(

@@ -236,7 +236,7 @@ 
 			array('Initial Increment', 'INPUT', array('name' => 'init_inc[init_inc]', '', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'init_inc[init_inc-integer]', '', '', '', 'search_int_type', ''),

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

 			array('Increment', 'INPUT', array('name' => 'inc[inc]', '', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'inc[inc-integer]', '', '', '', 'search_int_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('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_search_status', '', ''),

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

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

@@ -245,14 +245,14 @@ 
 ASTPP  3.0 

 Batch Delete

 ******/

-		$form['button_search_delete'] = array('name' => 'action', 'id' => "origination_rate_batch_dlt",'onclick'=>"check_btn();", 'content' => 'Delete Search Record','style'=>'display:none;', 'value' => 'save', 'type' => 'button', 'class' => 'btn pull-right btn btn-line-danger ');

+		$form['button_search_delete'] = array('name' => 'action', 'id' => "origination_rate_batch_dlt", 'onclick'=>"check_btn();", 'content' => 'Delete Search Record', 'style'=>'display:none;', 'value' => 'save', 'type' => 'button', 'class' => 'btn pull-right btn btn-line-danger ');

 

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

 /******** 

 ASTPP  3.0 

 Batch delete

 *********/

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

+		$form['button_search'] = array('name' => 'action', 'id' => "origination_rate_list_search_btn", 'onclick'=>'search_btn();', 'content' => 'Search', 'value' => 'save', 'type' => 'button', 'class' => 'btn btn-line-parrot pull-right  margin-x-10');

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

 		$form['button_reset'] = array('name' => 'action', 'id' => "id_reset", 'content' => 'Clear', 'value' => 'cancel', 'type' => 'reset', 'class' => 'btn btn-line-sky pull-right margin-x-10');

 

@@ -268,34 +268,34 @@ 
 

 	function build_termination_rate_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);

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

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

 		

 		// 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 Termination Rate edit on Code

 **/

-			array("Code", "78", "pattern", "pattern", "", "get_only_numeric_val","EDITABLE","true","center"),

+			array("Code", "78", "pattern", "pattern", "", "get_only_numeric_val", "EDITABLE", "true", "center"),

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

-			array("Destination", "80", "comment", "", "", "","","true","center"),

-			array("Connect Cost($currency)", "125", "connectcost", "connectcost", "connectcost", "convert_to_currency","","true","right"),

-			array("Included<br/> Seconds", "70", "includedseconds", "", "", "","","true","center"),

-			array("Per Minute <br/>Cost($currency)", "100", "cost", "cost", "cost", "convert_to_currency","","true","right"),

-  		array("Initial <br/> Increment", "95", "init_inc", "", "", "","","true","center"),

-			array("Increment", "75", "inc", "", "", "","","true","center"),

-			array("Priority", "70", "precedence", "", "", "","","true","center"),

-			array("Strip","60", "strip", "", "", "","","true","center"),

-			array("Prepend", "70", "prepend", "pattern", "", "get_only_numeric_val","","true","center"),

-			array("Trunk", "80", "trunk_id", "name", "trunks", "get_field_name","","true","center"),

+			array("Destination", "80", "comment", "", "", "", "", "true", "center"),

+			array("Connect Cost($currency)", "125", "connectcost", "connectcost", "connectcost", "convert_to_currency", "", "true", "right"),

+			array("Included<br/> Seconds", "70", "includedseconds", "", "", "", "", "true", "center"),

+			array("Per Minute <br/>Cost($currency)", "100", "cost", "cost", "cost", "convert_to_currency", "", "true", "right"),

+  		array("Initial <br/> Increment", "95", "init_inc", "", "", "", "", "true", "center"),

+			array("Increment", "75", "inc", "", "", "", "", "true", "center"),

+			array("Priority", "70", "precedence", "", "", "", "", "true", "center"),

+			array("Strip", "60", "strip", "", "", "", "", "true", "center"),

+			array("Prepend", "70", "prepend", "pattern", "", "get_only_numeric_val", "", "true", "center"),

+			array("Trunk", "80", "trunk_id", "name", "trunks", "get_field_name", "", "true", "center"),

 		   /*

             ASTPP  3.0 

             creation field show in grid

             */

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

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

 //            array("Created<br/>Date", "80", "creation_date", "creation_date", "creation_date", "convert_GMT_to","","true","center"),

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

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

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

 			 /*

             ASTPP  3.0

@@ -304,7 +304,7 @@ 
        

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

 //             array("Reseller", "103", "reseller_id", "number", "accounts", "get_field_name"),

-			array("Action", "80", "", "", "", array("EDIT" => array("url" => "rates/termination_rate_edit/", "mode" => "popup","layout"=>"medium"),

+			array("Action", "80", "", "", "", array("EDIT" => array("url" => "rates/termination_rate_edit/", "mode" => "popup", "layout"=>"medium"),

 					"DELETE" => array("url" => "rates/termination_rate_delete/", "mode" => "single")))

 				));

 		return $grid_field_arr;

@@ -317,36 +317,36 @@ 
    */

 	function build_origination_rate_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);

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

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

 		

 		// 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 Origination rate edit on code

 **/

-			array("Code", "75", "pattern", "pattern", "", "get_only_numeric_val","EDITABLE","true","center"),

+			array("Code", "75", "pattern", "pattern", "", "get_only_numeric_val", "EDITABLE", "true", "center"),

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

-			array("Destination", "100", "comment", "", "", "","","true","center"),

-			array("Connect Cost($currency)", "130", "connectcost", "connectcost", "connectcost", "convert_to_currency","","true","right"),

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

-			array("Per Minute Cost($currency)", "150", "cost", "cost", "cost", "convert_to_currency","","true","right"),

+			array("Destination", "100", "comment", "", "", "", "", "true", "center"),

+			array("Connect Cost($currency)", "130", "connectcost", "connectcost", "connectcost", "convert_to_currency", "", "true", "right"),

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

+			array("Per Minute Cost($currency)", "150", "cost", "cost", "cost", "convert_to_currency", "", "true", "right"),

 /**

 ASTPP  3.0 

 For Add Initial Increment field

 **/

-			array("Initial Increment", "130", "init_inc", "", "", "","","true","center"),

+			array("Initial Increment", "130", "init_inc", "", "", "", "", "true", "center"),

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

-			array("Increment", "90", "inc", "", "", "","","true","center"),

+			array("Increment", "90", "inc", "", "", "", "", "true", "center"),

 			//array("Priority", "72", "precedence", "", "", "","","true","center"),

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

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

 			/*

             ASTPP  3.0  creation field show in grid

             */

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

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

 //            array("Created<br/>Date", "80", "creation_date", "creation_date", "creation_date", "convert_GMT_to","","true","center"),

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

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

 

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

 			/*

@@ -354,7 +354,7 @@ 
             chnage in status active or inactive

             */

             

-			array("Action", "95", "", "", "", array("EDIT" => array("url" => "rates/origination_rate_edit/", "mode" => "popup","layout"=>"medium"),

+			array("Action", "95", "", "", "", array("EDIT" => array("url" => "rates/origination_rate_edit/", "mode" => "popup", "layout"=>"medium"),

 					"DELETE" => array("url" => "/rates/origination_rate_delete/", "mode" => "single")))

 				));

 		return $grid_field_arr;

@@ -362,20 +362,20 @@ 
 	/****************************************************************************************/

 

 	function build_grid_buttons() {

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

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

-			array("import","btn btn-line-blue" ,"fa fa-upload fa-lg", "button_action", "/rates/termination_rate_import/", 'single'),

-			array("Import with field map","btn btn-line-blue" ,"fa fa-upload fa-lg", "button_action", "/rates/termination_rate_import_mapper/", 'single'),

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

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

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

+			array("import", "btn btn-line-blue", "fa fa-upload fa-lg", "button_action", "/rates/termination_rate_import/", 'single'),

+			array("Import with field map", "btn btn-line-blue", "fa fa-upload fa-lg", "button_action", "/rates/termination_rate_import_mapper/", 'single'),

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

 			));

 		return $buttons_json;

 	}

 

 	function build_grid_buttons_origination_rate() {

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

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

-			array("import", "btn btn-line-blue","fa fa-upload fa-lg", "button_action", "/rates/origination_rate_import/", 'single'),

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

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

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

+			array("import", "btn btn-line-blue", "fa fa-upload fa-lg", "button_action", "/rates/origination_rate_import/", 'single'),

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

             

 			));

 		return $buttons_json;

@@ -384,7 +384,7 @@ 
 	function build_termination_rate_list_for_customer() {

 		// 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 checking checkall'/><label class='lbl'></label>", "30", "", "", "", "","","false","center"),

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

 			array("Code", "70", "pattern", "pattern", "", "get_only_numeric_val"),

 			array("Increment", "75", "inc", "", "", ""),

 			array("Connect <br> Charge", "100", "connectcost", "connectcost", "connectcost", "convert_to_currency"),

@@ -399,16 +399,16 @@ 
 	function build_block_pattern_list_for_customer() {

 		// 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='chkAll1' class='ace checking'/><label class='lbl'></label>", "30", "", "", "", "","","false","center","PatternChkBox"),

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

 			array("Code", "350", "pattern", "pattern", "", "get_only_numeric_val"),

 			array("Destination", "350", "comment", "", "", ""),

 				));

 		return $grid_field_arr;

 	}

-	function build_pattern_list_for_customer($accountid,$accounttype) {

+	function build_pattern_list_for_customer($accountid, $accounttype) {

 

 		$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", "blocked_patterns", "blocked_patterns", "", "get_only_numeric_val"),

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

 			array("Action", "100", "", "", "", array("DELETE" => array("url" => "accounts/".$accounttype."_delete_block_pattern/$accountid/", "mode" => "single")))

@@ -417,7 +417,7 @@ 
 	}

 

 	function set_pattern_grid_buttons($accountid) {

-		$buttons_json = json_encode(array(array("Add Prefixes","btn btn-line-warning btn","fa fa-plus-circle fa-lg", "button_action", "/accounts/customer_add_blockpatterns/$accountid", "popup")));

+		$buttons_json = json_encode(array(array("Add Prefixes", "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/accounts/customer_add_blockpatterns/$accountid", "popup")));

 		return $buttons_json;

 	}

 

@@ -435,7 +435,7 @@ 
 

 

 function build_grid_buttons_rates() {

-		$buttons_json = json_encode(array(array("Export","btn btn-xing" ," fa fa-download fa-lg", "button_action", "/rates/resellersrates_xls/", 'single')));

+		$buttons_json = json_encode(array(array("Export", "btn btn-xing", " fa fa-download fa-lg", "button_action", "/rates/resellersrates_xls/", 'single')));

 		return $buttons_json;

 	}

 

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

Spacing +261 added lines, -261 removed lines

@@ -36,7 +36,7 @@ 
 		ini_set("max_execution_time", "259200");
 		ini_set("upload_max_filesize", "200M");
 		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+			redirect(base_url().'/astpp/login');
 	}
 
 	function termination_rates_list() {
@@ -73,70 +73,70 @@ 
 
 		echo json_encode($json_data);
 	}
-	  function termination_rates_list_delete($flag='') {
+	  function termination_rates_list_delete($flag = '') {
 		$json_data = array();
-		$this->session->set_userdata('advance_batch_data_delete',1);
+		$this->session->set_userdata('advance_batch_data_delete', 1);
 		$count_all = $this->rates_model->get_termination_rates_list(false);
 	echo $count_all; 
 	} 
 /****************/
 	 function termination_rate_import() {
 		$data['page_title'] = 'Import Termination Rates';
-		$this->session->set_userdata('import_termination_rate_csv',"");
-		$this->session->set_userdata('import_termination_rate_csv_error',"");
+		$this->session->set_userdata('import_termination_rate_csv', "");
+		$this->session->set_userdata('import_termination_rate_csv_error', "");
 		$this->load->view('view_import_termination_rate', $data);
 	}
-	function termination_rate_preview_file(){
-		$invalid_flag= false;
-	$check_header=$this->input->post('check_header',true);
+	function termination_rate_preview_file() {
+		$invalid_flag = false;
+	$check_header = $this->input->post('check_header', true);
 	$data['page_title'] = 'Import Termination Rates';
 		$new_final_arr_key = $this->config->item('Termination-rates-field');
-		if(empty($_FILES) || !isset($_FILES)){
+		if (empty($_FILES) || ! isset($_FILES)) {
 	  redirect(base_url()."rates/termination_rates_list/");
 	}
-		if (isset($_FILES['termination_rate_import']['name']) && $_FILES['termination_rate_import']['name'] != "" &&  isset($_POST['trunk_id']) && $_POST['trunk_id'] != '') {
+		if (isset($_FILES['termination_rate_import']['name']) && $_FILES['termination_rate_import']['name'] != "" && isset($_POST['trunk_id']) && $_POST['trunk_id'] != '') {
 			list($txt, $ext) = explode(".", $_FILES['termination_rate_import']['name']);
-			if($ext == "csv" && $_FILES['termination_rate_import']['size'] > 0){ 
+			if ($ext == "csv" && $_FILES['termination_rate_import']['size'] > 0) { 
 				$error = $_FILES['termination_rate_import']['error'];
-				if ($error == 0 ) {
+				if ($error == 0) {
 					$uploadedFile = $_FILES["termination_rate_import"]["tmp_name"];
-					$csv_data=$this->csvreader->parse_file($uploadedFile,$new_final_arr_key,$check_header);
-			if(!empty($csv_data)){
+					$csv_data = $this->csvreader->parse_file($uploadedFile, $new_final_arr_key, $check_header);
+			if ( ! empty($csv_data)) {
 			$full_path = $this->config->item('rates-file-path');
-			$actual_file_name = "ASTPP-TERMINATION-RATES-".date("Y-m-d H:i:s"). "." . $ext;
-			if (move_uploaded_file($uploadedFile,$full_path.$actual_file_name)) {
+			$actual_file_name = "ASTPP-TERMINATION-RATES-".date("Y-m-d H:i:s").".".$ext;
+			if (move_uploaded_file($uploadedFile, $full_path.$actual_file_name)) {
 			  $data['csv_tmp_data'] = $csv_data;
 			  $data['trunkid'] = $_POST['trunk_id'];
-			  $data['check_header']=$check_header;
+			  $data['check_header'] = $check_header;
 			  $data['page_title'] = 'Termination Rates Preview';
-			  $this->session->set_userdata('import_termination_rate_csv',$actual_file_name);
-			}else{
+			  $this->session->set_userdata('import_termination_rate_csv', $actual_file_name);
+			} else {
 			  $data['error'] = "File Uploading Fail Please Try Again";
 			}
 					}
 				}
-				else{
-					$data['error']=="File Uploading Fail Please Try Again";
+				else {
+					$data['error'] == "File Uploading Fail Please Try Again";
 				}
-			}else {
+			} else {
 				$data['error'] = "Invalid file format : Only CSV file allows to import records(Can't import empty file)";
 			}
-		}else{
-		$invalid_flag=true;
+		} else {
+		$invalid_flag = true;
 		}
 		if ($invalid_flag) {
 			$str = '';
-			if (!isset($_POST['trunk_id']) || empty($_POST['trunk_id'])) {
-				$str.= '<br/>Please Create Trunk.';
+			if ( ! isset($_POST['trunk_id']) || empty($_POST['trunk_id'])) {
+				$str .= '<br/>Please Create Trunk.';
 			}
 			if (empty($_FILES['termination_rate_import']['name'])) {
-				$str.= '<br/>Please Select  File.';
+				$str .= '<br/>Please Select  File.';
 			}
-			$data['error']=$str;
+			$data['error'] = $str;
 		}
 		$this->load->view('view_import_termination_rate', $data);
 	}
-	function termination_rate_rates_import($trunkID,$check_header=false) {
+	function termination_rate_rates_import($trunkID, $check_header = false) {
 		$new_final_arr = array();
 		$invalid_array = array();
 		$new_final_arr_key = $this->config->item('Termination-rates-field');
@@ -146,65 +146,65 @@ 
 		}
 	$full_path = $this->config->item('rates-file-path');
 		$terminationrate_file_name = $this->session->userdata('import_termination_rate_csv');	
-		$csv_tmp_data = $this->csvreader->parse_file($full_path.$terminationrate_file_name,$new_final_arr_key,$check_header); 
-	$i=0;
+		$csv_tmp_data = $this->csvreader->parse_file($full_path.$terminationrate_file_name, $new_final_arr_key, $check_header); 
+	$i = 0;
 		foreach ($csv_tmp_data as $key => $csv_data) {
-	 if(isset($csv_data['pattern']) && $csv_data['pattern']!= '' && $i != 0){
-		$str=null;
-		$csv_data['prepend']= isset($csv_data['prepend'])? $csv_data['prepend'] :'';
-		$csv_data['comment']= isset($csv_data['comment'])? $csv_data['comment'] :'';
-		$csv_data['connectcost']= isset($csv_data['connectcost']) ? $csv_data['connectcost'] :0;
-		$csv_data['includedseconds']= isset($csv_data['includedseconds']) ? $csv_data['includedseconds'] :0;
-		$csv_data['cost']= !empty($csv_data['cost']) && is_numeric( $csv_data['cost']) ? $csv_data['cost'] :0;
-		$csv_data['inc']= isset($csv_data['inc']) ? $csv_data['inc'] :0;
-		$csv_data['precedence']= isset($csv_data['precedence']) ? $csv_data['precedence'] :'';
-		$csv_data['strip']= isset($csv_data['strip']) ? $csv_data['strip'] :'';
+	 if (isset($csv_data['pattern']) && $csv_data['pattern'] != '' && $i != 0) {
+		$str = null;
+		$csv_data['prepend'] = isset($csv_data['prepend']) ? $csv_data['prepend'] : '';
+		$csv_data['comment'] = isset($csv_data['comment']) ? $csv_data['comment'] : '';
+		$csv_data['connectcost'] = isset($csv_data['connectcost']) ? $csv_data['connectcost'] : 0;
+		$csv_data['includedseconds'] = isset($csv_data['includedseconds']) ? $csv_data['includedseconds'] : 0;
+		$csv_data['cost'] = ! empty($csv_data['cost']) && is_numeric($csv_data['cost']) ? $csv_data['cost'] : 0;
+		$csv_data['inc'] = isset($csv_data['inc']) ? $csv_data['inc'] : 0;
+		$csv_data['precedence'] = isset($csv_data['precedence']) ? $csv_data['precedence'] : '';
+		$csv_data['strip'] = isset($csv_data['strip']) ? $csv_data['strip'] : '';
 		$csv_data['last_modified_date'] = date("Y-m-d H:i:s");
-		$str=$this->data_validate($csv_data);
-		if($str != ""){
-		  $invalid_array[$i]=$csv_data;
+		$str = $this->data_validate($csv_data);
+		if ($str != "") {
+		  $invalid_array[$i] = $csv_data;
 		  $invalid_array[$i]['error'] = $str;
 		}
-		else{
-		  $csv_data['trunk_id']=$trunkID;
-		  $csv_data['pattern'] = "^" . $csv_data['pattern'] . ".*";
-		  $new_final_arr[$i]=$csv_data;
+		else {
+		  $csv_data['trunk_id'] = $trunkID;
+		  $csv_data['pattern'] = "^".$csv_data['pattern'].".*";
+		  $new_final_arr[$i] = $csv_data;
 		}
 	  }
 		  $i++;
 		}
-		 if(!empty($new_final_arr)){
+		 if ( ! empty($new_final_arr)) {
  		$result = $this->rates_model->bulk_insert_termination_rate($new_final_arr);
 		 }
 		  unlink($full_path.$terminationrate_file_name);
-	  $count=count($invalid_array);
-		if($count >0){
+	  $count = count($invalid_array);
+		if ($count > 0) {
 			$session_id = "-1";
 			$fp = fopen($full_path.$session_id.'.csv', 'w');
-			foreach($new_final_arr_key as $key=>$value){
-		  $custom_array[0][$key]=ucfirst($key);
+			foreach ($new_final_arr_key as $key=>$value) {
+		  $custom_array[0][$key] = ucfirst($key);
 			}
-			$custom_array[0]['error']= "Error";
-			$invalid_array =array_merge($custom_array,$invalid_array);
-			foreach($invalid_array as $err_data){
-					fputcsv($fp,$err_data);
+			$custom_array[0]['error'] = "Error";
+			$invalid_array = array_merge($custom_array, $invalid_array);
+			foreach ($invalid_array as $err_data) {
+					fputcsv($fp, $err_data);
 			}
 		   fclose($fp);
 		   $this->session->set_userdata('import_termination_rate_csv_error', $session_id.".csv");
 		   $data["error"] = $invalid_array;
 		   $data['trunkid'] = $trunkID;
 		   $data['impoted_count'] = count($new_final_arr);
-		   $data['failure_count'] = count($invalid_array)-1;
+		   $data['failure_count'] = count($invalid_array) - 1;
 		   $data['page_title'] = 'Termination Rates Import Error';	
-		   $this->load->view('view_import_error',$data);
-		 } else{
+		   $this->load->view('view_import_error', $data);
+		 } else {
 	  $this->session->set_flashdata('astpp_errormsg', 'Total '.count($new_final_arr).' Termination rates imported successfully!');
 		   redirect(base_url()."rates/termination_rates_list/");
 		 }        
 	}
-	function termination_rate_error_download(){
+	function termination_rate_error_download() {
 		$this->load->helper('download');
-		$error_data =  $this->session->userdata('import_termination_rate_csv_error');
+		$error_data = $this->session->userdata('import_termination_rate_csv_error');
 		$full_path = $this->config->item('rates-file-path');
 		$data = file_get_contents($full_path.$error_data);
 		force_download("Termination_rate_error.csv", $data); 
@@ -212,182 +212,182 @@ 
 	}  
 	function origination_rate_import() {
 		$data['page_title'] = 'Import Origination Rates';
-		$this->session->set_userdata('import_origination_rate_csv',"");
-		$error_data =  $this->session->userdata('import_origination_rate_csv_error');
+		$this->session->set_userdata('import_origination_rate_csv', "");
+		$error_data = $this->session->userdata('import_origination_rate_csv_error');
 		$full_path = $this->config->item('rates-file-path');
-		if(file_exists($full_path.$error_data) && $error_data != ""){
+		if (file_exists($full_path.$error_data) && $error_data != "") {
 			unlink($full_path.$error_data);
-			$this->session->set_userdata('import_origination_rate_csv_error',"");
+			$this->session->set_userdata('import_origination_rate_csv_error', "");
 		}
 		$this->load->view('view_import_origination_rate', $data);
 	}
-	function origination_rate_preview_file(){
-	$invalid_flag= false;
-	$data=array();
+	function origination_rate_preview_file() {
+	$invalid_flag = false;
+	$data = array();
 	$data['page_title'] = 'Import Origination Rates';
-	$check_header=$this->input->post('check_header',true);
-	if(empty($_FILES) || !isset($_FILES)){
+	$check_header = $this->input->post('check_header', true);
+	if (empty($_FILES) || ! isset($_FILES)) {
 	  redirect(base_url()."rates/origination_rate_list/");
 	}
-	$get_extension=strpos($_FILES['origination_rate_import']['name'],'.');
+	$get_extension = strpos($_FILES['origination_rate_import']['name'], '.');
 	$new_final_arr_key = $this->config->item('Origination-rates-field');
-	if(!$get_extension){
-		$data['error']= "Please Upload File Atleast";
+	if ( ! $get_extension) {
+		$data['error'] = "Please Upload File Atleast";
 		}
 		if (isset($_FILES['origination_rate_import']['name']) && $_FILES['origination_rate_import']['name'] != "" && isset($_POST['pricelist_id']) && $_POST['pricelist_id'] != '') {
-			list($txt,$ext) = explode(".", $_FILES['origination_rate_import']['name']);
+			list($txt, $ext) = explode(".", $_FILES['origination_rate_import']['name']);
             
-			if($ext == "csv" && $_FILES['origination_rate_import']['size'] > 0){ 
+			if ($ext == "csv" && $_FILES['origination_rate_import']['size'] > 0) { 
 				$error = $_FILES['origination_rate_import']['error'];
 				if ($error == 0) {
 					$uploadedFile = $_FILES["origination_rate_import"]["tmp_name"];
-					$csv_data=$this->csvreader->parse_file($uploadedFile,$new_final_arr_key,$check_header);
-					if(!empty($csv_data)){
+					$csv_data = $this->csvreader->parse_file($uploadedFile, $new_final_arr_key, $check_header);
+					if ( ! empty($csv_data)) {
 			$full_path = $this->config->item('rates-file-path');
-					$actual_file_name = "ASTPP-ORIGIN-RATES-".date("Y-m-d H:i:s"). "." . $ext;
-					if (move_uploaded_file($uploadedFile,$full_path.$actual_file_name)) {
-			$flag=false;
-			$data['trunkid']=isset($_POST['trunk_id']) && $_POST['trunk_id'] > 0 ? $_POST['trunk_id'] : 0;
+					$actual_file_name = "ASTPP-ORIGIN-RATES-".date("Y-m-d H:i:s").".".$ext;
+					if (move_uploaded_file($uploadedFile, $full_path.$actual_file_name)) {
+			$flag = false;
+			$data['trunkid'] = isset($_POST['trunk_id']) && $_POST['trunk_id'] > 0 ? $_POST['trunk_id'] : 0;
 						$data['csv_tmp_data'] = $csv_data;
 						$data['pricelistid'] = $_POST['pricelist_id'];
 						$data['page_title'] = "Origination Rates Preview";
-						$data['check_header']=$check_header;
-						$this->session->set_userdata('import_origination_rate_csv',$actual_file_name);
-					}else{
+						$data['check_header'] = $check_header;
+						$this->session->set_userdata('import_origination_rate_csv', $actual_file_name);
+					} else {
 						$data['error'] = "File Uploading Fail Please Try Again";
 					}
 				}
 			 }   
-			else{
-					$data['error']=="File Uploading Fail Please Try Again";
+			else {
+					$data['error'] == "File Uploading Fail Please Try Again";
 				}
 		   }
 		   else {
 				$data['error'] = "Invalid file format : Only CSV file allows to import records(Can't import empty file)";
 			}
-			}else{
-		$invalid_flag=true;
+			} else {
+		$invalid_flag = true;
 			}
 		if ($invalid_flag) {
 			$str = '';
-			if (!isset($_POST['pricelist_id']) || empty($_POST['pricelist_id'])) {
-				$str.= '<br/>Please Create Rate Group.';
+			if ( ! isset($_POST['pricelist_id']) || empty($_POST['pricelist_id'])) {
+				$str .= '<br/>Please Create Rate Group.';
 			}
 			if (empty($_FILES['origination_rate_import']['name'])) {
-				$str.= '<br/>Please Select File.';
+				$str .= '<br/>Please Select File.';
 			}
-			$data['error']=$str;
+			$data['error'] = $str;
 		}
 		$this->load->view('view_import_origination_rate', $data);
 	}
-	function origination_rate_import_file($pricelistID,$trunkid,$check_header=false) {
+	function origination_rate_import_file($pricelistID, $trunkid, $check_header = false) {
 	   $new_final_arr = array();
 		$invalid_array = array();
 		$new_final_arr_key = $this->config->item('Origination-rates-field');
 	$screen_path = $this->config->item('screen_path');
-	$reseller_id=0;
+	$reseller_id = 0;
 		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
 			$reseller_id = $this->session->userdata["accountinfo"]['id'];
 		}
         
 		$full_path = $this->config->item('rates-file-path');
 		$originationrate_file_name = $this->session->userdata('import_origination_rate_csv');	
-		$csv_tmp_data = $this->csvreader->parse_file($full_path.$originationrate_file_name,$new_final_arr_key,$check_header); 
+		$csv_tmp_data = $this->csvreader->parse_file($full_path.$originationrate_file_name, $new_final_arr_key, $check_header); 
 		//echo "<pre>";print_r($csv_tmp_data);exit;
-	$i=0;
+	$i = 0;
 		foreach ($csv_tmp_data as $key => $csv_data) {	
-	  if(isset($csv_data['pattern']) && $csv_data['pattern']!= '' && $i != 0){
-		$str=null;
-		$csv_data['comment']= isset($csv_data['comment'])? $csv_data['comment'] :'';
-		$csv_data['connectcost']= isset($csv_data['connectcost']) ? $csv_data['connectcost'] :0;
-		$csv_data['includedseconds']= isset($csv_data['includedseconds']) ? $csv_data['includedseconds'] :0;
-		$csv_data['cost']= !empty($csv_data['cost']) && is_numeric( $csv_data['cost']) ? $csv_data['cost'] :0;
-		$csv_data['inc']= isset($csv_data['inc']) ? $csv_data['inc'] :0;
-		$csv_data['precedence']= isset($csv_data['precedence']) ? $csv_data['precedence'] :'';
+	  if (isset($csv_data['pattern']) && $csv_data['pattern'] != '' && $i != 0) {
+		$str = null;
+		$csv_data['comment'] = isset($csv_data['comment']) ? $csv_data['comment'] : '';
+		$csv_data['connectcost'] = isset($csv_data['connectcost']) ? $csv_data['connectcost'] : 0;
+		$csv_data['includedseconds'] = isset($csv_data['includedseconds']) ? $csv_data['includedseconds'] : 0;
+		$csv_data['cost'] = ! empty($csv_data['cost']) && is_numeric($csv_data['cost']) ? $csv_data['cost'] : 0;
+		$csv_data['inc'] = isset($csv_data['inc']) ? $csv_data['inc'] : 0;
+		$csv_data['precedence'] = isset($csv_data['precedence']) ? $csv_data['precedence'] : '';
 		$csv_data['last_modified_date'] = date("Y-m-d H:i:s");
-		$str=$this->data_validate($csv_data);
-		if($str != ""){
-		  $invalid_array[$i]=$csv_data;
+		$str = $this->data_validate($csv_data);
+		if ($str != "") {
+		  $invalid_array[$i] = $csv_data;
 		  $invalid_array[$i]['error'] = $str;
 		}
-		else{
-		  $csv_data['pricelist_id']=$pricelistID;
-		  $csv_data['trunk_id']=$trunkid;
-		  $csv_data['pattern'] = "^" . $csv_data['pattern'] . ".*";
-		  $csv_data['reseller_id']= $reseller_id;
+		else {
+		  $csv_data['pricelist_id'] = $pricelistID;
+		  $csv_data['trunk_id'] = $trunkid;
+		  $csv_data['pattern'] = "^".$csv_data['pattern'].".*";
+		  $csv_data['reseller_id'] = $reseller_id;
 		  $csv_data['creation_date'] = gmdate('Y-m-d H:i:s');
-		  $new_final_arr[$i]=$csv_data;
+		  $new_final_arr[$i] = $csv_data;
 		}
 	  }
 		  $i++;
 		}
-		  if(!empty($new_final_arr)){
+		  if ( ! empty($new_final_arr)) {
   		$result = $this->rates_model->bulk_insert_origination_rate($new_final_arr);
 		  }
 		  unlink($full_path.$originationrate_file_name);
-	 $count=count($invalid_array);
-		if($count >0){
+	 $count = count($invalid_array);
+		if ($count > 0) {
 			$session_id = "-1";
 			$fp = fopen($full_path.$session_id.'.csv', 'w');
-			foreach($new_final_arr_key as $key=>$value){
-		  $custom_array[0][$key]=ucfirst($key);
+			foreach ($new_final_arr_key as $key=>$value) {
+		  $custom_array[0][$key] = ucfirst($key);
 			}
-			$custom_array[0]['error']= "Error";
-			$invalid_array =array_merge($custom_array,$invalid_array);
-			foreach($invalid_array as $err_data){
-					fputcsv($fp,$err_data);
+			$custom_array[0]['error'] = "Error";
+			$invalid_array = array_merge($custom_array, $invalid_array);
+			foreach ($invalid_array as $err_data) {
+					fputcsv($fp, $err_data);
 			}
 			fclose($fp);
 		   $this->session->set_userdata('import_origination_rate_csv_error', $session_id.".csv");
 		   $data["error"] = $invalid_array;
 		   $data['pricelistid'] = $pricelistID;
 		   $data['impoted_count'] = count($new_final_arr);
-		   $data['failure_count'] = count($invalid_array)-1;
+		   $data['failure_count'] = count($invalid_array) - 1;
 		   $data['page_title'] = 'Origination Rates Import Error';	
-		   $this->load->view('view_import_error',$data);
-		 } else{
+		   $this->load->view('view_import_error', $data);
+		 } else {
 	   $this->session->set_flashdata('astpp_errormsg', 'Total '.count($new_final_arr).' Origination rates imported successfully!');
 		   redirect(base_url()."rates/origination_rates_list/");
 		   }
 	}
-	 function data_validate($csvdata){
-		  $str=null;
+	 function data_validate($csvdata) {
+		  $str = null;
 	  $alpha_regex = "/^[a-z ,.'-]+$/i";
 	  $alpha_numeric_regex = "/^[a-z0-9 ,.'-]+$/i";
 	  $email_regex = "/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$/"; 
-	  $str.= $csvdata['pattern']!= '' ? null : 'Code,';
-	  $str=rtrim($str,',');
-	  if(!$str){
-		  $str.= is_numeric($csvdata['pattern']) ? null : 'Code,';
-
-		  $str.= !empty($csvdata['connectcost']) && is_numeric( $csvdata['connectcost']) ? null :( empty($csvdata['connectcost']) ? null : 'Connect Cost,');
-		  $str.= !empty($csvdata['includedseconds']) && is_numeric( $csvdata['includedseconds']) ? null :( empty($csvdata['includedseconds']) ? null : 'Included Seconds,');
-
-		  $str.= !empty($csvdata['inc']) && is_numeric( $csvdata['inc']) ? null :( empty($csvdata['inc']) ? null : 'Increment,');
-		  $str.= !empty($csvdata['precedence']) && is_numeric( $csvdata['precedence']) ? null :( empty($csvdata['precedence']) ? null : 'Precedence,');
-		  $str.= (isset($csvdata['strip']) && !empty($csvdata['strip'])) ? (is_numeric($csvdata['strip']) ? null :'Strip,') : null;
-		  if($str){
-		$str=rtrim($str,',');
-		$error_field=explode(',',$str);
+	  $str .= $csvdata['pattern'] != '' ? null : 'Code,';
+	  $str = rtrim($str, ',');
+	  if ( ! $str) {
+		  $str .= is_numeric($csvdata['pattern']) ? null : 'Code,';
+
+		  $str .= ! empty($csvdata['connectcost']) && is_numeric($csvdata['connectcost']) ? null : (empty($csvdata['connectcost']) ? null : 'Connect Cost,');
+		  $str .= ! empty($csvdata['includedseconds']) && is_numeric($csvdata['includedseconds']) ? null : (empty($csvdata['includedseconds']) ? null : 'Included Seconds,');
+
+		  $str .= ! empty($csvdata['inc']) && is_numeric($csvdata['inc']) ? null : (empty($csvdata['inc']) ? null : 'Increment,');
+		  $str .= ! empty($csvdata['precedence']) && is_numeric($csvdata['precedence']) ? null : (empty($csvdata['precedence']) ? null : 'Precedence,');
+		  $str .= (isset($csvdata['strip']) && ! empty($csvdata['strip'])) ? (is_numeric($csvdata['strip']) ? null : 'Strip,') : null;
+		  if ($str) {
+		$str = rtrim($str, ',');
+		$error_field = explode(',', $str);
 		$count = count($error_field);
-		$str.= $count > 1 ? ' are not valid' : ' is not Valid';
+		$str .= $count > 1 ? ' are not valid' : ' is not Valid';
 		return $str;
 		  }
-		  else{
+		  else {
 		  return false;
 		  }
 	  }
-	  else{
-	  $str=rtrim($str,',');
-		$error_field=explode(',',$str);
+	  else {
+	  $str = rtrim($str, ',');
+		$error_field = explode(',', $str);
 		$count = count($error_field);
-		$str.= $count > 1 ? ' are required' : ' is Required';
+		$str .= $count > 1 ? ' are required' : ' is Required';
 	return $str;
 	}
 	}
-	function origination_rate_error_download(){
+	function origination_rate_error_download() {
 		$this->load->helper('download');
-		$error_data =  $this->session->userdata('import_origination_rate_csv_error');
+		$error_data = $this->session->userdata('import_origination_rate_csv_error');
 		$full_path = $this->config->item('rates-file-path');
 		$data = file_get_contents($full_path.$error_data);
 		force_download("Origination_rate_error.csv", $data); 
@@ -417,13 +417,13 @@ 
 				$edit_data = $value;
 			}
 			$edit_data['connectcost'] = $this->common_model->to_calculate_currency($edit_data['connectcost'], '', '', true, false);
-			$edit_data['cost'] = $this->common_model->to_calculate_currency($edit_data['cost'], '', '',true, false);
+			$edit_data['cost'] = $this->common_model->to_calculate_currency($edit_data['cost'], '', '', true, false);
 			$edit_data['pattern'] = filter_var($edit_data['pattern'], FILTER_SANITIZE_NUMBER_INT);
 
 			$data['form'] = $this->form->build_form($this->rates_form->get_origination_rate_form_fields(), $edit_data);
 			$this->load->view('view_origination_rate_add_edit', $data);
 		} else {
-			redirect(base_url() . 'rates/origination_rate_list/');
+			redirect(base_url().'rates/origination_rate_list/');
 		}
 	}
 
@@ -471,7 +471,7 @@ 
 			$this->session->set_userdata('origination_rate_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'rates/origination_rates_list/');
+			redirect(base_url().'rates/origination_rates_list/');
 		}
 	}
 
@@ -483,13 +483,13 @@ 
 	function termination_rate_delete($id) {
 		$this->rates_model->remove_termination_rate($id);
 		$this->session->set_flashdata('astpp_notification', 'Termination removed successfully!');
-		redirect(base_url() . '/rates/termination_rates_list/');
+		redirect(base_url().'/rates/termination_rates_list/');
 	}
 
 	function origination_rate_delete($id) {
 		$this->rates_model->remove_origination_rate($id);
 		$this->session->set_flashdata('astpp_notification', 'Origination rate removed successfully!');
-		redirect(base_url() . 'rates/origination_rates_list/');
+		redirect(base_url().'rates/origination_rates_list/');
 	}
 
 	function origination_rates_list() {
@@ -528,9 +528,9 @@ 
 		echo json_encode($json_data);
 	}
 
-	  function origination_rates_list_delete($flag='') {
+	  function origination_rates_list_delete($flag = '') {
 		$json_data = array();
-		$this->session->set_userdata('advance_batch_data_delete',1);
+		$this->session->set_userdata('advance_batch_data_delete', 1);
 		$count_all = $this->rates_model->get_origination_rate_list(false);
 		echo $count_all; 
 	} 
@@ -604,7 +604,7 @@ 
 			$this->session->set_userdata('termination_rates_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'rates/termination_rates_list/');
+			redirect(base_url().'rates/termination_rates_list/');
 		}
 	}
 
@@ -613,20 +613,20 @@ 
 		$this->session->set_userdata('account_search', "");
 	}
 
-	function customer_block_pattern_list($accountid,$accounttype) {
+	function customer_block_pattern_list($accountid, $accounttype) {
 		$json_data = array();
 		$where = array('accountid' => $accountid);
-		$instant_search=$this->session->userdata('left_panel_search_'.$accounttype.'_pattern'); 
-		$like_str=!empty($instant_search) ? "(blocked_patterns like '%$instant_search%'  OR  destination like '%$instant_search%' )" :null;
-		if(!empty($like_str))
+		$instant_search = $this->session->userdata('left_panel_search_'.$accounttype.'_pattern'); 
+		$like_str = ! empty($instant_search) ? "(blocked_patterns like '%$instant_search%'  OR  destination like '%$instant_search%' )" : null;
+		if ( ! empty($like_str))
 		$this->db->where($like_str);
 		$count_all = $this->db_model->countQuery("*", "block_patterns", $where);
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
-		if(!empty($like_str))
+		if ( ! empty($like_str))
 		$this->db->where($like_str);
 		$pattern_data = $this->db_model->getSelect("*", "block_patterns", $where, "id", "ASC", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
-		$grid_fields = json_decode($this->rates_form->build_pattern_list_for_customer($accountid,$accounttype));
+		$grid_fields = json_decode($this->rates_form->build_pattern_list_for_customer($accountid, $accounttype));
 		$json_data['rows'] = $this->form->build_grid($pattern_data, $grid_fields);
 		echo json_encode($json_data);
 	}
@@ -649,7 +649,7 @@ 
 		$json_data = array();
 		$account_data = $this->session->userdata("accountinfo");
 		$markup = $this->common->get_field_name('markup', 'pricelists', array('id'=>$account_data["pricelist_id"]));
-		$markup = ($markup > 0)?$markup:1;
+		$markup = ($markup > 0) ? $markup : 1;
 
 		$count_all = $this->rates_model->get_origination_rate_list_for_user(false);
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
@@ -659,11 +659,11 @@ 
 		$grid_fields = json_decode($this->rates_form->build_origination_rate_list_for_user());
 		foreach ($query->result_array() as $key => $value) {
 			$json_data['rows'][] = array('cell' => array(
-					$this->common->get_only_numeric_val("","",$value["pattern"]),
+					$this->common->get_only_numeric_val("", "", $value["pattern"]),
 					$value['comment'],
 					$value['inc'],
-					$this->common_model->calculate_currency(($value['cost'] + ($value['cost']*$markup)/100),'','','',true),
-					$this->common_model->calculate_currency($value['connectcost'],'','','',true),
+					$this->common_model->calculate_currency(($value['cost'] + ($value['cost'] * $markup) / 100), '', '', '', true),
+					$this->common_model->calculate_currency($value['connectcost'], '', '', '', true),
 					$value['includedseconds']                    
 			));
 		}
@@ -682,7 +682,7 @@ 
 			$this->session->set_userdata('origination_rate_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'user/user_rates_list/');
+			redirect(base_url().'user/user_rates_list/');
 		}
 	}
 
@@ -690,10 +690,10 @@ 
 		$this->session->set_userdata('advance_search', 0);
 		$this->session->set_userdata('account_search', "");
 	}
-	function customer_rates_download_sample_file($file_name){
+	function customer_rates_download_sample_file($file_name) {
 		$this->load->helper('download');
 		$full_path = base_url()."assets/Rates_File/".$file_name.".csv";
-		$arrContextOptions=array(
+		$arrContextOptions = array(
 			"ssl"=>array(
 			"verify_peer"=>false,
 			"verify_peer_name"=>false,
@@ -702,19 +702,19 @@ 
 		$file = file_get_contents($full_path, false, stream_context_create($arrContextOptions));
 		force_download("samplefile.csv", $file); 
 	}
-	function termination_rate_batch_update(){
+	function termination_rate_batch_update() {
 		$batch_update_arr = $this->input->post();
-	$batch_update_arr["cost"]["cost"] = isset($batch_update_arr["cost"]["cost"])?$this->common_model->add_calculate_currency($batch_update_arr["cost"]["cost"], '', '', true, false):"0.0000";
-	$batch_update_arr["connectcost"]["connectcost"] = isset($batch_update_arr["connectcost"]["connectcost"])?$this->common_model->add_calculate_currency($batch_update_arr["connectcost"]["connectcost"], '', '', true, false):"0.0000";
+	$batch_update_arr["cost"]["cost"] = isset($batch_update_arr["cost"]["cost"]) ? $this->common_model->add_calculate_currency($batch_update_arr["cost"]["cost"], '', '', true, false) : "0.0000";
+	$batch_update_arr["connectcost"]["connectcost"] = isset($batch_update_arr["connectcost"]["connectcost"]) ? $this->common_model->add_calculate_currency($batch_update_arr["connectcost"]["connectcost"], '', '', true, false) : "0.0000";
 //        $batch_update_arr = array("inc"=> array("inc"=>"1","operator"=>"3"),"cost"=> array("cost"=>"1","operator"=>"4"));
 		$result = $this->rates_model->termination_rate_batch_update($batch_update_arr);
 		echo json_encode(array("SUCCESS"=> "Termination rates batch updated successfully!"));
 		exit;
 	}
     
-	function origination_rate_batch_update(){
+	function origination_rate_batch_update() {
 		$batch_update_arr = $this->input->post();
-		 $batch_update_arr["cost"]["cost"] = isset($batch_update_arr["cost"]["cost"])?$this->common_model->add_calculate_currency($batch_update_arr["cost"]["cost"], '', '', true, false):"0.0000";
+		 $batch_update_arr["cost"]["cost"] = isset($batch_update_arr["cost"]["cost"]) ? $this->common_model->add_calculate_currency($batch_update_arr["cost"]["cost"], '', '', true, false) : "0.0000";
 //        $batch_update_arr = array("inc"=> array("inc"=>"1","operator"=>"3"),"cost"=> array("cost"=>"1","operator"=>"4"));
 		$result = $this->rates_model->origination_rate_batch_update($batch_update_arr);
 		echo json_encode(array("SUCCESS"=> "Origination rates batch updated successfully!"));
@@ -723,23 +723,23 @@ 
 
 	function termination_rate_export_cdr_xls() {
 		$account_info = $accountinfo = $this->session->userdata('accountinfo');
-		$currency_id=$account_info['currency_id'];
-		$currency=$this->common->get_field_name('currency', 'currency', $currency_id);
+		$currency_id = $account_info['currency_id'];
+		$currency = $this->common->get_field_name('currency', 'currency', $currency_id);
 		$query = $this->rates_model->get_termination_rate(true, '', '', false);
 		$outbound_array = array();
 		ob_clean();
-		$outbound_array[] = array("Code", "Destination",  "Connect Cost($currency)", "Included Seconds","Per Minute Cost($currency)","Initial Increment", "Increment","Priority","Strip","Prepend","Trunk","Status","Created Date");
+		$outbound_array[] = array("Code", "Destination", "Connect Cost($currency)", "Included Seconds", "Per Minute Cost($currency)", "Initial Increment", "Increment", "Priority", "Strip", "Prepend", "Trunk", "Status", "Created Date");
 		if ($query->num_rows() > 0) {
 
 			foreach ($query->result_array() as $row) {
 				//echo"<pre>";print_r($row);exit;
 					$outbound_array[] = array(
-						$row['pattern']=$this->common->get_only_numeric_val("","",$row["pattern"]),
+						$row['pattern'] = $this->common->get_only_numeric_val("", "", $row["pattern"]),
 						$row['comment'],
-						$this->common_model->calculate_currency($row['connectcost'],'','',TRUE,false),
+						$this->common_model->calculate_currency($row['connectcost'], '', '', TRUE, false),
                         
 						$row['includedseconds'],
-			$this->common_model->calculate_currency($row['cost'],'','',TRUE,false),
+			$this->common_model->calculate_currency($row['cost'], '', '', TRUE, false),
 /**
 ASTPP  3.0 
 For Add Initial Increment field
@@ -751,7 +751,7 @@ 
 						$row['strip'],
 						$row['prepend'],
 						//$row['trunk_id'],
-						$this->common->get_field_name('name','trunks',$row["trunk_id"]),
+						$this->common->get_field_name('name', 'trunks', $row["trunk_id"]),
 						$this->common->get_status('export', '', $row['status']),
 						$row['creation_date'],
                         
@@ -760,7 +760,7 @@ 
 			}
 		$this->load->helper('csv');
         
-		array_to_csv($outbound_array, 'Termination_Rates_' . date("Y-m-d") . '.csv');
+		array_to_csv($outbound_array, 'Termination_Rates_'.date("Y-m-d").'.csv');
        
 	}
 
@@ -771,13 +771,13 @@ 
 		$this->load->library('pdf');
 		$this->fpdf = new PDF('P', 'pt');
 		$this->fpdf->initialize('P', 'mm', 'A4');
-		$this->fpdf->tablewidths = array(20, 30, 20, 20, 20, 20, 20,20,20);
-		$outbound_array[] = array("Code", "Destination",  "Connect Cost","Included Seconds","Per Minute Cost","Initial Increment", "Increment","Precedence","Prepend","Strip");
+		$this->fpdf->tablewidths = array(20, 30, 20, 20, 20, 20, 20, 20, 20);
+		$outbound_array[] = array("Code", "Destination", "Connect Cost", "Included Seconds", "Per Minute Cost", "Initial Increment", "Increment", "Precedence", "Prepend", "Strip");
 		if ($query->num_rows() > 0) {
 
 			foreach ($query->result_array() as $row) {
 					$outbound_array[] = array(
-			$row['pattern']=$this->common->get_only_numeric_val("","",$row["pattern"]),
+			$row['pattern'] = $this->common->get_only_numeric_val("", "", $row["pattern"]),
 						$row['comment'],
 						$row['connectcost'],
 						$row['includedseconds'],
@@ -800,7 +800,7 @@ 
 
 		$this->fpdf->SetFont('Arial', '', 15);
 		$this->fpdf->SetXY(60, 5);
-		$this->fpdf->Cell(100, 10, "Outbound Rates Report " . date('Y-m-d'));
+		$this->fpdf->Cell(100, 10, "Outbound Rates Report ".date('Y-m-d'));
 
 		$this->fpdf->SetY(20);
 		$this->fpdf->SetFont('Arial', '', 7);
@@ -808,29 +808,29 @@ 
 		$this->fpdf->lMargin = 2;
 
 		$dimensions = $this->fpdf->export_pdf($outbound_array, "7");
-		$this->fpdf->Output('Termination_Rate_' . date("Y-m-d") . '.pdf', "D");
+		$this->fpdf->Output('Termination_Rate_'.date("Y-m-d").'.pdf', "D");
 	}
     
 
 	function origination_rate_export_cdr_xls() {
 		$account_info = $accountinfo = $this->session->userdata('accountinfo');
-		$currency_id=$account_info['currency_id'];
-		$currency=$this->common->get_field_name('currency', 'currency', $currency_id);
+		$currency_id = $account_info['currency_id'];
+		$currency = $this->common->get_field_name('currency', 'currency', $currency_id);
 		$query = $this->rates_model->get_origination_rate(true, '', '', false);
 	//echo "<pre>";print_r($query);exit;
 		$inbound_array = array();
 		ob_clean();
-		$inbound_array[] = array("Code", "Destination","Connect Cost($currency)","Included Seconds","Per Minute Cost($currency)", "Initial Increment", "Increment","Rate Group","Status","Created Date");
+		$inbound_array[] = array("Code", "Destination", "Connect Cost($currency)", "Included Seconds", "Per Minute Cost($currency)", "Initial Increment", "Increment", "Rate Group", "Status", "Created Date");
 		if ($query->num_rows() > 0) {
 
 			foreach ($query->result_array() as $row) {
 				//echo"<pre>";print_r($row);exit;
 					$inbound_array[] = array(
-						$row['pattern']=$this->common->get_only_numeric_val("","",$row["pattern"]),
+						$row['pattern'] = $this->common->get_only_numeric_val("", "", $row["pattern"]),
 						$row['comment'],
-						$this->common_model->calculate_currency($row['connectcost'],'','',TRUE,false),
+						$this->common_model->calculate_currency($row['connectcost'], '', '', TRUE, false),
 						$row['includedseconds'],
-						$this->common_model->calculate_currency($row['cost'],'','',TRUE,false),
+						$this->common_model->calculate_currency($row['cost'], '', '', TRUE, false),
 /**
 ASTPP  3.0 
 For Add Initial Increment field
@@ -846,7 +846,7 @@ 
 				}
 			}
 		$this->load->helper('csv');
-		array_to_csv($inbound_array, 'Origination_Rates_' . date("Y-m-d") . '.csv');
+		array_to_csv($inbound_array, 'Origination_Rates_'.date("Y-m-d").'.csv');
 	}
 	function origination_rate_export_cdr_pdf() {
 		$query = $this->rates_model->get_origination_rate(true, '', '', false);
@@ -857,15 +857,15 @@ 
 		$this->fpdf = new PDF('P', 'pt');
 		$this->fpdf->initialize('P', 'mm', 'A4');
 		$this->fpdf->tablewidths = array(20, 20, 20, 20, 20, 20);
-	$inbound_array[] = array("Code", "Destination","Connect Cost","Included Seconds","Per Minute Cost","Initial Increment","Increment");
+	$inbound_array[] = array("Code", "Destination", "Connect Cost", "Included Seconds", "Per Minute Cost", "Initial Increment", "Increment");
 		if ($query->num_rows() > 0) {
 			foreach ($query->result_array() as $row) {
 					$inbound_array[] = array(
-					   $row['pattern']=$this->common->get_only_numeric_val("","",$row["pattern"]),
+					   $row['pattern'] = $this->common->get_only_numeric_val("", "", $row["pattern"]),
 						$row['comment'],
 						$row['connectcost'],
 						$row['includedseconds'],
-						$this->common_model->calculate_currency($row['cost'],'','','',false),
+						$this->common_model->calculate_currency($row['cost'], '', '', '', false),
 /**
 ASTPP  3.0 
 For Add Initial Increment field
@@ -881,7 +881,7 @@ 
 
 		$this->fpdf->SetFont('Arial', '', 15);
 		$this->fpdf->SetXY(60, 5);
-		$this->fpdf->Cell(100, 10, "Origination Rates Report " . date('Y-m-d'));
+		$this->fpdf->Cell(100, 10, "Origination Rates Report ".date('Y-m-d'));
 
 		$this->fpdf->SetY(20);
 		$this->fpdf->SetFont('Arial', '', 7);
@@ -889,7 +889,7 @@ 
 		$this->fpdf->lMargin = 2;
 
 		$dimensions = $this->fpdf->export_pdf($inbound_array, "5");
-		$this->fpdf->Output('Origination_Rate_' . date("Y-m-d") . '.pdf', "D");
+		$this->fpdf->Output('Origination_Rate_'.date("Y-m-d").'.pdf', "D");
 	}
 
   
@@ -901,14 +901,14 @@ 
 		$this->fpdf = new PDF('P', 'pt');
 		$this->fpdf->initialize('P', 'mm', 'A4');
 	$this->fpdf->tablewidths = array(20, 20, 20, 20, 20, 20);
-		$inbound_array[] = array("Code", "Destination", "Increment","Cost Per Minutes",  "Connect Charge", "Included Seconds");
+		$inbound_array[] = array("Code", "Destination", "Increment", "Cost Per Minutes", "Connect Charge", "Included Seconds");
 		if ($query->num_rows() > 0) {
 			foreach ($query->result_array() as $row) {
 					$inbound_array[] = array(
-					   $row['pattern']=$this->common->get_only_numeric_val("","",$row["pattern"]),
+					   $row['pattern'] = $this->common->get_only_numeric_val("", "", $row["pattern"]),
 						$row['comment'],
 						$row['inc'],
-			$this->common_model->calculate_currency($row['cost'],'','','',false),
+			$this->common_model->calculate_currency($row['cost'], '', '', '', false),
 						$row['connectcost'],
 						$row['includedseconds']
 					);
@@ -920,7 +920,7 @@ 
 
 		$this->fpdf->SetFont('Arial', '', 15);
 		$this->fpdf->SetXY(60, 5);
-		$this->fpdf->Cell(100, 10, "Rates Report " . date('Y-m-d'));
+		$this->fpdf->Cell(100, 10, "Rates Report ".date('Y-m-d'));
 
 		$this->fpdf->SetY(20);
 		$this->fpdf->SetFont('Arial', '', 7);
@@ -928,12 +928,12 @@ 
 		$this->fpdf->lMargin = 2;
 
 		$dimensions = $this->fpdf->export_pdf($inbound_array, "5");
-		$this->fpdf->Output('Rates_' . date("Y-m-d") . '.pdf', "D");
+		$this->fpdf->Output('Rates_'.date("Y-m-d").'.pdf', "D");
 	}
-	function resellersrates_list(){
-	$accountinfo=$this->session->userdata('accountinfo');
+	function resellersrates_list() {
+	$accountinfo = $this->session->userdata('accountinfo');
 	$data['username'] = $this->session->userdata('user_name');
-		$data['page_title'] = 'My Rates' ;
+		$data['page_title'] = 'My Rates';
 		$data['search_flag'] = true;
 		$this->session->set_userdata('advance_search', 0);
 		$data['grid_fields'] = $this->rates_form->build_rates_list_for_reseller();
@@ -953,11 +953,11 @@ 
 		$grid_fields = json_decode($this->rates_form->build_rates_list_for_reseller());
 		foreach ($query->result_array() as $key => $value) {
 			$json_data['rows'][] = array('cell' => array(
-					$this->common->get_only_numeric_val("","",$value["pattern"]),
+					$this->common->get_only_numeric_val("", "", $value["pattern"]),
 					$value['comment'],
-					$this->common_model->calculate_currency($value['connectcost'],'','','true',true),
+					$this->common_model->calculate_currency($value['connectcost'], '', '', 'true', true),
 					$value['includedseconds'],
-					$this->common_model->calculate_currency(($value['cost'] + ($value['cost']*$markup)/100),'','','true',true),
+					$this->common_model->calculate_currency(($value['cost'] + ($value['cost'] * $markup) / 100), '', '', 'true', true),
 					$value['inc'],
 					$value['precedence'],
 			));
@@ -977,7 +977,7 @@ 
 			$this->session->set_userdata('resellerrates_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'rates/resellersrates_list/');
+			redirect(base_url().'rates/resellersrates_list/');
 		}
 	}
 	function resellersrates_list_clearsearchfilter() {
@@ -1001,7 +1001,7 @@ 
 			foreach ($query->result_array() as $row) {
                 
 					$customer_array[] = array(
-						$row['pattern']=$this->common->get_only_numeric_val("","",$row["pattern"]),
+						$row['pattern'] = $this->common->get_only_numeric_val("", "", $row["pattern"]),
 						$row['comment'],
 						$row['connectcost'],
 			$row['includedseconds'],
@@ -1013,7 +1013,7 @@ 
 			}
 		}
 		$this->load->helper('csv');
-		array_to_csv($customer_array, 'My_Own_Rate_' . date("Y-m-d") . '.csv');
+		array_to_csv($customer_array, 'My_Own_Rate_'.date("Y-m-d").'.csv');
 		exit;
 	}
 /***********
@@ -1030,7 +1030,7 @@ 
 			$this->session->set_userdata('termination_rates_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'rates/termination_rates_list/');
+			redirect(base_url().'rates/termination_rates_list/');
 		}
 	}
 	function origination_rates_list_batch_delete() {
@@ -1043,7 +1043,7 @@ 
 			$this->session->set_userdata('origination_rate_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'rates/origination_rates_list/');
+			redirect(base_url().'rates/origination_rates_list/');
 		}
 	}
 
@@ -1059,14 +1059,14 @@ 
 
 	function csv_to_array($filename = '', $delimiter = ',')
 	{
-		if (!file_exists($filename) || !is_readable($filename)) return FALSE;
+		if ( ! file_exists($filename) || ! is_readable($filename)) return FALSE;
 		$header = NULL;
 		$data = array();
 		if (($handle = fopen($filename, 'r')) !== FALSE)
 		{
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
-				if (!$header) $header = $row;
+				if ( ! $header) $header = $row;
 				else $data[] = array_combine($header, $row);
 			}
 
@@ -1079,9 +1079,9 @@ 
 	function utf8_converter($array)
 	{
 		array_walk_recursive($array,
-		function (&$item, $key)
+		function(&$item, $key)
 		{
-			if (!mb_detect_encoding($item, 'utf-8', true))
+			if ( ! mb_detect_encoding($item, 'utf-8', true))
 			{
 				$item = utf8_encode($item);
 			}
@@ -1095,9 +1095,9 @@ 
 		$check_header = $this->input->post('check_header', true);
 		$data['page_title'] = 'Import Termination Rates';
 		$new_final_arr_key = $this->config->item('Termination-rates-field');
-		if (empty($_FILES) || !isset($_FILES))
+		if (empty($_FILES) || ! isset($_FILES))
 		{
-			redirect(base_url() . "rates/termination_rates_list/");
+			redirect(base_url()."rates/termination_rates_list/");
 		}
 
 		$data['mapto_fields'] = $new_final_arr_key;
@@ -1117,13 +1117,13 @@ 
 					// $csv_data = $this->csvreader->parse_file($uploadedFile, $new_final_arr_key, $check_header);
 
 					$csv_data = $this->utf8_converter($this->csvreader->parse_file($uploadedFile, $field_select, $check_header));
-					if (!empty($csv_data))
+					if ( ! empty($csv_data))
 					{
 						$full_path = $this->config->item('rates-file-path');
-						$actual_file_name = "ASTPP-TERMINATION-RATES-" . date("Y-m-d H:i:s") . "." . $ext;
+						$actual_file_name = "ASTPP-TERMINATION-RATES-".date("Y-m-d H:i:s").".".$ext;
 						$actual_file_name = str_replace(' ', '-', $actual_file_name);
 						$actual_file_name = str_replace(':', '-', $actual_file_name);
-						if (move_uploaded_file($uploadedFile, $full_path . $actual_file_name))
+						if (move_uploaded_file($uploadedFile, $full_path.$actual_file_name))
 						{
 							$data['field_select'] = serialize($field_select);
 							$data['csv_tmp_data'] = $csv_data;
@@ -1157,14 +1157,14 @@ 
 		if ($invalid_flag)
 		{
 			$str = '';
-			if (!isset($_POST['trunk_id']) || empty($_POST['trunk_id']))
+			if ( ! isset($_POST['trunk_id']) || empty($_POST['trunk_id']))
 			{
-				$str.= '<br/>Please Create Trunk.';
+				$str .= '<br/>Please Create Trunk.';
 			}
 
 			if (empty($_FILES['termination_rate_import_mapper']['name']))
 			{
-				$str.= '<br/>Please Select  File.';
+				$str .= '<br/>Please Select  File.';
 			}
 
 			$data['error'] = $str;
@@ -1185,7 +1185,7 @@ 
 		$new_final_arr = array();
 		$invalid_array = array();
 		$new_final_arr_key = array();
-		foreach($filefields as $item)
+		foreach ($filefields as $item)
 		{
 			$new_final_arr_key[$item] = $item;
 		}
@@ -1199,30 +1199,30 @@ 
 
 		$full_path = $this->config->item('rates-file-path');
 		$terminationrate_file_name = $this->session->userdata('import_termination_rate_mapper_csv');
-		$csv_tmp_data = $this->csvreader->parse_file($full_path . $terminationrate_file_name, $new_final_arr_key, $check_header);
+		$csv_tmp_data = $this->csvreader->parse_file($full_path.$terminationrate_file_name, $new_final_arr_key, $check_header);
 		$i = 0;
-		foreach($csv_tmp_data as $key => $csv_data)
+		foreach ($csv_tmp_data as $key => $csv_data)
 		{
-			if (isset($csv_data[$this->input->post("pattern-select") ]) && $csv_data[$this->input->post("pattern-select") ] != '' && $i != 0)
+			if (isset($csv_data[$this->input->post("pattern-select")]) && $csv_data[$this->input->post("pattern-select")] != '' && $i != 0)
 			{
 				$str = null;
-				$csv_data['pattern'] = ($this->input->post("pattern-prefix")) ? $this->input->post("pattern-prefix") . $csv_data[$this->input->post("pattern-select") ] : $csv_data[$this->input->post("pattern-select") ];
-				$csv_data['cost'] = ($this->input->post("cost-select")) ? $csv_data[$this->input->post("cost-select") ] : "";
-				$csv_data['cost'] = ($this->input->post("cost-prefix")) ? $this->input->post("cost-prefix") . $csv_data['cost'] : $csv_data['cost'];
-				$csv_data['prepend'] = ($this->input->post("prepend-select")) ? $csv_data[$this->input->post("prepend-select") ] : "";
-				$csv_data['prepend'] = ($this->input->post("prepend-prefix")) ? $this->input->post("prepend-prefix") . $csv_data['prepend'] : $csv_data['prepend'];
-				$csv_data['comment'] = ($this->input->post("comment-select")) ? $csv_data[$this->input->post("comment-select") ] : "";
-				$csv_data['comment'] = ($this->input->post("comment-prefix")) ? $this->input->post("comment-prefix") . $csv_data['comment'] : $csv_data['comment'];
-				$csv_data['connectcost'] = ($this->input->post("connectcost-select")) ? $csv_data[$this->input->post("connectcost-select") ] : "0";
-				$csv_data['connectcost'] = ($this->input->post("connectcost-prefix")) ? $this->input->post("connectcost-prefix") . $csv_data['connectcost'] : $csv_data['connectcost'];
-				$csv_data['includedseconds'] = ($this->input->post("includedseconds-select")) ? $csv_data[$this->input->post("includedseconds-select") ] : "0";
-				$csv_data['includedseconds'] = ($this->input->post("includedseconds-prefix")) ? $this->input->post("includedseconds-prefix") . $csv_data['includedseconds'] : $csv_data['includedseconds'];
-				$csv_data['inc'] = ($this->input->post("inc-select")) ? $csv_data[$this->input->post("inc-select") ] : "0";
-				$csv_data['inc'] = ($this->input->post("inc-prefix")) ? $this->input->post("inc-prefix") . $csv_data['inc'] : $csv_data['inc'];
-				$csv_data['precedence'] = ($this->input->post("precedence-select")) ? $csv_data[$this->input->post("precedence-select") ] : "";
-				$csv_data['precedence'] = ($this->input->post("precedence-prefix")) ? $this->input->post("precedence-prefix") . $csv_data['precedence'] : $csv_data['precedence'];
-				$csv_data['strip'] = ($this->input->post("strip-select")) ? $csv_data[$this->input->post("strip-select") ] : "";
-				$csv_data['strip'] = ($this->input->post("strip-prefix")) ? $this->input->post("strip-prefix") . $csv_data['strip'] : $csv_data['strip'];
+				$csv_data['pattern'] = ($this->input->post("pattern-prefix")) ? $this->input->post("pattern-prefix").$csv_data[$this->input->post("pattern-select")] : $csv_data[$this->input->post("pattern-select")];
+				$csv_data['cost'] = ($this->input->post("cost-select")) ? $csv_data[$this->input->post("cost-select")] : "";
+				$csv_data['cost'] = ($this->input->post("cost-prefix")) ? $this->input->post("cost-prefix").$csv_data['cost'] : $csv_data['cost'];
+				$csv_data['prepend'] = ($this->input->post("prepend-select")) ? $csv_data[$this->input->post("prepend-select")] : "";
+				$csv_data['prepend'] = ($this->input->post("prepend-prefix")) ? $this->input->post("prepend-prefix").$csv_data['prepend'] : $csv_data['prepend'];
+				$csv_data['comment'] = ($this->input->post("comment-select")) ? $csv_data[$this->input->post("comment-select")] : "";
+				$csv_data['comment'] = ($this->input->post("comment-prefix")) ? $this->input->post("comment-prefix").$csv_data['comment'] : $csv_data['comment'];
+				$csv_data['connectcost'] = ($this->input->post("connectcost-select")) ? $csv_data[$this->input->post("connectcost-select")] : "0";
+				$csv_data['connectcost'] = ($this->input->post("connectcost-prefix")) ? $this->input->post("connectcost-prefix").$csv_data['connectcost'] : $csv_data['connectcost'];
+				$csv_data['includedseconds'] = ($this->input->post("includedseconds-select")) ? $csv_data[$this->input->post("includedseconds-select")] : "0";
+				$csv_data['includedseconds'] = ($this->input->post("includedseconds-prefix")) ? $this->input->post("includedseconds-prefix").$csv_data['includedseconds'] : $csv_data['includedseconds'];
+				$csv_data['inc'] = ($this->input->post("inc-select")) ? $csv_data[$this->input->post("inc-select")] : "0";
+				$csv_data['inc'] = ($this->input->post("inc-prefix")) ? $this->input->post("inc-prefix").$csv_data['inc'] : $csv_data['inc'];
+				$csv_data['precedence'] = ($this->input->post("precedence-select")) ? $csv_data[$this->input->post("precedence-select")] : "";
+				$csv_data['precedence'] = ($this->input->post("precedence-prefix")) ? $this->input->post("precedence-prefix").$csv_data['precedence'] : $csv_data['precedence'];
+				$csv_data['strip'] = ($this->input->post("strip-select")) ? $csv_data[$this->input->post("strip-select")] : "";
+				$csv_data['strip'] = ($this->input->post("strip-prefix")) ? $this->input->post("strip-prefix").$csv_data['strip'] : $csv_data['strip'];
 				$csv_data['last_modified_date'] = date("Y-m-d H:i:s");
 				$str = $this->data_validate($csv_data);
 				if ($str != "")
@@ -1233,13 +1233,13 @@ 
 				else
 				{
 					$new_final_arr[$i]['trunk_id'] = $trunkID;
-					$new_final_arr[$i]['pattern'] = "^" . $csv_data['pattern'] . ".*";
+					$new_final_arr[$i]['pattern'] = "^".$csv_data['pattern'].".*";
 					$new_final_arr[$i]['prepend'] = $csv_data['prepend'];
 					$new_final_arr[$i]['last_modified_date'] = $csv_data['last_modified_date'];
 					$new_final_arr[$i]['comment'] = $csv_data['comment'];
 					$new_final_arr[$i]['connectcost'] = $csv_data['connectcost'];
 					$new_final_arr[$i]['includedseconds'] = $csv_data['includedseconds'];
-					$new_final_arr[$i]['cost'] = !empty($csv_data['cost']) && is_numeric($csv_data['cost']) ? $csv_data['cost'] : 0;
+					$new_final_arr[$i]['cost'] = ! empty($csv_data['cost']) && is_numeric($csv_data['cost']) ? $csv_data['cost'] : 0;
 					$new_final_arr[$i]['inc'] = isset($csv_data['inc']) ? $csv_data['inc'] : 0;
 					$new_final_arr[$i]['precedence'] = isset($csv_data['precedence']) ? $csv_data['precedence'] : '';
 					$new_final_arr[$i]['strip'] = isset($csv_data['strip']) ? $csv_data['strip'] : '';
@@ -1249,7 +1249,7 @@ 
 			$i++;
 		}
 
-		if (!empty($new_final_arr))
+		if ( ! empty($new_final_arr))
 		{
 			$result = $this->rates_model->bulk_insert_termination_rate($new_final_arr);
 		}
@@ -1257,29 +1257,29 @@ 
         {
 
            $this->session->set_flashdata('astpp_errormsg', 'Error - Nothing selected to import/process!');
-           redirect(base_url() . 'rates/termination_rates_list/');
+           redirect(base_url().'rates/termination_rates_list/');
 		}
 
-		unlink($full_path . $terminationrate_file_name);
+		unlink($full_path.$terminationrate_file_name);
 		$count = count($invalid_array);
 		if ($count > 0)
 		{
 			$session_id = "-1";
-			$fp = fopen($full_path . $session_id . '.csv', 'w');
-			foreach($new_final_arr_key as $key => $value)
+			$fp = fopen($full_path.$session_id.'.csv', 'w');
+			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)
+			foreach ($invalid_array as $err_data)
 			{
 				fputcsv($fp, $err_data);
 			}
 
 			fclose($fp);
-			$this->session->set_userdata('import_termination_rate_mapper_csv_error', $session_id . ".csv");
+			$this->session->set_userdata('import_termination_rate_mapper_csv_error', $session_id.".csv");
 			$data["error"] = $invalid_array;
 			$data['trunkid'] = $trunkID;
 			$data['impoted_count'] = count($new_final_arr);
@@ -1289,8 +1289,8 @@ 
 		}
 		else
 		{
-			$this->session->set_flashdata('astpp_errormsg', 'Total ' . count($new_final_arr) . ' Termination rates imported successfully!');
-			redirect(base_url() . "rates/termination_rate_list/");
+			$this->session->set_flashdata('astpp_errormsg', 'Total '.count($new_final_arr).' Termination rates imported successfully!');
+			redirect(base_url()."rates/termination_rate_list/");
 		}
 	}
 

web_interface/astpp/application/modules/opensips/libraries/opensips_form.php

Spacing +29 added lines, -29 removed lines

@@ -21,7 +21,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 Opensips_form {

@@ -35,18 +35,18 @@ 
 

         $uname_user = $this->CI->common->find_uniq_rendno('10', '', '');

         $password = $this->CI->common->generate_password();

-        $val = $id > 0 ? 'subscriber.username.' . $id : 'subscriber.username';

+        $val = $id > 0 ? 'subscriber.username.'.$id : 'subscriber.username';

 

         // echo '<pre>'; print_r($val); exit;

         $loginid = $this->CI->session->userdata('logintype') == 2 ? 0 : $accountinfo['id'];

-        $form['forms'] = array(base_url() . 'opensips/opensips_save/', array("id" => "opensips_form", "name" => "opensips_form"));

+        $form['forms'] = array(base_url().'opensips/opensips_save/', array("id" => "opensips_form", "name" => "opensips_form"));

         $form['Opensips Device'] = array(

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

-            array('Username', 'INPUT', array('name' => 'username', 'size' => '30',  'value' => $uname_user, 'id' => 'username', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter account number', '<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;" title="Reset Password" class="change_number fa fa-refresh"></i>'),

-            array('Password', 'INPUT', array('name' => 'password', 'size' => '30',  'value' => $password, 'id' => 'password', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter Password', '<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;" title="Reset Password" class="change_pass fa fa-refresh"></i>'),

+            array('Username', 'INPUT', array('name' => 'username', 'size' => '30', 'value' => $uname_user, 'id' => 'username', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter account number', '<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;" title="Reset Password" class="change_number fa fa-refresh"></i>'),

+            array('Password', 'INPUT', array('name' => 'password', 'size' => '30', 'value' => $password, 'id' => 'password', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter Password', '<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;" title="Reset Password" class="change_pass fa fa-refresh"></i>'),

             array('Account', 'accountcode', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'number', 'number', 'accounts', 'build_dropdown', 'where_arr', array("reseller_id" => $loginid, "type" => "GLOBAL", "deleted" => "0")),

             array('Domain', 'INPUT', array('name' => 'domain', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),

-            array('Caller Name', 'INPUT', array('name' => 'effective_caller_id_name', 'size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

+            array('Caller Name', 'INPUT', array('name' => 'effective_caller_id_name', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

             array('Caller Number', 'INPUT', array('name' => 'effective_caller_id_number', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

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

         );

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

     function get_dispatcher_form_fields() {

 

-        $form['forms'] = array(base_url() . 'opensips/dispatcher_save/', array("id" => "opensips_dispatcher_form", "name" => "opensips_dispatcher_form"));

+        $form['forms'] = array(base_url().'opensips/dispatcher_save/', array("id" => "opensips_dispatcher_form", "name" => "opensips_dispatcher_form"));

         $form['Dispatcher Information'] = array(

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

             array('Setid', 'INPUT', array('name' => 'setid', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),

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

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

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

             array('Attrs', 'INPUT', array('name' => 'attrs', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),

-            array('Description', 'INPUT', array('name' => 'description', 'size' => '100',  'class' => "text field medium"), '', 'tOOL TIP', ''),

+            array('Description', 'INPUT', array('name' => 'description', 'size' => '100', 'class' => "text field medium"), '', 'tOOL TIP', ''),

         );

         $form['button_save'] = array('name' => 'action', 'content' => 'Save', 'value' => 'save', 'type' => 'button', 'id' => 'submit', 'class' => 'btn btn-line-parrot');

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

@@ -103,12 +103,12 @@ 
     function build_opensips_list() {

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

         $grid_field_arr = json_encode(array(

-            array("Username", "150", "username", "", "", "","","true","center"),

-            array("Password", "150", "password", "", "", "","","true","center"),

-            array("Account", "150", "accountcode", "", "", "","","true","center"),

-            array("Domain", "317", "domain", "", "", "","","true","center"),

-            array("Caller Name", "200", "effective_caller_id_name", "", "", "","","true","center"),

-            array("Caller Number", "200", "effective_caller_id_number", "", "", "","","true","center"),

+            array("Username", "150", "username", "", "", "", "", "true", "center"),

+            array("Password", "150", "password", "", "", "", "", "true", "center"),

+            array("Account", "150", "accountcode", "", "", "", "", "true", "center"),

+            array("Domain", "317", "domain", "", "", "", "", "true", "center"),

+            array("Caller Name", "200", "effective_caller_id_name", "", "", "", "", "true", "center"),

+            array("Caller Number", "200", "effective_caller_id_number", "", "", "", "", "true", "center"),

             array(gettext("Action"), "100", "", "", "", array("EDIT" => array("url" => "/opensips/opensips_edit/", "mode" => "popup"),

                     "DELETE" => array("url" => "/opensips/opensips_remove/", "mode" => "single")))

                 ));

@@ -118,11 +118,11 @@ 
     function build_opensipsdispatcher_list() {

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

         $grid_field_arr = json_encode(array(

-            array("Set Id", "160", "setid", "", "", "","","true","center"),

-            array("Destination", "160", "destination", "", "", "","","true","center"),

-            array("Weight", "190", "weight", "", "", "","","true","center"),

-            array("Attrs", "180", "attrs", "", "", "","","true","center"),

-            array("Description", "190", "description", "", "", "","","true","center"),

+            array("Set Id", "160", "setid", "", "", "", "", "true", "center"),

+            array("Destination", "160", "destination", "", "", "", "", "true", "center"),

+            array("Weight", "190", "weight", "", "", "", "", "true", "center"),

+            array("Attrs", "180", "attrs", "", "", "", "", "true", "center"),

+            array("Description", "190", "description", "", "", "", "", "true", "center"),

             array(gettext("Action"), "170", "", "", "", array("EDIT" => array("url" => "/opensips/dispatcher_edit/", "mode" => "popup"),

                     "DELETE" => array("url" => "/opensips/dispatcher_remove/", "mode" => "single")))

                 ));

@@ -144,19 +144,19 @@ 
 	}

 

 	function get_opensips_form_fields_for_customer($accountid, $id = false) {

-		$val = $id > 0 ? 'subscriber.username.' . $id : 'subscriber.username';

+		$val = $id > 0 ? 'subscriber.username.'.$id : 'subscriber.username';

 		$uname_user = $this->CI->common->find_uniq_rendno('10', '', '');

 		$password = $this->CI->common->generate_password();

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

-		$link = ($accountinfo['type']==1 || $accountinfo['type']==3 )? base_url() . 'opensips/user_opensips_save/true/' : base_url() . 'opensips/customer_opensips_save/true/';    

+		$link = ($accountinfo['type'] == 1 || $accountinfo['type'] == 3) ? base_url().'opensips/user_opensips_save/true/' : base_url().'opensips/customer_opensips_save/true/';    

 			$form['forms'] = array($link, array("id" => "opensips_form", "name" => "opensips_form"));

 			$form['Opensips Device'] = array(

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

 				array('', 'HIDDEN', array('name' => 'accountcode', 'value' => $this->CI->common->get_field_name('number', 'accounts', array('id' => $accountid))), '', '', '', ''),

-				array('Username', 'INPUT', array('name' => 'username', 'size' => '20',  'id' => 'username', 'value' => $uname_user, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter account number', '<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;" title="Reset Password" class="change_number fa fa-refresh"></i>'),

+				array('Username', 'INPUT', array('name' => 'username', 'size' => '20', 'id' => 'username', 'value' => $uname_user, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter account number', '<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;" title="Reset Password" class="change_number fa fa-refresh"></i>'),

 				array('Password', 'PASSWORD', array('name' => 'password', 'size' => '20', 'id' => 'password1', 'value' => $password, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter Password', '<i style="cursor:pointer; font-size: 17px; padding-left:10px; padding-top:6px;" title="Reset Password" class="change_pass fa fa-refresh"></i>'),

-				array('Domain', 'INPUT', array('name' => 'domain', 'size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

-				array('Caller Name', 'INPUT', array('name' => 'effective_caller_id_name', 'size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

+				array('Domain', 'INPUT', array('name' => 'domain', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

+				array('Caller Name', 'INPUT', array('name' => 'effective_caller_id_name', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

 				array('Caller Number', 'INPUT', array('name' => 'effective_caller_id_number', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

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

 			);

@@ -192,10 +192,10 @@ 
 			array("Username", "200", "username", "", "", ""),

 			array("Password", "200", "password", "", "", ""),

 			array("Domain", "200", "domain", "", "", ""),

-			array("Caller Name", "150", "effective_caller_id_name", "", "", "","","true","center"),

-			array("Caller Number", "150", "effective_caller_id_number", "", "", "","","true","center"),

-			array("Action", "100", "", "", "", array("EDIT" => array("url" => 'accounts/customer_opensips_action/edit/' . $accountid . '/', "mode" => "popup"),

-					"DELETE" => array("url" => 'accounts/customer_opensips_action/delete/' . $accountid . "/", "mode" => "popup")))

+			array("Caller Name", "150", "effective_caller_id_name", "", "", "", "", "true", "center"),

+			array("Caller Number", "150", "effective_caller_id_number", "", "", "", "", "true", "center"),

+			array("Action", "100", "", "", "", array("EDIT" => array("url" => 'accounts/customer_opensips_action/edit/'.$accountid.'/', "mode" => "popup"),

+					"DELETE" => array("url" => 'accounts/customer_opensips_action/delete/'.$accountid."/", "mode" => "popup")))

 				));

 

 		return $grid_field_arr;