iNextrix / ASTPP

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

Spacing +153 added lines, -153 removed lines

@@ -36,7 +36,7 @@ 
 		$this->load->model('freeswitch_model');
 
 		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+			redirect(base_url().'/astpp/login');
 	}
 
 	function fssipdevices_add($type = "") {
@@ -44,7 +44,7 @@ 
 		 $account_data = $this->session->userdata("accountinfo");
 		$data['flag'] = 'create';
 		$data['page_title'] = 'Create SIP Device';
-	   if($account_data['type'] == '-1'  || $account_data['type'] == '1')
+	   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);
@@ -57,11 +57,11 @@ 
 	 $data['username'] = $this->session->userdata('user_name');
 	 $account_data = $this->session->userdata("accountinfo");
 		$data['page_title'] = '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')
+		$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);
-		}else{
+		} else {
 			$this->load->view('view_freeswitch_customer_add_edit', $data);
 		}
 	}
@@ -71,11 +71,11 @@ 
 		$account_data = $this->session->userdata("accountinfo");
 		$where = array('id' => $edit_id);
 		$account = $this->freeswitch_model->get_edited_data($edit_id);
-		if($account_data['type'] == '-1')
+		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);
-		}else{
+		} 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);
 		}
@@ -87,13 +87,13 @@ 
 		$data['page_title'] = 'Edit SIP device';
 		$where = array('id' => $edit_id);
 		$account = $this->freeswitch_model->get_edited_data($edit_id);
-		  if($account_data['type'] == '-1' || $account_data['type'] == '1')
+		  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);
+		$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{
+		} else {
         
-		$data['form'] = $this->form->build_form($this->freeswitch_form->fsdevice_form_fields_for_customer($accountid,$edit_id), $account);
+		$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);
 		}
 	}
@@ -109,7 +109,7 @@ 
 			$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() {
@@ -123,7 +123,7 @@ 
 			$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() {
@@ -140,10 +140,10 @@ 
 	}
 	function fssipdevices_save($user_flg = false) {
 		$add_array = $this->input->post();
-		if (!$user_flg) {
+		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'] = 'Freeswitch SIP Devices';
@@ -171,10 +171,10 @@ 
 	}
 	function customer_fssipdevices_save($user_flg = false) {
 		$add_array = $this->input->post();      
-		if (!$user_flg) {
+		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'] = 'Edit Freeswitch SIP Devices';
@@ -202,7 +202,7 @@ 
 	}
 	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);
+		$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'] = 'Edit Freeswitch SIP Devices';
 			if ($this->form_validation->run() == FALSE) {
@@ -214,14 +214,14 @@ 
 				echo json_encode(array("SUCCESS"=> "SIP Device Updated Successfully!"));
 				exit;
 			}
-		}else{
+		} else {
 			$data['page_title'] = '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('name'=>'default'));
+		$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("SUCCESS"=> "SIP Device Added Successfully!"));
 				exit;
@@ -239,7 +239,7 @@ 
 			$this->session->set_userdata('fssipdevices_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'freeswitch/fssipdevices/');
+			redirect(base_url().'freeswitch/fssipdevices/');
 		}
 	}
 
@@ -267,13 +267,13 @@ 
 		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">';
-	} else{
-		$voicemail_enabled ='<img src='.$path_false.' style="height:20px;width:20px;" title="Disable">';
+	if ($value['voicemail_enabled'] == 'true') {
+		$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">';
 	}
 		$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>',
+			'<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'],
@@ -281,10 +281,10 @@ 
 					$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']),                
+					 $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'])
 					));
 		}
@@ -304,7 +304,7 @@ 
 		$this->db->delete("sip_devices");
 		echo TRUE;
 	}
-	function customer_fssipdevices_delete_multiple(){
+	function customer_fssipdevices_delete_multiple() {
 		$ids = $this->input->post("selected_ids", true);
 		$where = "id IN ($ids)";
 		$this->db->where($where);
@@ -316,42 +316,42 @@ 
 ASTPP 3.0
 Customer side show voice mail detials
 ******/
-	function customer_fssipdevices_json($accountid,$entity_type='') {
+	function customer_fssipdevices_json($accountid, $entity_type = '') {
 		$json_data = array();
-		$count_all = $this->freeswitch_model->get_sipdevices_list(false, $accountid,$entity_type);
+		$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"]);
+		$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">';
+	$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>',
+			'<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('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);
 	}
 /****************************/
-	function get_action_fssipdevices_buttons($id, $accountid,$entity_type='') {
+	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;
 	}
@@ -359,15 +359,15 @@ 
 	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/');
+		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;
 	}
 
@@ -385,10 +385,10 @@ 
 		$calls_final = array();
 		$data_header = array();
 		$k = 0;
-			$data = explode("\n",$response);
+			$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") {
+					if (count($data_header) == 0 || substr($data[$i], 0, 4) == "uuid") {
 						$data_header = explode(",", $data[$i]);
 					} else {
 						$data_call = explode(",", $data[$i]);
@@ -435,7 +435,7 @@ 
 		$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());
+	  	$data['form_search'] = $this->form->build_serach_form($this->freeswitch_form->get_gateway_search_form());
 		$this->load->view('view_fsgateway_list', $data);
 	}
 
@@ -452,13 +452,13 @@ 
 		if ($query->num_rows > 0) {
 			$query = $query->result_array();
 			foreach ($query as $key => $query_value) {
-$gateway_data=array();
-$tmp=null;
+$gateway_data = array();
+$tmp = null;
 				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);
@@ -486,22 +486,22 @@ 
 		$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"]:"";
+  			$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") {
+				} else if ($gateway_key == "status") {
 					$gateway_data[$gateway_key] = $gatewau_val;
 				} 
 				 /**
                  ASTPP 3.0 
                  put one variable with the name of dialplan variable 
 				  **/ 
-				else if($gateway_key == "dialplan_variable") {
+				else if ($gateway_key == "dialplan_variable") {
 					$gateway_data[$gateway_key] = $gatewau_val;
 				} 
 				/****************************************************/
 				else {
-					$tmp = (array) json_decode($gatewau_val);
+					$tmp = (array)json_decode($gatewau_val);
 					$gateway_result = array_merge($gateway_data, $tmp);
 				}
 			}
@@ -510,9 +510,9 @@ 
         ASTPP  3.0 
         put one variable with the name of dialplan variable 
 		 **/
-		if(!empty($gateway_data['dialplan_variable']) && $gateway_data['dialplan_variable'] != ''){
-		 $gateway_result['dialplan_variable']  = $gateway_data['dialplan_variable'];
-		 }else{
+		if ( ! empty($gateway_data['dialplan_variable']) && $gateway_data['dialplan_variable'] != '') {
+		 $gateway_result['dialplan_variable'] = $gateway_data['dialplan_variable'];
+		 } else {
 		 $gateway_result['dialplan_variable'] = '';
 		 }
 		 /**********************************************************************************************/
@@ -525,7 +525,7 @@ 
 		$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'] ="";
+		$insert_arr['dialplan_variable'] = "";
 		foreach ($gateway_data as $key => $gateway_value) {
 			if ($gateway_value != "") {
 				if ($key == "sip_profile_id") {
@@ -543,9 +543,9 @@ 
 					$insert_arr['dialplan_variable'] = $gateway_data["dialplan_variable"];
 				}
 				/*********************************************************************/
-				else if($key == "status") {
+				else if ($key == "status") {
 					$insert_arr[$key] = $gateway_data["status"];
-				}  else {
+				} else {
 					if ($key != "id") {
 						$gateway_arr[$key] = $gateway_value;
 					}
@@ -562,7 +562,7 @@ 
 				echo $data['validation_errors'];
 				exit;
 			} else {
-		if ( preg_match('/\s/',$insert_arr['name']) )
+		if (preg_match('/\s/', $insert_arr['name']))
 		{
 		  echo json_encode(array("name_error"=> "Gateway name must not have any space."));
 		  exit;
@@ -571,17 +571,17 @@ 
 		ASTPP  3.0 
 		gateway last modified date
 		*/
-		$insert_arr['last_modified_date']=gmdate('Y-m-d H:i:s');
+		$insert_arr['last_modified_date'] = gmdate('Y-m-d H:i:s');
 		/*************************************************/
 				$update = $this->db->update("gateways", $insert_arr, array('id' => $gateway_data['id']));
 				if ($update) {
 					$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." killgw '".$insert_arr['name']."' ";
-					$this->freeswitch_model->reload_freeswitch($cmd,$sip_ip);
+					$this->freeswitch_model->reload_freeswitch($cmd, $sip_ip);
 
-					$cmd2 = "api sofia profile " . $profile_name . " rescan reloadacl reloadxml";
-					$this->freeswitch_model->reload_freeswitch($cmd2,$sip_ip);
+					$cmd2 = "api sofia profile ".$profile_name." rescan reloadacl reloadxml";
+					$this->freeswitch_model->reload_freeswitch($cmd2, $sip_ip);
 				}
 				echo json_encode(array("SUCCESS"=> $insert_arr['name']." Gateway Updated Successfully!"));
 				exit;
@@ -593,18 +593,18 @@ 
 				echo $data['validation_errors'];
 				exit;
 			} else {
-		if ( preg_match('/\s/',$insert_arr['name']) )
+		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_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);
+					$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!"));
 				exit;
@@ -619,12 +619,12 @@ 
 			$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);
 			$gateway_name = $this->common->get_field_name('name', 'gateways', $gateway_id);
-			$cmd = "api sofia profile " . $profile_name . " killgw " . $gateway_name . " reloadxml";
-			$this->freeswitch_model->reload_freeswitch($cmd,$sip_ip);
+			$cmd = "api sofia profile ".$profile_name." killgw ".$gateway_name." reloadxml";
+			$this->freeswitch_model->reload_freeswitch($cmd, $sip_ip);
 		}
 
 		$this->session->set_flashdata('astpp_notification', 'Gateway Removed Successfully!');
-		redirect(base_url() . 'freeswitch/fsgateway/');
+		redirect(base_url().'freeswitch/fsgateway/');
 	}
 
 	function fsgateway_delete_multiple() {
@@ -641,8 +641,8 @@ 
 		$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->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);
 	}
@@ -674,14 +674,14 @@ 
 		$query = $this->db_model->getSelect("*", "sip_profiles", $where);
 		$query = $query->result_array();
 		$gateway_result = array();
-		$i=0;
+		$i = 0;
 		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 != '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);
+					$tmp = (array)json_decode($gatewau_val);
 					$gateway_result = array_merge($gateway_data, $tmp);
 				}
 	}
@@ -694,74 +694,74 @@ 
 	  $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);
 	}
-	 function fssipprofile_action($button_name,$id) {
+	 function fssipprofile_action($button_name, $id) {
 		$where = array('id' => $id);
 		$query = $this->db_model->getSelect("*", "sip_profiles", $where);
 		$query = $query->result_array();
 		$where = array('sip_profile_id' => $id);
-		if($button_name == "start")
+		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")
+		elseif ($button_name == "stop")
 		{
-			$cmd= "api sofia profile stop";
+			$cmd = "api sofia profile stop";
 		}
-		elseif($button_name == "reload")
+		elseif ($button_name == "reload")
 		{
 			$cmd = "api reloadxml";
 		}
-		elseif($button_name == "rescan")
+		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/');   
+	redirect(base_url().'freeswitch/fssipprofile/');   
 	}
-	 function fssipprofile_add($add='') {
+	 function fssipprofile_add($add = '') {
      
 		$data['username'] = $this->session->userdata('user_name');
 		$data['flag'] = 'create';
 		$data['page_title'] = 'Create SIP Profile';
 		$sipprofile_data = $this->input->post();
-		 $sipprofile_data['status']=$sipprofile_data['sipstatus'];
-		$data['button_name']="Add Setting";
-		if($add == 'add')
+		 $sipprofile_data['status'] = $sipprofile_data['sipstatus'];
+		$data['button_name'] = "Add Setting";
+		if ($add == 'add')
 		{
           
 	  unset($sipprofile_data['action']);
 	   unset($sipprofile_data['sipstatus']);
-	  $insert_data=$sipprofile_data;
+	  $insert_data = $sipprofile_data;
 	  
-	  if($sipprofile_data['name'] == '' || $sipprofile_data['sip_ip'] =='' || $sipprofile_data['sip_port'] =='')
+	  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/');
+		  redirect(base_url().'freeswitch/fssipprofile_add/');
 		  exit;
 	  }
-	  if(preg_match('/\s/',$sipprofile_data['name']))
+	  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/');
+ 		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']))
+	  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/');
+ 		redirect(base_url().'freeswitch/fssipprofile_add/');
  		exit;
 	  }
-	  $sipprofile_data['id']='';
+	  $sipprofile_data['id'] = '';
 	  $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
 		  **/
@@ -772,40 +772,40 @@ 
 		}
 		else {
 					$this->session->set_flashdata('astpp_notification', 'Duplicate SIP IP OR Port found it must be unique!');
-			redirect(base_url() . 'freeswitch/fssipprofile_add/');
+			redirect(base_url().'freeswitch/fssipprofile_add/');
 		}
 		$this->session->set_flashdata('astpp_errormsg', 'SIP Profile Added Successfully!');
-		redirect(base_url() . 'freeswitch/fssipprofile/');
+		redirect(base_url().'freeswitch/fssipprofile/');
 		}
 	
-		if($add == 'edit')
+		if ($add == 'edit')
 		{
 	  $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");
+			$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/');   
+					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/');
+			redirect(base_url().'freeswitch/fssipprofile/');
 				}
-	  redirect(base_url() . 'freeswitch/fssipprofile/');   
+	  redirect(base_url().'freeswitch/fssipprofile/');   
 		}
 		$this->load->view('view_fssipprofile_add', $data);
 	}
 
 
-	function fssipprofile_edit($edit_id = '',$type='',$name_prams='') {
+	function fssipprofile_edit($edit_id = '', $type = '', $name_prams = '') {
 		$data['page_title'] = 'Edit SIP Profile';
 		  $sipprofile_data = $this->input->post();
-		if(!$edit_id)
+		if ( ! $edit_id)
 		{
-	  $edit_id=$sipprofile_data['id'];
+	  $edit_id = $sipprofile_data['id'];
 		}
 		$where = array('id' => $edit_id);
 		$query = $this->db_model->getSelect("*", "sip_profiles", $where);
@@ -816,45 +816,45 @@ 
 				if ($gateway_key != "profile_data") {
 					$gateway_data[$gateway_key] = $gatewau_val;
 				} else {
-					$tmp = (array) json_decode($gatewau_val);
+					$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['edited_id'] = $edit_id;
-		$data['sip_name']=$query[0]['name'];
-	$data['status']=$query[0]['status'];
-	$data['sip_ip']= $query[0]['sip_ip'];
-	$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')
+		$data['sip_name'] = $query[0]['name'];
+	$data['status'] = $query[0]['status'];
+	$data['sip_ip'] = $query[0]['sip_ip'];
+	$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')
+		if ($type == 'edit')
 		{
-		$data['params_name']=$name_prams;
-		$data['params_status']=0;
-		if($gateway_result[$name_prams] == "true" || $gateway_result[$name_prams] == "false")
+		$data['params_name'] = $name_prams;
+		$data['params_status'] = 0;
+		if ($gateway_result[$name_prams] == "true" || $gateway_result[$name_prams] == "false")
 		{
-		  $data['params_status']=1;
+		  $data['params_status'] = 1;
 		}
-		$data['params_value']=$gateway_result[$name_prams];
-		$data['button_name']="Update Setting";
+		$data['params_value'] = $gateway_result[$name_prams];
+		$data['button_name'] = "Update Setting";
 		}
-		if(isset($sipprofile_data['type']) && $sipprofile_data['type'] == 'save'){
+		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);
+		$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('id' => $edit_id));
-		   if($sipprofile_data['type_settings']=="add_setting"){
-			$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!");
+		   if ($sipprofile_data['type_settings'] == "add_setting") {
+			$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!");
 		    
 				  }
-				  redirect(base_url() . 'freeswitch/fssipprofile_edit/'.$sipprofile_data['id']);
+				  redirect(base_url().'freeswitch/fssipprofile_edit/'.$sipprofile_data['id']);
 		  exit;
 
 		}
@@ -875,19 +875,19 @@ 
 				if ($gateway_key != "profile_data") {
 					$gateway_data[$gateway_key] = $gatewau_val;
 				} else {
-					$tmp = (array) json_decode($gatewau_val);
+					$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);
+		$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('id' => $id));
 	$this->load->view('view_fssipprofile_edit', $data);
 	}
     
-	function fssipprofile_delete_params($id,$name) {
+	function fssipprofile_delete_params($id, $name) {
 	$where = array('id' => $id);
 		$query = $this->db_model->getSelect("*", "sip_profiles", $where);
 		$query = $query->result_array();
@@ -897,18 +897,18 @@ 
 				if ($gateway_key != "profile_data") {
 					$gateway_data[$gateway_key] = $gatewau_val;
 				} else {
-					$tmp = (array) json_decode($gatewau_val);
+					$tmp = (array)json_decode($gatewau_val);
 					$gateway_result = array_merge($gateway_data, $tmp);
 				}
 			}
 		}
-	if(isset($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('id' => $id));
 		$this->session->set_flashdata('astpp_notification', $name.' SIP Setting Removed Successfully!');
-		redirect(base_url() . 'freeswitch/fssipprofile_edit/'.$id);
+		redirect(base_url().'freeswitch/fssipprofile_edit/'.$id);
 	}
     
 	function fssipprofile_delete($profile_id) {
@@ -916,7 +916,7 @@ 
 		$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/');
+		redirect(base_url().'freeswitch/fssipprofile/');
 	}
 
 	function fsserver_list() {
@@ -1003,7 +1003,7 @@ 
 	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/');
+		redirect(base_url().'freeswitch/fsserver_list/');
 		exit;
 	}
 
@@ -1018,7 +1018,7 @@ 
 			$this->session->set_userdata('fsserver_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'freeswitch/fsserver_list/');
+			redirect(base_url().'freeswitch/fsserver_list/');
 		}
 	}
 
@@ -1026,11 +1026,11 @@ 
 		$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){
-		if($key == $name){
+	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) {
+		if ($key == $name) {
 			echo 1;
 			return true;
 		}

Braces +15 added lines, -18 removed lines

@@ -35,8 +35,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 = "") {
@@ -61,7 +62,7 @@ 
 		if($account_data['type'] == '-1'  || $account_data['type'] == '1')
 		{
 			$this->load->view('view_freeswitch_add_edit', $data);
-		}else{
+		} else{
 			$this->load->view('view_freeswitch_customer_add_edit', $data);
 		}
 	}
@@ -75,7 +76,7 @@ 
 		{
 			$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{
+		} 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);
 		}
@@ -91,7 +92,7 @@ 
 		{
 		$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{
+		} 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);
@@ -214,7 +215,7 @@ 
 				echo json_encode(array("SUCCESS"=> "SIP Device Updated Successfully!"));
 				exit;
 			}
-		}else{
+		} else{
 			$data['page_title'] = 'Create Freeswitch SIP Devices';
 			if ($this->form_validation->run() == FALSE) {
 				$data['validation_errors'] = validation_errors();
@@ -489,7 +490,7 @@ 
   			$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") {
+				} else if($gateway_key == "status") {
 					$gateway_data[$gateway_key] = $gatewau_val;
 				} 
 				 /**
@@ -512,7 +513,7 @@ 
 		 **/
 		if(!empty($gateway_data['dialplan_variable']) && $gateway_data['dialplan_variable'] != ''){
 		 $gateway_result['dialplan_variable']  = $gateway_data['dialplan_variable'];
-		 }else{
+		 } else{
 		 $gateway_result['dialplan_variable'] = '';
 		 }
 		 /**********************************************************************************************/
@@ -545,7 +546,7 @@ 
 				/*********************************************************************/
 				else if($key == "status") {
 					$insert_arr[$key] = $gateway_data["status"];
-				}  else {
+				} else {
 					if ($key != "id") {
 						$gateway_arr[$key] = $gateway_value;
 					}
@@ -707,16 +708,13 @@ 
 		if($button_name == "start")
 		{ 
 		   $cmd = "api sofia profile " . trim($query[0]['name']) ." start"; 
-		}
-		elseif($button_name == "stop")
+		} elseif($button_name == "stop")
 		{
 			$cmd= "api sofia profile stop";
-		}
-		elseif($button_name == "reload")
+		} elseif($button_name == "reload")
 		{
 			$cmd = "api reloadxml";
-		}
-		elseif($button_name == "rescan")
+		} elseif($button_name == "rescan")
 		{
 			$cmd = "api sofia profile " . trim($query[0]['name']) . " rescan";
 		}
@@ -769,8 +767,7 @@ 
 		  /**====================================================================*/
 		  $insert = $this->db->insert("sip_profiles", $sipprofile_data);
 
-		}
-		else {
+		} else {
 					$this->session->set_flashdata('astpp_notification', 'Duplicate SIP IP OR Port found it must be unique!');
 			redirect(base_url() . 'freeswitch/fssipprofile_add/');
 		}
@@ -850,7 +847,7 @@ 
 		  $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!");
-				  }else{
+				  } else{
 			$this->session->set_flashdata('astpp_errormsg',$data['sip_name']. " SIP Setting Updated Successfully!");
 		    
 				  }

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

Spacing +117 added lines, -117 removed lines

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

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

 

-if (!defined('BASEPATH'))

+if ( ! defined('BASEPATH'))

 	exit('No direct script access allowed');

 

 class Freeswitch_form {

@@ -31,26 +31,26 @@ 
 		$this->CI = & get_instance();

 	}

 

-	function get_freeswith_form_fields($id=false) {

+	function get_freeswith_form_fields($id = false) {

 	$log_type = $this->CI->session->userdata("logintype");

-	if($log_type == 0  || $log_type == 3 || $log_type == 1){

-		  $sip_pro=null;

+	if ($log_type == 0 || $log_type == 3 || $log_type == 1) {

+		  $sip_pro = null;

 	}

-	else{

-		  $sip_pro=array('SIP Profile', 'sip_profile_id', 'SELECT', '', 'trim|dropdown|xss_clean', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'sip_profiles', 'build_dropdown', '', '');

+	else {

+		  $sip_pro = array('SIP Profile', 'sip_profile_id', 'SELECT', '', 'trim|dropdown|xss_clean', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'sip_profiles', 'build_dropdown', '', '');

 

 	}  

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

 		/*Edit functionality*/

-		$form['forms'] = array(base_url() . 'freeswitch/fssipdevices_save/', array("id" => "sipdevices_form", "name" => "sipdevices_form"));

+		$form['forms'] = array(base_url().'freeswitch/fssipdevices_save/', array("id" => "sipdevices_form", "name" => "sipdevices_form"));

 		$form['Device Information'] = array(

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

-			 array('Username', 'INPUT', array('name' => 'fs_username', 'size' => '20', 'value'=>$uname_user,'id'=>'username1', 'class' => "text field medium"), '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('Password', 'INPUT', array('name' => 'fs_password', 'size' => '20', 'value'=>$password ,'id'=>'password1','class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', '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('Account', 'accountcode', 'SELECT', '','trim|dropdown|xss_clean', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0","type"=>"0", "deleted" => "0")),

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

+			 array('Username', 'INPUT', array('name' => 'fs_username', 'size' => '20', 'value'=>$uname_user, 'id'=>'username1', 'class' => "text field medium"), '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('Password', 'INPUT', array('name' => 'fs_password', 'size' => '20', 'value'=>$password, 'id'=>'password1', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', '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('Account', 'accountcode', 'SELECT', '', 'trim|dropdown|xss_clean', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0", "type"=>"0", "deleted" => "0")),

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

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

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

 	   $sip_pro,

@@ -90,10 +90,10 @@ 
             

 			 array('SIP Profile', 'sip_profile_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'sip_profiles', 'build_dropdown', 'where_arr', ''),

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

-			array('Gateway', 'gateway_id', 'SELECT', '', '', 'tOOL TIP', 'Please select gateway first', 'id', 'name', 'gateways', 'build_dropdown','where_arr', ''), 

-			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('Gateway', 'gateway_id', 'SELECT', '', '', 'tOOL TIP', 'Please select gateway first', 'id', 'name', 'gateways', 'build_dropdown', 'where_arr', ''), 

+			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('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_search_status', '', ''),

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

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

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

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

 		return $form;

@@ -102,7 +102,7 @@ 
 	  function get_sipdevices_search_form_user() {

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

 		$form['Search'] = array(

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

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

 			array('SIP Profile', 'sip_profile_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'sip_profiles', 'build_dropdown', 'where_arr', ''),

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

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

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

 		return $form;

 	}

-	function get_sipprofile_search_form(){

+	function get_sipprofile_search_form() {

     

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

 		$form['Search'] = array(

@@ -154,10 +154,10 @@ 
             

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

 			array('SIP Profile', 'sip_profile_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'sip_profiles', 'build_dropdown', 'where_arr', ''),

-			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"=>"GLOBAL", "deleted" => "0")),

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

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

 			//array('Voicemail', 'vm-enabled', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_voicemail_status'),

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

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

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

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

 		return $form;

@@ -168,18 +168,18 @@ 
     */

 	function build_system_list_for_admin() {

 		$grid_field_arr = json_encode(array(

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

-			array("User Name", "100", "username", "", "", "","","true","center"),

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

-			array("SIP Profile", "100", "sip_profile_id", "name", "sip_profiles", "get_field_name","","true","center"),

-			array("Account", "150", "accountid", "first_name,last_name,number", "accounts", "build_concat_string","","true","center"),

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

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

-			array("Voicemail", "100", "voicemail_enabled", "", "", "","","true","center"),	

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

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

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

-			array("Action", "107", "", "", "", array("EDIT" => array("url" => "/freeswitch/fssipdevices_edit/", "mode" => "single","layout"=>"medium"),

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

+			array("User Name", "100", "username", "", "", "", "", "true", "center"),

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

+			array("SIP Profile", "100", "sip_profile_id", "name", "sip_profiles", "get_field_name", "", "true", "center"),

+			array("Account", "150", "accountid", "first_name,last_name,number", "accounts", "build_concat_string", "", "true", "center"),

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

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

+			array("Voicemail", "100", "voicemail_enabled", "", "", "", "", "true", "center"),	

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

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

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

+			array("Action", "107", "", "", "", array("EDIT" => array("url" => "/freeswitch/fssipdevices_edit/", "mode" => "single", "layout"=>"medium"),

 					"DELETE" => array("url" => "/freeswitch/fssipdevices_delete/", "mode" => "single")))

 				));

 		return $grid_field_arr;

@@ -188,52 +188,52 @@ 
 

 

 	function build_grid_buttons() {

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

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

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

+			array("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("Create","btn btn-line-warning btn","fa fa-plus-circle fa-lg", "button_action", "/freeswitch/customer_fssipdevices_add/$accountid/", "popup","medium"),

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

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

+		array("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("id" => "gateway_form", "name" => "gateway_form"));

+		$form['forms'] = array(base_url().'freeswitch/fsgateway_save/', array("id" => "gateway_form", "name" => "gateway_form"));

 		$form['Basic Information'] = array(

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

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

 			array('SIP Profile', 'sip_profile_id', 'SELECT', '', '', 'tOOL TIP', '', 'id', 'name', 'sip_profiles', 'build_dropdown', '', ''),

-			array('Username', 'INPUT', array('name' => 'username', 'size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter user name'),

-		   array('Password', 'INPUT', array('name' => 'password', 'size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter Password'),

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

-			array('Outbound-<br/>Proxy', 'INPUT', array('name' => 'outbound-proxy', 'size' => '20',  'class' => "text field medium"), 'trim|xss_clean', 'tOOL TIP', ''),

+			array('Username', 'INPUT', array('name' => 'username', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter user name'),

+		   array('Password', 'INPUT', array('name' => 'password', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter Password'),

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

+			array('Outbound-<br/>Proxy', 'INPUT', array('name' => 'outbound-proxy', 'size' => '20', 'class' => "text field medium"), 'trim|xss_clean', 'tOOL TIP', ''),

 			array('Register', array('name' => 'register', 'class' => 'add_settings'), 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'set_sip_config_option'),

 			array('Caller-id-in-from', array('name' => 'caller-id-in-from', 'class' => 'add_settings'), 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'set_sip_config_option'),

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

             

 		);

 		$form['Optional Information'] = array(

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

-			array('From User', 'INPUT', array('name' => 'from_user', 'size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', ''),

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

+			array('From- Domain', 'INPUT', array('name' => 'from_domain', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),

+			array('From User', 'INPUT', array('name' => 'from_user', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),

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

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

 			array('Expire Seconds', 'INPUT', array('name' => 'expire-seconds', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),

-			array('Reg-<br/>Transport', 'INPUT', array('name' => 'register-transport', 'size' => '20','class' => "text field medium"), '', 'tOOL TIP', ''),

+			array('Reg-<br/>Transport', 'INPUT', array('name' => 'register-transport', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),

 			array('Contact Params', 'INPUT', array('name' => 'contact-params', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),

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

-			array('Retry-<br/>Seconds', 'INPUT', array('name' => 'retry-seconds', 'size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', ''),

-			array('Register-<br/>Proxy', 'INPUT', array('name' => 'register-proxy', 'size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', ''),

+			array('Retry-<br/>Seconds', 'INPUT', array('name' => 'retry-seconds', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),

+			array('Register-<br/>Proxy', 'INPUT', array('name' => 'register-proxy', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),

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

 			   /**

                ASTPP  3.0 

                               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('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', ''),

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

 		);

 

@@ -250,26 +250,26 @@ 
 	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("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "","","false","center"),

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

 /**

 ASTPP  3.0 

 For Gateway Edit on Gateway name

 **/

-			array("Name", "140", "name", "", "", "","EDITABLE","true","center"),

+			array("Name", "140", "name", "", "", "", "EDITABLE", "true", "center"),

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

-			array("SIP Profile", "115", "sip_profile_id", "name", "sip_profiles", "get_field_name","","true","center"),

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

+			array("SIP Profile", "115", "sip_profile_id", "name", "sip_profiles", "get_field_name", "", "true", "center"),

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

 //             array("Password", "181", "password", "", "", ""),

-			array("Proxy", "145", "proxy", "", "", "","","true","center"),

-			array("Register", "120", "register", "register", "register", "convert_to_ucfirst","","true","center"),

-			array("Caller-Id-In-Form", "130", "caller-id-in-from", "caller-id-in-from", "caller-id-in-from", "convert_to_ucfirst","","true","center"),

+			array("Proxy", "145", "proxy", "", "", "", "", "true", "center"),

+			array("Register", "120", "register", "register", "register", "convert_to_ucfirst", "", "true", "center"),

+			array("Caller-Id-In-Form", "130", "caller-id-in-from", "caller-id-in-from", "caller-id-in-from", "convert_to_ucfirst", "", "true", "center"),

 			 /*

             ASTPP  3.0 

              creation field show in grid

             */

-			array("Status", "110", "status", "status", "gateways", "get_status","","true","center"),

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

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

+			array("Status", "110", "status", "status", "gateways", "get_status", "", "true", "center"),

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

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

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

 		   /*

             ASTPP  3.0 

@@ -278,7 +278,7 @@ 
             */

            

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

-			array("Action", "106", "", "", "", array("EDIT" => array("url" => "/freeswitch/fsgateway_edit/", "mode" => "popup","layout"=>"medium"),

+			array("Action", "106", "", "", "", array("EDIT" => array("url" => "/freeswitch/fsgateway_edit/", "mode" => "popup", "layout"=>"medium"),

 					"DELETE" => array("url" => "/freeswitch/fsgateway_delete/", "mode" => "single")))

 				));

 		return $grid_field_arr;

@@ -286,23 +286,23 @@ 
 	/******************************************************/

 

 	function build_fdgateway_grid_buttons() {

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

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

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

+		array("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("id" => "fssipprofile_form", "name" => "fssipprofile_form"));

+		$form['forms'] = array(base_url().'freeswitch/fssipprofile_save/', array("id" => "fssipprofile_form", "name" => "fssipprofile_form"));

 		$form['Basic Information'] = array(

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

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

-			array('sip-ip', 'INPUT', array('name' => 'sip_ip', 'size' => '20',  'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter SIP IP Name'),

-			array('sip-port', 'INPUT', array('name' => 'sip_port', 'size' => '20', 'value' => '5060',  'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter SIP Port'),

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

+			array('sip-ip', 'INPUT', array('name' => 'sip_ip', 'size' => '20', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter SIP IP Name'),

+			array('sip-port', 'INPUT', array('name' => 'sip_port', 'size' => '20', 'value' => '5060', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter SIP Port'),

 			array('rtp-ip', 'INPUT', array('name' => 'rtp_ip', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),

-			array('Dial Plan', 'INPUT', array('name' => 'dialplan', 'size' => '20', 'value' => 'XML',  'class' => "text field medium"), '', 'tOOL TIP', ''),

-			array('user-agent-string', 'INPUT', array('name' => 'user-agent-string', 'size' => '20', 'value' => 'ASTPP',  'class' => "text field medium"), '', 'tOOL TIP', ''),

-			array('debug', 'INPUT', array('name' => 'debug', 'size' => '20', 'value' => '0',  'class' => "text field medium"), '', 'tOOL TIP', ''),

+			array('Dial Plan', 'INPUT', array('name' => 'dialplan', 'size' => '20', 'value' => 'XML', 'class' => "text field medium"), '', 'tOOL TIP', ''),

+			array('user-agent-string', 'INPUT', array('name' => 'user-agent-string', 'size' => '20', 'value' => 'ASTPP', 'class' => "text field medium"), '', 'tOOL TIP', ''),

+			array('debug', 'INPUT', array('name' => 'debug', 'size' => '20', 'value' => '0', 'class' => "text field medium"), '', 'tOOL TIP', ''),

 			array('sip-trace', 'sip-trace', 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'set_sip_drp_option'),

 			array('tls', 'tls', 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'set_sip_config_options'),

 			array('inbound-reg-force-matching-username', 'inbound-reg-force-matching-username', 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'set_sip_config_option'),

@@ -320,20 +320,20 @@ 
 			array('enable-100rel', 'enable-100rel', 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'set_sip_config_options'),

 			array('rtp-timeout-sec', 'INPUT', array('name' => 'rtp-timeout-sec', 'size' => '20', 'value' => '60', 'class' => "text field medium"), '', 'tOOL TIP', ''),

 			array('dtmf-duration', 'INPUT', array('name' => 'dtmf-duration', 'size' => '20', 'value' => '2000', 'class' => "text field medium"), '', 'tOOL TIP', ''),

-			array('manual-redirect','manual-redirect', 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'set_sip_config_options'),

+			array('manual-redirect', 'manual-redirect', 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'set_sip_config_options'),

 			array('aggressive-nat-detection', 'aggressive-nat-detection', 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'set_sip_config_option'),

 			array('enable-Timer', 'enable-timer', 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'set_sip_config_options'),

 			array('minimum-session-expires', 'INPUT', array('name' => 'minimum-session-expires', 'value' => '120', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),

 			array('session-timeout', 'INPUT', array('name' => 'session-timeout-pt', 'value' => '1800', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),

 			array('auth-calls', 'auth-calls', 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'set_sip_config_option'),

-			array('apply-inbound-acl', 'INPUT', array('name' => 'apply-inbound-acl', 'value' => 'default', 'size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', ''),

-			array('inbound-codec-prefs', 'INPUT', array('name' => 'inbound-codec-prefs', 'size' => '25',  'class' => "text field medium"), '', 'tOOL TIP', ''),

+			array('apply-inbound-acl', 'INPUT', array('name' => 'apply-inbound-acl', 'value' => 'default', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),

+			array('inbound-codec-prefs', 'INPUT', array('name' => 'inbound-codec-prefs', 'size' => '25', 'class' => "text field medium"), '', 'tOOL TIP', ''),

 			array('outbound-codec-prefs', 'INPUT', array('name' => 'outbound-codec-prefs', 'size' => '25', 'class' => "text field medium"), '', 'tOOL TIP', ''),

 			array('inbound-late-negotiation', 'inbound-late-negotiation', 'SELECT', '', '', 'tOOL TIP', '', '', '', '', 'set_sip_config_options'),

 			array('inbound-codec-negotiation', 'INPUT', array('name' => 'inbound-codec-negotiation', 'size' => '25', 'class' => "text field medium"), '', 'tOOL TIP', ''),

 		);

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

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

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

 

 		return $form;

 	}

@@ -341,22 +341,22 @@ 
 	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("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "","","false","center"),

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

 /**

 ASTPP  3.0

 For Sip Profile edit on Profile name

 **/

-			array("Name", "190", "name", "", "", "","EDITABLE","true","center"),

+			array("Name", "190", "name", "", "", "", "EDITABLE", "true", "center"),

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

-			array("SIP IP", "205", "sip_ip", "", "", "","","true","center"),

-			array("SIP Port", "200", "sip_port", "", "", "","","true","center"),

+			array("SIP IP", "205", "sip_ip", "", "", "", "", "true", "center"),

+			array("SIP Port", "200", "sip_port", "", "", "", "", "true", "center"),

 		   /*

             ASTPP  3.0 

             status show active or inactive

             */

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

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

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

-			 array("Profile Action", "282", "", "", "", array("START" => array("url" => "/freeswitch/fssipprofile_action/start/","mode"=>"single"),

+			 array("Profile Action", "282", "", "", "", array("START" => array("url" => "/freeswitch/fssipprofile_action/start/", "mode"=>"single"),

 					"STOP" => array("url" => "/freeswitch/fssipprofile_action/stop/", "mode" => "single"),

 					"RELOAD" => array("url" => "/freeswitch/fssipprofile_action/reload/", "mode" => "single"),

 					"RESCAN" => array("url" => "/freeswitch/fssipprofile_action/rescan/", "mode" => "single"),                    

@@ -369,8 +369,8 @@ 
 	}

 

 	function build_fssipprofile_grid_buttons() {

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

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

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

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

 		   ));

 		return $buttons_json;

 	}

@@ -392,15 +392,15 @@ 
 	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("Host", "200", "freeswitch_host", "", "", "","","true","center"),

-			array(" Password", "200", "freeswitch_password", "", "", "","","true","center"),

-			array(" Port", "200", "freeswitch_port", "", "", "","","true","center"),

+			array("Host", "200", "freeswitch_host", "", "", "", "", "true", "center"),

+			array(" Password", "200", "freeswitch_password", "", "", "", "", "true", "center"),

+			array(" Port", "200", "freeswitch_port", "", "", "", "", "true", "center"),

 			/*

             ASTPP  3.0 .3 creation field show in grid

             */

-			array("Status", "145", "status", "status", "freeswich_servers", "get_status","","true","center"),

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

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

+			array("Status", "145", "status", "status", "freeswich_servers", "get_status", "", "true", "center"),

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

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

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

            

 			array("Action", "182", "", "", "", array("EDIT" => array("url" => "/freeswitch/fsserver_edit/", "mode" => "popup"),

@@ -411,19 +411,19 @@ 
 	/**************************************************/

 

 	function build_fsserver_grid_buttons() {

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

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

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

 			));

 		return $buttons_json;

 	}

 

 	function get_form_fsserver_fields() {

-		$form['forms'] = array(base_url() . '/freeswitch/fsserver_save/', array("id" => "fsserver_form", "name" => "fsserver_form"));

+		$form['forms'] = array(base_url().'/freeswitch/fsserver_save/', array("id" => "fsserver_form", "name" => "fsserver_form"));

 		$form['Freeswitch Server Information'] = array(

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

 			array(' Host', 'INPUT', array('name' => 'freeswitch_host', 'size' => '20', 'class' => "text field medium"), 'trim|required|valid_ip', 'tOOL TIP', 'Please Enter account number'),

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

-			array(' Port', 'INPUT', array('name' => 'freeswitch_port', 'size' => '20',  'class' => "text field medium"), 'trim|required|numeric', 'tOOL TIP', 'Please Enter account number'),

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

+			array(' Port', 'INPUT', array('name' => 'freeswitch_port', 'size' => '20', 'class' => "text field medium"), 'trim|required|numeric', 'tOOL TIP', 'Please Enter account number'),

 		);

 

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

@@ -452,17 +452,17 @@ 
 	*/

 	function build_devices_list_for_customer() {

 		$grid_field_arr = json_encode(array(

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

-			array("User Name", "100", "username", "", "", "","","true","center"),

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

-			array("SIP Profile", "90", "sip_profile_id", "name", "sip_profiles", "get_field_name","","true","center"),

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

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

-			array("Voicemail", "100", "voicemail_enabled", "", "", "","","true","center"),

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

+			array("User Name", "100", "username", "", "", "", "", "true", "center"),

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

+			array("SIP Profile", "90", "sip_profile_id", "name", "sip_profiles", "get_field_name", "", "true", "center"),

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

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

+			array("Voicemail", "100", "voicemail_enabled", "", "", "", "", "true", "center"),

 			//array("Call Waiting", "105", "call_waiting", "", "", ""),

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

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

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

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

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

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

 			array("Action", "110", "", "", "", array("EDIT" => array("url" => "/accounts/fssipdevices_action/edit/", "mode" => "single"),

 					"DELETE" => array("url" => "/accounts/fssipdevices_action/delete/", "mode" => "single")))

 				));

@@ -471,21 +471,21 @@ 
     

 	/******************8*/

 

-	function fsdevice_form_fields_for_customer($accountid , $id=false) {

+	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';   

+	$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';

+		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("id" => "sipdevices_form", "name" => "sipdevices_form"));

 			$form['Device Information'] = array(

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

 				array('', 'HIDDEN', array('name' => 'accountcode', 'value' => $accountid), '', '', '', ''),

-				array('Username', 'INPUT', array('name' => 'fs_username', 'size' => '20', 'value'=>$uname_user,'id'=>'username', 'class' => "text field medium"), '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('Password', 'INPUT', array('name' => 'fs_password', 'size' => '20','id'=>'password1','value'=>$password, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', '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('Caller Name', 'INPUT', array('name' => 'effective_caller_id_name', 'size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

+				array('Username', 'INPUT', array('name' => 'fs_username', 'size' => '20', 'value'=>$uname_user, 'id'=>'username', 'class' => "text field medium"), '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('Password', 'INPUT', array('name' => 'fs_password', 'size' => '20', 'id'=>'password1', 'value'=>$password, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', '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('Caller Name', 'INPUT', array('name' => 'effective_caller_id_name', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

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

 				//array('Call Waiting', 'call_waiting', 'SELECT', '', '', 'tOOL TIP', 'Please Select Status', '', '', '', 'set_call_waiting'),

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

@@ -510,25 +510,25 @@ 
 		);   

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

 		} else {

-			 if($accountid){

-				$account_Arr=null;

-		 }else{

-				$account_Arr=array('Account', 'accountcode', 'SELECT', '','trim|dropdown|xss_clean', '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"));

+			 if ($accountid) {

+				$account_Arr = null;

+		 } else {

+				$account_Arr = array('Account', 'accountcode', 'SELECT', '', 'trim|dropdown|xss_clean', '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"));

 		 }       

 			if ($this->CI->session->userdata("logintype") == '1') {

-		$sip_pro =null;

-				$link = base_url() . 'freeswitch/customer_fssipdevices_save/true';

-			}else{

-		$sip_pro =array('SIP Profile', 'sip_profile_id', 'SELECT', '','trim|dropdown|xss_clean', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'sip_profiles', 'build_dropdown', '', '');

-				$link = base_url() . 'freeswitch/fssipdevices_save/true';

+		$sip_pro = null;

+				$link = base_url().'freeswitch/customer_fssipdevices_save/true';

+			} else {

+		$sip_pro = array('SIP Profile', 'sip_profile_id', 'SELECT', '', 'trim|dropdown|xss_clean', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'sip_profiles', 'build_dropdown', '', '');

+				$link = base_url().'freeswitch/fssipdevices_save/true';

 			}

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

 			/*Add sipdevice*/

 			$form['Device Information'] = array(

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

 				array('', 'HIDDEN', array('name' => 'accountcode', 'value' => $accountid), '', '', '', ''),

-				 array('Username', 'INPUT', array('name' => 'fs_username', 'size' => '20', 'value'=>$uname_user,'id'=>'username1', 'class' => "text field medium"), '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('Password', 'INPUT', array('name' => 'fs_password', 'size' => '20', 'id'=>'password1','value'=>$password, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', '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('Username', 'INPUT', array('name' => 'fs_username', 'size' => '20', 'value'=>$uname_user, 'id'=>'username1', 'class' => "text field medium"), '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('Password', 'INPUT', array('name' => 'fs_password', 'size' => '20', 'id'=>'password1', 'value'=>$password, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', '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('Caller Name', 'INPUT', array('name' => 'effective_caller_id_name', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'Please Enter account number'),

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

 		$account_Arr,

Braces +6 added lines, -6 removed lines

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

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

 

-if (!defined('BASEPATH'))

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

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

 class Freeswitch_form {

 

@@ -35,8 +36,7 @@ 
 	$log_type = $this->CI->session->userdata("logintype");

 	if($log_type == 0  || $log_type == 3 || $log_type == 1){

 		  $sip_pro=null;

-	}

-	else{

+	} else{

 		  $sip_pro=array('SIP Profile', 'sip_profile_id', 'SELECT', '', 'trim|dropdown|xss_clean', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'sip_profiles', 'build_dropdown', '', '');

 

 	}  

@@ -512,13 +512,13 @@ 
 		} else {

 			 if($accountid){

 				$account_Arr=null;

-		 }else{

+		 } else{

 				$account_Arr=array('Account', 'accountcode', 'SELECT', '','trim|dropdown|xss_clean', '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"));

 		 }       

 			if ($this->CI->session->userdata("logintype") == '1') {

 		$sip_pro =null;

 				$link = base_url() . 'freeswitch/customer_fssipdevices_save/true';

-			}else{

+			} else{

 		$sip_pro =array('SIP Profile', 'sip_profile_id', 'SELECT', '','trim|dropdown|xss_clean', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'sip_profiles', 'build_dropdown', '', '');

 				$link = base_url() . 'freeswitch/fssipdevices_save/true';

 			}

web_interface/astpp/application/modules/freeswitch/views/view_fs_freeswitch_execute.php

Spacing +2 added lines, -2 removed lines

@@ -39,8 +39,8 @@
 		<div class="col-md-2">
 		  <select class="form-control" name="host_id" id="host_id">
   		      <?php
-				foreach($fs_data as $name) { ?>
-     			 <option value="<?= $name['id'] ?>"<?php if(isset($host_id) && ($name['id'] == $host_id))echo 'selected';?>><?= $name['freeswitch_host'] ?></option>
+				foreach ($fs_data as $name) { ?>
+     			 <option value="<?= $name['id'] ?>"<?php if (isset($host_id) && ($name['id'] == $host_id))echo 'selected'; ?>><?= $name['freeswitch_host'] ?></option>
   			  <?php
 				  } ?>
 		   </select>

Braces +4 added lines, -1 removed lines

@@ -40,7 +40,10 @@
 		  <select class="form-control" name="host_id" id="host_id">
   		      <?php
 				foreach($fs_data as $name) { ?>
-     			 <option value="<?= $name['id'] ?>"<?php if(isset($host_id) && ($name['id'] == $host_id))echo 'selected';?>><?= $name['freeswitch_host'] ?></option>
+     			 <option value="<?= $name['id'] ?>"<?php if(isset($host_id) && ($name['id'] == $host_id)) {
+	echo 'selected';
+}
+?>><?= $name['freeswitch_host'] ?></option>
   			  <?php
 				  } ?>
 		   </select>

web_interface/astpp/application/modules/freeswitch/views/view_fssipprofile_edit.php

Spacing +4 added lines, -4 removed lines

@@ -191,11 +191,11 @@
 			          

 			</div>

 			<?

-			  if($params_name!='')

+			  if ($params_name != '')

 			  {

-				$type="edit_setting";

-			  }else{

-				$type="add_setting";

+				$type = "edit_setting";

+			  } else {

+				$type = "add_setting";

 			  }

 			?>

 			<input type='hidden' name='type_settings' value='<?=$type?>' />

Braces +5 added lines, -3 removed lines

@@ -119,7 +119,8 @@ 
 			<div style="width:550px;"><label style="text-align:right;" class="col-md-3">Status </label>

 			<select name="sipstatus" class="col-md-5 form-control selectpicker" data-live-search='true'>

 			    

-			    <option value="0" <?if ($status == 0)echo 'selected=selected;'?>>Active</option>

+			    <option value="0" <?if ($status == 0) {
+	echo 'selected=selected;'?>>Active</option>

 			    <option value="1" <?if ($status == 1)echo 'selected=selected;'?>>Inactive</option>

 			  </select>

                        </div>

@@ -146,7 +147,8 @@ 
     	<div class="container">

    	    <div class="row">

             	<div class="portlet-content"  id="search_bar" style="cursor:pointer; display:none">

-                    	<?php echo $form_search;

+                    	<?php echo $form_search;
+}
 

 ?>

     	        </div>

@@ -194,7 +196,7 @@ 
 			  if($params_name!='')

 			  {

 				$type="edit_setting";

-			  }else{

+			  } else{

 				$type="add_setting";

 			  }

 			?>

web_interface/astpp/application/modules/accounts/models/accounts_model.php

Spacing +63 added lines, -63 removed lines

@@ -31,12 +31,12 @@ 
 	function add_account($accountinfo) {
 	
 		$account_data = $this->session->userdata("accountinfo");
-		$accountinfo['reseller_id'] = ($account_data['type'] == 1 ) ? $account_data['id'] : 0;
-		$accountinfo['maxchannels'] = ($accountinfo['type'] == 1 || $account_data['type'] == 2 || $account_data['type'] == -1 ) ? "0" : $accountinfo['maxchannels'];
+		$accountinfo['reseller_id'] = ($account_data['type'] == 1) ? $account_data['id'] : 0;
+		$accountinfo['maxchannels'] = ($accountinfo['type'] == 1 || $account_data['type'] == 2 || $account_data['type'] == -1) ? "0" : $accountinfo['maxchannels'];
 		unset($accountinfo['action']);
 		$sip_flag = isset($accountinfo['sip_device_flag']) ? 1 : 0;
 		$opensip_flag = isset($accountinfo['opensips_device_flag']) ? 1 : 0;
-		unset($accountinfo['sip_device_flag'],$accountinfo['opensips_device_flag'],$accountinfo['tax_id']);
+		unset($accountinfo['sip_device_flag'], $accountinfo['opensips_device_flag'], $accountinfo['tax_id']);
 
 		/*         * ******************************** */
 		$accountinfo['creation'] = gmdate('Y-m-d H:i:s');
@@ -51,14 +51,14 @@ 
         }else{
 	  $accountinfo['allow_ip_management']=1;
         }*/
-		if(isset($accountinfo['local_call'])){
-	  $accountinfo['local_call']=0;
-		}else{
-	  $accountinfo['local_call']=1;
+		if (isset($accountinfo['local_call'])) {
+	  $accountinfo['local_call'] = 0;
+		} else {
+	  $accountinfo['local_call'] = 1;
 		}
-		if ($accountinfo['type'] == 1){
+		if ($accountinfo['type'] == 1) {
 		$invoice_config = $accountinfo['invoice_config_flag'];
-		}else{
+		} else {
 		$invoice_config = "";		
 		}
 		unset($accountinfo['invoice_config_flag']);
@@ -86,8 +86,8 @@ 
 			}
 		if ($sip_flag == '1') {
 			$this->db->select('id');
-			$this->db->where('name','default');
-			$sipprofile_result=(array)$this->db->get('sip_profiles')->first_row();
+			$this->db->where('name', 'default');
+			$sipprofile_result = (array)$this->db->get('sip_profiles')->first_row();
 			$free_switch_array = array('fs_username' => $accountinfo['number'],
 				'fs_password' => $this->common->decode($accountinfo['password']),
 				'context' => 'default',
@@ -109,8 +109,8 @@ 
 			$this->load->model('opensips/opensips_model');
 			$this->opensips_model->add_opensipsdevices($opensips_array);
 		}
-		$accountinfo['confirm'] =  base_url();
-		if($accountinfo['id'] == ""){
+		$accountinfo['confirm'] = base_url();
+		if ($accountinfo['id'] == "") {
 		$accountinfo['id'] = $last_id;
 		}
 		$accountinfo['password'] = $this->common->decode($accountinfo['password']);    
@@ -154,16 +154,16 @@ 
 				if ($query_pricelist->num_rows > 0) {
 					$description = '';
 					if ($update_array['balance']['operator'] == '2') {
-						$description .="Reseller update set balance by admin";
+						$description .= "Reseller update set balance by admin";
 					}
 					if ($update_array['balance']['operator'] == '3') {
-						$description .="Reseller update increase balance by admin";
+						$description .= "Reseller update increase balance by admin";
 					}
 					if ($update_array['balance']['operator'] == '4') {
-						$description .="Reseller update descrise balance by admin";
+						$description .= "Reseller update descrise balance by admin";
 					}
 					foreach ($query_pricelist->result_array() as $key => $reseller_payment) {
-						if (!empty($reseller_payment['reseller_id']) && $reseller_payment['reseller_id'] != '') {
+						if ( ! empty($reseller_payment['reseller_id']) && $reseller_payment['reseller_id'] != '') {
 							$payment_by = $reseller_payment['reseller_id'];
 						} else {
 							$payment_by = '-1';
@@ -218,16 +218,16 @@ 
 			if ($query_pricelist->num_rows > 0) {
 				$description = '';
 				if ($update_array['balance']['operator'] == '2') {
-					$description .="Customer update set balance by admin";
+					$description .= "Customer update set balance by admin";
 				}
 				if ($update_array['balance']['operator'] == '3') {
-					$description .="Customer update increase balance by admin";
+					$description .= "Customer update increase balance by admin";
 				}
 				if ($update_array['balance']['operator'] == '4') {
-					$description .="Customer update descrise balance by admin";
+					$description .= "Customer update descrise balance by admin";
 				}
 				foreach ($query_pricelist->result_array() as $key => $customer_payment) {
-					if (!empty($customer_payment['reseller_id']) && $customer_payment['reseller_id'] != '0') {
+					if ( ! empty($customer_payment['reseller_id']) && $customer_payment['reseller_id'] != '0') {
 						$payment_by = $customer_payment['reseller_id'];
 					} else {
 						$payment_by = '-1';
@@ -283,11 +283,11 @@ 
 			$pin = $this->common->find_uniq_rendno_accno($number_length, 'pin', 'accounts', '', $count);
 		}
 		$sip_flag = false;
-		$opensip_flag=false;
-		if (isset($add_array['sip_device_flag']) && common_model::$global_config['system_config']['opensips']== 0) {
+		$opensip_flag = false;
+		if (isset($add_array['sip_device_flag']) && common_model::$global_config['system_config']['opensips'] == 0) {
 			$sip_flag = true;
 		}
-		if (isset($add_array['opensips_device_flag']) && common_model::$global_config['system_config']['opensips']== 1) {
+		if (isset($add_array['opensips_device_flag']) && common_model::$global_config['system_config']['opensips'] == 1) {
 			$opensip_flag = true;
 		}
 		unset(
@@ -298,20 +298,20 @@ 
 				$add_array['sip_device_flag'],
 				$add_array['opensips_device_flag']
 		);
-		if(isset($add_array['is_recording']) &&  $add_array['is_recording'] != ''){
-		$is_recording=1;
-		}else{
-		$is_recording=0;
+		if (isset($add_array['is_recording']) && $add_array['is_recording'] != '') {
+		$is_recording = 1;
+		} else {
+		$is_recording = 0;
 		}
-		if(isset($add_array['allow_ip_management']) &&  $add_array['allow_ip_management'] != ''){
-		$allow_ip_management=1;
-		}else{
-		$allow_ip_management=0;
+		if (isset($add_array['allow_ip_management']) && $add_array['allow_ip_management'] != '') {
+		$allow_ip_management = 1;
+		} else {
+		$allow_ip_management = 0;
 		}
-		if(isset($add_array['local_call']) &&  $add_array['local_call'] != ''){
-		$local_call=1;
-		}else{
-		$local_call=0;
+		if (isset($add_array['local_call']) && $add_array['local_call'] != '') {
+		$local_call = 1;
+		} else {
+		$local_call = 0;
 		}
 		if ($sip_flag) {
 			$query = $this->db_model->select("*", "sip_profiles", array('status' => "0"), "id", "ASC", '1', '0');
@@ -419,7 +419,7 @@ 
 			$this->db->insert_batch('accounts', $insert_array);
 			if ($opensip_flag == 1) {
 				$db_config = Common_model::$global_config['system_config'];
-				$opensipdsn = "mysql://" . $db_config['opensips_dbuser'] . ":" . $db_config['opensips_dbpass'] . "@" . $db_config['opensips_dbhost'] . "/" . $db_config['opensips_dbname'] . "?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
+				$opensipdsn = "mysql://".$db_config['opensips_dbuser'].":".$db_config['opensips_dbpass']."@".$db_config['opensips_dbhost']."/".$db_config['opensips_dbname']."?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
 				$this->opensips_db = $this->load->database($opensipdsn, true);
 				$this->opensips_db->insert_batch("subscriber", $opensips_array);
 			}
@@ -428,7 +428,7 @@ 
 	}
 
 	function get_max_limit($add_array) {
-		$this->db->where('deleted','0');
+		$this->db->where('deleted', '0');
 		$this->db->where("length(number)", $add_array['account_length']);
 		$this->db->like('number', $add_array['prefix'], 'after');
 		$this->db->select("count(id) as count");
@@ -444,16 +444,16 @@ 
 	}
 	function account_process_payment($data) {
 	$data['accountid'] = $data['id'];
-		$accountdata=(array)$this->db->get_where('accounts',array("id"=>$data['accountid']))->first_row();
-		$accountinfo =$this->session->userdata('accountinfo');
+		$accountdata = (array)$this->db->get_where('accounts', array("id"=>$data['accountid']))->first_row();
+		$accountinfo = $this->session->userdata('accountinfo');
 	$data["payment_by"] = $accountdata['reseller_id'] > 0 ? $accountdata['reseller_id'] : '-1';
 	$data['payment_mode'] = $data['payment_type'];
-	unset($data['action'],$data['id'],$data['account_currency'],$data['payment_type']);
-	if (isset($data) && !empty($accountdata)) {
-		$data['credit']=$data['credit'] =='' ?  0 : $data['credit'];
+	unset($data['action'], $data['id'], $data['account_currency'], $data['payment_type']);
+	if (isset($data) && ! empty($accountdata)) {
+		$data['credit'] = $data['credit'] == '' ? 0 : $data['credit'];
 		$date = gmdate('Y-m-d H:i:s');
-		if($data['payment_mode']== 1){       
-		  $balance = $this->update_balance($data['credit'], $data['accountid'],$data['payment_mode']);
+		if ($data['payment_mode'] == 1) {       
+		  $balance = $this->update_balance($data['credit'], $data['accountid'], $data['payment_mode']);
 			  $insert_arr = array("accountid" => $data['accountid'],
 			  "credit" => "-".$data['credit'],
 			  'payment_mode'=>$data['payment_mode'],
@@ -474,11 +474,11 @@ 
 			  'payment_by'=>$data['payment_by'],
 		  );
 		  $this->db->insert("payments", $insert_arr);
-		  $accountdata['refill_amount']=$data['credit'];
-		  $current_id=$accountinfo['type'] ==1 ? $accountinfo['id'] : '0';
-		  if($accountdata['reseller_id'] == $current_id){
+		  $accountdata['refill_amount'] = $data['credit'];
+		  $current_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : '0';
+		  if ($accountdata['reseller_id'] == $current_id) {
 			$this->common->mail_to_users('voip_account_refilled', $accountdata);
-		  }else{
+		  } else {
 			$this->common->mail_to_users('voip_child_account_refilled', $accountdata);
 		  }
 		}
@@ -488,7 +488,7 @@ 
 
 	function get_admin_Account_list($flag, $start = 0, $limit = 0, $reseller_id = 0) {
 		$this->db_model->build_search('admin_list_search');
-		$where = "reseller_id =" . $reseller_id . " AND deleted =0 AND type in (2,4,-1)";
+		$where = "reseller_id =".$reseller_id." AND deleted =0 AND type in (2,4,-1)";
 		if ($this->session->userdata('advance_search') == 1) {
 			$search = $this->session->userdata('admin_list_search');
 			if ($search['type'] == '') {
@@ -504,10 +504,10 @@ 
 		if ($flag) {
 			$this->db->limit($limit, $start);
 		}
-		if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
-		  $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-		}else{
-			$this->db->order_by('number','desc');
+		if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined') {
+		  $this->db->order_by($_GET['sortname'], ($_GET['sortorder'] == 'undefined') ? 'desc' : $_GET['sortorder']);
+		} else {
+			$this->db->order_by('number', 'desc');
 		}
 		$result = $this->db->get('accounts');
 
@@ -535,13 +535,13 @@ 
 			$this->db->where($type);
 		}
 		if ($flag) {
-			if (!$export)
+			if ( ! $export)
 				$this->db->limit($limit, $start);
 		}
-		if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
-		  $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-		}else{
-			$this->db->order_by('number','desc');
+		if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined') {
+		  $this->db->order_by($_GET['sortname'], ($_GET['sortorder'] == 'undefined') ? 'desc' : $_GET['sortorder']);
+		} else {
+			$this->db->order_by('number', 'desc');
 		}
 		$result = $this->db->get('accounts');
 		if ($flag) {
@@ -590,7 +590,7 @@ 
 	function insert_block($data, $accountid) {
 		$data = explode(",", $data);
 		$tmp = array();
-		if (!empty($data)) {
+		if ( ! empty($data)) {
 			foreach ($data as $key => $data_value) {
 				$tmp[$key]["accountid"] = $accountid;
 				$result = $this->get_pattern_by_id($data_value);
@@ -621,7 +621,7 @@ 
 	}
 
 	function add_callerid($data) {
-		unset($data['action'],$data['flag']);
+		unset($data['action'], $data['flag']);
 		$data['accountid'] = $this->common->get_field_name('id', 'accounts', array('number' => $data['accountid']));
 		$this->db->insert('accounts_callerid', $data);
 		return true;
@@ -706,10 +706,10 @@ 
 
 	function update_balance($amount, $accountid, $payment_type) {
 		if ($payment_type == 0) {
-			$query = 'UPDATE `accounts` SET `balance` = (balance + ' . $amount . ') WHERE `id` = ' . $accountid;
+			$query = 'UPDATE `accounts` SET `balance` = (balance + '.$amount.') WHERE `id` = '.$accountid;
 			return $this->db->query($query);
 		}if ($payment_type == 1) {
-			$query = 'UPDATE `accounts` SET `balance` = (balance - ' . $amount . ') WHERE `id` = ' . $accountid;
+			$query = 'UPDATE `accounts` SET `balance` = (balance - '.$amount.') WHERE `id` = '.$accountid;
 			return $this->db->query($query);
 		}
 	}

Braces +36 added lines, -30 removed lines

@@ -53,12 +53,12 @@ 
         }*/
 		if(isset($accountinfo['local_call'])){
 	  $accountinfo['local_call']=0;
-		}else{
+		} else{
 	  $accountinfo['local_call']=1;
 		}
 		if ($accountinfo['type'] == 1){
 		$invoice_config = $accountinfo['invoice_config_flag'];
-		}else{
+		} else{
 		$invoice_config = "";		
 		}
 		unset($accountinfo['invoice_config_flag']);
@@ -300,17 +300,17 @@ 
 		);
 		if(isset($add_array['is_recording']) &&  $add_array['is_recording'] != ''){
 		$is_recording=1;
-		}else{
+		} else{
 		$is_recording=0;
 		}
 		if(isset($add_array['allow_ip_management']) &&  $add_array['allow_ip_management'] != ''){
 		$allow_ip_management=1;
-		}else{
+		} else{
 		$allow_ip_management=0;
 		}
 		if(isset($add_array['local_call']) &&  $add_array['local_call'] != ''){
 		$local_call=1;
-		}else{
+		} else{
 		$local_call=0;
 		}
 		if ($sip_flag) {
@@ -478,7 +478,7 @@ 
 		  $current_id=$accountinfo['type'] ==1 ? $accountinfo['id'] : '0';
 		  if($accountdata['reseller_id'] == $current_id){
 			$this->common->mail_to_users('voip_account_refilled', $accountdata);
-		  }else{
+		  } else{
 			$this->common->mail_to_users('voip_child_account_refilled', $accountdata);
 		  }
 		}
@@ -506,7 +506,7 @@ 
 		}
 		if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
 		  $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-		}else{
+		} else{
 			$this->db->order_by('number','desc');
 		}
 		$result = $this->db->get('accounts');
@@ -535,12 +535,13 @@ 
 			$this->db->where($type);
 		}
 		if ($flag) {
-			if (!$export)
-				$this->db->limit($limit, $start);
+			if (!$export) {
+							$this->db->limit($limit, $start);
+			}
 		}
 		if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
 		  $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-		}else{
+		} else{
 			$this->db->order_by('number','desc');
 		}
 		$result = $this->db->get('accounts');
@@ -614,10 +615,11 @@ 
 
 	function get_account_number($accountid) {
 		$query = $this->db_model->getSelect("number", "accounts", array("id" => $accountid));
-		if ($query->num_rows() > 0)
-			return $query->row_array();
-		else
-			return false;
+		if ($query->num_rows() > 0) {
+					return $query->row_array();
+		} else {
+					return false;
+		}
 	}
 
 	function add_callerid($data) {
@@ -662,10 +664,11 @@ 
 	function get_accounttax_by_id($account_id) {
 		$this->db->where("accountid", trim($account_id));
 		$query = $this->db->get("taxes_to_accounts");
-		if ($query->num_rows() > 0)
-			return $query->result_array();
-		else
-			return false;
+		if ($query->num_rows() > 0) {
+					return $query->result_array();
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -678,29 +681,32 @@ 
 		$this->db->where("number", $acc_num);
 		$query = $this->db->get("accounts");
 
-		if ($query->num_rows() > 0)
-			return $query->row_array();
-		else
-			return false;
+		if ($query->num_rows() > 0) {
+					return $query->row_array();
+		} else {
+					return false;
+		}
 	}
 
 	function get_account_by_number($id) {
 		$this->db->where("id", $id);
 		$query = $this->db->get("accounts");
 
-		if ($query->num_rows() > 0)
-			return $query->row_array();
-		else
-			return false;
+		if ($query->num_rows() > 0) {
+					return $query->row_array();
+		} else {
+					return false;
+		}
 	}
 
 	function get_currency_by_id($currency_id) {
 
 		$query = $this->db_model->getSelect("*", 'currency', array('id' => $currency_id));
-		if ($query->num_rows() > 0)
-			return $query->row_array();
-		else
-			return false;
+		if ($query->num_rows() > 0) {
+					return $query->row_array();
+		} else {
+					return false;
+		}
 	}
 
 

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

Indentation +26 added lines, -26 removed lines

@@ -1386,35 +1386,35 @@
 			  $invoice_id=$this->invoices->invoices->generate_receipt($reseller_info['id'],$custom_array['credit'],$reseller_info,$last_invoice_ID+1,$invoice_prefix,$due_date);
 			  $account_balance = $this->common->get_field_name('balance', 'accounts', $reseller_info['id']);
 			  $insert_arr = array("accountid" => $reseller_info['id'],
-				      "description" => trim($custom_array['notes']),
-				      "debit" => 0,
-				      "credit" => $custom_array['credit'],
-				      "created_date" => gmdate("Y-m-d H:i:s"), 
-				      "invoiceid"=>$invoice_id,
-				      "reseller_id"=>$reseller_info['reseller_id'],
-				      "item_type"=>'Refill',
-				      "item_id"=>'0',
-  				      'before_balance'=>$account_balance - $custom_array['credit'],
-				      'after_balance'=>$account_balance,
-				    );
-			    $this->db->insert("invoice_details", $insert_arr);
+					  "description" => trim($custom_array['notes']),
+					  "debit" => 0,
+					  "credit" => $custom_array['credit'],
+					  "created_date" => gmdate("Y-m-d H:i:s"), 
+					  "invoiceid"=>$invoice_id,
+					  "reseller_id"=>$reseller_info['reseller_id'],
+					  "item_type"=>'Refill',
+					  "item_id"=>'0',
+  					  'before_balance'=>$account_balance - $custom_array['credit'],
+					  'after_balance'=>$account_balance,
+					);
+				$this->db->insert("invoice_details", $insert_arr);
+			}
+			  }
 			}
-		      }
-		    }
 		}
-	        $message = $post_array['payment_type'] == 0 ? "Recharge successfully!" : "Post charge applied successfully.";
+			$message = $post_array['payment_type'] == 0 ? "Recharge successfully!" : "Post charge applied successfully.";
 /***********************************************************************************************/
-                echo json_encode(array("SUCCESS"=> $message));
-                exit;
-        //    }
-        }
-        $this->load->view('view_accounts_process_payment', $data);
-    }
-
-    /**
-     * @param string $select
-     */
-    function get_invoice_date($select,$accountid){
+				echo json_encode(array("SUCCESS"=> $message));
+				exit;
+		//    }
+		}
+		$this->load->view('view_accounts_process_payment', $data);
+	}
+
+	/**
+	 * @param string $select
+	 */
+	function get_invoice_date($select,$accountid){
 	$query = $this->db_model->select($select, "invoices", '',"id","DESC","1","0");
 	if($query->num_rows >0){
 		$invoiceid = $query->result_array();

Braces +27 added lines, -20 removed lines

@@ -37,8 +37,9 @@ 
 		$this->load->model('accounts_model');
 		$this->load->model('Astpp_common');
 		$this->protected_pages = array('account_list');
-		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/login/login');
+		if ($this->session->userdata('user_login') == FALSE) {
+					redirect(base_url() . '/login/login');
+		}
 	}
 
 	function customer_list() {
@@ -377,13 +378,15 @@ 
 		$where = array("accountid" => $accountid);
 		$instant_search=$this->session->userdata('left_panel_search_'.$accounttype.'_ipmap');
 		$like_str=!empty($instant_search) ? "(name like '%$instant_search%'  OR ip like '%$instant_search%' OR prefix like '%$instant_search%' OR created_date like '%$instant_search%' )" :null;
-		if(!empty($like_str))
-		$this->db->where($like_str);
+		if(!empty($like_str)) {
+				$this->db->where($like_str);
+		}
 		$count_all = $this->db_model->countQuery("*", "ip_map", $where);
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
-		if(!empty($like_str))
-		$this->db->where($like_str);
+		if(!empty($like_str)) {
+				$this->db->where($like_str);
+		}
 		$query = $this->db_model->select("*", "ip_map", $where, "id", "ASC", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
 		$grid_fields = json_decode($this->accounts_form->build_ip_list_for_customer($accountid, $accounttype));
 		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
@@ -472,15 +475,17 @@ 
 		$json_data = array();
 		$instant_search=$this->session->userdata('left_panel_search_'.$accounttype.'_animap'); 
 		$like_str=!empty($instant_search) ? "(number like '%$instant_search%'  OR  creation_date like '%$instant_search%' )" :null;
-		if(!empty($like_str))
-		$this->db->where($like_str);
+		if(!empty($like_str)) {
+				$this->db->where($like_str);
+		}
 		$where = array("accountid" => $accountid);
 		$count_all = $this->db_model->countQuery("*", "ani_map", $where);
 
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
-		if(!empty($like_str))
-		$this->db->where($like_str);
+		if(!empty($like_str)) {
+				$this->db->where($like_str);
+		}
 		$query = $this->db_model->select("*", "ani_map", $where, "id", "ASC", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
 
 		$grid_fields = json_decode($this->accounts_form->build_animap_list_for_customer($accountid, $accounttype));
@@ -1043,7 +1048,7 @@ 
 			$data['edit_id'] = $edit_id;
 			$data['accounttype'] = $accounttype;
 			$this->load->view('view_reseller_package_list', $data);
-	   }else {
+	   } else {
 			redirect(base_url() . 'accounts/reseller_list/');
 			exit;
 	   }
@@ -1321,14 +1326,14 @@ 
 			$accountinfo = $this->accounts_model->get_account_by_number($post_array['id']);
 			if($accountinfo['reseller_id'] == 0){
 			   $where = array("accountid"=> 1);
-		}else{
+		} else{
 			$where = array("accountid"=> $accountinfo['id']);    
 		}
 		$query = $this->db_model->getSelect("*", "invoice_conf", $where);
 		if($query->num_rows >0){
 			$invoice_conf = $query->result_array();
 			$invoice_conf = $invoice_conf[0];
-		}else{
+		} else{
 			$query = $this->db_model->getSelect("*", "invoice_conf",array("accountid"=> 1));
 			$invoice_conf = $query->result_array();
 			$invoice_conf = $invoice_conf[0];            
@@ -1355,7 +1360,7 @@ 
 					  'after_balance'=>$account_balance,
 					);
 			$this->db->insert("invoice_details", $insert_arr);
-				}else{
+				} else{
 			$this->load->module('invoices/invoices');
 			$invoice_id=$this->invoices->invoices->generate_receipt($post_array['id'],$post_array['credit'],$accountinfo,$last_invoice_ID+1,$invoice_prefix,$due_date);
 			$account_balance = $this->common->get_field_name('balance', 'accounts', $post_array['id']);
@@ -1788,8 +1793,9 @@ 
 		$json_data['total'] = $config['total_rows'];
 		$perpage = $config['per_page'];
 		$start = ($page_no - 1) * $perpage;
-		if ($start < 0)
-			$start = 0;
+		if ($start < 0) {
+					$start = 0;
+		}
 
 		$account_charge_list = $this->db_model->getAllJionQuery($table, $select, $where, $jionTable, $jionCondition, $type, $perpage, $start, $order_by, $order_type, "");
 		if ($account_charge_list->num_rows > 0) {
@@ -2132,8 +2138,9 @@ 
 		$data['username'] = $this->session->userdata('user_name');
 		$data['page_title'] = 'Account Taxes';
 
-		if ($action == false)
-			$action = "list";
+		if ($action == false) {
+					$action = "list";
+		}
 
 		if ($action == 'list') {
 			$this->load->view('view_account_taxes_list', $data);
@@ -2397,10 +2404,10 @@ 
 	   $ip_map_result=(array)$this->db->get('ip_map')->first_row();
 	   if($ip_map_result['count'] > 0 ){
 		 echo 'FALSE';
-	   }else{
+	   } else{
 		 echo 'TRUE';
 	   }
-	 }else{
+	 } else{
 	  echo 'FALSE';
 	 }
     

Spacing +228 added lines, -228 removed lines

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

web_interface/astpp/application/modules/accounts/views/view_accounting_taxes_add.php

Braces +3 added lines, -2 removed lines

@@ -59,8 +59,9 @@
 							if (isset($taxesList) && is_array($taxesList) && count($taxesList) > 0) {
 								echo "<table>";
 								foreach ($taxesList as $values) {
-									if ($i == 1)
-										echo"<tr>";
+									if ($i == 1) {
+																			echo"<tr>";
+									}
 									?>
                                 <td style="padding-left: 10px;">
                                     <input type="checkbox" id="tax_<?= $values->id; ?>"name="tax_<?= $values->id; ?>" value="<?= $values->id; ?>" <? if (in_array($values->id, $tax_ids)) {

web_interface/astpp/application/modules/accounts/views/view_customer_speed_dial.php

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
                                             </label>
                                             </div>
                                                <div class="col-md-3">
-                                            <input class="col-md-2 form-control" name="speed_dial_<?php echo $i; ?>" id="speed_dial_<?php echo $i; ?>" size="16" type="text"  value="<?php if (isset($speeddial[$i]) && !empty($speeddial[$i])) {
+                                            <input class="col-md-2 form-control" name="speed_dial_<?php echo $i; ?>" id="speed_dial_<?php echo $i; ?>" size="16" type="text"  value="<?php if (isset($speeddial[$i]) && ! empty($speeddial[$i])) {
 		echo $speeddial[$i];
 	} ?>">
                                                </div>

web_interface/astpp/application/modules/accounts/views/view_bulk_account_creation.php

Spacing +3 added lines, -3 removed lines

@@ -57,10 +57,10 @@
                     <div style="color:red;margin-left: 60px;">
                         <?php
 						if (isset($validation_errors)) {
-						   $validation_array=json_decode($validation_errors);
-						   if(is_object($validation_array)){
+						   $validation_array = json_decode($validation_errors);
+						   if (is_object($validation_array)) {
 						   $validation_array = get_object_vars($validation_array);
-						   foreach($validation_array as $key=>$value)
+						   foreach ($validation_array as $key=>$value)
 					  echo $value."<br/>";
 						   }
 						   else

Braces +5 added lines, -4 removed lines

@@ -60,11 +60,12 @@
 						   $validation_array=json_decode($validation_errors);
 						   if(is_object($validation_array)){
 						   $validation_array = get_object_vars($validation_array);
-						   foreach($validation_array as $key=>$value)
-					  echo $value."<br/>";
+						   foreach($validation_array as $key=>$value) {
+						   					  echo $value."<br/>";
+						   }
+						   } else {
+						   					  echo $validation_errors;
 						   }
-						   else
-					  echo $validation_errors;
                            
 						}
 						?>