iNextrix / ASTPP

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

Spacing +72 added lines, -72 removed lines

@@ -20,26 +20,26 @@ 
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 // ##############################################################################
-if (! defined ( 'BASEPATH' ))
-	exit ( 'No direct script access allowed' );
+if ( ! defined('BASEPATH'))
+	exit ('No direct script access allowed');
 class Taxes_form {
 	function __construct() {
-		$this->CI = & get_instance ();
+		$this->CI = & get_instance();
 	}
 	function get_taxes_form_fields() {
-		$form ['forms'] = array (
-				base_url () . 'taxes/taxes_save/',
-				array (
+		$form ['forms'] = array(
+				base_url().'taxes/taxes_save/',
+				array(
 						'id' => 'taxes_form',
 						'method' => 'POST',
 						'name' => 'taxes_form' 
 				) 
 		);
-		$form [gettext ( 'Tax Information' )] = array (
-				array (
+		$form [gettext('Tax Information')] = array(
+				array(
 						'',
 						'HIDDEN',
-						array (
+						array(
 								'name' => 'id' 
 						),
 						'',
@@ -47,10 +47,10 @@ 
 						'',
 						'' 
 				),
-				array (
-						gettext ( 'Name' ),
+				array(
+						gettext('Name'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'taxes_description',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -59,10 +59,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'Priority' ),
+				array(
+						gettext('Priority'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'taxes_priority',
 								'size' => '20',
 								'maxlength' => '5',
@@ -72,10 +72,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'Amount' ),
+				array(
+						gettext('Amount'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'taxes_amount',
 								'size' => '20',
 								'maxlength' => '20',
@@ -85,10 +85,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'Rate(%)' ),
+				array(
+						gettext('Rate(%)'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'taxes_rate',
 								'size' => '20',
 								'maxlength' => '20',
@@ -98,8 +98,8 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'Status' ),
+				array(
+						gettext('Status'),
 						'status',
 						'SELECT',
 						'',
@@ -113,17 +113,17 @@ 
 				) 
 		)
 		;
-		$form ['button_save'] = array (
+		$form ['button_save'] = array(
 				'name' => 'action',
-				'content' => gettext ( 'Save' ),
+				'content' => gettext('Save'),
 				'value' => 'save',
 				'id' => 'submit',
 				'type' => 'button',
 				'class' => 'btn btn-line-parrot' 
 		);
-		$form ['button_cancel'] = array (
+		$form ['button_cancel'] = array(
 				'name' => 'action',
-				'content' => gettext ( 'Close' ),
+				'content' => gettext('Close'),
 				'value' => 'cancel',
 				'type' => 'button',
 				'class' => 'btn btn-line-sky margin-x-10',
@@ -132,17 +132,17 @@ 
 		return $form;
 	}
 	function get_search_taxes_form() {
-		$form ['forms'] = array (
+		$form ['forms'] = array(
 				"",
-				array (
+				array(
 						'id' => "taxes_search" 
 				) 
 		);
-		$form [gettext ( 'Search' )] = array (
-				array (
-						gettext ( 'Name' ),
+		$form [gettext('Search')] = array(
+				array(
+						gettext('Name'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'taxes_description[taxes_description]',
 								'',
 								'size' => '20',
@@ -158,10 +158,10 @@ 
 						'search_string_type',
 						'' 
 				),
-				array (
-						gettext ( 'Amount' ),
+				array(
+						gettext('Amount'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'taxes_amount[taxes_amount]',
 								'value' => '',
 								'size' => '20',
@@ -177,10 +177,10 @@ 
 						'search_int_type',
 						'' 
 				),
-				array (
-						gettext ( 'Rate(%)' ),
+				array(
+						gettext('Rate(%)'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'taxes_rate[taxes_rate]',
 								'value' => '',
 								'size' => '20',
@@ -196,7 +196,7 @@ 
 						'search_int_type',
 						'' 
 				),
-				array (
+				array(
 						'Status',
 						'status',
 						'SELECT',
@@ -211,7 +211,7 @@ 
 						'',
 						'' 
 				),
-				array (
+				array(
 						'',
 						'HIDDEN',
 						'ajax_search',
@@ -220,7 +220,7 @@ 
 						'',
 						'' 
 				),
-				array (
+				array(
 						'',
 						'HIDDEN',
 						'advance_search',
@@ -230,18 +230,18 @@ 
 						'' 
 				) 
 		);
-		$form ['button_search'] = array (
+		$form ['button_search'] = array(
 				'name' => 'action',
 				'id' => "taxes_search_btn",
-				'content' => gettext ( 'Search' ),
+				'content' => gettext('Search'),
 				'value' => 'save',
 				'type' => 'button',
 				'class' => 'btn btn-line-parrot pull-right' 
 		);
-		$form ['button_reset'] = array (
+		$form ['button_reset'] = array(
 				'name' => 'action',
 				'id' => "id_reset",
-				'content' => gettext ( 'Clear' ),
+				'content' => gettext('Clear'),
 				'value' => 'cancel',
 				'type' => 'reset',
 				'class' => 'btn btn-line-sky pull-right margin-x-10' 
@@ -249,11 +249,11 @@ 
 		return $form;
 	}
 	function build_taxes_list_for_admin() {
-		$account_info = $accountinfo = $this->CI->session->userdata ( 'accountinfo' );
+		$account_info = $accountinfo = $this->CI->session->userdata('accountinfo');
 		$currency_id = $account_info ['currency_id'];
-		$currency = $this->CI->common->get_field_name ( 'currency', 'currency', $currency_id );
-		$grid_field_arr = json_encode ( array (
-				array (
+		$currency = $this->CI->common->get_field_name('currency', 'currency', $currency_id);
+		$grid_field_arr = json_encode(array(
+				array(
 						"<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>",
 						"30",
 						"",
@@ -264,8 +264,8 @@ 
 						"false",
 						"center" 
 				),
-				array (
-						gettext ( "Name" ),
+				array(
+						gettext("Name"),
 						"270",
 						"taxes_description",
 						"",
@@ -275,8 +275,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Priority" ),
+				array(
+						gettext("Priority"),
 						"145",
 						"taxes_priority",
 						"",
@@ -286,8 +286,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Amount($currency)" ),
+				array(
+						gettext("Amount($currency)"),
 						"260",
 						"taxes_amount",
 						"taxes_amount",
@@ -297,8 +297,8 @@ 
 						"true",
 						"right" 
 				),
-				array (
-						gettext ( "Rate(%)" ),
+				array(
+						gettext("Rate(%)"),
 						"230",
 						"taxes_rate",
 						"",
@@ -308,8 +308,8 @@ 
 						"true",
 						"right" 
 				),
-				array (
-						gettext ( "Status" ),
+				array(
+						gettext("Status"),
 						"160",
 						"status",
 						"status",
@@ -319,44 +319,44 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Action" ),
+				array(
+						gettext("Action"),
 						"175",
 						"",
 						"",
 						"",
-						array (
-								"EDIT" => array (
+						array(
+								"EDIT" => array(
 										"url" => "taxes/taxes_edit/",
 										"mode" => "popup" 
 								),
-								"DELETE" => array (
+								"DELETE" => array(
 										"url" => "taxes/taxes_delete/",
 										"mode" => "single" 
 								) 
 						) 
 				) 
-		) );
+		));
 		return $grid_field_arr;
 	}
 	function build_grid_buttons() {
-		$buttons_json = json_encode ( array (
-				array (
-						gettext ( "Create" ),
+		$buttons_json = json_encode(array(
+				array(
+						gettext("Create"),
 						"btn btn-line-warning btn",
 						"fa fa-plus-circle fa-lg",
 						"button_action",
 						"/taxes/taxes_add/",
 						"popup" 
 				),
-				array (
-						gettext ( "Delete" ),
+				array(
+						gettext("Delete"),
 						"btn btn-line-danger",
 						"fa fa-times-circle fa-lg",
 						"button_action",
 						"/taxes/taxes_delete_multiple/" 
 				) 
-		) );
+		));
 		return $buttons_json;
 	}
 }

Braces +2 added lines, -1 removed lines

@@ -20,8 +20,9 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 // ##############################################################################
-if (! defined ( 'BASEPATH' ))
+if (! defined ( 'BASEPATH' )) {
 	exit ( 'No direct script access allowed' );
+}
 class Taxes_form {
 	function __construct() {
 		$this->CI = & get_instance ();

web_interface/astpp/application/modules/charges/models/charges_model.php

Spacing +49 added lines, -49 removed lines

@@ -23,25 +23,25 @@ 
 // ##############################################################################
 class Charges_model extends CI_Model {
 	function Charges_model() {
-		parent::__construct ();
+		parent::__construct();
 	}
 	function getcharges_list($flag, $start = 0, $limit = 0) {
-		$this->db_model->build_search ( 'charges_list_search' );
-		if ($this->session->userdata ( 'logintype' ) == 1 || $this->session->userdata ( 'logintype' ) == 5) {
-			$account_data = $this->session->userdata ( "accountinfo" );
+		$this->db_model->build_search('charges_list_search');
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			$account_data = $this->session->userdata("accountinfo");
 			$reseller = $account_data ['id'];
-			$where = array (
+			$where = array(
 					"reseller_id" => $reseller 
 			);
 		} else {
-			$where = array (
+			$where = array(
 					"reseller_id" => "0" 
 			);
 		}
 		if ($flag) {
-			$query = $this->db_model->select ( "*", "charges", $where, "id", "ASC", $limit, $start );
+			$query = $this->db_model->select("*", "charges", $where, "id", "ASC", $limit, $start);
 		} else {
-			$query = $this->db_model->countQuery ( "*", "charges", $where );
+			$query = $this->db_model->countQuery("*", "charges", $where);
 		}
 		return $query;
 	}
@@ -50,97 +50,97 @@ 
 		 * ASTPP 3.0
 		 * Charges Add time last creation date update
 		 */
-		$add_array ['creation_date'] = gmdate ( 'Y-m-d H:i:s' );
+		$add_array ['creation_date'] = gmdate('Y-m-d H:i:s');
 		/**
 		 * *******************************************************************************************
 		 */
-		if ($this->session->userdata ( 'logintype' ) == 1 || $this->session->userdata ( 'logintype' ) == 5) {
-			$account_data = $this->session->userdata ( "accountinfo" );
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			$account_data = $this->session->userdata("accountinfo");
 			$add_array ['reseller_id'] = $account_data ['id'];
 		} else {
 			$add_array ['reseller_id'] = "0";
 		}
 		
-		unset ( $add_array ['action'] );
-		$this->db->insert ( "charges", $add_array );
-		$insert_id = $this->db->insert_id ();
-		$data = $this->db_model->getSelect ( "*", "accounts", array (
+		unset ($add_array ['action']);
+		$this->db->insert("charges", $add_array);
+		$insert_id = $this->db->insert_id();
+		$data = $this->db_model->getSelect("*", "accounts", array(
 				"pricelist_id" => $add_array ['pricelist_id'] 
-		) );
+		));
 		if ($data->num_rows > 0) {
-			foreach ( $data->result_array () as $key => $value ) {
-				$this->common->mail_to_users ( 'add_subscription', $value );
+			foreach ($data->result_array() as $key => $value) {
+				$this->common->mail_to_users('add_subscription', $value);
 			}
 		}
 		return $insert_id;
 	}
 	function edit_charge($data, $id) {
-		unset ( $data ['action'] );
+		unset ($data ['action']);
 		/*
 		 * ASTPP 3.0
 		 * Charges edit time last modified date update
 		 */
-		$data ['last_modified_date'] = gmdate ( 'Y-m-d H:i:s' );
+		$data ['last_modified_date'] = gmdate('Y-m-d H:i:s');
 		/**
 		 * *******************************************************************************************
 		 */
-		if ($this->session->userdata ( 'logintype' ) == 1 || $this->session->userdata ( 'logintype' ) == 5) {
-			$account_data = $this->session->userdata ( "accountinfo" );
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			$account_data = $this->session->userdata("accountinfo");
 			$data ['reseller_id'] = $account_data ['id'];
 		} else {
 			$data ['reseller_id'] = "0";
 		}
-		$this->db->where ( "id", $id );
-		$this->db->update ( "charges", $data );
+		$this->db->where("id", $id);
+		$this->db->update("charges", $data);
 		
 		if ($data ['pricelist_id'] == 0) {
-			$this->db->where ( "charge_id", $id );
-			$this->db->delete ( "charge_to_account" );
+			$this->db->where("charge_id", $id);
+			$this->db->delete("charge_to_account");
 		}
 	}
 	function remove_charge($id) {
-		$this->db->where ( "id", $id );
-		$this->db->delete ( "charges" );
-		$this->db->where ( "charge_id", $id );
-		$this->db->delete ( "charge_to_account" );
-		$data = $this->db_model->getSelect ( "*", "charges", array (
+		$this->db->where("id", $id);
+		$this->db->delete("charges");
+		$this->db->where("charge_id", $id);
+		$this->db->delete("charge_to_account");
+		$data = $this->db_model->getSelect("*", "charges", array(
 				"id" => $id 
-		) );
-		$data = $data->result_array ();
+		));
+		$data = $data->result_array();
 		$data = $data [0];
-		$data = $this->db_model->getSelect ( "*", "accounts", array (
+		$data = $this->db_model->getSelect("*", "accounts", array(
 				"pricelist_id" => $data ['pricelist_id'] 
-		) );
+		));
 		if ($data->num_rows > 0) {
-			foreach ( $data->result_array () as $key => $value ) {
-				$this->common->mail_to_users ( 'remove_subscription', $value );
+			foreach ($data->result_array() as $key => $value) {
+				$this->common->mail_to_users('remove_subscription', $value);
 			}
 		}
 		return true;
 	}
 	function add_account_charges($pricelistid, $chargeid, $flag) {
 		if ($flag) {
-			$this->db->where ( "charge_id", $chargeid );
-			$this->db->delete ( "charge_to_account" );
+			$this->db->where("charge_id", $chargeid);
+			$this->db->delete("charge_to_account");
 		}
-		$account = $this->db_model->getSelect ( "*", "accounts", array (
+		$account = $this->db_model->getSelect("*", "accounts", array(
 				"pricelist_id" => $pricelistid 
-		) );
+		));
 		if ($account->num_rows > 0) {
-			foreach ( $account->result_array () as $key => $value ) {
-				$charge_arr = array (
+			foreach ($account->result_array() as $key => $value) {
+				$charge_arr = array(
 						"charge_id" => $chargeid,
 						"accountid" => $value ['id'],
-						"assign_date" => gmdate ( "Y-m-d H:i:s" ) 
+						"assign_date" => gmdate("Y-m-d H:i:s") 
 				);
-				$this->db->insert ( "charge_to_account", $charge_arr );
-				require_once (APPPATH . 'controllers/ProcessCharges.php');
-				$ProcessCharges = new ProcessCharges ();
-				$Params = array (
+				$this->db->insert("charge_to_account", $charge_arr);
+				require_once (APPPATH.'controllers/ProcessCharges.php');
+				$ProcessCharges = new ProcessCharges();
+				$Params = array(
 						"ChargeID" => $chargeid,
 						"AccountInfo" => $value 
 				);
-				$ProcessCharges->BillAccountCharges ( "ACCOUNTSUBSCRIPTION", $Params );
+				$ProcessCharges->BillAccountCharges("ACCOUNTSUBSCRIPTION", $Params);
 			}
 		}
 	}

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

Spacing +93 added lines, -93 removed lines

@@ -23,78 +23,78 @@ 
 // ##############################################################################
 class Charges extends MX_Controller {
 	function Charges() {
-		parent::__construct ();
+		parent::__construct();
 		
-		$this->load->helper ( 'template_inheritance' );
+		$this->load->helper('template_inheritance');
 		
-		$this->load->library ( 'session' );
-		$this->load->library ( "charges_form" );
-		$this->load->library ( 'astpp/form' );
-		$this->load->model ( 'charges_model' );
+		$this->load->library('session');
+		$this->load->library("charges_form");
+		$this->load->library('astpp/form');
+		$this->load->model('charges_model');
 		
-		if ($this->session->userdata ( 'user_login' ) == FALSE)
-			redirect ( base_url () . '/astpp/login' );
+		if ($this->session->userdata('user_login') == FALSE)
+			redirect(base_url().'/astpp/login');
 	}
 	function periodiccharges_add() {
-		$data ['username'] = $this->session->userdata ( 'user_name' );
+		$data ['username'] = $this->session->userdata('user_name');
 		$data ['flag'] = 'create';
-		$data ['page_title'] = gettext ( 'Create Subscription' );
-		$data ['form'] = $this->form->build_form ( $this->charges_form->get_charge_form_fields (), '' );
-		$this->load->view ( 'view_periodiccharges_add_edit', $data );
+		$data ['page_title'] = gettext('Create Subscription');
+		$data ['form'] = $this->form->build_form($this->charges_form->get_charge_form_fields(), '');
+		$this->load->view('view_periodiccharges_add_edit', $data);
 	}
 	function periodiccharges_edit($edit_id = '') {
-		$data ['page_title'] = gettext ( 'Edit Subscription' );
-		$where = array (
+		$data ['page_title'] = gettext('Edit Subscription');
+		$where = array(
 				'id' => $edit_id 
 		);
-		$account = $this->db_model->getSelect ( "*", "charges", $where );
-		foreach ( $account->result_array () as $key => $value ) {
+		$account = $this->db_model->getSelect("*", "charges", $where);
+		foreach ($account->result_array() as $key => $value) {
 			$edit_data = $value;
 		}
-		$edit_data ['charge'] = $this->common_model->to_calculate_currency ( $edit_data ['charge'], '', '', true, false );
+		$edit_data ['charge'] = $this->common_model->to_calculate_currency($edit_data ['charge'], '', '', true, false);
 		
-		$data ['form'] = $this->form->build_form ( $this->charges_form->get_charge_form_fields (), $edit_data );
-		$this->load->view ( 'view_periodiccharges_add_edit', $data );
+		$data ['form'] = $this->form->build_form($this->charges_form->get_charge_form_fields(), $edit_data);
+		$this->load->view('view_periodiccharges_add_edit', $data);
 	}
 	function periodiccharges_save() {
-		$add_array = $this->input->post ();
-		$data ['form'] = $this->form->build_form ( $this->charges_form->get_charge_form_fields (), $add_array );
+		$add_array = $this->input->post();
+		$data ['form'] = $this->form->build_form($this->charges_form->get_charge_form_fields(), $add_array);
 		if ($add_array ['id'] != '') {
-			$data ['page_title'] = gettext ( 'Edit Subscription' );
-			if ($this->form_validation->run () == FALSE) {
-				$data ['validation_errors'] = validation_errors ();
+			$data ['page_title'] = gettext('Edit Subscription');
+			if ($this->form_validation->run() == FALSE) {
+				$data ['validation_errors'] = validation_errors();
 				echo $data ['validation_errors'];
 				exit ();
 			} else {
 				if ($add_array ['pricelist_id'] == '') {
 					$add_array ['pricelist_id'] = '0';
 				}
-				$add_array ['charge'] = $this->common_model->add_calculate_currency ( $add_array ['charge'], '', '', false, false );
-				$this->charges_model->edit_charge ( $add_array, $add_array ['id'] );
+				$add_array ['charge'] = $this->common_model->add_calculate_currency($add_array ['charge'], '', '', false, false);
+				$this->charges_model->edit_charge($add_array, $add_array ['id']);
 				
 				if ($add_array ['pricelist_id'] > 0) {
-					$this->charges_model->add_account_charges ( $add_array ['pricelist_id'], $add_array ['id'], true );
+					$this->charges_model->add_account_charges($add_array ['pricelist_id'], $add_array ['id'], true);
 				}
-				echo json_encode ( array (
-						"SUCCESS" => $add_array ["description"] . " subscription updated successfully!" 
-				) );
+				echo json_encode(array(
+						"SUCCESS" => $add_array ["description"]." subscription updated successfully!" 
+				));
 				exit ();
 			}
 		} else {
-			$data ['page_title'] = gettext ( 'Add Subscription' );
-			if ($this->form_validation->run () == FALSE) {
-				$data ['validation_errors'] = validation_errors ();
+			$data ['page_title'] = gettext('Add Subscription');
+			if ($this->form_validation->run() == FALSE) {
+				$data ['validation_errors'] = validation_errors();
 				echo $data ['validation_errors'];
 				exit ();
 			} else {
-				$add_array ['charge'] = $this->common_model->add_calculate_currency ( $add_array ['charge'], '', '', false, false );
-				$charge_id = $this->charges_model->add_charge ( $add_array );
+				$add_array ['charge'] = $this->common_model->add_calculate_currency($add_array ['charge'], '', '', false, false);
+				$charge_id = $this->charges_model->add_charge($add_array);
 				if ($add_array ['pricelist_id'] > 0 && $charge_id > 0) {
-					$this->charges_model->add_account_charges ( $add_array ['pricelist_id'], $charge_id, false );
+					$this->charges_model->add_account_charges($add_array ['pricelist_id'], $charge_id, false);
 				}
-				echo json_encode ( array (
-						"SUCCESS" => $add_array ["description"] . " subscription added successfully!" 
-				) );
+				echo json_encode(array(
+						"SUCCESS" => $add_array ["description"]." subscription added successfully!" 
+				));
 				exit ();
 			}
 		}
@@ -102,50 +102,50 @@ 
 	
 	// /*ASTPP_invoice_changes_05_05_start*/
 	function periodiccharges_delete($id) {
-		$this->charges_model->remove_charge ( $id );
+		$this->charges_model->remove_charge($id);
 		
-		require_once (APPPATH . 'controllers/ProcessCharges.php');
-		$ProcessCharges = new ProcessCharges ();
+		require_once (APPPATH.'controllers/ProcessCharges.php');
+		$ProcessCharges = new ProcessCharges();
 		
-		$Params = array (
+		$Params = array(
 				"ChargeID" => $id 
 		);
-		$ProcessCharges->BillAccountCharges ( "SUBSCRIPTION", $Params );
+		$ProcessCharges->BillAccountCharges("SUBSCRIPTION", $Params);
 		
-		$this->session->set_flashdata ( 'astpp_notification', 'Subscription removed successfully!' );
-		redirect ( base_url () . 'charges/periodiccharges/' );
+		$this->session->set_flashdata('astpp_notification', 'Subscription removed successfully!');
+		redirect(base_url().'charges/periodiccharges/');
 	}
 	// end
 	function periodiccharges_search() {
-		$ajax_search = $this->input->post ( 'ajax_search', 0 );
-		if ($this->input->post ( 'advance_search', TRUE ) == 1) {
-			$this->session->set_userdata ( 'advance_search', $this->input->post ( 'advance_search' ) );
-			$action = $this->input->post ();
-			unset ( $action ['action'] );
-			unset ( $action ['advance_search'] );
-			if (isset ( $action ['charge'] ['charge'] ) && $action ['charge'] ['charge'] != '') {
-				$action ['charge'] ['charge'] = $this->common_model->add_calculate_currency ( $action ['charge'] ['charge'], "", '', true, false );
+		$ajax_search = $this->input->post('ajax_search', 0);
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset ($action ['action']);
+			unset ($action ['advance_search']);
+			if (isset ($action ['charge'] ['charge']) && $action ['charge'] ['charge'] != '') {
+				$action ['charge'] ['charge'] = $this->common_model->add_calculate_currency($action ['charge'] ['charge'], "", '', true, false);
 			}
-			$this->session->set_userdata ( 'charges_list_search', $action );
+			$this->session->set_userdata('charges_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect ( base_url () . 'charges/periodiccharges/' );
+			redirect(base_url().'charges/periodiccharges/');
 		}
 	}
 	function periodiccharges_clearsearchfilter() {
-		$this->session->set_userdata ( 'advance_search', 0 );
-		$this->session->set_userdata ( 'charges_list_search', "" );
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('charges_list_search', "");
 	}
 	function periodiccharges() {
-		$data ['username'] = $this->session->userdata ( 'user_name' );
-		$data ['page_title'] = gettext ( 'Subscriptions' );
+		$data ['username'] = $this->session->userdata('user_name');
+		$data ['page_title'] = gettext('Subscriptions');
 		$data ['search_flag'] = true;
-		$this->session->set_userdata ( 'advance_search', 0 );
-		$data ['grid_fields'] = $this->charges_form->build_charge_list_for_admin ();
-		$data ["grid_buttons"] = $this->charges_form->build_grid_buttons ();
-		$data ['form_search'] = $this->form->build_serach_form ( $this->charges_form->get_charges_search_form () );
+		$this->session->set_userdata('advance_search', 0);
+		$data ['grid_fields'] = $this->charges_form->build_charge_list_for_admin();
+		$data ["grid_buttons"] = $this->charges_form->build_grid_buttons();
+		$data ['form_search'] = $this->form->build_serach_form($this->charges_form->get_charges_search_form());
 		
-		$this->load->view ( 'view_charges_list', $data );
+		$this->load->view('view_charges_list', $data);
 	}
 	
 	/**
@@ -153,68 +153,68 @@ 
 	 * Listing of Accounts table data through php function json_encode
 	 */
 	function periodiccharges_json() {
-		$json_data = array ();
-		$count_all = $this->charges_model->getcharges_list ( false );
-		$paging_data = $this->form->load_grid_config ( $count_all, $_GET ['rp'], $_GET ['page'] );
+		$json_data = array();
+		$count_all = $this->charges_model->getcharges_list(false);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET ['rp'], $_GET ['page']);
 		$json_data = $paging_data ["json_paging"];
-		$query = $this->charges_model->getcharges_list ( true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"] );
-		$grid_fields = json_decode ( $this->charges_form->build_charge_list_for_admin () );
-		$json_data ['rows'] = $this->form->build_grid ( $query, $grid_fields );
+		$query = $this->charges_model->getcharges_list(true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"]);
+		$grid_fields = json_decode($this->charges_form->build_charge_list_for_admin());
+		$json_data ['rows'] = $this->form->build_grid($query, $grid_fields);
 		
-		echo json_encode ( $json_data );
+		echo json_encode($json_data);
 	}
 	// /*ASTPP_invoice_changes_05_05_start*/
 	function periodiccharges_delete_multiple() {
-		$ids = $this->input->post ( "selected_ids", true );
+		$ids = $this->input->post("selected_ids", true);
 		
-		$charge_where = "charge_id IN(" . $ids . ")";
-		$this->db->delete ( 'charge_to_account', $charge_where );
+		$charge_where = "charge_id IN(".$ids.")";
+		$this->db->delete('charge_to_account', $charge_where);
 		
 		$where = "id IN ($ids)";
-		$this->db->delete ( "charges", $where );
+		$this->db->delete("charges", $where);
 		
 		echo "SUBSCRIPTION";
 	}
 	// end
 	function customer_charge_list($accountid, $accounttype) {
-		$json_data = array ();
+		$json_data = array();
 		
 		$select = "charge_to_account.id,charges.description,charges.charge,charges.sweep_id,charges.pro_rate,charges.creation_date,charges.last_modified_date";
 		$table = "charges";
-		$jionTable = array (
+		$jionTable = array(
 				'charge_to_account',
 				'accounts' 
 		);
-		$jionCondition = array (
+		$jionCondition = array(
 				'charges.id = charge_to_account.charge_id',
 				'accounts.id = charge_to_account.accountid' 
 		);
-		$type = array (
+		$type = array(
 				'left',
 				'inner' 
 		);
-		$where = array (
+		$where = array(
 				'accounts.id' => $accountid 
 		);
 		$order_type = 'id';
 		$order_by = "ASC";
-		$instant_search = $this->session->userdata ( 'left_panel_search_' . $accounttype . '_subscription' );
-		$like_str = ! empty ( $instant_search ) ? "(charges.description like '%$instant_search%'  
+		$instant_search = $this->session->userdata('left_panel_search_'.$accounttype.'_subscription');
+		$like_str = ! empty ($instant_search) ? "(charges.description like '%$instant_search%'  
                                             OR  charges.charge like '%$instant_search%'
                                             OR  charges.charge like '%$instant_search%' 
                                                 )" : null;
-		if (! empty ( $like_str ))
-			$this->db->where ( $like_str );
-		$count_all = $this->db_model->getCountWithJion ( $table, $select, $where, $jionTable, $jionCondition, $type );
-		$paging_data = $this->form->load_grid_config ( $count_all, $_GET ['rp'], $_GET ['page'] );
+		if ( ! empty ($like_str))
+			$this->db->where($like_str);
+		$count_all = $this->db_model->getCountWithJion($table, $select, $where, $jionTable, $jionCondition, $type);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET ['rp'], $_GET ['page']);
 		$json_data = $paging_data ["json_paging"];
-		if (! empty ( $like_str ))
-			$this->db->where ( $like_str );
-		$account_charge_list = $this->db_model->getAllJionQuery ( $table, $select, $where, $jionTable, $jionCondition, $type, $paging_data ["paging"] ["page_no"], $paging_data ["paging"] ["start"], $order_by, $order_type, "" );
-		$grid_fields = json_decode ( $this->charges_form->build_charges_list_for_customer ( $accountid, $accounttype ) );
-		$json_data ['rows'] = $this->form->build_grid ( $account_charge_list, $grid_fields );
+		if ( ! empty ($like_str))
+			$this->db->where($like_str);
+		$account_charge_list = $this->db_model->getAllJionQuery($table, $select, $where, $jionTable, $jionCondition, $type, $paging_data ["paging"] ["page_no"], $paging_data ["paging"] ["start"], $order_by, $order_type, "");
+		$grid_fields = json_decode($this->charges_form->build_charges_list_for_customer($accountid, $accounttype));
+		$json_data ['rows'] = $this->form->build_grid($account_charge_list, $grid_fields);
 		
-		echo json_encode ( $json_data );
+		echo json_encode($json_data);
 	}
 }
 

Braces +9 added lines, -6 removed lines

@@ -32,8 +32,9 @@ 
 		$this->load->library ( 'astpp/form' );
 		$this->load->model ( 'charges_model' );
 		
-		if ($this->session->userdata ( 'user_login' ) == FALSE)
-			redirect ( base_url () . '/astpp/login' );
+		if ($this->session->userdata ( 'user_login' ) == FALSE) {
+					redirect ( base_url () . '/astpp/login' );
+		}
 	}
 	function periodiccharges_add() {
 		$data ['username'] = $this->session->userdata ( 'user_name' );
@@ -203,13 +204,15 @@ 
                                             OR  charges.charge like '%$instant_search%'
                                             OR  charges.charge like '%$instant_search%' 
                                                 )" : null;
-		if (! empty ( $like_str ))
-			$this->db->where ( $like_str );
+		if (! empty ( $like_str )) {
+					$this->db->where ( $like_str );
+		}
 		$count_all = $this->db_model->getCountWithJion ( $table, $select, $where, $jionTable, $jionCondition, $type );
 		$paging_data = $this->form->load_grid_config ( $count_all, $_GET ['rp'], $_GET ['page'] );
 		$json_data = $paging_data ["json_paging"];
-		if (! empty ( $like_str ))
-			$this->db->where ( $like_str );
+		if (! empty ( $like_str )) {
+					$this->db->where ( $like_str );
+		}
 		$account_charge_list = $this->db_model->getAllJionQuery ( $table, $select, $where, $jionTable, $jionCondition, $type, $paging_data ["paging"] ["page_no"], $paging_data ["paging"] ["start"], $order_by, $order_type, "" );
 		$grid_fields = json_decode ( $this->charges_form->build_charges_list_for_customer ( $accountid, $accounttype ) );
 		$json_data ['rows'] = $this->form->build_grid ( $account_charge_list, $grid_fields );

web_interface/astpp/application/modules/charges/libraries/charges_form.php

Spacing +102 added lines, -102 removed lines

@@ -21,26 +21,26 @@ 
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 // ##############################################################################
-if (! defined ( 'BASEPATH' ))
-	exit ( 'No direct script access allowed' );
+if ( ! defined('BASEPATH'))
+	exit ('No direct script access allowed');
 class Charges_form {
 	function __construct($library_name = '') {
-		$this->CI = & get_instance ();
+		$this->CI = & get_instance();
 	}
 	function get_charge_form_fields() {
-		$form ['forms'] = array (
-				base_url () . 'charges/periodiccharges_save/',
-				array (
+		$form ['forms'] = array(
+				base_url().'charges/periodiccharges_save/',
+				array(
 						'id' => 'charges_form',
 						'method' => 'POST',
 						'name' => 'charges_form' 
 				) 
 		);
-		$form [gettext ( 'Information' )] = array (
-				array (
+		$form [gettext('Information')] = array(
+				array(
 						'',
 						'HIDDEN',
-						array (
+						array(
 								'name' => 'id' 
 						),
 						'',
@@ -48,10 +48,10 @@ 
 						'',
 						'' 
 				),
-				array (
-						gettext ( 'Name' ),
+				array(
+						gettext('Name'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'description',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -60,8 +60,8 @@ 
 						'tOOL TIP',
 						'Please Enter account number' 
 				),
-				array (
-						gettext ( 'Rate Group' ),
+				array(
+						gettext('Rate Group'),
 						'pricelist_id',
 						'SELECT',
 						'',
@@ -73,15 +73,15 @@ 
 						'pricelists',
 						'build_dropdown',
 						'where_arr',
-						array (
+						array(
 								"reseller_id" => "0",
 								"status <>" => "2" 
 						) 
 				),
-				array (
-						gettext ( 'Amount' ),
+				array(
+						gettext('Amount'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'charge',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -90,8 +90,8 @@ 
 						'tOOL TIP',
 						'Please Enter account number' 
 				),
-				array (
-						gettext ( 'Prorate' ),
+				array(
+						gettext('Prorate'),
 						'pro_rate',
 						'SELECT',
 						'',
@@ -103,8 +103,8 @@ 
 						'',
 						'set_prorate' 
 				),
-				array (
-						gettext ( 'Bill cycle' ),
+				array(
+						gettext('Bill cycle'),
 						'sweep_id',
 						'SELECT',
 						'',
@@ -118,8 +118,8 @@ 
 						'',
 						'' 
 				),
-				array (
-						gettext ( 'Status' ),
+				array(
+						gettext('Status'),
 						'status',
 						'SELECT',
 						'',
@@ -132,17 +132,17 @@ 
 						'set_status' 
 				) 
 		);
-		$form ['button_cancel'] = array (
+		$form ['button_cancel'] = array(
 				'name' => 'action',
-				'content' => gettext ( 'Close' ),
+				'content' => gettext('Close'),
 				'value' => 'cancel',
 				'type' => 'button',
 				'class' => 'btn btn-line-sky margin-x-10',
 				'onclick' => 'return redirect_page(\'NULL\')' 
 		);
-		$form ['button_save'] = array (
+		$form ['button_save'] = array(
 				'name' => 'action',
-				'content' => gettext ( 'Save' ),
+				'content' => gettext('Save'),
 				'value' => 'save',
 				'id' => 'submit',
 				'type' => 'button',
@@ -151,24 +151,24 @@ 
 		return $form;
 	}
 	function get_charges_search_form() {
-		$logintype = $this->CI->session->userdata ( 'logintype' );
+		$logintype = $this->CI->session->userdata('logintype');
 		if ($logintype == 1 || $logintype == 5) {
-			$account_data = $this->CI->session->userdata ( "accountinfo" );
+			$account_data = $this->CI->session->userdata("accountinfo");
 			$loginid = $account_data ['id'];
 		} else {
 			$loginid = "0";
 		}
-		$form ['forms'] = array (
+		$form ['forms'] = array(
 				"",
-				array (
+				array(
 						'id' => "charges_search" 
 				) 
 		);
-		$form [gettext ( 'Search' )] = array (
-				array (
-						gettext ( 'Name' ),
+		$form [gettext('Search')] = array(
+				array(
+						gettext('Name'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'description[description]',
 								'',
 								'size' => '20',
@@ -184,8 +184,8 @@ 
 						'search_string_type',
 						'' 
 				),
-				array (
-						gettext ( 'Rate Group' ),
+				array(
+						gettext('Rate Group'),
 						'pricelist_id',
 						'SELECT',
 						'',
@@ -197,15 +197,15 @@ 
 						'pricelists',
 						'build_dropdown',
 						'where_arr',
-						array (
+						array(
 								'status' => 0,
 								'reseller_id' => $loginid 
 						) 
 				),
-				array (
-						gettext ( 'Amount' ),
+				array(
+						gettext('Amount'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'charge[charge]',
 								'value' => '',
 								'size' => '20',
@@ -221,8 +221,8 @@ 
 						'search_int_type',
 						'' 
 				),
-				array (
-						gettext ( 'Billing Cycle' ),
+				array(
+						gettext('Billing Cycle'),
 						'sweep_id',
 						'SELECT',
 						'',
@@ -236,8 +236,8 @@ 
 						'',
 						'' 
 				),
-				array (
-						gettext ( 'Status' ),
+				array(
+						gettext('Status'),
 						'status',
 						'SELECT',
 						'',
@@ -249,7 +249,7 @@ 
 						'',
 						'set_search_status' 
 				),
-				array (
+				array(
 						'',
 						'HIDDEN',
 						'ajax_search',
@@ -258,7 +258,7 @@ 
 						'',
 						'' 
 				),
-				array (
+				array(
 						'',
 						'HIDDEN',
 						'advance_search',
@@ -268,18 +268,18 @@ 
 						'' 
 				) 
 		);
-		$form ['button_search'] = array (
+		$form ['button_search'] = array(
 				'name' => 'action',
 				'id' => "charges_search_btn",
-				'content' => gettext ( 'Search' ),
+				'content' => gettext('Search'),
 				'value' => 'save',
 				'type' => 'button',
 				'class' => 'btn btn-line-parrot pull-right' 
 		);
-		$form ['button_reset'] = array (
+		$form ['button_reset'] = array(
 				'name' => 'action',
 				'id' => "id_reset",
-				'content' => gettext ( 'Clear' ),
+				'content' => gettext('Clear'),
 				'value' => 'cancel',
 				'type' => 'reset',
 				'class' => 'btn btn-line-sky pull-right margin-x-10' 
@@ -292,13 +292,13 @@ 
 	 * Change size of grind
 	 */
 	function build_charge_list_for_admin() {
-		$account_info = $accountinfo = $this->CI->session->userdata ( 'accountinfo' );
+		$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 = $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 (
+		$grid_field_arr = json_encode(array(
+				array(
 						"<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>",
 						"30",
 						"",
@@ -314,8 +314,8 @@ 
 				 * For DID edit on DID number
 				 * *
 				 */
-				array (
-						gettext ( "Name" ),
+				array(
+						gettext("Name"),
 						"140",
 						"description",
 						"",
@@ -328,8 +328,8 @@ 
 				/**
 				 * ***********************************************
 				 */
-				array (
-						gettext ( "Rate Group" ),
+				array(
+						gettext("Rate Group"),
 						"140",
 						"pricelist_id",
 						"name",
@@ -339,7 +339,7 @@ 
 						"true",
 						"center" 
 				),
-				array (
+				array(
 						"Amount($currency)",
 						"125",
 						"charge",
@@ -350,8 +350,8 @@ 
 						"true",
 						"right" 
 				),
-				array (
-						gettext ( "Prorate" ),
+				array(
+						gettext("Prorate"),
 						"125",
 						"pro_rate",
 						"pro_rate",
@@ -361,8 +361,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Billing Cycle" ),
+				array(
+						gettext("Billing Cycle"),
 						"130",
 						"sweep_id",
 						"sweep",
@@ -376,8 +376,8 @@ 
 				 * ASTPP 3.0
 				 * Show Creation date,last_modified date in reseller grid with admin login
 				 */
-				array (
-						gettext ( "Status" ),
+				array(
+						gettext("Status"),
 						"125",
 						"status",
 						"status",
@@ -387,8 +387,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Created Date" ),
+				array(
+						gettext("Created Date"),
 						"150",
 						"creation_date",
 						"",
@@ -398,8 +398,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Modified Date" ),
+				array(
+						gettext("Modified Date"),
 						"150",
 						"last_modified_date",
 						"",
@@ -420,33 +420,33 @@ 
 				/**
 				 * ********************************************
 				 */
-				array (
-						gettext ( "Action" ),
+				array(
+						gettext("Action"),
 						"150",
 						"",
 						"",
 						"",
-						array (
-								"EDIT" => array (
+						array(
+								"EDIT" => array(
 										"url" => "charges/periodiccharges_edit/",
 										"mode" => "popup",
 										'popup' 
 								),
-								"DELETE" => array (
+								"DELETE" => array(
 										"url" => "charges/periodiccharges_delete/",
 										"mode" => "single" 
 								) 
 						) 
 				) 
-		) );
+		));
 		return $grid_field_arr;
 	}
 	/**
 	 * *****************************************
 	 */
 	function build_grid_buttons() {
-		$buttons_json = json_encode ( array (
-				array (
+		$buttons_json = json_encode(array(
+				array(
 						"Create",
 						"btn btn-line-warning btn",
 						"fa fa-plus-circle fa-lg",
@@ -454,23 +454,23 @@ 
 						"/charges/periodiccharges_add/",
 						"popup" 
 				),
-				array (
-						gettext ( "Delete" ),
+				array(
+						gettext("Delete"),
 						"btn btn-line-danger",
 						"fa fa-times-circle fa-lg",
 						"button_action",
 						"/charges/periodiccharges_delete_multiple/" 
 				) 
-		) );
+		));
 		return $buttons_json;
 	}
 	function build_charges_list_for_customer($accountid, $accounttype) {
-		$account_info = $accountinfo = $this->CI->session->userdata ( 'accountinfo' );
+		$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 = $this->CI->common->get_field_name('currency', 'currency', $currency_id);
 		
-		$grid_field_arr = json_encode ( array (
-				array (
+		$grid_field_arr = json_encode(array(
+				array(
 						"Name",
 						"140",
 						"description",
@@ -481,8 +481,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Amount($currency)" ),
+				array(
+						gettext("Amount($currency)"),
 						"140",
 						"charge",
 						"charge",
@@ -492,8 +492,8 @@ 
 						"true",
 						"right" 
 				),
-				array (
-						gettext ( "Prorate" ),
+				array(
+						gettext("Prorate"),
 						"125",
 						"pro_rate",
 						"pro_rate",
@@ -503,8 +503,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Billing Cycle" ),
+				array(
+						gettext("Billing Cycle"),
 						"170",
 						"sweep_id",
 						"sweep",
@@ -514,8 +514,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Created Date" ),
+				array(
+						gettext("Created Date"),
 						"150",
 						"creation_date",
 						"",
@@ -525,8 +525,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Modified Date" ),
+				array(
+						gettext("Modified Date"),
 						"150",
 						"last_modified_date",
 						"",
@@ -536,20 +536,20 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Action" ),
+				array(
+						gettext("Action"),
 						"150",
 						"",
 						"",
 						"",
-						array (
-								"DELETE" => array (
-										"url" => "accounts/" . $accounttype . "_subscription_action/delete/$accountid/$accounttype/",
+						array(
+								"DELETE" => array(
+										"url" => "accounts/".$accounttype."_subscription_action/delete/$accountid/$accounttype/",
 										"mode" => "single" 
 								) 
 						) 
 				) 
-		) );
+		));
 		return $grid_field_arr;
 	}
 }

Braces +2 added lines, -1 removed lines

@@ -21,8 +21,9 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 // ##############################################################################
-if (! defined ( 'BASEPATH' ))
+if (! defined ( 'BASEPATH' )) {
 	exit ( 'No direct script access allowed' );
+}
 class Charges_form {
 	function __construct($library_name = '') {
 		$this->CI = & get_instance ();

web_interface/astpp/application/modules/freeswitch/models/freeswitch_model.php

Spacing +101 added lines, -101 removed lines

@@ -23,7 +23,7 @@ 
 // #############################################################################
 class Freeswitch_model extends CI_Model {
 	function Freeswitch_model() {
-		parent::__construct ();
+		parent::__construct();
 	}
 	
 	/**
@@ -34,26 +34,26 @@ 
 	 */
 	function get_sipdevices_list($flag, $accountid = "", $entitytype = '', $start = "", $limit = "") {
 		if ($accountid != "") {
-			$where = array (
+			$where = array(
 					"accountid" => $accountid 
 			);
 		}
-		$this->db_model->build_search ( 'fssipdevices_list_search' );
-		$instant_search = $this->session->userdata ( 'left_panel_search_' . $entitytype . '_sipdevices' );
-		if (! empty ( $instant_search )) {
+		$this->db_model->build_search('fssipdevices_list_search');
+		$instant_search = $this->session->userdata('left_panel_search_'.$entitytype.'_sipdevices');
+		if ( ! empty ($instant_search)) {
 			$like_str = "(username like '%$instant_search%' OR creation_date like '%$instant_search%' OR last_modified_date like '%$instant_search%')";
-			$this->db->where ( $like_str );
+			$this->db->where($like_str);
 		}
-		$query = array ();
+		$query = array();
 		if ($flag) {
-			$deviceinfo = $this->db_model->select ( "*", "sip_devices", $where, "id", "ASC", $limit, $start );
+			$deviceinfo = $this->db_model->select("*", "sip_devices", $where, "id", "ASC", $limit, $start);
 			if ($deviceinfo->num_rows > 0) {
-				$add_array = $deviceinfo->result_array ();
-				foreach ( $add_array as $key => $value ) {
-					$vars = json_decode ( $value ['dir_vars'] );
-					$vars_new = json_decode ( $value ['dir_params'], true );
-					$passowrds = json_decode ( $value ['dir_params'] );
-					$query [] = array (
+				$add_array = $deviceinfo->result_array();
+				foreach ($add_array as $key => $value) {
+					$vars = json_decode($value ['dir_vars']);
+					$vars_new = json_decode($value ['dir_params'], true);
+					$passowrds = json_decode($value ['dir_params']);
+					$query [] = array(
 							'id' => $value ['id'],
 							'username' => $value ['username'],
 							'accountid' => $value ['accountid'],
@@ -80,7 +80,7 @@ 
 				}
 			}
 		} else {
-			$query = $this->db_model->countQuery ( "*", "sip_devices", $where );
+			$query = $this->db_model->countQuery("*", "sip_devices", $where);
 		}
 		return $query;
 	}
@@ -94,22 +94,22 @@ 
 	 * *****
 	 */
 	function add_freeswith($add_array) {
-		$where = array (
+		$where = array(
 				'id' => $add_array ['accountcode'] 
 		);
-		$query = $this->db_model->getSelect ( "*", "accounts", $where );
-		$query = $query->result_array ();
+		$query = $this->db_model->getSelect("*", "accounts", $where);
+		$query = $query->result_array();
 		$account_data = $query [0];
 		
-		$log_type = $this->session->userdata ( "logintype" );
+		$log_type = $this->session->userdata("logintype");
 		
 		$reseller_id = $log_type == 1 ? $account_data ['reseller_id'] : 0;
 		
-		$sip_profile_id = isset ( $add_array ['sip_profile_id'] ) ? $add_array ['sip_profile_id'] : $this->common->get_field_name ( 'id', 'sip_profiles', array (
+		$sip_profile_id = isset ($add_array ['sip_profile_id']) ? $add_array ['sip_profile_id'] : $this->common->get_field_name('id', 'sip_profiles', array(
 				'name' => 'default' 
-		) );
+		));
 		
-		$parms_array = array (
+		$parms_array = array(
 				'password' => $add_array ['fs_password'],
 				'vm-enabled' => $add_array ['voicemail_enabled'],
 				'vm-password' => $add_array ['fs_password'],
@@ -119,8 +119,8 @@ 
 				'vm-email-all-messages' => $add_array ['vm_send_all_message'] 
 		);
 		
-		$add_array ['status'] = isset ( $add_array ['status'] ) ? $add_array ['status'] : "0";
-		$parms_array_vars = array (
+		$add_array ['status'] = isset ($add_array ['status']) ? $add_array ['status'] : "0";
+		$parms_array_vars = array(
 				'effective_caller_id_name' => $add_array ['effective_caller_id_name'],
 				'effective_caller_id_number' => $add_array ['effective_caller_id_number'],
 				'user_context' => 'default' 
@@ -129,27 +129,27 @@ 
 		 * ASTPP 3.0
 		 * creation date add
 		 */
-		$new_array = array (
-				'creation_date' => gmdate ( 'Y-m-d H:i:s' ),
+		$new_array = array(
+				'creation_date' => gmdate('Y-m-d H:i:s'),
 				'username' => $add_array ['fs_username'],
 				'reseller_id' => $reseller_id,
 				'accountid' => $add_array ['accountcode'],
 				'status' => $add_array ['status'],
-				'dir_params' => json_encode ( $parms_array ),
-				'dir_vars' => json_encode ( $parms_array_vars ),
+				'dir_params' => json_encode($parms_array),
+				'dir_vars' => json_encode($parms_array_vars),
 				'sip_profile_id' => $sip_profile_id 
 		);
 		/**
 		 * **************************************8
 		 */
-		$this->db->insert ( 'sip_devices', $new_array );
+		$this->db->insert('sip_devices', $new_array);
 		/**
 		 * ****
 		 * ASTPP 3.0
 		 * Email broadcast when Sip Device create
 		 * *****
 		 */
-		$mail = (isset ( $add_array ['voicemail_mail_to'] ) && $add_array ['voicemail_mail_to'] != "") ? $add_array ['voicemail_mail_to'] : $account_data ['email'];
+		$mail = (isset ($add_array ['voicemail_mail_to']) && $add_array ['voicemail_mail_to'] != "") ? $add_array ['voicemail_mail_to'] : $account_data ['email'];
 		
 		$add_array ['id'] = $add_array ['accountcode'];
 		$add_array ['reseller_id'] = $account_data ['reseller_id'];
@@ -160,7 +160,7 @@ 
 		// $add_array['password']=$this->common->decode($add_array['fs_password']);
 		$add_array ['password'] = $add_array ['fs_password'];
 		// echo "<pre>"; print_r($add_array); exit;
-		$this->common->mail_to_users ( 'add_sip_device', $add_array );
+		$this->common->mail_to_users('add_sip_device', $add_array);
 		/**
 		 * *************************
 		 */
@@ -176,7 +176,7 @@ 
 	 * *****
 	 */
 	function edit_freeswith($add_array, $id) {
-		$parms_array = array (
+		$parms_array = array(
 				'password' => $add_array ['fs_password'],
 				'vm-enabled' => $add_array ['voicemail_enabled'],
 				'vm-password' => $add_array ['voicemail_password'],
@@ -187,34 +187,34 @@ 
 		);
 		// echo "<pre>";print_r($parms_array);exit;
 		
-		$parms_array_vars = array (
+		$parms_array_vars = array(
 				'effective_caller_id_name' => $add_array ['effective_caller_id_name'],
 				'effective_caller_id_number' => $add_array ['effective_caller_id_number'] 
 		);
-		$log_type = $this->session->userdata ( "logintype" );
+		$log_type = $this->session->userdata("logintype");
 		if ($log_type == 0 || $log_type == 3 || $log_type == 1) {
-			$add_array ['sip_profile_id'] = $this->common->get_field_name ( 'id', 'sip_profiles', array (
+			$add_array ['sip_profile_id'] = $this->common->get_field_name('id', 'sip_profiles', array(
 					'name' => 'default' 
-			) );
+			));
 		}
-		$add_array ['status'] = isset ( $add_array ['status'] ) ? $add_array ['status'] : "0";
+		$add_array ['status'] = isset ($add_array ['status']) ? $add_array ['status'] : "0";
 		/*
 		 * ASTPP 3.0 edit modified date
 		 */
-		$new_array = array (
-				'last_modified_date' => gmdate ( 'Y-m-d H:i:s' ),
+		$new_array = array(
+				'last_modified_date' => gmdate('Y-m-d H:i:s'),
 				'username' => $add_array ['fs_username'],
 				'accountid' => $add_array ['accountcode'],
 				'status' => $add_array ['status'],
-				'dir_params' => json_encode ( $parms_array ),
-				'dir_vars' => json_encode ( $parms_array_vars ),
+				'dir_params' => json_encode($parms_array),
+				'dir_vars' => json_encode($parms_array_vars),
 				'sip_profile_id' => $add_array ['sip_profile_id'] 
 		);
 		/**
 		 * ****************************************
 		 */
-		$this->db->where ( 'id', $id );
-		$this->db->update ( 'sip_devices', $new_array );
+		$this->db->where('id', $id);
+		$this->db->update('sip_devices', $new_array);
 		// echo $this->db->last_query(); exit;
 		return true;
 	}
@@ -228,17 +228,17 @@ 
 	 * *****
 	 */
 	function get_edited_data($edit_id) {
-		$deviceinfo = array ();
-		$where = array (
+		$deviceinfo = array();
+		$where = array(
 				'id' => $edit_id 
 		);
-		$deviceinfo = $this->db_model->getSelect ( "*", "sip_devices", $where );
-		$add_array = $deviceinfo->result_array ();
-		foreach ( $add_array as $key => $value ) {
-			$vars = json_decode ( $value ['dir_vars'] );
-			$vars_new = json_decode ( $value ['dir_params'], true );
-			$passowrds = json_decode ( $value ['dir_params'] );
-			$query = array (
+		$deviceinfo = $this->db_model->getSelect("*", "sip_devices", $where);
+		$add_array = $deviceinfo->result_array();
+		foreach ($add_array as $key => $value) {
+			$vars = json_decode($value ['dir_vars']);
+			$vars_new = json_decode($value ['dir_params'], true);
+			$passowrds = json_decode($value ['dir_params']);
+			$query = array(
 					'id' => $value ['id'],
 					'fs_username' => $value ['username'],
 					'accountcode' => $value ['accountid'],
@@ -261,8 +261,8 @@ 
 	 * **********************
 	 */
 	function delete_freeswith_devices($id) {
-		$this->db->where ( 'id', $id );
-		$this->db->delete ( 'sip_devices' );
+		$this->db->where('id', $id);
+		$this->db->delete('sip_devices');
 		return true;
 	}
 	/**
@@ -272,28 +272,28 @@ 
 	 * *****
 	 */
 	function fs_retrieve_sip_user($flag, $start = 0, $limit = 0) {
-		$deviceinfo = array ();
-		$this->db_model->build_search ( 'fssipdevices_list_search' );
-		$accountinfo = $this->session->userdata ( "accountinfo" );
+		$deviceinfo = array();
+		$this->db_model->build_search('fssipdevices_list_search');
+		$accountinfo = $this->session->userdata("accountinfo");
 		$reseller_id = $accountinfo ['type'] == 1 ? $accountinfo ['id'] : 0;
-		$query = array ();
-		$logintype = $this->session->userdata ( "logintype" );
+		$query = array();
+		$logintype = $this->session->userdata("logintype");
 		
 		$where ['reseller_id'] = $reseller_id;
 		
 		if ($flag) {
-			$deviceinfo = $this->db_model->select ( "*", "sip_devices", $where, "id", "ASC", $limit, $start );
+			$deviceinfo = $this->db_model->select("*", "sip_devices", $where, "id", "ASC", $limit, $start);
 			if ($deviceinfo->num_rows > 0) {
-				$add_array = $deviceinfo->result_array ();
-				foreach ( $add_array as $key => $value ) {
-					$vars = json_decode ( $value ['dir_vars'] );
-					$vars_new = json_decode ( $value ['dir_params'], true );
-					$passowrds = json_decode ( $value ['dir_params'] );
+				$add_array = $deviceinfo->result_array();
+				foreach ($add_array as $key => $value) {
+					$vars = json_decode($value ['dir_vars']);
+					$vars_new = json_decode($value ['dir_params'], true);
+					$passowrds = json_decode($value ['dir_params']);
 					/*
 					 * ASTPP 3.0
 					 * add two filed show on gried
 					 */
-					$query [] = array (
+					$query [] = array(
 							'id' => $value ['id'],
 							'username' => $value ['username'],
 							'accountid' => $value ['accountid'],
@@ -313,7 +313,7 @@ 
 				}
 			}
 		} else {
-			$query = $this->db_model->countQuery ( "*", 'sip_devices', $where );
+			$query = $this->db_model->countQuery("*", 'sip_devices', $where);
 		}
 		return $query;
 	}
@@ -321,45 +321,45 @@ 
 	 * *******************
 	 */
 	function get_gateway_list($flag, $start = 0, $limit = 0) {
-		$this->db_model->build_search ( 'fsgateway_list_search' );
+		$this->db_model->build_search('fsgateway_list_search');
 		if ($flag) {
-			$query = $this->db_model->select ( "*", "gateways", "", "id", "desc", $limit, $start );
+			$query = $this->db_model->select("*", "gateways", "", "id", "desc", $limit, $start);
 		} else {
-			$query = $this->db_model->countQuery ( "*", "gateways", "" );
+			$query = $this->db_model->countQuery("*", "gateways", "");
 		}
 		return $query;
 	}
 	function get_sipprofile_list($flag, $start = 0, $limit = 0) {
-		$this->db_model->build_search ( 'fssipprofile_list_search' );
+		$this->db_model->build_search('fssipprofile_list_search');
 		if ($flag) {
-			$query = $this->db_model->select ( "*", "sip_profiles", "", "id", "desc", $limit, $start );
+			$query = $this->db_model->select("*", "sip_profiles", "", "id", "desc", $limit, $start);
 		} else {
-			$query = $this->db_model->countQuery ( "*", "sip_profiles", "" );
+			$query = $this->db_model->countQuery("*", "sip_profiles", "");
 		}
 		return $query;
 	}
 	function profile_authentication($profile_data) {
 		if ($profile_data ['id'] != '') {
-			$where = array (
+			$where = array(
 					'id <>' => $profile_data ["id"],
 					'sip_ip' => $profile_data ["sip_ip"],
 					"sip_port" => $profile_data ["sip_port"] 
 			);
 		} else {
-			$where = array (
+			$where = array(
 					'sip_ip' => $profile_data ["sip_ip"],
 					"sip_port" => $profile_data ["sip_port"] 
 			);
 		}
-		$query = $this->db_model->getSelect ( "*", "sip_profiles", $where );
+		$query = $this->db_model->getSelect("*", "sip_profiles", $where);
 		return $query;
 	}
 	function get_fsserver_list($flag, $start = 0, $limit = 0) {
-		$this->db_model->build_search ( 'fsserver_list_search' );
+		$this->db_model->build_search('fsserver_list_search');
 		if ($flag) {
-			$query = $this->db_model->select ( "*", "freeswich_servers", "", "id", "desc", $limit, $start );
+			$query = $this->db_model->select("*", "freeswich_servers", "", "id", "desc", $limit, $start);
 		} else {
-			$query = $this->db_model->countQuery ( "*", "freeswich_servers", "" );
+			$query = $this->db_model->countQuery("*", "freeswich_servers", "");
 		}
 		return $query;
 	}
@@ -367,58 +367,58 @@ 
 		/*
 		 * ASTPP 3.0 ADD creation date
 		 */
-		$data ['creation_date'] = gmdate ( 'Y-m-d H:i:s' );
+		$data ['creation_date'] = gmdate('Y-m-d H:i:s');
 		/**
 		 * ********************************
 		 */
-		unset ( $data ['action'] );
-		$this->db->insert ( 'freeswich_servers', $data );
+		unset ($data ['action']);
+		$this->db->insert('freeswich_servers', $data);
 		return true;
 	}
 	function edit_fsserver($data, $id) {
-		unset ( $data ['action'] );
+		unset ($data ['action']);
 		/*
 		 * ASTPP 3.0 edit modified date add
 		 */
-		$data ['last_modified_date'] = gmdate ( 'Y-m-d H:i:s' );
+		$data ['last_modified_date'] = gmdate('Y-m-d H:i:s');
 		/**
 		 * ********************************************
 		 */
-		$this->db->where ( 'id', $id );
-		$this->db->update ( 'freeswich_servers', $data );
+		$this->db->where('id', $id);
+		$this->db->update('freeswich_servers', $data);
 		return true;
 	}
 	function fsserver_delete($id) {
-		$this->db->where ( 'id', $id );
-		$this->db->delete ( 'freeswich_servers' );
+		$this->db->where('id', $id);
+		$this->db->delete('freeswich_servers');
 		return true;
 	}
 	function reload_freeswitch($command, $server_host = "") {
 		$response = '';
-		$query = $this->db_model->getSelect ( "*", "freeswich_servers", "" );
-		$fs_data = $query->result_array ();
-		foreach ( $fs_data as $fs_key => $fs_value ) {
-			$fp = $this->freeswitch_lib->event_socket_create ( $fs_value ["freeswitch_host"], $fs_value ["freeswitch_port"], $fs_value ["freeswitch_password"] );
+		$query = $this->db_model->getSelect("*", "freeswich_servers", "");
+		$fs_data = $query->result_array();
+		foreach ($fs_data as $fs_key => $fs_value) {
+			$fp = $this->freeswitch_lib->event_socket_create($fs_value ["freeswitch_host"], $fs_value ["freeswitch_port"], $fs_value ["freeswitch_password"]);
 			if ($fp) {
-				$response .= $this->freeswitch_lib->event_socket_request ( $fp, $command );
-				fclose ( $fp );
+				$response .= $this->freeswitch_lib->event_socket_request($fp, $command);
+				fclose($fp);
 			}
 		}
 		return $response;
 	}
 	function reload_live_freeswitch($command) {
 		$response = '';
-		$query = $this->db_model->getSelect ( "*", "freeswich_servers", "" );
-		$fs_data = $query->result_array ();
+		$query = $this->db_model->getSelect("*", "freeswich_servers", "");
+		$fs_data = $query->result_array();
 		
-		foreach ( $fs_data as $fs_key => $fs_value ) {
-			$fp = $this->freeswitch_lib->event_socket_create ( $fs_value ["freeswitch_host"], $fs_value ["freeswitch_port"], $fs_value ["freeswitch_password"] );
+		foreach ($fs_data as $fs_key => $fs_value) {
+			$fp = $this->freeswitch_lib->event_socket_create($fs_value ["freeswitch_host"], $fs_value ["freeswitch_port"], $fs_value ["freeswitch_password"]);
 			if ($fp) {
-				$response .= $this->freeswitch_lib->event_socket_request ( $fp, $command );
-				fclose ( $fp );
+				$response .= $this->freeswitch_lib->event_socket_request($fp, $command);
+				fclose($fp);
 			}
 		}
-		$response = str_replace ( "0 total.", "", $response );
+		$response = str_replace("0 total.", "", $response);
 		return $response;
 	}
 }

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

Spacing +523 added lines, -523 removed lines

@@ -23,240 +23,240 @@ 
 // ##############################################################################
 class Freeswitch extends MX_Controller {
 	function Freeswitch() {
-		parent::__construct ();
+		parent::__construct();
 		
-		$this->load->helper ( 'template_inheritance' );
+		$this->load->helper('template_inheritance');
 		
-		$this->load->library ( 'session' );
-		$this->load->library ( "freeswitch_form" );
-		$this->load->library ( 'astpp/form' );
-		$this->load->library ( 'freeswitch_lib' );
-		$this->load->model ( 'freeswitch_model' );
+		$this->load->library('session');
+		$this->load->library("freeswitch_form");
+		$this->load->library('astpp/form');
+		$this->load->library('freeswitch_lib');
+		$this->load->model('freeswitch_model');
 		
-		if ($this->session->userdata ( 'user_login' ) == FALSE)
-			redirect ( base_url () . '/astpp/login' );
+		if ($this->session->userdata('user_login') == FALSE)
+			redirect(base_url().'/astpp/login');
 	}
 	function fssipdevices_add($type = "") {
-		$data ['username'] = $this->session->userdata ( 'user_name' );
-		$account_data = $this->session->userdata ( "accountinfo" );
+		$data ['username'] = $this->session->userdata('user_name');
+		$account_data = $this->session->userdata("accountinfo");
 		$data ['flag'] = 'create';
-		$data ['page_title'] = gettext ( 'Create SIP Device' );
+		$data ['page_title'] = gettext('Create SIP Device');
 		if ($account_data ['type'] == '-1' || $account_data ['type'] == '1') {
-			$data ['form'] = $this->form->build_form ( $this->freeswitch_form->fsdevice_form_fields_for_customer ( $type ), '' );
-			$this->load->view ( 'view_freeswitch_add_edit', $data );
+			$data ['form'] = $this->form->build_form($this->freeswitch_form->fsdevice_form_fields_for_customer($type), '');
+			$this->load->view('view_freeswitch_add_edit', $data);
 		} else {
-			$data ['form'] = $this->form->build_form ( $this->freeswitch_form->get_freeswith_form_fields (), '' );
-			$this->load->view ( 'view_freeswitch_customer_add_edit', $data );
+			$data ['form'] = $this->form->build_form($this->freeswitch_form->get_freeswith_form_fields(), '');
+			$this->load->view('view_freeswitch_customer_add_edit', $data);
 		}
 	}
 	function customer_fssipdevices_add($accountid) {
-		$data ['username'] = $this->session->userdata ( 'user_name' );
-		$account_data = $this->session->userdata ( "accountinfo" );
-		$data ['page_title'] = gettext ( 'Create SIP Device' );
-		$data ['form'] = $this->form->build_form ( $this->freeswitch_form->fsdevice_form_fields_for_customer ( $accountid ), "" );
+		$data ['username'] = $this->session->userdata('user_name');
+		$account_data = $this->session->userdata("accountinfo");
+		$data ['page_title'] = gettext('Create SIP Device');
+		$data ['form'] = $this->form->build_form($this->freeswitch_form->fsdevice_form_fields_for_customer($accountid), "");
 		if ($account_data ['type'] == '-1' || $account_data ['type'] == '1') {
-			$this->load->view ( 'view_freeswitch_add_edit', $data );
+			$this->load->view('view_freeswitch_add_edit', $data);
 		} else {
-			$this->load->view ( 'view_freeswitch_customer_add_edit', $data );
+			$this->load->view('view_freeswitch_customer_add_edit', $data);
 		}
 	}
 	function fssipdevices_edit($edit_id = '') {
-		$data ['page_title'] = gettext ( 'Edit SIP Device' );
-		$account_data = $this->session->userdata ( "accountinfo" );
-		$where = array (
+		$data ['page_title'] = gettext('Edit SIP Device');
+		$account_data = $this->session->userdata("accountinfo");
+		$where = array(
 				'id' => $edit_id 
 		);
-		$account = $this->freeswitch_model->get_edited_data ( $edit_id );
+		$account = $this->freeswitch_model->get_edited_data($edit_id);
 		if ($account_data ['type'] == '-1') {
-			$data ['form'] = $this->form->build_form ( $this->freeswitch_form->get_freeswith_form_fields ( $edit_id ), $account );
-			$this->load->view ( 'view_freeswitch_add_edit', $data );
+			$data ['form'] = $this->form->build_form($this->freeswitch_form->get_freeswith_form_fields($edit_id), $account);
+			$this->load->view('view_freeswitch_add_edit', $data);
 		} else {
-			$data ['form'] = $this->form->build_form ( $this->freeswitch_form->get_freeswith_form_fields ( $edit_id ), $account );
-			$this->load->view ( 'view_freeswitch_customer_add_edit', $data );
+			$data ['form'] = $this->form->build_form($this->freeswitch_form->get_freeswith_form_fields($edit_id), $account);
+			$this->load->view('view_freeswitch_customer_add_edit', $data);
 		}
 	}
 	function customer_fssipdevices_edit($edit_id, $accountid) {
-		$data ['username'] = $this->session->userdata ( 'user_name' );
-		$account_data = $this->session->userdata ( "accountinfo" );
-		$data ['page_title'] = gettext ( 'Edit SIP device' );
-		$where = array (
+		$data ['username'] = $this->session->userdata('user_name');
+		$account_data = $this->session->userdata("accountinfo");
+		$data ['page_title'] = gettext('Edit SIP device');
+		$where = array(
 				'id' => $edit_id 
 		);
-		$account = $this->freeswitch_model->get_edited_data ( $edit_id );
+		$account = $this->freeswitch_model->get_edited_data($edit_id);
 		if ($account_data ['type'] == '-1' || $account_data ['type'] == '1') {
-			$data ['form'] = $this->form->build_form ( $this->freeswitch_form->fsdevice_form_fields_for_customer ( $accountid, $edit_id ), $account );
-			$this->load->view ( 'view_freeswitch_add_edit', $data );
+			$data ['form'] = $this->form->build_form($this->freeswitch_form->fsdevice_form_fields_for_customer($accountid, $edit_id), $account);
+			$this->load->view('view_freeswitch_add_edit', $data);
 		} else {
 			
-			$data ['form'] = $this->form->build_form ( $this->freeswitch_form->fsdevice_form_fields_for_customer ( $accountid, $edit_id ), $account );
-			$this->load->view ( 'view_freeswitch_customer_add_edit', $data );
+			$data ['form'] = $this->form->build_form($this->freeswitch_form->fsdevice_form_fields_for_customer($accountid, $edit_id), $account);
+			$this->load->view('view_freeswitch_customer_add_edit', $data);
 		}
 	}
 	function fsgateway_search() {
-		$ajax_search = $this->input->post ( 'ajax_search', 0 );
+		$ajax_search = $this->input->post('ajax_search', 0);
 		
-		if ($this->input->post ( 'advance_search', TRUE ) == 1) {
-			$this->session->set_userdata ( 'advance_search', $this->input->post ( 'advance_search' ) );
-			$action = $this->input->post ();
-			unset ( $action ['action'] );
-			unset ( $action ['advance_search'] );
-			$this->session->set_userdata ( 'fsgateway_list_search', $action );
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset ($action ['action']);
+			unset ($action ['advance_search']);
+			$this->session->set_userdata('fsgateway_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect ( base_url () . 'freeswitch/fsgateway/' );
+			redirect(base_url().'freeswitch/fsgateway/');
 		}
 	}
 	function fssipprofile_search() {
-		$ajax_search = $this->input->post ( 'ajax_search', 0 );
+		$ajax_search = $this->input->post('ajax_search', 0);
 		
-		if ($this->input->post ( 'advance_search', TRUE ) == 1) {
-			$this->session->set_userdata ( 'advance_search', $this->input->post ( 'advance_search' ) );
-			$action = $this->input->post ();
-			unset ( $action ['action'] );
-			unset ( $action ['advance_search'] );
-			$this->session->set_userdata ( 'fssipprofile_list_search', $action );
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset ($action ['action']);
+			unset ($action ['advance_search']);
+			$this->session->set_userdata('fssipprofile_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect ( base_url () . 'freeswitch/fssipprofile/' );
+			redirect(base_url().'freeswitch/fssipprofile/');
 		}
 	}
 	function fssipdevices_clearsearchfilter() {
-		$this->session->set_userdata ( 'advance_search', 0 );
-		$this->session->set_userdata ( 'account_search', "" );
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('account_search', "");
 	}
 	function fsgateway_clearsearchfilter() {
-		$this->session->set_userdata ( 'advance_search', 0 );
-		$this->session->set_userdata ( 'account_search', "" );
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('account_search', "");
 	}
 	function fssipprofile_clearsearchfilter() {
-		$this->session->set_userdata ( 'advance_search', 0 );
-		$this->session->set_userdata ( 'account_search', "" );
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('account_search', "");
 	}
 	function fssipdevices_save($user_flg = false) {
-		$add_array = $this->input->post ();
-		if (! $user_flg) {
-			$data ['form'] = $this->form->build_form ( $this->freeswitch_form->get_freeswith_form_fields ( $add_array ['id'] ), $add_array );
+		$add_array = $this->input->post();
+		if ( ! $user_flg) {
+			$data ['form'] = $this->form->build_form($this->freeswitch_form->get_freeswith_form_fields($add_array ['id']), $add_array);
 		} else {
-			$data ['form'] = $this->form->build_form ( $this->freeswitch_form->fsdevice_form_fields_for_customer ( $add_array ["accountcode"], $add_array ['id'] ), $add_array );
+			$data ['form'] = $this->form->build_form($this->freeswitch_form->fsdevice_form_fields_for_customer($add_array ["accountcode"], $add_array ['id']), $add_array);
 		}
 		if ($add_array ['id'] != '') {
-			$data ['page_title'] = gettext ( 'Freeswitch SIP Devices' );
-			if ($this->form_validation->run () == FALSE) {
-				$data ['validation_errors'] = validation_errors ();
+			$data ['page_title'] = gettext('Freeswitch SIP Devices');
+			if ($this->form_validation->run() == FALSE) {
+				$data ['validation_errors'] = validation_errors();
 				echo $data ['validation_errors'];
 				exit ();
 			} else {
-				$this->freeswitch_model->edit_freeswith ( $add_array, $add_array ['id'] );
-				echo json_encode ( array (
+				$this->freeswitch_model->edit_freeswith($add_array, $add_array ['id']);
+				echo json_encode(array(
 						"SUCCESS" => "SIP Device Updated Successfully!" 
-				) );
+				));
 				exit ();
 			}
 		} else {
-			$data ['page_title'] = gettext ( 'Create Freeswitch SIP Devices' );
-			if ($this->form_validation->run () == FALSE) {
-				$data ['validation_errors'] = validation_errors ();
+			$data ['page_title'] = gettext('Create Freeswitch SIP Devices');
+			if ($this->form_validation->run() == FALSE) {
+				$data ['validation_errors'] = validation_errors();
 				echo $data ['validation_errors'];
 				exit ();
 			} else {
-				$this->freeswitch_model->add_freeswith ( $add_array );
-				echo json_encode ( array (
+				$this->freeswitch_model->add_freeswith($add_array);
+				echo json_encode(array(
 						"SUCCESS" => "SIP Device Added Successfully!" 
-				) );
+				));
 				exit ();
 			}
 		}
 	}
 	function customer_fssipdevices_save($user_flg = false) {
-		$add_array = $this->input->post ();
-		if (! $user_flg) {
-			$data ['form'] = $this->form->build_form ( $this->freeswitch_form->get_freeswith_form_fields (), $add_array );
+		$add_array = $this->input->post();
+		if ( ! $user_flg) {
+			$data ['form'] = $this->form->build_form($this->freeswitch_form->get_freeswith_form_fields(), $add_array);
 		} else {
-			$data ['form'] = $this->form->build_form ( $this->freeswitch_form->fsdevice_form_fields_for_customer ( $add_array ["accountcode"], $add_array ['id'] ), $add_array );
+			$data ['form'] = $this->form->build_form($this->freeswitch_form->fsdevice_form_fields_for_customer($add_array ["accountcode"], $add_array ['id']), $add_array);
 		}
 		if ($add_array ['id'] != '') {
-			$data ['page_title'] = gettext ( 'Edit Freeswitch SIP Devices' );
-			if ($this->form_validation->run () == FALSE) {
-				$data ['validation_errors'] = validation_errors ();
+			$data ['page_title'] = gettext('Edit Freeswitch SIP Devices');
+			if ($this->form_validation->run() == FALSE) {
+				$data ['validation_errors'] = validation_errors();
 				echo $data ['validation_errors'];
 				exit ();
 			} else {
-				$this->freeswitch_model->edit_freeswith ( $add_array, $add_array ['id'] );
-				echo json_encode ( array (
+				$this->freeswitch_model->edit_freeswith($add_array, $add_array ['id']);
+				echo json_encode(array(
 						"SUCCESS" => "SIP Device Updated Successfully!" 
-				) );
+				));
 				exit ();
 			}
 		} else {
-			$data ['page_title'] = gettext ( 'Create Freeswitch SIP Devices' );
-			if ($this->form_validation->run () == FALSE) {
-				$data ['validation_errors'] = validation_errors ();
+			$data ['page_title'] = gettext('Create Freeswitch SIP Devices');
+			if ($this->form_validation->run() == FALSE) {
+				$data ['validation_errors'] = validation_errors();
 				echo $data ['validation_errors'];
 				exit ();
 			} else {
-				$this->freeswitch_model->add_freeswith ( $add_array );
-				echo json_encode ( array (
+				$this->freeswitch_model->add_freeswith($add_array);
+				echo json_encode(array(
 						"SUCCESS" => "SIP Device Added Successfully!" 
-				) );
+				));
 				exit ();
 			}
 		}
 	}
 	function user_fssipdevices_save($user_flg = false) {
-		$add_array = $this->input->post ();
-		$data ['form'] = $this->form->build_form ( $this->freeswitch_form->fsdevice_form_fields_for_customer ( $add_array ["accountcode"], $add_array ['id'] ), $add_array );
+		$add_array = $this->input->post();
+		$data ['form'] = $this->form->build_form($this->freeswitch_form->fsdevice_form_fields_for_customer($add_array ["accountcode"], $add_array ['id']), $add_array);
 		if ($add_array ['id'] != '') {
-			$data ['page_title'] = gettext ( 'Edit Freeswitch SIP Devices' );
-			if ($this->form_validation->run () == FALSE) {
-				$data ['validation_errors'] = validation_errors ();
+			$data ['page_title'] = gettext('Edit Freeswitch SIP Devices');
+			if ($this->form_validation->run() == FALSE) {
+				$data ['validation_errors'] = validation_errors();
 				echo $data ['validation_errors'];
 				exit ();
 			} else {
-				$this->freeswitch_model->edit_freeswith ( $add_array, $add_array ['id'] );
-				echo json_encode ( array (
+				$this->freeswitch_model->edit_freeswith($add_array, $add_array ['id']);
+				echo json_encode(array(
 						"SUCCESS" => "SIP Device Updated Successfully!" 
-				) );
+				));
 				exit ();
 			}
 		} else {
-			$data ['page_title'] = gettext ( 'Create Freeswitch SIP Devices' );
-			if ($this->form_validation->run () == FALSE) {
-				$data ['validation_errors'] = validation_errors ();
+			$data ['page_title'] = gettext('Create Freeswitch SIP Devices');
+			if ($this->form_validation->run() == FALSE) {
+				$data ['validation_errors'] = validation_errors();
 				echo $data ['validation_errors'];
 				exit ();
 			} else {
-				$sip_profile_id = $this->common->get_field_name ( 'id', 'sip_profiles', array (
+				$sip_profile_id = $this->common->get_field_name('id', 'sip_profiles', array(
 						'name' => 'default' 
-				) );
-				$this->freeswitch_model->add_freeswith ( $add_array );
-				echo json_encode ( array (
+				));
+				$this->freeswitch_model->add_freeswith($add_array);
+				echo json_encode(array(
 						"SUCCESS" => "SIP Device Added Successfully!" 
-				) );
+				));
 				exit ();
 			}
 		}
 	}
 	function fssipdevices_search() {
-		$ajax_search = $this->input->post ( 'ajax_search', 0 );
-		if ($this->input->post ( 'advance_search', TRUE ) == 1) {
-			$this->session->set_userdata ( 'advance_search', $this->input->post ( 'advance_search' ) );
-			$action = $this->input->post ();
-			unset ( $action ['action'] );
-			unset ( $action ['advance_search'] );
-			$this->session->set_userdata ( 'fssipdevices_list_search', $action );
+		$ajax_search = $this->input->post('ajax_search', 0);
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset ($action ['action']);
+			unset ($action ['advance_search']);
+			$this->session->set_userdata('fssipdevices_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect ( base_url () . 'freeswitch/fssipdevices/' );
+			redirect(base_url().'freeswitch/fssipdevices/');
 		}
 	}
 	function fssipdevices() {
-		$data ['page_title'] = gettext ( 'SIP Devices' );
+		$data ['page_title'] = gettext('SIP Devices');
 		$data ['search_flag'] = true;
-		$this->session->set_userdata ( 'advance_search', 0 );
-		$data ['grid_fields'] = $this->freeswitch_form->build_system_list_for_admin ();
-		$data ["grid_buttons"] = $this->freeswitch_form->build_grid_buttons ();
-		$data ['form_search'] = $this->form->build_serach_form ( $this->freeswitch_form->get_sipdevice_search_form () );
-		$this->load->view ( 'view_freeswitch_sip_devices_list', $data );
+		$this->session->set_userdata('advance_search', 0);
+		$data ['grid_fields'] = $this->freeswitch_form->build_system_list_for_admin();
+		$data ["grid_buttons"] = $this->freeswitch_form->build_grid_buttons();
+		$data ['form_search'] = $this->form->build_serach_form($this->freeswitch_form->get_sipdevice_search_form());
+		$this->load->view('view_freeswitch_sip_devices_list', $data);
 	}
 	
 	/**
@@ -266,63 +266,63 @@ 
 	 * *****
 	 */
 	function fssipdevices_json() {
-		$json_data = array ();
-		$count_all = $this->freeswitch_model->fs_retrieve_sip_user ( false );
-		$paging_data = $this->form->load_grid_config ( $count_all, $_GET ['rp'], $_GET ['page'] );
+		$json_data = array();
+		$count_all = $this->freeswitch_model->fs_retrieve_sip_user(false);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET ['rp'], $_GET ['page']);
 		$json_data = $paging_data ["json_paging"];
-		$query = $this->freeswitch_model->fs_retrieve_sip_user ( true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"] );
-		foreach ( $query as $key => $value ) {
-			$path_true = base_url () . '/assets/images/true.png';
-			$path_false = base_url () . '/assets/images/false.png';
+		$query = $this->freeswitch_model->fs_retrieve_sip_user(true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"]);
+		foreach ($query as $key => $value) {
+			$path_true = base_url().'/assets/images/true.png';
+			$path_false = base_url().'/assets/images/false.png';
 			if ($value ['voicemail_enabled'] == 'true') {
-				$voicemail_enabled = '<img src=' . $path_true . ' style="height:20px;width:20px;" title="Enable">';
+				$voicemail_enabled = '<img src='.$path_true.' style="height:20px;width:20px;" title="Enable">';
 			} else {
-				$voicemail_enabled = '<img src=' . $path_false . ' style="height:20px;width:20px;" title="Disable">';
+				$voicemail_enabled = '<img src='.$path_false.' style="height:20px;width:20px;" title="Disable">';
 			}
-			$json_data ['rows'] [] = array (
-					'cell' => array (
-							'<input type="checkbox" name="chkAll" id=' . $value ['id'] . ' class="ace chkRefNos" onclick="clickchkbox(' . $value ['id'] . ')" value=' . $value ['id'] . '><lable class="lbl"></lable>',
-							"<a href='/freeswitch/fssipdevices_edit/" . $value ['id'] . "' style='cursor:pointer;color:#005298;' rel='facebox_medium' title='username'>" . $value ['username'] . "</a>",
+			$json_data ['rows'] [] = array(
+					'cell' => array(
+							'<input type="checkbox" name="chkAll" id='.$value ['id'].' class="ace chkRefNos" onclick="clickchkbox('.$value ['id'].')" value='.$value ['id'].'><lable class="lbl"></lable>',
+							"<a href='/freeswitch/fssipdevices_edit/".$value ['id']."' style='cursor:pointer;color:#005298;' rel='facebox_medium' title='username'>".$value ['username']."</a>",
 							/**
 							 * ***********************
 							 */
 							$value ['password'],
-							$this->common->get_field_name ( 'name', '`sip_profiles', array (
+							$this->common->get_field_name('name', '`sip_profiles', array(
 									'id' => $value ['sip_profile_id'] 
-							) ),
-							$this->common->get_field_name_coma_new ( 'first_name,last_name,number', 'accounts', array (
+							)),
+							$this->common->get_field_name_coma_new('first_name,last_name,number', 'accounts', array(
 									'0' => $value ['accountid'] 
-							) ),
+							)),
 							$value ['effective_caller_id_name'],
 							$value ['effective_caller_id_number'],
 							$voicemail_enabled,
-							$this->common->get_status ( 'status', 'sip_devices', $value ),
-							$this->common->convert_GMT_to ( '', '', $value ['creation_date'] ),
-							$this->common->convert_GMT_to ( '', '', $value ['last_modified_date'] ),
-							$this->get_action_buttons_fssipdevices ( $value ['id'] ) 
+							$this->common->get_status('status', 'sip_devices', $value),
+							$this->common->convert_GMT_to('', '', $value ['creation_date']),
+							$this->common->convert_GMT_to('', '', $value ['last_modified_date']),
+							$this->get_action_buttons_fssipdevices($value ['id']) 
 					) 
 			);
 		}
-		echo json_encode ( $json_data );
+		echo json_encode($json_data);
 	}
 	function fssipdevices_delete_multiple() {
-		$ids = $this->input->post ( "selected_ids", true );
+		$ids = $this->input->post("selected_ids", true);
 		$where = "id IN ($ids)";
-		$this->db->where ( $where );
-		echo $this->db->delete ( "sip_devices" );
+		$this->db->where($where);
+		echo $this->db->delete("sip_devices");
 	}
 	function user_fssipdevices_delete_multiple() {
-		$ids = $this->input->post ( "selected_ids", true );
+		$ids = $this->input->post("selected_ids", true);
 		$where = "id IN ($ids)";
-		$this->db->where ( $where );
-		$this->db->delete ( "sip_devices" );
+		$this->db->where($where);
+		$this->db->delete("sip_devices");
 		echo TRUE;
 	}
 	function customer_fssipdevices_delete_multiple() {
-		$ids = $this->input->post ( "selected_ids", true );
+		$ids = $this->input->post("selected_ids", true);
 		$where = "id IN ($ids)";
-		$this->db->where ( $where );
-		$this->db->delete ( "sip_devices" );
+		$this->db->where($where);
+		$this->db->delete("sip_devices");
 		echo TRUE;
 	}
 	
@@ -333,112 +333,112 @@ 
 	 * *****
 	 */
 	function customer_fssipdevices_json($accountid, $entity_type = '') {
-		$json_data = array ();
-		$count_all = $this->freeswitch_model->get_sipdevices_list ( false, $accountid, $entity_type );
-		$paging_data = $this->form->load_grid_config ( $count_all, $_GET ['rp'], $_GET ['page'] );
+		$json_data = array();
+		$count_all = $this->freeswitch_model->get_sipdevices_list(false, $accountid, $entity_type);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET ['rp'], $_GET ['page']);
 		$json_data = $paging_data ["json_paging"];
-		$devices_result = array ();
-		$query = $this->freeswitch_model->get_sipdevices_list ( true, $accountid, $entity_type, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"] );
-		foreach ( $query as $key => $value ) {
-			$path_true = base_url () . '/assets/images/true.png';
-			$path_false = base_url () . '/assets/images/false.png';
-			$voicemail_enabled = $value ['voicemail_enabled'] == 'true' ? '<img src=' . $path_true . ' style="height:20px;width:20px;" title="Enable">' : '<img src=' . $path_false . ' style="height:20px;width:20px;" title="Disable">';
-			$json_data ['rows'] [] = array (
-					'cell' => array (
-							'<input type="checkbox" name="chkAll" id="' . $value ['id'] . '" class="ace chkRefNos" onclick="clickchkbox(' . $value ['id'] . ')" value=' . $value ['id'] . '><lable class="lbl"></lable>',
+		$devices_result = array();
+		$query = $this->freeswitch_model->get_sipdevices_list(true, $accountid, $entity_type, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"]);
+		foreach ($query as $key => $value) {
+			$path_true = base_url().'/assets/images/true.png';
+			$path_false = base_url().'/assets/images/false.png';
+			$voicemail_enabled = $value ['voicemail_enabled'] == 'true' ? '<img src='.$path_true.' style="height:20px;width:20px;" title="Enable">' : '<img src='.$path_false.' style="height:20px;width:20px;" title="Disable">';
+			$json_data ['rows'] [] = array(
+					'cell' => array(
+							'<input type="checkbox" name="chkAll" id="'.$value ['id'].'" class="ace chkRefNos" onclick="clickchkbox('.$value ['id'].')" value='.$value ['id'].'><lable class="lbl"></lable>',
 							$value ['username'],
 							$value ['password'],
-							$this->common->get_field_name ( 'name', '`sip_profiles', array (
+							$this->common->get_field_name('name', '`sip_profiles', array(
 									'id' => $value ['sip_profile_id'] 
-							) ),
+							)),
 							$value ['effective_caller_id_name'],
 							$value ['effective_caller_id_number'],
 							$voicemail_enabled,
-							$this->common->get_status ( 'status', 'sip_devices', $value ),
-							$this->common->convert_GMT_to ( '', '', $value ['creation_date'] ),
-							$this->common->convert_GMT_to ( '', '', $value ['last_modified_date'] ),
-							$this->get_action_fssipdevices_buttons ( $value ['id'], $value ['accountid'], $entity_type ) 
+							$this->common->get_status('status', 'sip_devices', $value),
+							$this->common->convert_GMT_to('', '', $value ['creation_date']),
+							$this->common->convert_GMT_to('', '', $value ['last_modified_date']),
+							$this->get_action_fssipdevices_buttons($value ['id'], $value ['accountid'], $entity_type) 
 					) 
 			);
 		} // exit;
-		echo json_encode ( $json_data );
+		echo json_encode($json_data);
 	}
 	/**
 	 * *************************
 	 */
 	function get_action_fssipdevices_buttons($id, $accountid, $entity_type = '') {
 		$ret_url = '';
-		if ($this->session->userdata ( "logintype" ) == '0' || $this->session->userdata ( "logintype" ) == '3') {
-			$ret_url = '<a href="' . base_url () . 'user/user_fssipdevices_action/edit/' . $id . '/' . $accountid . '/" class="btn btn-royelblue btn-sm"  rel="facebox_medium" title="Edit">&nbsp;<i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;';
-			$ret_url .= '<a href="' . base_url () . 'user/user_fssipdevices_action/delete/' . $id . '/' . $accountid . '/" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();">&nbsp;<i class="fa fa-trash fa-fw"></i></a>';
+		if ($this->session->userdata("logintype") == '0' || $this->session->userdata("logintype") == '3') {
+			$ret_url = '<a href="'.base_url().'user/user_fssipdevices_action/edit/'.$id.'/'.$accountid.'/" class="btn btn-royelblue btn-sm"  rel="facebox_medium" title="Edit">&nbsp;<i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;';
+			$ret_url .= '<a href="'.base_url().'user/user_fssipdevices_action/delete/'.$id.'/'.$accountid.'/" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();">&nbsp;<i class="fa fa-trash fa-fw"></i></a>';
 		} else {
-			$ret_url = '<a href="' . base_url () . 'accounts/' . $entity_type . '_fssipdevices_action/edit/' . $id . '/' . $accountid . '/" class="btn btn-royelblue btn-sm"  rel="facebox_medium" title="Edit">&nbsp;<i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;';
-			$ret_url .= '<a href="' . base_url () . 'accounts/' . $entity_type . '_fssipdevices_action/delete/' . $id . '/' . $accountid . '/" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();">&nbsp;<i class="fa fa-trash fa-fw"></i></a>';
+			$ret_url = '<a href="'.base_url().'accounts/'.$entity_type.'_fssipdevices_action/edit/'.$id.'/'.$accountid.'/" class="btn btn-royelblue btn-sm"  rel="facebox_medium" title="Edit">&nbsp;<i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;';
+			$ret_url .= '<a href="'.base_url().'accounts/'.$entity_type.'_fssipdevices_action/delete/'.$id.'/'.$accountid.'/" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();">&nbsp;<i class="fa fa-trash fa-fw"></i></a>';
 		}
 		return $ret_url;
 	}
 	function fssipdevices_delete($id) {
-		$this->freeswitch_model->delete_freeswith_devices ( $id );
-		$this->session->set_flashdata ( 'astpp_notification', 'SIP Device Removed Successfully!' );
-		redirect ( base_url () . 'freeswitch/fssipdevices/' );
+		$this->freeswitch_model->delete_freeswith_devices($id);
+		$this->session->set_flashdata('astpp_notification', 'SIP Device Removed Successfully!');
+		redirect(base_url().'freeswitch/fssipdevices/');
 		exit ();
 	}
 	function get_action_buttons_fssipdevices($id) {
 		$ret_url = '';
-		$ret_url = '<a href="' . base_url () . 'freeswitch/fssipdevices_edit/' . $id . '/" class="btn btn-royelblue btn-sm"  rel="facebox_medium" title="Edit">&nbsp;<i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;';
-		$ret_url .= '<a href="' . base_url () . 'freeswitch/fssipdevices_delete/' . $id . '/" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();">&nbsp;<i class="fa fa-trash fa-fw"></i></a>';
+		$ret_url = '<a href="'.base_url().'freeswitch/fssipdevices_edit/'.$id.'/" class="btn btn-royelblue btn-sm"  rel="facebox_medium" title="Edit">&nbsp;<i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;';
+		$ret_url .= '<a href="'.base_url().'freeswitch/fssipdevices_delete/'.$id.'/" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();">&nbsp;<i class="fa fa-trash fa-fw"></i></a>';
 		return $ret_url;
 	}
 	function livecall_report() {
-		$data ['username'] = $this->session->userdata ( 'user_name' );
-		$data ['page_title'] = gettext ( 'Live Call Report' );
-		$this->load->view ( 'view_fs_livecall_report', $data );
+		$data ['username'] = $this->session->userdata('user_name');
+		$data ['page_title'] = gettext('Live Call Report');
+		$this->load->view('view_fs_livecall_report', $data);
 	}
 	function livecall_report_json() {
 		$command = "api show channels";
-		$response = $this->freeswitch_model->reload_live_freeswitch ( $command );
-		$calls = array ();
-		$calls_final = array ();
-		$data_header = array ();
+		$response = $this->freeswitch_model->reload_live_freeswitch($command);
+		$calls = array();
+		$calls_final = array();
+		$data_header = array();
 		$k = 0;
-		$data = explode ( "\n", $response );
-		for($i = 0; $i < count ( $data ) - 2; $i ++) {
-			if (trim ( $data [$i] ) != '') {
-				if (count ( $data_header ) == 0 || substr ( $data [$i], 0, 4 ) == "uuid") {
-					$data_header = explode ( ",", $data [$i] );
+		$data = explode("\n", $response);
+		for ($i = 0; $i < count($data) - 2; $i++) {
+			if (trim($data [$i]) != '') {
+				if (count($data_header) == 0 || substr($data [$i], 0, 4) == "uuid") {
+					$data_header = explode(",", $data [$i]);
 				} else {
-					$data_call = explode ( ",", $data [$i] );
-					for($j = 0; $j < count ( $data_call ); $j ++) {
+					$data_call = explode(",", $data [$i]);
+					for ($j = 0; $j < count($data_call); $j++) {
 						$calls [$k] [@$data_header [$j]] = @$data_call [$j];
 						$calls_final [@$calls [$k] ['uuid']] = @$calls [$k];
 					}
-					$k ++;
+					$k++;
 				}
 			}
 		}
-		$json_data = array ();
+		$json_data = array();
 		$count = 0;
-		foreach ( $calls as $key => $value ) {
-			if (isset ( $value ['state'] ) && ($value ['state'] == 'CS_EXCHANGE_MEDIA' || $value ['state'] == 'CS_CONSUME_MEDIA')) {
+		foreach ($calls as $key => $value) {
+			if (isset ($value ['state']) && ($value ['state'] == 'CS_EXCHANGE_MEDIA' || $value ['state'] == 'CS_CONSUME_MEDIA')) {
 				$calls [$i] ['application'] = @$calls_final [$value ['call_uuid']] ['application'];
 				$calls [$i] ['application_data'] = @$calls_final [$value ['call_uuid']] ['application_data'];
 				
 				$diff_value = 0;
 				if ($value ['callstate'] == 'ACTIVE') {
-					$cmd = "api uuid_dump " . $value ['uuid'] . "";
-					$fs_result = $this->freeswitch_model->reload_freeswitch ( $cmd );
-					$fs_array = explode ( "\n", $fs_result );
-					foreach ( $fs_array as $key => $sub_value ) {
-						$sub_fs_array = explode ( ':', $sub_value );
-						if (trim ( $sub_fs_array [0] ) == 'Caller-Channel-Answered-Time') {
+					$cmd = "api uuid_dump ".$value ['uuid']."";
+					$fs_result = $this->freeswitch_model->reload_freeswitch($cmd);
+					$fs_array = explode("\n", $fs_result);
+					foreach ($fs_array as $key => $sub_value) {
+						$sub_fs_array = explode(':', $sub_value);
+						if (trim($sub_fs_array [0]) == 'Caller-Channel-Answered-Time') {
 							$answer_min = $sub_fs_array [1];
-							$diff_value = substr ( $answer_min, 0, 11 ) - $value ['created_epoch'];
+							$diff_value = substr($answer_min, 0, 11) - $value ['created_epoch'];
 						}
 					}
 				}
-				$duration = ($value ['callstate'] == 'ACTIVE') ? date ( "H:i:s", strtotime ( date ( "Y-m-d H:i:s" ) ) - $value ['created_epoch'] - $diff_value ) : "00:00:00";
-				$json_data ['rows'] [] = array (
-						'cell' => array (
+				$duration = ($value ['callstate'] == 'ACTIVE') ? date ("H:i:s", strtotime(date("Y-m-d H:i:s")) - $value ['created_epoch'] - $diff_value) : "00:00:00";
+				$json_data ['rows'] [] = array(
+						'cell' => array(
 								$value ['created'],
 								$value ['cid_name'],
 								$value ['cid_num'],
@@ -451,73 +451,73 @@ 
 								$duration 
 						) 
 				);
-				$count ++;
+				$count++;
 			} else {
-				unset ( $calls [$i] );
+				unset ($calls [$i]);
 			}
 		}
 		$json_data ['page'] = 1;
 		$json_data ['total'] = $count;
-		echo json_encode ( $json_data );
+		echo json_encode($json_data);
 	}
 	function fsgateway() {
-		$data ['username'] = $this->session->userdata ( 'user_name' );
-		$data ['page_title'] = gettext ( 'Gateways' );
+		$data ['username'] = $this->session->userdata('user_name');
+		$data ['page_title'] = gettext('Gateways');
 		$data ['search_flag'] = true;
-		$this->session->set_userdata ( 'advance_search', 0 );
-		$data ['grid_fields'] = $this->freeswitch_form->build_fsgateway_list_for_admin ();
-		$data ["grid_buttons"] = $this->freeswitch_form->build_fdgateway_grid_buttons ();
-		$data ['form_search'] = $this->form->build_serach_form ( $this->freeswitch_form->get_gateway_search_form () );
-		$this->load->view ( 'view_fsgateway_list', $data );
+		$this->session->set_userdata('advance_search', 0);
+		$data ['grid_fields'] = $this->freeswitch_form->build_fsgateway_list_for_admin();
+		$data ["grid_buttons"] = $this->freeswitch_form->build_fdgateway_grid_buttons();
+		$data ['form_search'] = $this->form->build_serach_form($this->freeswitch_form->get_gateway_search_form());
+		$this->load->view('view_fsgateway_list', $data);
 	}
 	function fsgateway_json() {
-		$json_data = array ();
+		$json_data = array();
 		
-		$count_all = $this->freeswitch_model->get_gateway_list ( false );
+		$count_all = $this->freeswitch_model->get_gateway_list(false);
 		
-		$paging_data = $this->form->load_grid_config ( $count_all, $_GET ['rp'], $_GET ['page'] );
+		$paging_data = $this->form->load_grid_config($count_all, $_GET ['rp'], $_GET ['page']);
 		$json_data = $paging_data ["json_paging"];
-		$gateway_data = array ();
-		$query = $this->freeswitch_model->get_gateway_list ( true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"] );
-		$gateway_result = array ();
+		$gateway_data = array();
+		$query = $this->freeswitch_model->get_gateway_list(true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"]);
+		$gateway_result = array();
 		if ($query->num_rows > 0) {
-			$query = $query->result_array ();
-			foreach ( $query as $key => $query_value ) {
-				$gateway_data = array ();
+			$query = $query->result_array();
+			foreach ($query as $key => $query_value) {
+				$gateway_data = array();
 				$tmp = null;
-				foreach ( $query_value as $gateway_key => $gateway_val ) {
+				foreach ($query_value as $gateway_key => $gateway_val) {
 					if ($gateway_key != "gateway_data") {
 						$gateway_data [$gateway_key] = $gateway_val;
 					} else {
-						$tmp = ( array ) json_decode ( $gateway_val );
+						$tmp = (array)json_decode($gateway_val);
 					}
 				}
-				$gateway_result [$key] = array_merge ( $gateway_data, $tmp );
+				$gateway_result [$key] = array_merge($gateway_data, $tmp);
 			}
 		}
 		
-		$grid_fields = json_decode ( $this->freeswitch_form->build_fsgateway_list_for_admin () );
-		$json_data ['rows'] = $this->form->build_json_grid ( $gateway_result, $grid_fields );
-		echo json_encode ( $json_data );
+		$grid_fields = json_decode($this->freeswitch_form->build_fsgateway_list_for_admin());
+		$json_data ['rows'] = $this->form->build_json_grid($gateway_result, $grid_fields);
+		echo json_encode($json_data);
 	}
 	function fsgateway_add() {
-		$data ['username'] = $this->session->userdata ( 'user_name' );
+		$data ['username'] = $this->session->userdata('user_name');
 		$data ['flag'] = 'create';
-		$data ['page_title'] = gettext ( 'Create Gateway' );
-		$data ['form'] = $this->form->build_form ( $this->freeswitch_form->get_gateway_form_fields (), '' );
-		$this->load->view ( 'view_fsgateway_add', $data );
+		$data ['page_title'] = gettext('Create Gateway');
+		$data ['form'] = $this->form->build_form($this->freeswitch_form->get_gateway_form_fields(), '');
+		$this->load->view('view_fsgateway_add', $data);
 	}
 	function fsgateway_edit($edit_id = '') {
-		$data ['page_title'] = gettext ( 'Edit Gateway' );
-		$where = array (
+		$data ['page_title'] = gettext('Edit Gateway');
+		$where = array(
 				'id' => $edit_id 
 		);
-		$query = $this->db_model->getSelect ( "*", "gateways", $where );
-		$query = $query->result_array ();
-		$gateway_result = array ();
-		foreach ( $query as $key => $query_value ) {
-			foreach ( $query_value as $gateway_key => $gatewau_val ) {
-				$gateway_data ["status"] = isset ( $query_value ["status"] ) ? $query_value ["status"] : "";
+		$query = $this->db_model->getSelect("*", "gateways", $where);
+		$query = $query->result_array();
+		$gateway_result = array();
+		foreach ($query as $key => $query_value) {
+			foreach ($query_value as $gateway_key => $gatewau_val) {
+				$gateway_data ["status"] = isset ($query_value ["status"]) ? $query_value ["status"] : "";
 				if ($gateway_key != "gateway_data") {
 					$gateway_data [$gateway_key] = $gatewau_val;
 				} else if ($gateway_key == "status") {
@@ -532,8 +532,8 @@ 
 				 * *************************************************
 				 */
 				else {
-					$tmp = ( array ) json_decode ( $gatewau_val );
-					$gateway_result = array_merge ( $gateway_data, $tmp );
+					$tmp = (array)json_decode($gatewau_val);
+					$gateway_result = array_merge($gateway_data, $tmp);
 				}
 			}
 		}
@@ -541,7 +541,7 @@ 
 		 * ASTPP 3.0
 		 * put one variable with the name of dialplan variable
 		 */
-		if (! empty ( $gateway_data ['dialplan_variable'] ) && $gateway_data ['dialplan_variable'] != '') {
+		if ( ! empty ($gateway_data ['dialplan_variable']) && $gateway_data ['dialplan_variable'] != '') {
 			$gateway_result ['dialplan_variable'] = $gateway_data ['dialplan_variable'];
 		} else {
 			$gateway_result ['dialplan_variable'] = '';
@@ -549,16 +549,16 @@ 
 		/**
 		 * *******************************************************************************************
 		 */
-		$data ['form'] = $this->form->build_form ( $this->freeswitch_form->get_gateway_form_fields (), $gateway_result );
-		$this->load->view ( 'view_fsgateway_add', $data );
+		$data ['form'] = $this->form->build_form($this->freeswitch_form->get_gateway_form_fields(), $gateway_result);
+		$this->load->view('view_fsgateway_add', $data);
 	}
 	function fsgateway_save() {
-		$gateway_data = $this->input->post ();
-		$data ['form'] = $this->form->build_form ( $this->freeswitch_form->get_gateway_form_fields (), $gateway_data );
-		$insert_arr = array ();
-		$gateway_arr = array ();
+		$gateway_data = $this->input->post();
+		$data ['form'] = $this->form->build_form($this->freeswitch_form->get_gateway_form_fields(), $gateway_data);
+		$insert_arr = array();
+		$gateway_arr = array();
 		$insert_arr ['dialplan_variable'] = "";
-		foreach ( $gateway_data as $key => $gateway_value ) {
+		foreach ($gateway_data as $key => $gateway_value) {
 			if ($gateway_value != "") {
 				if ($key == "sip_profile_id") {
 					$insert_arr ['sip_profile_id'] = $gateway_data ["sip_profile_id"];
@@ -585,313 +585,313 @@ 
 			}
 		}
 		
-		$insert_arr ["gateway_data"] = json_encode ( $gateway_arr );
+		$insert_arr ["gateway_data"] = json_encode($gateway_arr);
 		
 		if ($gateway_data ['id'] != '') {
-			$data ['page_title'] = gettext ( 'Edit Gateway Details' );
-			if ($this->form_validation->run () == FALSE) {
-				$data ['validation_errors'] = validation_errors ();
+			$data ['page_title'] = gettext('Edit Gateway Details');
+			if ($this->form_validation->run() == FALSE) {
+				$data ['validation_errors'] = validation_errors();
 				echo $data ['validation_errors'];
 				exit ();
 			} else {
-				if (preg_match ( '/\s/', $insert_arr ['name'] )) {
-					echo json_encode ( array (
+				if (preg_match('/\s/', $insert_arr ['name'])) {
+					echo json_encode(array(
 							"name_error" => "Gateway name must not have any space." 
-					) );
+					));
 					exit ();
 				}
 				/*
 				 * ASTPP 3.0
 				 * gateway last modified date
 				 */
-				$insert_arr ['last_modified_date'] = gmdate ( 'Y-m-d H:i:s' );
-				$this->db->select ( 'name,sip_profile_id' );
-				$old_gateway_info = ( array ) $this->db->get_where ( 'gateways', array (
+				$insert_arr ['last_modified_date'] = gmdate('Y-m-d H:i:s');
+				$this->db->select('name,sip_profile_id');
+				$old_gateway_info = (array)$this->db->get_where('gateways', array(
 						'id' => $gateway_data ['id'] 
-				) )->first_row ();
+				))->first_row();
 				/**
 				 * **********************************************
 				 */
-				$update = $this->db->update ( "gateways", $insert_arr, array (
+				$update = $this->db->update("gateways", $insert_arr, array(
 						'id' => $gateway_data ['id'] 
-				) );
+				));
 				if ($update) {
-					$this->db->select ( 'name,sip_ip' );
-					$old_sip_profile_info = ( array ) $this->db->get_where ( 'sip_profiles', array (
+					$this->db->select('name,sip_ip');
+					$old_sip_profile_info = (array)$this->db->get_where('sip_profiles', array(
 							'id' => $old_gateway_info ['sip_profile_id'] 
-					) )->first_row ();
-					$sip_profile_info = ( array ) $this->db->get_where ( 'sip_profiles', array (
+					))->first_row();
+					$sip_profile_info = (array)$this->db->get_where('sip_profiles', array(
 							'id' => $old_gateway_info ['sip_profile_id'] 
-					) )->first_row ();
-					$cmd = "api sofia profile " . $old_sip_profile_info ['name'] . " killgw '" . $old_gateway_info ['name'] . "' ";
+					))->first_row();
+					$cmd = "api sofia profile ".$old_sip_profile_info ['name']." killgw '".$old_gateway_info ['name']."' ";
 					$sip_ip = $sip_profile_info ['id'];
-					$this->freeswitch_model->reload_freeswitch ( $cmd, $sip_ip );
-					$cmd2 = "api sofia profile " . $sip_profile_info ['name'] . " rescan reloadacl reloadxml";
-					$this->freeswitch_model->reload_freeswitch ( $cmd2, $sip_ip );
+					$this->freeswitch_model->reload_freeswitch($cmd, $sip_ip);
+					$cmd2 = "api sofia profile ".$sip_profile_info ['name']." rescan reloadacl reloadxml";
+					$this->freeswitch_model->reload_freeswitch($cmd2, $sip_ip);
 				}
-				echo json_encode ( array (
-						"SUCCESS" => $insert_arr ['name'] . " Gateway Updated Successfully!" 
-				) );
+				echo json_encode(array(
+						"SUCCESS" => $insert_arr ['name']." Gateway Updated Successfully!" 
+				));
 				exit ();
 			}
 		} else {
-			$data ['page_title'] = gettext ( 'Create Gateway Details' );
-			if ($this->form_validation->run () == FALSE) {
-				$data ['validation_errors'] = validation_errors ();
+			$data ['page_title'] = gettext('Create Gateway Details');
+			if ($this->form_validation->run() == FALSE) {
+				$data ['validation_errors'] = validation_errors();
 				echo $data ['validation_errors'];
 				exit ();
 			} else {
-				if (preg_match ( '/\s/', $insert_arr ['name'] )) {
-					echo json_encode ( array (
+				if (preg_match('/\s/', $insert_arr ['name'])) {
+					echo json_encode(array(
 							"name_error" => "Gateway name must not have any space." 
-					) );
+					));
 					exit ();
 				}
-				$insert_arr ['created_date'] = gmdate ( 'Y-m-d H:i:s' );
-				$insert = $this->db->insert ( "gateways", $insert_arr );
+				$insert_arr ['created_date'] = gmdate('Y-m-d H:i:s');
+				$insert = $this->db->insert("gateways", $insert_arr);
 				if ($insert) {
-					$profile_name = $this->common->get_field_name ( 'name', 'sip_profiles', $insert_arr ['sip_profile_id'] );
-					$sip_ip = $this->common->get_field_name ( 'sip_ip', 'sip_profiles', $insert_arr ['sip_profile_id'] );
-					$cmd = "api sofia profile " . $profile_name . " rescan reloadacl reloadxml";
-					$this->freeswitch_model->reload_freeswitch ( $cmd, $sip_ip );
+					$profile_name = $this->common->get_field_name('name', 'sip_profiles', $insert_arr ['sip_profile_id']);
+					$sip_ip = $this->common->get_field_name('sip_ip', 'sip_profiles', $insert_arr ['sip_profile_id']);
+					$cmd = "api sofia profile ".$profile_name." rescan reloadacl reloadxml";
+					$this->freeswitch_model->reload_freeswitch($cmd, $sip_ip);
 				}
-				echo json_encode ( array (
-						"SUCCESS" => $insert_arr ['name'] . " Gateway Added Successfully!" 
-				) );
+				echo json_encode(array(
+						"SUCCESS" => $insert_arr ['name']." Gateway Added Successfully!" 
+				));
 				exit ();
 			}
 		}
 	}
 	function fsgateway_delete($gateway_id) {
-		$this->db->select ( 'name,sip_profile_id' );
-		$gateway_info = ( array ) $this->db->get_where ( 'gateways', array (
+		$this->db->select('name,sip_profile_id');
+		$gateway_info = (array)$this->db->get_where('gateways', array(
 				'id' => $gateway_id 
-		) )->first_row ();
-		$this->db->select ( 'name,sip_ip' );
-		$profile_info = ( array ) $this->db->get_where ( 'sip_profiles', array (
+		))->first_row();
+		$this->db->select('name,sip_ip');
+		$profile_info = (array)$this->db->get_where('sip_profiles', array(
 				'id' => $gateway_info ['sip_profile_id'] 
-		) )->first_row ();
-		$cmd = "api sofia profile " . $profile_info ['name'] . " killgw " . $gateway_info ['name'] . " rescan reloadacl reloadxml";
-		$this->db_model->delete ( "gateways", array (
+		))->first_row();
+		$cmd = "api sofia profile ".$profile_info ['name']." killgw ".$gateway_info ['name']." rescan reloadacl reloadxml";
+		$this->db_model->delete("gateways", array(
 				"id" => $gateway_id 
-		) );
-		$this->freeswitch_model->reload_freeswitch ( $cmd, $sip_ip );
-		$this->session->set_flashdata ( 'astpp_notification', 'Gateway Removed Successfully!' );
-		redirect ( base_url () . 'freeswitch/fsgateway/' );
+		));
+		$this->freeswitch_model->reload_freeswitch($cmd, $sip_ip);
+		$this->session->set_flashdata('astpp_notification', 'Gateway Removed Successfully!');
+		redirect(base_url().'freeswitch/fsgateway/');
 	}
 	function fsgateway_delete_multiple() {
-		$ids = $this->input->post ( "selected_ids", true );
+		$ids = $this->input->post("selected_ids", true);
 		$where = "id IN ($ids)";
-		$this->db->where ( $where );
-		$this->db->select ( 'group_concat(sip_profile_id) as sip_profile_id' );
-		$this->db->from ( 'gateways' );
-		$sip_profile_ids = ( array ) $this->db->get ()->first_row ();
-		$sip_profile_where = "id IN (" . $sip_profile_ids ['sip_profile_id'] . ")";
-		$this->db->select ( 'id,name,sip_ip' );
-		$this->db->where ( $sip_profile_where );
-		$this->db->from ( 'sip_profiles' );
-		$result_array = $this->db->get ()->result_array ();
-		$sip_profile_arr = array ();
-		foreach ( $result_array as $key => $value ) {
-			$sip_profile_arr [$value ['id']] = array (
+		$this->db->where($where);
+		$this->db->select('group_concat(sip_profile_id) as sip_profile_id');
+		$this->db->from('gateways');
+		$sip_profile_ids = (array)$this->db->get()->first_row();
+		$sip_profile_where = "id IN (".$sip_profile_ids ['sip_profile_id'].")";
+		$this->db->select('id,name,sip_ip');
+		$this->db->where($sip_profile_where);
+		$this->db->from('sip_profiles');
+		$result_array = $this->db->get()->result_array();
+		$sip_profile_arr = array();
+		foreach ($result_array as $key => $value) {
+			$sip_profile_arr [$value ['id']] = array(
 					"name" => $value ['name'],
 					"sip_ip" => $value ['sip_ip'] 
 			);
 		}
-		$this->db->select ( 'id,name,sip_profile_id' );
-		$this->db->where ( $where );
-		$this->db->from ( 'gateways' );
-		$gateway_info = $this->db->get ()->result_array ();
-		foreach ( $gateway_info as $key => $value ) {
-			$cmd = "api sofia profile " . $sip_profile_arr [$value ['sip_profile_id']] ['name'] . " killgw " . $value ['name'] . " rescan reloadacl reloadxml";
-			$this->freeswitch_model->reload_freeswitch ( $cmd, $sip_profile_arr [$value ['sip_profile_id']] ['sip_ip'] );
+		$this->db->select('id,name,sip_profile_id');
+		$this->db->where($where);
+		$this->db->from('gateways');
+		$gateway_info = $this->db->get()->result_array();
+		foreach ($gateway_info as $key => $value) {
+			$cmd = "api sofia profile ".$sip_profile_arr [$value ['sip_profile_id']] ['name']." killgw ".$value ['name']." rescan reloadacl reloadxml";
+			$this->freeswitch_model->reload_freeswitch($cmd, $sip_profile_arr [$value ['sip_profile_id']] ['sip_ip']);
 		}
-		$this->db->where ( $where );
-		echo $this->db->delete ( "gateways" );
+		$this->db->where($where);
+		echo $this->db->delete("gateways");
 	}
 	function fssipprofile() {
-		$data ['username'] = $this->session->userdata ( 'user_name' );
-		$data ['page_title'] = gettext ( 'SIP Profile' );
+		$data ['username'] = $this->session->userdata('user_name');
+		$data ['page_title'] = gettext('SIP Profile');
 		$data ['search_flag'] = true;
-		$this->session->set_userdata ( 'advance_search', 0 );
-		$data ['grid_fields'] = $this->freeswitch_form->build_fssipprofile_list_for_admin ();
-		$data ["grid_buttons"] = $this->freeswitch_form->build_fssipprofile_grid_buttons ();
-		$data ['form_search'] = $this->form->build_serach_form ( $this->freeswitch_form->get_sipprofile_search_form () );
+		$this->session->set_userdata('advance_search', 0);
+		$data ['grid_fields'] = $this->freeswitch_form->build_fssipprofile_list_for_admin();
+		$data ["grid_buttons"] = $this->freeswitch_form->build_fssipprofile_grid_buttons();
+		$data ['form_search'] = $this->form->build_serach_form($this->freeswitch_form->get_sipprofile_search_form());
 		$data ['button_name'] = "Add Setting";
 		// $data['form_search'] = $this->form->build_serach_form($this->trunk_form->get_trunk_search_form());
-		$this->load->view ( 'view_fssipprofile_list', $data );
+		$this->load->view('view_fssipprofile_list', $data);
 	}
 	function fssipprofile_delete_multiple() {
-		$ids = $this->input->post ( "selected_ids", true );
+		$ids = $this->input->post("selected_ids", true);
 		$where = "id IN ($ids)";
-		$this->db->where ( $where );
-		echo $this->db->delete ( "sip_profiles" );
+		$this->db->where($where);
+		echo $this->db->delete("sip_profiles");
 	}
 	function fssipprofile_json() {
-		$json_data = array ();
-		$count_all = $this->freeswitch_model->get_sipprofile_list ( false );
-		$paging_data = $this->form->load_grid_config ( $count_all, $_GET ['rp'], $_GET ['page'] );
+		$json_data = array();
+		$count_all = $this->freeswitch_model->get_sipprofile_list(false);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET ['rp'], $_GET ['page']);
 		$json_data = $paging_data ["json_paging"];
-		$gateway_data = array ();
-		$query = $this->freeswitch_model->get_sipprofile_list ( true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"] );
-		$grid_fields = json_decode ( $this->freeswitch_form->build_fssipprofile_list_for_admin () );
-		$json_data ['rows'] = $this->form->build_grid ( $query, $grid_fields );
-		echo json_encode ( $json_data );
+		$gateway_data = array();
+		$query = $this->freeswitch_model->get_sipprofile_list(true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"]);
+		$grid_fields = json_decode($this->freeswitch_form->build_fssipprofile_list_for_admin());
+		$json_data ['rows'] = $this->form->build_grid($query, $grid_fields);
+		echo json_encode($json_data);
 	}
 	function fssipprofile_params_json($edited_id) {
-		$json_data = array ();
-		$gateway_data = array ();
-		$where = array (
+		$json_data = array();
+		$gateway_data = array();
+		$where = array(
 				'id' => $edited_id 
 		);
-		$query = $this->db_model->getSelect ( "*", "sip_profiles", $where );
-		$query = $query->result_array ();
-		$gateway_result = array ();
+		$query = $this->db_model->getSelect("*", "sip_profiles", $where);
+		$query = $query->result_array();
+		$gateway_result = array();
 		$i = 0;
-		foreach ( $query as $key => $query_value ) {
-			foreach ( $query_value as $gateway_key => $gatewau_val ) {
+		foreach ($query as $key => $query_value) {
+			foreach ($query_value as $gateway_key => $gatewau_val) {
 				if ($gateway_key != 'id' && $gateway_key != 'name' && $gateway_key != 'sip_ip' && $gateway_key != 'sip_port') {
 					if ($gateway_key != "profile_data") {
 						$gateway_data [$gateway_key] = $gatewau_val;
 					} else {
-						$tmp = ( array ) json_decode ( $gatewau_val );
-						$gateway_result = array_merge ( $gateway_data, $tmp );
+						$tmp = (array)json_decode($gatewau_val);
+						$gateway_result = array_merge($gateway_data, $tmp);
 					}
 				}
 			}
 		}
-		$paging_data = $this->form->load_grid_config ( count ( $gateway_result ), $_GET ['rp'], $_GET ['page'] );
+		$paging_data = $this->form->load_grid_config(count($gateway_result), $_GET ['rp'], $_GET ['page']);
 		$json_data = $paging_data ["json_paging"];
 		
-		foreach ( $gateway_result as $key => $value ) {
-			$json_data ['rows'] [] = array (
-					'cell' => array (
+		foreach ($gateway_result as $key => $value) {
+			$json_data ['rows'] [] = array(
+					'cell' => array(
 							$key,
 							$value,
-							array (
-									'<a href="/freeswitch/fssipprofile_edit/' . $edited_id . '/edit/' . $key . '/" class="btn btn-royelblue btn-sm"  title="Edit">&nbsp;<i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;<a href="/freeswitch/fssipprofile_delete_params/' . $edited_id . '/' . $key . '/" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();">&nbsp;<i class="fa fa-trash fa-fw"></i></a>' 
+							array(
+									'<a href="/freeswitch/fssipprofile_edit/'.$edited_id.'/edit/'.$key.'/" class="btn btn-royelblue btn-sm"  title="Edit">&nbsp;<i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;<a href="/freeswitch/fssipprofile_delete_params/'.$edited_id.'/'.$key.'/" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();">&nbsp;<i class="fa fa-trash fa-fw"></i></a>' 
 							) 
 					) 
 			);
 		}
-		echo json_encode ( $json_data );
+		echo json_encode($json_data);
 	}
 	function fssipprofile_action($button_name, $id) {
-		$where = array (
+		$where = array(
 				'id' => $id 
 		);
-		$query = $this->db_model->getSelect ( "*", "sip_profiles", $where );
-		$query = $query->result_array ();
-		$where = array (
+		$query = $this->db_model->getSelect("*", "sip_profiles", $where);
+		$query = $query->result_array();
+		$where = array(
 				'sip_profile_id' => $id 
 		);
 		if ($button_name == "start") {
-			$cmd = "api sofia profile " . trim ( $query [0] ['name'] ) . " start";
+			$cmd = "api sofia profile ".trim($query [0] ['name'])." start";
 		} elseif ($button_name == "stop") {
 			$cmd = "api sofia profile stop";
 		} elseif ($button_name == "reload") {
 			$cmd = "api reloadxml";
 		} elseif ($button_name == "rescan") {
-			$cmd = "api sofia profile " . trim ( $query [0] ['name'] ) . " rescan";
+			$cmd = "api sofia profile ".trim($query [0] ['name'])." rescan";
 		}
 		
-		$this->freeswitch_model->reload_freeswitch ( $cmd );
-		redirect ( base_url () . 'freeswitch/fssipprofile/' );
+		$this->freeswitch_model->reload_freeswitch($cmd);
+		redirect(base_url().'freeswitch/fssipprofile/');
 	}
 	function fssipprofile_add($add = '') {
-		$data ['username'] = $this->session->userdata ( 'user_name' );
+		$data ['username'] = $this->session->userdata('user_name');
 		$data ['flag'] = 'create';
-		$data ['page_title'] = gettext ( 'Create SIP Profile' );
-		$sipprofile_data = $this->input->post ();
+		$data ['page_title'] = gettext('Create SIP Profile');
+		$sipprofile_data = $this->input->post();
 		$sipprofile_data ['status'] = $sipprofile_data ['sipstatus'];
 		$data ['button_name'] = "Add Setting";
 		if ($add == 'add') {
 			
-			unset ( $sipprofile_data ['action'] );
-			unset ( $sipprofile_data ['sipstatus'] );
+			unset ($sipprofile_data ['action']);
+			unset ($sipprofile_data ['sipstatus']);
 			$insert_data = $sipprofile_data;
 			
 			if ($sipprofile_data ['name'] == '' || $sipprofile_data ['sip_ip'] == '' || $sipprofile_data ['sip_port'] == '') {
-				$this->session->set_flashdata ( 'astpp_notification', 'Please enter All profile value!' );
-				redirect ( base_url () . 'freeswitch/fssipprofile_add/' );
+				$this->session->set_flashdata('astpp_notification', 'Please enter All profile value!');
+				redirect(base_url().'freeswitch/fssipprofile_add/');
 				exit ();
 			}
-			if (preg_match ( '/\s/', $sipprofile_data ['name'] )) {
-				$this->session->set_flashdata ( 'astpp_notification', 'SIP Profile name must not have any space!' );
-				redirect ( base_url () . 'freeswitch/fssipprofile_add/' );
+			if (preg_match('/\s/', $sipprofile_data ['name'])) {
+				$this->session->set_flashdata('astpp_notification', 'SIP Profile name must not have any space!');
+				redirect(base_url().'freeswitch/fssipprofile_add/');
 				exit ();
 			}
-			if (! preg_match ( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\z/', $sipprofile_data ['sip_ip'] )) {
-				$this->session->set_flashdata ( 'astpp_notification', 'SIP IP must be proper!' );
-				redirect ( base_url () . 'freeswitch/fssipprofile_add/' );
+			if ( ! preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\z/', $sipprofile_data ['sip_ip'])) {
+				$this->session->set_flashdata('astpp_notification', 'SIP IP must be proper!');
+				redirect(base_url().'freeswitch/fssipprofile_add/');
 				exit ();
 			}
 			$sipprofile_data ['id'] = '';
-			$check_authentication = $this->freeswitch_model->profile_authentication ( $sipprofile_data );
+			$check_authentication = $this->freeswitch_model->profile_authentication($sipprofile_data);
 			if ($check_authentication->num_rows == 0) {
 				
-				$sipprofile_data ['created_date'] = gmdate ( 'Y-m-d H:i:s' );
+				$sipprofile_data ['created_date'] = gmdate('Y-m-d H:i:s');
 				/**
 				 * Version 2.1
 				 * Purpose : Set default data for new created profile
 				 */
-				$sipprofile_data ['profile_data'] = $this->common->sip_profile_date ();
+				$sipprofile_data ['profile_data'] = $this->common->sip_profile_date();
 				/**
 				 * ====================================================================
 				 */
-				$insert = $this->db->insert ( "sip_profiles", $sipprofile_data );
+				$insert = $this->db->insert("sip_profiles", $sipprofile_data);
 			} else {
-				$this->session->set_flashdata ( 'astpp_notification', 'Duplicate SIP IP OR Port found it must be unique!' );
-				redirect ( base_url () . 'freeswitch/fssipprofile_add/' );
+				$this->session->set_flashdata('astpp_notification', 'Duplicate SIP IP OR Port found it must be unique!');
+				redirect(base_url().'freeswitch/fssipprofile_add/');
 			}
-			$this->session->set_flashdata ( 'astpp_errormsg', 'SIP Profile Added Successfully!' );
-			redirect ( base_url () . 'freeswitch/fssipprofile/' );
+			$this->session->set_flashdata('astpp_errormsg', 'SIP Profile Added Successfully!');
+			redirect(base_url().'freeswitch/fssipprofile/');
 		}
 		
 		if ($add == 'edit') {
-			$check_authentication = $this->freeswitch_model->profile_authentication ( $sipprofile_data );
-			unset ( $sipprofile_data ['action'] );
-			unset ( $sipprofile_data ['sipstatus'] );
+			$check_authentication = $this->freeswitch_model->profile_authentication($sipprofile_data);
+			unset ($sipprofile_data ['action']);
+			unset ($sipprofile_data ['sipstatus']);
 			$insert_arr = $sipprofile_data;
 			if ($check_authentication->num_rows == 0) {
-				$insert_arr ['last_modified_date'] = gmdate ( "Y-m-d H:i:s" );
-				$update = $this->db->update ( "sip_profiles", $insert_arr, array (
+				$insert_arr ['last_modified_date'] = gmdate("Y-m-d H:i:s");
+				$update = $this->db->update("sip_profiles", $insert_arr, array(
 						'id' => $sipprofile_data ['id'] 
-				) );
-				$this->session->set_flashdata ( 'astpp_errormsg', $sipprofile_data ['name'] . " SIP Profile Updated Successfully!" );
-				redirect ( base_url () . 'freeswitch/fssipprofile/' );
+				));
+				$this->session->set_flashdata('astpp_errormsg', $sipprofile_data ['name']." SIP Profile Updated Successfully!");
+				redirect(base_url().'freeswitch/fssipprofile/');
 				exit ();
 			} else {
-				$this->session->set_flashdata ( 'astpp_notification', 'Duplicate SIP IP OR Port found it must be unique!' );
-				redirect ( base_url () . 'freeswitch/fssipprofile/' );
+				$this->session->set_flashdata('astpp_notification', 'Duplicate SIP IP OR Port found it must be unique!');
+				redirect(base_url().'freeswitch/fssipprofile/');
 			}
-			redirect ( base_url () . 'freeswitch/fssipprofile/' );
+			redirect(base_url().'freeswitch/fssipprofile/');
 		}
-		$this->load->view ( 'view_fssipprofile_add', $data );
+		$this->load->view('view_fssipprofile_add', $data);
 	}
 	function fssipprofile_edit($edit_id = '', $type = '', $name_prams = '') {
-		$data ['page_title'] = gettext ( 'Edit SIP Profile' );
-		$sipprofile_data = $this->input->post ();
-		if (! $edit_id) {
+		$data ['page_title'] = gettext('Edit SIP Profile');
+		$sipprofile_data = $this->input->post();
+		if ( ! $edit_id) {
 			$edit_id = $sipprofile_data ['id'];
 		}
-		$where = array (
+		$where = array(
 				'id' => $edit_id 
 		);
-		$query = $this->db_model->getSelect ( "*", "sip_profiles", $where );
-		$query = $query->result_array ();
-		$gateway_result = array ();
-		foreach ( $query as $key => $query_value ) {
-			foreach ( $query_value as $gateway_key => $gatewau_val ) {
+		$query = $this->db_model->getSelect("*", "sip_profiles", $where);
+		$query = $query->result_array();
+		$gateway_result = array();
+		foreach ($query as $key => $query_value) {
+			foreach ($query_value as $gateway_key => $gatewau_val) {
 				if ($gateway_key != "profile_data") {
 					$gateway_data [$gateway_key] = $gatewau_val;
 				} else {
-					$tmp = ( array ) json_decode ( $gatewau_val );
-					$gateway_result = array_merge ( $gateway_data, $tmp );
+					$tmp = (array)json_decode($gatewau_val);
+					$gateway_result = array_merge($gateway_data, $tmp);
 				}
 			}
 		}
-		$data ['grid_fields'] = $this->freeswitch_form->build_fssipprofile_params_list_for_admin ();
+		$data ['grid_fields'] = $this->freeswitch_form->build_fssipprofile_params_list_for_admin();
 		$data ['edited_id'] = $edit_id;
 		$data ['sip_name'] = $query [0] ['name'];
 		$data ['status'] = $query [0] ['status'];
@@ -899,7 +899,7 @@ 
 		$data ['sip_port'] = $query [0] ['sip_port'];
 		$data ['id'] = $query [0] ['id'];
 		$data ['button_name'] = "Add Setting";
-		if ($type == 'edit' || isset ( $sipprofile_data ['type'] ) && $sipprofile_data ['type'] == 'save') {
+		if ($type == 'edit' || isset ($sipprofile_data ['type']) && $sipprofile_data ['type'] == 'save') {
 			if ($type == 'edit') {
 				$data ['params_name'] = $name_prams;
 				$data ['params_status'] = 0;
@@ -909,100 +909,100 @@ 
 				$data ['params_value'] = $gateway_result [$name_prams];
 				$data ['button_name'] = "Update Setting";
 			}
-			if (isset ( $sipprofile_data ['type'] ) && $sipprofile_data ['type'] == 'save') {
-				$sipprofile_data = $this->input->post ();
+			if (isset ($sipprofile_data ['type']) && $sipprofile_data ['type'] == 'save') {
+				$sipprofile_data = $this->input->post();
 				$tmp [$sipprofile_data ['params_name']] = $sipprofile_data ['params_value'];
-				$final_data = json_encode ( $tmp );
-				$insert_arr ["profile_data"] = json_encode ( $tmp );
-				$update = $this->db->update ( "sip_profiles", $insert_arr, array (
+				$final_data = json_encode($tmp);
+				$insert_arr ["profile_data"] = json_encode($tmp);
+				$update = $this->db->update("sip_profiles", $insert_arr, array(
 						'id' => $edit_id 
-				) );
+				));
 				if ($sipprofile_data ['type_settings'] == "add_setting") {
-					$this->session->set_flashdata ( 'astpp_errormsg', $data ['sip_name'] . " SIP Setting Added Successfully!" );
+					$this->session->set_flashdata('astpp_errormsg', $data ['sip_name']." SIP Setting Added Successfully!");
 				} else {
-					$this->session->set_flashdata ( 'astpp_errormsg', $data ['sip_name'] . " SIP Setting Updated Successfully!" );
+					$this->session->set_flashdata('astpp_errormsg', $data ['sip_name']." SIP Setting Updated Successfully!");
 				}
-				redirect ( base_url () . 'freeswitch/fssipprofile_edit/' . $sipprofile_data ['id'] );
+				redirect(base_url().'freeswitch/fssipprofile_edit/'.$sipprofile_data ['id']);
 				exit ();
 			}
 		}
-		$this->load->view ( 'view_fssipprofile_edit', $data );
+		$this->load->view('view_fssipprofile_edit', $data);
 	}
 	function fssipprofile_save($id) {
-		$sipprofile_data = $this->input->post ();
-		$insert_arr = array ();
-		$sipprofile_arr = array ();
-		$where = array (
+		$sipprofile_data = $this->input->post();
+		$insert_arr = array();
+		$sipprofile_arr = array();
+		$where = array(
 				'id' => $id 
 		);
-		$query = $this->db_model->getSelect ( "*", "sip_profiles", $where );
-		$query = $query->result_array ();
-		$gateway_result = array ();
-		foreach ( $query as $key => $query_value ) {
-			foreach ( $query_value as $gateway_key => $gatewau_val ) {
+		$query = $this->db_model->getSelect("*", "sip_profiles", $where);
+		$query = $query->result_array();
+		$gateway_result = array();
+		foreach ($query as $key => $query_value) {
+			foreach ($query_value as $gateway_key => $gatewau_val) {
 				if ($gateway_key != "profile_data") {
 					$gateway_data [$gateway_key] = $gatewau_val;
 				} else {
-					$tmp = ( array ) json_decode ( $gatewau_val );
-					$gateway_result = array_merge ( $gateway_data, $tmp );
+					$tmp = (array)json_decode($gatewau_val);
+					$gateway_result = array_merge($gateway_data, $tmp);
 				}
 			}
 		}
 		$tmp [$sipprofile_data ['params_name']] = $sipprofile_data ['params_value'];
-		$final_data = json_encode ( $tmp );
-		$insert_arr ["profile_data"] = json_encode ( $tmp );
-		$update = $this->db->update ( "sip_profiles", $insert_arr, array (
+		$final_data = json_encode($tmp);
+		$insert_arr ["profile_data"] = json_encode($tmp);
+		$update = $this->db->update("sip_profiles", $insert_arr, array(
 				'id' => $id 
-		) );
-		$this->load->view ( 'view_fssipprofile_edit', $data );
+		));
+		$this->load->view('view_fssipprofile_edit', $data);
 	}
 	function fssipprofile_delete_params($id, $name) {
-		$where = array (
+		$where = array(
 				'id' => $id 
 		);
-		$query = $this->db_model->getSelect ( "*", "sip_profiles", $where );
-		$query = $query->result_array ();
-		$gateway_result = array ();
-		foreach ( $query as $key => $query_value ) {
-			foreach ( $query_value as $gateway_key => $gatewau_val ) {
+		$query = $this->db_model->getSelect("*", "sip_profiles", $where);
+		$query = $query->result_array();
+		$gateway_result = array();
+		foreach ($query as $key => $query_value) {
+			foreach ($query_value as $gateway_key => $gatewau_val) {
 				if ($gateway_key != "profile_data") {
 					$gateway_data [$gateway_key] = $gatewau_val;
 				} else {
-					$tmp = ( array ) json_decode ( $gatewau_val );
-					$gateway_result = array_merge ( $gateway_data, $tmp );
+					$tmp = (array)json_decode($gatewau_val);
+					$gateway_result = array_merge($gateway_data, $tmp);
 				}
 			}
 		}
-		if (isset ( $tmp [$name] )) {
-			unset ( $tmp [$name] );
+		if (isset ($tmp [$name])) {
+			unset ($tmp [$name]);
 		}
-		$insert_arr ["profile_data"] = json_encode ( $tmp );
-		$update = $this->db->update ( "sip_profiles", $insert_arr, array (
+		$insert_arr ["profile_data"] = json_encode($tmp);
+		$update = $this->db->update("sip_profiles", $insert_arr, array(
 				'id' => $id 
-		) );
-		$this->session->set_flashdata ( 'astpp_notification', $name . ' SIP Setting Removed Successfully!' );
-		redirect ( base_url () . 'freeswitch/fssipprofile_edit/' . $id );
+		));
+		$this->session->set_flashdata('astpp_notification', $name.' SIP Setting Removed Successfully!');
+		redirect(base_url().'freeswitch/fssipprofile_edit/'.$id);
 	}
 	function fssipprofile_delete($profile_id) {
-		$profile_name = $this->common->get_field_name ( 'name', 'sip_profiles', $profile_id );
-		$sip_ip = $this->common->get_field_name ( 'sip_ip', 'sip_profiles', $profile_id );
-		$delete = $this->db_model->delete ( "sip_profiles", array (
+		$profile_name = $this->common->get_field_name('name', 'sip_profiles', $profile_id);
+		$sip_ip = $this->common->get_field_name('sip_ip', 'sip_profiles', $profile_id);
+		$delete = $this->db_model->delete("sip_profiles", array(
 				"id" => $profile_id 
-		) );
-		$this->session->set_flashdata ( 'astpp_notification', 'SIP Profile Removed Successfully!' );
-		redirect ( base_url () . 'freeswitch/fssipprofile/' );
+		));
+		$this->session->set_flashdata('astpp_notification', 'SIP Profile Removed Successfully!');
+		redirect(base_url().'freeswitch/fssipprofile/');
 	}
 	function fsserver_list() {
-		$data ['username'] = $this->session->userdata ( 'user_name' );
-		$data ['page_title'] = gettext ( 'Freeswitch Servers' );
+		$data ['username'] = $this->session->userdata('user_name');
+		$data ['page_title'] = gettext('Freeswitch Servers');
 		$data ['search_flag'] = true;
 		$data ['cur_menu_no'] = 1;
-		$this->session->set_userdata ( 'advance_search', 0 );
-		$data ['grid_fields'] = $this->freeswitch_form->build_fsserver_list ();
-		$data ["grid_buttons"] = $this->freeswitch_form->build_fsserver_grid_buttons ();
+		$this->session->set_userdata('advance_search', 0);
+		$data ['grid_fields'] = $this->freeswitch_form->build_fsserver_list();
+		$data ["grid_buttons"] = $this->freeswitch_form->build_fsserver_grid_buttons();
 		
-		$data ['form_search'] = $this->form->build_serach_form ( $this->freeswitch_form->get_search_fsserver_form () );
-		$this->load->view ( 'view_fsserver_list', $data );
+		$data ['form_search'] = $this->form->build_serach_form($this->freeswitch_form->get_search_fsserver_form());
+		$this->load->view('view_fsserver_list', $data);
 	}
 	
 	/**
@@ -1010,98 +1010,98 @@ 
 	 * Listing of Accounts table data through php function json_encode
 	 */
 	function fsserver_list_json() {
-		$json_data = array ();
+		$json_data = array();
 		
-		$count_all = $this->freeswitch_model->get_fsserver_list ( false );
-		$paging_data = $this->form->load_grid_config ( $count_all, $_GET ['rp'], $_GET ['page'] );
+		$count_all = $this->freeswitch_model->get_fsserver_list(false);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET ['rp'], $_GET ['page']);
 		$json_data = $paging_data ["json_paging"];
-		$query = $this->freeswitch_model->get_fsserver_list ( true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"] );
-		$grid_fields = json_decode ( $this->freeswitch_form->build_fsserver_list () );
-		$json_data ['rows'] = $this->form->build_grid ( $query, $grid_fields );
+		$query = $this->freeswitch_model->get_fsserver_list(true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"]);
+		$grid_fields = json_decode($this->freeswitch_form->build_fsserver_list());
+		$json_data ['rows'] = $this->form->build_grid($query, $grid_fields);
 		
-		echo json_encode ( $json_data );
+		echo json_encode($json_data);
 	}
 	function fsserver_add($type = "") {
-		$data ['username'] = $this->session->userdata ( 'user_name' );
+		$data ['username'] = $this->session->userdata('user_name');
 		$data ['flag'] = 'create';
-		$data ['page_title'] = gettext ( 'Create Freeswich Server' );
-		$data ['form'] = $this->form->build_form ( $this->freeswitch_form->get_form_fsserver_fields (), '' );
+		$data ['page_title'] = gettext('Create Freeswich Server');
+		$data ['form'] = $this->form->build_form($this->freeswitch_form->get_form_fsserver_fields(), '');
 		
-		$this->load->view ( 'view_fsserver_add_edit', $data );
+		$this->load->view('view_fsserver_add_edit', $data);
 	}
 	function fsserver_edit($edit_id = '') {
-		$data ['page_title'] = gettext ( 'Edit Freeswich Server' );
-		$where = array (
+		$data ['page_title'] = gettext('Edit Freeswich Server');
+		$where = array(
 				'id' => $edit_id 
 		);
-		$account = $this->db_model->getSelect ( "*", "freeswich_servers", $where );
-		foreach ( $account->result_array () as $key => $value ) {
+		$account = $this->db_model->getSelect("*", "freeswich_servers", $where);
+		foreach ($account->result_array() as $key => $value) {
 			$edit_data = $value;
 		}
-		$data ['form'] = $this->form->build_form ( $this->freeswitch_form->get_form_fsserver_fields (), $edit_data );
-		$this->load->view ( 'view_fsserver_add_edit', $data );
+		$data ['form'] = $this->form->build_form($this->freeswitch_form->get_form_fsserver_fields(), $edit_data);
+		$this->load->view('view_fsserver_add_edit', $data);
 	}
 	function fsserver_save() {
-		$add_array = $this->input->post ();
+		$add_array = $this->input->post();
 		
-		$data ['form'] = $this->form->build_form ( $this->freeswitch_form->get_form_fsserver_fields (), $add_array );
+		$data ['form'] = $this->form->build_form($this->freeswitch_form->get_form_fsserver_fields(), $add_array);
 		if ($add_array ['id'] != '') {
-			$data ['page_title'] = gettext ( 'Edit Freeswitch Server' );
-			if ($this->form_validation->run () == FALSE) {
-				$data ['validation_errors'] = validation_errors ();
+			$data ['page_title'] = gettext('Edit Freeswitch Server');
+			if ($this->form_validation->run() == FALSE) {
+				$data ['validation_errors'] = validation_errors();
 				echo $data ['validation_errors'];
 				exit ();
 			} else {
-				$this->freeswitch_model->edit_fsserver ( $add_array, $add_array ['id'] );
-				echo json_encode ( array (
+				$this->freeswitch_model->edit_fsserver($add_array, $add_array ['id']);
+				echo json_encode(array(
 						"SUCCESS" => " Freeswitch Server Updated Successfully!" 
-				) );
+				));
 				exit ();
 			}
 		} else {
-			$data ['page_title'] = gettext ( 'Freeswich Server' );
-			if ($this->form_validation->run () == FALSE) {
-				$data ['validation_errors'] = validation_errors ();
+			$data ['page_title'] = gettext('Freeswich Server');
+			if ($this->form_validation->run() == FALSE) {
+				$data ['validation_errors'] = validation_errors();
 				echo $data ['validation_errors'];
 				exit ();
 			} else {
-				$this->freeswitch_model->add_fssever ( $add_array );
-				echo json_encode ( array (
+				$this->freeswitch_model->add_fssever($add_array);
+				echo json_encode(array(
 						"SUCCESS" => "Freeswitch Server Added Successfully!" 
-				) );
+				));
 				exit ();
 			}
 		}
-		$this->load->view ( 'view_callshop_details', $data );
+		$this->load->view('view_callshop_details', $data);
 	}
 	function fsserver_delete($id) {
-		$this->freeswitch_model->fsserver_delete ( $id );
-		$this->session->set_flashdata ( 'astpp_notification', 'Freeswitch Server Removed Successfully!' );
-		redirect ( base_url () . 'freeswitch/fsserver_list/' );
+		$this->freeswitch_model->fsserver_delete($id);
+		$this->session->set_flashdata('astpp_notification', 'Freeswitch Server Removed Successfully!');
+		redirect(base_url().'freeswitch/fsserver_list/');
 		exit ();
 	}
 	function fsserver_list_search() {
-		$ajax_search = $this->input->post ( 'ajax_search', 0 );
+		$ajax_search = $this->input->post('ajax_search', 0);
 		
-		if ($this->input->post ( 'advance_search', TRUE ) == 1) {
-			$this->session->set_userdata ( 'advance_search', $this->input->post ( 'advance_search' ) );
-			$action = $this->input->post ();
-			unset ( $action ['action'] );
-			unset ( $action ['advance_search'] );
-			$this->session->set_userdata ( 'fsserver_list_search', $action );
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset ($action ['action']);
+			unset ($action ['advance_search']);
+			$this->session->set_userdata('fsserver_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect ( base_url () . 'freeswitch/fsserver_list/' );
+			redirect(base_url().'freeswitch/fsserver_list/');
 		}
 	}
 	function fsserver_list_clearsearchfilter() {
-		$this->session->set_userdata ( 'advance_search', 0 );
-		$this->session->set_userdata ( 'account_search', "" );
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('account_search', "");
 	}
 	function fssipprofile_edit_validation($id, $name) {
-		$sip_profile_data = $this->common->get_field_name ( 'profile_data', 'sip_profiles', $id );
-		$final_data = json_decode ( $sip_profile_data, true );
-		foreach ( $final_data as $key => $value ) {
+		$sip_profile_data = $this->common->get_field_name('profile_data', 'sip_profiles', $id);
+		$final_data = json_decode($sip_profile_data, true);
+		foreach ($final_data as $key => $value) {
 			if ($key == $name) {
 				echo 1;
 				return true;

Braces +3 added lines, -2 removed lines

@@ -33,8 +33,9 @@
 		$this->load->library ( 'freeswitch_lib' );
 		$this->load->model ( 'freeswitch_model' );
 		
-		if ($this->session->userdata ( 'user_login' ) == FALSE)
-			redirect ( base_url () . '/astpp/login' );
+		if ($this->session->userdata ( 'user_login' ) == FALSE) {
+					redirect ( base_url () . '/astpp/login' );
+		}
 	}
 	function fssipdevices_add($type = "") {
 		$data ['username'] = $this->session->userdata ( 'user_name' );

web_interface/astpp/application/modules/freeswitch/libraries/freeswitch_form.php

Spacing +586 added lines, -586 removed lines

@@ -21,18 +21,18 @@ 
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 // ##############################################################################
-if (! defined ( 'BASEPATH' ))
-	exit ( 'No direct script access allowed' );
+if ( ! defined('BASEPATH'))
+	exit ('No direct script access allowed');
 class Freeswitch_form {
 	function __construct() {
-		$this->CI = & get_instance ();
+		$this->CI = & get_instance();
 	}
 	function get_freeswith_form_fields($id = false) {
-		$log_type = $this->CI->session->userdata ( "logintype" );
+		$log_type = $this->CI->session->userdata("logintype");
 		if ($log_type == 0 || $log_type == 3 || $log_type == 1) {
 			$sip_pro = null;
 		} else {
-			$sip_pro = array (
+			$sip_pro = array(
 					'SIP Profile',
 					'sip_profile_id',
 					'SELECT',
@@ -48,22 +48,22 @@ 
 					'' 
 			);
 		}
-		$val = $id > 0 ? 'sip_devices.username.' . $id : 'sip_devices.username';
-		$uname_user = $this->CI->common->find_uniq_rendno ( '10', '', '' );
-		$password = $this->CI->common->generate_password ();
+		$val = $id > 0 ? 'sip_devices.username.'.$id : 'sip_devices.username';
+		$uname_user = $this->CI->common->find_uniq_rendno('10', '', '');
+		$password = $this->CI->common->generate_password();
 		/* Edit functionality */
-		$form ['forms'] = array (
-				base_url () . 'freeswitch/fssipdevices_save/',
-				array (
+		$form ['forms'] = array(
+				base_url().'freeswitch/fssipdevices_save/',
+				array(
 						"id" => "sipdevices_form",
 						"name" => "sipdevices_form" 
 				) 
 		);
-		$form [gettext ( 'Device Information' )] = array (
-				array (
+		$form [gettext('Device Information')] = array(
+				array(
 						'',
 						'HIDDEN',
-						array (
+						array(
 								'name' => 'id' 
 						),
 						'',
@@ -71,25 +71,25 @@ 
 						'',
 						'' 
 				),
-				array (
-						gettext ( 'Username' ),
+				array(
+						gettext('Username'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'fs_username',
 								'size' => '20',
 								'value' => $uname_user,
 								'id' => 'username1',
 								'class' => "text field medium" 
 						),
-						'trim|required|is_unique[' . $val . ']|xss_clean',
+						'trim|required|is_unique['.$val.']|xss_clean',
 						'tOOL TIP',
 						'Please Enter account number',
 						'<i style="cursor:pointer; color:#1BCB61 !important; font-size:14px;    padding-left:5px;    padding-top:8px;    float:left;" title="Reset Password" class="change_number  fa fa-refresh"></i>' 
 				),
-				array (
-						gettext ( 'Password' ),
+				array(
+						gettext('Password'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'fs_password',
 								'size' => '20',
 								'value' => $password,
@@ -101,8 +101,8 @@ 
 						'Please Enter Password',
 						'<i style="cursor:pointer; color:#1BCB61 !important; font-size:14px;    padding-left:5px;    padding-top:8px;    float:left;" title="Reset Password" class="change_pass fa fa-refresh"></i>' 
 				),
-				array (
-						gettext ( 'Account' ),
+				array(
+						gettext('Account'),
 						'accountcode',
 						'SELECT',
 						'',
@@ -114,16 +114,16 @@ 
 						'accounts',
 						'build_concat_dropdown',
 						'where_arr',
-						array (
+						array(
 								"reseller_id" => "0",
 								"type" => "0",
 								"deleted" => "0" 
 						) 
 				),
-				array (
-						gettext ( 'Caller Name' ),
+				array(
+						gettext('Caller Name'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'effective_caller_id_name',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -132,10 +132,10 @@ 
 						'tOOL TIP',
 						'Please Enter account number' 
 				),
-				array (
-						gettext ( 'Caller Number' ),
+				array(
+						gettext('Caller Number'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'effective_caller_id_number',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -144,8 +144,8 @@ 
 						'tOOL TIP',
 						'Please Enter account number' 
 				),
-				array (
-						gettext ( 'Status' ),
+				array(
+						gettext('Status'),
 						'status',
 						'SELECT',
 						'',
@@ -166,9 +166,9 @@ 
 		 * *****
 		 */
 		
-		$form [gettext ( 'Voicemail Options' )] = array (
-				array (
-						gettext ( 'Enable' ),
+		$form [gettext('Voicemail Options')] = array(
+				array(
+						gettext('Enable'),
 						'voicemail_enabled',
 						'SELECT',
 						'',
@@ -181,10 +181,10 @@ 
 						'set_sip_config_option' 
 				),
 				
-				array (
-						gettext ( 'Password' ),
+				array(
+						gettext('Password'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'voicemail_password',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -193,10 +193,10 @@ 
 						'tOOL TIP',
 						'Please Enter account number' 
 				),
-				array (
-						gettext ( 'Mail To' ),
+				array(
+						gettext('Mail To'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'voicemail_mail_to',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -206,8 +206,8 @@ 
 						'Please Enter account number' 
 				),
 				
-				array (
-						gettext ( 'Attach File' ),
+				array(
+						gettext('Attach File'),
 						'voicemail_attach_file',
 						'SELECT',
 						'',
@@ -220,8 +220,8 @@ 
 						'custom_status_voicemail' 
 				),
 				
-				array (
-						gettext ( 'Local After Email' ),
+				array(
+						gettext('Local After Email'),
 						'vm_keep_local_after_email',
 						'SELECT',
 						'',
@@ -234,8 +234,8 @@ 
 						'custom_status_voicemail' 
 				),
 				
-				array (
-						gettext ( 'Send all Message' ),
+				array(
+						gettext('Send all Message'),
 						'vm_send_all_message',
 						'SELECT',
 						'',
@@ -252,17 +252,17 @@ 
 		/**
 		 * ***********************
 		 */
-		$form ['button_cancel'] = array (
+		$form ['button_cancel'] = array(
 				'name' => 'action',
-				'content' => gettext ( 'Close' ),
+				'content' => gettext('Close'),
 				'value' => 'cancel',
 				'type' => 'button',
 				'class' => 'btn btn-line-sky margin-x-10',
 				'onclick' => 'return redirect_page(\'NULL\')' 
 		);
-		$form ['button_save'] = array (
+		$form ['button_save'] = array(
 				'name' => 'action',
-				'content' => gettext ( 'Save' ),
+				'content' => gettext('Save'),
 				'value' => 'save',
 				'id' => 'submit',
 				'type' => 'button',
@@ -272,16 +272,16 @@ 
 		return $form;
 	}
 	function get_freeswith_search_form() {
-		$form ['forms'] = array (
+		$form ['forms'] = array(
 				"",
-				array (
+				array(
 						'id' => "freeswith_search" 
 				) 
 		);
-		$form [gettext ( 'Search' )] = array (
+		$form [gettext('Search')] = array(
 				
-				array (
-						gettext ( 'SIP Profile' ),
+				array(
+						gettext('SIP Profile'),
 						'sip_profile_id',
 						'SELECT',
 						'',
@@ -295,10 +295,10 @@ 
 						'where_arr',
 						'' 
 				),
-				array (
-						gettext ( 'Username' ),
+				array(
+						gettext('Username'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'username[username]',
 								'',
 								'size' => '20',
@@ -314,8 +314,8 @@ 
 						'search_string_type',
 						'' 
 				),
-				array (
-						gettext ( 'Gateway' ),
+				array(
+						gettext('Gateway'),
 						'gateway_id',
 						'SELECT',
 						'',
@@ -329,8 +329,8 @@ 
 						'where_arr',
 						'' 
 				),
-				array (
-						gettext ( 'Account' ),
+				array(
+						gettext('Account'),
 						'accountid',
 						'SELECT',
 						'',
@@ -342,14 +342,14 @@ 
 						'accounts',
 						'build_concat_dropdown',
 						'where_arr',
-						array (
+						array(
 								"reseller_id" => "0",
 								"type" => "0",
 								"deleted" => "0" 
 						) 
 				),
-				array (
-						gettext ( 'Status' ),
+				array(
+						gettext('Status'),
 						'status',
 						'SELECT',
 						'',
@@ -363,7 +363,7 @@ 
 						'',
 						'' 
 				),
-				array (
+				array(
 						'',
 						'HIDDEN',
 						'ajax_search',
@@ -372,7 +372,7 @@ 
 						'',
 						'' 
 				),
-				array (
+				array(
 						'',
 						'HIDDEN',
 						'advance_search',
@@ -382,18 +382,18 @@ 
 						'' 
 				) 
 		);
-		$form ['button_search'] = array (
+		$form ['button_search'] = array(
 				'name' => 'action',
 				'id' => "freeswith_search_btn",
-				'content' => gettext ( 'Search' ),
+				'content' => gettext('Search'),
 				'value' => 'save',
 				'type' => 'button',
 				'class' => 'btn btn-line-parrot pull-right' 
 		);
-		$form ['button_reset'] = array (
+		$form ['button_reset'] = array(
 				'name' => 'action',
 				'id' => "id_reset",
-				'content' => gettext ( 'Clear' ),
+				'content' => gettext('Clear'),
 				'value' => 'cancel',
 				'type' => 'reset',
 				'class' => 'btn btn-line-sky pull-right margin-x-10' 
@@ -401,17 +401,17 @@ 
 		return $form;
 	}
 	function get_sipdevices_search_form_user() {
-		$form ['forms'] = array (
+		$form ['forms'] = array(
 				"",
-				array (
+				array(
 						'id' => "sipdevices_search" 
 				) 
 		);
-		$form [gettext ( 'Search' )] = array (
-				array (
-						gettext ( 'Username' ),
+		$form [gettext('Search')] = array(
+				array(
+						gettext('Username'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'username[username]',
 								'',
 								'size' => '20',
@@ -427,8 +427,8 @@ 
 						'search_string_type',
 						'' 
 				),
-				array (
-						gettext ( 'SIP Profile' ),
+				array(
+						gettext('SIP Profile'),
 						'sip_profile_id',
 						'SELECT',
 						'',
@@ -442,7 +442,7 @@ 
 						'where_arr',
 						'' 
 				),
-				array (
+				array(
 						'',
 						'HIDDEN',
 						'ajax_search',
@@ -451,7 +451,7 @@ 
 						'',
 						'' 
 				),
-				array (
+				array(
 						'',
 						'HIDDEN',
 						'advance_search',
@@ -462,18 +462,18 @@ 
 				) 
 		)
 		;
-		$form ['button_search'] = array (
+		$form ['button_search'] = array(
 				'name' => 'action',
 				'id' => "sipdevices_search_btn",
-				'content' => gettext ( 'Search' ),
+				'content' => gettext('Search'),
 				'value' => 'save',
 				'type' => 'button',
 				'class' => 'btn btn-line-parrot pull-right' 
 		);
-		$form ['button_reset'] = array (
+		$form ['button_reset'] = array(
 				'name' => 'action',
 				'id' => "id_reset",
-				'content' => gettext ( 'Clear' ),
+				'content' => gettext('Clear'),
 				'value' => 'cancel',
 				'type' => 'reset',
 				'class' => 'btn btn-line-sky pull-right margin-x-10' 
@@ -481,18 +481,18 @@ 
 		return $form;
 	}
 	function get_gateway_search_form() {
-		$form ['forms'] = array (
+		$form ['forms'] = array(
 				"",
-				array (
+				array(
 						'id' => "freeswith_search" 
 				) 
 		);
-		$form [gettext ( 'Search' )] = array (
+		$form [gettext('Search')] = array(
 				
-				array (
-						gettext ( 'Name' ),
+				array(
+						gettext('Name'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'name[name]',
 								'',
 								'size' => '20',
@@ -509,8 +509,8 @@ 
 						'' 
 				),
 				// array('Gateway Name', 'id', 'SELECT', '', '', 'tOOL TIP', 'Please select gateway first', 'id', 'name', 'gateways', 'build_dropdown','where_arr', ''),
-				array (
-						gettext ( 'SIP Profile' ),
+				array(
+						gettext('SIP Profile'),
 						'sip_profile_id',
 						'SELECT',
 						'',
@@ -526,8 +526,8 @@ 
 				),
 				// array('Username', 'INPUT', array('name' => 'username[username]', '', 'size' => '20', 'maxlength' => '15', 'class' => "text field"), '', 'tOOL TIP', '1', 'username[username-string]', '', '', '', 'search_string_type', ''),
 				
-				array (
-						gettext ( 'Status' ),
+				array(
+						gettext('Status'),
 						'status',
 						'SELECT',
 						'',
@@ -540,7 +540,7 @@ 
 						'set_search_status' 
 				),
 				// array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0","type"=>"0", "deleted" => "0")),
-				array (
+				array(
 						'',
 						'HIDDEN',
 						'ajax_search',
@@ -549,7 +549,7 @@ 
 						'',
 						'' 
 				),
-				array (
+				array(
 						'',
 						'HIDDEN',
 						'advance_search',
@@ -559,18 +559,18 @@ 
 						'' 
 				) 
 		);
-		$form ['button_search'] = array (
+		$form ['button_search'] = array(
 				'name' => 'action',
 				'id' => "fsgateway_search_btn",
-				'content' => gettext ( 'Search' ),
+				'content' => gettext('Search'),
 				'value' => 'save',
 				'type' => 'button',
 				'class' => 'btn btn-line-parrot pull-right' 
 		);
-		$form ['button_reset'] = array (
+		$form ['button_reset'] = array(
 				'name' => 'action',
 				'id' => "id_reset",
-				'content' => gettext ( 'Clear' ),
+				'content' => gettext('Clear'),
 				'value' => 'cancel',
 				'type' => 'reset',
 				'class' => 'btn btn-line-sky pull-right margin-x-10' 
@@ -578,18 +578,18 @@ 
 		return $form;
 	}
 	function get_sipprofile_search_form() {
-		$form ['forms'] = array (
+		$form ['forms'] = array(
 				"",
-				array (
+				array(
 						'id' => "freeswitch_search" 
 				) 
 		);
-		$form [gettext ( 'Search' )] = array (
+		$form [gettext('Search')] = array(
 				
-				array (
-						gettext ( 'Name' ),
+				array(
+						gettext('Name'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'name[name]',
 								'',
 								'size' => '20',
@@ -605,10 +605,10 @@ 
 						'search_string_type',
 						'' 
 				),
-				array (
-						gettext ( 'SIP IP' ),
+				array(
+						gettext('SIP IP'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'sip_ip[sip_ip]',
 								'value' => '',
 								'size' => '20',
@@ -624,10 +624,10 @@ 
 						'search_string_type',
 						'' 
 				),
-				array (
-						gettext ( 'SIP Port' ),
+				array(
+						gettext('SIP Port'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'sip_port[sip_port]',
 								'value' => '',
 								'size' => '20',
@@ -644,8 +644,8 @@ 
 						'' 
 				),
 				
-				array (
-						gettext ( 'Status' ),
+				array(
+						gettext('Status'),
 						'status',
 						'SELECT',
 						'',
@@ -657,7 +657,7 @@ 
 						'',
 						'set_search_status' 
 				),
-				array (
+				array(
 						'',
 						'HIDDEN',
 						'ajax_search',
@@ -666,7 +666,7 @@ 
 						'',
 						'' 
 				),
-				array (
+				array(
 						'',
 						'HIDDEN',
 						'advance_search',
@@ -676,18 +676,18 @@ 
 						'' 
 				) 
 		);
-		$form ['button_search'] = array (
+		$form ['button_search'] = array(
 				'name' => 'action',
 				'id' => "fssipprofile_search_btn",
-				'content' => gettext ( 'Search' ),
+				'content' => gettext('Search'),
 				'value' => 'save',
 				'type' => 'button',
 				'class' => 'btn btn-line-parrot pull-right' 
 		);
-		$form ['button_reset'] = array (
+		$form ['button_reset'] = array(
 				'name' => 'action',
 				'id' => "id_reset",
-				'content' => gettext ( 'Clear' ),
+				'content' => gettext('Clear'),
 				'value' => 'cancel',
 				'type' => 'reset',
 				'class' => 'btn btn-line-sky pull-right margin-x-10' 
@@ -695,18 +695,18 @@ 
 		return $form;
 	}
 	function get_sipdevice_search_form() {
-		$form ['forms'] = array (
+		$form ['forms'] = array(
 				"",
-				array (
+				array(
 						'id' => "freeswith_search" 
 				) 
 		);
-		$form [gettext ( 'Search' )] = array (
+		$form [gettext('Search')] = array(
 				
-				array (
-						gettext ( 'Username' ),
+				array(
+						gettext('Username'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'username[username]',
 								'',
 								'size' => '20',
@@ -722,8 +722,8 @@ 
 						'search_string_type',
 						'' 
 				),
-				array (
-						gettext ( 'SIP Profile' ),
+				array(
+						gettext('SIP Profile'),
 						'sip_profile_id',
 						'SELECT',
 						'',
@@ -737,8 +737,8 @@ 
 						'where_arr',
 						'' 
 				),
-				array (
-						gettext ( 'Account' ),
+				array(
+						gettext('Account'),
 						'accountid',
 						'SELECT',
 						'',
@@ -750,14 +750,14 @@ 
 						'accounts',
 						'build_concat_dropdown',
 						'where_arr',
-						array (
+						array(
 								"reseller_id" => "0",
 								"type" => "GLOBAL",
 								"deleted" => "0" 
 						) 
 				),
-				array (
-						gettext ( 'Status' ),
+				array(
+						gettext('Status'),
 						'status',
 						'SELECT',
 						'',
@@ -770,7 +770,7 @@ 
 						'set_search_status' 
 				),
 				// array('Voicemail', 'vm-enabled', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_voicemail_status'),
-				array (
+				array(
 						'',
 						'HIDDEN',
 						'ajax_search',
@@ -779,7 +779,7 @@ 
 						'',
 						'' 
 				),
-				array (
+				array(
 						'',
 						'HIDDEN',
 						'advance_search',
@@ -789,18 +789,18 @@ 
 						'' 
 				) 
 		);
-		$form ['button_search'] = array (
+		$form ['button_search'] = array(
 				'name' => 'action',
 				'id' => "fssipdevice_search_btn",
-				'content' => gettext ( 'Search' ),
+				'content' => gettext('Search'),
 				'value' => 'save',
 				'type' => 'button',
 				'class' => 'btn btn-line-parrot pull-right' 
 		);
-		$form ['button_reset'] = array (
+		$form ['button_reset'] = array(
 				'name' => 'action',
 				'id' => "id_reset",
-				'content' => gettext ( 'Clear' ),
+				'content' => gettext('Clear'),
 				'value' => 'cancel',
 				'type' => 'reset',
 				'class' => 'btn btn-line-sky pull-right margin-x-10' 
@@ -812,8 +812,8 @@ 
 	 * Changes in gried size
 	 */
 	function build_system_list_for_admin() {
-		$grid_field_arr = json_encode ( array (
-				array (
+		$grid_field_arr = json_encode(array(
+				array(
 						"<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>",
 						"50",
 						"",
@@ -824,8 +824,8 @@ 
 						"false",
 						"center" 
 				),
-				array (
-						gettext ( "User Name" ),
+				array(
+						gettext("User Name"),
 						"100",
 						"username",
 						"",
@@ -835,8 +835,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Password" ),
+				array(
+						gettext("Password"),
 						"100",
 						"password",
 						"",
@@ -846,8 +846,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "SIP Profile" ),
+				array(
+						gettext("SIP Profile"),
 						"100",
 						"sip_profile_id",
 						"name",
@@ -857,8 +857,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Account" ),
+				array(
+						gettext("Account"),
 						"150",
 						"accountid",
 						"first_name,last_name,number",
@@ -868,8 +868,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Caller Name" ),
+				array(
+						gettext("Caller Name"),
 						"100",
 						"effective_caller_id_name",
 						"",
@@ -879,8 +879,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Caller Number" ),
+				array(
+						gettext("Caller Number"),
 						"100",
 						"effective_caller_id_number",
 						"",
@@ -890,8 +890,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Voicemail" ),
+				array(
+						gettext("Voicemail"),
 						"100",
 						"voicemail_enabled",
 						"",
@@ -901,8 +901,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Status" ),
+				array(
+						gettext("Status"),
 						"100",
 						"status",
 						"status",
@@ -912,8 +912,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Created Date" ),
+				array(
+						gettext("Created Date"),
 						"130",
 						"creation_date",
 						"creation_date",
@@ -923,8 +923,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Modified Date" ),
+				array(
+						gettext("Modified Date"),
 						"130",
 						"last_modified_date",
 						"last_modified_date",
@@ -934,34 +934,34 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Action" ),
+				array(
+						gettext("Action"),
 						"107",
 						"",
 						"",
 						"",
-						array (
-								"EDIT" => array (
+						array(
+								"EDIT" => array(
 										"url" => "/freeswitch/fssipdevices_edit/",
 										"mode" => "single",
 										"layout" => "medium" 
 								),
-								"DELETE" => array (
+								"DELETE" => array(
 										"url" => "/freeswitch/fssipdevices_delete/",
 										"mode" => "single" 
 								) 
 						) 
 				) 
-		) );
+		));
 		return $grid_field_arr;
 	}
 	/**
 	 * ******************************
 	 */
 	function build_grid_buttons() {
-		$buttons_json = json_encode ( array (
-				array (
-						gettext ( "Create" ),
+		$buttons_json = json_encode(array(
+				array(
+						gettext("Create"),
 						"btn btn-line-warning btn",
 						"fa fa-plus-circle fa-lg",
 						"button_action",
@@ -969,20 +969,20 @@ 
 						"popup",
 						"medium" 
 				),
-				array (
-						gettext ( "Delete" ),
+				array(
+						gettext("Delete"),
 						"btn btn-line-danger",
 						"fa fa-times-circle fa-lg",
 						"button_action",
 						"/freeswitch/fssipdevices_delete_multiple/" 
 				) 
-		) );
+		));
 		return $buttons_json;
 	}
 	function fsdevices_build_grid_buttons($accountid) {
-		$buttons_json = json_encode ( array (
-				array (
-						gettext ( "Create" ),
+		$buttons_json = json_encode(array(
+				array(
+						gettext("Create"),
 						"btn btn-line-warning btn",
 						"fa fa-plus-circle fa-lg",
 						"button_action",
@@ -990,29 +990,29 @@ 
 						"popup",
 						"medium" 
 				),
-				array (
-						gettext ( "Delete" ),
+				array(
+						gettext("Delete"),
 						"btn btn-line-danger",
 						"fa fa-times-circle fa-lg",
 						"button_action",
 						"/freeswitch/customer_fssipdevices_delete_multiple/" 
 				) 
-		) );
+		));
 		return $buttons_json;
 	}
 	function get_gateway_form_fields() {
-		$form ['forms'] = array (
-				base_url () . 'freeswitch/fsgateway_save/',
-				array (
+		$form ['forms'] = array(
+				base_url().'freeswitch/fsgateway_save/',
+				array(
 						"id" => "gateway_form",
 						"name" => "gateway_form" 
 				) 
 		);
-		$form [gettext ( 'Basic Information' )] = array (
-				array (
+		$form [gettext('Basic Information')] = array(
+				array(
 						'',
 						'HIDDEN',
-						array (
+						array(
 								'name' => 'id' 
 						),
 						'',
@@ -1020,10 +1020,10 @@ 
 						'',
 						'' 
 				),
-				array (
-						gettext ( 'Name' ),
+				array(
+						gettext('Name'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'name',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -1032,8 +1032,8 @@ 
 						'tOOL TIP',
 						'Please Enter Gateway Name' 
 				),
-				array (
-						gettext ( 'SIP Profile' ),
+				array(
+						gettext('SIP Profile'),
 						'sip_profile_id',
 						'SELECT',
 						'',
@@ -1047,10 +1047,10 @@ 
 						'',
 						'' 
 				),
-				array (
-						gettext ( 'Username' ),
+				array(
+						gettext('Username'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'username',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -1059,10 +1059,10 @@ 
 						'tOOL TIP',
 						'Please Enter user name' 
 				),
-				array (
-						gettext ( 'Password' ),
+				array(
+						gettext('Password'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'password',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -1071,10 +1071,10 @@ 
 						'tOOL TIP',
 						'Please Enter Password' 
 				),
-				array (
-						gettext ( 'Proxy' ),
+				array(
+						gettext('Proxy'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'proxy',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -1083,10 +1083,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'Outbound-<br/>Proxy' ),
+				array(
+						gettext('Outbound-<br/>Proxy'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'outbound-proxy',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -1095,9 +1095,9 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'Register' ),
-						array (
+				array(
+						gettext('Register'),
+						array(
 								'name' => 'register',
 								'class' => 'add_settings' 
 						),
@@ -1111,9 +1111,9 @@ 
 						'',
 						'set_sip_config_option' 
 				),
-				array (
-						gettext ( 'Caller-id-in-from' ),
-						array (
+				array(
+						gettext('Caller-id-in-from'),
+						array(
 								'name' => 'caller-id-in-from',
 								'class' => 'add_settings' 
 						),
@@ -1127,8 +1127,8 @@ 
 						'',
 						'set_sip_config_option' 
 				),
-				array (
-						gettext ( 'Status' ),
+				array(
+						gettext('Status'),
 						'status',
 						'SELECT',
 						'',
@@ -1142,11 +1142,11 @@ 
 				) 
 		)
 		;
-		$form [gettext ( 'Optional Information' )] = array (
-				array (
-						gettext ( 'From- Domain' ),
+		$form [gettext('Optional Information')] = array(
+				array(
+						gettext('From- Domain'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'from_domain',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -1155,10 +1155,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'From User' ),
+				array(
+						gettext('From User'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'from_user',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -1167,10 +1167,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'Realm' ),
+				array(
+						gettext('Realm'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'realm',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -1179,10 +1179,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'Extension' ),
+				array(
+						gettext('Extension'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'extension',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -1191,10 +1191,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'Expire Seconds' ),
+				array(
+						gettext('Expire Seconds'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'expire-seconds',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -1203,10 +1203,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'Reg-<br/>Transport' ),
+				array(
+						gettext('Reg-<br/>Transport'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'register-transport',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -1215,10 +1215,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'Contact Params' ),
+				array(
+						gettext('Contact Params'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'contact-params',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -1227,10 +1227,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'Ping' ),
+				array(
+						gettext('Ping'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'ping',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -1239,10 +1239,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'Retry-<br/>Seconds' ),
+				array(
+						gettext('Retry-<br/>Seconds'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'retry-seconds',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -1251,10 +1251,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'Register-<br/>Proxy' ),
+				array(
+						gettext('Register-<br/>Proxy'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'register-proxy',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -1263,10 +1263,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'Channel' ),
+				array(
+						gettext('Channel'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'channel',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -1281,10 +1281,10 @@ 
 				 * put one variable with the name of dialplan variable
 				 */
 				// array('Dialplan Variable', 'TEXTAREA', array('name' => 'dialplan_variable', 'size' => '20','cols'=>'10','rows'=>'5', 'class' => "col_md-5 form-control", 'style'=>"width: 200px; height: 100px;font-family: Open sans,sans-serif !important;"), '', 'tOOL TIP', ''),
-				array (
+				array(
 						'Dialplan Variable',
 						'TEXTAREA',
-						array (
+						array(
 								'name' => 'dialplan_variable',
 								'size' => '0',
 								'cols' => '0',
@@ -1301,17 +1301,17 @@ 
 		 */
 		;
 		
-		$form ['button_cancel'] = array (
+		$form ['button_cancel'] = array(
 				'name' => 'action',
-				'content' => gettext ( 'Close' ),
+				'content' => gettext('Close'),
 				'value' => 'cancel',
 				'type' => 'button',
 				'class' => 'btn btn-line-sky margin-x-10',
 				'onclick' => 'return redirect_page(\'NULL\')' 
 		);
-		$form ['button_save'] = array (
+		$form ['button_save'] = array(
 				'name' => 'action',
-				'content' => gettext ( 'Save' ),
+				'content' => gettext('Save'),
 				'value' => 'save',
 				'id' => 'submit',
 				'type' => 'button',
@@ -1327,8 +1327,8 @@ 
 	 */
 	function build_fsgateway_list_for_admin() {
 		// array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);
-		$grid_field_arr = json_encode ( array (
-				array (
+		$grid_field_arr = json_encode(array(
+				array(
 						"<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>",
 						"30",
 						"",
@@ -1344,8 +1344,8 @@ 
 				 * For Gateway Edit on Gateway name
 				 * *
 				 */
-				array (
-						gettext ( "Name" ),
+				array(
+						gettext("Name"),
 						"140",
 						"name",
 						"",
@@ -1358,8 +1358,8 @@ 
 				/**
 				 * *******************************
 				 */
-				array (
-						gettext ( "SIP Profile" ),
+				array(
+						gettext("SIP Profile"),
 						"115",
 						"sip_profile_id",
 						"name",
@@ -1369,8 +1369,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Username" ),
+				array(
+						gettext("Username"),
 						"140",
 						"username",
 						"",
@@ -1381,8 +1381,8 @@ 
 						"center" 
 				),
 				// array("Password", "181", "password", "", "", ""),
-				array (
-						gettext ( "Proxy" ),
+				array(
+						gettext("Proxy"),
 						"145",
 						"proxy",
 						"",
@@ -1392,8 +1392,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Register" ),
+				array(
+						gettext("Register"),
 						"120",
 						"register",
 						"register",
@@ -1403,8 +1403,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Caller-Id-In-Form" ),
+				array(
+						gettext("Caller-Id-In-Form"),
 						"130",
 						"caller-id-in-from",
 						"caller-id-in-from",
@@ -1418,8 +1418,8 @@ 
             ASTPP  3.0 

              creation field show in grid

             */

-			array (
-						gettext ( "Status" ),
+			array(
+						gettext("Status"),
 						"110",
 						"status",
 						"status",
@@ -1429,8 +1429,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Created Date" ),
+				array(
+						gettext("Created Date"),
 						"100",
 						"created_date",
 						"creation_date",
@@ -1440,8 +1440,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Modified Date" ),
+				array(
+						gettext("Modified Date"),
 						"130",
 						"last_modified_date",
 						"last_modified_date",
@@ -1463,34 +1463,34 @@ 
 				/**
 				 * ***************************************
 				 */
-				array (
+				array(
 						"Action",
 						"106",
 						"",
 						"",
 						"",
-						array (
-								"EDIT" => array (
+						array(
+								"EDIT" => array(
 										"url" => "/freeswitch/fsgateway_edit/",
 										"mode" => "popup",
 										"layout" => "medium" 
 								),
-								"DELETE" => array (
+								"DELETE" => array(
 										"url" => "/freeswitch/fsgateway_delete/",
 										"mode" => "single" 
 								) 
 						) 
 				) 
-		) );
+		));
 		return $grid_field_arr;
 	}
 	/**
 	 * ***************************************************
 	 */
 	function build_fdgateway_grid_buttons() {
-		$buttons_json = json_encode ( array (
-				array (
-						gettext ( "Create" ),
+		$buttons_json = json_encode(array(
+				array(
+						gettext("Create"),
 						"btn btn-line-warning btn",
 						"fa fa-plus-circle fa-lg",
 						"button_action",
@@ -1498,29 +1498,29 @@ 
 						"popup",
 						"medium" 
 				),
-				array (
-						gettext ( "Delete" ),
+				array(
+						gettext("Delete"),
 						"btn btn-line-danger",
 						"fa fa-times-circle fa-lg",
 						"button_action",
 						"/freeswitch/fsgateway_delete_multiple/" 
 				) 
-		) );
+		));
 		return $buttons_json;
 	}
 	function get_sipprofile_form_fields() {
-		$form ['forms'] = array (
-				base_url () . 'freeswitch/fssipprofile_save/',
-				array (
+		$form ['forms'] = array(
+				base_url().'freeswitch/fssipprofile_save/',
+				array(
 						"id" => "fssipprofile_form",
 						"name" => "fssipprofile_form" 
 				) 
 		);
-		$form [gettext ( 'Basic Information' )] = array (
-				array (
+		$form [gettext('Basic Information')] = array(
+				array(
 						'',
 						'HIDDEN',
-						array (
+						array(
 								'name' => 'id' 
 						),
 						'',
@@ -1528,10 +1528,10 @@ 
 						'',
 						'' 
 				),
-				array (
-						gettext ( 'Profile name' ),
+				array(
+						gettext('Profile name'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'name',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -1540,10 +1540,10 @@ 
 						'tOOL TIP',
 						'Please Enter Name' 
 				),
-				array (
-						gettext ( 'sip-ip' ),
+				array(
+						gettext('sip-ip'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'sip_ip',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -1552,10 +1552,10 @@ 
 						'tOOL TIP',
 						'Please Enter SIP IP Name' 
 				),
-				array (
-						gettext ( 'sip-port' ),
+				array(
+						gettext('sip-port'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'sip_port',
 								'size' => '20',
 								'value' => '5060',
@@ -1565,10 +1565,10 @@ 
 						'tOOL TIP',
 						'Please Enter SIP Port' 
 				),
-				array (
-						gettext ( 'rtp-ip' ),
+				array(
+						gettext('rtp-ip'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'rtp_ip',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -1577,10 +1577,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'Dial Plan' ),
+				array(
+						gettext('Dial Plan'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'dialplan',
 								'size' => '20',
 								'value' => 'XML',
@@ -1590,10 +1590,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'user-agent-string' ),
+				array(
+						gettext('user-agent-string'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'user-agent-string',
 								'size' => '20',
 								'value' => 'ASTPP',
@@ -1603,10 +1603,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'debug' ),
+				array(
+						gettext('debug'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'debug',
 								'size' => '20',
 								'value' => '0',
@@ -1616,8 +1616,8 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'sip-trace' ),
+				array(
+						gettext('sip-trace'),
 						'sip-trace',
 						'SELECT',
 						'',
@@ -1629,8 +1629,8 @@ 
 						'',
 						'set_sip_drp_option' 
 				),
-				array (
-						gettext ( 'tls' ),
+				array(
+						gettext('tls'),
 						'tls',
 						'SELECT',
 						'',
@@ -1642,8 +1642,8 @@ 
 						'',
 						'set_sip_config_options' 
 				),
-				array (
-						gettext ( 'inbound-reg-force-matching-username' ),
+				array(
+						gettext('inbound-reg-force-matching-username'),
 						'inbound-reg-force-matching-username',
 						'SELECT',
 						'',
@@ -1655,8 +1655,8 @@ 
 						'',
 						'set_sip_config_option' 
 				),
-				array (
-						gettext ( 'disable-transcoding' ),
+				array(
+						gettext('disable-transcoding'),
 						'disable-transcoding',
 						'SELECT',
 						'',
@@ -1668,8 +1668,8 @@ 
 						'',
 						'set_sip_config_option' 
 				),
-				array (
-						gettext ( 'all-reg-options-ping' ),
+				array(
+						gettext('all-reg-options-ping'),
 						'all-reg-options-ping',
 						'SELECT',
 						'',
@@ -1681,8 +1681,8 @@ 
 						'',
 						'set_sip_config_option' 
 				),
-				array (
-						gettext ( 'unregister-on-options-fail' ),
+				array(
+						gettext('unregister-on-options-fail'),
 						'unregister-on-options-fail',
 						'SELECT',
 						'',
@@ -1694,8 +1694,8 @@ 
 						'',
 						'set_sip_config_option' 
 				),
-				array (
-						gettext ( 'log-auth-failures' ),
+				array(
+						gettext('log-auth-failures'),
 						'log-auth-failures',
 						'SELECT',
 						'',
@@ -1707,8 +1707,8 @@ 
 						'',
 						'set_sip_config_option' 
 				),
-				array (
-						gettext ( 'Status' ),
+				array(
+						gettext('Status'),
 						'status',
 						'SELECT',
 						'',
@@ -1722,9 +1722,9 @@ 
 				) 
 		);
 		
-		$form [gettext ( 'Others Information' )] = array (
-				array (
-						gettext ( 'inbound-bypass-media' ),
+		$form [gettext('Others Information')] = array(
+				array(
+						gettext('inbound-bypass-media'),
 						'inbound-bypass-media',
 						'SELECT',
 						'',
@@ -1736,8 +1736,8 @@ 
 						'',
 						'set_sip_config_options' 
 				),
-				array (
-						gettext ( 'inbound-proxy-media' ),
+				array(
+						gettext('inbound-proxy-media'),
 						'inbound-proxy-media',
 						'SELECT',
 						'',
@@ -1749,8 +1749,8 @@ 
 						'',
 						'set_sip_config_options' 
 				),
-				array (
-						gettext ( 'disable-transfer' ),
+				array(
+						gettext('disable-transfer'),
 						'disable-transfer',
 						'SELECT',
 						'',
@@ -1762,8 +1762,8 @@ 
 						'',
 						'set_sip_config_option' 
 				),
-				array (
-						gettext ( 'enable-100rel' ),
+				array(
+						gettext('enable-100rel'),
 						'enable-100rel',
 						'SELECT',
 						'',
@@ -1775,10 +1775,10 @@ 
 						'',
 						'set_sip_config_options' 
 				),
-				array (
-						gettext ( 'rtp-timeout-sec' ),
+				array(
+						gettext('rtp-timeout-sec'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'rtp-timeout-sec',
 								'size' => '20',
 								'value' => '60',
@@ -1788,10 +1788,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'dtmf-duration' ),
+				array(
+						gettext('dtmf-duration'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'dtmf-duration',
 								'size' => '20',
 								'value' => '2000',
@@ -1801,8 +1801,8 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'manual-redirect' ),
+				array(
+						gettext('manual-redirect'),
 						'manual-redirect',
 						'SELECT',
 						'',
@@ -1814,8 +1814,8 @@ 
 						'',
 						'set_sip_config_options' 
 				),
-				array (
-						gettext ( 'aggressive-nat-detection' ),
+				array(
+						gettext('aggressive-nat-detection'),
 						'aggressive-nat-detection',
 						'SELECT',
 						'',
@@ -1827,8 +1827,8 @@ 
 						'',
 						'set_sip_config_option' 
 				),
-				array (
-						gettext ( 'enable-Timer' ),
+				array(
+						gettext('enable-Timer'),
 						'enable-timer',
 						'SELECT',
 						'',
@@ -1840,10 +1840,10 @@ 
 						'',
 						'set_sip_config_options' 
 				),
-				array (
-						gettext ( 'minimum-session-expires' ),
+				array(
+						gettext('minimum-session-expires'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'minimum-session-expires',
 								'value' => '120',
 								'size' => '20',
@@ -1853,10 +1853,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'session-timeout' ),
+				array(
+						gettext('session-timeout'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'session-timeout-pt',
 								'value' => '1800',
 								'size' => '20',
@@ -1866,8 +1866,8 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'auth-calls' ),
+				array(
+						gettext('auth-calls'),
 						'auth-calls',
 						'SELECT',
 						'',
@@ -1879,10 +1879,10 @@ 
 						'',
 						'set_sip_config_option' 
 				),
-				array (
-						gettext ( 'apply-inbound-acl' ),
+				array(
+						gettext('apply-inbound-acl'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'apply-inbound-acl',
 								'value' => 'default',
 								'size' => '20',
@@ -1892,10 +1892,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'inbound-codec-prefs' ),
+				array(
+						gettext('inbound-codec-prefs'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'inbound-codec-prefs',
 								'size' => '25',
 								'class' => "text field medium" 
@@ -1904,10 +1904,10 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'outbound-codec-prefs' ),
+				array(
+						gettext('outbound-codec-prefs'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'outbound-codec-prefs',
 								'size' => '25',
 								'class' => "text field medium" 
@@ -1916,8 +1916,8 @@ 
 						'tOOL TIP',
 						'' 
 				),
-				array (
-						gettext ( 'inbound-late-negotiation' ),
+				array(
+						gettext('inbound-late-negotiation'),
 						'inbound-late-negotiation',
 						'SELECT',
 						'',
@@ -1929,10 +1929,10 @@ 
 						'',
 						'set_sip_config_options' 
 				),
-				array (
-						gettext ( 'inbound-codec-negotiation' ),
+				array(
+						gettext('inbound-codec-negotiation'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'inbound-codec-negotiation',
 								'size' => '25',
 								'class' => "text field medium" 
@@ -1942,16 +1942,16 @@ 
 						'' 
 				) 
 		);
-		$form ['button_cancel'] = array (
+		$form ['button_cancel'] = array(
 				'name' => 'action',
-				'content' => gettext ( 'Close' ),
+				'content' => gettext('Close'),
 				'value' => 'cancel',
 				'type' => 'button',
 				'class' => 'btn btn-line-sky margin-x-10',
 				'onclick' => 'return redirect_page(\'NULL\')' 
 		);
-		$form ['button_save'] = array (
-				'content' => gettext ( 'Save' ),
+		$form ['button_save'] = array(
+				'content' => gettext('Save'),
 				'value' => 'save',
 				'type' => 'button',
 				'id' => 'submit',
@@ -1962,8 +1962,8 @@ 
 	}
 	function build_fssipprofile_list_for_admin() {
 		// array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);
-		$grid_field_arr = json_encode ( array (
-				array (
+		$grid_field_arr = json_encode(array(
+				array(
 						"<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>",
 						"30",
 						"",
@@ -1979,8 +1979,8 @@ 
 				 * For Sip Profile edit on Profile name
 				 * *
 				 */
-				array (
-						gettext ( "Name" ),
+				array(
+						gettext("Name"),
 						"190",
 						"name",
 						"",
@@ -1993,8 +1993,8 @@ 
 				/**
 				 * *********************************
 				 */
-				array (
-						gettext ( "SIP IP" ),
+				array(
+						gettext("SIP IP"),
 						"205",
 						"sip_ip",
 						"",
@@ -2004,8 +2004,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "SIP Port" ),
+				array(
+						gettext("SIP Port"),
 						"200",
 						"sip_port",
 						"",
@@ -2019,8 +2019,8 @@ 
             ASTPP  3.0 

             status show active or inactive

             */

-			array (
-						gettext ( "Status" ),
+			array(
+						gettext("Status"),
 						"160",
 						"status",
 						"status",
@@ -2033,83 +2033,83 @@ 
 				/**
 				 * ****************************************************
 				 */
-				array (
-						gettext ( "Profile Action" ),
+				array(
+						gettext("Profile Action"),
 						"282",
 						"",
 						"",
 						"",
-						array (
-								"START" => array (
+						array(
+								"START" => array(
 										"url" => "/freeswitch/fssipprofile_action/start/",
 										"mode" => "single" 
 								),
-								"STOP" => array (
+								"STOP" => array(
 										"url" => "/freeswitch/fssipprofile_action/stop/",
 										"mode" => "single" 
 								),
-								"RELOAD" => array (
+								"RELOAD" => array(
 										"url" => "/freeswitch/fssipprofile_action/reload/",
 										"mode" => "single" 
 								),
-								"RESCAN" => array (
+								"RESCAN" => array(
 										"url" => "/freeswitch/fssipprofile_action/rescan/",
 										"mode" => "single" 
 								) 
 						) 
 				),
-				array (
-						gettext ( "Action" ),
+				array(
+						gettext("Action"),
 						"202",
 						"",
 						"",
 						"",
-						array (
-								"EDIT" => array (
+						array(
+								"EDIT" => array(
 										"url" => "/freeswitch/fssipprofile_edit/",
 										"mode" => "" 
 								),
-								"DELETE" => array (
+								"DELETE" => array(
 										"url" => "/freeswitch/fssipprofile_delete/",
 										"mode" => "single" 
 								) 
 						) 
 				) 
-		) );
+		));
 		return $grid_field_arr;
 	}
 	function build_fssipprofile_grid_buttons() {
-		$buttons_json = json_encode ( array (
-				array (
-						gettext ( "Create" ),
+		$buttons_json = json_encode(array(
+				array(
+						gettext("Create"),
 						"btn btn-line-warning btn",
 						"fa fa-plus-circle fa-lg",
 						"button_action",
 						"/freeswitch/fssipprofile_add/",
 						"" 
 				),
-				array (
-						gettext ( "Delete" ),
+				array(
+						gettext("Delete"),
 						"btn btn-line-danger",
 						"fa fa-times-circle fa-lg",
 						"button_action",
 						"/freeswitch/fssipprofile_delete_multiple/" 
 				) 
-		) );
+		));
 		return $buttons_json;
 	}
 	function build_fssipprofile_params_list_for_admin() {
-		$grid_field_arr = json_encode ( array (
-				array (
-						gettext ( "Name" ),
+		$grid_field_arr = json_encode(array(
+				array(
+						gettext("Name"),
 						"450",
 						"name",
 						"",
 						"",
 						"" 
 				),
-				array (
-						gettext ( "Value" ),
+				array(
+						gettext("Value"),
 						"414",
 						"sip_ip",
 						"",
@@ -2117,20 +2117,20 @@ 
 						"" 
 				),
 				// array("SIP Port", "250", "sip_port", "", "", ""),
-				array (
-						gettext ( "Action" ),
+				array(
+						gettext("Action"),
 						"400",
 						"",
 						"",
 						"",
-						array (
-								"DELETE" => array (
+						array(
+								"DELETE" => array(
 										"url" => "/freeswitch/fssipprofile_delete/",
 										"mode" => "single" 
 								) 
 						) 
 				) 
-		) );
+		));
 		return $grid_field_arr;
 	}
 	/*
@@ -2139,9 +2139,9 @@ 
 	 */
 	function build_fsserver_list() {
 		// array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);
-		$grid_field_arr = json_encode ( array (
-				array (
-						gettext ( "Host" ),
+		$grid_field_arr = json_encode(array(
+				array(
+						gettext("Host"),
 						"200",
 						"freeswitch_host",
 						"",
@@ -2151,8 +2151,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Password" ),
+				array(
+						gettext("Password"),
 						"200",
 						"freeswitch_password",
 						"",
@@ -2162,8 +2162,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Port" ),
+				array(
+						gettext("Port"),
 						"200",
 						"freeswitch_port",
 						"",
@@ -2176,8 +2176,8 @@ 
 			/*

             ASTPP  3.0 .3 creation field show in grid

             */

-			array (
-						gettext ( "Status" ),
+			array(
+						gettext("Status"),
 						"145",
 						"status",
 						"status",
@@ -2187,8 +2187,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Created Date" ),
+				array(
+						gettext("Created Date"),
 						"170",
 						"creation_date",
 						"creation_date",
@@ -2198,8 +2198,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Modified Date" ),
+				array(
+						gettext("Modified Date"),
 						"170",
 						"last_modified_date",
 						"last_modified_date",
@@ -2213,33 +2213,33 @@ 
 				 * *****************************************************************
 				 */
 				
-				array (
-						gettext ( "Action" ),
+				array(
+						gettext("Action"),
 						"182",
 						"",
 						"",
 						"",
-						array (
-								"EDIT" => array (
+						array(
+								"EDIT" => array(
 										"url" => "/freeswitch/fsserver_edit/",
 										"mode" => "popup" 
 								),
-								"DELETE" => array (
+								"DELETE" => array(
 										"url" => "/freeswitch/fsserver_delete/",
 										"mode" => "single" 
 								) 
 						) 
 				) 
-		) );
+		));
 		return $grid_field_arr;
 	}
 	/**
 	 * ***********************************************
 	 */
 	function build_fsserver_grid_buttons() {
-		$buttons_json = json_encode ( array (
-				array (
-						gettext ( "Create" ),
+		$buttons_json = json_encode(array(
+				array(
+						gettext("Create"),
 						"btn btn-line-warning btn",
 						"fa fa-plus-circle fa-lg",
 						"button_action",
@@ -2252,18 +2252,18 @@ 
 		return $buttons_json;
 	}
 	function get_form_fsserver_fields() {
-		$form ['forms'] = array (
-				base_url () . '/freeswitch/fsserver_save/',
-				array (
+		$form ['forms'] = array(
+				base_url().'/freeswitch/fsserver_save/',
+				array(
 						"id" => "fsserver_form",
 						"name" => "fsserver_form" 
 				) 
 		);
-		$form [gettext ( 'Freeswitch Server Information' )] = array (
-				array (
+		$form [gettext('Freeswitch Server Information')] = array(
+				array(
 						'',
 						'HIDDEN',
-						array (
+						array(
 								'name' => 'id' 
 						),
 						'',
@@ -2271,10 +2271,10 @@ 
 						'',
 						'' 
 				),
-				array (
-						gettext ( 'Host' ),
+				array(
+						gettext('Host'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'freeswitch_host',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -2283,10 +2283,10 @@ 
 						'tOOL TIP',
 						'Please Enter account number' 
 				),
-				array (
-						gettext ( 'Password' ),
+				array(
+						gettext('Password'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'freeswitch_password',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -2295,10 +2295,10 @@ 
 						'tOOL TIP',
 						'Please Enter account number' 
 				),
-				array (
-						gettext ( 'Port' ),
+				array(
+						gettext('Port'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'freeswitch_port',
 								'size' => '20',
 								'class' => "text field medium" 
@@ -2309,17 +2309,17 @@ 
 				) 
 		);
 		
-		$form ['button_cancel'] = array (
+		$form ['button_cancel'] = array(
 				'name' => 'action',
-				'content' => gettext ( 'Close' ),
+				'content' => gettext('Close'),
 				'value' => 'cancel',
 				'type' => 'button',
 				'class' => 'btn btn-line-sky margin-x-10',
 				'onclick' => 'return redirect_page(\'NULL\')' 
 		);
-		$form ['button_save'] = array (
+		$form ['button_save'] = array(
 				'name' => 'action',
-				'content' => gettext ( 'Save' ),
+				'content' => gettext('Save'),
 				'value' => 'save',
 				'id' => 'submit',
 				'type' => 'button',
@@ -2329,17 +2329,17 @@ 
 		return $form;
 	}
 	function get_search_fsserver_form() {
-		$form ['forms'] = array (
+		$form ['forms'] = array(
 				"",
-				array (
+				array(
 						'id' => "fsserver_search" 
 				) 
 		);
-		$form [gettext ( 'Search' )] = array (
-				array (
-						gettext ( 'Host' ),
+		$form [gettext('Search')] = array(
+				array(
+						gettext('Host'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'freeswitch_host[freeswitch_host]',
 								'',
 								'id' => 'first_name',
@@ -2356,10 +2356,10 @@ 
 						'search_string_type',
 						'' 
 				),
-				array (
-						gettext ( 'Port' ),
+				array(
+						gettext('Port'),
 						'INPUT',
-						array (
+						array(
 								'name' => 'freeswitch_port[freeswitch_port]',
 								'value' => '',
 								'size' => '20',
@@ -2375,8 +2375,8 @@ 
 						'search_string_type',
 						'' 
 				),
-				array (
-						gettext ( 'Status' ),
+				array(
+						gettext('Status'),
 						'status',
 						'SELECT',
 						'',
@@ -2388,7 +2388,7 @@ 
 						'',
 						'set_search_status' 
 				),
-				array (
+				array(
 						'',
 						'HIDDEN',
 						'ajax_search',
@@ -2397,7 +2397,7 @@ 
 						'',
 						'' 
 				),
-				array (
+				array(
 						'',
 						'HIDDEN',
 						'advance_search',
@@ -2407,18 +2407,18 @@ 
 						'' 
 				) 
 		);
-		$form ['button_search'] = array (
+		$form ['button_search'] = array(
 				'name' => 'action',
 				'id' => "fsserver_search_btn",
-				'content' => gettext ( 'Search' ),
+				'content' => gettext('Search'),
 				'value' => 'save',
 				'type' => 'button',
 				'class' => 'btn btn-line-parrot pull-right' 
 		);
-		$form ['button_reset'] = array (
+		$form ['button_reset'] = array(
 				'name' => 'action',
 				'id' => "id_reset",
-				'content' => gettext ( 'Clear' ),
+				'content' => gettext('Clear'),
 				'value' => 'cancel',
 				'type' => 'reset',
 				'class' => 'btn btn-line-sky pull-right margin-x-10' 
@@ -2431,8 +2431,8 @@ 
 	 * CHanges in grid size
 	 */
 	function build_devices_list_for_customer() {
-		$grid_field_arr = json_encode ( array (
-				array (
+		$grid_field_arr = json_encode(array(
+				array(
 						"<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>",
 						"30",
 						"",
@@ -2443,8 +2443,8 @@ 
 						"false",
 						"center" 
 				),
-				array (
-						gettext ( "User Name" ),
+				array(
+						gettext("User Name"),
 						"100",
 						"username",
 						"",
@@ -2454,8 +2454,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Password" ),
+				array(
+						gettext("Password"),
 						"100",
 						"password",
 						"",
@@ -2465,8 +2465,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "SIP Profile" ),
+				array(
+						gettext("SIP Profile"),
 						"90",
 						"sip_profile_id",
 						"name",
@@ -2476,8 +2476,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Caller Name" ),
+				array(
+						gettext("Caller Name"),
 						"100",
 						"effective_caller_id_name",
 						"",
@@ -2487,8 +2487,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Caller Number" ),
+				array(
+						gettext("Caller Number"),
 						"100",
 						"effective_caller_id_number",
 						"",
@@ -2498,8 +2498,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Voicemail" ),
+				array(
+						gettext("Voicemail"),
 						"100",
 						"voicemail_enabled",
 						"",
@@ -2510,8 +2510,8 @@ 
 						"center" 
 				),
 				// array("Call Waiting", "105", "call_waiting", "", "", ""),
-				array (
-						gettext ( "Status" ),
+				array(
+						gettext("Status"),
 						"100",
 						"status",
 						"",
@@ -2521,8 +2521,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Created Date" ),
+				array(
+						gettext("Created Date"),
 						"100",
 						"creation_date",
 						"creation_date",
@@ -2532,8 +2532,8 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Modified Date" ),
+				array(
+						gettext("Modified Date"),
 						"100",
 						"last_modified_date",
 						"last_modified_date",
@@ -2543,24 +2543,24 @@ 
 						"true",
 						"center" 
 				),
-				array (
-						gettext ( "Action" ),
+				array(
+						gettext("Action"),
 						"110",
 						"",
 						"",
 						"",
-						array (
-								"EDIT" => array (
+						array(
+								"EDIT" => array(
 										"url" => "/accounts/fssipdevices_action/edit/",
 										"mode" => "single" 
 								),
-								"DELETE" => array (
+								"DELETE" => array(
 										"url" => "/accounts/fssipdevices_action/delete/",
 										"mode" => "single" 
 								) 
 						) 
 				) 
-		) );
+		));
 		return $grid_field_arr;
 	}
 	
@@ -2570,23 +2570,23 @@ 
 	function fsdevice_form_fields_for_customer($accountid, $id = false) {
 		
 		// $val = $id > 0 ? 'sip_devices.username.' . $id : 'sip_devices.username';
-		$val = $id > 0 ? 'sip_devices.username.' . $id : 'sip_devices.username';
-		$uname_user = $this->CI->common->find_uniq_rendno ( '10', '', '' );
-		$password = $this->CI->common->generate_password ();
-		if ($this->CI->session->userdata ( "logintype" ) == '0' || $this->CI->session->userdata ( "logintype" ) == '3') {
-			$link = base_url () . 'freeswitch/user_fssipdevices_save/true';
-			$form ['forms'] = array (
+		$val = $id > 0 ? 'sip_devices.username.'.$id : 'sip_devices.username';
+		$uname_user = $this->CI->common->find_uniq_rendno('10', '', '');
+		$password = $this->CI->common->generate_password();
+		if ($this->CI->session->userdata("logintype") == '0' || $this->CI->session->userdata("logintype") == '3') {
+			$link = base_url().'freeswitch/user_fssipdevices_save/true';
+			$form ['forms'] = array(
 					$link,
-					array (
+					array(
 							"id" => "sipdevices_form",
 							"name" => "sipdevices_form" 
 					) 
 			);
-			$form [gettext ( 'Device Information' )] = array (
-					array (
+			$form [gettext('Device Information')] = array(
+					array(
 							'',
 							'HIDDEN',
-							array (
+							array(
 									'name' => 'id' 
 							),
 							'',
@@ -2594,10 +2594,10 @@ 
 							'',
 							'' 
 					),
-					array (
+					array(
 							'',
 							'HIDDEN',
-							array (
+							array(
 									'name' => 'accountcode',
 									'value' => $accountid 
 							),
@@ -2606,25 +2606,25 @@ 
 							'',
 							'' 
 					),
-					array (
-							gettext ( 'Username' ),
+					array(
+							gettext('Username'),
 							'INPUT',
-							array (
+							array(
 									'name' => 'fs_username',
 									'size' => '20',
 									'value' => $uname_user,
 									'id' => 'username',
 									'class' => "text field medium" 
 							),
-							'trim|required|is_unique[' . $val . ']|xss_clean',
+							'trim|required|is_unique['.$val.']|xss_clean',
 							'tOOL TIP',
 							'Please Enter account number',
 							'<i style="cursor:pointer;color:#1BCB61 !important;font-size:14px; padding-left:5px; padding-top:8px; float:left; " title="Reset Password" class="change_number fa fa-refresh"></i>' 
 					),
-					array (
-							gettext ( 'Password' ),
+					array(
+							gettext('Password'),
 							'INPUT',
-							array (
+							array(
 									'name' => 'fs_password',
 									'size' => '20',
 									'id' => 'password1',
@@ -2636,10 +2636,10 @@ 
 							'Please Enter Password',
 							'<i style="cursor:pointer;color:#1BCB61 !important;  font-size:14px;    padding-left:5px;    padding-top:8px;    float:left;" title="Reset Password" class="change_pass fa fa-refresh"></i>' 
 					),
-					array (
-							gettext ( 'Caller Name' ),
+					array(
+							gettext('Caller Name'),
 							'INPUT',
-							array (
+							array(
 									'name' => 'effective_caller_id_name',
 									'size' => '20',
 									'class' => "text field medium" 
@@ -2648,10 +2648,10 @@ 
 							'tOOL TIP',
 							'Please Enter account number' 
 					),
-					array (
-							gettext ( 'Caller Number' ),
+					array(
+							gettext('Caller Number'),
 							'INPUT',
-							array (
+							array(
 									'name' => 'effective_caller_id_number',
 									'size' => '20',
 									'class' => "text field medium" 
@@ -2661,8 +2661,8 @@ 
 							'Please Enter account number' 
 					),
 					// array('Call Waiting', 'call_waiting', 'SELECT', '', '', 'tOOL TIP', 'Please Select Status', '', '', '', 'set_call_waiting'),
-					array (
-							gettext ( 'Status' ),
+					array(
+							gettext('Status'),
 							'status',
 							'SELECT',
 							'',
@@ -2681,10 +2681,10 @@ 
 			 * Voicemail add edit
 			 * *****
 			 */
-			$form [gettext ( 'Voicemail Options' )] = array (
+			$form [gettext('Voicemail Options')] = array(
 					
-					array (
-							gettext ( 'Enable' ),
+					array(
+							gettext('Enable'),
 							'voicemail_enabled',
 							'SELECT',
 							'',
@@ -2697,10 +2697,10 @@ 
 							'set_sip_config_option' 
 					),
 					
-					array (
-							gettext ( 'Password' ),
+					array(
+							gettext('Password'),
 							'INPUT',
-							array (
+							array(
 									'name' => 'voicemail_password',
 									'size' => '20',
 									'class' => "text field medium" 
@@ -2709,10 +2709,10 @@ 
 							'tOOL TIP',
 							'Please Enter account number' 
 					),
-					array (
-							gettext ( 'Mail To' ),
+					array(
+							gettext('Mail To'),
 							'INPUT',
-							array (
+							array(
 									'name' => 'voicemail_mail_to',
 									'size' => '20',
 									'class' => "text field medium" 
@@ -2722,8 +2722,8 @@ 
 							'Please Enter account number' 
 					),
 					
-					array (
-							gettext ( 'Attach File' ),
+					array(
+							gettext('Attach File'),
 							'voicemail_attach_file',
 							'SELECT',
 							'',
@@ -2735,8 +2735,8 @@ 
 							'',
 							'custom_status_voicemail' 
 					),
-					array (
-							gettext ( 'Local After Email' ),
+					array(
+							gettext('Local After Email'),
 							'vm_keep_local_after_email',
 							'SELECT',
 							'',
@@ -2749,11 +2749,11 @@ 
 							'custom_status_voicemail' 
 					),
 					
-					array (
-							gettext ( 'Send all Message' ),
+					array(
+							gettext('Send all Message'),
 							'vm_send_all_message',
 							'CHECKBOX',
-							array (
+							array(
 									'name' => 'vm_send_all_message',
 									'value' => 'on',
 									'checked' => false 
@@ -2775,7 +2775,7 @@ 
 			if ($accountid) {
 				$account_Arr = null;
 			} else {
-				$account_Arr = array (
+				$account_Arr = array(
 						'Account',
 						'accountcode',
 						'SELECT',
@@ -2788,18 +2788,18 @@ 
 						'accounts',
 						'build_concat_dropdown',
 						'where_arr',
-						array (
+						array(
 								"reseller_id" => "0",
 								"type" => "0",
 								"deleted" => "0" 
 						) 
 				);
 			}
-			if ($this->CI->session->userdata ( "logintype" ) == '1') {
+			if ($this->CI->session->userdata("logintype") == '1') {
 				$sip_pro = null;
-				$link = base_url () . 'freeswitch/customer_fssipdevices_save/true';
+				$link = base_url().'freeswitch/customer_fssipdevices_save/true';
 			} else {
-				$sip_pro = array (
+				$sip_pro = array(
 						'SIP Profile',
 						'sip_profile_id',
 						'SELECT',
@@ -2814,21 +2814,21 @@ 
 						'',
 						'' 
 				);
-				$link = base_url () . 'freeswitch/fssipdevices_save/true';
+				$link = base_url().'freeswitch/fssipdevices_save/true';
 			}
-			$form ['forms'] = array (
+			$form ['forms'] = array(
 					$link,
-					array (
+					array(
 							"id" => "sipdevices_form",
 							"name" => "sipdevices_form" 
 					) 
 			);
 			/* Add sipdevice */
-			$form [gettext ( 'Device Information' )] = array (
-					array (
+			$form [gettext('Device Information')] = array(
+					array(
 							'',
 							'HIDDEN',
-							array (
+							array(
 									'name' => 'id' 
 							),
 							'',
@@ -2836,10 +2836,10 @@ 
 							'',
 							'' 
 					),
-					array (
+					array(
 							'',
 							'HIDDEN',
-							array (
+							array(
 									'name' => 'accountcode',
 									'value' => $accountid 
 							),
@@ -2848,25 +2848,25 @@ 
 							'',
 							'' 
 					),
-					array (
-							gettext ( 'Username' ),
+					array(
+							gettext('Username'),
 							'INPUT',
-							array (
+							array(
 									'name' => 'fs_username',
 									'size' => '20',
 									'value' => $uname_user,
 									'id' => 'username1',
 									'class' => "text field medium" 
 							),
-							'trim|required|is_unique[' . $val . ']|xss_clean',
+							'trim|required|is_unique['.$val.']|xss_clean',
 							'tOOL TIP',
 							'Please Enter account number',
 							'<i style="cursor:pointer; color:#1BCB61; font-size:14px; padding-left:5px;  padding-top:8px; float:left;" title="Reset Password" class="change_number fa fa-refresh"></i>' 
 					),
-					array (
-							gettext ( 'Password' ),
+					array(
+							gettext('Password'),
 							'INPUT',
-							array (
+							array(
 									'name' => 'fs_password',
 									'size' => '20',
 									'id' => 'password1',
@@ -2878,10 +2878,10 @@ 
 							'Please Enter Password',
 							'<i style="cursor:pointer; color:#1BCB61; font-size:14px; padding-left:5px;padding-top:8px; float:left;" title="Reset Password" class="change_pass fa fa-refresh"></i>' 
 					),
-					array (
-							gettext ( 'Caller Name' ),
+					array(
+							gettext('Caller Name'),
 							'INPUT',
-							array (
+							array(
 									'name' => 'effective_caller_id_name',
 									'size' => '20',
 									'class' => "text field medium" 
@@ -2890,10 +2890,10 @@ 
 							'tOOL TIP',
 							'Please Enter account number' 
 					),
-					array (
-							gettext ( 'Caller Number' ),
+					array(
+							gettext('Caller Number'),
 							'INPUT',
-							array (
+							array(
 									'name' => 'effective_caller_id_number',
 									'size' => '20',
 									'class' => "text field medium" 
@@ -2903,8 +2903,8 @@ 
 							'Please Enter account number' 
 					),
 					$account_Arr,
-					array (
-							gettext ( 'Status' ),
+					array(
+							gettext('Status'),
 							'status',
 							'SELECT',
 							'',
@@ -2924,9 +2924,9 @@ 
 			 * Voicemail add edit
 			 * *****
 			 */
-			$form [gettext ( 'Voicemail Options' )] = array (
-					array (
-							gettext ( 'Enable' ),
+			$form [gettext('Voicemail Options')] = array(
+					array(
+							gettext('Enable'),
 							'voicemail_enabled',
 							'SELECT',
 							'',
@@ -2938,10 +2938,10 @@ 
 							'',
 							'set_sip_config_option' 
 					),
-					array (
-							gettext ( 'Password' ),
+					array(
+							gettext('Password'),
 							'INPUT',
-							array (
+							array(
 									'name' => 'voicemail_password',
 									'size' => '20',
 									'class' => "text field medium" 
@@ -2950,10 +2950,10 @@ 
 							'tOOL TIP',
 							'PleaseEnter account number' 
 					),
-					array (
-							gettext ( 'Mail To' ),
+					array(
+							gettext('Mail To'),
 							'INPUT',
-							array (
+							array(
 									'name' => 'voicemail_mail_to',
 									'size' => '20',
 									'class' => "text field medium" 
@@ -2962,8 +2962,8 @@ 
 							'tOOL TIP',
 							'Please Enter account number' 
 					),
-					array (
-							gettext ( 'Attach File' ),
+					array(
+							gettext('Attach File'),
 							'voicemail_attach_file',
 							'SELECT',
 							'',
@@ -2976,8 +2976,8 @@ 
 							'custom_status_voicemail' 
 					),
 					// array('Local After Email', 'vm_keep_local_after_email', 'CHECKBOX', array('name' => 'vm_keep_local_after_email', 'value' => 'on', 'checked' => false), '', 'tOOL TIP', 'Please Select Status', 'custom_status_true', '', '', ''),
-					array (
-							gettext ( 'Local After Email' ),
+					array(
+							gettext('Local After Email'),
 							'vm_keep_local_after_email',
 							'SELECT',
 							'',
@@ -2991,8 +2991,8 @@ 
 					),
 					// array('Send all Message', 'vm_send_all_message', 'CHECKBOX', array('name' => 'vm_send_all_message', 'value' => 'on', 'checked' => false), '', 'tOOL TIP', 'Please Select Status', 'custom_status_true', '', '', ''),
 					
-					array (
-							gettext ( 'Send all Message' ),
+					array(
+							gettext('Send all Message'),
 							'vm_send_all_message',
 							'SELECT',
 							'',
@@ -3011,17 +3011,17 @@ 
 		 */
 		}
 		
-		$form ['button_cancel'] = array (
+		$form ['button_cancel'] = array(
 				'name' => 'action',
-				'content' => gettext ( 'Close' ),
+				'content' => gettext('Close'),
 				'value' => 'cancel',
 				'type' => 'button',
 				'class' => 'btn btn-line-sky margin-x-10',
 				'onclick' => 'return redirect_page(\'NULL\')' 
 		);
-		$form ['button_save'] = array (
+		$form ['button_save'] = array(
 				'name' => 'action',
-				'content' => gettext ( 'Save' ),
+				'content' => gettext('Save'),
 				'value' => 'save',
 				'id' => 'submit',
 				'type' => 'button',

Braces +2 added lines, -1 removed lines

@@ -21,8 +21,9 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 // ##############################################################################
-if (! defined ( 'BASEPATH' ))
+if (! defined ( 'BASEPATH' )) {
 	exit ( 'No direct script access allowed' );
+}
 class Freeswitch_form {
 	function __construct() {
 		$this->CI = & get_instance ();

web_interface/astpp/application/modules/reports/models/reports_model.php

Indentation +2 added lines, -2 removed lines

@@ -262,6 +262,6 @@
 		return $query;
 	}
 /**
- * **********************************************************************
- */
+	 * **********************************************************************
+	 */
 }

Spacing +86 added lines, -86 removed lines

@@ -22,7 +22,7 @@ 
 // ##############################################################################
 class Reports_model extends CI_Model {
 	function Reports_model() {
-		parent::__construct ();
+		parent::__construct();
 	}
 	/**
 	 * ASTPP 3.0
@@ -30,112 +30,112 @@ 
 	 * *
 	 */
 	function getcustomer_cdrs($flag, $start, $limit, $export = false) {
-		$this->db_model->build_search ( 'customer_cdr_list_search' );
-		$account_data = $this->session->userdata ( "accountinfo" );
+		$this->db_model->build_search('customer_cdr_list_search');
+		$account_data = $this->session->userdata("accountinfo");
 		$where ['reseller_id'] = $account_data ['type'] == 1 ? $account_data ['id'] : 0;
 		// $where['type']=0;
-		if ($this->session->userdata ( 'advance_search' ) != 1) {
-			$where ['callstart >= '] = date ( "Y-m-d" ) . " 00:00:00";
-			$where ['callstart <='] = date ( "Y-m-d" ) . " 23:59:59";
+		if ($this->session->userdata('advance_search') != 1) {
+			$where ['callstart >= '] = date("Y-m-d")." 00:00:00";
+			$where ['callstart <='] = date("Y-m-d")." 23:59:59";
 		}
 		
-		$types = array (
+		$types = array(
 				'0',
 				'3' 
 		);
 		// $this->db->or_where_in('type', $types);
-		$this->db->where_in ( 'type', $types );
+		$this->db->where_in('type', $types);
 		
-		$this->db->where ( $where );
-		if (isset ( $_GET ['sortname'] ) && $_GET ['sortname'] != 'undefined') {
-			$this->db->order_by ( $_GET ['sortname'], ($_GET ['sortorder'] == 'undefined') ? 'desc' : $_GET ['sortorder'] );
+		$this->db->where($where);
+		if (isset ($_GET ['sortname']) && $_GET ['sortname'] != 'undefined') {
+			$this->db->order_by($_GET ['sortname'], ($_GET ['sortorder'] == 'undefined') ? 'desc' : $_GET ['sortorder']);
 		} else {
-			$this->db->order_by ( "callstart desc" );
+			$this->db->order_by("callstart desc");
 		}
 		if ($flag) {
-			if (! $export)
-				$this->db->limit ( $limit, $start );
+			if ( ! $export)
+				$this->db->limit($limit, $start);
 				// Add is_recording for enabled recording.
-			$this->db->select ( 'callstart,callerid,callednum,pattern,notes,billseconds,disposition,debit,cost,accountid,pricelist_id,calltype,trunk_id,uniqueid' );
+			$this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,debit,cost,accountid,pricelist_id,calltype,trunk_id,uniqueid');
 		} else {
-			$this->db->select ( 'count(*) as count,sum(billseconds) as billseconds,sum(debit) as total_debit,sum(cost) as total_cost,group_concat(distinct(pricelist_id)) as pricelist_ids,group_concat(distinct(trunk_id)) as trunk_ids,group_concat(distinct(accountid)) as accounts_ids' );
+			$this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(debit) as total_debit,sum(cost) as total_cost,group_concat(distinct(pricelist_id)) as pricelist_ids,group_concat(distinct(trunk_id)) as trunk_ids,group_concat(distinct(accountid)) as accounts_ids');
 		}
-		$result = $this->db->get ( 'cdrs' );
+		$result = $this->db->get('cdrs');
 		return $result;
 	}
 	/*
 	 * Below function using by Detail reseller report
 	 */
 	function getreseller_cdrs($flag, $start, $limit, $export = false) {
-		$this->db_model->build_search ( 'reseller_cdr_list_search' );
-		$account_data = $this->session->userdata ( "accountinfo" );
+		$this->db_model->build_search('reseller_cdr_list_search');
+		$account_data = $this->session->userdata("accountinfo");
 		$where ['reseller_id'] = $account_data ['type'] == 1 ? $account_data ['id'] : 0;
 		$where ["accountid <>"] = $account_data ['type'] == 1 ? $account_data ['id'] : 0;
-		if ($this->session->userdata ( 'advance_search' ) != 1) {
-			$where ['callstart >= '] = date ( "Y-m-d" ) . " 00:00:00";
-			$where ['callstart <='] = date ( "Y-m-d" ) . " 23:59:59";
+		if ($this->session->userdata('advance_search') != 1) {
+			$where ['callstart >= '] = date("Y-m-d")." 00:00:00";
+			$where ['callstart <='] = date("Y-m-d")." 23:59:59";
 		}
-		$this->db->where ( $where );
-		if (isset ( $_GET ['sortname'] ) && $_GET ['sortname'] != 'undefined') {
-			$this->db->order_by ( $_GET ['sortname'], ($_GET ['sortorder'] == 'undefined') ? 'desc' : $_GET ['sortorder'] );
+		$this->db->where($where);
+		if (isset ($_GET ['sortname']) && $_GET ['sortname'] != 'undefined') {
+			$this->db->order_by($_GET ['sortname'], ($_GET ['sortorder'] == 'undefined') ? 'desc' : $_GET ['sortorder']);
 		} else {
-			$this->db->order_by ( "callstart desc" );
+			$this->db->order_by("callstart desc");
 		}
 		if ($flag) {
-			if (! $export)
-				$this->db->limit ( $limit, $start );
-			$this->db->select ( 'callstart,callerid,callednum,pattern,notes,billseconds,disposition,debit,cost,accountid,pricelist_id,calltype' );
+			if ( ! $export)
+				$this->db->limit($limit, $start);
+			$this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,debit,cost,accountid,pricelist_id,calltype');
 		} else {
-			$this->db->select ( 'count(*) as count,sum(billseconds) as billseconds,sum(debit) as total_debit,sum(cost) as total_cost,group_concat(distinct(pricelist_id)) as pricelist_ids' );
+			$this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(debit) as total_debit,sum(cost) as total_cost,group_concat(distinct(pricelist_id)) as pricelist_ids');
 		}
-		$result = $this->db->get ( 'reseller_cdrs' );
+		$result = $this->db->get('reseller_cdrs');
 		return $result;
 	}
 	/*
 	 * Below function using by Detail provider report
 	 */
 	function getprovider_cdrs($flag, $start, $limit, $export = false) {
-		$this->db_model->build_search ( 'provider_cdr_list_search' );
-		$account_data = $this->session->userdata ( "accountinfo" );
-		$where = array ();
+		$this->db_model->build_search('provider_cdr_list_search');
+		$account_data = $this->session->userdata("accountinfo");
+		$where = array();
 		if ($account_data ['type'] == 3) {
 			$where ['provider_id'] = $account_data ['id'];
 		}
 		
-		if ($this->session->userdata ( 'advance_search' ) != 1) {
-			$where ['callstart >= '] = date ( "Y-m-d" ) . " 00:00:00";
-			$where ['callstart <='] = date ( "Y-m-d" ) . " 23:59:59";
+		if ($this->session->userdata('advance_search') != 1) {
+			$where ['callstart >= '] = date("Y-m-d")." 00:00:00";
+			$where ['callstart <='] = date("Y-m-d")." 23:59:59";
 		}
-		$this->db->where ( 'trunk_id !=', '' );
-		$this->db->where ( $where );
-		if (isset ( $_GET ['sortname'] ) && $_GET ['sortname'] != 'undefined') {
-			$this->db->order_by ( $_GET ['sortname'], ($_GET ['sortorder'] == 'undefined') ? 'desc' : $_GET ['sortorder'] );
+		$this->db->where('trunk_id !=', '');
+		$this->db->where($where);
+		if (isset ($_GET ['sortname']) && $_GET ['sortname'] != 'undefined') {
+			$this->db->order_by($_GET ['sortname'], ($_GET ['sortorder'] == 'undefined') ? 'desc' : $_GET ['sortorder']);
 		} else {
-			$this->db->order_by ( "callstart desc" );
+			$this->db->order_by("callstart desc");
 		}
 		if ($flag) {
-			if (! $export)
-				$this->db->limit ( $limit, $start );
-			$this->db->select ( 'callstart,callerid,callednum,pattern,notes,billseconds,provider_call_cost,disposition,provider_id,cost' );
+			if ( ! $export)
+				$this->db->limit($limit, $start);
+			$this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,provider_call_cost,disposition,provider_id,cost');
 		} else {
-			$this->db->select ( 'count(*) as count,sum(billseconds) as billseconds,sum(cost) as total_cost' );
+			$this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(cost) as total_cost');
 		}
-		$result = $this->db->get ( 'cdrs' );
+		$result = $this->db->get('cdrs');
 		// echo $this->db->last_query();
 		return $result;
 	}
 	function users_cdrs_list($flag, $accountid, $entity_type, $start, $limit) {
-		$where = "callstart >= '" . date ( 'Y-m-d 00:00:00' ) . "' AND callstart <='" . date ( 'Y-m-d 23:59:59' ) . "' AND ";
+		$where = "callstart >= '".date('Y-m-d 00:00:00')."' AND callstart <='".date('Y-m-d 23:59:59')."' AND ";
 		$account_type = $entity_type == 'provider' ? 'provider_id' : 'accountid';
-		$where .= "accountid = '" . $accountid . "' ";
+		$where .= "accountid = '".$accountid."' ";
 		// ~ if($entity_type == 'provider'){
 		// ~ $where.="OR provider_id = '".$accountid."'";
 		// ~ }
 		$table = $entity_type == 'reseller' ? 'reseller_cdrs' : 'cdrs';
 		if ($flag) {
-			$query = $this->db_model->select ( "*", $table, $where, "callstart", "DESC", $limit, $start );
+			$query = $this->db_model->select("*", $table, $where, "callstart", "DESC", $limit, $start);
 		} else {
-			$query = $this->db_model->countQuery ( "*", $table, $where );
+			$query = $this->db_model->countQuery("*", $table, $where);
 		}
 		return $query;
 	}
@@ -147,30 +147,30 @@ 
 	 * *****
 	 */
 	function getuser_refill_list($flag, $start, $limit) {
-		$this->db_model->build_search ( 'cdr_refill_search' );
-		$account_data = $this->session->userdata ( "accountinfo" );
-		$this->db_model->build_search ( 'customer_cdr_list_search' );
-		$where = array (
+		$this->db_model->build_search('cdr_refill_search');
+		$account_data = $this->session->userdata("accountinfo");
+		$this->db_model->build_search('customer_cdr_list_search');
+		$where = array(
 				"accountid" => $account_data ["id"] 
 		);
 		if ($flag) {
-			$query = $this->db_model->select ( "*", "payments", $where, "payment_date", "DESC", $limit, $start );
+			$query = $this->db_model->select("*", "payments", $where, "payment_date", "DESC", $limit, $start);
 		} else {
-			$query = $this->db_model->countQuery ( "*", "payments", $where );
+			$query = $this->db_model->countQuery("*", "payments", $where);
 		}
 		return $query;
 	}
 	function get_refill_list($flag, $start, $limit, $export = false) {
-		$this->db_model->build_search ( 'cdr_refill_search' );
-		$accountinfo = $this->session->userdata ( 'accountinfo' );
+		$this->db_model->build_search('cdr_refill_search');
+		$accountinfo = $this->session->userdata('accountinfo');
 		$where ['payment_by'] = $accountinfo ['type'] == 1 ? $accountinfo ['id'] : - 1;
 		if ($flag) {
 			if ($export)
-				$query = $this->db_model->select ( "*", "payments", $where, "payment_date", "DESC", "", "" );
+				$query = $this->db_model->select("*", "payments", $where, "payment_date", "DESC", "", "");
 			else
-				$query = $this->db_model->select ( "*", "payments", $where, "payment_date", "DESC", $limit, $start );
+				$query = $this->db_model->select("*", "payments", $where, "payment_date", "DESC", $limit, $start);
 		} else {
-			$query = $this->db_model->countQuery ( "*", "payments", $where );
+			$query = $this->db_model->countQuery("*", "payments", $where);
 		}
 		
 		return $query;
@@ -179,17 +179,17 @@ 
 	 * ***************
 	 */
 	function getreseller_commission_list($flag, $start, $limit) {
-		$this->db_model->build_search ( 'reseller_commission_search' );
-		if ($this->session->userdata ( 'logintype' ) == 1 || $this->session->userdata ( 'logintype' ) == 5) {
+		$this->db_model->build_search('reseller_commission_search');
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
 			$accountinfo = $this->session->userdata ['accountinfo'];
 			$reseller_id = $accountinfo ["id"];
 		} else {
 			$reseller_id = "0";
 		}
 		if ($flag) {
-			$query = $this->db_model->select_by_in ( "*", "commission", "", "date", "DESC", $limit, $start, "", "reseller_id", $reseller_id );
+			$query = $this->db_model->select_by_in("*", "commission", "", "date", "DESC", $limit, $start, "", "reseller_id", $reseller_id);
 		} else {
-			$query = $this->db_model->countQuery_by_in ( "*", "commission", "", "reseller_id", $reseller_id );
+			$query = $this->db_model->countQuery_by_in("*", "commission", "", "reseller_id", $reseller_id);
 		}
 		
 		return $query;
@@ -201,26 +201,26 @@ 
 	 * **********
 	 */
 	function getcharges_list($flag, $start = 0, $limit = 0) {
-		$accountinfo = $this->session->userdata ( 'accountinfo' );
+		$accountinfo = $this->session->userdata('accountinfo');
 		$reseller_id = $accountinfo ['id'];
 		if ($accountinfo ['type'] == 1) {
 			$where ['reseller_id'] = $reseller_id;
 		} else {
 			$where ['reseller_id'] = 0;
 		}
-		if ($this->session->userdata ( 'advance_search' ) != 1) {
-			$where ['created_date >='] = gmdate ( "Y-m-01 00:00:01" );
-			$where ['created_date <='] = gmdate ( "Y-m-d 23:59:59" );
+		if ($this->session->userdata('advance_search') != 1) {
+			$where ['created_date >='] = gmdate("Y-m-01 00:00:01");
+			$where ['created_date <='] = gmdate("Y-m-d 23:59:59");
 		}
-		$this->db_model->build_search ( 'charges_list_search' );
-		$this->db->where ( $where );
+		$this->db_model->build_search('charges_list_search');
+		$this->db->where($where);
 		$whr = "( invoiceid =0 OR invoiceid in (  select id  from invoices where confirm = 1) )";
-		$this->db->where ( $whr );
-		$this->db->where ( 'item_type <>', 'STANDARD' );
+		$this->db->where($whr);
+		$this->db->where('item_type <>', 'STANDARD');
 		if ($flag) {
-			$query = $this->db_model->select ( '*', "invoice_details", "", "id", "DESC", $limit, $start );
+			$query = $this->db_model->select('*', "invoice_details", "", "id", "DESC", $limit, $start);
 		} else {
-			$query = $this->db_model->countQuery ( "*", "invoice_details", "" );
+			$query = $this->db_model->countQuery("*", "invoice_details", "");
 		}
 		return $query;
 	}
@@ -233,30 +233,30 @@ 
 	 * This function using for customer edit
 	 */
 	function get_customer_charge_list($flag, $accountid, $start = 0, $limit = 0) {
-		$this->db_model->build_search ( 'charges_list_search' );
-		$accountinfo = $this->session->userdata ( 'accountinfo' );
+		$this->db_model->build_search('charges_list_search');
+		$accountinfo = $this->session->userdata('accountinfo');
 		$reseller_id = $accountinfo ['type'] == 1 ? $accountinfo ['id'] : 0;
 		$where ['reseller_id'] = $reseller_id;
 		$where ['accountid'] = $accountid;
-		if ($this->session->userdata ( 'advance_search' ) != 1) {
-			$where ['created_date >='] = gmdate ( "Y-m-1 00:00:00" );
-			$where ['created_date <='] = gmdate ( "Y-m-d 23:59:59" );
+		if ($this->session->userdata('advance_search') != 1) {
+			$where ['created_date >='] = gmdate("Y-m-1 00:00:00");
+			$where ['created_date <='] = gmdate("Y-m-d 23:59:59");
 		}
 		if ($flag) {
-			$query = $this->db_model->select ( "*", "invoice_details", $where, "id", "DESC", $limit, $start );
+			$query = $this->db_model->select("*", "invoice_details", $where, "id", "DESC", $limit, $start);
 		} else {
-			$query = $this->db_model->countQuery ( "*", "invoice_details", $where );
+			$query = $this->db_model->countQuery("*", "invoice_details", $where);
 		}
 		return $query;
 	}
 	function get_customer_refillreport($flag, $accountid, $start = 0, $limit = 0) {
-		$where = array (
+		$where = array(
 				"accountid" => $accountid 
 		);
 		if ($flag) {
-			$query = $this->db_model->select ( "*", "payments", $where, "payment_date", "DESC", $limit, $start );
+			$query = $this->db_model->select("*", "payments", $where, "payment_date", "DESC", $limit, $start);
 		} else {
-			$query = $this->db_model->countQuery ( "*", "payments", $where );
+			$query = $this->db_model->countQuery("*", "payments", $where);
 		}
 		
 		return $query;

Braces +14 added lines, -10 removed lines

@@ -53,8 +53,9 @@ 
 			$this->db->order_by ( "callstart desc" );
 		}
 		if ($flag) {
-			if (! $export)
-				$this->db->limit ( $limit, $start );
+			if (! $export) {
+							$this->db->limit ( $limit, $start );
+			}
 				// Add is_recording for enabled recording.
 			$this->db->select ( 'callstart,callerid,callednum,pattern,notes,billseconds,disposition,debit,cost,accountid,pricelist_id,calltype,trunk_id,uniqueid' );
 		} else {
@@ -82,8 +83,9 @@ 
 			$this->db->order_by ( "callstart desc" );
 		}
 		if ($flag) {
-			if (! $export)
-				$this->db->limit ( $limit, $start );
+			if (! $export) {
+							$this->db->limit ( $limit, $start );
+			}
 			$this->db->select ( 'callstart,callerid,callednum,pattern,notes,billseconds,disposition,debit,cost,accountid,pricelist_id,calltype' );
 		} else {
 			$this->db->select ( 'count(*) as count,sum(billseconds) as billseconds,sum(debit) as total_debit,sum(cost) as total_cost,group_concat(distinct(pricelist_id)) as pricelist_ids' );
@@ -114,8 +116,9 @@ 
 			$this->db->order_by ( "callstart desc" );
 		}
 		if ($flag) {
-			if (! $export)
-				$this->db->limit ( $limit, $start );
+			if (! $export) {
+							$this->db->limit ( $limit, $start );
+			}
 			$this->db->select ( 'callstart,callerid,callednum,pattern,notes,billseconds,provider_call_cost,disposition,provider_id,cost' );
 		} else {
 			$this->db->select ( 'count(*) as count,sum(billseconds) as billseconds,sum(cost) as total_cost' );
@@ -165,10 +168,11 @@ 
 		$accountinfo = $this->session->userdata ( 'accountinfo' );
 		$where ['payment_by'] = $accountinfo ['type'] == 1 ? $accountinfo ['id'] : - 1;
 		if ($flag) {
-			if ($export)
-				$query = $this->db_model->select ( "*", "payments", $where, "payment_date", "DESC", "", "" );
-			else
-				$query = $this->db_model->select ( "*", "payments", $where, "payment_date", "DESC", $limit, $start );
+			if ($export) {
+							$query = $this->db_model->select ( "*", "payments", $where, "payment_date", "DESC", "", "" );
+			} else {
+							$query = $this->db_model->select ( "*", "payments", $where, "payment_date", "DESC", $limit, $start );
+			}
 		} else {
 			$query = $this->db_model->countQuery ( "*", "payments", $where );
 		}

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

Indentation +2 added lines, -2 removed lines

@@ -1109,8 +1109,8 @@
 		echo json_encode ( $json_data );
 	}
 /**
- * ********************************************************
- */
+	 * ********************************************************
+	 */
 }
 ?>
  

Spacing +526 added lines, -526 removed lines

@@ -23,30 +23,30 @@ 
 // ##############################################################################
 class Reports extends MX_Controller {
 	function Reports() {
-		parent::__construct ();
+		parent::__construct();
 		
-		$this->load->helper ( 'template_inheritance' );
+		$this->load->helper('template_inheritance');
 		
-		$this->load->library ( 'session' );
-		$this->load->library ( "reports_form" );
-		$this->load->library ( 'astpp/form' );
-		$this->load->model ( 'reports_model' );
-		$this->load->library ( 'fpdf' );
-		$this->load->library ( 'pdf' );
-		$this->fpdf = new PDF ( 'P', 'pt' );
-		$this->fpdf->initialize ( 'P', 'mm', 'A4' );
+		$this->load->library('session');
+		$this->load->library("reports_form");
+		$this->load->library('astpp/form');
+		$this->load->model('reports_model');
+		$this->load->library('fpdf');
+		$this->load->library('pdf');
+		$this->fpdf = new PDF('P', 'pt');
+		$this->fpdf->initialize('P', 'mm', 'A4');
 		
-		if ($this->session->userdata ( 'user_login' ) == FALSE)
-			redirect ( base_url () . '/astpp/login' );
+		if ($this->session->userdata('user_login') == FALSE)
+			redirect(base_url().'/astpp/login');
 	}
 	function customerReport() {
-		$data ['page_title'] = gettext ( 'Customer CDRs Report' );
+		$data ['page_title'] = gettext('Customer CDRs Report');
 		$data ['search_flag'] = true;
-		$this->session->set_userdata ( 'advance_search', 0 );
-		$data ['grid_fields'] = $this->reports_form->build_report_list_for_customer ();
-		$data ["grid_buttons"] = $this->reports_form->build_grid_customer ();
-		$data ['form_search'] = $this->form->build_serach_form ( $this->reports_form->get_customer_cdr_form () );
-		$this->load->view ( 'view_cdr_customer_list', $data );
+		$this->session->set_userdata('advance_search', 0);
+		$data ['grid_fields'] = $this->reports_form->build_report_list_for_customer();
+		$data ["grid_buttons"] = $this->reports_form->build_grid_customer();
+		$data ['form_search'] = $this->form->build_serach_form($this->reports_form->get_customer_cdr_form());
+		$this->load->view('view_cdr_customer_list', $data);
 	}
 	
 	/*
@@ -56,86 +56,86 @@ 
 	 * ****
 	 */
 	function customerReport_json() {
-		$count_res = $this->reports_model->getcustomer_cdrs ( false, "", "" );
-		$accountinfo = $this->session->userdata ( 'accountinfo' );
-		$count_all = ( array ) $count_res->first_row ();
-		$paging_data = $this->form->load_grid_config ( $count_all ['count'], $_GET ['rp'], $_GET ['page'] );
+		$count_res = $this->reports_model->getcustomer_cdrs(false, "", "");
+		$accountinfo = $this->session->userdata('accountinfo');
+		$count_all = (array)$count_res->first_row();
+		$paging_data = $this->form->load_grid_config($count_all ['count'], $_GET ['rp'], $_GET ['page']);
 		$json_data = $paging_data ["json_paging"];
-		$query = $this->reports_model->getcustomer_cdrs ( true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"] );
-		if ($query->num_rows () > 0) {
+		$query = $this->reports_model->getcustomer_cdrs(true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"]);
+		if ($query->num_rows() > 0) {
 			// Initialization of Rategroup and Trunk Array
-			$pricelist_arr = array ();
-			$trunk_arr = array ();
+			$pricelist_arr = array();
+			$trunk_arr = array();
 			// Get search information from session.
-			$search_arr = $this->session->userdata ( 'customer_cdr_list_search' );
-			$show_seconds = (! empty ( $search_arr ['search_in'] )) ? $search_arr ['search_in'] : 'minutes';
-			$query = $query->result_array ();
+			$search_arr = $this->session->userdata('customer_cdr_list_search');
+			$show_seconds = ( ! empty ($search_arr ['search_in'])) ? $search_arr ['search_in'] : 'minutes';
+			$query = $query->result_array();
 			
-			$where = "id IN (" . $count_all ['pricelist_ids'] . ")";
-			$this->db->where ( $where );
-			$this->db->select ( 'id,name' );
-			$pricelist_res = $this->db->get ( 'pricelists' );
-			$pricelist_res = $pricelist_res->result_array ();
-			foreach ( $pricelist_res as $value ) {
+			$where = "id IN (".$count_all ['pricelist_ids'].")";
+			$this->db->where($where);
+			$this->db->select('id,name');
+			$pricelist_res = $this->db->get('pricelists');
+			$pricelist_res = $pricelist_res->result_array();
+			foreach ($pricelist_res as $value) {
 				$pricelist_arr [$value ['id']] = $value ['name'];
 			}
-			$where = "id IN (" . $count_all ['trunk_ids'] . ")";
-			$this->db->where ( $where );
-			$this->db->select ( 'id,name' );
-			$trunk_res = $this->db->get ( 'trunks' );
-			$trunk_res = $trunk_res->result_array ();
-			foreach ( $trunk_res as $value ) {
+			$where = "id IN (".$count_all ['trunk_ids'].")";
+			$this->db->where($where);
+			$this->db->select('id,name');
+			$trunk_res = $this->db->get('trunks');
+			$trunk_res = $trunk_res->result_array();
+			foreach ($trunk_res as $value) {
 				$trunk_arr [$value ['id']] = $value ['name'];
 			}
-			$where = "id IN (" . $count_all ['accounts_ids'] . ")";
-			$this->db->where ( $where );
-			$this->db->select ( 'id,number,first_name,last_name' );
-			$account_res = $this->db->get ( 'accounts' );
-			foreach ( $account_res->result_array () as $value ) {
-				$account_arr [$value ['id']] = $value ['first_name'] . " " . $value ['last_name'] . ' (' . $value ['number'] . ')';
+			$where = "id IN (".$count_all ['accounts_ids'].")";
+			$this->db->where($where);
+			$this->db->select('id,number,first_name,last_name');
+			$account_res = $this->db->get('accounts');
+			foreach ($account_res->result_array() as $value) {
+				$account_arr [$value ['id']] = $value ['first_name']." ".$value ['last_name'].' ('.$value ['number'].')';
 			}
 			
 			// Get Decimal points,system currency and user currency.
-			$currency_info = $this->common->get_currency_info ();
-			foreach ( $query as $value ) {
-				$duration = ($show_seconds == 'minutes') ? ($value ['billseconds'] > 0) ? sprintf ( '%02d', $value ['billseconds'] / 60 ) . ":" . sprintf ( '%02d', $value ['billseconds'] % 60 ) : "00:00" : $value ['billseconds'];
-				$account = isset ( $account_arr [$value ['accountid']] ) ? $account_arr [$value ['accountid']] : 'Anonymous';
+			$currency_info = $this->common->get_currency_info();
+			foreach ($query as $value) {
+				$duration = ($show_seconds == 'minutes') ? ($value ['billseconds'] > 0) ? sprintf ('%02d', $value ['billseconds'] / 60).":".sprintf('%02d', $value ['billseconds'] % 60) : "00:00" : $value ['billseconds'];
+				$account = isset ($account_arr [$value ['accountid']]) ? $account_arr [$value ['accountid']] : 'Anonymous';
 				$uid = $value ['uniqueid'];
 				if ($accountinfo ['type'] == 1) {
-					$json_data ['rows'] [] = array (
-							'cell' => array (
-									$this->common->convert_GMT_to ( '', '', $value ['callstart'] ),
+					$json_data ['rows'] [] = array(
+							'cell' => array(
+									$this->common->convert_GMT_to('', '', $value ['callstart']),
 									$value ['callerid'],
 									$value ['callednum'],
-									filter_var ( $value ['pattern'], FILTER_SANITIZE_NUMBER_INT ),
+									filter_var($value ['pattern'], FILTER_SANITIZE_NUMBER_INT),
 									$value ['notes'],
 									$duration,
-									$this->common->calculate_currency_manually ( $currency_info, $value ['debit'], false ),
-									$this->common->calculate_currency_manually ( $currency_info, $value ['cost'], false ),
+									$this->common->calculate_currency_manually($currency_info, $value ['debit'], false),
+									$this->common->calculate_currency_manually($currency_info, $value ['cost'], false),
 									$value ['disposition'],
 									$account,
 									// isset($trunk_arr[$value['trunk_id']]) ? $trunk_arr[$value['trunk_id']] : '',
-									isset ( $pricelist_arr [$value ['pricelist_id']] ) ? $pricelist_arr [$value ['pricelist_id']] : '',
+									isset ($pricelist_arr [$value ['pricelist_id']]) ? $pricelist_arr [$value ['pricelist_id']] : '',
 									$value ['calltype'] 
 							)
 							// $recording,
 							 
 					);
 				} else {
-					$json_data ['rows'] [] = array (
-							'cell' => array (
-									$this->common->convert_GMT_to ( '', '', $value ['callstart'] ),
+					$json_data ['rows'] [] = array(
+							'cell' => array(
+									$this->common->convert_GMT_to('', '', $value ['callstart']),
 									$value ['callerid'],
 									$value ['callednum'],
-									filter_var ( $value ['pattern'], FILTER_SANITIZE_NUMBER_INT ),
+									filter_var($value ['pattern'], FILTER_SANITIZE_NUMBER_INT),
 									$value ['notes'],
 									$duration,
-									$this->common->calculate_currency_manually ( $currency_info, $value ['debit'], false ),
-									$this->common->calculate_currency_manually ( $currency_info, $value ['cost'], false ),
+									$this->common->calculate_currency_manually($currency_info, $value ['debit'], false),
+									$this->common->calculate_currency_manually($currency_info, $value ['cost'], false),
 									$value ['disposition'],
 									$account,
-									isset ( $trunk_arr [$value ['trunk_id']] ) ? $trunk_arr [$value ['trunk_id']] : '',
-									isset ( $pricelist_arr [$value ['pricelist_id']] ) ? $pricelist_arr [$value ['pricelist_id']] : '',
+									isset ($trunk_arr [$value ['trunk_id']]) ? $trunk_arr [$value ['trunk_id']] : '',
+									isset ($pricelist_arr [$value ['pricelist_id']]) ? $pricelist_arr [$value ['pricelist_id']] : '',
 									$value ['calltype'] 
 							)
 							// $recording,
@@ -143,9 +143,9 @@ 
 					);
 				}
 			}
-			$duration = ($show_seconds == 'minutes') ? ($count_all ['billseconds'] > 0) ? floor ( $count_all ['billseconds'] / 60 ) . ":" . sprintf ( '%02d', $count_all ['billseconds'] % 60 ) : "00:00" : $count_all ['billseconds'];
-			$json_data ['rows'] [] = array (
-					"cell" => array (
+			$duration = ($show_seconds == 'minutes') ? ($count_all ['billseconds'] > 0) ? floor ($count_all ['billseconds'] / 60).":".sprintf('%02d', $count_all ['billseconds'] % 60) : "00:00" : $count_all ['billseconds'];
+			$json_data ['rows'] [] = array(
+					"cell" => array(
 							"<b>Grand Total</b>",
 							"",
 							"",
@@ -153,8 +153,8 @@ 
 							"",
 							"<b>$duration</b>",
 							// $count_all['total_debit'],
-							"<b>" . $this->common->calculate_currency_manually ( $currency_info, $count_all ['total_debit'], false ) . "</b>",
-							"<b>" . $this->common->calculate_currency_manually ( $currency_info, $count_all ['total_cost'], false ) . "</b>",
+							"<b>".$this->common->calculate_currency_manually($currency_info, $count_all ['total_debit'], false)."</b>",
+							"<b>".$this->common->calculate_currency_manually($currency_info, $count_all ['total_cost'], false)."</b>",
 							"",
 							"",
 							"",
@@ -166,7 +166,7 @@ 
 					) 
 			);
 		}
-		echo json_encode ( $json_data );
+		echo json_encode($json_data);
 	}
 	
 	/*
@@ -176,35 +176,35 @@ 
 	 * ****
 	 */
 	function customerReport_recording_download($file_name) {
-		$file_name = getcwd () . "/recording/" . $file_name;
-		header ( 'Content-Description: File Transfer' );
-		header ( 'Content-Type: application/octet-stream' );
-		header ( 'Content-Disposition: attachment; filename=' . basename ( $file_name ) );
-		header ( 'Content-Transfer-Encoding: binary' );
-		header ( 'Expires: 0' );
-		header ( 'Cache-Control: must-revalidate' );
-		header ( 'Pragma: public' );
-		ob_clean ();
-		flush ();
-		readfile ( $file_name );
+		$file_name = getcwd()."/recording/".$file_name;
+		header('Content-Description: File Transfer');
+		header('Content-Type: application/octet-stream');
+		header('Content-Disposition: attachment; filename='.basename($file_name));
+		header('Content-Transfer-Encoding: binary');
+		header('Expires: 0');
+		header('Cache-Control: must-revalidate');
+		header('Pragma: public');
+		ob_clean();
+		flush();
+		readfile($file_name);
 		exit ();
 	}
 	function customerReport_search() {
-		$ajax_search = $this->input->post ( 'ajax_search', 0 );
-		if ($this->input->post ( 'advance_search', TRUE ) == 1) {
-			$this->session->set_userdata ( 'advance_search', $this->input->post ( 'advance_search' ) );
-			$action = $this->input->post ();
-			unset ( $action ['action'] );
-			unset ( $action ['advance_search'] );
-			$this->session->set_userdata ( 'customer_cdr_list_search', $action );
+		$ajax_search = $this->input->post('ajax_search', 0);
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset ($action ['action']);
+			unset ($action ['advance_search']);
+			$this->session->set_userdata('customer_cdr_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect ( base_url () . 'reports/customerReport/' );
+			redirect(base_url().'reports/customerReport/');
 		}
 	}
 	function customerReport_clearsearchfilter() {
-		$this->session->set_userdata ( 'advance_search', 0 );
-		$this->session->set_userdata ( 'customer_cdr_list_search', "" );
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('customer_cdr_list_search', "");
 	}
 	
 	/**
@@ -212,92 +212,92 @@ 
 	 * For Customer CDRs export
 	 */
 	function customerReport_export() {
-		$account_info = $accountinfo = $this->session->userdata ( 'accountinfo' );
+		$account_info = $accountinfo = $this->session->userdata('accountinfo');
 		$currency_id = $account_info ['currency_id'];
-		$currency = $this->common->get_field_name ( 'currency', 'currency', $currency_id );
-		$count_res = $this->reports_model->getcustomer_cdrs ( false, "", "" );
-		$count_all = ( array ) $count_res->first_row ();
-		ob_clean ();
+		$currency = $this->common->get_field_name('currency', 'currency', $currency_id);
+		$count_res = $this->reports_model->getcustomer_cdrs(false, "", "");
+		$count_all = (array)$count_res->first_row();
+		ob_clean();
 		if ($count_all ['count'] > 0) {
 			// Initialization of Rategroup and Trunk Array
-			$pricelist_arr = array ();
-			$trunk_arr = array ();
-			$account_arr = array ();
-			$query = $this->reports_model->getcustomer_cdrs ( true, '', '', true );
+			$pricelist_arr = array();
+			$trunk_arr = array();
+			$account_arr = array();
+			$query = $this->reports_model->getcustomer_cdrs(true, '', '', true);
 			// Get Decimal points,system currency and user currency.
-			$currency_info = $this->common->get_currency_info ();
+			$currency_info = $this->common->get_currency_info();
 			// Get search information from session.
-			$search_arr = $this->session->userdata ( 'customer_cdr_list_search' );
-			$show_seconds = (! empty ( $search_arr ['search_in'] )) ? $search_arr ['search_in'] : 'minutes';
-			$where = "id IN (" . $count_all ['pricelist_ids'] . ")";
-			$this->db->where ( $where );
-			$this->db->select ( 'id,name' );
-			$pricelist_res = $this->db->get ( 'pricelists' );
-			$pricelist_res = $pricelist_res->result_array ();
-			foreach ( $pricelist_res as $value ) {
+			$search_arr = $this->session->userdata('customer_cdr_list_search');
+			$show_seconds = ( ! empty ($search_arr ['search_in'])) ? $search_arr ['search_in'] : 'minutes';
+			$where = "id IN (".$count_all ['pricelist_ids'].")";
+			$this->db->where($where);
+			$this->db->select('id,name');
+			$pricelist_res = $this->db->get('pricelists');
+			$pricelist_res = $pricelist_res->result_array();
+			foreach ($pricelist_res as $value) {
 				$pricelist_arr [$value ['id']] = $value ['name'];
 			}
-			$where = "id IN (" . $count_all ['accounts_ids'] . ")";
-			$this->db->where ( $where );
-			$this->db->select ( 'id,number,first_name,last_name' );
-			$account_res = $this->db->get ( 'accounts' );
-			foreach ( $account_res->result_array () as $value ) {
-				$account_arr [$value ['id']] = $value ['first_name'] . " " . $value ['last_name'] . ' (' . $value ['number'] . ')';
+			$where = "id IN (".$count_all ['accounts_ids'].")";
+			$this->db->where($where);
+			$this->db->select('id,number,first_name,last_name');
+			$account_res = $this->db->get('accounts');
+			foreach ($account_res->result_array() as $value) {
+				$account_arr [$value ['id']] = $value ['first_name']." ".$value ['last_name'].' ('.$value ['number'].')';
 			}
 			
 			if ($accountinfo ['type'] != 1) {
-				$customer_array [] = array (
-						gettext ( "Date" ),
-						gettext ( "Caller ID" ),
-						gettext ( "Called Number" ),
-						gettext ( "Code" ),
-						gettext ( "Destination" ),
-						gettext ( "Duration" ),
-						gettext ( "Debit" ) . "(" . $currency . ")",
-						gettext ( "Cost" ) . "(" . $currency . ")",
-						gettext ( "Disposition" ),
-						gettext ( "Account" ),
-						gettext ( "Trunk" ),
-						gettext ( "Rate Group" ),
-						gettext ( "Call Type" ) 
+				$customer_array [] = array(
+						gettext("Date"),
+						gettext("Caller ID"),
+						gettext("Called Number"),
+						gettext("Code"),
+						gettext("Destination"),
+						gettext("Duration"),
+						gettext("Debit")."(".$currency.")",
+						gettext("Cost")."(".$currency.")",
+						gettext("Disposition"),
+						gettext("Account"),
+						gettext("Trunk"),
+						gettext("Rate Group"),
+						gettext("Call Type") 
 				);
-				$where = "id IN (" . $count_all ['trunk_ids'] . ")";
-				$this->db->where ( $where );
-				$this->db->select ( 'id,name' );
-				$trunk_res = $this->db->get ( 'trunks' );
-				$trunk_res = $trunk_res->result_array ();
-				foreach ( $trunk_res as $value ) {
+				$where = "id IN (".$count_all ['trunk_ids'].")";
+				$this->db->where($where);
+				$this->db->select('id,name');
+				$trunk_res = $this->db->get('trunks');
+				$trunk_res = $trunk_res->result_array();
+				foreach ($trunk_res as $value) {
 					$trunk_arr [$value ['id']] = $value ['name'];
 				}
-				foreach ( $query->result_array () as $value ) {
-					$duration = ($show_seconds == 'minutes') ? ($value ['billseconds'] > 0) ? floor ( $value ['billseconds'] / 60 ) . ":" . sprintf ( '%02d', $value ['billseconds'] % 60 ) : "00:00" : $value ['billseconds'];
-					$account = isset ( $account_arr [$value ['accountid']] ) ? $account_arr [$value ['accountid']] : 'Anonymous';
-					$customer_array [] = array (
-							$this->common->convert_GMT_to ( '', '', $value ['callstart'] ),
+				foreach ($query->result_array() as $value) {
+					$duration = ($show_seconds == 'minutes') ? ($value ['billseconds'] > 0) ? floor ($value ['billseconds'] / 60).":".sprintf('%02d', $value ['billseconds'] % 60) : "00:00" : $value ['billseconds'];
+					$account = isset ($account_arr [$value ['accountid']]) ? $account_arr [$value ['accountid']] : 'Anonymous';
+					$customer_array [] = array(
+							$this->common->convert_GMT_to('', '', $value ['callstart']),
 							$value ['callerid'],
 							$value ['callednum'],
-							filter_var ( $value ['pattern'], FILTER_SANITIZE_NUMBER_INT ),
+							filter_var($value ['pattern'], FILTER_SANITIZE_NUMBER_INT),
 							$value ['notes'],
 							$duration,
-							$this->common->calculate_currency_manually ( $currency_info, $value ['debit'], false, false ),
-							$this->common->calculate_currency_manually ( $currency_info, $value ['cost'], false, false ),
+							$this->common->calculate_currency_manually($currency_info, $value ['debit'], false, false),
+							$this->common->calculate_currency_manually($currency_info, $value ['cost'], false, false),
 							$value ['disposition'],
 							$account,
-							isset ( $trunk_arr [$value ['trunk_id']] ) ? $trunk_arr [$value ['trunk_id']] : '',
-							isset ( $pricelist_arr [$value ['pricelist_id']] ) ? $pricelist_arr [$value ['pricelist_id']] : '',
+							isset ($trunk_arr [$value ['trunk_id']]) ? $trunk_arr [$value ['trunk_id']] : '',
+							isset ($pricelist_arr [$value ['pricelist_id']]) ? $pricelist_arr [$value ['pricelist_id']] : '',
 							$value ['calltype'] 
 					);
 				}
-				$duration = ($show_seconds == 'minutes') ? ($count_all ['billseconds'] > 0) ? floor ( $count_all ['billseconds'] / 60 ) . ":" . sprintf ( '%02d', $count_all ['billseconds'] % 60 ) : "00:00" : $count_all ['billseconds'];
-				$customer_array [] = array (
+				$duration = ($show_seconds == 'minutes') ? ($count_all ['billseconds'] > 0) ? floor ($count_all ['billseconds'] / 60).":".sprintf('%02d', $count_all ['billseconds'] % 60) : "00:00" : $count_all ['billseconds'];
+				$customer_array [] = array(
 						"Grand Total",
 						"",
 						"",
 						"",
 						"",
 						$duration,
-						$this->common->calculate_currency_manually ( $currency_info, $count_all ['total_debit'], false, false ),
-						$this->common->calculate_currency_manually ( $currency_info, $count_all ['total_cost'], false, false ),
+						$this->common->calculate_currency_manually($currency_info, $count_all ['total_debit'], false, false),
+						$this->common->calculate_currency_manually($currency_info, $count_all ['total_cost'], false, false),
 						"",
 						"",
 						"",
@@ -308,48 +308,48 @@ 
 						"" 
 				);
 			} else {
-				$customer_array [] = array (
-						gettext ( "Date" ),
-						gettext ( "CallerID" ),
-						gettext ( "Called Number" ),
-						gettext ( "Code" ),
-						gettext ( "Destination" ),
-						gettext ( "Duration" ),
-						gettext ( "Debit" ) . "(" . $currency . ")",
-						gettext ( "Cost" ) . "(" . $currency . ")",
-						gettext ( "Disposition" ),
-						gettext ( "Account" ),
-						gettext ( "Rate Group" ),
-						gettext ( "Call Type" ) 
+				$customer_array [] = array(
+						gettext("Date"),
+						gettext("CallerID"),
+						gettext("Called Number"),
+						gettext("Code"),
+						gettext("Destination"),
+						gettext("Duration"),
+						gettext("Debit")."(".$currency.")",
+						gettext("Cost")."(".$currency.")",
+						gettext("Disposition"),
+						gettext("Account"),
+						gettext("Rate Group"),
+						gettext("Call Type") 
 				);
-				foreach ( $query->result_array () as $value ) {
-					$duration = ($show_seconds == 'minutes') ? ($value ['billseconds'] > 0) ? floor ( $value ['billseconds'] / 60 ) . ":" . sprintf ( '%02d', $value ['billseconds'] % 60 ) : "00:00" : $value ['billseconds'];
-					$account = isset ( $account_arr [$value ['accountid']] ) ? $account_arr [$value ['accountid']] : 'Anonymous';
-					$customer_array [] = array (
-							$this->common->convert_GMT_to ( '', '', $value ['callstart'] ),
+				foreach ($query->result_array() as $value) {
+					$duration = ($show_seconds == 'minutes') ? ($value ['billseconds'] > 0) ? floor ($value ['billseconds'] / 60).":".sprintf('%02d', $value ['billseconds'] % 60) : "00:00" : $value ['billseconds'];
+					$account = isset ($account_arr [$value ['accountid']]) ? $account_arr [$value ['accountid']] : 'Anonymous';
+					$customer_array [] = array(
+							$this->common->convert_GMT_to('', '', $value ['callstart']),
 							$value ['callerid'],
 							$value ['callednum'],
-							filter_var ( $value ['pattern'], FILTER_SANITIZE_NUMBER_INT ),
+							filter_var($value ['pattern'], FILTER_SANITIZE_NUMBER_INT),
 							$value ['notes'],
 							$duration,
-							$this->common->calculate_currency_manually ( $currency_info, $value ['debit'], false, false ),
-							$this->common->calculate_currency_manually ( $currency_info, $value ['cost'], false, false ),
+							$this->common->calculate_currency_manually($currency_info, $value ['debit'], false, false),
+							$this->common->calculate_currency_manually($currency_info, $value ['cost'], false, false),
 							$value ['disposition'],
 							$account,
-							isset ( $pricelist_arr [$value ['pricelist_id']] ) ? $pricelist_arr [$value ['pricelist_id']] : '',
+							isset ($pricelist_arr [$value ['pricelist_id']]) ? $pricelist_arr [$value ['pricelist_id']] : '',
 							$value ['calltype'] 
 					);
 				}
-				$duration = ($show_seconds == 'minutes') ? ($count_all ['billseconds'] > 0) ? floor ( $count_all ['billseconds'] / 60 ) . ":" . sprintf ( '%02d', $count_all ['billseconds'] % 60 ) : "00:00" : $count_all ['billseconds'];
-				$customer_array [] = array (
+				$duration = ($show_seconds == 'minutes') ? ($count_all ['billseconds'] > 0) ? floor ($count_all ['billseconds'] / 60).":".sprintf('%02d', $count_all ['billseconds'] % 60) : "00:00" : $count_all ['billseconds'];
+				$customer_array [] = array(
 						"Grand Total",
 						"",
 						"",
 						"",
 						"",
 						$duration,
-						$this->common->calculate_currency_manually ( $currency_info, $count_all ['total_debit'], false, false ),
-						$this->common->calculate_currency_manually ( $currency_info, $count_all ['total_cost'], false, false ),
+						$this->common->calculate_currency_manually($currency_info, $count_all ['total_debit'], false, false),
+						$this->common->calculate_currency_manually($currency_info, $count_all ['total_cost'], false, false),
 						"",
 						"",
 						"",
@@ -360,37 +360,37 @@ 
 				);
 			}
 		}
-		$this->load->helper ( 'csv' );
-		if (isset ( $customer_array )) {
-			array_to_csv ( $customer_array, 'Customer_CDR_' . date ( "Y-m-d" ) . '.csv' );
+		$this->load->helper('csv');
+		if (isset ($customer_array)) {
+			array_to_csv($customer_array, 'Customer_CDR_'.date("Y-m-d").'.csv');
 		} else {
-			$customer_array [] = array (
-					gettext ( "Date" ),
-					gettext ( "Caller ID" ),
-					gettext ( "Called Number" ),
-					gettext ( "Code" ),
-					gettext ( "Destination" ),
-					gettext ( "Duration" ),
-					gettext ( "Debit" ) . "(" . $currency . ")",
-					gettext ( "Cost" ) . "(" . $currency . ")",
-					gettext ( "Disposition" ),
-					gettext ( "Account" ),
-					gettext ( "Rate Group" ),
-					gettext ( "Call Type" ) 
+			$customer_array [] = array(
+					gettext("Date"),
+					gettext("Caller ID"),
+					gettext("Called Number"),
+					gettext("Code"),
+					gettext("Destination"),
+					gettext("Duration"),
+					gettext("Debit")."(".$currency.")",
+					gettext("Cost")."(".$currency.")",
+					gettext("Disposition"),
+					gettext("Account"),
+					gettext("Rate Group"),
+					gettext("Call Type") 
 			);
-			array_to_csv ( $customer_array, 'Customer_CDR_' . date ( "Y-m-d" ) . '.csv' );
+			array_to_csv($customer_array, 'Customer_CDR_'.date("Y-m-d").'.csv');
 		}
 	}
 	
 	/* * *************************** */
 	function resellerReport() {
-		$data ['page_title'] = gettext ( 'Resellers CDRs Report' );
+		$data ['page_title'] = gettext('Resellers CDRs Report');
 		$data ['search_flag'] = true;
-		$this->session->set_userdata ( 'advance_search', 0 );
-		$data ['grid_fields'] = $this->reports_form->build_report_list_for_reseller ();
-		$data ["grid_buttons"] = $this->reports_form->build_grid_buttons_reseller ();
-		$data ['form_search'] = $this->form->build_serach_form ( $this->reports_form->get_reseller_cdr_form () );
-		$this->load->view ( 'view_cdr_reseller_list', $data );
+		$this->session->set_userdata('advance_search', 0);
+		$data ['grid_fields'] = $this->reports_form->build_report_list_for_reseller();
+		$data ["grid_buttons"] = $this->reports_form->build_grid_buttons_reseller();
+		$data ['form_search'] = $this->form->build_serach_form($this->reports_form->get_reseller_cdr_form());
+		$this->load->view('view_cdr_reseller_list', $data);
 	}
 	
 	/**
@@ -400,27 +400,27 @@ 
 	function resellerReport_json() {
 		
 		// Get Total Count,Total debit,Total cost information
-		$count_res = $this->reports_model->getreseller_cdrs ( false, "", "" );
-		$count_all = ( array ) $count_res->first_row ();
-		$paging_data = $this->form->load_grid_config ( $count_all ['count'], $_GET ['rp'], $_GET ['page'] );
+		$count_res = $this->reports_model->getreseller_cdrs(false, "", "");
+		$count_all = (array)$count_res->first_row();
+		$paging_data = $this->form->load_grid_config($count_all ['count'], $_GET ['rp'], $_GET ['page']);
 		$json_data = $paging_data ["json_paging"];
-		$query = $this->reports_model->getreseller_cdrs ( true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"] );
-		$grid_fields = json_decode ( $this->reports_form->build_report_list_for_reseller () );
-		$json_data ['rows'] = $this->form->build_grid ( $query, $grid_fields );
+		$query = $this->reports_model->getreseller_cdrs(true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"]);
+		$grid_fields = json_decode($this->reports_form->build_report_list_for_reseller());
+		$json_data ['rows'] = $this->form->build_grid($query, $grid_fields);
 		if ($count_all ['count'] > 0) {
-			$search_arr = $this->session->userdata ( 'reseller_cdr_list_search' );
-			$show_seconds = (! empty ( $search_arr ['search_in'] )) ? $search_arr ['search_in'] : 'minutes';
-			$duration = ($show_seconds == 'minutes') ? ($count_all ['billseconds'] > 0) ? sprintf ( '%02d', $count_all ['billseconds'] / 60 ) . ":" . sprintf ( '%02d', $count_all ['billseconds'] % 60 ) : "00:00" : sprintf ( '%02d', $count_all ['billseconds'] );
-			$json_data ['rows'] [] = array (
-					"cell" => array (
+			$search_arr = $this->session->userdata('reseller_cdr_list_search');
+			$show_seconds = ( ! empty ($search_arr ['search_in'])) ? $search_arr ['search_in'] : 'minutes';
+			$duration = ($show_seconds == 'minutes') ? ($count_all ['billseconds'] > 0) ? sprintf ('%02d', $count_all ['billseconds'] / 60).":".sprintf('%02d', $count_all ['billseconds'] % 60) : "00:00" : sprintf('%02d', $count_all ['billseconds']);
+			$json_data ['rows'] [] = array(
+					"cell" => array(
 							"<b>Grand Total</b>",
 							"",
 							"",
 							"",
 							"",
 							"<b>$duration</b>",
-							"<b>" . $this->common_model->calculate_currency ( $count_all ['total_debit'], '', '', true, false ) . "</b>",
-							"<b>" . $this->common_model->calculate_currency ( $count_all ['total_cost'], '', '', true, false ) . "</b>",
+							"<b>".$this->common_model->calculate_currency($count_all ['total_debit'], '', '', true, false)."</b>",
+							"<b>".$this->common_model->calculate_currency($count_all ['total_cost'], '', '', true, false)."</b>",
 							"",
 							"",
 							"",
@@ -432,91 +432,91 @@ 
 					) 
 			);
 		}
-		echo json_encode ( $json_data );
+		echo json_encode($json_data);
 	}
 	function resellerReport_search() {
-		$ajax_search = $this->input->post ( 'ajax_search', 0 );
-		if ($this->input->post ( 'advance_search', TRUE ) == 1) {
-			$this->session->set_userdata ( 'advance_search', $this->input->post ( 'advance_search' ) );
-			$action = $this->input->post ();
-			unset ( $action ['action'] );
-			unset ( $action ['advance_search'] );
-			$this->session->set_userdata ( 'reseller_cdr_list_search', $action );
+		$ajax_search = $this->input->post('ajax_search', 0);
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset ($action ['action']);
+			unset ($action ['advance_search']);
+			$this->session->set_userdata('reseller_cdr_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect ( base_url () . 'reports/resellerReport/' );
+			redirect(base_url().'reports/resellerReport/');
 		}
 	}
 	function resellerReport_clearsearchfilter() {
-		$this->session->set_userdata ( 'advance_search', 0 );
-		$this->session->set_userdata ( 'account_search', "" );
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('account_search', "");
 	}
 	function resellerReport_export() {
 		// Get All count related information.
-		$account_info = $accountinfo = $this->session->userdata ( 'accountinfo' );
+		$account_info = $accountinfo = $this->session->userdata('accountinfo');
 		$currency_id = $account_info ['currency_id'];
-		$currency = $this->common->get_field_name ( 'currency', 'currency', $currency_id );
-		$count_res = $this->reports_model->getreseller_cdrs ( false, "", "" );
-		$count_all = ( array ) $count_res->first_row ();
-		ob_clean ();
-		$reseller_array [] = array (
-				gettext ( "Date" ),
-				gettext ( "Caller ID" ),
-				gettext ( "Called Number" ),
-				gettext ( "Code" ),
-				gettext ( "Destination" ),
-				gettext ( "Duration" ),
-				gettext ( "Debit" ) . "(" . $currency . ")",
-				gettext ( "Cost" ) . "(" . $currency . ")",
-				gettext ( "Disposition" ),
-				gettext ( "Account" ),
-				gettext ( "Rate Group" ),
-				gettext ( "Call Type" ) 
+		$currency = $this->common->get_field_name('currency', 'currency', $currency_id);
+		$count_res = $this->reports_model->getreseller_cdrs(false, "", "");
+		$count_all = (array)$count_res->first_row();
+		ob_clean();
+		$reseller_array [] = array(
+				gettext("Date"),
+				gettext("Caller ID"),
+				gettext("Called Number"),
+				gettext("Code"),
+				gettext("Destination"),
+				gettext("Duration"),
+				gettext("Debit")."(".$currency.")",
+				gettext("Cost")."(".$currency.")",
+				gettext("Disposition"),
+				gettext("Account"),
+				gettext("Rate Group"),
+				gettext("Call Type") 
 		);
 		if ($count_all ['count'] > 0) {
 			// Initialization of Rategroup array
-			$pricelist_arr = array ();
-			$query = $this->reports_model->getreseller_cdrs ( true, '', '', true );
+			$pricelist_arr = array();
+			$query = $this->reports_model->getreseller_cdrs(true, '', '', true);
 			// Get Decimal points,system currency and user currency.
-			$currency_info = $this->common->get_currency_info ();
+			$currency_info = $this->common->get_currency_info();
 			// Get search information from session.
-			$search_arr = $this->session->userdata ( 'reseller_cdr_list_search' );
-			$show_seconds = (! empty ( $search_arr ['search_in'] )) ? $search_arr ['search_in'] : 'minutes';
-			$where = "id IN (" . $count_all ['pricelist_ids'] . ")";
-			$this->db->where ( $where );
-			$this->db->select ( 'id,name' );
-			$pricelist_res = $this->db->get ( 'pricelists' );
-			$pricelist_res = $pricelist_res->result_array ();
-			foreach ( $pricelist_res as $value ) {
+			$search_arr = $this->session->userdata('reseller_cdr_list_search');
+			$show_seconds = ( ! empty ($search_arr ['search_in'])) ? $search_arr ['search_in'] : 'minutes';
+			$where = "id IN (".$count_all ['pricelist_ids'].")";
+			$this->db->where($where);
+			$this->db->select('id,name');
+			$pricelist_res = $this->db->get('pricelists');
+			$pricelist_res = $pricelist_res->result_array();
+			foreach ($pricelist_res as $value) {
 				$pricelist_arr [$value ['id']] = $value ['name'];
 			}
-			foreach ( $query->result_array () as $value ) {
-				$duration = ($show_seconds == 'minutes') ? ($value ['billseconds'] > 0) ? sprintf ( '%02d', $value ['billseconds'] / 60 ) . ":" . sprintf ( '%02d', $value ['billseconds'] % 60 ) : "00:00" : $value ['billseconds'];
-				$reseller_array [] = array (
-						$this->common->convert_GMT_to ( '', '', $value ['callstart'] ),
+			foreach ($query->result_array() as $value) {
+				$duration = ($show_seconds == 'minutes') ? ($value ['billseconds'] > 0) ? sprintf ('%02d', $value ['billseconds'] / 60).":".sprintf('%02d', $value ['billseconds'] % 60) : "00:00" : $value ['billseconds'];
+				$reseller_array [] = array(
+						$this->common->convert_GMT_to('', '', $value ['callstart']),
 						$value ['callerid'],
 						$value ['callednum'],
-						filter_var ( $value ['pattern'], FILTER_SANITIZE_NUMBER_INT ),
+						filter_var($value ['pattern'], FILTER_SANITIZE_NUMBER_INT),
 						$value ['notes'],
 						$duration,
-						$this->common->calculate_currency_manually ( $currency_info, $value ['debit'], false, false ),
-						$this->common->calculate_currency_manually ( $currency_info, $value ['cost'], false, false ),
+						$this->common->calculate_currency_manually($currency_info, $value ['debit'], false, false),
+						$this->common->calculate_currency_manually($currency_info, $value ['cost'], false, false),
 						$value ['disposition'],
-						$this->common->build_concat_string ( "first_name,last_name,number", "accounts", $value ['accountid'] ),
-						isset ( $pricelist_arr [$value ['pricelist_id']] ) ? $pricelist_arr [$value ['pricelist_id']] : '',
+						$this->common->build_concat_string("first_name,last_name,number", "accounts", $value ['accountid']),
+						isset ($pricelist_arr [$value ['pricelist_id']]) ? $pricelist_arr [$value ['pricelist_id']] : '',
 						$value ['calltype'] 
 				);
 			}
-			$duration = ($show_seconds == 'minutes') ? ($count_all ['billseconds'] > 0) ? floor ( $count_all ['billseconds'] / 60 ) . ":" . sprintf ( '%02d', $count_all ['billseconds'] % 60 ) : "00:00" : $count_all ['billseconds'];
-			$reseller_array [] = array (
+			$duration = ($show_seconds == 'minutes') ? ($count_all ['billseconds'] > 0) ? floor ($count_all ['billseconds'] / 60).":".sprintf('%02d', $count_all ['billseconds'] % 60) : "00:00" : $count_all ['billseconds'];
+			$reseller_array [] = array(
 					"Grand Total",
 					"",
 					"",
 					"",
 					"",
 					$duration,
-					$this->common->calculate_currency_manually ( $currency_info, $count_all ['total_debit'], false, false ),
-					$this->common->calculate_currency_manually ( $currency_info, $count_all ['total_cost'], false, false ),
+					$this->common->calculate_currency_manually($currency_info, $count_all ['total_debit'], false, false),
+					$this->common->calculate_currency_manually($currency_info, $count_all ['total_cost'], false, false),
 					"",
 					"",
 					"",
@@ -527,120 +527,120 @@ 
 					"" 
 			);
 		}
-		$this->load->helper ( 'csv' );
-		array_to_csv ( $reseller_array, 'Reseller_CDR_' . date ( "Y-m-d" ) . '.csv' );
+		$this->load->helper('csv');
+		array_to_csv($reseller_array, 'Reseller_CDR_'.date("Y-m-d").'.csv');
 	}
 	function providerReport() {
-		$data ['page_title'] = gettext ( 'Provider CDRs Report' );
+		$data ['page_title'] = gettext('Provider CDRs Report');
 		$data ['search_flag'] = true;
-		$this->session->set_userdata ( 'advance_search', 0 );
-		$data ['grid_fields'] = $this->reports_form->build_report_list_for_provider ();
-		$data ["grid_buttons"] = $this->reports_form->build_grid_buttons_provider ();
-		$data ['form_search'] = $this->form->build_serach_form ( $this->reports_form->get_provider_cdr_form () );
-		$this->load->view ( 'view_cdr_provider_list', $data );
+		$this->session->set_userdata('advance_search', 0);
+		$data ['grid_fields'] = $this->reports_form->build_report_list_for_provider();
+		$data ["grid_buttons"] = $this->reports_form->build_grid_buttons_provider();
+		$data ['form_search'] = $this->form->build_serach_form($this->reports_form->get_provider_cdr_form());
+		$this->load->view('view_cdr_provider_list', $data);
 	}
 	function providerReport_json() {
 		// Get All count related information.
-		$count_res = $this->reports_model->getprovider_cdrs ( false, "", "" );
-		$count_all = ( array ) $count_res->first_row ();
-		$paging_data = $this->form->load_grid_config ( $count_all ['count'], $_GET ['rp'], $_GET ['page'] );
+		$count_res = $this->reports_model->getprovider_cdrs(false, "", "");
+		$count_all = (array)$count_res->first_row();
+		$paging_data = $this->form->load_grid_config($count_all ['count'], $_GET ['rp'], $_GET ['page']);
 		$json_data = $paging_data ["json_paging"];
 		
-		$query = $this->reports_model->getprovider_cdrs ( true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"] );
-		$grid_fields = json_decode ( $this->reports_form->build_report_list_for_provider () );
-		$json_data ['rows'] = $this->form->build_grid ( $query, $grid_fields );
+		$query = $this->reports_model->getprovider_cdrs(true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"]);
+		$grid_fields = json_decode($this->reports_form->build_report_list_for_provider());
+		$json_data ['rows'] = $this->form->build_grid($query, $grid_fields);
 		if ($count_all ['count'] > 0) {
-			$search_arr = $this->session->userdata ( 'provider_cdr_list_search' );
-			$show_seconds = (! empty ( $search_arr ['search_in'] )) ? $search_arr ['search_in'] : 'minutes';
-			$duration = ($show_seconds == 'minutes') ? ($count_all ['billseconds'] > 0) ? floor ( $count_all ['billseconds'] / 60 ) . ":" . sprintf ( "%02d", $count_all ['billseconds'] % 60 ) : "00:00" : $count_all ['billseconds'];
-			$json_data ['rows'] [] = array (
-					"cell" => array (
+			$search_arr = $this->session->userdata('provider_cdr_list_search');
+			$show_seconds = ( ! empty ($search_arr ['search_in'])) ? $search_arr ['search_in'] : 'minutes';
+			$duration = ($show_seconds == 'minutes') ? ($count_all ['billseconds'] > 0) ? floor ($count_all ['billseconds'] / 60).":".sprintf("%02d", $count_all ['billseconds'] % 60) : "00:00" : $count_all ['billseconds'];
+			$json_data ['rows'] [] = array(
+					"cell" => array(
 							"<b>Grand Total</b>",
 							"",
 							"",
 							"",
 							"",
 							"<b>$duration</b>",
-							"<b>" . $this->common_model->calculate_currency ( $count_all ['total_cost'], '', '', true, false ) . "</b>",
+							"<b>".$this->common_model->calculate_currency($count_all ['total_cost'], '', '', true, false)."</b>",
 							"",
 							"" 
 					) 
 			);
 		}
-		echo json_encode ( $json_data );
+		echo json_encode($json_data);
 	}
 	function providerReport_search() {
-		$ajax_search = $this->input->post ( 'ajax_search', 0 );
-		if ($this->input->post ( 'advance_search', TRUE ) == 1) {
-			$this->session->set_userdata ( 'advance_search', $this->input->post ( 'advance_search' ) );
-			$action = $this->input->post ();
-			unset ( $action ['action'] );
-			unset ( $action ['advance_search'] );
-			$this->session->set_userdata ( 'provider_cdr_list_search', $action );
+		$ajax_search = $this->input->post('ajax_search', 0);
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset ($action ['action']);
+			unset ($action ['advance_search']);
+			$this->session->set_userdata('provider_cdr_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect ( base_url () . 'reports/providerReport/' );
+			redirect(base_url().'reports/providerReport/');
 		}
 	}
 	function providerReport_clearsearchfilter() {
-		$this->session->set_userdata ( 'advance_search', 0 );
-		$this->session->set_userdata ( 'account_search', "" );
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('account_search', "");
 	}
 	function providerReport_export() {
 		/*
 		 * ASTPP 3.0
 		 * Get All count information as well All total information
 		 */
-		$account_info = $accountinfo = $this->session->userdata ( 'accountinfo' );
+		$account_info = $accountinfo = $this->session->userdata('accountinfo');
 		$currency_id = $account_info ['currency_id'];
-		$currency = $this->common->get_field_name ( 'currency', 'currency', $currency_id );
-		$count_res = $this->reports_model->getprovider_cdrs ( false, "", "" );
-		$count_all = ( array ) $count_res->first_row ();
-		ob_clean ();
-		$provider_array [] = array (
-				gettext ( "Date" ),
-				gettext ( "Caller ID" ),
-				gettext ( "Called Number" ),
-				gettext ( "Code" ),
-				gettext ( "Destination" ),
-				gettext ( "Duration" ),
-				gettext ( "Cost" ) . "(" . $currency . ")",
-				gettext ( "Disposition" ),
-				gettext ( "Account" ) 
+		$currency = $this->common->get_field_name('currency', 'currency', $currency_id);
+		$count_res = $this->reports_model->getprovider_cdrs(false, "", "");
+		$count_all = (array)$count_res->first_row();
+		ob_clean();
+		$provider_array [] = array(
+				gettext("Date"),
+				gettext("Caller ID"),
+				gettext("Called Number"),
+				gettext("Code"),
+				gettext("Destination"),
+				gettext("Duration"),
+				gettext("Cost")."(".$currency.")",
+				gettext("Disposition"),
+				gettext("Account") 
 		);
 		if ($count_all ['count'] > 0) {
-			$query = $this->reports_model->getprovider_cdrs ( true, '', '', true );
+			$query = $this->reports_model->getprovider_cdrs(true, '', '', true);
 			// Get Decimal points,system currency and user currency.
-			$currency_info = $this->common->get_currency_info ();
+			$currency_info = $this->common->get_currency_info();
 			// Get search information from session.
-			$search_arr = $this->session->userdata ( 'provider_cdr_list_search' );
-			$show_seconds = (! empty ( $search_arr ['search_in'] )) ? $search_arr ['search_in'] : 'minutes';
-			foreach ( $query->result_array () as $value ) {
+			$search_arr = $this->session->userdata('provider_cdr_list_search');
+			$show_seconds = ( ! empty ($search_arr ['search_in'])) ? $search_arr ['search_in'] : 'minutes';
+			foreach ($query->result_array() as $value) {
 				// echo"<pre>";print_r($value);exit;
-				$duration = ($show_seconds == 'minutes') ? ($value ['billseconds'] > 0) ? floor ( $value ['billseconds'] / 60 ) . ":" . sprintf ( "%02d", $value ['billseconds'] % 60 ) : "00:00" : $value ['billseconds'];
-				$account_arr = $this->db_model->getSelect ( '*', 'accounts', array (
+				$duration = ($show_seconds == 'minutes') ? ($value ['billseconds'] > 0) ? floor ($value ['billseconds'] / 60).":".sprintf("%02d", $value ['billseconds'] % 60) : "00:00" : $value ['billseconds'];
+				$account_arr = $this->db_model->getSelect('*', 'accounts', array(
 						'id' => $value ['provider_id'] 
-				) );
-				if ($account_arr->num_rows () > 0) {
-					$account_array = $account_arr->result_array ();
-					$account = $account_array [0] ['first_name'] . " " . $account_array [0] ['last_name'] . ' (' . $account_array [0] ['number'] . ')';
+				));
+				if ($account_arr->num_rows() > 0) {
+					$account_array = $account_arr->result_array();
+					$account = $account_array [0] ['first_name']." ".$account_array [0] ['last_name'].' ('.$account_array [0] ['number'].')';
 				} else {
 					$account = "Anonymous";
 				}
-				$provider_array [] = array (
-						$this->common->convert_GMT_to ( '', '', $value ['callstart'] ),
+				$provider_array [] = array(
+						$this->common->convert_GMT_to('', '', $value ['callstart']),
 						$value ['callerid'],
 						$value ['callednum'],
-						filter_var ( $value ['pattern'], FILTER_SANITIZE_NUMBER_INT ),
+						filter_var($value ['pattern'], FILTER_SANITIZE_NUMBER_INT),
 						$value ['notes'],
 						$duration,
-						$this->common->calculate_currency_manually ( $currency_info, $value ['cost'], false, false ),
+						$this->common->calculate_currency_manually($currency_info, $value ['cost'], false, false),
 						$value ['disposition'],
 						$account 
 				);
 			}
-			$duration = ($show_seconds == 'minutes') ? ($count_all ['billseconds'] > 0) ? floor ( $count_all ['billseconds'] / 60 ) . ":" . sprintf ( "%02d", $count_all ['billseconds'] % 60 ) : "00:00" : $count_all ['billseconds'];
-			$provider_array [] = array (
+			$duration = ($show_seconds == 'minutes') ? ($count_all ['billseconds'] > 0) ? floor ($count_all ['billseconds'] / 60).":".sprintf("%02d", $count_all ['billseconds'] % 60) : "00:00" : $count_all ['billseconds'];
+			$provider_array [] = array(
 					"Grand Total",
 					"",
 					"",
@@ -648,7 +648,7 @@ 
 					"",
 					$duration,
 					// $this->common->calculate_currency_manually($currency_info, $count_all['total_debit']),
-					$this->common->calculate_currency_manually ( $currency_info, $count_all ['total_cost'], false, false ),
+					$this->common->calculate_currency_manually($currency_info, $count_all ['total_cost'], false, false),
 					"",
 					"",
 					"",
@@ -660,8 +660,8 @@ 
 			);
 		}
 		// echo "<pre>";print_r($provider_array);exit;
-		$this->load->helper ( 'csv' );
-		array_to_csv ( $provider_array, 'Provider_CDR_' . date ( "Y-m-d" ) . '.csv' );
+		$this->load->helper('csv');
+		array_to_csv($provider_array, 'Provider_CDR_'.date("Y-m-d").'.csv');
 	}
 	
 	/*
@@ -671,40 +671,40 @@ 
 	 * ****
 	 */
 	function user_refillreport() {
-		$json_data = array ();
-		$count_all = $this->reports_model->getuser_refill_list ( false, "", "" );
-		$paging_data = $this->form->load_grid_config ( $count_all, $_GET ['rp'], $_GET ['page'] );
+		$json_data = array();
+		$count_all = $this->reports_model->getuser_refill_list(false, "", "");
+		$paging_data = $this->form->load_grid_config($count_all, $_GET ['rp'], $_GET ['page']);
 		$json_data = $paging_data ["json_paging"];
 		
-		$query = $this->reports_model->getuser_refill_list ( true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"] );
-		$grid_fields = json_decode ( $this->reports_form->build_refill_report_for_user () );
-		$json_data ['rows'] = $this->form->build_grid ( $query, $grid_fields );
+		$query = $this->reports_model->getuser_refill_list(true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"]);
+		$grid_fields = json_decode($this->reports_form->build_refill_report_for_user());
+		$json_data ['rows'] = $this->form->build_grid($query, $grid_fields);
 		
-		echo json_encode ( $json_data );
+		echo json_encode($json_data);
 	}
 	function user_refillreport_search() {
-		$ajax_search = $this->input->post ( 'ajax_search', 0 );
-		if ($this->input->post ( 'advance_search', TRUE ) == 1) {
-			$this->session->set_userdata ( 'advance_search', $this->input->post ( 'advance_search' ) );
-			$action = $this->input->post ();
-			unset ( $action ['action'] );
-			unset ( $action ['advance_search'] );
-			$this->session->set_userdata ( 'cdr_refill_search', $action );
+		$ajax_search = $this->input->post('ajax_search', 0);
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset ($action ['action']);
+			unset ($action ['advance_search']);
+			$this->session->set_userdata('cdr_refill_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect ( base_url () . 'user/user_cdrs_report/' );
+			redirect(base_url().'user/user_cdrs_report/');
 		}
 	}
 	function user_refillreport_clearsearchfilter() {
-		$this->session->set_userdata ( 'advance_search', 0 );
-		$this->session->set_userdata ( 'account_search', "" );
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('account_search', "");
 	}
 	
 	/* * ************************** */
 	function customer_cdrreport($accountid, $accounttype) {
-		$instant_search = $this->session->userdata ( 'left_panel_search_' . $accounttype . '_cdrs' );
-		$instant_search_currency = $this->common_model->add_calculate_currency ( $instant_search, "", '', true, false );
-		$like_str = ! empty ( $instant_search ) ? "(callstart like '%$instant_search%'  
+		$instant_search = $this->session->userdata('left_panel_search_'.$accounttype.'_cdrs');
+		$instant_search_currency = $this->common_model->add_calculate_currency($instant_search, "", '', true, false);
+		$like_str = ! empty ($instant_search) ? "(callstart like '%$instant_search%'  
                                             OR  callerid like '%$instant_search%'
                                             OR  callednum like '%$instant_search%' 
                                             OR  notes like '%$instant_search%'
@@ -714,18 +714,18 @@ 
                                             OR  cost like '%$instant_search_currency%'  
                                                 )" : null;
 		
-		$json_data = array ();
-		if (! empty ( $like_str ))
-			$this->db->where ( $like_str );
-		$count_all = $this->reports_model->users_cdrs_list ( false, $accountid, $accounttype, "", "" );
-		$paging_data = $this->form->load_grid_config ( $count_all, $_GET ['rp'], $_GET ['page'] );
+		$json_data = array();
+		if ( ! empty ($like_str))
+			$this->db->where($like_str);
+		$count_all = $this->reports_model->users_cdrs_list(false, $accountid, $accounttype, "", "");
+		$paging_data = $this->form->load_grid_config($count_all, $_GET ['rp'], $_GET ['page']);
 		$json_data = $paging_data ["json_paging"];
-		if (! empty ( $like_str ))
-			$this->db->where ( $like_str );
-		$query = $this->reports_model->users_cdrs_list ( true, $accountid, $accounttype, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"] );
-		$grid_fields = json_decode ( $this->reports_form->build_report_list_for_user ( $accounttype ) );
-		$json_data ['rows'] = $this->form->build_grid ( $query, $grid_fields );
-		echo json_encode ( $json_data );
+		if ( ! empty ($like_str))
+			$this->db->where($like_str);
+		$query = $this->reports_model->users_cdrs_list(true, $accountid, $accounttype, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"]);
+		$grid_fields = json_decode($this->reports_form->build_report_list_for_user($accounttype));
+		$json_data ['rows'] = $this->form->build_grid($query, $grid_fields);
+		echo json_encode($json_data);
 	}
 	
 	/*
@@ -735,82 +735,82 @@ 
 	 * ****
 	 */
 	function refillreport() {
-		$data ['page_title'] = gettext ( 'Refill Report' );
+		$data ['page_title'] = gettext('Refill Report');
 		$data ['search_flag'] = true;
-		$this->session->set_userdata ( 'advance_search', 0 );
-		$data ['grid_buttons'] = $this->reports_form->build_refillreport_buttons ();
-		$data ['grid_fields'] = $this->reports_form->build_refill_report_for_admin ();
-		$data ['form_search'] = $this->form->build_serach_form ( $this->reports_form->build_search_refill_report_for_admin () );
-		$this->load->view ( 'view_refill_report', $data );
+		$this->session->set_userdata('advance_search', 0);
+		$data ['grid_buttons'] = $this->reports_form->build_refillreport_buttons();
+		$data ['grid_fields'] = $this->reports_form->build_refill_report_for_admin();
+		$data ['form_search'] = $this->form->build_serach_form($this->reports_form->build_search_refill_report_for_admin());
+		$this->load->view('view_refill_report', $data);
 	}
 	function refillreport_json() {
-		$json_data = array ();
-		$count_all = $this->reports_model->get_refill_list ( false, "", "" );
-		$paging_data = $this->form->load_grid_config ( $count_all, $_GET ['rp'], $_GET ['page'] );
+		$json_data = array();
+		$count_all = $this->reports_model->get_refill_list(false, "", "");
+		$paging_data = $this->form->load_grid_config($count_all, $_GET ['rp'], $_GET ['page']);
 		$json_data = $paging_data ["json_paging"];
-		$query = $this->reports_model->get_refill_list ( true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"] );
-		$grid_fields = json_decode ( $this->reports_form->build_refill_report_for_admin () );
-		$json_data ['rows'] = $this->form->build_grid ( $query, $grid_fields );
-		echo json_encode ( $json_data );
+		$query = $this->reports_model->get_refill_list(true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"]);
+		$grid_fields = json_decode($this->reports_form->build_refill_report_for_admin());
+		$json_data ['rows'] = $this->form->build_grid($query, $grid_fields);
+		echo json_encode($json_data);
 	}
 	function refillreport_export() {
-		$account_info = $accountinfo = $this->session->userdata ( 'accountinfo' );
+		$account_info = $accountinfo = $this->session->userdata('accountinfo');
 		$currency_id = $account_info ['currency_id'];
 		$reseller_id = $accountinfo ['reseller_id'] > 0 ? $accountinfo ['reseller_id'] : 0;
-		$account_arr = array ();
-		$currency_info = $this->common->get_currency_info ();
-		$currency = $this->common->get_field_name ( 'currency', 'currency', $currency_id );
-		ob_clean ();
-		$customer_array [] = array (
-				gettext ( "Date" ),
-				gettext ( "Account" ),
-				gettext ( "Amount" ) . "(" . $currency . ")",
-				gettext ( "Refill By" ),
-				gettext ( "Note" ) 
+		$account_arr = array();
+		$currency_info = $this->common->get_currency_info();
+		$currency = $this->common->get_field_name('currency', 'currency', $currency_id);
+		ob_clean();
+		$customer_array [] = array(
+				gettext("Date"),
+				gettext("Account"),
+				gettext("Amount")."(".$currency.")",
+				gettext("Refill By"),
+				gettext("Note") 
 		);
-		$query = $this->reports_model->get_refill_list ( true, "", "", true );
-		$this->db->select ( "concat(first_name,' ',last_name,' ','(',number,')') as first_name,id", false );
-		$this->db->where ( 'reseller_id', $reseller_id );
-		$this->db->where_not_in ( 'type', array (
+		$query = $this->reports_model->get_refill_list(true, "", "", true);
+		$this->db->select("concat(first_name,' ',last_name,' ','(',number,')') as first_name,id", false);
+		$this->db->where('reseller_id', $reseller_id);
+		$this->db->where_not_in('type', array(
 				"-1,2,4" 
-		) );
-		$account_res = $this->db->get ( 'accounts' );
-		if ($account_res->num_rows () > 0) {
-			$account_res = $account_res->result_array ();
-			foreach ( $account_res as $key => $value ) {
+		));
+		$account_res = $this->db->get('accounts');
+		if ($account_res->num_rows() > 0) {
+			$account_res = $account_res->result_array();
+			foreach ($account_res as $key => $value) {
 				$account_arr [$value ['id']] = $value ['first_name'];
 			}
 		}
-		if ($query->num_rows () > 0) {
-			foreach ( $query->result_array () as $row ) {
-				$customer_array [] = array (
+		if ($query->num_rows() > 0) {
+			foreach ($query->result_array() as $row) {
+				$customer_array [] = array(
 						$row ['payment_date'],
-						isset ( $account_arr [$row ['accountid']] ) ? $account_arr [$row ['accountid']] : 'Anonymous',
-						number_format ( ( float ) (($row ['credit'] * $currency_info ['user_currency'] ['currencyrate']) / $currency_info ['base_currency'] ['currencyrate']), $currency_info ['decimalpoints'], ".", "" ),
-						$this->common->get_refill_by ( "", "", $row ['payment_by'] ),
+						isset ($account_arr [$row ['accountid']]) ? $account_arr [$row ['accountid']] : 'Anonymous',
+						number_format((float)(($row ['credit'] * $currency_info ['user_currency'] ['currencyrate']) / $currency_info ['base_currency'] ['currencyrate']), $currency_info ['decimalpoints'], ".", ""),
+						$this->common->get_refill_by("", "", $row ['payment_by']),
 						$row ['notes'] 
 				);
 			}
 		}
-		$this->load->helper ( 'csv' );
-		array_to_csv ( $customer_array, 'Refill_Report_' . date ( "Y-m-d" ) . '.csv' );
+		$this->load->helper('csv');
+		array_to_csv($customer_array, 'Refill_Report_'.date("Y-m-d").'.csv');
 	}
 	function customer_refillreport_search() {
-		$ajax_search = $this->input->post ( 'ajax_search', 0 );
-		if ($this->input->post ( 'advance_search', TRUE ) == 1) {
-			$this->session->set_userdata ( 'advance_search', $this->input->post ( 'advance_search' ) );
-			$action = $this->input->post ();
-			unset ( $action ['action'] );
-			unset ( $action ['advance_search'] );
-			$this->session->set_userdata ( 'cdr_refill_search', $action );
+		$ajax_search = $this->input->post('ajax_search', 0);
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset ($action ['action']);
+			unset ($action ['advance_search']);
+			$this->session->set_userdata('cdr_refill_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect ( base_url () . 'user/user_cdrs_report/' );
+			redirect(base_url().'user/user_cdrs_report/');
 		}
 	}
 	function customer_refillreport_clearsearchfilter() {
-		$this->session->set_userdata ( 'advance_search', 0 );
-		$this->session->set_userdata ( 'account_search', "" );
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('account_search', "");
 	}
 	
 	/**
@@ -820,64 +820,64 @@ 
 	 * ******
 	 */
 	function charges_history() {
-		$data ['page_title'] = gettext ( 'Charges History' );
+		$data ['page_title'] = gettext('Charges History');
 		$data ['search_flag'] = true;
-		$this->session->set_userdata ( 'advance_search', 0 );
-		$data ['grid_fields'] = $this->reports_form->build_charge_list_for_admin ();
-		$data ['form_search'] = $this->form->build_serach_form ( $this->reports_form->get_charges_search_form () );
-		$this->load->view ( 'view_charges_list', $data );
+		$this->session->set_userdata('advance_search', 0);
+		$data ['grid_fields'] = $this->reports_form->build_charge_list_for_admin();
+		$data ['form_search'] = $this->form->build_serach_form($this->reports_form->get_charges_search_form());
+		$this->load->view('view_charges_list', $data);
 	}
 	function charges_history_json() {
-		$json_data = array ();
-		$count_all = $this->reports_model->getcharges_list ( false );
-		$paging_data = $this->form->load_grid_config ( $count_all, $_GET ['rp'], $_GET ['page'] );
+		$json_data = array();
+		$count_all = $this->reports_model->getcharges_list(false);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET ['rp'], $_GET ['page']);
 		$json_data = $paging_data ["json_paging"];
-		$query = $this->reports_model->getcharges_list ( true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"] );
-		$result = $query->result_array ();
-		$query1 = $this->reports_model->getcharges_list ( true, '', '' );
-		$res = $query1->result_array ();
+		$query = $this->reports_model->getcharges_list(true, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"]);
+		$result = $query->result_array();
+		$query1 = $this->reports_model->getcharges_list(true, '', '');
+		$res = $query1->result_array();
 		$debit = 0;
 		$credit = 0;
 		$before_balance = 0;
 		$after_balance = 0;
 		$i = 0;
-		foreach ( $result as $key => $value ) {
-			$date = $this->common->convert_GMT_to ( '', '', $value ['created_date'] );
-			$cust_type = $this->common->get_field_name ( 'posttoexternal', 'accounts', $value ['accountid'] );
-			$invoice_prefix = $entity_type = $this->common->get_field_name ( 'invoice_prefix', 'invoices', array (
+		foreach ($result as $key => $value) {
+			$date = $this->common->convert_GMT_to('', '', $value ['created_date']);
+			$cust_type = $this->common->get_field_name('posttoexternal', 'accounts', $value ['accountid']);
+			$invoice_prefix = $entity_type = $this->common->get_field_name('invoice_prefix', 'invoices', array(
 					'id' => $value ['invoiceid'] 
-			) );
-			$invoiceid = $entity_type = $this->common->get_field_name ( 'invoiceid', 'invoices', array (
+			));
+			$invoiceid = $entity_type = $this->common->get_field_name('invoiceid', 'invoices', array(
 					'id' => $value ['invoiceid'] 
-			) );
-			$invoice_num = $invoice_prefix . $invoiceid;
-			$account = $this->common->get_field_name_coma_new ( 'first_name,last_name,number', 'accounts', $value ['accountid'] );
-			$reseller = $this->common->reseller_select_value ( 'first_name,last_name,number', 'accounts', $value ['reseller_id'] );
+			));
+			$invoice_num = $invoice_prefix.$invoiceid;
+			$account = $this->common->get_field_name_coma_new('first_name,last_name,number', 'accounts', $value ['accountid']);
+			$reseller = $this->common->reseller_select_value('first_name,last_name,number', 'accounts', $value ['reseller_id']);
 			$item_type = $value ['item_type'];
 			if ($value ['before_balance'] == '-') {
 				$before_balance = '-';
 			} else {
-				$before_balance = $this->common->convert_to_currency ( '', '', $value ['before_balance'] );
+				$before_balance = $this->common->convert_to_currency('', '', $value ['before_balance']);
 			}
 			if ($value ['debit'] == '-') {
 				$debit = '-';
 			} else {
-				$debit = $this->common->convert_to_currency ( '', '', $value ['debit'] );
+				$debit = $this->common->convert_to_currency('', '', $value ['debit']);
 			}
-			$credit = $this->common->convert_to_currency ( '', '', $value ['credit'] );
+			$credit = $this->common->convert_to_currency('', '', $value ['credit']);
 			if ($cust_type == 0 && $value ['item_type'] == 'INVPAY') {
-				$credit = '(-) ' . $credit;
+				$credit = '(-) '.$credit;
 			}
 			if ($value ['after_balance'] == '-') {
 				$after_balance = '-';
 			} else {
-				$after_balance = $this->common->convert_to_currency ( '', '', $value ['after_balance'] );
+				$after_balance = $this->common->convert_to_currency('', '', $value ['after_balance']);
 			}
 			$description = $value ['description'];
-			$cust_type = $this->common->get_field_name ( 'posttoexternal', 'accounts', $value ['accountid'] );
-			if ($this->session->userdata ( 'logintype' ) == 1) {
-				$json_data ['rows'] [] = array (
-						'cell' => array (
+			$cust_type = $this->common->get_field_name('posttoexternal', 'accounts', $value ['accountid']);
+			if ($this->session->userdata('logintype') == 1) {
+				$json_data ['rows'] [] = array(
+						'cell' => array(
 								$date,
 								$invoice_num,
 								$account,
@@ -891,8 +891,8 @@ 
 						) 
 				);
 			} else {
-				$json_data ['rows'] [] = array (
-						'cell' => array (
+				$json_data ['rows'] [] = array(
+						'cell' => array(
 								$date,
 								$invoice_num,
 								$account,
@@ -908,57 +908,57 @@ 
 		}
 		$debit_sum = 0;
 		$credit_sum = 0;
-		foreach ( $res as $value ) {
-			$cust_type = $this->common->get_field_name ( 'posttoexternal', 'accounts', $value ['accountid'] );
-			$cust_type = $this->common->get_field_name ( 'posttoexternal', 'accounts', $value ['accountid'] );
+		foreach ($res as $value) {
+			$cust_type = $this->common->get_field_name('posttoexternal', 'accounts', $value ['accountid']);
+			$cust_type = $this->common->get_field_name('posttoexternal', 'accounts', $value ['accountid']);
 			$debit_sum += $value ['debit'];
 			$credit_sum += $value ['credit'];
 			$before_balance += $value ['before_balance'];
 			$after_balance += $value ['after_balance'];
 		}
-		if ($this->session->userdata ( 'logintype' ) == 1) {
-			$json_data ['rows'] [$count_all] ['cell'] = array (
+		if ($this->session->userdata('logintype') == 1) {
+			$json_data ['rows'] [$count_all] ['cell'] = array(
 					'<b>Total</b>',
 					'-',
 					'-',
 					'-',
 					'-',
-					'<b>' . $this->common->convert_to_currency ( '', '', $debit_sum ) . '</b>',
-					'<b>' . $this->common->convert_to_currency ( '', '', $credit_sum ) . '</b>',
+					'<b>'.$this->common->convert_to_currency('', '', $debit_sum).'</b>',
+					'<b>'.$this->common->convert_to_currency('', '', $credit_sum).'</b>',
 					'-',
 					'-' 
 			);
 		} else {
-			$json_data ['rows'] [$count_all] ['cell'] = array (
+			$json_data ['rows'] [$count_all] ['cell'] = array(
 					'<b>Total</b>',
 					'-',
 					'-',
 					'-',
 					'-',
-					'<b>' . $this->common->convert_to_currency ( '', '', $debit_sum ) . '</b>',
-					'<b>' . $this->common->convert_to_currency ( '', '', $credit_sum ) . '</b>',
+					'<b>'.$this->common->convert_to_currency('', '', $debit_sum).'</b>',
+					'<b>'.$this->common->convert_to_currency('', '', $credit_sum).'</b>',
 					'-',
 					'-' 
 			);
 		}
-		echo json_encode ( $json_data );
+		echo json_encode($json_data);
 	}
 	function charges_history_search() {
-		$ajax_search = $this->input->post ( 'ajax_search', 0 );
-		if ($this->input->post ( 'advance_search', TRUE ) == 1) {
-			$this->session->set_userdata ( 'advance_search', $this->input->post ( 'advance_search' ) );
-			$action = $this->input->post ();
-			unset ( $action ['action'] );
-			unset ( $action ['advance_search'] );
-			$this->session->set_userdata ( 'charges_list_search', $action );
+		$ajax_search = $this->input->post('ajax_search', 0);
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset ($action ['action']);
+			unset ($action ['advance_search']);
+			$this->session->set_userdata('charges_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect ( base_url () . 'accounts/admin_list/' );
+			redirect(base_url().'accounts/admin_list/');
 		}
 	}
 	function charges_history_clearsearchfilter() {
-		$this->session->set_userdata ( 'advance_search', 0 );
-		$this->session->set_userdata ( 'charges_list_search', "" );
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('charges_list_search', "");
 	}
 	/* * ******************************** */
 	/*
@@ -966,68 +966,68 @@ 
 	 * This function using for customer edit
 	 */
 	function customer_charge_history($accountid, $accounttype) {
-		$json_data = array ();
-		$instant_search = $this->session->userdata ( 'left_panel_search_' . $accounttype . '_charges' );
-		$like_str = ! empty ( $instant_search ) ? "(created_date like '%$instant_search%'  
+		$json_data = array();
+		$instant_search = $this->session->userdata('left_panel_search_'.$accounttype.'_charges');
+		$like_str = ! empty ($instant_search) ? "(created_date like '%$instant_search%'  
                                             OR  item_type like '%$instant_search%'
                                             OR  'debit' like '%$instant_search%'
                                             OR 'credit' like '%$instant_search%'
                                             OR  'description' like '%$instant_search%')" : null;
-		if (! empty ( $like_str ))
-			$this->db->where ( $like_str );
-		$count_all = $this->reports_model->get_customer_charge_list ( false, $accountid );
+		if ( ! empty ($like_str))
+			$this->db->where($like_str);
+		$count_all = $this->reports_model->get_customer_charge_list(false, $accountid);
 		
-		$paging_data = $this->form->load_grid_config ( $count_all, $_GET ['rp'], $_GET ['page'] );
+		$paging_data = $this->form->load_grid_config($count_all, $_GET ['rp'], $_GET ['page']);
 		$json_data = $paging_data ["json_paging"];
-		if (! empty ( $like_str ))
-			$this->db->where ( $like_str );
-		$query = $this->reports_model->get_customer_charge_list ( true, $accountid, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"] );
-		$result = $query->result_array ();
-		$query1 = $this->reports_model->get_customer_charge_list ( true, $accountid, '', '' );
-		$res = $query1->result_array ();
+		if ( ! empty ($like_str))
+			$this->db->where($like_str);
+		$query = $this->reports_model->get_customer_charge_list(true, $accountid, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"]);
+		$result = $query->result_array();
+		$query1 = $this->reports_model->get_customer_charge_list(true, $accountid, '', '');
+		$res = $query1->result_array();
 		
 		$debit = 0;
 		$credit = 0;
 		$before_balance = 0;
 		$after_balance = 0;
 		$i = 0;
-		foreach ( $result as $key => $value ) {
-			$date = $this->common->convert_GMT_to ( '', '', $value ['created_date'] );
-			$cust_type = $this->common->get_field_name ( 'posttoexternal', 'accounts', $value ['accountid'] );
-			$invoice_prefix = $entity_type = $this->common->get_field_name ( 'invoice_prefix', 'invoices', array (
+		foreach ($result as $key => $value) {
+			$date = $this->common->convert_GMT_to('', '', $value ['created_date']);
+			$cust_type = $this->common->get_field_name('posttoexternal', 'accounts', $value ['accountid']);
+			$invoice_prefix = $entity_type = $this->common->get_field_name('invoice_prefix', 'invoices', array(
 					'id' => $value ['invoiceid'] 
-			) );
-			$invoiceid = $entity_type = $this->common->get_field_name ( 'invoiceid', 'invoices', array (
+			));
+			$invoiceid = $entity_type = $this->common->get_field_name('invoiceid', 'invoices', array(
 					'id' => $value ['invoiceid'] 
-			) );
-			$invoice_num = $invoice_prefix . $invoiceid;
-			$account = $this->common->get_field_name_coma_new ( 'first_name,last_name,number', 'accounts', $value ['accountid'] );
-			$reseller = $this->common->reseller_select_value ( 'first_name,last_name,number', 'accounts', $value ['reseller_id'] );
+			));
+			$invoice_num = $invoice_prefix.$invoiceid;
+			$account = $this->common->get_field_name_coma_new('first_name,last_name,number', 'accounts', $value ['accountid']);
+			$reseller = $this->common->reseller_select_value('first_name,last_name,number', 'accounts', $value ['reseller_id']);
 			$item_type = $value ['item_type'];
 			if ($value ['before_balance'] == '-') {
 				$before_balance = '-';
 			} else {
-				$before_balance = $this->common->convert_to_currency ( '', '', $value ['before_balance'] );
+				$before_balance = $this->common->convert_to_currency('', '', $value ['before_balance']);
 			}
 			if ($value ['debit'] == '-') {
 				$debit = '-';
 			} else {
-				$debit = $this->common->convert_to_currency ( '', '', $value ['debit'] );
+				$debit = $this->common->convert_to_currency('', '', $value ['debit']);
 			}
-			$credit = $this->common->convert_to_currency ( '', '', $value ['credit'] );
+			$credit = $this->common->convert_to_currency('', '', $value ['credit']);
 			if ($cust_type == 0 && $value ['item_type'] == 'INVPAY') {
-				$credit = '(-) ' . $credit;
+				$credit = '(-) '.$credit;
 			}
 			if ($value ['after_balance'] == '-') {
 				$after_balance = '-';
 			} else {
-				$after_balance = $this->common->convert_to_currency ( '', '', $value ['after_balance'] );
+				$after_balance = $this->common->convert_to_currency('', '', $value ['after_balance']);
 			}
 			$description = $value ['description'];
-			$cust_type = $this->common->get_field_name ( 'posttoexternal', 'accounts', $value ['accountid'] );
-			if ($this->session->userdata ( 'logintype' ) == 1) {
-				$json_data ['rows'] [] = array (
-						'cell' => array (
+			$cust_type = $this->common->get_field_name('posttoexternal', 'accounts', $value ['accountid']);
+			if ($this->session->userdata('logintype') == 1) {
+				$json_data ['rows'] [] = array(
+						'cell' => array(
 								$date,
 								$invoice_num,
 								$item_type,
@@ -1039,8 +1039,8 @@ 
 						) 
 				);
 			} else {
-				$json_data ['rows'] [] = array (
-						'cell' => array (
+				$json_data ['rows'] [] = array(
+						'cell' => array(
 								$date,
 								$invoice_num,
 								$item_type,
@@ -1055,58 +1055,58 @@ 
 		}
 		$debit_sum = 0;
 		$credit_sum = 0;
-		foreach ( $res as $value ) {
-			$cust_type = $this->common->get_field_name ( 'posttoexternal', 'accounts', $value ['accountid'] );
-			$cust_type = $this->common->get_field_name ( 'posttoexternal', 'accounts', $value ['accountid'] );
+		foreach ($res as $value) {
+			$cust_type = $this->common->get_field_name('posttoexternal', 'accounts', $value ['accountid']);
+			$cust_type = $this->common->get_field_name('posttoexternal', 'accounts', $value ['accountid']);
 			$debit_sum += $value ['debit'];
 			$credit_sum += $value ['credit'];
 			$before_balance += $value ['before_balance'];
 			$after_balance += $value ['after_balance'];
 		}
-		if ($this->session->userdata ( 'logintype' ) == 1) {
-			$json_data ['rows'] [$count_all] ['cell'] = array (
+		if ($this->session->userdata('logintype') == 1) {
+			$json_data ['rows'] [$count_all] ['cell'] = array(
 					'<b>Total</b>',
 					'-',
 					'-',
 					'-',
-					'<b>' . $this->common->convert_to_currency ( '', '', $debit_sum ) . '</b>',
-					'<b>' . $this->common->convert_to_currency ( '', '', $credit_sum ) . '</b>',
+					'<b>'.$this->common->convert_to_currency('', '', $debit_sum).'</b>',
+					'<b>'.$this->common->convert_to_currency('', '', $credit_sum).'</b>',
 					'-',
 					'-' 
 			);
 		} else {
-			$json_data ['rows'] [$count_all] ['cell'] = array (
+			$json_data ['rows'] [$count_all] ['cell'] = array(
 					'<b>Total</b>',
 					'-',
 					'-',
 					'-',
-					'<b>' . $this->common->convert_to_currency ( '', '', $debit_sum ) . '</b>',
-					'<b>' . $this->common->convert_to_currency ( '', '', $credit_sum ) . '</b>',
+					'<b>'.$this->common->convert_to_currency('', '', $debit_sum).'</b>',
+					'<b>'.$this->common->convert_to_currency('', '', $credit_sum).'</b>',
 					'-',
 					'-' 
 			);
 		}
-		echo json_encode ( $json_data );
+		echo json_encode($json_data);
 	}
 	function customer_refillreport($accountid, $accounttype) {
-		$json_data = array ();
-		$instant_search = $this->session->userdata ( 'left_panel_search_' . $accounttype . '_refill' );
-		$like_str = ! empty ( $instant_search ) ? "(payment_date like '%$instant_search%'
+		$json_data = array();
+		$instant_search = $this->session->userdata('left_panel_search_'.$accounttype.'_refill');
+		$like_str = ! empty ($instant_search) ? "(payment_date like '%$instant_search%'
                                             OR  credit like '%$instant_search%'
                                             OR  payment_by like '%$instant_search%'
                                             OR  notes like '%$instant_search%'
                                                 )" : null;
-		if (! empty ( $like_str ))
-			$this->db->where ( $like_str );
-		$count_all = $this->reports_model->get_customer_refillreport ( false, $accountid );
-		$paging_data = $this->form->load_grid_config ( $count_all, $_GET ['rp'], $_GET ['page'] );
+		if ( ! empty ($like_str))
+			$this->db->where($like_str);
+		$count_all = $this->reports_model->get_customer_refillreport(false, $accountid);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET ['rp'], $_GET ['page']);
 		$json_data = $paging_data ["json_paging"];
-		if (! empty ( $like_str ))
-			$this->db->where ( $like_str );
-		$query = $this->reports_model->get_customer_refillreport ( true, $accountid, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"] );
-		$grid_fields = json_decode ( $this->reports_form->build_refillreport_for_customer () );
-		$json_data ['rows'] = $this->form->build_grid ( $query, $grid_fields );
-		echo json_encode ( $json_data );
+		if ( ! empty ($like_str))
+			$this->db->where($like_str);
+		$query = $this->reports_model->get_customer_refillreport(true, $accountid, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"]);
+		$grid_fields = json_decode($this->reports_form->build_refillreport_for_customer());
+		$json_data ['rows'] = $this->form->build_grid($query, $grid_fields);
+		echo json_encode($json_data);
 	}
 /**
  * ********************************************************

Braces +21 added lines, -14 removed lines

@@ -36,8 +36,9 @@ 
 		$this->fpdf = new PDF ( 'P', 'pt' );
 		$this->fpdf->initialize ( 'P', 'mm', 'A4' );
 		
-		if ($this->session->userdata ( 'user_login' ) == FALSE)
-			redirect ( base_url () . '/astpp/login' );
+		if ($this->session->userdata ( 'user_login' ) == FALSE) {
+					redirect ( base_url () . '/astpp/login' );
+		}
 	}
 	function customerReport() {
 		$data ['page_title'] = gettext ( 'Customer CDRs Report' );
@@ -715,13 +716,15 @@ 
                                                 )" : null;
 		
 		$json_data = array ();
-		if (! empty ( $like_str ))
-			$this->db->where ( $like_str );
+		if (! empty ( $like_str )) {
+					$this->db->where ( $like_str );
+		}
 		$count_all = $this->reports_model->users_cdrs_list ( false, $accountid, $accounttype, "", "" );
 		$paging_data = $this->form->load_grid_config ( $count_all, $_GET ['rp'], $_GET ['page'] );
 		$json_data = $paging_data ["json_paging"];
-		if (! empty ( $like_str ))
-			$this->db->where ( $like_str );
+		if (! empty ( $like_str )) {
+					$this->db->where ( $like_str );
+		}
 		$query = $this->reports_model->users_cdrs_list ( true, $accountid, $accounttype, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"] );
 		$grid_fields = json_decode ( $this->reports_form->build_report_list_for_user ( $accounttype ) );
 		$json_data ['rows'] = $this->form->build_grid ( $query, $grid_fields );
@@ -973,14 +976,16 @@ 
                                             OR  'debit' like '%$instant_search%'
                                             OR 'credit' like '%$instant_search%'
                                             OR  'description' like '%$instant_search%')" : null;
-		if (! empty ( $like_str ))
-			$this->db->where ( $like_str );
+		if (! empty ( $like_str )) {
+					$this->db->where ( $like_str );
+		}
 		$count_all = $this->reports_model->get_customer_charge_list ( false, $accountid );
 		
 		$paging_data = $this->form->load_grid_config ( $count_all, $_GET ['rp'], $_GET ['page'] );
 		$json_data = $paging_data ["json_paging"];
-		if (! empty ( $like_str ))
-			$this->db->where ( $like_str );
+		if (! empty ( $like_str )) {
+					$this->db->where ( $like_str );
+		}
 		$query = $this->reports_model->get_customer_charge_list ( true, $accountid, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"] );
 		$result = $query->result_array ();
 		$query1 = $this->reports_model->get_customer_charge_list ( true, $accountid, '', '' );
@@ -1096,13 +1101,15 @@ 
                                             OR  payment_by like '%$instant_search%'
                                             OR  notes like '%$instant_search%'
                                                 )" : null;
-		if (! empty ( $like_str ))
-			$this->db->where ( $like_str );
+		if (! empty ( $like_str )) {
+					$this->db->where ( $like_str );
+		}
 		$count_all = $this->reports_model->get_customer_refillreport ( false, $accountid );
 		$paging_data = $this->form->load_grid_config ( $count_all, $_GET ['rp'], $_GET ['page'] );
 		$json_data = $paging_data ["json_paging"];
-		if (! empty ( $like_str ))
-			$this->db->where ( $like_str );
+		if (! empty ( $like_str )) {
+					$this->db->where ( $like_str );
+		}
 		$query = $this->reports_model->get_customer_refillreport ( true, $accountid, $paging_data ["paging"] ["start"], $paging_data ["paging"] ["page_no"] );
 		$grid_fields = json_decode ( $this->reports_form->build_refillreport_for_customer () );
 		$json_data ['rows'] = $this->form->build_grid ( $query, $grid_fields );