iNextrix / ASTPP

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

Spacing +60 added lines, -60 removed lines

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

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

Spacing +40 added lines, -40 removed lines

@@ -24,7 +24,7 @@ 
 
 class Refill_coupon extends MX_Controller {
     
-    function Refill_coupon(){
+    function Refill_coupon() {
 	      parent::__construct();
 	      $this->load->helper('template_inheritance');
 	      $this->load->helper('form');
@@ -33,11 +33,11 @@ 
 	      $this->load->library("astpp/form");
 	      $this->load->library("session");
 	      if ($this->session->userdata('user_login') == FALSE)
-		    redirect(base_url() . 'login/login');
+		    redirect(base_url().'login/login');
       }
-    function refill_coupon_list(){
-	if($this->session->userdata('logintype') == 0 || $this->session->userdata('logintype') == 3){
-            redirect(base_url() . 'user/user/');
+    function refill_coupon_list() {
+	if ($this->session->userdata('logintype') == 0 || $this->session->userdata('logintype') == 3) {
+            redirect(base_url().'user/user/');
 	}
 		$data['username'] = $this->session->userdata('user_name');
         $data['page_title'] = gettext('Refill Coupon');
@@ -49,7 +49,7 @@ 
         $data['form_search'] = $this->form->build_serach_form($this->refill_coupon_form->get_refill_coupon_search_form());
         $this->load->view('view_refill_coupon_list', $data);
     }
-    function refill_coupon_list_json(){
+    function refill_coupon_list_json() {
 	$json_data = array();
         $count_all = $this->refill_coupon_model->get_refill_coupon_list(false, "", "");
         $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
@@ -59,7 +59,7 @@ 
         $json_data['rows'] = $this->form->build_grid($query, $grid_fields);
         echo json_encode($json_data);
     }   
-    function refill_coupon_list_search(){
+    function refill_coupon_list_search() {
         $ajax_search = $this->input->post('ajax_search', 0);
         if ($this->input->post('advance_search', TRUE) == 1) {
             $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
@@ -72,21 +72,21 @@ 
             $this->session->set_userdata('refill_coupon_list_search', $action);
         }
         if (@$ajax_search != 1) {
-            redirect(base_url() . 'refill_coupon/refill_coupon_list/');
+            redirect(base_url().'refill_coupon/refill_coupon_list/');
         }
     }
-    function refill_coupon_clearsearchfilter(){
+    function refill_coupon_clearsearchfilter() {
 	$this->session->set_userdata('advance_search', 0);
         $this->session->set_userdata('refill_coupon_list_search', "");
     }
-    function refill_coupon_list_view($id){
+    function refill_coupon_list_view($id) {
     $data['username'] = $this->session->userdata('user_name');
         $data['page_title'] = 'View Refill Coupon';
         if ($cc = $this->refill_coupon_model->get_refill_coupon_details($id)) {
-	    $refill_coupon_details=$cc->result_array();
-	    $data['refill_coupon_details']=$refill_coupon_details[0];
-            $data['refill_coupon_details']['callingcard']= $this->common->get_field_name('cardnumber', 'callingcards', $refill_coupon_details[0]['callingcard_id']);
-            $data['refill_coupon_details']['currency']= $this->common->build_concat_string('currencyname,currency', 'currency', $refill_coupon_details[0]['currency_id']);
+	    $refill_coupon_details = $cc->result_array();
+	    $data['refill_coupon_details'] = $refill_coupon_details[0];
+            $data['refill_coupon_details']['callingcard'] = $this->common->get_field_name('cardnumber', 'callingcards', $refill_coupon_details[0]['callingcard_id']);
+            $data['refill_coupon_details']['currency'] = $this->common->build_concat_string('currencyname,currency', 'currency', $refill_coupon_details[0]['currency_id']);
         } else {
             echo "This card is not available.";
             return;
@@ -95,8 +95,8 @@ 
     
     }
     function refill_coupon_add() {
-	if($this->session->userdata('logintype') == 0 || $this->session->userdata('logintype') == 3){
-            redirect(base_url() . 'user/user/');
+	if ($this->session->userdata('logintype') == 0 || $this->session->userdata('logintype') == 3) {
+            redirect(base_url().'user/user/');
 	}
         $data['username'] = $this->session->userdata('user_name');
         $data['flag'] = 'create';
@@ -105,16 +105,16 @@ 
         $this->load->view('view_refill_coupon_add', $data);
     }
     function refill_coupon_save() {
-        $account_length=Common_model::$global_config['system_config']['refill_coupon_length'];
+        $account_length = Common_model::$global_config['system_config']['refill_coupon_length'];
         $add_array = $this->input->post();
-        $add_array['status']=0;
+        $add_array['status'] = 0;
         $data['form'] = $this->form->build_form($this->refill_coupon_form->get_refill_coupon_form_fields(), $add_array);
-	$result=$this->refill_coupon_model->refill_coupon_count($add_array);
-        $count=$result[0]['count'];
-        $remaining_length =0;
-        $remaining_length=$account_length - strlen($add_array['prefix']);
-        $currentlength =pow(5,$remaining_length);
-        $currentlength=$currentlength-$count;
+	$result = $this->refill_coupon_model->refill_coupon_count($add_array);
+        $count = $result[0]['count'];
+        $remaining_length = 0;
+        $remaining_length = $account_length - strlen($add_array['prefix']);
+        $currentlength = pow(5, $remaining_length);
+        $currentlength = $currentlength - $count;
         $data['page_title'] = 'Add Refill Coupon';
         if ($this->form_validation->run() == FALSE) {
                 $data['validation_errors'] = validation_errors();
@@ -122,18 +122,18 @@ 
                 exit;
         }
         else {    
-    	  if($account_length<=strlen($add_array['prefix'])){
+    	  if ($account_length <= strlen($add_array['prefix'])) {
     	      echo json_encode(array("count_error"=>"You Can Not Create ".$add_array['count']." Accounts with ".$add_array['prefix']." prefix."));
     	      exit;      
     	  }
-    	  if($currentlength <= 0){
+    	  if ($currentlength <= 0) {
     		echo json_encode(array("count_error"=>"You Can Not Create ".$add_array['count']." Accounts with ".$add_array['prefix']." prefix"));
     		exit;  
     	  }
-    	  if($currentlength > 0 && $add_array['count'] > $currentlength){
+    	  if ($currentlength > 0 && $add_array['count'] > $currentlength) {
     		echo json_encode(array("count_error"=>"You Can Create Maximum ".$currentlength." accounts with ".$add_array['prefix']." prefix"));
     		exit;      
-    	  }else{
+    	  } else {
     	    $this->refill_coupon_model->add_refill_coupon($add_array);
     	    echo json_encode(array("SUCCESS"=> "Refill coupon created successfully!"));
     	    exit;
@@ -143,26 +143,26 @@ 
     function refill_coupon_list_delete($id) {
         $this->refill_coupon_model->remove_refill_coupon($id);
         $this->session->set_flashdata('astpp_notification', 'Refill coupon removed successfully!');
-        redirect(base_url() . 'refill_coupon/refill_coupon_list/');
+        redirect(base_url().'refill_coupon/refill_coupon_list/');
     }
-    function refill_coupon_export(){
+    function refill_coupon_export() {
 	 $account_info = $accountinfo = $this->session->userdata('accountinfo');
-		$currency_id=$account_info['currency_id'];
-		$currency=$this->common->get_field_name('currency', 'currency', $currency_id);
-	$query = $this->refill_coupon_model->get_refill_coupon_list(true,'','',true);
+		$currency_id = $account_info['currency_id'];
+		$currency = $this->common->get_field_name('currency', 'currency', $currency_id);
+	$query = $this->refill_coupon_model->get_refill_coupon_list(true, '', '', true);
         $cc_array = array();
         ob_clean();
-        $cc_array[] = array('Coupon No.','Description', 'Account','Amount('.$currency.')','Created Date',"Used?",'Used Date');
+        $cc_array[] = array('Coupon No.', 'Description', 'Account', 'Amount('.$currency.')', 'Created Date', "Used?", 'Used Date');
         if ($query->num_rows() > 0) {
             foreach ($query->result_array() as $row) {
                 $row['currency'] = $this->common->build_concat_string('currencyname,currency', 'currency', $row['currency_id']);
                 $row['acc_name'] = $row['account_id'] > 0 ? $this->common->get_field_name('number', 'accounts', $row['account_id']) : "";
-                $row['status']=$this->common->get_refill_coupon_status('','',$row['status']);
+                $row['status'] = $this->common->get_refill_coupon_status('', '', $row['status']);
                 $cc_array[] = array(
                     $row['number'],
                     $row['description'],
                     $row['acc_name'],
-                    $this->common->convert_to_currency('','',$row['amount']),
+                    $this->common->convert_to_currency('', '', $row['amount']),
                     $row['creation_date'],
                     $row['status'],
                     $row['firstused']
@@ -170,14 +170,14 @@ 
             }
         }
         $this->load->helper('csv');
-        array_to_csv($cc_array, 'refill_coupon_' . date("Y-m-d") . '.csv');
+        array_to_csv($cc_array, 'refill_coupon_'.date("Y-m-d").'.csv');
     }
-    function refill_coupon_customer_json($accountid){
+    function refill_coupon_customer_json($accountid) {
 	$json_data = array();
-        $count_all = $this->refill_coupon_model->get_customer_refill_coupon_list(false, "", "",$accountid);
+        $count_all = $this->refill_coupon_model->get_customer_refill_coupon_list(false, "", "", $accountid);
         $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
         $json_data = $paging_data["json_paging"];
-        $query = $this->refill_coupon_model->get_customer_refill_coupon_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"],$accountid);
+        $query = $this->refill_coupon_model->get_customer_refill_coupon_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], $accountid);
         $grid_fields = json_decode($this->refill_coupon_form->build_user_refill_coupon_grid());
         $json_data['rows'] = $this->form->build_grid($query, $grid_fields);
         echo json_encode($json_data);

web_interface/astpp/application/modules/refill_coupon/libraries/refill_coupon_form.php

Spacing +29 added lines, -29 removed lines

@@ -20,18 +20,18 @@ 
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###############################################################################
-if (!defined('BASEPATH'))
+if ( ! defined('BASEPATH'))
     exit('No direct script access allowed');
 
 class Refill_coupon_form {
     function __construct($library_name = '') {
         $this->CI = & get_instance();
     }
-    function get_refill_coupon_form_fields(){
-        $form['forms'] = array(base_url() . 'refill_coupon/refill_coupon_save/',array("id" => "refill_coupon_form", "name" => "refill_coupon_form"));
+    function get_refill_coupon_form_fields() {
+        $form['forms'] = array(base_url().'refill_coupon/refill_coupon_save/', array("id" => "refill_coupon_form", "name" => "refill_coupon_form"));
         $form['Coupon Information'] = array(
-	    array('Description', 'INPUT', array('name' => 'description', 'size' => '20',  'class' => "text field medium"), 'trim|xss_clean', 'tOOL TIP', 'Please Enter account number'),
-	    array('Start prefix', 'INPUT', array('name' => 'prefix', 'size' => '20',  'class' => "text field medium"), 'trim|required|numeric|xss_clean', 'tOOL TIP', ''),
+	    array('Description', 'INPUT', array('name' => 'description', 'size' => '20', 'class' => "text field medium"), 'trim|xss_clean', 'tOOL TIP', 'Please Enter account number'),
+	    array('Start prefix', 'INPUT', array('name' => 'prefix', 'size' => '20', 'class' => "text field medium"), 'trim|required|numeric|xss_clean', 'tOOL TIP', ''),
             array('Quantity', 'INPUT', array('name' => 'count', 'size' => '20', 'maxlength' => '5', 'class' => "text field medium"), 'trim|required|is_numeric|greater_than[0]|xss_clean', 'tOOL TIP', 'Please Enter account number'),
             array('Amount', 'INPUT', array('name' => 'amount', 'size' => '20', 'class' => "text field medium"), 'trim|required|is_numeric|greater_than[0]|xss_clean', 'tOOL TIP', 'Please Enter account number'),
         );
@@ -42,8 +42,8 @@ 
     } 
     function build_grid_buttons_refill_coupon() {
         $buttons_json = json_encode(array(
-	    array(gettext("Create"),"btn btn-line-warning btn","fa fa-plus-circle fa-lg", "button_action", "/refill_coupon/refill_coupon_add/","popup"),
-	    array(gettext("Export"),"btn btn-xing" ," fa fa-download fa-lg", "button_action", "/refill_coupon/refill_coupon_export/", 'single'),
+	    array(gettext("Create"), "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/refill_coupon/refill_coupon_add/", "popup"),
+	    array(gettext("Export"), "btn btn-xing", " fa fa-download fa-lg", "button_action", "/refill_coupon/refill_coupon_export/", 'single'),
            ));
         return $buttons_json;
     }
@@ -53,14 +53,14 @@ 
         return $buttons_json;
     }
     function get_refill_coupon_search_form() {
-       $accountinfo=$this->CI->session->userdata('accountinfo');
-       $reseller_id=$accountinfo['type']== 1 ?$accountinfo['id'] :  0 ;
+       $accountinfo = $this->CI->session->userdata('accountinfo');
+       $reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
         $form['forms'] = array("", array('id' => "refill_coupon_list_search"));
         $form['Search'] = array(
             array('Coupon Number', 'INPUT', array('name' => 'number[number]', '', 'id' => 'number', 'size' => '15', 'class' => "text field "), '', 'tOOL TIP', '1', 'number[number-string]', '', '', '', 'search_string_type', ''),
-            array('Description', 'INPUT', array('name' => 'description[description]', '', 'id' => 'description', 'size' => '15','class' => "text field "), '', 'tOOL TIP', '1', 'description[description-string]', '', '', '', 'search_string_type', ''),
-           array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => $reseller_id,"type"=>"GLOBAL")),
-            array('Amount', 'INPUT', array('name' => 'amount[amount]', '', 'id' => 'amount', 'size' => '15',  'class' => "text field "), '', 'tOOL TIP', '1', 'amount[amount-integer]', '', '', '', 'search_int_type', ''),
+            array('Description', 'INPUT', array('name' => 'description[description]', '', 'id' => 'description', 'size' => '15', 'class' => "text field "), '', 'tOOL TIP', '1', 'description[description-string]', '', '', '', 'search_string_type', ''),
+           array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => $reseller_id, "type"=>"GLOBAL")),
+            array('Amount', 'INPUT', array('name' => 'amount[amount]', '', 'id' => 'amount', 'size' => '15', 'class' => "text field "), '', 'tOOL TIP', '1', 'amount[amount-integer]', '', '', '', 'search_int_type', ''),
             array('Used?', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_refill_coupon_status', '', ''),
              
             array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),
@@ -77,7 +77,7 @@ 
         $form['Search Refill Coupon'] = array(
             array('Coupon Number', 'INPUT', array('name' => 'number[number]', '', 'id' => 'number', 'size' => '15', 'class' => "text field "), '', 'tOOL TIP', '1', 'number[number-string]', '', '', '', 'search_string_type', ''),
             array('Description', 'INPUT', array('name' => 'description[description]', '', 'id' => 'description', 'size' => '15', 'class' => "text field "), '', 'tOOL TIP', '1', 'description[description-string]', '', '', '', 'search_string_type', ''),
-            array('Amount', 'INPUT', array('name' => 'amount[amount]', '', 'id' => 'amount', 'size' => '15',  'class' => "text field "), '', 'tOOL TIP', '1', 'amount[amount-integer]', '', '', '', 'search_int_type', ''),
+            array('Amount', 'INPUT', array('name' => 'amount[amount]', '', 'id' => 'amount', 'size' => '15', 'class' => "text field "), '', 'tOOL TIP', '1', 'amount[amount-integer]', '', '', '', 'search_int_type', ''),
             array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_refill_coupon_status', '', ''),
             array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),
             array('', 'HIDDEN', 'advance_search', '1', '', '', ''),
@@ -89,17 +89,17 @@ 
     function build_refill_coupon_grid() {
 		
 		$account_info = $accountinfo = $this->CI->session->userdata('accountinfo');
-		$currency_id=$account_info['currency_id'];
-		$currency=$this->CI->common->get_field_name('currency', 'currency', $currency_id);
+		$currency_id = $account_info['currency_id'];
+		$currency = $this->CI->common->get_field_name('currency', 'currency', $currency_id);
 		
         $grid_field_arr = json_encode(array(
-            array(gettext("Coupon Number"), "150", "number", "", "", "","","true","center"),
-            array(gettext("Description"), "165", "description", "", "", "","","true","center"),
-            array(gettext("Account"), "165", "account_id", "first_name,last_name,number", "accounts", "build_concat_string","","true","center"),
-            array("Amount($currency)", "150", "amount", "amount", "amount", "convert_to_currency","","true","right"),
-            array(gettext("Created Date"), "200", "creation_date", "", "", "","","true","center"),
-            array(gettext("Used?"),"135","status",'status','status','get_refill_coupon_used',"","true","center"),
-            array(gettext("Used Date"), "180", "firstused", "firstused", "firstused", "firstused_check","","true","center"),
+            array(gettext("Coupon Number"), "150", "number", "", "", "", "", "true", "center"),
+            array(gettext("Description"), "165", "description", "", "", "", "", "true", "center"),
+            array(gettext("Account"), "165", "account_id", "first_name,last_name,number", "accounts", "build_concat_string", "", "true", "center"),
+            array("Amount($currency)", "150", "amount", "amount", "amount", "convert_to_currency", "", "true", "right"),
+            array(gettext("Created Date"), "200", "creation_date", "", "", "", "", "true", "center"),
+            array(gettext("Used?"), "135", "status", 'status', 'status', 'get_refill_coupon_used', "", "true", "center"),
+            array(gettext("Used Date"), "180", "firstused", "firstused", "firstused", "firstused_check", "", "true", "center"),
             array("Action", "120", "", "", "", array(
                     "DELETE" => array("url" => "refill_coupon/refill_coupon_list_delete/", "mode" => "single")
             ))
@@ -108,14 +108,14 @@ 
     }
     function build_user_refill_coupon_grid() {
 		$account_info = $accountinfo = $this->CI->session->userdata('accountinfo');
-         $currency_id=$account_info['currency_id'];
-         $currency=$this->CI->common->get_field_name('currency', 'currency', $currency_id);
+         $currency_id = $account_info['currency_id'];
+         $currency = $this->CI->common->get_field_name('currency', 'currency', $currency_id);
 		 $grid_field_arr = json_encode(array(
-            array("Coupon Number", "230", "number", "", "", "","","true","center"),
-            array("Description", "210", "description", "", "", "","","true","center"),
-            array("Amount($currency)", "190", "amount", "amount", "amount", "convert_to_currency","","true","right"),
-            array("Created Date", "250", "creation_date", "", "", "","","true","center"),
-            array("Used Date", "250", "firstused", "firstused", "firstused", "firstused_check","","true","center"),
+            array("Coupon Number", "230", "number", "", "", "", "", "true", "center"),
+            array("Description", "210", "description", "", "", "", "", "true", "center"),
+            array("Amount($currency)", "190", "amount", "amount", "amount", "convert_to_currency", "", "true", "right"),
+            array("Created Date", "250", "creation_date", "", "", "", "", "true", "center"),
+            array("Used Date", "250", "firstused", "firstused", "firstused", "firstused_check", "", "true", "center"),
                 ));
         return $grid_field_arr;
     }

web_interface/astpp/application/modules/refill_coupon/views/view_refill_coupon_details.php

Spacing +7 added lines, -7 removed lines

@@ -20,7 +20,7 @@ 
   }
   </style> 
 <div class="portlet ui-widget ui-widget-content ui-helper-clearfix ui-corner-all">
-  <div class="portlet-header ui-widget-header"><?= $page_title;?><span class="ui-icon ui-icon-circle-arrow-s"></span></div>
+  <div class="portlet-header ui-widget-header"><?= $page_title; ?><span class="ui-icon ui-icon-circle-arrow-s"></span></div>
   <div class="portlet-content">
       <table class="details_table" style="width:700px;">        
         <tr>      
@@ -34,11 +34,11 @@ 
            <th>Expiry Date</th><td><?=$refill_coupon_details['expiry_date']?></td>      
            <th>Callingcard</th><td><?=$refill_coupon_details['callingcard']?></td>      
         </tr>      
-            <th>Status</th><td><?php if($refill_coupon_details['status'] == 0){ echo "Inactive";} elseif($refill_coupon_details['status'] == 1){ echo "Active"; } elseif($refill_coupon_details['status'] == 2){ echo "Inuse"; }else{ echo "Expired";}?></td>      
+            <th>Status</th><td><?php if ($refill_coupon_details['status'] == 0) { echo "Inactive"; } elseif ($refill_coupon_details['status'] == 1) { echo "Active"; } elseif ($refill_coupon_details['status'] == 2) { echo "Inuse"; } else { echo "Expired"; }?></td>      
         </tr>     
         </table>
         
-        <?php if(isset($cdrs) && is_array($cdrs)){?>
+        <?php if (isset($cdrs) && is_array($cdrs)) {?>
         <table class="details_table" style="width:700px;">        
         <tr>      
           <th>Destination</th>
@@ -48,10 +48,10 @@ 
           <th>Length in Seconds</th>
           <th>Cost(CAD)</th>
         </tr>
-        <?php foreach($cdrs as $cdr){
-	    $debit= '';
-	    $debit =($cdr['debit']/10000);
-	    $debit=$debit+0;
+        <?php foreach ($cdrs as $cdr) {
+	    $debit = '';
+	    $debit = ($cdr['debit'] / 10000);
+	    $debit = $debit + 0;
         ?>
         <tr>
           <td><?=$cdr['destination']?></td>

web_interface/astpp/application/modules/refill_coupon/models/refill_coupon_model.php

Spacing +41 added lines, -41 removed lines

@@ -27,81 +27,81 @@
     function refill_coupon_model() {
         parent::__construct();
     }
-    function get_refill_coupon_list($flag,$start = 0, $limit = 0,$export=false){
+    function get_refill_coupon_list($flag, $start = 0, $limit = 0, $export = false) {
         $this->db_model->build_search('refill_coupon_list_search');
-        $accountinfo=$this->session->userdata('accountinfo');
-        $reseller_id=$accountinfo['type']==1 ? $accountinfo['id'] : 0;
-        $where=array('reseller_id'=>$reseller_id);
+        $accountinfo = $this->session->userdata('accountinfo');
+        $reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
+        $where = array('reseller_id'=>$reseller_id);
         if ($flag) {
-	    if($export)
-	      $query = $this->db_model->select("*", "refill_coupon",$where, "id", "ASC",'','');
+	    if ($export)
+	      $query = $this->db_model->select("*", "refill_coupon", $where, "id", "ASC", '', '');
 	    else
-	    $query = $this->db_model->select("*", "refill_coupon",$where, "id", "ASC", $limit, $start);
+	    $query = $this->db_model->select("*", "refill_coupon", $where, "id", "ASC", $limit, $start);
         } else {
-            $query = $this->db_model->countQuery("*", "refill_coupon",$where);
+            $query = $this->db_model->countQuery("*", "refill_coupon", $where);
         }
         return $query;
     }
-    function get_customer_refill_coupon_list($flag,$start = 0, $limit = 0,$accountid){
+    function get_customer_refill_coupon_list($flag, $start = 0, $limit = 0, $accountid) {
         $this->db_model->build_search('refill_coupon_list_search');
-        $accountinfo=$this->session->userdata('accountinfo');
-        $reseller_id=$accountinfo['type']==1 ? $accountinfo['id'] : ($accountinfo['type']== 0 ? $accountinfo['reseller_id']: 0 );
-        $where=array('reseller_id'=>$reseller_id,"account_id"=>$accountid);
+        $accountinfo = $this->session->userdata('accountinfo');
+        $reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : ($accountinfo['type'] == 0 ? $accountinfo['reseller_id'] : 0);
+        $where = array('reseller_id'=>$reseller_id, "account_id"=>$accountid);
         if ($flag) {
-	    $query = $this->db_model->select("*", "refill_coupon",$where, "id", "ASC", $limit, $start);
+	    $query = $this->db_model->select("*", "refill_coupon", $where, "id", "ASC", $limit, $start);
         } else {
-            $query = $this->db_model->countQuery("*", "refill_coupon",$where);
+            $query = $this->db_model->countQuery("*", "refill_coupon", $where);
         }
         return $query;
     }
-    function add_refill_coupon($add_array){
+    function add_refill_coupon($add_array) {
       $count = $add_array['count'];
         unset($add_array['action']);
         unset($add_array['count']);
-        $prefix=$add_array['prefix'];
+        $prefix = $add_array['prefix'];
         unset($add_array['prefix']);
-    	$accountinfo=$this->session->userdata('accountinfo');
-    	$reseller_id=$accountinfo['type']==1 ? $accountinfo['id']:0;
-    	$insert_arr=array();
-    	$account_length=Common_model::$global_config['system_config']['refill_coupon_length'];
-    	$length=strlen($prefix);
-        if($length !=0){
-	  $number_length=$account_length-$length;
+    	$accountinfo = $this->session->userdata('accountinfo');
+    	$reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
+    	$insert_arr = array();
+    	$account_length = Common_model::$global_config['system_config']['refill_coupon_length'];
+    	$length = strlen($prefix);
+        if ($length != 0) {
+	  $number_length = $account_length - $length;
 	}
-	else{
-	  $number_length=$account_length;
+	else {
+	  $number_length = $account_length;
 	}
 	$add_array['amount'] = $this->common_model->add_calculate_currency($add_array['amount'], '', '', false, false);
-	$number=$this->common->find_uniq_rendno_accno($number_length, 'number', 'refill_coupon',$prefix,$count);
-	$date=gmdate('Y-m-d H:i:s');
+	$number = $this->common->find_uniq_rendno_accno($number_length, 'number', 'refill_coupon', $prefix, $count);
+	$date = gmdate('Y-m-d H:i:s');
         for ($i = 0; $i < $count; $i++) {
             $add_array['number'] = trim($number[$i]);
-	    $add_array['currency_id']=$accountinfo['currency_id'];
-	    $add_array['reseller_id']=$reseller_id;
-	    $add_array['creation_date']=$date;
-	    $insert_arr[$i]=$add_array;
+	    $add_array['currency_id'] = $accountinfo['currency_id'];
+	    $add_array['reseller_id'] = $reseller_id;
+	    $add_array['creation_date'] = $date;
+	    $insert_arr[$i] = $add_array;
         }
-        $this->db->insert_batch("refill_coupon",$insert_arr);
+        $this->db->insert_batch("refill_coupon", $insert_arr);
         return true;
     }
-    function remove_refill_coupon($id){
+    function remove_refill_coupon($id) {
 		$this->db->where("id", $id);
         $this->db->delete("refill_coupon");
         return true;
     }
-    function get_refill_coupon_details($id){
+    function get_refill_coupon_details($id) {
        $this->db->where("id", $id);
-       $result=$this->db->get('refill_coupon');
+       $result = $this->db->get('refill_coupon');
        return $result;
     }
-    function refill_coupon_count($add_array){
-        $account_length=Common_model::$global_config['system_config']['refill_coupon_length'];
-        $this->db->where("length(number)",$account_length);
-        $this->db->like('number',$add_array['prefix'],'after');
+    function refill_coupon_count($add_array) {
+        $account_length = Common_model::$global_config['system_config']['refill_coupon_length'];
+        $this->db->where("length(number)", $account_length);
+        $this->db->like('number', $add_array['prefix'], 'after');
         $this->db->select("count(id) as count");
         $this->db->from('refill_coupon');
-        $result=$this->db->get();
-        $result=$result->result_array();
+        $result = $this->db->get();
+        $result = $result->result_array();
 	return $result;
     }
 }

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

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

Spacing +119 added lines, -119 removed lines

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

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

 

-if (!defined('BASEPATH'))

+if ( ! defined('BASEPATH'))

     exit('No direct script access allowed');

 

 class Freeswitch_form {

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

     }

 

-    function get_freeswith_form_fields($id=false) {

+    function get_freeswith_form_fields($id = false) {

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

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

-	      $sip_pro=null;

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

+	      $sip_pro = null;

 	}

-	else{

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

+	else {

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

 

 	}  

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

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

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

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

         /*Edit functionality*/

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

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

         $form['Device Information'] = array(

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

-             array('Username', 'INPUT', array('name' => 'fs_username', 'size' => '20', 'value'=>$uname_user,'id'=>'username1', 'class' => "text field medium"), 'trim|required|is_unique['.$val.']|xss_clean', 'tOOL TIP', 'Please Enter account number','<i style="cursor:pointer; color:#1BCB61 !important; font-size:14px;    padding-left:5px;    padding-top:8px;    float:left;" title="Reset Password" class="change_number  fa fa-refresh"></i>'),

-            array('Password', 'INPUT', array('name' => 'fs_password', 'size' => '20', 'value'=>$password ,'id'=>'password1','class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter Password','<i style="cursor:pointer; color:#1BCB61 !important; font-size:14px;    padding-left:5px;    padding-top:8px;    float:left;" title="Reset Password" class="change_pass fa fa-refresh"></i>'), 

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

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

+             array('Username', 'INPUT', array('name' => 'fs_username', 'size' => '20', 'value'=>$uname_user, 'id'=>'username1', 'class' => "text field medium"), 'trim|required|is_unique['.$val.']|xss_clean', 'tOOL TIP', 'Please Enter account number', '<i style="cursor:pointer; color:#1BCB61 !important; font-size:14px;    padding-left:5px;    padding-top:8px;    float:left;" title="Reset Password" class="change_number  fa fa-refresh"></i>'),

+            array('Password', 'INPUT', array('name' => 'fs_password', 'size' => '20', 'value'=>$password, 'id'=>'password1', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter Password', '<i style="cursor:pointer; color:#1BCB61 !important; font-size:14px;    padding-left:5px;    padding-top:8px;    float:left;" title="Reset Password" class="change_pass fa fa-refresh"></i>'), 

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

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

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

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

 	   $sip_pro,

@@ -64,7 +64,7 @@ 
             array('Enable', 'voicemail_enabled', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_sip_config_option'),

             

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

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

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

             

             array('Attach File', 'voicemail_attach_file', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'custom_status_voicemail'),

             

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

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

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

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

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

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

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

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

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

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

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

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

         return $form;

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

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

         $form['Search'] = array(

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

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

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

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

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

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

         return $form;

     }

-    function get_sipprofile_search_form(){

+    function get_sipprofile_search_form() {

     

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

         $form['Search'] = array(

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

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

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

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

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

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

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

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

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

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

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

         return $form;

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

     function build_system_list_for_admin() {

         $grid_field_arr = json_encode(array(

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

                 ));

         return $grid_field_arr;

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

 

     function build_grid_buttons() {

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

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

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

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

                         ));

         return $buttons_json;

     }

     

     function fsdevices_build_grid_buttons($accountid) {

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

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

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

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

             ));

         return $buttons_json;

     }

 

     function get_gateway_form_fields() {

 

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

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

         $form['Basic Information'] = array(

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

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

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

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

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

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

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

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

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

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

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

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

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

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

             

         );

         $form['Optional Information'] = array(

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

                /**

                ASTPP  3.0 

                               put one variable with the name of dialplan variable 

               **/ 

-              array('Dialplan Variable', 'TEXTAREA', array('name' => 'dialplan_variable', 'size' => '20','cols'=>'10','rows'=>'5', 'class' => "col_md-5 form-control", 'style'=>"width: 200px; height: 100px;font-family: Open sans,sans-serif !important;"), '', 'tOOL TIP', ''),

+              array('Dialplan Variable', 'TEXTAREA', array('name' => 'dialplan_variable', 'size' => '20', 'cols'=>'10', 'rows'=>'5', 'class' => "col_md-5 form-control", 'style'=>"width: 200px; height: 100px;font-family: Open sans,sans-serif !important;"), '', 'tOOL TIP', ''),

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

         );

 

@@ -250,26 +250,26 @@ 
     function build_fsgateway_list_for_admin() {

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

         $grid_field_arr = json_encode(array(

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

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

 /**

 ASTPP  3.0 

 For Gateway Edit on Gateway name

 **/

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

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

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

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

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

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

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

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

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

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

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

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

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

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

              /*

             ASTPP  3.0 

              creation field show in grid

             */

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

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

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

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

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

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

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

            /*

             ASTPP  3.0 

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

            

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

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

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

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

                 ));

         return $grid_field_arr;

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

 

     function build_fdgateway_grid_buttons() {

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

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

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

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

             ));

         return $buttons_json;

     }

 

     function get_sipprofile_form_fields() {

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

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

         $form['Basic Information'] = array(

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

         );

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

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

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

 

         return $form;

     }

@@ -341,22 +341,22 @@ 
     function build_fssipprofile_list_for_admin() {

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

         $grid_field_arr = json_encode(array(

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

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

 /**

 ASTPP  3.0

 For Sip Profile edit on Profile name

 **/

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

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

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

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

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

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

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

            /*

             ASTPP  3.0 

             status show active or inactive

             */

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

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

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

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

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

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

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

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

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

 

     function build_fssipprofile_grid_buttons() {

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

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

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

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

            ));

         return $buttons_json;

     }

@@ -392,15 +392,15 @@ 
     function build_fsserver_list() {

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

         $grid_field_arr = json_encode(array(

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

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

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

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

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

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

             /*

             ASTPP  3.0 .3 creation field show in grid

             */

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

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

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

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

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

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

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

            

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

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

 

     function build_fsserver_grid_buttons() {

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

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

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

             ));

         return $buttons_json;

     }

 

     function get_form_fsserver_fields() {

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

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

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

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

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

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

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

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

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

         );

 

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

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

     function build_devices_list_for_customer() {

         $grid_field_arr = json_encode(array(

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

                 ));

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

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

 

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

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

     

 	// $val = $id > 0 ? 'sip_devices.username.' . $id : 'sip_devices.username';

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

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

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

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

-        if ($this->CI->session->userdata("logintype") == '0'  || $this->CI->session->userdata("logintype") == '3') {

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

+        if ($this->CI->session->userdata("logintype") == '0' || $this->CI->session->userdata("logintype") == '3') {

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

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

             $form['Device Information'] = array(

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

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

-                array('Username', 'INPUT', array('name' => 'fs_username', 'size' => '20', 'value'=>$uname_user,'id'=>'username', 'class' => "text field medium"), 'trim|required|is_unique['.$val.']|xss_clean', 'tOOL TIP', 'Please Enter account number','<i style="cursor:pointer;color:#1BCB61 !important;font-size:14px; padding-left:5px; padding-top:8px; float:left; " title="Reset Password" class="change_number fa fa-refresh"></i>'),

-                array('Password', 'INPUT', array('name' => 'fs_password', 'size' => '20','id'=>'password1','value'=>$password, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter Password','<i style="cursor:pointer;color:#1BCB61 !important;  font-size:14px;    padding-left:5px;    padding-top:8px;    float:left;" title="Reset Password" class="change_pass fa fa-refresh"></i>'),

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

+                array('Username', 'INPUT', array('name' => 'fs_username', 'size' => '20', 'value'=>$uname_user, 'id'=>'username', 'class' => "text field medium"), 'trim|required|is_unique['.$val.']|xss_clean', 'tOOL TIP', 'Please Enter account number', '<i style="cursor:pointer;color:#1BCB61 !important;font-size:14px; padding-left:5px; padding-top:8px; float:left; " title="Reset Password" class="change_number fa fa-refresh"></i>'),

+                array('Password', 'INPUT', array('name' => 'fs_password', 'size' => '20', 'id'=>'password1', 'value'=>$password, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter Password', '<i style="cursor:pointer;color:#1BCB61 !important;  font-size:14px;    padding-left:5px;    padding-top:8px;    float:left;" title="Reset Password" class="change_pass fa fa-refresh"></i>'),

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

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

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

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

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

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

         } else {

-             if($accountid){

-	            $account_Arr=null;

-	     }else{

-	            $account_Arr=array('Account', 'accountcode', 'SELECT', '','trim|dropdown|xss_clean', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0","type"=>"0", "deleted" => "0"));

+             if ($accountid) {

+	            $account_Arr = null;

+	     } else {

+	            $account_Arr = array('Account', 'accountcode', 'SELECT', '', 'trim|dropdown|xss_clean', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0", "type"=>"0", "deleted" => "0"));

 	     }       

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

-		$sip_pro =null;

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

-            }else{

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

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

+		$sip_pro = null;

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

+            } else {

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

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

             }

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

             /*Add sipdevice*/

             $form['Device Information'] = array(

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

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

-                 array('Username', 'INPUT', array('name' => 'fs_username', 'size' => '20', 'value'=>$uname_user,'id'=>'username1', 'class' => "text field medium"), 'trim|required|is_unique['.$val.']|xss_clean', 'tOOL TIP', 'Please Enter account number','<i style="cursor:pointer; color:#1BCB61; font-size:14px; padding-left:5px;  padding-top:8px; float:left;" title="Reset Password" class="change_number fa fa-refresh"></i>'),

-             array('Password', 'INPUT', array('name' => 'fs_password', 'size' => '20', 'id'=>'password1','value'=>$password, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter Password','<i style="cursor:pointer; color:#1BCB61; font-size:14px; padding-left:5px;padding-top:8px; float:left;" title="Reset Password" class="change_pass fa fa-refresh"></i>'),

+                 array('Username', 'INPUT', array('name' => 'fs_username', 'size' => '20', 'value'=>$uname_user, 'id'=>'username1', 'class' => "text field medium"), 'trim|required|is_unique['.$val.']|xss_clean', 'tOOL TIP', 'Please Enter account number', '<i style="cursor:pointer; color:#1BCB61; font-size:14px; padding-left:5px;  padding-top:8px; float:left;" title="Reset Password" class="change_number fa fa-refresh"></i>'),

+             array('Password', 'INPUT', array('name' => 'fs_password', 'size' => '20', 'id'=>'password1', 'value'=>$password, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter Password', '<i style="cursor:pointer; color:#1BCB61; font-size:14px; padding-left:5px;padding-top:8px; float:left;" title="Reset Password" class="change_pass fa fa-refresh"></i>'),

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

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

 		$account_Arr,

@@ -542,7 +542,7 @@ 
 	 $form['Voicemail Options'] = array(

             array('Enable', 'voicemail_enabled', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'set_sip_config_option'),

 			array('Password', 'INPUT', array('name' => 'voicemail_password', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', 'PleaseEnter account number'),

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

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

 			array('Attach File', 'voicemail_attach_file', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'custom_status_voicemail'),

 			//array('Local After Email', 'vm_keep_local_after_email', 'CHECKBOX', array('name' => 'vm_keep_local_after_email', 'value' => 'on', 'checked' => false), '', 'tOOL TIP', 'Please Select Status', 'custom_status_true', '', '', ''),

 			array('Local After Email', 'vm_keep_local_after_email', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', '', '', '', 'custom_status_voicemail'),

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

Spacing +9 added lines, -9 removed lines

@@ -101,23 +101,23 @@ 
 		      </div>

 		     <form method="post" action="<?= base_url() ?>freeswitch/fssipprofile_add/edit/" enctype="multipart/form-data" name='form1' id ="myForm1">

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

-			<div class='col-md-12'><div style="width:550px;" ><label style="text-align:right;" class="col-md-3">Name *</label><input class="col-md-5 form-control" value="<?=$sip_name;?>" id="sip_name" name="name" size="20" type="text"></div>

+			<div class='col-md-12'><div style="width:550px;" ><label style="text-align:right;" class="col-md-3">Name *</label><input class="col-md-5 form-control" value="<?=$sip_name; ?>" id="sip_name" name="name" size="20" type="text"></div>

 			<span style="color:red;margin-left: 10px;float:left;" id="error_msg_sip"></span>

 			</div>

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

-			<div style="width:550px;" ><label style="text-align:right;" class="col-md-3">SIP IP  *</label><input class="col-md-5 form-control " value="<?=@$sip_ip;?>" name="sip_ip" size="20" id="sip_ip" type="text"></div>

+			<div style="width:550px;" ><label style="text-align:right;" class="col-md-3">SIP IP  *</label><input class="col-md-5 form-control " value="<?=@$sip_ip; ?>" name="sip_ip" size="20" id="sip_ip" type="text"></div>

 			<span style="color:red;margin-left: 10px;float:left;" id="error_msg_ip"></span>

 			</div>

 			<div>

-			<div style="width:550px;"><label style="text-align:right;"  class="col-md-3">SIP Port *</label><input class="col-md-5 form-control" value="<?=@$sip_port;?>" name="sip_port" size="20" id="sip_port" type="text"></div>

+			<div style="width:550px;"><label style="text-align:right;"  class="col-md-3">SIP Port *</label><input class="col-md-5 form-control" value="<?=@$sip_port; ?>" name="sip_port" size="20" id="sip_port" type="text"></div>

 			<span style="color:red;margin-left: 10px;float:left;" id="error_msg_port"></span>

 			</div>

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

 			<div style="width:550px;"><label style="text-align:right;" class="col-md-3">Status </label>

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

 			    

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

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

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

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

 			  </select>

                        </div>

 		       </div>

@@ -183,11 +183,11 @@ 
 			          

 			</div>

 			<?

-			  if($params_name!='')

+			  if ($params_name != '')

 			  {

-			    $type="edit_setting";

-			  }else{

-			    $type="add_setting";

+			    $type = "edit_setting";

+			  } else {

+			    $type = "add_setting";

 			  }

 			?>

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

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

Spacing +4 added lines, -4 removed lines

@@ -6,7 +6,7 @@ 
 <?=$page_title?><br/>
 <? endblock() ?>
 <? startblock('content') ?>
-<?php 	$command_show = str_replace("api ","",$command); ?>
+<?php 	$command_show = str_replace("api ", "", $command); ?>
 <script>
 $(document).ready(function(){
   $("#freeswitch_command").change(function(){
@@ -39,8 +39,8 @@ 
 		<div class="col-md-2">
 		  <select class="form-control" name="host_id" id="host_id">
   		      <?php
-    			foreach($fs_data as $name) { ?>
-     			 <option value="<?= $name['id'] ?>"<?php if(isset($host_id) && ($name['id'] == $host_id))echo 'selected';?>><?= $name['freeswitch_host'] ?></option>
+    			foreach ($fs_data as $name) { ?>
+     			 <option value="<?= $name['id'] ?>"<?php if (isset($host_id) && ($name['id'] == $host_id))echo 'selected'; ?>><?= $name['freeswitch_host'] ?></option>
   			  <?php
     			  } ?>
 		   </select>
@@ -57,7 +57,7 @@ 
 		</div>
 		<span style="color:red;margin-left:655px;float:left;" id="error_field_command"></span>
 		</div>
-	     <?php if($command != ''){ ?>
+	     <?php if ($command != '') { ?>
              <div style="margin-left:00px;"><h2>Command : <font color="blue"><?php echo $command_show; ?></font></h2></div>
 	
 	     <div class="col-md-12">