iNextrix / ASTPP

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

Spacing +84 added lines, -84 removed lines

@@ -36,7 +36,7 @@ 
 		$this->load->library('csvreader');
 	$this->load->library('astpp/email_lib');
 		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+			redirect(base_url().'/astpp/login');
 	}
 
 	function email_edit($edit_id = '') {
@@ -56,9 +56,9 @@ 
 			$data['form'] = $this->form->build_form($this->email_form->get_form_fields_email(), $edit_data);
 			$this->load->view('view_email_add_edit', $data);
 		} else {
-			redirect(base_url() . 'email/email_history_list/');
+			redirect(base_url().'email/email_history_list/');
 		}
-			redirect(base_url() . 'email/email_history_list/');
+			redirect(base_url().'email/email_history_list/');
 	}
 
 	function email_resend() {
@@ -78,7 +78,7 @@ 
 			foreach ($account->result_array() as $key => $value) {
 				$edit_data = $value;
 			}
-		$add_array=array('accountid'=>$edit_data['accountid'],
+		$add_array = array('accountid'=>$edit_data['accountid'],
 				 'subject'=>$add_array['subject'],
 				 'body'=>$add_array['body'],
 				 'from'=>$edit_data['from'],
@@ -91,7 +91,7 @@ 
 				$this->email_re_send($add_array);		
         
 		$this->session->set_flashdata('astpp_errormsg', 'Email resend successfully!');
-			redirect(base_url() . 'email/email_history_list/');
+			redirect(base_url().'email/email_history_list/');
 	}
 	function email_resend_edit($edit_id = '') {
 	$data['page_title'] = 'Resend Email';
@@ -106,7 +106,7 @@ 
 
 			$this->load->view('view_email_add_edit', $data);
 		} else {
-			redirect(base_url() . 'email/email_history_list/');
+			redirect(base_url().'email/email_history_list/');
 		}
 
 	}
@@ -123,7 +123,7 @@ 
 
 			$this->load->view('view_email_add_edit', $data);
 		} else {
-			redirect(base_url() . 'email/email_history_list/');
+			redirect(base_url().'email/email_history_list/');
 		}
 
 	}
@@ -136,7 +136,7 @@ 
 			foreach ($account->result_array() as $key => $value) {
 				$edit_data = $value;
 			}
-		$add_array=array('accountid'=>$edit_data['accountid'],
+		$add_array = array('accountid'=>$edit_data['accountid'],
 				 'subject'=>$add_array['subject'],
 				 'body'=>$add_array['body'],
 				 'from'=>$edit_data['from'],
@@ -146,11 +146,11 @@ 
 				 'attachment'=>$edit_data['attachment'],
 				);
 			$this->email_model->add_email($add_array);
-			$this->email_lib->send_email('',$add_array,'','',1);
+			$this->email_lib->send_email('', $add_array, '', '', 1);
 
 			$this->load->module('accounts/accounts');
 		$this->session->set_flashdata('astpp_errormsg', 'Email resend successfully!');
-			redirect(base_url() . 'accounts/customer_edit/'.$value["accountid"]);
+			redirect(base_url().'accounts/customer_edit/'.$value["accountid"]);
 	}
 	function email_add($type = "") {
 
@@ -189,9 +189,9 @@ 
 		}
 	}
 	function email_re_send($edit_data) {
-	$this->email_lib->send_email('',$edit_data,'',$edit_data['attachment'],1);
+	$this->email_lib->send_email('', $edit_data, '', $edit_data['attachment'], 1);
 	$this->session->set_flashdata('astpp_errormsg', 'Email resend successfully!');
-		redirect(base_url() . '/email/email_history_list/');
+		redirect(base_url().'/email/email_history_list/');
 	}
 	function email_view($edit_id = '') {
 	$data['page_title'] = 'View Email';
@@ -201,16 +201,16 @@ 
 			foreach ($account->result_array() as $key => $value) {
 				$edit_data = $value;
 			}  
-			if($edit_data['status'] == 1){
-				$edit_data['status']='Not Sent';
-			} else{
-				$edit_data['status']='Sent';
+			if ($edit_data['status'] == 1) {
+				$edit_data['status'] = 'Not Sent';
+			} else {
+				$edit_data['status'] = 'Sent';
 			}
 			$data['form'] = $this->form->build_form($this->email_form->get_form_fields_email_view(), $edit_data);
 
 			$this->load->view('view_email_add_edit', $data);
 		} else {
-			redirect(base_url() . 'email/email_history_list/');
+			redirect(base_url().'email/email_history_list/');
 		}
 	}
 	function email_view_customer($edit_id = '') {
@@ -224,140 +224,140 @@ 
 			$data['form'] = $this->form->build_form($this->email_form->get_form_fields_email_view_cus(), $edit_data);
 			$this->load->view('view_email_add_edit', $data);
 		} else {
-			redirect(base_url() . 'email/email_history_list/'.$edit_id);
+			redirect(base_url().'email/email_history_list/'.$edit_id);
 		}
 	}
 	function email_delete($id) {
 		$this->email_model->remove_email($id);
 		$this->session->set_flashdata('astpp_notification', 'Email removed successfully!');
-		redirect(base_url() . '/email/email_history_list/');
+		redirect(base_url().'/email/email_history_list/');
 	}
-	function email_delete_customer($accounttype,$accountid,$id) {
+	function email_delete_customer($accounttype, $accountid, $id) {
 		$this->email_model->remove_email($id);
 		$where = array('id' => $id);
 		$account = $this->db_model->getSelect("*", "mail_details", $where);
 	foreach ($account->result_array() as $key => $value) {
 		$edit_data = $value;
 	}
-		$url ="accounts/".$accounttype."_emailhistory/$accountid/";
+		$url = "accounts/".$accounttype."_emailhistory/$accountid/";
 		$this->session->set_flashdata('astpp_notification', 'Email removed successfully!');
 	$this->load->module('accounts/accounts');
-		redirect(base_url() . $url);
+		redirect(base_url().$url);
 	}
 	function email_mass() {
 		$account_data = $this->session->userdata("accountinfo");
-		if ($account_data['type'] == '1' || $account_data['type']== 0 || $account_data['type']==3)
-			redirect(base_url() . '/astpp/dashboard/');
+		if ($account_data['type'] == '1' || $account_data['type'] == 0 || $account_data['type'] == 3)
+			redirect(base_url().'/astpp/dashboard/');
 	$data['username'] = $this->session->userdata('user_name');	
 		$data['page_title'] = 'Email Mass';
 		$data['form'] = $this->form->build_form($this->email_form->build_list_for_email_client_area(), '');
-	$this->load->view('view_email_client_area',$data); 
+	$this->load->view('view_email_client_area', $data); 
 	}
  /*Mass Email*/
-   function attachment_icons($select = "", $table = "", $attachement="") {
-	if($attachement!="")
+   function attachment_icons($select = "", $table = "", $attachement = "") {
+	if ($attachement != "")
 	{
-		$array=explode(",", $attachement);
-		$str='';
-		foreach($array as $key =>$val){
-			$link = base_url() . "email/email_history_list_attachment/".$val;
-			$str.="<a href='".$link."' title='".$val."' class='btn btn-royelblue btn-sm'><i class='fa fa-paperclip fa-fw'></i></a>&nbsp;&nbsp;";
+		$array = explode(",", $attachement);
+		$str = '';
+		foreach ($array as $key =>$val) {
+			$link = base_url()."email/email_history_list_attachment/".$val;
+			$str .= "<a href='".$link."' title='".$val."' class='btn btn-royelblue btn-sm'><i class='fa fa-paperclip fa-fw'></i></a>&nbsp;&nbsp;";
 		}
 		return $str;
-	} else{
+	} else {
 		return "";
 	}
 	}
 	function email_client_get()
 	  {
-		   $files=$_FILES;
+		   $files = $_FILES;
 		   $add_array = $this->input->post();
 		   $add_array['page_title'] = 'Compose email';
-		   $nooffile= $files['file']['name'];
-		   $count=count($nooffile);
-		   $add_array['attachment']='';
-		   $add_array['file']='';
-		   for($i=0;$i<$count;$i++){
-			   $tmp_name[]= $files['file']['tmp_name'][$i];
-			   if($files['file']['error'][$i]==0){
+		   $nooffile = $files['file']['name'];
+		   $count = count($nooffile);
+		   $add_array['attachment'] = '';
+		   $add_array['file'] = '';
+		   for ($i = 0; $i < $count; $i++) {
+			   $tmp_name[] = $files['file']['tmp_name'][$i];
+			   if ($files['file']['error'][$i] == 0) {
 				   $cur_name = $files['file']['name'][$i];
 				   $parts = explode(".", $cur_name);
-				   $add_array['attachment'].=date('ymdhis').$i.'.'.$parts[1].',';
-				   $add_array['file'].=date('ymdhis').$i.'.'.$parts[1].',';
+				   $add_array['attachment'] .= date('ymdhis').$i.'.'.$parts[1].',';
+				   $add_array['file'] .= date('ymdhis').$i.'.'.$parts[1].',';
 			 		   $uploadedFile1 = $files['file']['tmp_name'][$i];
-				   $user_name='inextrix';
-				   $actual_file_name=date('ymdhis').$i.'.'.$parts[1];
-				   $dir_path=  getcwd()."/attachments/";
-				   $path =$dir_path.$actual_file_name;
-				   if (move_uploaded_file($uploadedFile1,$path)) {
+				   $user_name = 'inextrix';
+				   $actual_file_name = date('ymdhis').$i.'.'.$parts[1];
+				   $dir_path = getcwd()."/attachments/";
+				   $path = $dir_path.$actual_file_name;
+				   if (move_uploaded_file($uploadedFile1, $path)) {
 				   $this->session->set_flashdata('astpp_errormsg', 'files added successfully!');
 				   }
-				   else{
+				   else {
 					$this->session->set_flashdata('astpp_errormsg', 'Please try again   !');
 				   }
 			   }
 		   }
-		   $add_array['attachment']=trim($add_array['attachment'],',');
-		   $add_array['file']=trim($add_array['file'],',');
-			   $add_array['email']= explode(",",$add_array['to']);   
+		   $add_array['attachment'] = trim($add_array['attachment'], ',');
+		   $add_array['file'] = trim($add_array['file'], ',');
+			   $add_array['email'] = explode(",", $add_array['to']);   
 			   $this->email_model->multipal_email($add_array);
 			   $screen_path = getcwd()."/cron";
 			   $screen_filename = "Email_Broadcast_".strtotime('now');
 			   $command = "cd ".$screen_path." && /usr/bin/screen -d -m -S  $screen_filename php cron.php BroadcastEmail";
 			   exec($command);
 			   $this->session->set_flashdata('astpp_errormsg', 'Email broad cast successfully!');
-			   redirect(base_url() . 'email/email_history_list/');
+			   redirect(base_url().'email/email_history_list/');
 			   exit; 
 		}
     
 	   function email_client_area() {
 		$add_array = $this->input->post();
-		if($add_array['temp'] == ''){
+		if ($add_array['temp'] == '') {
 	 	$subject = '';
-		$body ='';	
+		$body = '';	
 			 }
-		else{
+		else {
 				$where = array('id' => $add_array['temp']);
 		$account = $this->db_model->getSelect("subject,template", "default_templates", $where);
-		$account_data =$account->result_array();
-				$subject = isset($account_data[0]['subject'])?$account_data[0]['subject']:'';
-		$body = isset($account_data[0]['template'])?$account_data[0]['template']:'';	
+		$account_data = $account->result_array();
+				$subject = isset($account_data[0]['subject']) ? $account_data[0]['subject'] : '';
+		$body = isset($account_data[0]['template']) ? $account_data[0]['template'] : '';	
 	
             
 		}
 	   	$count_all = $this->email_model->get_email_client_data($add_array);
 	$email_arr = array();
 	$id_arr = array();
-	foreach($count_all as $key=>$value){
+	foreach ($count_all as $key=>$value) {
 		$value = $value;
-		if($value['email']!=''){
-		$email_arr[$value['email']]= $value['email'];
-		$id_arr[]= $value['id'];}
+		if ($value['email'] != '') {
+		$email_arr[$value['email']] = $value['email'];
+		$id_arr[] = $value['id']; }
 	} 
 	if (empty($email_arr))
 	{
 			$this->session->set_flashdata('astpp_notification', 'No record found! ');
-			redirect(base_url() . 'email/email_mass/');
+			redirect(base_url().'email/email_mass/');
 	}
 	$to_email = $email_arr;
 	
 	$to_id = $id_arr;
-	$to_send_mail = implode(",",$to_email);
-	if($to_send_mail != ''){
-		$add_arr['email']= $email_arr;
+	$to_send_mail = implode(",", $to_email);
+	if ($to_send_mail != '') {
+		$add_arr['email'] = $email_arr;
 	}
 	$data['username'] = $this->session->userdata('user_name');	
 	$data['page_title'] = 'Compose Email';
 	$send_id = $this->db_model->getSelect("emailaddress", "invoice_conf", array());
-	$send_id =$send_id->result_array();
-	$send_id =$send_id[0]['emailaddress'];
+	$send_id = $send_id->result_array();
+	$send_id = $send_id[0]['emailaddress'];
 	$add_arr['template'] = $body;
 	$add_arr['subject'] = $subject;
 		$add_arr['accountid'] = $id_arr;
 	$add_arr['from'] = $send_id;
 	$add_arr['temp'] = $add_array['temp'];
-	$add_arr['to']=$to_send_mail;
-	$add_arr['temp']=$add_array['temp'];
+	$add_arr['to'] = $to_send_mail;
+	$add_arr['temp'] = $add_array['temp'];
 		$this->load->view('view_email_brod', $add_arr);
 	}
 
@@ -370,10 +370,10 @@ 
 				$edit_data = $value;
 			}
 		$this->load->module('accounts/accounts');
-			redirect(base_url() . 'accounts/customer_edit/'.$value['accountid']);
+			redirect(base_url().'accounts/customer_edit/'.$value['accountid']);
 	}
 	function email_history_list() {
-	$data['logintype']=$this->session->userdata('logintype');
+	$data['logintype'] = $this->session->userdata('logintype');
 		$data['username'] = $this->session->userdata('user_name');
 		$data['search_flag'] = true;
 		$this->session->set_userdata('advance_search', 0);
@@ -384,7 +384,7 @@ 
 	$this->load->view('view_email_list', $data);
 	}
 	function email_history_list_json() {
-	$data['logintype']=$this->session->userdata('logintype');
+	$data['logintype'] = $this->session->userdata('logintype');
 		$json_data = array();
 		$count_all = $this->email_model->get_email_list(false);
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
@@ -395,13 +395,13 @@ 
 		echo json_encode($json_data);
 	}
 
-	function customer_mail_record($accountid,$accounttype){
+	function customer_mail_record($accountid, $accounttype) {
 		$json_data = array();
-		$count_all = $this->email_model->customer_get_email_list(false,$accountid,"","");
+		$count_all = $this->email_model->customer_get_email_list(false, $accountid, "", "");
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
-		$query = $this->email_model->customer_get_email_list(true,$accountid,$paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
-	$grid_fields = json_decode($this->email_form->build_list_for_email_customer($accountid,$accounttype));
+		$query = $this->email_model->customer_get_email_list(true, $accountid, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
+	$grid_fields = json_decode($this->email_form->build_list_for_email_customer($accountid, $accounttype));
 		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
 		echo json_encode($json_data);
 	}    
@@ -412,11 +412,11 @@ 
 		echo $this->db->delete("email");
 	}
 
-	function email_send_multipal(){
+	function email_send_multipal() {
 	$add_array = $this->input->post();
-	if($add_array['email'] == '' || $add_array['subject'] == '' || $add_array['template'] == ''){
+	if ($add_array['email'] == '' || $add_array['subject'] == '' || $add_array['template'] == '') {
 		$this->session->set_flashdata('astpp_notification', 'Email address not found!');
-			redirect(base_url() . '/email/email_client_area/');
+			redirect(base_url().'/email/email_client_area/');
 	}
 		$this->email_model->multipal_email($add_array);
 	$screen_path = "/var/www/html/ITPLATP/cron";
@@ -424,7 +424,7 @@ 
 	$command = "cd ".$screen_path." && /usr/bin/screen -d -m -S  $screen_filename php cron.php BroadcastEmail";
 		exec($command);
 	$this->session->set_flashdata('astpp_errormsg', 'Email broad cast successfully!');
-		redirect(base_url() . 'email/email_history_list/');
+		redirect(base_url().'email/email_history_list/');
 
 	}
 	function email_history_list_search() {
@@ -438,7 +438,7 @@ 
 			$this->session->set_userdata('email_search_list', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'email/email_history_list/');
+			redirect(base_url().'email/email_history_list/');
 		}
 	}
 
@@ -451,7 +451,7 @@ 
 	* Version 2.1
     */
 	function email_history_list_attachment($file_name) {
-	if(file_exists(getcwd().'/attachments/'.$file_name)){
+	if (file_exists(getcwd().'/attachments/'.$file_name)) {
 		header('Content-Type: application/octet-stream');
 		header('Content-Disposition: attachment; filename='.$file_name);
 		ob_clean();

web_interface/astpp/application/modules/email/libraries/email_form.php

Spacing +65 added lines, -65 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 Email_form {

@@ -31,13 +31,13 @@ 
 	}

 

   function get_form_fields_email() {

-		 $form['forms'] = array(base_url() . 'email/email_re_send/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

+		 $form['forms'] = array(base_url().'email/email_re_send/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

 		$form['Resend Email'] = array(

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

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

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

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

-			array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20',  'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

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

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

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

+			array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

             

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

 	           

@@ -49,15 +49,15 @@ 
 	}

 

 	function get_form_fields_email_edit() {

-	 $readable='disabled';

-		 $form['forms'] = array(base_url() . 'email/email_resend/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

+	 $readable = 'disabled';

+		 $form['forms'] = array(base_url().'email/email_resend/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

 	 $form['Resent Email'] = array(

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

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

-		   array('From', 'TEXTAREA', array('name' => 'from', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true,  'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

-		   array('To', 'TEXTAREA', array('name' => 'to', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true, 'class' => "margin-t-10 text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

-		   array('Subject', 'TEXTAREA', array('name' => 'subject', 'size' => '20','cols'=>50,'rows'=>1,  'class' => "margin-t-10 text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

-		   array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20','cols'=>50,'rows'=>15,  'class' => "margin-t-10 text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

+		   array('From', 'TEXTAREA', array('name' => 'from', 'size' => '20', 'cols'=>50, 'rows'=>1, 'readonly' => true, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+		   array('To', 'TEXTAREA', array('name' => 'to', 'size' => '20', 'cols'=>50, 'rows'=>1, 'readonly' => true, 'class' => "margin-t-10 text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+		   array('Subject', 'TEXTAREA', array('name' => 'subject', 'size' => '20', 'cols'=>50, 'rows'=>1, 'class' => "margin-t-10 text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+		   array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20', 'cols'=>50, 'rows'=>15, 'class' => "margin-t-10 text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

 	           

 	 );

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

@@ -66,48 +66,48 @@ 
 	}

     

 	function get_form_fields_email_view() {

-		$readable='disabled';

-		 $form['forms'] = array(base_url() . 'email/email_history_list/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

+		$readable = 'disabled';

+		 $form['forms'] = array(base_url().'email/email_history_list/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

 		$form['View Email'] = array(

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

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

-			array('From', 'TEXTAREA', array('name' => 'from', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true,  'class' => "text field medium col-md-5"),'trim|required|xss_clean', 'tOOL TIP', ''),

-			array('To', 'TEXTAREA', array('name' => 'to', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true,'style'=>'margin-top: 3px;' ,'class' => "text field medium col-md-5"),'trim|required|xss_clean', 'tOOL TIP', ''),

-			array('Subject', 'TEXTAREA', array('name' => 'subject', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true, 'style'=>'margin-top: 3px;', 'class' => "text field medium col-md-5"),'trim|required|xss_clean', 'tOOL TIP', ''),

-			array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20','cols'=>50,'rows'=>15, 'readonly' => true, 'style'=>'margin-top: 3px;', 'class' => "text field medium col-md-5"),'trim|required|xss_clean', 'tOOL TIP', ''),

-			array('Status', 'INPUT', array('name' => 'status', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true, 'style'=>'width: 18% !important;margin-top: 3px;' , 'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),   

+			array('From', 'TEXTAREA', array('name' => 'from', 'size' => '20', 'cols'=>50, 'rows'=>1, 'readonly' => true, 'class' => "text field medium col-md-5"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+			array('To', 'TEXTAREA', array('name' => 'to', 'size' => '20', 'cols'=>50, 'rows'=>1, 'readonly' => true, 'style'=>'margin-top: 3px;', 'class' => "text field medium col-md-5"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+			array('Subject', 'TEXTAREA', array('name' => 'subject', 'size' => '20', 'cols'=>50, 'rows'=>1, 'readonly' => true, 'style'=>'margin-top: 3px;', 'class' => "text field medium col-md-5"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+			array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20', 'cols'=>50, 'rows'=>15, 'readonly' => true, 'style'=>'margin-top: 3px;', 'class' => "text field medium col-md-5"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+			array('Status', 'INPUT', array('name' => 'status', 'size' => '20', 'cols'=>50, 'rows'=>1, 'readonly' => true, 'style'=>'width: 18% !important;margin-top: 3px;', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),   

 	           

 );

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

 		return $form;

 	}

 	function get_form_fields_email_view_cus() {

-	 $readable='disabled';

-		 $form['forms'] = array(base_url() . 'email/email_history_list_customer/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

+	 $readable = 'disabled';

+		 $form['forms'] = array(base_url().'email/email_history_list_customer/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

 		 $form['View Email'] = array(

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

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

-		   array('From', 'TEXTAREA', array('name' => 'from', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true, 'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

-		   array('To', 'TEXTAREA', array('name' => 'to', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true, 'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

-	   array('Subject', 'TEXTAREA', array('name' => 'subject', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true,  'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

-		   array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20','cols'=>50,'rows'=>15, 'readonly' => true,  'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

+		   array('From', 'TEXTAREA', array('name' => 'from', 'size' => '20', 'cols'=>50, 'rows'=>1, 'readonly' => true, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+		   array('To', 'TEXTAREA', array('name' => 'to', 'size' => '20', 'cols'=>50, 'rows'=>1, 'readonly' => true, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+	   array('Subject', 'TEXTAREA', array('name' => 'subject', 'size' => '20', 'cols'=>50, 'rows'=>1, 'readonly' => true, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+		   array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20', 'cols'=>50, 'rows'=>15, 'readonly' => true, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

             

-		array('Status', array('name' => 'status', 'disabled' => $readable, 'style' => 'width:20% !important;','class' => "text field medium"), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'email_search_status', '', ''),

+		array('Status', array('name' => 'status', 'disabled' => $readable, 'style' => 'width:20% !important;', 'class' => "text field medium"), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'email_search_status', '', ''),

 	           

 );

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

 		return $form;

 	}

 	function get_form_fields_email_view_cus_edit() {

-		$readable='disabled';

-		 $form['forms'] = array(base_url() . 'email/email_resend_customer/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

+		$readable = 'disabled';

+		 $form['forms'] = array(base_url().'email/email_resend_customer/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

 		$form['Resent Email'] = array(

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

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

-			array('From', 'TEXTAREA', array('name' => 'from', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true,  'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

-			array('To', 'TEXTAREA', array('name' => 'to', 'size' => '20','cols'=>50,'rows'=>1, 'readonly' => true, 'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

-			array('Subject', 'TEXTAREA', array('name' => 'subject', 'size' => '20','cols'=>50,'rows'=>1, 'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

-			array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20','cols'=>50,'rows'=>15, 'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),           

+			array('From', 'TEXTAREA', array('name' => 'from', 'size' => '20', 'cols'=>50, 'rows'=>1, 'readonly' => true, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+			array('To', 'TEXTAREA', array('name' => 'to', 'size' => '20', 'cols'=>50, 'rows'=>1, 'readonly' => true, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+			array('Subject', 'TEXTAREA', array('name' => 'subject', 'size' => '20', 'cols'=>50, 'rows'=>1, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+			array('Body', 'TEXTAREA', array('name' => 'body', 'size' => '20', 'cols'=>50, 'rows'=>15, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),           

 );

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

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

@@ -117,49 +117,49 @@ 
 	function build_list_for_email() {

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

 		$grid_field_arr = json_encode(array(

-			array("Date", "100", "date", "", "", "","","true","center"),

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

-			array("From", "145", "from", "", "", "","","true","center"),

-			array("To", "140", "to", "", "", "","","true","center"),

-			array("Subject", "180", "subject", "", "", "","","true","center"),

-			array("Body", "320", "body", "", "", "","","true","center"),

-			array("Attachement", "120", "attachment", "attachment", "attachment", "attachment_icons","","true","center"),

-			array("Status", "70", "status", "status", "status", "email_status","","true","center"),

+			array("Date", "100", "date", "", "", "", "", "true", "center"),

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

+			array("From", "145", "from", "", "", "", "", "true", "center"),

+			array("To", "140", "to", "", "", "", "", "true", "center"),

+			array("Subject", "180", "subject", "", "", "", "", "true", "center"),

+			array("Body", "320", "body", "", "", "", "", "true", "center"),

+			array("Attachement", "120", "attachment", "attachment", "attachment", "attachment_icons", "", "true", "center"),

+			array("Status", "70", "status", "status", "status", "email_status", "", "true", "center"),

 			array("Action", "100", "", "", "", array("RESEND" => array("url" => "email/email_resend_edit/", "mode" => "popup"),

-			"VIEW" => array("url" => "email/email_view/", "mode" => "popup","layout"=>"medium"),

+			"VIEW" => array("url" => "email/email_view/", "mode" => "popup", "layout"=>"medium"),

 					"DELETE" => array("url" => "/email/email_delete/", "mode" => "single")))

 				));

 		return $grid_field_arr;

 	}

 

-	function build_list_for_email_customer($accountid,$accounttype) {

+	function build_list_for_email_customer($accountid, $accounttype) {

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

 			   $grid_field_arr = json_encode(array(

-					array("Date", "140", "date", "", "", "","","true","center"),

-					array("Subject", "230", "subject", "", "", "","","true","center"),

-					array("Body", "350", "body", "", "", "","","true","center"),

-					array("Attachement", "120", "attachment", "attachment", "attachment", "attachment_icons","","true","center"),

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

+					array("Date", "140", "date", "", "", "", "", "true", "center"),

+					array("Subject", "230", "subject", "", "", "", "", "true", "center"),

+					array("Body", "350", "body", "", "", "", "", "true", "center"),

+					array("Attachement", "120", "attachment", "attachment", "attachment", "attachment_icons", "", "true", "center"),

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

 					array("Action", "100", "", "", "", array("RESEND" => array("url" => "email/email_resend_edit_customer/", "mode" => "popup"),

-							"VIEW" => array("url" => "email/email_view_customer/", "mode" => "popup","layout"=>"medium"),

+							"VIEW" => array("url" => "email/email_view_customer/", "mode" => "popup", "layout"=>"medium"),

 							"DELETE" => array("url" => "email/email_delete_customer/".$accounttype."/".$accountid."/", "mode" => "single")))

 					));

 		return $grid_field_arr;

 	}

 

-	function build_list_for_email_client_area(){

+	function build_list_for_email_client_area() {

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

 	if ($logintype == 1 || $logintype == 5) {

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

 			$loginid = $account_data['id'];

 

-		}else{

+		} else {

 			$loginid = "0";

 		}

-		 $form['forms'] = array(base_url() . 'email/email_client_area/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

+		 $form['forms'] = array(base_url().'email/email_client_area/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

 		$form['Filter'] = array(

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

-		  array('Account Type',array('name' => 'posttoexternal','class' => 'posttoexternal', 'id' => 'posttoexternal'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_account_type'),

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

+		  array('Account Type', array('name' => 'posttoexternal', 'class' => 'posttoexternal', 'id' => 'posttoexternal'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_account_type'),

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

 	  array('Entity Type', 'type', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_entity_type_email_mass'),

 	);

@@ -174,26 +174,26 @@ 
 		return $form;

 	} 

 	function get_form_fields_email_view_client($add_arr) {

-	if($add_arr['type'] == ''){

-	   $email_add = array('To','email', 'SELECT', '', '', 'tOOL TIP', 'Please Enter receipent Email', 'email', 'email', 'accounts', 'build_dropdown', 'where_arr',array('status'=>$add_arr['status'],'posttoexternal'=>$add_arr['posttoexternal'],'pricelist_id'=>$add_arr['pricelist_id']), 'multi');

-	} else{

-	 $email_add = array('To','email', 'SELECT', '', '', 'tOOL TIP', 'Please Enter receipent Email', 'email', 'email', 'accounts', 'build_dropdown', 'where_arr',array('status'=>$add_arr['status'],'posttoexternal'=>$add_arr['posttoexternal'],'pricelist_id'=>$add_arr['pricelist_id'],'type'=>$add_arr['type']), 'multi');

+	if ($add_arr['type'] == '') {

+	   $email_add = array('To', 'email', 'SELECT', '', '', 'tOOL TIP', 'Please Enter receipent Email', 'email', 'email', 'accounts', 'build_dropdown', 'where_arr', array('status'=>$add_arr['status'], 'posttoexternal'=>$add_arr['posttoexternal'], 'pricelist_id'=>$add_arr['pricelist_id']), 'multi');

+	} else {

+	 $email_add = array('To', 'email', 'SELECT', '', '', 'tOOL TIP', 'Please Enter receipent Email', 'email', 'email', 'accounts', 'build_dropdown', 'where_arr', array('status'=>$add_arr['status'], 'posttoexternal'=>$add_arr['posttoexternal'], 'pricelist_id'=>$add_arr['pricelist_id'], 'type'=>$add_arr['type']), 'multi');

 	}

 

-		 $form['forms'] = array(base_url() . 'email/email_send_multipal/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

+		 $form['forms'] = array(base_url().'email/email_send_multipal/', array('id' => 'commission_form', 'method' => 'POST', 'name' => 'commission_form'));

 		$form['Compose Email'] = array(

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

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

-			array('From', 'INPUT', array('name' => 'from', 'size' => '20','readonly'=>true,'value'=>'',  'class' => "text field medium"),'trim|required|xss_clean', 'tOOL TIP', ''),

+			array('From', 'INPUT', array('name' => 'from', 'size' => '20', 'readonly'=>true, 'value'=>'', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

 			$email_add,

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

 			array('Body', 'TEXTAREA', array('name' => 'template', 'id' => 'template', 'size' => '20', 'class' => "textarea medium"), 'trim|required', 'tOOL TIP', ''),

 );

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

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

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

 		return $form;

 	}

-	function build_grid_buttons_email(){

+	function build_grid_buttons_email() {

 	$buttons_json = json_encode(array(

 					));

 	return $buttons_json;

@@ -205,10 +205,10 @@ 
  'class' => "text field "), '', 'tOOL TIP', '', 'date[date-date]'),

 			array('To Date', 'INPUT', array('name' => 'date[]', 'id' => 'customer_cdr_to_date', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '', 'date[date-date]'),

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

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

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

-			array('Subject', 'INPUT', array('name' => 'subject[subject]', '','id'=>'body', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'subject[subject-string]', '', '', '', 'search_string_type', ''),  

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

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

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

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

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

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

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

 		);

web_interface/astpp/application/modules/email/views/view_email_brod.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
               <div class="col-md-12">
             	<div class="w-box">
             	 <span  style="margin-left:10px; text-align: center;background-color: none;color:#1c8400;">
-                    <? if(isset($error) && !empty($error)) {
+                    <? if (isset($error) && ! empty($error)) {
                         echo $error;
                     }?>
                  </span>

web_interface/astpp/application/modules/email/views/view_email_add_edit.php

Spacing +3 added lines, -3 removed lines

@@ -29,10 +29,10 @@
             </div>

             <?php echo $form; ?>

         </div>    

-        <?php if(isset($maildata) && $maildata != ''){

+        <?php if (isset($maildata) && $maildata != '') {

 		  echo "<div class='col-md-12 no-padding'>Attachments :</div>";

-		  $imgArr = explode(",",$maildata);

-		  foreach($imgArr as $key => $imgname){

+		  $imgArr = explode(",", $maildata);

+		  foreach ($imgArr as $key => $imgname) {

 			$imgpath = base_url()."email/email_history_list_attachment/".$imgname;

 			echo "<div class='col-md-4 no-padding'>

                   <a href='".$imgpath."'>".$imgname."</a>

web_interface/astpp/application/modules/trunk/models/trunk_model.php

Spacing +3 added lines, -3 removed lines

@@ -39,14 +39,14 @@ 
 
 	function add_trunk($add_array) {
 		unset($add_array["action"]);
-		$add_array['creation_date']=gmdate('Y-m-d H:i:s');
+		$add_array['creation_date'] = gmdate('Y-m-d H:i:s');
 		$this->db->insert("trunks", $add_array);
 		return true;
 	}
 
 	function edit_trunk($data, $id) {
 		unset($data["action"]);
-		$data['last_modified_date']=gmdate('Y-m-d H:i:s');
+		$data['last_modified_date'] = gmdate('Y-m-d H:i:s');
 		$this->db->where("id", $id);
 		$this->db->update("trunks", $data);
 	}
@@ -54,7 +54,7 @@ 
 	function remove_trunk($id) {
 		$this->db->where("id", $id);
 		$this->db->update("trunks", array("status" => 2));
-		$this->db->where('trunk_id',$id);
+		$this->db->where('trunk_id', $id);
 		$this->db->delete('outbound_routes');
 		return true;
 	}

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

Spacing +22 added lines, -22 removed lines

@@ -33,7 +33,7 @@ 
 		$this->load->model('trunk_model');
 
 		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+			redirect(base_url().'/astpp/login');
 	}
 
 	function trunk_list() {
@@ -50,7 +50,7 @@ 
 	function trunk_list_json() {
 		$json_data = array();
 		$count_all = $this->trunk_model->gettrunk_list(false);
-		$paging_data = $this->form->load_grid_config($count_all,$_GET['rp'], $_GET['page']);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
 		$query = $this->trunk_model->gettrunk_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
 		$grid_fields = json_decode($this->trunk_form->build_trunk_list_for_admin());
@@ -117,7 +117,7 @@ 
 			$this->session->set_userdata('trunk_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'trunk/trunk_list/');
+			redirect(base_url().'trunk/trunk_list/');
 		}
 	}
 
@@ -128,9 +128,9 @@ 
 
 	function trunk_remove($id) {
 		$this->trunk_model->remove_trunk($id);
-	$this->db->delete("routing",array("trunk_id"=>$id));
+	$this->db->delete("routing", array("trunk_id"=>$id));
 		$this->session->set_flashdata('astpp_notification', 'Trunk removed successfully!');
-		redirect(base_url() . 'trunk/trunk_list/');
+		redirect(base_url().'trunk/trunk_list/');
 	}
 
 	function trunk_delete_multiple() {
@@ -144,34 +144,34 @@ 
 			$this->db->update('trunks', $update_data);
 			echo TRUE;
 		} else {
-			$trunk_arr=array();
+			$trunk_arr = array();
 			$this->db->select('id,name');
 			$this->db->where('id '.$where);
-			$trunk_res=$this->db->get('trunks');
-			$trunk_res=$trunk_res->result_array();
-			foreach($trunk_res as $value){
-				$trunk_arr[$value['id']]['name']=$value['name'];
+			$trunk_res = $this->db->get('trunks');
+			$trunk_res = $trunk_res->result_array();
+			foreach ($trunk_res as $value) {
+				$trunk_arr[$value['id']]['name'] = $value['name'];
 			}
 			$this->db->where('trunk_id '.$where);
 			$this->db->select('count(id) as cnt,trunk_id');
 			$this->db->group_by('trunk_id');
-			$outbound_routes_res=$this->db->get('outbound_routes');
-			if($outbound_routes_res->num_rows() > 0){
-			 $outbound_routes_res=$outbound_routes_res->result_array();
-			 foreach($outbound_routes_res as $key=>$value){
-				$trunk_arr[$value['trunk_id']]['outbound_routes']=$value['cnt'];
+			$outbound_routes_res = $this->db->get('outbound_routes');
+			if ($outbound_routes_res->num_rows() > 0) {
+			 $outbound_routes_res = $outbound_routes_res->result_array();
+			 foreach ($outbound_routes_res as $key=>$value) {
+				$trunk_arr[$value['trunk_id']]['outbound_routes'] = $value['cnt'];
 			 }
 			}
-			$str=null;
-			foreach($trunk_arr as $key=>$value){
-				 if(isset($value['outbound_routes'])){
-					 $str.= $value['name']."trunk using by ".$value['outbound_routes']." termination rates \n";
+			$str = null;
+			foreach ($trunk_arr as $key=>$value) {
+				 if (isset($value['outbound_routes'])) {
+					 $str .= $value['name']."trunk using by ".$value['outbound_routes']." termination rates \n";
 				 }
 			} 
-			if(!empty($str)){
-				$data['str']=$str;
+			if ( ! empty($str)) {
+				$data['str'] = $str;
 			}
-			$data['selected_ids']=$add_array['selected_ids'];
+			$data['selected_ids'] = $add_array['selected_ids'];
 			echo json_encode($data);
 		}
 	}

web_interface/astpp/application/modules/trunk/libraries/trunk_form.php

Spacing +22 added lines, -22 removed lines

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

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

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

-if (!defined('BASEPATH'))

+if ( ! defined('BASEPATH'))

 	exit('No direct script access allowed');

 

 class trunk_form {

 

 	function get_trunk_form_fields() {

-		$form['forms'] = array(base_url() . 'trunk/trunk_save/', array('id' => 'trunks_form', 'method' => 'POST', 'name' => 'trunks_form'));

+		$form['forms'] = array(base_url().'trunk/trunk_save/', array('id' => 'trunks_form', 'method' => 'POST', 'name' => 'trunks_form'));

 		$form['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', ''),

-			array('Provider', 'provider_id', 'SELECT', '', 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr',array('type'=>3,"deleted"=>"0","status"=>"0")),

-			array('Gateway Name', 'gateway_id', 'SELECT', '', 'trim|required|xss_clean', 'tOOL TIP', 'Please select gateway first', 'id', 'name', 'gateways', 'build_dropdown','where_arr', array("status" => "0")),

+			array('Provider', 'provider_id', 'SELECT', '', 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array('type'=>3, "deleted"=>"0", "status"=>"0")),

+			array('Gateway Name', 'gateway_id', 'SELECT', '', 'trim|required|xss_clean', 'tOOL TIP', 'Please select gateway first', 'id', 'name', 'gateways', 'build_dropdown', 'where_arr', array("status" => "0")),

 			array('Failover GW Name #1', 'failover_gateway_id', 'SELECT', '', '', 'tOOL TIP', 'Please select gateway first', 'id', 'name', 'gateways', 'build_dropdown', 'where_arr', array("status" => "0")),

 			array('Failover GW Name #2', 'failover_gateway_id1', 'SELECT', '', '', 'tOOL TIP', 'Please select gateway first', 'id', 'name', 'gateways', 'build_dropdown', 'where_arr', array("status" => "0")),            

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

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

 		$form['Settings'] = array(  

-			array('Number Translation', 'INPUT', array('name' => 'dialed_modify', 'size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', ''),

+			array('Number Translation', 'INPUT', array('name' => 'dialed_modify', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),

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

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

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

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

 		);

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

@@ -50,8 +50,8 @@ 
 		$form['forms'] = array("", array('id' => "trunk_search"));

 		$form['Search'] = array(

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

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

-			array('Gateway Name', 'gateway_id', 'SELECT', '', '', 'tOOL TIP', 'Please select gateway first', 'id', 'name', 'gateways', 'build_dropdown','where_arr', array("status" => "0")),

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

+			array('Gateway Name', 'gateway_id', 'SELECT', '', '', 'tOOL TIP', 'Please select gateway first', 'id', 'name', 'gateways', 'build_dropdown', 'where_arr', array("status" => "0")),

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

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

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

@@ -63,26 +63,26 @@ 
 

 	function build_trunk_list_for_admin() {

         

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

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

-			array("Provider", "110", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string","","true","center"),

-			array("Gateway Name", "100", "gateway_id", "name", "gateways", "get_field_name","","true","center"),

-			array("Failover <br>GW Name #1", "130", "failover_gateway_id","name", "gateways", "get_field_name","","true","center"),

-			array("Failover<br> GW Name #2", "130", "failover_gateway_id1","name", "gateways", "get_field_name","","true","center"),

-			array("CC", "90", "maxchannels", "", "", "","","true","center"),

-			array("Codecs", "90", "codec", "", "", "","","true","center"),

-			array("Rate<br>Count", "70", "id", "trunk_id", "outbound_routes", "get_field_count","","true","center"),

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

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

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

+			array("Provider", "110", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string", "", "true", "center"),

+			array("Gateway Name", "100", "gateway_id", "name", "gateways", "get_field_name", "", "true", "center"),

+			array("Failover <br>GW Name #1", "130", "failover_gateway_id", "name", "gateways", "get_field_name", "", "true", "center"),

+			array("Failover<br> GW Name #2", "130", "failover_gateway_id1", "name", "gateways", "get_field_name", "", "true", "center"),

+			array("CC", "90", "maxchannels", "", "", "", "", "true", "center"),

+			array("Codecs", "90", "codec", "", "", "", "", "true", "center"),

+			array("Rate<br>Count", "70", "id", "trunk_id", "outbound_routes", "get_field_count", "", "true", "center"),

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

 			array("Created Date", "110", "creation_date", "creation_date", "creation_date", "convert_GMT_to"),

-			array("Modified <br/>Date", "105", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to","","true","center"),

-			array("Action", "100", "", "", "", array("EDIT" => array("url" => "trunk/trunk_edit/", "mode" => "popup","layout"=>"medium"),

+			array("Modified <br/>Date", "105", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to", "", "true", "center"),

+			array("Action", "100", "", "", "", array("EDIT" => array("url" => "trunk/trunk_edit/", "mode" => "popup", "layout"=>"medium"),

 					"DELETE" => array("url" => "trunk/trunk_remove/", "mode" => "single")))

 				));

 			return $grid_field_arr;

 	}

 

 	function build_grid_buttons() {

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

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

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

 			));

 		return $buttons_json;

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

Spacing +27 added lines, -27 removed lines

@@ -32,14 +32,14 @@ 
 ASTPP  3.0 
 Voicemail data get
 ******/
-	function get_sipdevices_list($flag, $accountid = "",$entitytype='',$start = "", $limit = "") {
+	function get_sipdevices_list($flag, $accountid = "", $entitytype = '', $start = "", $limit = "") {
 	if ($accountid != "") {
 		$where = array("accountid" => $accountid);
 	}
 	$this->db_model->build_search('fssipdevices_list_search');
-		$instant_search=$this->session->userdata('left_panel_search_'.$entitytype.'_sipdevices');
-		if(!empty($instant_search)){
-			$like_str="(username like '%$instant_search%' OR creation_date like '%$instant_search%' OR last_modified_date like '%$instant_search%')";
+		$instant_search = $this->session->userdata('left_panel_search_'.$entitytype.'_sipdevices');
+		if ( ! empty($instant_search)) {
+			$like_str = "(username like '%$instant_search%' OR creation_date like '%$instant_search%' OR last_modified_date like '%$instant_search%')";
 			$this->db->where($like_str);   
 		}
 	$query = array();
@@ -88,13 +88,13 @@ 
 		$where = array('id' => $add_array['accountcode']);
 		$query = $this->db_model->getSelect("*", "accounts", $where);
 		$query = $query->result_array();
-		$account_data=$query[0];
+		$account_data = $query[0];
        
 		$log_type = $this->session->userdata("logintype");
         	
-		$reseller_id = $log_type==1 ? $account_data['reseller_id']:0;
+		$reseller_id = $log_type == 1 ? $account_data['reseller_id'] : 0;
         
-		$sip_profile_id = isset($add_array['sip_profile_id'])?$add_array['sip_profile_id']:$this->common->get_field_name('id','sip_profiles',array('name'=>'default'));
+		$sip_profile_id = isset($add_array['sip_profile_id']) ? $add_array['sip_profile_id'] : $this->common->get_field_name('id', 'sip_profiles', array('name'=>'default'));
 	
 	$parms_array = array('password' => $add_array['fs_password'],
 			'vm-enabled' => $add_array['voicemail_enabled'],
@@ -128,16 +128,16 @@ 
 ASTPP  3.0 
 Email broadcast when Sip Device create
 ******/
-		$mail = (isset($add_array['voicemail_mail_to']) && $add_array['voicemail_mail_to'] != "")?$add_array['voicemail_mail_to']:$account_data['email'];
+		$mail = (isset($add_array['voicemail_mail_to']) && $add_array['voicemail_mail_to'] != "") ? $add_array['voicemail_mail_to'] : $account_data['email'];
     
-		$add_array['id']=$add_array['accountcode'];
-		$add_array['reseller_id']=$account_data['reseller_id'];
-		$add_array['email']=$mail;
-		$add_array['first_name']=$account_data['first_name'];
-		$add_array['last_name']=$account_data['last_name'];
-		$add_array['number']=$add_array['fs_username'];
+		$add_array['id'] = $add_array['accountcode'];
+		$add_array['reseller_id'] = $account_data['reseller_id'];
+		$add_array['email'] = $mail;
+		$add_array['first_name'] = $account_data['first_name'];
+		$add_array['last_name'] = $account_data['last_name'];
+		$add_array['number'] = $add_array['fs_username'];
 		//$add_array['password']=$this->common->decode($add_array['fs_password']);
-		$add_array['password']=$add_array['fs_password'];
+		$add_array['password'] = $add_array['fs_password'];
 		//echo "<pre>"; print_r($add_array); exit;		
 		$this->common->mail_to_users('add_sip_device', $add_array);
 /****************************/
@@ -191,9 +191,9 @@ 
 		$add_array = $deviceinfo->result_array();
 		foreach ($add_array as $key => $value) {
 			$vars = json_decode($value['dir_vars']);
-			$vars_new = json_decode($value['dir_params'],true);
+			$vars_new = json_decode($value['dir_params'], true);
 			$passowrds = json_decode($value['dir_params']);
-			$query = array('id' => $value['id'],'fs_username' => $value['username'],
+			$query = array('id' => $value['id'], 'fs_username' => $value['username'],
 						'accountcode' => $value['accountid'],
 						'status' => $value['status'],
 						'sip_profile_id' => $value['sip_profile_id'],
@@ -223,11 +223,11 @@ 
 		$deviceinfo = array();
 		$this->db_model->build_search('fssipdevices_list_search');
 		$accountinfo = $this->session->userdata("accountinfo");
-		$reseller_id=$accountinfo['type']==1 ? $accountinfo['id'] : 0;
+		$reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
 		$query = array();
 		$logintype = $this->session->userdata("logintype");
         
-		$where['reseller_id']=$reseller_id;
+		$where['reseller_id'] = $reseller_id;
       
 		if ($flag) {
 			$deviceinfo = $this->db_model->select("*", "sip_devices", $where, "id", "ASC", $limit, $start);
@@ -235,7 +235,7 @@ 
 				$add_array = $deviceinfo->result_array();
 				foreach ($add_array as $key => $value) {
 					$vars = json_decode($value['dir_vars']);
-					$vars_new = json_decode($value['dir_params'],true);
+					$vars_new = json_decode($value['dir_params'], true);
 					$passowrds = json_decode($value['dir_params']);
 					/*
                     ASTPP  3.0 
@@ -309,7 +309,7 @@ 
 		/*
         ASTPP  3.0  ADD creation date 
         */
-		$data['creation_date']=gmdate('Y-m-d H:i:s');
+		$data['creation_date'] = gmdate('Y-m-d H:i:s');
 		/***********************************/
 		unset($data['action']);
 		$this->db->insert('freeswich_servers', $data);
@@ -321,7 +321,7 @@ 
 		/*
         ASTPP  3.0  edit modified date add
         */
-		$data['last_modified_date']=gmdate('Y-m-d H:i:s');
+		$data['last_modified_date'] = gmdate('Y-m-d H:i:s');
 		/***********************************************/
 		$this->db->where('id', $id);
 		$this->db->update('freeswich_servers', $data);
@@ -334,21 +334,21 @@ 
 		return true;
 	}
 
-	function reload_freeswitch($command,$server_host="") {
-	$response='';
+	function reload_freeswitch($command, $server_host = "") {
+	$response = '';
 		$query = $this->db_model->getSelect("*", "freeswich_servers", "");
 		$fs_data = $query->result_array();
 	   foreach ($fs_data as $fs_key => $fs_value) {
 		$fp = $this->freeswitch_lib->event_socket_create($fs_value["freeswitch_host"], $fs_value["freeswitch_port"], $fs_value["freeswitch_password"]);
 		if ($fp) {
-		$response.= $this->freeswitch_lib->event_socket_request($fp, $command);
+		$response .= $this->freeswitch_lib->event_socket_request($fp, $command);
 		fclose($fp);
 		}
 	   }
 		return $response;
 	}
 	function reload_live_freeswitch($command) {
-	$response='';
+	$response = '';
 		$query = $this->db_model->getSelect("*", "freeswich_servers", "");
 		$fs_data = $query->result_array();
         
@@ -359,7 +359,7 @@ 
 		fclose($fp);
 		}
 		}
-	$response = str_replace("0 total.","",$response);
+	$response = str_replace("0 total.", "", $response);
 		return $response;
 	}
 

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

Spacing +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;
 		}