iNextrix / ASTPP

web_interface/astpp/application/modules/user/views/view_ip_map.php

Indentation +2 added lines, -2 removed lines

@@ -50,8 +50,8 @@
                 <span class="ui-icon ui-icon-circle-arrow-s"></span></div>
             <div style="color:red;margin-left: 60px;">
                 <?php if (isset($validation_errors)) {
-                    echo $validation_errors;
-                } ?> 
+					echo $validation_errors;
+				} ?> 
             </div>
 
         </div>

web_interface/astpp/application/modules/user/views/view_user_ipmap_list.php

Indentation +2 added lines, -2 removed lines

@@ -22,12 +22,12 @@
                 <div class="pull-left">
                     <ul class="breadcrumb">
                          <?php $accountinfo=$this->session->userdata('accountinfo');
-                          if($accountinfo['type']==1){ ?>
+						  if($accountinfo['type']==1){ ?>
                           <li><a href="<?= base_url() . "user/user_myprofile/"; ?>">My Profile</a></li>
                           <?php }else{ ?>
 			    <li><a href="#">Configuration</a></li>
                           <?php }
-                    ?>
+					?>
                         
                         <li class='active'>
                             <a href="<?= base_url() . "user/user_ipmap/"; ?>">IP Settings</a>

Spacing +8 added lines, -8 removed lines

@@ -21,24 +21,24 @@ 
             <div class="col-md-12 no-padding color-three border_box"> 
                 <div class="pull-left">
                     <ul class="breadcrumb">
-                         <?php $accountinfo=$this->session->userdata('accountinfo');
-                          if($accountinfo['type']==1){ ?>
-                          <li><a href="<?= base_url() . "user/user_myprofile/"; ?>">My Profile</a></li>
-                          <?php }else{ ?>
+                         <?php $accountinfo = $this->session->userdata('accountinfo');
+                          if ($accountinfo['type'] == 1) { ?>
+                          <li><a href="<?= base_url()."user/user_myprofile/"; ?>">My Profile</a></li>
+                          <?php } else { ?>
 			    <li><a href="#">Configuration</a></li>
                           <?php }
                     ?>
                         
                         <li class='active'>
-                            <a href="<?= base_url() . "user/user_ipmap/"; ?>">IP Settings</a>
+                            <a href="<?= base_url()."user/user_ipmap/"; ?>">IP Settings</a>
                         </li>
                     </ul>
                 </div>
-                <?php if($accountinfo['type']==1) { ?>
+                <?php if ($accountinfo['type'] == 1) { ?>
                    <div class="pull-right">
                     <ul class="breadcrumb">
 		      <li class="active pull-right">
-		      <a href="<?= base_url() . "user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
+		      <a href="<?= base_url()."user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
                     </ul>
                    </div>
                 <?php }?>
@@ -54,7 +54,7 @@ 
                     <div class="margin-b-10 slice color-three pull-left content_border col-md-12" id="left_panel_form" style="cursor: pointer; display: none;">
                     <fieldset class="margin-b-20">
                         <legend>IP Settings</legend>
-                        <form method="post" name="ip_map" id="ip_map" action="<?= base_url() . "user/user_ipmap_action/add/" ?>">
+                        <form method="post" name="ip_map" id="ip_map" action="<?= base_url()."user/user_ipmap_action/add/" ?>">
                             <div class='col-md-4'> 
                                 <label class="col-md-1 no-padding">Name</label>
                                 <input class="col-md-2 form-control" name="name" size="16" type="text"/>

Braces +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
                          <?php $accountinfo=$this->session->userdata('accountinfo');
                           if($accountinfo['type']==1){ ?>
                           <li><a href="<?= base_url() . "user/user_myprofile/"; ?>">My Profile</a></li>
-                          <?php }else{ ?>
+                          <?php } else{ ?>
 			    <li><a href="#">Configuration</a></li>
                           <?php }
                     ?>

web_interface/astpp/application/modules/user/views/view_user_cdrs.php

Spacing +3 added lines, -3 removed lines

@@ -21,16 +21,16 @@
             <div class="col-md-12 no-padding color-three border_box"> 
                 <div class="pull-left">
                     <ul class="breadcrumb">
-                        <li><a href="<?= base_url() . "user/user_myprofile/"; ?>">My Profile</a></li>
+                        <li><a href="<?= base_url()."user/user_myprofile/"; ?>">My Profile</a></li>
                         <li>
-                            <a href="<?= base_url() . "user/user_cdrs/"; ?>">CDRs</a>
+                            <a href="<?= base_url()."user/user_cdrs/"; ?>">CDRs</a>
                         </li>
                     </ul>
                 </div>
                 <div class="pull-right">
                     <ul class="breadcrumb">
 		      <li class="active pull-right">
-		      <a href="<?= base_url() . "user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
+		      <a href="<?= base_url()."user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
                     </ul>
                 </div>
             </div>

web_interface/astpp/application/modules/user/models/user_model.php

Indentation +335 added lines, -335 removed lines

@@ -24,169 +24,169 @@ 
 
 class user_model extends CI_Model {
 
-    function user_model() {
-        parent::__construct();
-        if(Common_model::$global_config['system_config']['opensips']==0){
+	function user_model() {
+		parent::__construct();
+		if(Common_model::$global_config['system_config']['opensips']==0){
 			$db_config = Common_model::$global_config['system_config'];
 			$opensipdsn = "mysql://" . $db_config['opensips_dbuser'] . ":" . $db_config['opensips_dbpass'] . "@" . $db_config['opensips_dbhost'] . "/" . $db_config['opensips_dbname'] . "?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
 			$this->opensips_db = $this->load->database($opensipdsn, true);
-	    }
-    }
+		}
+	}
 
-    function validate_password($pass, $id) {
-        $this->db->select('password');
-        $this->db->where('number', $id);
-        $query = $this->db->get('accounts');
-        $count = $query->num_rows();
-        return $count;
-    }
+	function validate_password($pass, $id) {
+		$this->db->select('password');
+		$this->db->where('number', $id);
+		$query = $this->db->get('accounts');
+		$count = $query->num_rows();
+		return $count;
+	}
 
-    function update_password($newpass, $id) {
-        $this->db->update('password', $newpass);
-        $this->db->where('number', $id);
-        $result = $this->db->get('accounts');
-        return $result->result();
-    }
+	function update_password($newpass, $id) {
+		$this->db->update('password', $newpass);
+		$this->db->where('number', $id);
+		$result = $this->db->get('accounts');
+		return $result->result();
+	}
 
-    function change_password($id) {
-        $this->db->select('password');
-        $this->db->where('id', $id);
-        $query = $this->db->get('accounts');
-        $result = $query->result();
-        return $result;
-    }
+	function change_password($id) {
+		$this->db->select('password');
+		$this->db->where('id', $id);
+		$query = $this->db->get('accounts');
+		$result = $query->result();
+		return $result;
+	}
 
-    function change_db_password($update, $id) {
-        $this->db->where('id', $id);
-        $this->db->update('accounts', array('password' => $update));
-    }
+	function change_db_password($update, $id) {
+		$this->db->where('id', $id);
+		$this->db->update('accounts', array('password' => $update));
+	}
 
-    function edit_account($accountinfo, $edit_id) {
-        unset($accountinfo['action']);
-        $this->db->where('id', $edit_id);
-        $result = $this->db->update('accounts', $accountinfo);
-        return true;
-    }
+	function edit_account($accountinfo, $edit_id) {
+		unset($accountinfo['action']);
+		$this->db->where('id', $edit_id);
+		$result = $this->db->update('accounts', $accountinfo);
+		return true;
+	}
 
-    function get_user_packages_list($flag, $start = 0, $limit = 0) {
-        $this->db_model->build_search('package_list_search');
-        $account_data = $this->session->userdata("accountinfo");
-        $where = array("pricelist_id" => $account_data['pricelist_id']);
-        if ($flag) {
-            $query = $this->db_model->getSelect("*", "packages", $where, "id", "ASC", $limit, $start);
-        } else {
-            $query = $this->db_model->countQuery("*", "packages", $where);
-        }
-        return $query;
-    }
+	function get_user_packages_list($flag, $start = 0, $limit = 0) {
+		$this->db_model->build_search('package_list_search');
+		$account_data = $this->session->userdata("accountinfo");
+		$where = array("pricelist_id" => $account_data['pricelist_id']);
+		if ($flag) {
+			$query = $this->db_model->getSelect("*", "packages", $where, "id", "ASC", $limit, $start);
+		} else {
+			$query = $this->db_model->countQuery("*", "packages", $where);
+		}
+		return $query;
+	}
 
-    function get_user_invoices_list($flag, $start = 0, $limit = 0) {
-        $this->db_model->build_search('user_invoice_list_search');
-        $accountinfo = $this->session->userdata('accountinfo');
-        $reseller_id = $accountinfo['id'];
-        $this->db->where('accountid', $reseller_id);
-        if ($flag) {
-            $this->db->select('*');
-        } else {
-            $this->db->select('count(id) as count');
-        }
-        if ($flag) {
-           if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
-            $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-           }else{
-            $this->db->order_by('invoice_date', 'desc');
-           }
-        }
-        $result = $this->db->get('invoices');
-        if ($result->num_rows() > 0) {
-            if ($flag) {
-                return $result;
-            } else {
-                $result = $result->result_array();
-                return $result[0]['count'];
-            }
-        } else {
-            if ($flag) {
-                $query = (object) array('num_rows' => 0);
-            } else {
-                $query = 0;
-            }
-            return $query;
-        }
-    }
+	function get_user_invoices_list($flag, $start = 0, $limit = 0) {
+		$this->db_model->build_search('user_invoice_list_search');
+		$accountinfo = $this->session->userdata('accountinfo');
+		$reseller_id = $accountinfo['id'];
+		$this->db->where('accountid', $reseller_id);
+		if ($flag) {
+			$this->db->select('*');
+		} else {
+			$this->db->select('count(id) as count');
+		}
+		if ($flag) {
+		   if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
+			$this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
+		   }else{
+			$this->db->order_by('invoice_date', 'desc');
+		   }
+		}
+		$result = $this->db->get('invoices');
+		if ($result->num_rows() > 0) {
+			if ($flag) {
+				return $result;
+			} else {
+				$result = $result->result_array();
+				return $result[0]['count'];
+			}
+		} else {
+			if ($flag) {
+				$query = (object) array('num_rows' => 0);
+			} else {
+				$query = 0;
+			}
+			return $query;
+		}
+	}
 
-    function get_user_charge_history($flag, $start = 0, $limit = 0) {
-        $this->db_model->build_search('user_charge_history_search');
-        $accountinfo=$this->session->userdata('accountinfo');
-        $where['accountid']=$accountinfo['id'];
-        if($this->session->userdata('advance_search') != 1){
-             $where['created_date >=']=gmdate("Y-m-1 00:00:00");
-             $where['created_date <=']=gmdate("Y-m-d 23:59:59");
-        }
+	function get_user_charge_history($flag, $start = 0, $limit = 0) {
+		$this->db_model->build_search('user_charge_history_search');
+		$accountinfo=$this->session->userdata('accountinfo');
+		$where['accountid']=$accountinfo['id'];
+		if($this->session->userdata('advance_search') != 1){
+			 $where['created_date >=']=gmdate("Y-m-1 00:00:00");
+			 $where['created_date <=']=gmdate("Y-m-d 23:59:59");
+		}
 	$where['item_type <>']='STANDARD';
-        if ($flag) {
-            $query = $this->db_model->select("*", "invoice_details", $where, "id", "DESC", $limit, $start);
-        } else {
-            $query = $this->db_model->countQuery("*", "invoice_details", $where);
-        }
-        return $query;
-    }
+		if ($flag) {
+			$query = $this->db_model->select("*", "invoice_details", $where, "id", "DESC", $limit, $start);
+		} else {
+			$query = $this->db_model->countQuery("*", "invoice_details", $where);
+		}
+		return $query;
+	}
     
-    function get_user_refill_list($flag, $start = '', $limit = '') {
-        $this->db_model->build_search('user_refill_report_search');
-        $accountinfo = $this->session->userdata['accountinfo'];
-        $where = array("accountid" => $accountinfo["id"]);
-        if ($flag) {
-            $query = $this->db_model->select("*", "payments", $where, "payment_date", "DESC", $limit, $start);
-        } else {
-            $query = $this->db_model->countQuery("*", "payments", $where);
-        }
-        return $query;
-    }
+	function get_user_refill_list($flag, $start = '', $limit = '') {
+		$this->db_model->build_search('user_refill_report_search');
+		$accountinfo = $this->session->userdata['accountinfo'];
+		$where = array("accountid" => $accountinfo["id"]);
+		if ($flag) {
+			$query = $this->db_model->select("*", "payments", $where, "payment_date", "DESC", $limit, $start);
+		} else {
+			$query = $this->db_model->countQuery("*", "payments", $where);
+		}
+		return $query;
+	}
 
-    function get_user_emails_list($flag, $start = 0, $limit = 0) {
-        $account_data = $this->session->userdata("accountinfo");
-        $this->db_model->build_search('user_emails_search');
+	function get_user_emails_list($flag, $start = 0, $limit = 0) {
+		$account_data = $this->session->userdata("accountinfo");
+		$this->db_model->build_search('user_emails_search');
         
-        $where = array('accountid' => $account_data['id']);
-        if ($flag) {
-            $query = $this->db_model->select("*", "mail_details", $where, "id", "DESC", $limit, $start);
-        } else {
-            $query = $this->db_model->countQuery("*", "mail_details", $where);
-        }
-        return $query;
-    }
+		$where = array('accountid' => $account_data['id']);
+		if ($flag) {
+			$query = $this->db_model->select("*", "mail_details", $where, "id", "DESC", $limit, $start);
+		} else {
+			$query = $this->db_model->countQuery("*", "mail_details", $where);
+		}
+		return $query;
+	}
 
-    function add_invoice_config($add_array) {
-        $result = $this->db->insert('invoice_conf', $add_array);
-        return true;
-    }
+	function add_invoice_config($add_array) {
+		$result = $this->db->insert('invoice_conf', $add_array);
+		return true;
+	}
 
-    function edit_invoice_config($add_array, $edit_id) {
-        $this->db->where('id', $edit_id);
-        $result = $this->db->update('invoice_conf', $add_array);
-        return true;
-    }
+	function edit_invoice_config($add_array, $edit_id) {
+		$this->db->where('id', $edit_id);
+		$result = $this->db->update('invoice_conf', $add_array);
+		return true;
+	}
 
-    function edit_alert_threshold($add_array, $edit_id) {
-        $this->db->where('id', $edit_id);
-        $result = $this->db->update('accounts', $add_array);
-        return true;
-    }
+	function edit_alert_threshold($add_array, $edit_id) {
+		$this->db->where('id', $edit_id);
+		$result = $this->db->update('accounts', $add_array);
+		return true;
+	}
     
-    function user_ipmap_list($flag,$limit='',$start=''){
-        $accountinfo=$this->session->userdata('accountinfo');
-        $where['accountid']=$accountinfo['id'];
-        $this->db_model->build_search('user_ipmap_search');
-        if ($flag) {
-         $query = $this->db_model->select("*", "ip_map", $where, "id", "ASC", $limit, $start);
-        } else {
-         $query = $this->db_model->countQuery("*", "ip_map", $where);
-        }
-          return $query;
-    }
-    function user_sipdevices_list($flag, $accountid = "",$start = "", $limit = "") {
-        $where = array("accountid" => $accountid);
+	function user_ipmap_list($flag,$limit='',$start=''){
+		$accountinfo=$this->session->userdata('accountinfo');
+		$where['accountid']=$accountinfo['id'];
+		$this->db_model->build_search('user_ipmap_search');
+		if ($flag) {
+		 $query = $this->db_model->select("*", "ip_map", $where, "id", "ASC", $limit, $start);
+		} else {
+		 $query = $this->db_model->countQuery("*", "ip_map", $where);
+		}
+		  return $query;
+	}
+	function user_sipdevices_list($flag, $accountid = "",$start = "", $limit = "") {
+		$where = array("accountid" => $accountid);
 		$this->db_model->build_search('user_sipdevices_search');
 		$query = array();
 		if ($flag) {
@@ -218,30 +218,30 @@ 
 		$query = $this->db_model->countQuery("*", "sip_devices", $where);
 	}
 	return $query;
-    }
+	}
     
-    function user_sipdevice_info($edit_id){
-        $sipdevice_info = $this->db_model->getSelect("*", "sip_devices", array('id' => $edit_id));
-        $sipdevice_arr = (array)$sipdevice_info->first_row();
-        $vars = (array)json_decode($sipdevice_arr['dir_vars']);
-        $params = (array)json_decode($sipdevice_arr['dir_params'],true);
-        $query = array('id' => $sipdevice_arr['id'],
-                        'fs_username' => $sipdevice_arr['username'],
-                        'accountcode' => $sipdevice_arr['accountid'],
-                        'status' => $sipdevice_arr['status'],
-                        'effective_caller_id_name' => $vars['effective_caller_id_name'],
-                        'effective_caller_id_number' => $vars['effective_caller_id_number'],
-                        'voicemail_enabled' => $params['vm-enabled'],
-                        'voicemail_password' => $params['vm-password'],
-                        'voicemail_mail_to' => $params['vm-mailto'],
-                        'voicemail_attach_file' => $params['vm-attach-file'],
-                        'vm_keep_local_after_email' => $params['vm-keep-local-after-email'],
-                        'vm_send_all_message' => $params['vm-email-all-messages'],
-                        'fs_password' => $params['password']);
-        return $query;
-    }
-    function user_sipdevice_add($add_array){
-        $account_data = $this->session->userdata("accountinfo");
+	function user_sipdevice_info($edit_id){
+		$sipdevice_info = $this->db_model->getSelect("*", "sip_devices", array('id' => $edit_id));
+		$sipdevice_arr = (array)$sipdevice_info->first_row();
+		$vars = (array)json_decode($sipdevice_arr['dir_vars']);
+		$params = (array)json_decode($sipdevice_arr['dir_params'],true);
+		$query = array('id' => $sipdevice_arr['id'],
+						'fs_username' => $sipdevice_arr['username'],
+						'accountcode' => $sipdevice_arr['accountid'],
+						'status' => $sipdevice_arr['status'],
+						'effective_caller_id_name' => $vars['effective_caller_id_name'],
+						'effective_caller_id_number' => $vars['effective_caller_id_number'],
+						'voicemail_enabled' => $params['vm-enabled'],
+						'voicemail_password' => $params['vm-password'],
+						'voicemail_mail_to' => $params['vm-mailto'],
+						'voicemail_attach_file' => $params['vm-attach-file'],
+						'vm_keep_local_after_email' => $params['vm-keep-local-after-email'],
+						'vm_send_all_message' => $params['vm-email-all-messages'],
+						'fs_password' => $params['password']);
+		return $query;
+	}
+	function user_sipdevice_add($add_array){
+		$account_data = $this->session->userdata("accountinfo");
 	$parms_array = array('password' => $add_array['fs_password'],
 			'vm-enabled' => $add_array['voicemail_enabled'],
 			'vm-password' => $add_array['voicemail_password'],
@@ -251,21 +251,21 @@ 
 			'vm-email-all-messages' => $add_array['vm_send_all_message']);
 			$add_array['status'] = isset($add_array['status'])?$add_array['status']:"0";
 			$parms_array_vars = array('effective_caller_id_name' => $add_array['effective_caller_id_name'],
-		    'effective_caller_id_number' => $add_array['effective_caller_id_number'],
-		    'user_context' => 'default');
+			'effective_caller_id_number' => $add_array['effective_caller_id_number'],
+			'user_context' => 'default');
 
 	$new_array = array('creation_date'=>gmdate('Y-m-d H:i:s'),
-                           'username' => $add_array['fs_username'],
-                           'accountid' => $account_data['id'],
-                           'status' => $add_array['status'],
-                           'dir_params' => json_encode($parms_array),
-                           'dir_vars' => json_encode($parms_array_vars),
-                            'sip_profile_id' => $this->common->get_field_name('id','sip_profiles',array('name'=>'default')));    
+						   'username' => $add_array['fs_username'],
+						   'accountid' => $account_data['id'],
+						   'status' => $add_array['status'],
+						   'dir_params' => json_encode($parms_array),
+						   'dir_vars' => json_encode($parms_array_vars),
+							'sip_profile_id' => $this->common->get_field_name('id','sip_profiles',array('name'=>'default')));    
 	$this->db->insert('sip_devices', $new_array);
 	$this->common->mail_to_users('add_sip_device', $account_data);
 	return true;
-    }
-    function user_sipdevice_edit($add_array){
+	}
+	function user_sipdevice_edit($add_array){
 	$parms_array = array('password' => $add_array['fs_password'],
 			'vm-enabled' => $add_array['voicemail_enabled'],
 			'vm-password' => $add_array['voicemail_password'],
@@ -286,68 +286,68 @@ 
 			   'dir_vars' => json_encode($parms_array_vars), 'sip_profile_id' => $add_array['sip_profile_id']);		   
 	$this->db->update('sip_devices', $new_array,array('id'=>$add_array['id']));
 	return true;
-    }
-    function getuser_cdrs_list($flag, $start, $limit,$export=true) {
-        $this->db_model->build_search('user_cdrs_report_search');
-        $account_data = $this->session->userdata("accountinfo");
-        $field_name='debit';
-        if($account_data['type']==0 || $account_data['type']==1){
-            $where['accountid']=$account_data['id'];
+	}
+	function getuser_cdrs_list($flag, $start, $limit,$export=true) {
+		$this->db_model->build_search('user_cdrs_report_search');
+		$account_data = $this->session->userdata("accountinfo");
+		$field_name='debit';
+		if($account_data['type']==0 || $account_data['type']==1){
+			$where['accountid']=$account_data['id'];
             
-        }
-        if($account_data['type']==3){
-           $where['provider_id']=$account_data['id'];
-           $field_name='cost';
-        }
-        $table_name=$account_data['type'] !=1 ? 'cdrs': 'reseller_cdrs';
-        if($this->session->userdata('advance_search') != 1){
-	    $where['callstart >= ']=date("Y-m-d")." 00:00:00";
-            $where['callstart <=']=date("Y-m-d")." 23:59:59";
-        }
-        $this->db->where($where);
-        $this->db->order_by("callstart desc");
-        if ($flag) {
-            if (!$export)
-                $this->db->limit($limit, $start);
-            $this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,debit,cost,accountid,pricelist_id,calltype,is_recording,trunk_id,uniqueid');
-        }else {
-            $this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(debit) as total_debit,sum(cost) as total_cost,group_concat(distinct(pricelist_id)) as pricelist_ids,group_concat(distinct(trunk_id)) as trunk_ids');
-        }
-        $result = $this->db->get($table_name);
-        return $result;
-    }
+		}
+		if($account_data['type']==3){
+		   $where['provider_id']=$account_data['id'];
+		   $field_name='cost';
+		}
+		$table_name=$account_data['type'] !=1 ? 'cdrs': 'reseller_cdrs';
+		if($this->session->userdata('advance_search') != 1){
+		$where['callstart >= ']=date("Y-m-d")." 00:00:00";
+			$where['callstart <=']=date("Y-m-d")." 23:59:59";
+		}
+		$this->db->where($where);
+		$this->db->order_by("callstart desc");
+		if ($flag) {
+			if (!$export)
+				$this->db->limit($limit, $start);
+			$this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,debit,cost,accountid,pricelist_id,calltype,is_recording,trunk_id,uniqueid');
+		}else {
+			$this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(debit) as total_debit,sum(cost) as total_cost,group_concat(distinct(pricelist_id)) as pricelist_ids,group_concat(distinct(trunk_id)) as trunk_ids');
+		}
+		$result = $this->db->get($table_name);
+		return $result;
+	}
     
-    function user_fund_transfer($data){
+	function user_fund_transfer($data){
 	$accountinfo = $this->session->userdata['accountinfo'];
-        $data["payment_by"] = $accountinfo['reseller_id'] > 0 ? $accountinfo['reseller_id'] : -1 ;
-        $data['accountid'] = $data['id'];
-        $data['payment_mode'] = $data['payment_type'];
-        unset($data['action'],$data['id'],$data['account_currency'],$data['payment_type']);
-        if (isset($data)) {
-            $data['credit']=$data['credit'] =='' ?  0 : $data['credit'];
-            $date = gmdate('Y-m-d H:i:s');
-            $accountid=$data['accountid'];
-            while($accountid > 0 ){
-                $customer_id=$accountid;
-                $accountid=$this->common_model->get_parent_info($accountid);
-                $parent_id=$accountid > 0 ? $accountid : -1;
-                $balance = $this->db_model->update_balance($data['credit'], $customer_id,$data['payment_mode']);
-                if($data['payment_mode'] == 0){
-            		$insert_arr = array("accountid" => $customer_id,
-				    "credit" => $data['credit'],
-				    'payment_mode'=>$data['payment_mode'],
-				    'type'=>"SYSTEM",
-				    "notes" => $data['notes'],
-				    "payment_date" => $date, 
-				    'payment_by'=>$parent_id,
-				    );
-		    return $this->db->insert("payments", $insert_arr);
-                }
-            }
-        }
-    }
-     function user_dashboard_recent_recharge_info()
-    {
+		$data["payment_by"] = $accountinfo['reseller_id'] > 0 ? $accountinfo['reseller_id'] : -1 ;
+		$data['accountid'] = $data['id'];
+		$data['payment_mode'] = $data['payment_type'];
+		unset($data['action'],$data['id'],$data['account_currency'],$data['payment_type']);
+		if (isset($data)) {
+			$data['credit']=$data['credit'] =='' ?  0 : $data['credit'];
+			$date = gmdate('Y-m-d H:i:s');
+			$accountid=$data['accountid'];
+			while($accountid > 0 ){
+				$customer_id=$accountid;
+				$accountid=$this->common_model->get_parent_info($accountid);
+				$parent_id=$accountid > 0 ? $accountid : -1;
+				$balance = $this->db_model->update_balance($data['credit'], $customer_id,$data['payment_mode']);
+				if($data['payment_mode'] == 0){
+					$insert_arr = array("accountid" => $customer_id,
+					"credit" => $data['credit'],
+					'payment_mode'=>$data['payment_mode'],
+					'type'=>"SYSTEM",
+					"notes" => $data['notes'],
+					"payment_date" => $date, 
+					'payment_by'=>$parent_id,
+					);
+			return $this->db->insert("payments", $insert_arr);
+				}
+			}
+		}
+	}
+	 function user_dashboard_recent_recharge_info()
+	{
 	$accountinfo=$this->session->userdata('accountinfo');
 	$userlevel_logintype=$this->session->userdata('userlevel_logintype');
 	
@@ -358,132 +358,132 @@ 
 	if($userlevel_logintype == 0 || $userlevel_logintype == 3){
 	  $where_arr=array('accountid'=>$accountinfo['id']);
 	}
-        $this->db->where($where_arr);
-        $this->db->select('id,accountid,credit,payment_date,notes');
-        $this->db->from('payments');
-        $this->db->limit(10);
-        $this->db->order_by('payment_date','desc');
+		$this->db->where($where_arr);
+		$this->db->select('id,accountid,credit,payment_date,notes');
+		$this->db->from('payments');
+		$this->db->limit(10);
+		$this->db->order_by('payment_date','desc');
 	return $this->db->get();
-    }
+	}
     
-    function get_user_rates_list($flag, $start = 0, $limit = 0) {
-        $this->db_model->build_search('user_rates_list_search');
-        $account_data = $this->session->userdata("accountinfo");
-        $where = array("pricelist_id" => $account_data["pricelist_id"],"status" => '0');
-        if ($flag) {
-            $query = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
-        } else {
-            $query = $this->db_model->countQuery("*", "routes", $where);
-        }
-        return $query;
-    }
-    function get_user_opensips($flag, $account_number = "", $start = "0", $limit = "0") {
-        $this->db_model->build_search_opensips($this->opensips_db,'user_opensips_search');	
-        $this->opensips_db->where('accountcode',$account_number);
-        if ($flag) {
-	      $this->opensips_db->limit($limit,$start);
-        }
-        $result = $this->opensips_db->get("subscriber");
-        if($result->num_rows() > 0){
+	function get_user_rates_list($flag, $start = 0, $limit = 0) {
+		$this->db_model->build_search('user_rates_list_search');
+		$account_data = $this->session->userdata("accountinfo");
+		$where = array("pricelist_id" => $account_data["pricelist_id"],"status" => '0');
+		if ($flag) {
+			$query = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
+		} else {
+			$query = $this->db_model->countQuery("*", "routes", $where);
+		}
+		return $query;
+	}
+	function get_user_opensips($flag, $account_number = "", $start = "0", $limit = "0") {
+		$this->db_model->build_search_opensips($this->opensips_db,'user_opensips_search');	
+		$this->opensips_db->where('accountcode',$account_number);
+		if ($flag) {
+		  $this->opensips_db->limit($limit,$start);
+		}
+		$result = $this->opensips_db->get("subscriber");
+		if($result->num_rows() > 0){
 	  if($flag){
-	    return $result;
+		return $result;
 	  }
 	  else{
-	    return $result->num_rows();
+		return $result->num_rows();
 	  }
-        }else{
-         if($flag){
-	      $result=(object)array('num_rows'=>0);
+		}else{
+		 if($flag){
+		  $result=(object)array('num_rows'=>0);
 	  }
 	  else{
-	      $result=0;
+		  $result=0;
 	  }
 	  return $result;
-        }
-    }
-    function user_opensips_add($data) {
-        unset($data["action"]);
-        $data['creation_date']=gmdate("Y-m-d H:i:s");
-        $accountinfo=$this->session->userdata('accountinfo');
+		}
+	}
+	function user_opensips_add($data) {
+		unset($data["action"]);
+		$data['creation_date']=gmdate("Y-m-d H:i:s");
+		$accountinfo=$this->session->userdata('accountinfo');
 	$data['reseller_id']=$accountinfo['type']==1 ? $accountinfo['id'] : 0;
-        $this->opensips_db->insert("subscriber", $data);
-    }
+		$this->opensips_db->insert("subscriber", $data);
+	}
 
-    function user_opensips_edit($data, $id) {
-      unset($data["action"]);
-      $data=array("username"=>$data['username'],"password"=>$data['password'],"accountcode"=>$data['accountcode'],"domain"=>$data['domain']);
-      $this->opensips_db->where("id", $id);
-      $data['last_modified_date']=gmdate("Y-m-d H:i:s");
-      $this->opensips_db->update("subscriber", $data);
-    }
-    function user_opensips_delete($id) {
-        $this->opensips_db->where("id", $id);
-        $this->opensips_db->delete("subscriber");
-        return true;
-    }
-    function get_user_invoice_list($flag, $start = 0, $limit = 0){
+	function user_opensips_edit($data, $id) {
+	  unset($data["action"]);
+	  $data=array("username"=>$data['username'],"password"=>$data['password'],"accountcode"=>$data['accountcode'],"domain"=>$data['domain']);
+	  $this->opensips_db->where("id", $id);
+	  $data['last_modified_date']=gmdate("Y-m-d H:i:s");
+	  $this->opensips_db->update("subscriber", $data);
+	}
+	function user_opensips_delete($id) {
+		$this->opensips_db->where("id", $id);
+		$this->opensips_db->delete("subscriber");
+		return true;
+	}
+	function get_user_invoice_list($flag, $start = 0, $limit = 0){
 	$this->db_model->build_search('user_invoice_list_search');
 	$accountinfo=$this->session->userdata('accountinfo');
-    $where = array("accountid" => $accountinfo['id'],'confirm'=>1);	
+	$where = array("accountid" => $accountinfo['id'],'confirm'=>1);	
 	$this->db->where($where);
 	$or_where= "(type='I' OR type='R')";
 	$this->db->where($or_where);
-        if ($flag) {
-            $query = $this->db_model->select("*", "invoices", "", "invoice_date", "desc", $limit, $start);
+		if ($flag) {
+			$query = $this->db_model->select("*", "invoices", "", "invoice_date", "desc", $limit, $start);
             
-        } else {
-            $query = $this->db_model->countQuery("*", "invoices", "");
-        }
+		} else {
+			$query = $this->db_model->countQuery("*", "invoices", "");
+		}
       
-        return $query;
-    }
-    function get_user_cdrs_info($flag,$accountid,$start = 0, $limit = 0){
-     if ($flag) {
-            $query = $this->db_model->select("*", "reseller_cdrs", "", "invoice_date", "desc", $limit, $start);
+		return $query;
+	}
+	function get_user_cdrs_info($flag,$accountid,$start = 0, $limit = 0){
+	 if ($flag) {
+			$query = $this->db_model->select("*", "reseller_cdrs", "", "invoice_date", "desc", $limit, $start);
             
-        } else {
-            $query = $this->db_model->countQuery("*", "invoices", "");
-        }
+		} else {
+			$query = $this->db_model->countQuery("*", "invoices", "");
+		}
       
-    }
-    function get_invoiceconf($accountid) {
-        $return_array=array();
+	}
+	function get_invoiceconf($accountid) {
+		$return_array=array();
  	$logintype = $this->session->userdata('logintype');
-        if ($logintype == 1 || $logintype == 5) {
+		if ($logintype == 1 || $logintype == 5) {
           
 		$where = array("accountid" => $this->session->userdata["accountinfo"]['id']);
-        }else{
-       		 $where=array('id'=> $accountid);
+		}else{
+	   		 $where=array('id'=> $accountid);
 	}      
-        $query = $this->db_model->getSelect("*","invoice_conf",$where);
-        foreach($query->result_array() as $key => $value)
-        {
-            $return_array=$value;
-        }       
-         return $return_array;
-    }
+		$query = $this->db_model->getSelect("*","invoice_conf",$where);
+		foreach($query->result_array() as $key => $value)
+		{
+			$return_array=$value;
+		}       
+		 return $return_array;
+	}
     
     
-    function getprovider_cdrs_list($flag, $start, $limit,$export=true) {
-        $this->db_model->build_search('user_provider_cdrs_report_search');
-        $account_data = $this->session->userdata("accountinfo");
-        $where['provider_id']=$account_data['id'];
-        if($this->session->userdata('advance_search') != 1){
-	        $where['callstart >= ']=date("Y-m-d")." 00:00:00";
-            $where['callstart <=']=date("Y-m-d")." 23:59:59";
-        }
-        $this->db->where($where);
-        $this->db->order_by("callstart","desc");
-        if ($flag) {
-            if (!$export)
-                $this->db->limit($limit, $start);
-            $this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,cost,accountid,pricelist_id,calltype,is_recording,trunk_id,uniqueid');
-        }else {
-            $this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(cost) as total_cost,group_concat(distinct(trunk_id)) as trunk_ids');
-        }
-        $result = $this->db->get('cdrs');
-        return $result;
-    }
+	function getprovider_cdrs_list($flag, $start, $limit,$export=true) {
+		$this->db_model->build_search('user_provider_cdrs_report_search');
+		$account_data = $this->session->userdata("accountinfo");
+		$where['provider_id']=$account_data['id'];
+		if($this->session->userdata('advance_search') != 1){
+			$where['callstart >= ']=date("Y-m-d")." 00:00:00";
+			$where['callstart <=']=date("Y-m-d")." 23:59:59";
+		}
+		$this->db->where($where);
+		$this->db->order_by("callstart","desc");
+		if ($flag) {
+			if (!$export)
+				$this->db->limit($limit, $start);
+			$this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,cost,accountid,pricelist_id,calltype,is_recording,trunk_id,uniqueid');
+		}else {
+			$this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(cost) as total_cost,group_concat(distinct(trunk_id)) as trunk_ids');
+		}
+		$result = $this->db->get('cdrs');
+		return $result;
+	}
      
 }
 

Spacing +96 added lines, -96 removed lines

@@ -26,9 +26,9 @@ 
 
     function user_model() {
         parent::__construct();
-        if(Common_model::$global_config['system_config']['opensips']==0){
+        if (Common_model::$global_config['system_config']['opensips'] == 0) {
 			$db_config = Common_model::$global_config['system_config'];
-			$opensipdsn = "mysql://" . $db_config['opensips_dbuser'] . ":" . $db_config['opensips_dbpass'] . "@" . $db_config['opensips_dbhost'] . "/" . $db_config['opensips_dbname'] . "?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
+			$opensipdsn = "mysql://".$db_config['opensips_dbuser'].":".$db_config['opensips_dbpass']."@".$db_config['opensips_dbhost']."/".$db_config['opensips_dbname']."?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
 			$this->opensips_db = $this->load->database($opensipdsn, true);
 	    }
     }
@@ -91,9 +91,9 @@ 
             $this->db->select('count(id) as count');
         }
         if ($flag) {
-           if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
-            $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-           }else{
+           if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined') {
+            $this->db->order_by($_GET['sortname'], ($_GET['sortorder'] == 'undefined') ? 'desc' : $_GET['sortorder']);
+           } else {
             $this->db->order_by('invoice_date', 'desc');
            }
         }
@@ -107,7 +107,7 @@ 
             }
         } else {
             if ($flag) {
-                $query = (object) array('num_rows' => 0);
+                $query = (object)array('num_rows' => 0);
             } else {
                 $query = 0;
             }
@@ -117,13 +117,13 @@ 
 
     function get_user_charge_history($flag, $start = 0, $limit = 0) {
         $this->db_model->build_search('user_charge_history_search');
-        $accountinfo=$this->session->userdata('accountinfo');
-        $where['accountid']=$accountinfo['id'];
-        if($this->session->userdata('advance_search') != 1){
-             $where['created_date >=']=gmdate("Y-m-1 00:00:00");
-             $where['created_date <=']=gmdate("Y-m-d 23:59:59");
+        $accountinfo = $this->session->userdata('accountinfo');
+        $where['accountid'] = $accountinfo['id'];
+        if ($this->session->userdata('advance_search') != 1) {
+             $where['created_date >='] = gmdate("Y-m-1 00:00:00");
+             $where['created_date <='] = gmdate("Y-m-d 23:59:59");
         }
-	$where['item_type <>']='STANDARD';
+	$where['item_type <>'] = 'STANDARD';
         if ($flag) {
             $query = $this->db_model->select("*", "invoice_details", $where, "id", "DESC", $limit, $start);
         } else {
@@ -174,9 +174,9 @@ 
         return true;
     }
     
-    function user_ipmap_list($flag,$limit='',$start=''){
-        $accountinfo=$this->session->userdata('accountinfo');
-        $where['accountid']=$accountinfo['id'];
+    function user_ipmap_list($flag, $limit = '', $start = '') {
+        $accountinfo = $this->session->userdata('accountinfo');
+        $where['accountid'] = $accountinfo['id'];
         $this->db_model->build_search('user_ipmap_search');
         if ($flag) {
          $query = $this->db_model->select("*", "ip_map", $where, "id", "ASC", $limit, $start);
@@ -185,7 +185,7 @@ 
         }
           return $query;
     }
-    function user_sipdevices_list($flag, $accountid = "",$start = "", $limit = "") {
+    function user_sipdevices_list($flag, $accountid = "", $start = "", $limit = "") {
         $where = array("accountid" => $accountid);
 		$this->db_model->build_search('user_sipdevices_search');
 		$query = array();
@@ -195,7 +195,7 @@ 
 			$add_array = $deviceinfo->result_array();
 			foreach ($add_array as $key => $value) {
 				$vars = json_decode($value['dir_vars']);
-				$vars_new = json_decode($value['dir_params'],true);
+				$vars_new = json_decode($value['dir_params'], true);
 				$passowrds = json_decode($value['dir_params']);
 				$query[] = array('id' => $value['id'],
 						'username' => $value['username'],
@@ -220,11 +220,11 @@ 
 	return $query;
     }
     
-    function user_sipdevice_info($edit_id){
+    function user_sipdevice_info($edit_id) {
         $sipdevice_info = $this->db_model->getSelect("*", "sip_devices", array('id' => $edit_id));
         $sipdevice_arr = (array)$sipdevice_info->first_row();
         $vars = (array)json_decode($sipdevice_arr['dir_vars']);
-        $params = (array)json_decode($sipdevice_arr['dir_params'],true);
+        $params = (array)json_decode($sipdevice_arr['dir_params'], true);
         $query = array('id' => $sipdevice_arr['id'],
                         'fs_username' => $sipdevice_arr['username'],
                         'accountcode' => $sipdevice_arr['accountid'],
@@ -240,7 +240,7 @@ 
                         'fs_password' => $params['password']);
         return $query;
     }
-    function user_sipdevice_add($add_array){
+    function user_sipdevice_add($add_array) {
         $account_data = $this->session->userdata("accountinfo");
 	$parms_array = array('password' => $add_array['fs_password'],
 			'vm-enabled' => $add_array['voicemail_enabled'],
@@ -249,7 +249,7 @@ 
 			'vm-attach-file' => $add_array['voicemail_attach_file'],
 			'vm-keep-local-after-email' => $add_array['vm_keep_local_after_email'],
 			'vm-email-all-messages' => $add_array['vm_send_all_message']);
-			$add_array['status'] = isset($add_array['status'])?$add_array['status']:"0";
+			$add_array['status'] = isset($add_array['status']) ? $add_array['status'] : "0";
 			$parms_array_vars = array('effective_caller_id_name' => $add_array['effective_caller_id_name'],
 		    'effective_caller_id_number' => $add_array['effective_caller_id_number'],
 		    'user_context' => 'default');
@@ -260,12 +260,12 @@ 
                            'status' => $add_array['status'],
                            'dir_params' => json_encode($parms_array),
                            'dir_vars' => json_encode($parms_array_vars),
-                            '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->db->insert('sip_devices', $new_array);
 	$this->common->mail_to_users('add_sip_device', $account_data);
 	return true;
     }
-    function user_sipdevice_edit($add_array){
+    function user_sipdevice_edit($add_array) {
 	$parms_array = array('password' => $add_array['fs_password'],
 			'vm-enabled' => $add_array['voicemail_enabled'],
 			'vm-password' => $add_array['voicemail_password'],
@@ -277,62 +277,62 @@ 
 	$parms_array_vars = array('effective_caller_id_name' => $add_array['effective_caller_id_name'],
 	'effective_caller_id_number' => $add_array['effective_caller_id_number'],);
 	$log_type = $this->session->userdata("logintype");
-	if($log_type == 0  || $log_type == 3 || $log_type == 1){
-		$add_array['sip_profile_id']=$this->common->get_field_name('id','sip_profiles',array('name'=>'default'));
+	if ($log_type == 0 || $log_type == 3 || $log_type == 1) {
+		$add_array['sip_profile_id'] = $this->common->get_field_name('id', 'sip_profiles', array('name'=>'default'));
 	}
-	$add_array['status'] = isset($add_array['status'])?$add_array['status']:"0";
-	$new_array = array('last_modified_date'=>gmdate('Y-m-d H:i:s'),'username' => $add_array['fs_username'],'status' => $add_array['status'],
+	$add_array['status'] = isset($add_array['status']) ? $add_array['status'] : "0";
+	$new_array = array('last_modified_date'=>gmdate('Y-m-d H:i:s'), 'username' => $add_array['fs_username'], 'status' => $add_array['status'],
 	 	 	   'dir_params' => json_encode($parms_array),
 			   'dir_vars' => json_encode($parms_array_vars), 'sip_profile_id' => $add_array['sip_profile_id']);		   
-	$this->db->update('sip_devices', $new_array,array('id'=>$add_array['id']));
+	$this->db->update('sip_devices', $new_array, array('id'=>$add_array['id']));
 	return true;
     }
-    function getuser_cdrs_list($flag, $start, $limit,$export=true) {
+    function getuser_cdrs_list($flag, $start, $limit, $export = true) {
         $this->db_model->build_search('user_cdrs_report_search');
         $account_data = $this->session->userdata("accountinfo");
-        $field_name='debit';
-        if($account_data['type']==0 || $account_data['type']==1){
-            $where['accountid']=$account_data['id'];
+        $field_name = 'debit';
+        if ($account_data['type'] == 0 || $account_data['type'] == 1) {
+            $where['accountid'] = $account_data['id'];
             
         }
-        if($account_data['type']==3){
-           $where['provider_id']=$account_data['id'];
-           $field_name='cost';
+        if ($account_data['type'] == 3) {
+           $where['provider_id'] = $account_data['id'];
+           $field_name = 'cost';
         }
-        $table_name=$account_data['type'] !=1 ? 'cdrs': 'reseller_cdrs';
-        if($this->session->userdata('advance_search') != 1){
-	    $where['callstart >= ']=date("Y-m-d")." 00:00:00";
-            $where['callstart <=']=date("Y-m-d")." 23:59:59";
+        $table_name = $account_data['type'] != 1 ? 'cdrs' : 'reseller_cdrs';
+        if ($this->session->userdata('advance_search') != 1) {
+	    $where['callstart >= '] = date("Y-m-d")." 00:00:00";
+            $where['callstart <='] = date("Y-m-d")." 23:59:59";
         }
         $this->db->where($where);
         $this->db->order_by("callstart desc");
         if ($flag) {
-            if (!$export)
+            if ( ! $export)
                 $this->db->limit($limit, $start);
             $this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,debit,cost,accountid,pricelist_id,calltype,is_recording,trunk_id,uniqueid');
-        }else {
+        } else {
             $this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(debit) as total_debit,sum(cost) as total_cost,group_concat(distinct(pricelist_id)) as pricelist_ids,group_concat(distinct(trunk_id)) as trunk_ids');
         }
         $result = $this->db->get($table_name);
         return $result;
     }
     
-    function user_fund_transfer($data){
+    function user_fund_transfer($data) {
 	$accountinfo = $this->session->userdata['accountinfo'];
-        $data["payment_by"] = $accountinfo['reseller_id'] > 0 ? $accountinfo['reseller_id'] : -1 ;
+        $data["payment_by"] = $accountinfo['reseller_id'] > 0 ? $accountinfo['reseller_id'] : -1;
         $data['accountid'] = $data['id'];
         $data['payment_mode'] = $data['payment_type'];
-        unset($data['action'],$data['id'],$data['account_currency'],$data['payment_type']);
+        unset($data['action'], $data['id'], $data['account_currency'], $data['payment_type']);
         if (isset($data)) {
-            $data['credit']=$data['credit'] =='' ?  0 : $data['credit'];
+            $data['credit'] = $data['credit'] == '' ? 0 : $data['credit'];
             $date = gmdate('Y-m-d H:i:s');
-            $accountid=$data['accountid'];
-            while($accountid > 0 ){
-                $customer_id=$accountid;
-                $accountid=$this->common_model->get_parent_info($accountid);
-                $parent_id=$accountid > 0 ? $accountid : -1;
-                $balance = $this->db_model->update_balance($data['credit'], $customer_id,$data['payment_mode']);
-                if($data['payment_mode'] == 0){
+            $accountid = $data['accountid'];
+            while ($accountid > 0) {
+                $customer_id = $accountid;
+                $accountid = $this->common_model->get_parent_info($accountid);
+                $parent_id = $accountid > 0 ? $accountid : -1;
+                $balance = $this->db_model->update_balance($data['credit'], $customer_id, $data['payment_mode']);
+                if ($data['payment_mode'] == 0) {
             		$insert_arr = array("accountid" => $customer_id,
 				    "credit" => $data['credit'],
 				    'payment_mode'=>$data['payment_mode'],
@@ -348,28 +348,28 @@ 
     }
      function user_dashboard_recent_recharge_info()
     {
-	$accountinfo=$this->session->userdata('accountinfo');
-	$userlevel_logintype=$this->session->userdata('userlevel_logintype');
+	$accountinfo = $this->session->userdata('accountinfo');
+	$userlevel_logintype = $this->session->userdata('userlevel_logintype');
 	
-	$where_arr=array('payment_by'=>-1);
-	if($userlevel_logintype == 1){
-	  $where_arr=array('payment_by'=>$accountinfo['id']);
+	$where_arr = array('payment_by'=>-1);
+	if ($userlevel_logintype == 1) {
+	  $where_arr = array('payment_by'=>$accountinfo['id']);
 	}
-	if($userlevel_logintype == 0 || $userlevel_logintype == 3){
-	  $where_arr=array('accountid'=>$accountinfo['id']);
+	if ($userlevel_logintype == 0 || $userlevel_logintype == 3) {
+	  $where_arr = array('accountid'=>$accountinfo['id']);
 	}
         $this->db->where($where_arr);
         $this->db->select('id,accountid,credit,payment_date,notes');
         $this->db->from('payments');
         $this->db->limit(10);
-        $this->db->order_by('payment_date','desc');
+        $this->db->order_by('payment_date', 'desc');
 	return $this->db->get();
     }
     
     function get_user_rates_list($flag, $start = 0, $limit = 0) {
         $this->db_model->build_search('user_rates_list_search');
         $account_data = $this->session->userdata("accountinfo");
-        $where = array("pricelist_id" => $account_data["pricelist_id"],"status" => '0');
+        $where = array("pricelist_id" => $account_data["pricelist_id"], "status" => '0');
         if ($flag) {
             $query = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
         } else {
@@ -378,42 +378,42 @@ 
         return $query;
     }
     function get_user_opensips($flag, $account_number = "", $start = "0", $limit = "0") {
-        $this->db_model->build_search_opensips($this->opensips_db,'user_opensips_search');	
-        $this->opensips_db->where('accountcode',$account_number);
+        $this->db_model->build_search_opensips($this->opensips_db, 'user_opensips_search');	
+        $this->opensips_db->where('accountcode', $account_number);
         if ($flag) {
-	      $this->opensips_db->limit($limit,$start);
+	      $this->opensips_db->limit($limit, $start);
         }
         $result = $this->opensips_db->get("subscriber");
-        if($result->num_rows() > 0){
-	  if($flag){
+        if ($result->num_rows() > 0) {
+	  if ($flag) {
 	    return $result;
 	  }
-	  else{
+	  else {
 	    return $result->num_rows();
 	  }
-        }else{
-         if($flag){
-	      $result=(object)array('num_rows'=>0);
+        } else {
+         if ($flag) {
+	      $result = (object)array('num_rows'=>0);
 	  }
-	  else{
-	      $result=0;
+	  else {
+	      $result = 0;
 	  }
 	  return $result;
         }
     }
     function user_opensips_add($data) {
         unset($data["action"]);
-        $data['creation_date']=gmdate("Y-m-d H:i:s");
-        $accountinfo=$this->session->userdata('accountinfo');
-	$data['reseller_id']=$accountinfo['type']==1 ? $accountinfo['id'] : 0;
+        $data['creation_date'] = gmdate("Y-m-d H:i:s");
+        $accountinfo = $this->session->userdata('accountinfo');
+	$data['reseller_id'] = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
         $this->opensips_db->insert("subscriber", $data);
     }
 
     function user_opensips_edit($data, $id) {
       unset($data["action"]);
-      $data=array("username"=>$data['username'],"password"=>$data['password'],"accountcode"=>$data['accountcode'],"domain"=>$data['domain']);
+      $data = array("username"=>$data['username'], "password"=>$data['password'], "accountcode"=>$data['accountcode'], "domain"=>$data['domain']);
       $this->opensips_db->where("id", $id);
-      $data['last_modified_date']=gmdate("Y-m-d H:i:s");
+      $data['last_modified_date'] = gmdate("Y-m-d H:i:s");
       $this->opensips_db->update("subscriber", $data);
     }
     function user_opensips_delete($id) {
@@ -421,12 +421,12 @@ 
         $this->opensips_db->delete("subscriber");
         return true;
     }
-    function get_user_invoice_list($flag, $start = 0, $limit = 0){
+    function get_user_invoice_list($flag, $start = 0, $limit = 0) {
 	$this->db_model->build_search('user_invoice_list_search');
-	$accountinfo=$this->session->userdata('accountinfo');
-    $where = array("accountid" => $accountinfo['id'],'confirm'=>1);	
+	$accountinfo = $this->session->userdata('accountinfo');
+    $where = array("accountid" => $accountinfo['id'], 'confirm'=>1);	
 	$this->db->where($where);
-	$or_where= "(type='I' OR type='R')";
+	$or_where = "(type='I' OR type='R')";
 	$this->db->where($or_where);
         if ($flag) {
             $query = $this->db_model->select("*", "invoices", "", "invoice_date", "desc", $limit, $start);
@@ -437,7 +437,7 @@ 
       
         return $query;
     }
-    function get_user_cdrs_info($flag,$accountid,$start = 0, $limit = 0){
+    function get_user_cdrs_info($flag, $accountid, $start = 0, $limit = 0) {
      if ($flag) {
             $query = $this->db_model->select("*", "reseller_cdrs", "", "invoice_date", "desc", $limit, $start);
             
@@ -447,38 +447,38 @@ 
       
     }
     function get_invoiceconf($accountid) {
-        $return_array=array();
+        $return_array = array();
  	$logintype = $this->session->userdata('logintype');
         if ($logintype == 1 || $logintype == 5) {
           
 		$where = array("accountid" => $this->session->userdata["accountinfo"]['id']);
-        }else{
-       		 $where=array('id'=> $accountid);
+        } else {
+       		 $where = array('id'=> $accountid);
 	}      
-        $query = $this->db_model->getSelect("*","invoice_conf",$where);
-        foreach($query->result_array() as $key => $value)
+        $query = $this->db_model->getSelect("*", "invoice_conf", $where);
+        foreach ($query->result_array() as $key => $value)
         {
-            $return_array=$value;
+            $return_array = $value;
         }       
          return $return_array;
     }
     
     
-    function getprovider_cdrs_list($flag, $start, $limit,$export=true) {
+    function getprovider_cdrs_list($flag, $start, $limit, $export = true) {
         $this->db_model->build_search('user_provider_cdrs_report_search');
         $account_data = $this->session->userdata("accountinfo");
-        $where['provider_id']=$account_data['id'];
-        if($this->session->userdata('advance_search') != 1){
-	        $where['callstart >= ']=date("Y-m-d")." 00:00:00";
-            $where['callstart <=']=date("Y-m-d")." 23:59:59";
+        $where['provider_id'] = $account_data['id'];
+        if ($this->session->userdata('advance_search') != 1) {
+	        $where['callstart >= '] = date("Y-m-d")." 00:00:00";
+            $where['callstart <='] = date("Y-m-d")." 23:59:59";
         }
         $this->db->where($where);
-        $this->db->order_by("callstart","desc");
+        $this->db->order_by("callstart", "desc");
         if ($flag) {
-            if (!$export)
+            if ( ! $export)
                 $this->db->limit($limit, $start);
             $this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,cost,accountid,pricelist_id,calltype,is_recording,trunk_id,uniqueid');
-        }else {
+        } else {
             $this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(cost) as total_cost,group_concat(distinct(trunk_id)) as trunk_ids');
         }
         $result = $this->db->get('cdrs');

Braces +13 added lines, -13 removed lines

@@ -93,7 +93,7 @@ 
         if ($flag) {
            if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
             $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-           }else{
+           } else{
             $this->db->order_by('invoice_date', 'desc');
            }
         }
@@ -307,10 +307,11 @@ 
         $this->db->where($where);
         $this->db->order_by("callstart desc");
         if ($flag) {
-            if (!$export)
-                $this->db->limit($limit, $start);
+            if (!$export) {
+                            $this->db->limit($limit, $start);
+            }
             $this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,debit,cost,accountid,pricelist_id,calltype,is_recording,trunk_id,uniqueid');
-        }else {
+        } else {
             $this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(debit) as total_debit,sum(cost) as total_cost,group_concat(distinct(pricelist_id)) as pricelist_ids,group_concat(distinct(trunk_id)) as trunk_ids');
         }
         $result = $this->db->get($table_name);
@@ -387,15 +388,13 @@ 
         if($result->num_rows() > 0){
 	  if($flag){
 	    return $result;
-	  }
-	  else{
+	  } else{
 	    return $result->num_rows();
 	  }
-        }else{
+        } else{
          if($flag){
 	      $result=(object)array('num_rows'=>0);
-	  }
-	  else{
+	  } else{
 	      $result=0;
 	  }
 	  return $result;
@@ -452,7 +451,7 @@ 
         if ($logintype == 1 || $logintype == 5) {
           
 		$where = array("accountid" => $this->session->userdata["accountinfo"]['id']);
-        }else{
+        } else{
        		 $where=array('id'=> $accountid);
 	}      
         $query = $this->db_model->getSelect("*","invoice_conf",$where);
@@ -475,10 +474,11 @@ 
         $this->db->where($where);
         $this->db->order_by("callstart","desc");
         if ($flag) {
-            if (!$export)
-                $this->db->limit($limit, $start);
+            if (!$export) {
+                            $this->db->limit($limit, $start);
+            }
             $this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,cost,accountid,pricelist_id,calltype,is_recording,trunk_id,uniqueid');
-        }else {
+        } else {
             $this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(cost) as total_cost,group_concat(distinct(trunk_id)) as trunk_ids');
         }
         $result = $this->db->get('cdrs');

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

Indentation +553 added lines, -553 removed lines

@@ -22,77 +22,77 @@ 
 ###############################################################################
 class Systems extends CI_Controller {
 
-    function Systems() {
-        parent::__construct();
+	function Systems() {
+		parent::__construct();
 
-        $this->load->helper('template_inheritance');
+		$this->load->helper('template_inheritance');
 	$this->load->helper('file');
-        $this->load->library('session');
-        $this->load->library("system_form");
-        $this->load->library('astpp/form');
-        $this->load->model('system_model');
-        $this->load->dbutil();
-
-        if ($this->session->userdata('user_login') == FALSE)
-            redirect(base_url() . '/astpp/login');
-    }
-
-    function configuration_edit($edit_id = '') {
-        $data['page_title'] = 'Edit Settings';
-        $where = array('id' => $edit_id);
-        $account = $this->db_model->getSelect("*", "system", $where);
-        foreach ($account->result_array() as $key => $value) {
-            $edit_data = $value;
-        }
-        $data['form'] = $this->form->build_form($this->system_form->get_configuration_form_fields(), $edit_data);
-        $this->load->view('view_configuration_add_edit', $data);
-    }
-
-    function configuration_search() {
-        $ajax_search = $this->input->post('ajax_search', 0);
-        if ($this->input->post('advance_search', TRUE) == 1) {
-            $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
-            $action = $this->input->post();
-            unset($action['action']);
-            unset($action['advance_search']);
-            $this->session->set_userdata('configuration_search', $action);
-        }
-        if (@$ajax_search != 1) {
-            redirect(base_url() . 'systems/configuration/');
-        }
-    }
-
-    function configuration_clearsearchfilter() {
-        $this->session->set_userdata('advance_search', 0);
-        $this->session->set_userdata('did_search', "");
-    }
-
-    function configuration_save() {
-        $add_array = $this->input->post();
-        $data['form'] = $this->form->build_form($this->system_form->get_configuration_form_fields(), $add_array);
-        if ($add_array['id'] != '') {
-            $data['page_title'] = 'Edit Settings';
-            if ($this->form_validation->run() == FALSE) {
-                $data['validation_errors'] = validation_errors();
-                echo $data['validation_errors'];
-                exit;
-            } else {
-                $this->system_model->edit_configuration($add_array, $add_array['id']);
-                echo json_encode(array("SUCCESS"=> "setting updated successfully!"));
-                exit;
-            }
-        }
-    }
-
-    function configuration($group_title='') {
+		$this->load->library('session');
+		$this->load->library("system_form");
+		$this->load->library('astpp/form');
+		$this->load->model('system_model');
+		$this->load->dbutil();
+
+		if ($this->session->userdata('user_login') == FALSE)
+			redirect(base_url() . '/astpp/login');
+	}
+
+	function configuration_edit($edit_id = '') {
+		$data['page_title'] = 'Edit Settings';
+		$where = array('id' => $edit_id);
+		$account = $this->db_model->getSelect("*", "system", $where);
+		foreach ($account->result_array() as $key => $value) {
+			$edit_data = $value;
+		}
+		$data['form'] = $this->form->build_form($this->system_form->get_configuration_form_fields(), $edit_data);
+		$this->load->view('view_configuration_add_edit', $data);
+	}
+
+	function configuration_search() {
+		$ajax_search = $this->input->post('ajax_search', 0);
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset($action['action']);
+			unset($action['advance_search']);
+			$this->session->set_userdata('configuration_search', $action);
+		}
+		if (@$ajax_search != 1) {
+			redirect(base_url() . 'systems/configuration/');
+		}
+	}
+
+	function configuration_clearsearchfilter() {
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('did_search', "");
+	}
+
+	function configuration_save() {
+		$add_array = $this->input->post();
+		$data['form'] = $this->form->build_form($this->system_form->get_configuration_form_fields(), $add_array);
+		if ($add_array['id'] != '') {
+			$data['page_title'] = 'Edit Settings';
+			if ($this->form_validation->run() == FALSE) {
+				$data['validation_errors'] = validation_errors();
+				echo $data['validation_errors'];
+				exit;
+			} else {
+				$this->system_model->edit_configuration($add_array, $add_array['id']);
+				echo json_encode(array("SUCCESS"=> "setting updated successfully!"));
+				exit;
+			}
+		}
+	}
+
+	function configuration($group_title='') {
 	if($group_title==""){
 		redirect(base_url() . '/dashboard');
 	}
 	if($group_title=="email"){
-	      $data['test_email_flag'] = true;
+		  $data['test_email_flag'] = true;
 	}
-        $data['username'] = $this->session->userdata('user_name');
-        $data['page_title'] = ucfirst($group_title);
+		$data['username'] = $this->session->userdata('user_name');
+		$data['page_title'] = ucfirst($group_title);
 	$data['group_title']=$group_title;
 	$where=array("group_title"=>$group_title);
 	$details = $this->db_model->getSelect("*", "system", $where);
@@ -104,545 +104,545 @@ 
 			$update_array=array('value'=>$val);
 			$this->system_model->edit_configuration($update_array, $key);
 		}
-            	$this->session->set_flashdata('astpp_errormsg', ucfirst($group_title).' Settings updated sucessfully!');
-	    	redirect(base_url() . 'systems/configuration/'.$group_title);
-        }else{
+				$this->session->set_flashdata('astpp_errormsg', ucfirst($group_title).' Settings updated sucessfully!');
+			redirect(base_url() . 'systems/configuration/'.$group_title);
+		}else{
 	 	$this->load->view('view_systemconf', $data);
 	}
-    }
+	}
     
-    function configuration_json() {
-
-        $json_data = array();
-        $count_all = $this->system_model->getsystem_list(false, "", "");
-        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
-
-        $query = $this->system_model->getsystem_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
-        $grid_fields = json_decode($this->system_form->build_system_list_for_admin());
-        $json_data['rows'] = $this->form->build_grid($query, $grid_fields);
-
-        echo json_encode($json_data);
-    }
-
-    function template() {
-        $data['username'] = $this->session->userdata('user_name');
-        $data['page_title'] = 'Email Templates';
-        $data['search_flag'] = true;
-        $this->session->set_userdata('advance_search', 0);
-        $data['grid_fields'] = $this->system_form->build_template_list_for_admin();
-        $data["grid_buttons"] = $this->system_form->build_grid_buttons();
-        $data['form_search'] = $this->form->build_serach_form($this->system_form->get_template_search_form());
-        $this->load->view('view_template_list', $data);
-    }
-
-    function template_json() {
-        $json_data = array();
-        $count_all = $this->system_model->gettemplate_list(false, "", "");
-        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
-
-        $query = $this->system_model->gettemplate_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
-        $grid_fields = json_decode($this->system_form->build_template_list_for_admin());
-        $json_data['rows'] = $this->form->build_grid($query, $grid_fields);
-
-        echo json_encode($json_data);
-    }
-
-    function template_edit($edit_id = '') {
-        $data['page_title'] = 'Edit Email template';
-        $where = array('id' => $edit_id);
-        $account = $this->db_model->getSelect("*", "default_templates", $where);
-        foreach ($account->result_array() as $key => $value) {
-            $edit_data = $value;
-        }
-        $data['form'] = $this->form->build_form($this->system_form->get_template_form_fields(), $edit_data);
-        $this->load->view('view_template_add_edit', $data);
-    }
-
-    function template_save() {
-        $add_array = $this->input->post();
+	function configuration_json() {
+
+		$json_data = array();
+		$count_all = $this->system_model->getsystem_list(false, "", "");
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
+
+		$query = $this->system_model->getsystem_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
+		$grid_fields = json_decode($this->system_form->build_system_list_for_admin());
+		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
+
+		echo json_encode($json_data);
+	}
+
+	function template() {
+		$data['username'] = $this->session->userdata('user_name');
+		$data['page_title'] = 'Email Templates';
+		$data['search_flag'] = true;
+		$this->session->set_userdata('advance_search', 0);
+		$data['grid_fields'] = $this->system_form->build_template_list_for_admin();
+		$data["grid_buttons"] = $this->system_form->build_grid_buttons();
+		$data['form_search'] = $this->form->build_serach_form($this->system_form->get_template_search_form());
+		$this->load->view('view_template_list', $data);
+	}
+
+	function template_json() {
+		$json_data = array();
+		$count_all = $this->system_model->gettemplate_list(false, "", "");
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
+
+		$query = $this->system_model->gettemplate_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
+		$grid_fields = json_decode($this->system_form->build_template_list_for_admin());
+		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
+
+		echo json_encode($json_data);
+	}
+
+	function template_edit($edit_id = '') {
+		$data['page_title'] = 'Edit Email template';
+		$where = array('id' => $edit_id);
+		$account = $this->db_model->getSelect("*", "default_templates", $where);
+		foreach ($account->result_array() as $key => $value) {
+			$edit_data = $value;
+		}
+		$data['form'] = $this->form->build_form($this->system_form->get_template_form_fields(), $edit_data);
+		$this->load->view('view_template_add_edit', $data);
+	}
+
+	function template_save() {
+		$add_array = $this->input->post();
         
-        if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
-             $account_data = $this->session->userdata("accountinfo");
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			 $account_data = $this->session->userdata("accountinfo");
 			 $reseller = $account_data['id'];
-             $this->resellertemplate_save($add_array,$reseller);
-        }
-        else
-        {
-            $this->admintemplate_save($add_array);
-        }
-    }
+			 $this->resellertemplate_save($add_array,$reseller);
+		}
+		else
+		{
+			$this->admintemplate_save($add_array);
+		}
+	}
     
-    function resellertemplate_save($data,$resellerid)
-    {
-        $where = array('name' => $data['name'],'reseller_id'=>$resellerid);
-        $count = $this->db_model->countQuery("*", "default_templates", $where);
-        $data['form'] = $this->form->build_form($this->system_form->get_template_form_fields(), $data);
-        if($count >0)
-        {
-            $data['page_title'] = 'Edit Template';
-            if ($this->form_validation->run() == FALSE) {
-                $data['validation_errors'] = validation_errors();
-            } else {
+	function resellertemplate_save($data,$resellerid)
+	{
+		$where = array('name' => $data['name'],'reseller_id'=>$resellerid);
+		$count = $this->db_model->countQuery("*", "default_templates", $where);
+		$data['form'] = $this->form->build_form($this->system_form->get_template_form_fields(), $data);
+		if($count >0)
+		{
+			$data['page_title'] = 'Edit Template';
+			if ($this->form_validation->run() == FALSE) {
+				$data['validation_errors'] = validation_errors();
+			} else {
                 
-                $this->system_model->edit_resellertemplate($data, $data['id']);
-                $this->session->set_flashdata('astpp_errormsg', 'Template updated successfully!');
-                redirect(base_url() . 'systems/template/');
-                exit;
-            }
-        } else {
-            if ($this->form_validation->run() == FALSE) {    
-                $data['validation_errors'] = validation_errors();
-            } else {
-                 unset($data['form']);
-                 $data['reseller_id'] = $resellerid;
-                $this->system_model->add_resellertemplate($data);
-                $this->session->set_flashdata('astpp_errormsg', 'Template added successfully!');
-                redirect(base_url() . 'systems/template/');
-                exit;
-            }
-        }
-        $this->load->view('view_template_add_edit', $data);   
-    }
-    function admintemplate_save($data)
-    {
-        $data['form'] = $this->form->build_form($this->system_form->get_template_form_fields(), $data);
-        if ($data['id'] != '') {
-            $data['page_title'] = 'Edit Template';
-            if ($this->form_validation->run() == FALSE) {
-                $data['validation_errors'] = validation_errors();
-            } else {
-                 unset($data['form']);
-                 unset($data['page_title']);
-                $this->system_model->edit_template($data, $data['id']);
-                $this->session->set_flashdata('astpp_errormsg', 'Template updated successfully!');
-                redirect(base_url() . 'systems/template/');
-                exit;
-            }
-        } else {
-            $data['page_title'] = 'Termination Details';
-            if ($this->form_validation->run() == FALSE) {
-                $data['validation_errors'] = validation_errors();
-            } else {
-                 unset($data['form']);
-                $this->system_model->add_template($data);
-                $this->session->set_flashdata('astpp_errormsg', 'Template added successfully!');
-                redirect(base_url() . 'systems/template/');
-                exit;
-            }
-        }
-        $this->load->view('view_template_add_edit', $data);   
-    }
-    function template_search() {
-        $ajax_search = $this->input->post('ajax_search', 0);
-
-        if ($this->input->post('advance_search', TRUE) == 1) {
-            $this->session->set_userdata('advance_search', $this->input->post('advance_search'));
-            $action = $this->input->post();
-            unset($action['action']);
-            unset($action['advance_search']);
-            $this->session->set_userdata('template_search', $action);
-        }
-        if (@$ajax_search != 1) {
-            redirect(base_url() . 'systems/template/');
-        }
-    }
-
-    function template_clearsearchfilter() {
-        $this->session->set_userdata('advance_search', 0);
-        $this->session->set_userdata('did_search', "");
-    }
+				$this->system_model->edit_resellertemplate($data, $data['id']);
+				$this->session->set_flashdata('astpp_errormsg', 'Template updated successfully!');
+				redirect(base_url() . 'systems/template/');
+				exit;
+			}
+		} else {
+			if ($this->form_validation->run() == FALSE) {    
+				$data['validation_errors'] = validation_errors();
+			} else {
+				 unset($data['form']);
+				 $data['reseller_id'] = $resellerid;
+				$this->system_model->add_resellertemplate($data);
+				$this->session->set_flashdata('astpp_errormsg', 'Template added successfully!');
+				redirect(base_url() . 'systems/template/');
+				exit;
+			}
+		}
+		$this->load->view('view_template_add_edit', $data);   
+	}
+	function admintemplate_save($data)
+	{
+		$data['form'] = $this->form->build_form($this->system_form->get_template_form_fields(), $data);
+		if ($data['id'] != '') {
+			$data['page_title'] = 'Edit Template';
+			if ($this->form_validation->run() == FALSE) {
+				$data['validation_errors'] = validation_errors();
+			} else {
+				 unset($data['form']);
+				 unset($data['page_title']);
+				$this->system_model->edit_template($data, $data['id']);
+				$this->session->set_flashdata('astpp_errormsg', 'Template updated successfully!');
+				redirect(base_url() . 'systems/template/');
+				exit;
+			}
+		} else {
+			$data['page_title'] = 'Termination Details';
+			if ($this->form_validation->run() == FALSE) {
+				$data['validation_errors'] = validation_errors();
+			} else {
+				 unset($data['form']);
+				$this->system_model->add_template($data);
+				$this->session->set_flashdata('astpp_errormsg', 'Template added successfully!');
+				redirect(base_url() . 'systems/template/');
+				exit;
+			}
+		}
+		$this->load->view('view_template_add_edit', $data);   
+	}
+	function template_search() {
+		$ajax_search = $this->input->post('ajax_search', 0);
+
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset($action['action']);
+			unset($action['advance_search']);
+			$this->session->set_userdata('template_search', $action);
+		}
+		if (@$ajax_search != 1) {
+			redirect(base_url() . 'systems/template/');
+		}
+	}
+
+	function template_clearsearchfilter() {
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('did_search', "");
+	}
     
-    function country_list() {
-        $data['username'] = $this->session->userdata('user_name');
-        $data['page_title'] = 'Countries';
-        $data['search_flag'] = true;
-        $data['cur_menu_no'] = 4;
+	function country_list() {
+		$data['username'] = $this->session->userdata('user_name');
+		$data['page_title'] = 'Countries';
+		$data['search_flag'] = true;
+		$data['cur_menu_no'] = 4;
 	$this->session->set_userdata('country_search', 0);
-        $data['grid_fields'] = $this->system_form->build_country_list_for_admin();
-        if ($this->session->userdata('logintype') == 2) {
-            $data["grid_buttons"] = $this->system_form->build_admin_grid_buttons();
-        } else {
-            $data["grid_buttons"] = json_encode(array());
-        }
+		$data['grid_fields'] = $this->system_form->build_country_list_for_admin();
+		if ($this->session->userdata('logintype') == 2) {
+			$data["grid_buttons"] = $this->system_form->build_admin_grid_buttons();
+		} else {
+			$data["grid_buttons"] = json_encode(array());
+		}
 	$data['form_search'] = $this->form->build_serach_form($this->system_form->get_search_country_form());
-        $this->load->view('view_country_list', $data);
-    }
+		$this->load->view('view_country_list', $data);
+	}
 
-    function country_list_json() {
+	function country_list_json() {
 	$json_data = array();
-        $count_all = $this->system_model->getcountry_list(false);
-        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
-        $query = $this->system_model->getcountry_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
-        $grid_fields = json_decode($this->system_form->build_country_list_for_admin());
-        $json_data['rows'] = $this->form->build_grid($query, $grid_fields);
-
-        echo json_encode($json_data);
-    }
+		$count_all = $this->system_model->getcountry_list(false);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
+		$query = $this->system_model->getcountry_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
+		$grid_fields = json_decode($this->system_form->build_country_list_for_admin());
+		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
+
+		echo json_encode($json_data);
+	}
     
-    function country_list_search() {
-        $ajax_search = $this->input->post('ajax_search', 0);
+	function country_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'));
-            $action = $this->input->post();
-            unset($action['action']);
-            unset($action['advance_search']);
-            $this->session->set_userdata('country_list_search', $action);
-        }
-        if (@$ajax_search != 1) {
-            redirect(base_url() . 'systems/country_list/');
-        }
-    }
-
-    function country_list_clearsearchfilter() {
-        $this->session->set_userdata('advance_search', 0);
-        $this->session->set_userdata('country_search', "");
-    }
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset($action['action']);
+			unset($action['advance_search']);
+			$this->session->set_userdata('country_list_search', $action);
+		}
+		if (@$ajax_search != 1) {
+			redirect(base_url() . 'systems/country_list/');
+		}
+	}
+
+	function country_list_clearsearchfilter() {
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('country_search', "");
+	}
     
-    function country_add() {
+	function country_add() {
 	$data['username'] = $this->session->userdata('user_name');
-        $data['flag'] = 'create';
-        $data['page_title'] = 'Add Country';
-        $data['form'] = $this->form->build_form($this->system_form->get_country_form_fields(), '');
-        $this->load->view('view_country_add_edit', $data);
-    }
+		$data['flag'] = 'create';
+		$data['page_title'] = 'Add Country';
+		$data['form'] = $this->form->build_form($this->system_form->get_country_form_fields(), '');
+		$this->load->view('view_country_add_edit', $data);
+	}
 
-    function country_list_edit($edit_id = '') {
+	function country_list_edit($edit_id = '') {
  	$data['page_title'] = 'Edit Country';
-        $where = array('id' => $edit_id);
-        $account = $this->db_model->getSelect("*", "countrycode", $where);
-        foreach ($account->result_array() as $key => $value) {
-            $edit_data = $value;
-        }
-        $data['form'] = $this->form->build_form($this->system_form->get_country_form_fields(), $edit_data);
-        $this->load->view('view_country_add_edit', $data);
-    }
+		$where = array('id' => $edit_id);
+		$account = $this->db_model->getSelect("*", "countrycode", $where);
+		foreach ($account->result_array() as $key => $value) {
+			$edit_data = $value;
+		}
+		$data['form'] = $this->form->build_form($this->system_form->get_country_form_fields(), $edit_data);
+		$this->load->view('view_country_add_edit', $data);
+	}
     
 
-    function country_save() {
+	function country_save() {
 	$add_array = $this->input->post();
-        $data['form'] = $this->form->build_form($this->system_form->get_country_form_fields(), $add_array);
-        if ($add_array['id'] != '') {
-            $data['page_title'] = 'Edit Country';
-            if ($this->form_validation->run() == FALSE) {
-                $data['validation_errors'] = validation_errors();
-                echo $data['validation_errors'];
-                exit;
-            } else {
-                $this->system_model->edit_country($add_array, $add_array['id']);
-                echo json_encode(array("SUCCESS"=> $add_array["country"]." country updated successfully!"));
-                exit;
-            }
-        } else {
-            $data['page_title'] = 'Add Country';
-            if ($this->form_validation->run() == FALSE) {
-                $data['validation_errors'] = validation_errors();
-                echo $data['validation_errors'];
-                exit;
-            } else {
-                $response = $this->system_model->add_country($add_array);
-                echo json_encode(array("SUCCESS"=> $add_array["country"]." country added successfully!"));
-                exit;
-            }
-        }
-    }
+		$data['form'] = $this->form->build_form($this->system_form->get_country_form_fields(), $add_array);
+		if ($add_array['id'] != '') {
+			$data['page_title'] = 'Edit Country';
+			if ($this->form_validation->run() == FALSE) {
+				$data['validation_errors'] = validation_errors();
+				echo $data['validation_errors'];
+				exit;
+			} else {
+				$this->system_model->edit_country($add_array, $add_array['id']);
+				echo json_encode(array("SUCCESS"=> $add_array["country"]." country updated successfully!"));
+				exit;
+			}
+		} else {
+			$data['page_title'] = 'Add Country';
+			if ($this->form_validation->run() == FALSE) {
+				$data['validation_errors'] = validation_errors();
+				echo $data['validation_errors'];
+				exit;
+			} else {
+				$response = $this->system_model->add_country($add_array);
+				echo json_encode(array("SUCCESS"=> $add_array["country"]." country added successfully!"));
+				exit;
+			}
+		}
+	}
     
-    function country_remove($id) {
-        $this->system_model->remove_country($id);
-        $country=$this->common->get_field_name('country','countrycode',$id);
-        $this->session->set_flashdata('astpp_notification', $country.'Country removed successfully!');
-        redirect(base_url() . 'systems/country_list/');
-    }
-
-    function country_delete_multiple() {
-        $ids = $this->input->post("selected_ids", true);
-        $where = "id IN ($ids)";
-        $this->db->where($where);
-        echo $this->db->delete("countrycode");
-    }
-    function currency_list() {
+	function country_remove($id) {
+		$this->system_model->remove_country($id);
+		$country=$this->common->get_field_name('country','countrycode',$id);
+		$this->session->set_flashdata('astpp_notification', $country.'Country removed successfully!');
+		redirect(base_url() . 'systems/country_list/');
+	}
+
+	function country_delete_multiple() {
+		$ids = $this->input->post("selected_ids", true);
+		$where = "id IN ($ids)";
+		$this->db->where($where);
+		echo $this->db->delete("countrycode");
+	}
+	function currency_list() {
 	$base_currency = Common_model::$global_config['system_config']['base_currency'];
-        $data['username'] = $this->session->userdata('user_name');
-        $data['page_title'] = 'Currencies'; 
-        $data['search_flag'] = true;
-        $data['cur_menu_no'] = 4;
+		$data['username'] = $this->session->userdata('user_name');
+		$data['page_title'] = 'Currencies'; 
+		$data['search_flag'] = true;
+		$data['cur_menu_no'] = 4;
 	$this->session->set_userdata('currency_search', 0);
-        $data['grid_fields'] = $this->system_form->build_currency_list_for_admin();
-        if ($this->session->userdata('logintype') == 2) {
-            $data["grid_buttons"] = $this->system_form->build_admin_currency_grid_buttons();
-        } else {
-            $data["grid_buttons"] = json_encode(array());
-        }
+		$data['grid_fields'] = $this->system_form->build_currency_list_for_admin();
+		if ($this->session->userdata('logintype') == 2) {
+			$data["grid_buttons"] = $this->system_form->build_admin_currency_grid_buttons();
+		} else {
+			$data["grid_buttons"] = json_encode(array());
+		}
 	$data['form_search'] = $this->form->build_serach_form($this->system_form->get_search_currency_form());
-        $this->load->view('view_currency_list', $data);
-    }
+		$this->load->view('view_currency_list', $data);
+	}
 
-    function currency_list_json() {
-      $json_data = array();
+	function currency_list_json() {
+	  $json_data = array();
 
-        $count_all = $this->system_model->getcurrency_list(false);
-        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
-        $json_data = $paging_data["json_paging"];
+		$count_all = $this->system_model->getcurrency_list(false);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
+		$json_data = $paging_data["json_paging"];
 
-        $query = $this->system_model->getcurrency_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
-        $grid_fields = json_decode($this->system_form->build_currency_list_for_admin());
-        $json_data['rows'] = $this->form->build_grid($query, $grid_fields);
+		$query = $this->system_model->getcurrency_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
+		$grid_fields = json_decode($this->system_form->build_currency_list_for_admin());
+		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
 
-        echo json_encode($json_data);
-    }
+		echo json_encode($json_data);
+	}
 
-    function currency_list_search() {
-        $ajax_search = $this->input->post('ajax_search', 0);
+	function currency_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'));
-            $action = $this->input->post();
-            unset($action['action']);
-            unset($action['advance_search']);
-            $this->session->set_userdata('currency_list_search', $action);
-        }
-        if (@$ajax_search != 1) {
-            redirect(base_url() . 'systems/currency_list/');
-        }
-    }
-
-    function currency_list_clearsearchfilter() {
-        $this->session->set_userdata('advance_search', 0);
-        $this->session->set_userdata('currency_search', "");
-    }
-
-    function currency_add() {
+		if ($this->input->post('advance_search', TRUE) == 1) {
+			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
+			$action = $this->input->post();
+			unset($action['action']);
+			unset($action['advance_search']);
+			$this->session->set_userdata('currency_list_search', $action);
+		}
+		if (@$ajax_search != 1) {
+			redirect(base_url() . 'systems/currency_list/');
+		}
+	}
+
+	function currency_list_clearsearchfilter() {
+		$this->session->set_userdata('advance_search', 0);
+		$this->session->set_userdata('currency_search', "");
+	}
+
+	function currency_add() {
 	$data['username'] = $this->session->userdata('user_name');
-        $data['flag'] = 'create';
-        $data['page_title'] = 'Add Currency';
-        $data['form'] = $this->form->build_form($this->system_form->get_currency_form_fields(), '');
-        $this->load->view('view_currency_add_edit', $data);
-    }
+		$data['flag'] = 'create';
+		$data['page_title'] = 'Add Currency';
+		$data['form'] = $this->form->build_form($this->system_form->get_currency_form_fields(), '');
+		$this->load->view('view_currency_add_edit', $data);
+	}
 
-    function currency_list_edit($edit_id = '') {
+	function currency_list_edit($edit_id = '') {
  	$data['page_title'] = 'Edit Currency';
-        $where = array('id' => $edit_id);
-        $account = $this->db_model->getSelect("*", "currency", $where);
-        foreach ($account->result_array() as $key => $value) {
-            $edit_data = $value;
-        }
-        $data['form'] = $this->form->build_form($this->system_form->get_currency_form_fields(), $edit_data);
-        $this->load->view('view_country_add_edit', $data);
-    }
+		$where = array('id' => $edit_id);
+		$account = $this->db_model->getSelect("*", "currency", $where);
+		foreach ($account->result_array() as $key => $value) {
+			$edit_data = $value;
+		}
+		$data['form'] = $this->form->build_form($this->system_form->get_currency_form_fields(), $edit_data);
+		$this->load->view('view_country_add_edit', $data);
+	}
     
 
-    function currency_save() {
+	function currency_save() {
 	$add_array = $this->input->post();
-        $data['form'] = $this->form->build_form($this->system_form->get_currency_form_fields(), $add_array);
-        if ($add_array['id'] != '') {
-            $data['page_title'] = 'Edit Currency';
-	    $data['page_title'] = 'Edit Currency';
-            if ($this->form_validation->run() == FALSE) {
-                $data['validation_errors'] = validation_errors();
-                echo $data['validation_errors'];
-                exit;
-            } else {
-                $this->system_model->edit_currency($add_array, $add_array['id']);
-                echo json_encode(array("SUCCESS"=> $add_array["currencyname"]." currency updated successfully!"));
-                exit;
-            }
-        } else {
-            $data['page_title'] = 'Create Currency';
-            if ($this->form_validation->run() == FALSE) {
-                $data['validation_errors'] = validation_errors();
-                echo $data['validation_errors'];
-                exit;
-            } else {
-                $response = $this->system_model->add_currency($add_array);
-                echo json_encode(array("SUCCESS"=> $add_array["currencyname"]." currency added successfully!"));
-                exit;
-            }
-        }
-    }
+		$data['form'] = $this->form->build_form($this->system_form->get_currency_form_fields(), $add_array);
+		if ($add_array['id'] != '') {
+			$data['page_title'] = 'Edit Currency';
+		$data['page_title'] = 'Edit Currency';
+			if ($this->form_validation->run() == FALSE) {
+				$data['validation_errors'] = validation_errors();
+				echo $data['validation_errors'];
+				exit;
+			} else {
+				$this->system_model->edit_currency($add_array, $add_array['id']);
+				echo json_encode(array("SUCCESS"=> $add_array["currencyname"]." currency updated successfully!"));
+				exit;
+			}
+		} else {
+			$data['page_title'] = 'Create Currency';
+			if ($this->form_validation->run() == FALSE) {
+				$data['validation_errors'] = validation_errors();
+				echo $data['validation_errors'];
+				exit;
+			} else {
+				$response = $this->system_model->add_currency($add_array);
+				echo json_encode(array("SUCCESS"=> $add_array["currencyname"]." currency added successfully!"));
+				exit;
+			}
+		}
+	}
     
-     function currency_remove($id) {
+	 function currency_remove($id) {
 		$currencyname=$this->common->get_field_name('currencyname','currency',$id);
-        $this->system_model->remove_currency($id);
-        $this->session->set_flashdata('astpp_notification',$currencyname. ' Currency removed successfully!');
-        redirect(base_url() . 'systems/currency_list/');
-    }
-
-    function currency_delete_multiple() {
-        $ids = $this->input->post("selected_ids", true);
-        $where = "id IN ($ids)";
-        $this->db->where($where);
-        echo $this->db->delete("currency");
-    }
-    function database_backup()
-    {
-        $data=array();
-        $data['username'] = $this->session->userdata('user_name');
-        $data['page_title'] = 'Database Backup';
-        $filename=$this->db->database."_".date("YmdHms").".sql.gz";
-        $data['form'] = $this->form->build_form($this->system_form->get_backup_database_form_fields($filename), '');
-        $this->load->view('view_database_backup', $data);
-    }
-    function database_backup_save()
-    { 
-
-      $add_array=$this->input->post();
+		$this->system_model->remove_currency($id);
+		$this->session->set_flashdata('astpp_notification',$currencyname. ' Currency removed successfully!');
+		redirect(base_url() . 'systems/currency_list/');
+	}
+
+	function currency_delete_multiple() {
+		$ids = $this->input->post("selected_ids", true);
+		$where = "id IN ($ids)";
+		$this->db->where($where);
+		echo $this->db->delete("currency");
+	}
+	function database_backup()
+	{
+		$data=array();
+		$data['username'] = $this->session->userdata('user_name');
+		$data['page_title'] = 'Database Backup';
+		$filename=$this->db->database."_".date("YmdHms").".sql.gz";
+		$data['form'] = $this->form->build_form($this->system_form->get_backup_database_form_fields($filename), '');
+		$this->load->view('view_database_backup', $data);
+	}
+	function database_backup_save()
+	{ 
+
+	  $add_array=$this->input->post();
       
-      $data['form'] = $this->form->build_form($this->system_form->get_backup_database_form_fields($add_array['path'],$add_array['id']),$add_array);
-      $data['page_title'] = 'Database Backup';
-      if($add_array['id'] != ''){
+	  $data['form'] = $this->form->build_form($this->system_form->get_backup_database_form_fields($add_array['path'],$add_array['id']),$add_array);
+	  $data['page_title'] = 'Database Backup';
+	  if($add_array['id'] != ''){
       
-      }else{
-           if($this->form_validation->run() == FALSE) {
-                $data['validation_errors'] = validation_errors();
-                echo $data['validation_errors'];
-                exit;
-          }else{
-             $db_name     = $this->db->database;
-             $db_username = $this->db->username;
-             $db_password = $this->db->password;
-             $db_hostname = $this->db->hostname;
-             $filename = $add_array['path'];
-             $backup_file=DATABASE_DIRECTORY.$filename;
-            if (substr($backup_file,-3)=='.gz'){
-                  $backup_file = substr($backup_file,0,-3);
-                  $do_gzip=1;
-            }
-
-           $run_backup="/usr/bin/mysqldump -all --databases ".$db_name." -u'".$db_username."' -p'".$db_password."' > '$backup_file'";
-           $error_zip=0;
-           exec($run_backup,$output,$error);
-           if ($do_gzip){
-              $gzip = $this->config->item('gzip-path');
-              $run_gzip = $gzip." ".$backup_file;
-              exec($run_gzip,$output,$error_zip);
-           }
+	  }else{
+		   if($this->form_validation->run() == FALSE) {
+				$data['validation_errors'] = validation_errors();
+				echo $data['validation_errors'];
+				exit;
+		  }else{
+			 $db_name     = $this->db->database;
+			 $db_username = $this->db->username;
+			 $db_password = $this->db->password;
+			 $db_hostname = $this->db->hostname;
+			 $filename = $add_array['path'];
+			 $backup_file=DATABASE_DIRECTORY.$filename;
+			if (substr($backup_file,-3)=='.gz'){
+				  $backup_file = substr($backup_file,0,-3);
+				  $do_gzip=1;
+			}
+
+		   $run_backup="/usr/bin/mysqldump -all --databases ".$db_name." -u'".$db_username."' -p'".$db_password."' > '$backup_file'";
+		   $error_zip=0;
+		   exec($run_backup,$output,$error);
+		   if ($do_gzip){
+			  $gzip = $this->config->item('gzip-path');
+			  $run_gzip = $gzip." ".$backup_file;
+			  exec($run_gzip,$output,$error_zip);
+		   }
           
-           if($error == 0 && $error_zip == 0 ){      
-              $this->system_model->backup_insert($add_array);
-              echo json_encode(array("SUCCESS"=> $add_array['backup_name']." backup exported successfully!"));
-              exit;
-           }else{
-                echo 'An error occur when the system tried to backup of the database. Please check yours system settings for the backup section';
-                exit;
-           }
-        }
-      }
-    }
-    function database_restore() {
-        $data['page_title'] = 'Database Restore';
-        $data['grid_fields'] = $this->system_form->build_backupdastabase_list();
-        $data["grid_buttons"] = $this->system_form->build_backupdastabase_buttons();
-        $this->load->view('view_database_list', $data);
-    }
+		   if($error == 0 && $error_zip == 0 ){      
+			  $this->system_model->backup_insert($add_array);
+			  echo json_encode(array("SUCCESS"=> $add_array['backup_name']." backup exported successfully!"));
+			  exit;
+		   }else{
+				echo 'An error occur when the system tried to backup of the database. Please check yours system settings for the backup section';
+				exit;
+		   }
+		}
+	  }
+	}
+	function database_restore() {
+		$data['page_title'] = 'Database Restore';
+		$data['grid_fields'] = $this->system_form->build_backupdastabase_list();
+		$data["grid_buttons"] = $this->system_form->build_backupdastabase_buttons();
+		$this->load->view('view_database_list', $data);
+	}
 function database_restore_json()
-    {
-    $json_data = array();
-        $count_all = $this->system_model->getbackup_list(false, "", "");
-        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'],$_GET['page']);
-        $json_data = $paging_data["json_paging"];
-
-        $query = $this->system_model->getbackup_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
-        $grid_fields = json_decode($this->system_form->build_backupdastabase_list());
-        $json_data['rows'] = $this->form->build_grid($query, $grid_fields);
-
-        echo json_encode($json_data);
-    exit;
-    }
-    function database_restore_one($id='')
-    {
-       $result = $this->system_model->get_backup_data($id);
-       $result_array=$result->result_array();
-       if($result->num_rows() > 0)
-       {
-            $db_name     = $this->db->database;
-            $db_username = $this->db->username;
-            $db_password = $this->db->password;
-            $db_hostname = $this->db->hostname;            
-            $path=DATABASE_DIRECTORY.$result_array[0]['path'];
-            if(file_exists($path)){
-              if (substr($path,-3)=='.gz') {
-                            $GUNZIP_EXE = $this->config->item('gunzip-path');
-                            $run_gzip = $GUNZIP_EXE." < ".$path." | ";
-              }
-              $MYSQL="/usr/bin/mysql";
-              $run_restore = $run_gzip.$MYSQL." -h".$db_hostname." -u".$db_username." -p".$db_password." ".$db_name;
-              exec($run_restore);
-              $this->session->set_flashdata('astpp_errormsg', 'Database Restore successfully.');
-              redirect(base_url() . 'systems/database_restore/');
-            }else{
-              $this->session->set_flashdata('astpp_notification', 'File not exists!');
-              redirect(base_url() . 'systems/database_restore/');
-            }
-      }
-      redirect(base_url() . 'systems/database_restore/');
-    }
+	{
+	$json_data = array();
+		$count_all = $this->system_model->getbackup_list(false, "", "");
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'],$_GET['page']);
+		$json_data = $paging_data["json_paging"];
+
+		$query = $this->system_model->getbackup_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
+		$grid_fields = json_decode($this->system_form->build_backupdastabase_list());
+		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
+
+		echo json_encode($json_data);
+	exit;
+	}
+	function database_restore_one($id='')
+	{
+	   $result = $this->system_model->get_backup_data($id);
+	   $result_array=$result->result_array();
+	   if($result->num_rows() > 0)
+	   {
+			$db_name     = $this->db->database;
+			$db_username = $this->db->username;
+			$db_password = $this->db->password;
+			$db_hostname = $this->db->hostname;            
+			$path=DATABASE_DIRECTORY.$result_array[0]['path'];
+			if(file_exists($path)){
+			  if (substr($path,-3)=='.gz') {
+							$GUNZIP_EXE = $this->config->item('gunzip-path');
+							$run_gzip = $GUNZIP_EXE." < ".$path." | ";
+			  }
+			  $MYSQL="/usr/bin/mysql";
+			  $run_restore = $run_gzip.$MYSQL." -h".$db_hostname." -u".$db_username." -p".$db_password." ".$db_name;
+			  exec($run_restore);
+			  $this->session->set_flashdata('astpp_errormsg', 'Database Restore successfully.');
+			  redirect(base_url() . 'systems/database_restore/');
+			}else{
+			  $this->session->set_flashdata('astpp_notification', 'File not exists!');
+			  redirect(base_url() . 'systems/database_restore/');
+			}
+	  }
+	  redirect(base_url() . 'systems/database_restore/');
+	}
 
  function database_download($id=''){
     
-    $result = $this->system_model->get_backup_data($id);
-    $result_array=$result->result_array();
-    if($result->num_rows() > 0)
-    {
-      $path=$result_array[0]['path'];
-      $filename = basename($path);
-      $len = filesize($path);
+	$result = $this->system_model->get_backup_data($id);
+	$result_array=$result->result_array();
+	if($result->num_rows() > 0)
+	{
+	  $path=$result_array[0]['path'];
+	  $filename = basename($path);
+	  $len = filesize($path);
       
-      header("Content-Encoding: binary");
-      header("Content-Type: application/octet-stream");
-      header( "content-length: " . $len );
-      header( "content-disposition: attachment; filename=" . $filename );
-      header("Expires: 0");
-      header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
-      header("Cache-Control: private");
-      header("Pragma: public");
-      ob_clean();
-      $fp=fopen( $path, "r" );
-      fpassthru( $fp );
-      exit;
-    }
-    }
-
-    function database_import()
-    {
-       $data['page_title'] = 'Import Database';
-       $this->load->view('view_import_database', $data);
+	  header("Content-Encoding: binary");
+	  header("Content-Type: application/octet-stream");
+	  header( "content-length: " . $len );
+	  header( "content-disposition: attachment; filename=" . $filename );
+	  header("Expires: 0");
+	  header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
+	  header("Cache-Control: private");
+	  header("Pragma: public");
+	  ob_clean();
+	  $fp=fopen( $path, "r" );
+	  fpassthru( $fp );
+	  exit;
+	}
+	}
+
+	function database_import()
+	{
+	   $data['page_title'] = 'Import Database';
+	   $this->load->view('view_import_database', $data);
     
-    }
+	}
    function database_import_file()
-    {
-        $filename = $_POST['fname'];
-        $upload_greeting_file= $_FILES['userfile']['name'];
-        $db_file = explode(".",$upload_greeting_file); 
-        if( $db_file[1] == 'csv' || $db_file[1] == 'tar' || $db_file[1] == 'sql'){
-            $target_path = basename( $_FILES['userfile']['name']);
-            move_uploaded_file($_FILES["userfile"]["tmp_name"], $target_path );
+	{
+		$filename = $_POST['fname'];
+		$upload_greeting_file= $_FILES['userfile']['name'];
+		$db_file = explode(".",$upload_greeting_file); 
+		if( $db_file[1] == 'csv' || $db_file[1] == 'tar' || $db_file[1] == 'sql'){
+			$target_path = basename( $_FILES['userfile']['name']);
+			move_uploaded_file($_FILES["userfile"]["tmp_name"], $target_path );
           
-            $query = $this->system_model->import_database($filename,$_FILES['userfile']['name']);
-            $this->session->set_flashdata('astpp_errormsg',"The file ".  basename( $_FILES['userfile']['name'])." has been uploaded");
-            redirect(base_url()."systems/database_restore/");            
-        }else{
-            $this->session->set_flashdata('astpp_notification',"There is a some issue or invalid file format.");
-            redirect(base_url()."systems/database_restore/");            
-        }
-    }
-    function database_delete($id)
-    {
-      $where = array("id"=>$id);
-      $this->db->where($where);
-      $this->db->delete("backup_database");
-      $this->session->set_flashdata('astpp_errormsg', 'Database backup deleted successfully.');      
-      redirect(base_url() . 'systems/database_restore/');
-      return true;
-    }
-    function database_backup_delete_multiple() {
-        $ids = $this->input->post("selected_ids", true);
-        $where = "id IN ($ids)";
-        $this->db->where($where);
-        echo  $this->db->delete("backup_database");
-    }
+			$query = $this->system_model->import_database($filename,$_FILES['userfile']['name']);
+			$this->session->set_flashdata('astpp_errormsg',"The file ".  basename( $_FILES['userfile']['name'])." has been uploaded");
+			redirect(base_url()."systems/database_restore/");            
+		}else{
+			$this->session->set_flashdata('astpp_notification',"There is a some issue or invalid file format.");
+			redirect(base_url()."systems/database_restore/");            
+		}
+	}
+	function database_delete($id)
+	{
+	  $where = array("id"=>$id);
+	  $this->db->where($where);
+	  $this->db->delete("backup_database");
+	  $this->session->set_flashdata('astpp_errormsg', 'Database backup deleted successfully.');      
+	  redirect(base_url() . 'systems/database_restore/');
+	  return true;
+	}
+	function database_backup_delete_multiple() {
+		$ids = $this->input->post("selected_ids", true);
+		$where = "id IN ($ids)";
+		$this->db->where($where);
+		echo  $this->db->delete("backup_database");
+	}
 }
 
 ?>

Spacing +79 added lines, -79 removed lines

@@ -34,7 +34,7 @@ 
         $this->load->dbutil();
 
         if ($this->session->userdata('user_login') == FALSE)
-            redirect(base_url() . '/astpp/login');
+            redirect(base_url().'/astpp/login');
     }
 
     function configuration_edit($edit_id = '') {
@@ -58,7 +58,7 @@ 
             $this->session->set_userdata('configuration_search', $action);
         }
         if (@$ajax_search != 1) {
-            redirect(base_url() . 'systems/configuration/');
+            redirect(base_url().'systems/configuration/');
         }
     }
 
@@ -84,29 +84,29 @@ 
         }
     }
 
-    function configuration($group_title='') {
-	if($group_title==""){
-		redirect(base_url() . '/dashboard');
+    function configuration($group_title = '') {
+	if ($group_title == "") {
+		redirect(base_url().'/dashboard');
 	}
-	if($group_title=="email"){
+	if ($group_title == "email") {
 	      $data['test_email_flag'] = true;
 	}
         $data['username'] = $this->session->userdata('user_name');
         $data['page_title'] = ucfirst($group_title);
-	$data['group_title']=$group_title;
-	$where=array("group_title"=>$group_title);
+	$data['group_title'] = $group_title;
+	$where = array("group_title"=>$group_title);
 	$details = $this->db_model->getSelect("*", "system", $where);
-	$data['details']=$details->result_array();
+	$data['details'] = $details->result_array();
 	$add_array = $this->input->post();
- 	if (!empty($add_array)) {
+ 	if ( ! empty($add_array)) {
 
-		foreach($add_array as $key=>$val){
-			$update_array=array('value'=>$val);
+		foreach ($add_array as $key=>$val) {
+			$update_array = array('value'=>$val);
 			$this->system_model->edit_configuration($update_array, $key);
 		}
             	$this->session->set_flashdata('astpp_errormsg', ucfirst($group_title).' Settings updated sucessfully!');
-	    	redirect(base_url() . 'systems/configuration/'.$group_title);
-        }else{
+	    	redirect(base_url().'systems/configuration/'.$group_title);
+        } else {
 	 	$this->load->view('view_systemconf', $data);
 	}
     }
@@ -166,7 +166,7 @@ 
         if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
              $account_data = $this->session->userdata("accountinfo");
 			 $reseller = $account_data['id'];
-             $this->resellertemplate_save($add_array,$reseller);
+             $this->resellertemplate_save($add_array, $reseller);
         }
         else
         {
@@ -174,12 +174,12 @@ 
         }
     }
     
-    function resellertemplate_save($data,$resellerid)
+    function resellertemplate_save($data, $resellerid)
     {
-        $where = array('name' => $data['name'],'reseller_id'=>$resellerid);
+        $where = array('name' => $data['name'], 'reseller_id'=>$resellerid);
         $count = $this->db_model->countQuery("*", "default_templates", $where);
         $data['form'] = $this->form->build_form($this->system_form->get_template_form_fields(), $data);
-        if($count >0)
+        if ($count > 0)
         {
             $data['page_title'] = 'Edit Template';
             if ($this->form_validation->run() == FALSE) {
@@ -188,7 +188,7 @@ 
                 
                 $this->system_model->edit_resellertemplate($data, $data['id']);
                 $this->session->set_flashdata('astpp_errormsg', 'Template updated successfully!');
-                redirect(base_url() . 'systems/template/');
+                redirect(base_url().'systems/template/');
                 exit;
             }
         } else {
@@ -199,7 +199,7 @@ 
                  $data['reseller_id'] = $resellerid;
                 $this->system_model->add_resellertemplate($data);
                 $this->session->set_flashdata('astpp_errormsg', 'Template added successfully!');
-                redirect(base_url() . 'systems/template/');
+                redirect(base_url().'systems/template/');
                 exit;
             }
         }
@@ -217,7 +217,7 @@ 
                  unset($data['page_title']);
                 $this->system_model->edit_template($data, $data['id']);
                 $this->session->set_flashdata('astpp_errormsg', 'Template updated successfully!');
-                redirect(base_url() . 'systems/template/');
+                redirect(base_url().'systems/template/');
                 exit;
             }
         } else {
@@ -228,7 +228,7 @@ 
                  unset($data['form']);
                 $this->system_model->add_template($data);
                 $this->session->set_flashdata('astpp_errormsg', 'Template added successfully!');
-                redirect(base_url() . 'systems/template/');
+                redirect(base_url().'systems/template/');
                 exit;
             }
         }
@@ -245,7 +245,7 @@ 
             $this->session->set_userdata('template_search', $action);
         }
         if (@$ajax_search != 1) {
-            redirect(base_url() . 'systems/template/');
+            redirect(base_url().'systems/template/');
         }
     }
 
@@ -293,7 +293,7 @@ 
             $this->session->set_userdata('country_list_search', $action);
         }
         if (@$ajax_search != 1) {
-            redirect(base_url() . 'systems/country_list/');
+            redirect(base_url().'systems/country_list/');
         }
     }
 
@@ -352,9 +352,9 @@ 
     
     function country_remove($id) {
         $this->system_model->remove_country($id);
-        $country=$this->common->get_field_name('country','countrycode',$id);
+        $country = $this->common->get_field_name('country', 'countrycode', $id);
         $this->session->set_flashdata('astpp_notification', $country.'Country removed successfully!');
-        redirect(base_url() . 'systems/country_list/');
+        redirect(base_url().'systems/country_list/');
     }
 
     function country_delete_multiple() {
@@ -405,7 +405,7 @@ 
             $this->session->set_userdata('currency_list_search', $action);
         }
         if (@$ajax_search != 1) {
-            redirect(base_url() . 'systems/currency_list/');
+            redirect(base_url().'systems/currency_list/');
         }
     }
 
@@ -464,10 +464,10 @@ 
     }
     
      function currency_remove($id) {
-		$currencyname=$this->common->get_field_name('currencyname','currency',$id);
+		$currencyname = $this->common->get_field_name('currencyname', 'currency', $id);
         $this->system_model->remove_currency($id);
-        $this->session->set_flashdata('astpp_notification',$currencyname. ' Currency removed successfully!');
-        redirect(base_url() . 'systems/currency_list/');
+        $this->session->set_flashdata('astpp_notification', $currencyname.' Currency removed successfully!');
+        redirect(base_url().'systems/currency_list/');
     }
 
     function currency_delete_multiple() {
@@ -478,53 +478,53 @@ 
     }
     function database_backup()
     {
-        $data=array();
+        $data = array();
         $data['username'] = $this->session->userdata('user_name');
         $data['page_title'] = 'Database Backup';
-        $filename=$this->db->database."_".date("YmdHms").".sql.gz";
+        $filename = $this->db->database."_".date("YmdHms").".sql.gz";
         $data['form'] = $this->form->build_form($this->system_form->get_backup_database_form_fields($filename), '');
         $this->load->view('view_database_backup', $data);
     }
     function database_backup_save()
     { 
 
-      $add_array=$this->input->post();
+      $add_array = $this->input->post();
       
-      $data['form'] = $this->form->build_form($this->system_form->get_backup_database_form_fields($add_array['path'],$add_array['id']),$add_array);
+      $data['form'] = $this->form->build_form($this->system_form->get_backup_database_form_fields($add_array['path'], $add_array['id']), $add_array);
       $data['page_title'] = 'Database Backup';
-      if($add_array['id'] != ''){
+      if ($add_array['id'] != '') {
       
-      }else{
-           if($this->form_validation->run() == FALSE) {
+      } else {
+           if ($this->form_validation->run() == FALSE) {
                 $data['validation_errors'] = validation_errors();
                 echo $data['validation_errors'];
                 exit;
-          }else{
+          } else {
              $db_name     = $this->db->database;
              $db_username = $this->db->username;
              $db_password = $this->db->password;
              $db_hostname = $this->db->hostname;
              $filename = $add_array['path'];
-             $backup_file=DATABASE_DIRECTORY.$filename;
-            if (substr($backup_file,-3)=='.gz'){
-                  $backup_file = substr($backup_file,0,-3);
-                  $do_gzip=1;
+             $backup_file = DATABASE_DIRECTORY.$filename;
+            if (substr($backup_file, -3) == '.gz') {
+                  $backup_file = substr($backup_file, 0, -3);
+                  $do_gzip = 1;
             }
 
-           $run_backup="/usr/bin/mysqldump -all --databases ".$db_name." -u'".$db_username."' -p'".$db_password."' > '$backup_file'";
-           $error_zip=0;
-           exec($run_backup,$output,$error);
-           if ($do_gzip){
+           $run_backup = "/usr/bin/mysqldump -all --databases ".$db_name." -u'".$db_username."' -p'".$db_password."' > '$backup_file'";
+           $error_zip = 0;
+           exec($run_backup, $output, $error);
+           if ($do_gzip) {
               $gzip = $this->config->item('gzip-path');
               $run_gzip = $gzip." ".$backup_file;
-              exec($run_gzip,$output,$error_zip);
+              exec($run_gzip, $output, $error_zip);
            }
           
-           if($error == 0 && $error_zip == 0 ){      
+           if ($error == 0 && $error_zip == 0) {      
               $this->system_model->backup_insert($add_array);
               echo json_encode(array("SUCCESS"=> $add_array['backup_name']." backup exported successfully!"));
               exit;
-           }else{
+           } else {
                 echo 'An error occur when the system tried to backup of the database. Please check yours system settings for the backup section';
                 exit;
            }
@@ -541,7 +541,7 @@ 
     {
     $json_data = array();
         $count_all = $this->system_model->getbackup_list(false, "", "");
-        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'],$_GET['page']);
+        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
         $json_data = $paging_data["json_paging"];
 
         $query = $this->system_model->getbackup_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
@@ -551,56 +551,56 @@ 
         echo json_encode($json_data);
     exit;
     }
-    function database_restore_one($id='')
+    function database_restore_one($id = '')
     {
        $result = $this->system_model->get_backup_data($id);
-       $result_array=$result->result_array();
-       if($result->num_rows() > 0)
+       $result_array = $result->result_array();
+       if ($result->num_rows() > 0)
        {
             $db_name     = $this->db->database;
             $db_username = $this->db->username;
             $db_password = $this->db->password;
             $db_hostname = $this->db->hostname;            
-            $path=DATABASE_DIRECTORY.$result_array[0]['path'];
-            if(file_exists($path)){
-              if (substr($path,-3)=='.gz') {
+            $path = DATABASE_DIRECTORY.$result_array[0]['path'];
+            if (file_exists($path)) {
+              if (substr($path, -3) == '.gz') {
                             $GUNZIP_EXE = $this->config->item('gunzip-path');
                             $run_gzip = $GUNZIP_EXE." < ".$path." | ";
               }
-              $MYSQL="/usr/bin/mysql";
+              $MYSQL = "/usr/bin/mysql";
               $run_restore = $run_gzip.$MYSQL." -h".$db_hostname." -u".$db_username." -p".$db_password." ".$db_name;
               exec($run_restore);
               $this->session->set_flashdata('astpp_errormsg', 'Database Restore successfully.');
-              redirect(base_url() . 'systems/database_restore/');
-            }else{
+              redirect(base_url().'systems/database_restore/');
+            } else {
               $this->session->set_flashdata('astpp_notification', 'File not exists!');
-              redirect(base_url() . 'systems/database_restore/');
+              redirect(base_url().'systems/database_restore/');
             }
       }
-      redirect(base_url() . 'systems/database_restore/');
+      redirect(base_url().'systems/database_restore/');
     }
 
- function database_download($id=''){
+ function database_download($id = '') {
     
     $result = $this->system_model->get_backup_data($id);
-    $result_array=$result->result_array();
-    if($result->num_rows() > 0)
+    $result_array = $result->result_array();
+    if ($result->num_rows() > 0)
     {
-      $path=$result_array[0]['path'];
+      $path = $result_array[0]['path'];
       $filename = basename($path);
       $len = filesize($path);
       
       header("Content-Encoding: binary");
       header("Content-Type: application/octet-stream");
-      header( "content-length: " . $len );
-      header( "content-disposition: attachment; filename=" . $filename );
+      header("content-length: ".$len);
+      header("content-disposition: attachment; filename=".$filename);
       header("Expires: 0");
       header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
       header("Cache-Control: private");
       header("Pragma: public");
       ob_clean();
-      $fp=fopen( $path, "r" );
-      fpassthru( $fp );
+      $fp = fopen($path, "r");
+      fpassthru($fp);
       exit;
     }
     }
@@ -614,17 +614,17 @@ 
    function database_import_file()
     {
         $filename = $_POST['fname'];
-        $upload_greeting_file= $_FILES['userfile']['name'];
-        $db_file = explode(".",$upload_greeting_file); 
-        if( $db_file[1] == 'csv' || $db_file[1] == 'tar' || $db_file[1] == 'sql'){
-            $target_path = basename( $_FILES['userfile']['name']);
-            move_uploaded_file($_FILES["userfile"]["tmp_name"], $target_path );
+        $upload_greeting_file = $_FILES['userfile']['name'];
+        $db_file = explode(".", $upload_greeting_file); 
+        if ($db_file[1] == 'csv' || $db_file[1] == 'tar' || $db_file[1] == 'sql') {
+            $target_path = basename($_FILES['userfile']['name']);
+            move_uploaded_file($_FILES["userfile"]["tmp_name"], $target_path);
           
-            $query = $this->system_model->import_database($filename,$_FILES['userfile']['name']);
-            $this->session->set_flashdata('astpp_errormsg',"The file ".  basename( $_FILES['userfile']['name'])." has been uploaded");
+            $query = $this->system_model->import_database($filename, $_FILES['userfile']['name']);
+            $this->session->set_flashdata('astpp_errormsg', "The file ".basename($_FILES['userfile']['name'])." has been uploaded");
             redirect(base_url()."systems/database_restore/");            
-        }else{
-            $this->session->set_flashdata('astpp_notification',"There is a some issue or invalid file format.");
+        } else {
+            $this->session->set_flashdata('astpp_notification', "There is a some issue or invalid file format.");
             redirect(base_url()."systems/database_restore/");            
         }
     }
@@ -634,7 +634,7 @@ 
       $this->db->where($where);
       $this->db->delete("backup_database");
       $this->session->set_flashdata('astpp_errormsg', 'Database backup deleted successfully.');      
-      redirect(base_url() . 'systems/database_restore/');
+      redirect(base_url().'systems/database_restore/');
       return true;
     }
     function database_backup_delete_multiple() {

Braces +10 added lines, -10 removed lines

@@ -33,8 +33,9 @@ 
         $this->load->model('system_model');
         $this->load->dbutil();
 
-        if ($this->session->userdata('user_login') == FALSE)
-            redirect(base_url() . '/astpp/login');
+        if ($this->session->userdata('user_login') == FALSE) {
+                    redirect(base_url() . '/astpp/login');
+        }
     }
 
     function configuration_edit($edit_id = '') {
@@ -106,7 +107,7 @@ 
 		}
             	$this->session->set_flashdata('astpp_errormsg', ucfirst($group_title).' Settings updated sucessfully!');
 	    	redirect(base_url() . 'systems/configuration/'.$group_title);
-        }else{
+        } else{
 	 	$this->load->view('view_systemconf', $data);
 	}
     }
@@ -167,8 +168,7 @@ 
              $account_data = $this->session->userdata("accountinfo");
 			 $reseller = $account_data['id'];
              $this->resellertemplate_save($add_array,$reseller);
-        }
-        else
+        } else
         {
             $this->admintemplate_save($add_array);
         }
@@ -494,12 +494,12 @@ 
       $data['page_title'] = 'Database Backup';
       if($add_array['id'] != ''){
       
-      }else{
+      } else{
            if($this->form_validation->run() == FALSE) {
                 $data['validation_errors'] = validation_errors();
                 echo $data['validation_errors'];
                 exit;
-          }else{
+          } else{
              $db_name     = $this->db->database;
              $db_username = $this->db->username;
              $db_password = $this->db->password;
@@ -524,7 +524,7 @@ 
               $this->system_model->backup_insert($add_array);
               echo json_encode(array("SUCCESS"=> $add_array['backup_name']." backup exported successfully!"));
               exit;
-           }else{
+           } else{
                 echo 'An error occur when the system tried to backup of the database. Please check yours system settings for the backup section';
                 exit;
            }
@@ -572,7 +572,7 @@ 
               exec($run_restore);
               $this->session->set_flashdata('astpp_errormsg', 'Database Restore successfully.');
               redirect(base_url() . 'systems/database_restore/');
-            }else{
+            } else{
               $this->session->set_flashdata('astpp_notification', 'File not exists!');
               redirect(base_url() . 'systems/database_restore/');
             }
@@ -623,7 +623,7 @@ 
             $query = $this->system_model->import_database($filename,$_FILES['userfile']['name']);
             $this->session->set_flashdata('astpp_errormsg',"The file ".  basename( $_FILES['userfile']['name'])." has been uploaded");
             redirect(base_url()."systems/database_restore/");            
-        }else{
+        } else{
             $this->session->set_flashdata('astpp_notification',"There is a some issue or invalid file format.");
             redirect(base_url()."systems/database_restore/");            
         }

web_interface/astpp/application/modules/systems/libraries/system_form.php

Indentation +172 added lines, -172 removed lines

@@ -22,221 +22,221 @@ 
 ###############################################################################

 

 if (!defined('BASEPATH'))

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

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

 

 class System_form {

 

-    function get_template_form_fields() {

+	function get_template_form_fields() {

 

-        $form['forms'] = array(base_url() . 'systems/template_save/', array("template_form", "name" => "template_form"));

-        $form['Email Template'] = array(

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

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

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

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

-        );

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

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

+		$form['forms'] = array(base_url() . 'systems/template_save/', array("template_form", "name" => "template_form"));

+		$form['Email Template'] = array(

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

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

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

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

+		);

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

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

 

-        return $form;

-    }

+		return $form;

+	}

 

-    function get_template_search_form() {

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

-        $form['Search'] = array(

+	function get_template_search_form() {

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

+		$form['Search'] = array(

             

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

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

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

-        );

-        $form['button_search'] = array('name' => 'action', 'id' => "template_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;

-    }

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

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

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

+		);

+		$form['button_search'] = array('name' => 'action', 'id' => "template_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;

+	}

 

-    function get_configuration_form_fields() {

+	function get_configuration_form_fields() {

 

-        $form['forms'] = array(base_url() . 'systems/configuration_save/', array("id" => "config_form", "name" => "config_form"));

-        $form['Edit Settings '] = array(

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

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

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

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

-        );

+		$form['forms'] = array(base_url() . 'systems/configuration_save/', array("id" => "config_form", "name" => "config_form"));

+		$form['Edit Settings '] = array(

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

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

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

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

+		);

 

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

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

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

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

 

-        return $form;

-    }

+		return $form;

+	}

 

-    function get_configuration_search_form() {

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

-        $form['Search'] = array(

+	function get_configuration_search_form() {

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

+		$form['Search'] = array(

            

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

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

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

-            array('Group', 'group_title', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'group_title', 'group_title', 'system', 'build_dropdown','where_arr',"group_title NOT IN ('asterisk','osc','freepbx')", 'group_by', 'group_title'),

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

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

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

+			array('Group', 'group_title', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'group_title', 'group_title', 'system', 'build_dropdown','where_arr',"group_title NOT IN ('asterisk','osc','freepbx')", 'group_by', 'group_title'),

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

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

-        );

-        $form['button_search'] = array('name' => 'action', 'id' => "configuration_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;

-    }

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

+		);

+		$form['button_search'] = array('name' => 'action', 'id' => "configuration_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;

+	}

 

-    function build_system_list_for_admin() {

-        $grid_field_arr = json_encode(array(

-            array("Name", "190", "name", "", "", ""),

-            array("Value", "190", "value", "", "", ""),

-            array("Description", "320", "comment", "", "", ""),

-            array("Group", "120", "group_title", "", "", ""),

-            array("Action", "442", "", "", "",array("EDIT" => array("url" => "systems/configuration_edit/", "mode" => "popup"),

-            ))

-                ));

-        return $grid_field_arr;

-    }

+	function build_system_list_for_admin() {

+		$grid_field_arr = json_encode(array(

+			array("Name", "190", "name", "", "", ""),

+			array("Value", "190", "value", "", "", ""),

+			array("Description", "320", "comment", "", "", ""),

+			array("Group", "120", "group_title", "", "", ""),

+			array("Action", "442", "", "", "",array("EDIT" => array("url" => "systems/configuration_edit/", "mode" => "popup"),

+			))

+				));

+		return $grid_field_arr;

+	}

 

-    function build_grid_buttons() {

-        $buttons_json = json_encode(array(

-            ));

-        return $buttons_json;

-    }

+	function build_grid_buttons() {

+		$buttons_json = json_encode(array(

+			));

+		return $buttons_json;

+	}

 

-    function build_template_list_for_admin() {

-        $grid_field_arr = json_encode(array(array("Name", "425", "name", "", "", "","","true","center"),

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

-            array("Action", "200", "", "", "",array("EDIT" => array("url" => "systems/template_edit/", "mode" => "single"),

-            ))

-                ));

-        return $grid_field_arr;

-    }

+	function build_template_list_for_admin() {

+		$grid_field_arr = json_encode(array(array("Name", "425", "name", "", "", "","","true","center"),

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

+			array("Action", "200", "", "", "",array("EDIT" => array("url" => "systems/template_edit/", "mode" => "single"),

+			))

+				));

+		return $grid_field_arr;

+	}

 

-    function build_country_list_for_admin() {     

-            $action = 'systems/country_list_edit/';

-            $action_remove = 'systems/country_remove/';

-            $mode="popup";

-        $grid_field_arr = json_encode(array(

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

-            array("Name", "705", "country", "", "", "","","true","center"),

-               array("Action", "100", "", "", "", array("EDIT" => array("url" => "$action", "mode" => "$mode"),

-                    "DELETE" => array("url" => "$action_remove", "mode" => "single")

-                ))

-                ));

-        return $grid_field_arr;

-     }

+	function build_country_list_for_admin() {     

+			$action = 'systems/country_list_edit/';

+			$action_remove = 'systems/country_remove/';

+			$mode="popup";

+		$grid_field_arr = json_encode(array(

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

+			array("Name", "705", "country", "", "", "","","true","center"),

+			   array("Action", "100", "", "", "", array("EDIT" => array("url" => "$action", "mode" => "$mode"),

+					"DELETE" => array("url" => "$action_remove", "mode" => "single")

+				))

+				));

+		return $grid_field_arr;

+	 }

     

-     function build_admin_grid_buttons() {

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

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

-           ));

-        return $buttons_json;

-    }

+	 function build_admin_grid_buttons() {

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

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

+		   ));

+		return $buttons_json;

+	}

 

-     function get_search_country_form() {

+	 function get_search_country_form() {

 

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

-        $form['Search'] = array(

-            array('Name', 'id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'country', 'countrycode', 'build_dropdown', '', ''),

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

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

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

+		$form['Search'] = array(

+			array('Name', 'id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'country', 'countrycode', 'build_dropdown', '', ''),

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

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

             

-        );

+		);

 

-        $form['button_search'] = array('name' => 'action', 'id' => "country_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');

+		$form['button_search'] = array('name' => 'action', 'id' => "country_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;

-    }

+		return $form;

+	}

 

-     function get_country_form_fields() {

+	 function get_country_form_fields() {

      

         

-        $form['forms'] = array(base_url() . 'systems/country_save/', array('id' => 'system_form', 'method' => 'POST', 'name' => 'system_form'));

-        $form['Country List'] = array(

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

-            array('Name', 'INPUT', array('name' => 'country', 'size' => '20',  'class' => "text field medium"), 'trim|required|char|min_length[2]|max_length[20]|xss_clean', 'tOOL TIP', 'Please Enter country'),

+		$form['forms'] = array(base_url() . 'systems/country_save/', array('id' => 'system_form', 'method' => 'POST', 'name' => 'system_form'));

+		$form['Country List'] = array(

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

+			array('Name', 'INPUT', array('name' => 'country', 'size' => '20',  'class' => "text field medium"), 'trim|required|char|min_length[2]|max_length[20]|xss_clean', 'tOOL TIP', 'Please Enter country'),

 

-        );

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

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

-        return $form;

-    }

+		);

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

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

+		return $form;

+	}

 

-      function build_currency_list_for_admin() {        

-            $action = 'systems/currency_list_edit/';

-            $action_remove = 'systems/currency_remove/';

-            $mode="popup";

+	  function build_currency_list_for_admin() {        

+			$action = 'systems/currency_list_edit/';

+			$action_remove = 'systems/currency_remove/';

+			$mode="popup";

         

-        $grid_field_arr = json_encode(array(

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

-            array("Name", "320", "currencyname", "", "", "","","true","center"),

-	    array("Code", "290", "currency", "", "", "","","true","center"),

-	    array(" Rate", "330", "currencyrate", "", "", "","","true","right"),

-               array("Action", "265", "", "", "", array("EDIT" => array("url" => "$action", "mode" => "$mode"),

-                    "DELETE" => array("url" => "$action_remove", "mode" => "single")

-                ))

-                ));

-        return $grid_field_arr;

-     }

+		$grid_field_arr = json_encode(array(

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

+			array("Name", "320", "currencyname", "", "", "","","true","center"),

+		array("Code", "290", "currency", "", "", "","","true","center"),

+		array(" Rate", "330", "currencyrate", "", "", "","","true","right"),

+			   array("Action", "265", "", "", "", array("EDIT" => array("url" => "$action", "mode" => "$mode"),

+					"DELETE" => array("url" => "$action_remove", "mode" => "single")

+				))

+				));

+		return $grid_field_arr;

+	 }

 

-    function get_search_currency_form() {

+	function get_search_currency_form() {

 

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

-        $form['Search'] = array(

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

+		$form['Search'] = array(

             

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

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

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

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

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

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

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

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

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

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

 

-        $form['button_search'] = array('name' => 'action', 'id' => "currency_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');

+		$form['button_search'] = array('name' => 'action', 'id' => "currency_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;

-    }

+		return $form;

+	}

 

-    function get_currency_form_fields() {

+	function get_currency_form_fields() {

      

         

-        $form['forms'] = array(base_url() . 'systems/currency_save/', array('id' => 'system_form', 'method' => 'POST', 'name' => 'system_form'));

-        $form['Currency List'] = array(

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

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

+		$form['forms'] = array(base_url() . 'systems/currency_save/', array('id' => 'system_form', 'method' => 'POST', 'name' => 'system_form'));

+		$form['Currency List'] = array(

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

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

 			array('Code', 'INPUT', array('name' => 'currency', 'size' => '20','maxlength' => '3', 'class' => "text field medium"), 'trim|required|char|xss_clean', 'tOOL TIP', 'Please Enter country'),

-            array('Rate', 'INPUT', array('name' => 'currencyrate', 'size' => '20','maxlength' => '7', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter country'),

+			array('Rate', 'INPUT', array('name' => 'currencyrate', 'size' => '20','maxlength' => '7', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter country'),

 

-        );

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

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

-        return $form;

-    }

+		);

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

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

+		return $form;

+	}

 

-     function build_admin_currency_grid_buttons() {

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

-            array("Update Currencies","btn btn-line-blue" ,"fa fa-upload fa-lg", "button_action", "currencyupdate/update_currency/", 'single'),

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

-           ));

-        return $buttons_json;

-    }

+	 function build_admin_currency_grid_buttons() {

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

+			array("Update Currencies","btn btn-line-blue" ,"fa fa-upload fa-lg", "button_action", "currencyupdate/update_currency/", 'single'),

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

+		   ));

+		return $buttons_json;

+	}

  

   

   function get_backup_database_form_fields($file_name,$id='') {

    $val = $id > 0 ? "backup_database.path.$id" : 'backup_database.path';

-      $form['forms'] = array(base_url() . 'systems/database_backup_save/',array('id' => 'backup_form', 'method' => 'POST', 'name' => 'backup_form'));

-      $form['Database Information'] = array(

+	  $form['forms'] = array(base_url() . 'systems/database_backup_save/',array('id' => 'backup_form', 'method' => 'POST', 'name' => 'backup_form'));

+	  $form['Database Information'] = array(

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

 	  array('Name', 'INPUT', array('name' => 'backup_name', 'size' => '20', 'class' => "text field medium"), 'required', 'tOOL TIP', ''),

 	  array('File Name', 'INPUT', array('name' => 'path', 'size' => '20', 'value'=>$file_name,'class' => "text field medium"), 'trim|required|is_unique[' . $val . ']', 'tOOL TIP', ''),

-      );

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

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

-      return $form;

+	  );

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

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

+	  return $form;

   }

   function build_backupdastabase_list() {

-        $grid_field_arr = json_encode(array(

+		$grid_field_arr = json_encode(array(

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

 			array("Date", "260", "date", "date", "date", "convert_GMT_to","","true","center"),

 			array("Name", "295", "backup_name", "", "", "","","true","center"),

@@ -245,16 +245,16 @@ 
 			array("EDIT_RESTORE" => array("url" => "systems/database_restore_one/", "mode" => ""),

 			"DOWNLOAD_DATABASE" => array("url" => "systems/database_download/", "mode" => ""),

 			"Delete" => array("url" => "systems/database_delete/", "mode" => ""),

-            ))));

-        return $grid_field_arr;

-    }

-    function build_backupdastabase_buttons() {

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

+			))));

+		return $grid_field_arr;

+	}

+	function build_backupdastabase_buttons() {

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

 		  array("import","btn btn-line-blue" ,"fa fa-upload fa-lg", "button_action", "systems/database_import/", "popup"),	

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

 						));

-	      return $buttons_json;

-    }

+		  return $buttons_json;

+	}

 }

 

 ?>

Spacing +43 added lines, -43 removed lines

@@ -21,19 +21,19 @@ 
 # 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 System_form {

 

     function get_template_form_fields() {

 

-        $form['forms'] = array(base_url() . 'systems/template_save/', array("template_form", "name" => "template_form"));

+        $form['forms'] = array(base_url().'systems/template_save/', array("template_form", "name" => "template_form"));

         $form['Email Template'] = array(

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

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

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

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

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

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

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

         );

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

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

@@ -46,7 +46,7 @@ 
         $form['Search'] = array(

             

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

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

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

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

         );

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

@@ -56,12 +56,12 @@ 
 

     function get_configuration_form_fields() {

 

-        $form['forms'] = array(base_url() . 'systems/configuration_save/', array("id" => "config_form", "name" => "config_form"));

+        $form['forms'] = array(base_url().'systems/configuration_save/', array("id" => "config_form", "name" => "config_form"));

         $form['Edit Settings '] = array(

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

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

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

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

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

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

         );

 

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

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

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

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

-            array('Group', 'group_title', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'group_title', 'group_title', 'system', 'build_dropdown','where_arr',"group_title NOT IN ('asterisk','osc','freepbx')", 'group_by', 'group_title'),

+            array('Group', 'group_title', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'group_title', 'group_title', 'system', 'build_dropdown', 'where_arr', "group_title NOT IN ('asterisk','osc','freepbx')", 'group_by', 'group_title'),

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

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

         );

@@ -92,7 +92,7 @@ 
             array("Value", "190", "value", "", "", ""),

             array("Description", "320", "comment", "", "", ""),

             array("Group", "120", "group_title", "", "", ""),

-            array("Action", "442", "", "", "",array("EDIT" => array("url" => "systems/configuration_edit/", "mode" => "popup"),

+            array("Action", "442", "", "", "", array("EDIT" => array("url" => "systems/configuration_edit/", "mode" => "popup"),

             ))

                 ));

         return $grid_field_arr;

@@ -105,9 +105,9 @@ 
     }

 

     function build_template_list_for_admin() {

-        $grid_field_arr = json_encode(array(array("Name", "425", "name", "", "", "","","true","center"),

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

-            array("Action", "200", "", "", "",array("EDIT" => array("url" => "systems/template_edit/", "mode" => "single"),

+        $grid_field_arr = json_encode(array(array("Name", "425", "name", "", "", "", "", "true", "center"),

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

+            array("Action", "200", "", "", "", array("EDIT" => array("url" => "systems/template_edit/", "mode" => "single"),

             ))

                 ));

         return $grid_field_arr;

@@ -116,10 +116,10 @@ 
     function build_country_list_for_admin() {     

             $action = 'systems/country_list_edit/';

             $action_remove = 'systems/country_remove/';

-            $mode="popup";

+            $mode = "popup";

         $grid_field_arr = json_encode(array(

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

-            array("Name", "705", "country", "", "", "","","true","center"),

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

+            array("Name", "705", "country", "", "", "", "", "true", "center"),

                array("Action", "100", "", "", "", array("EDIT" => array("url" => "$action", "mode" => "$mode"),

                     "DELETE" => array("url" => "$action_remove", "mode" => "single")

                 ))

@@ -128,8 +128,8 @@ 
      }

     

      function build_admin_grid_buttons() {

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

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

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

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

            ));

         return $buttons_json;

     }

@@ -153,10 +153,10 @@ 
      function get_country_form_fields() {

      

         

-        $form['forms'] = array(base_url() . 'systems/country_save/', array('id' => 'system_form', 'method' => 'POST', 'name' => 'system_form'));

+        $form['forms'] = array(base_url().'systems/country_save/', array('id' => 'system_form', 'method' => 'POST', 'name' => 'system_form'));

         $form['Country List'] = array(

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

-            array('Name', 'INPUT', array('name' => 'country', 'size' => '20',  'class' => "text field medium"), 'trim|required|char|min_length[2]|max_length[20]|xss_clean', 'tOOL TIP', 'Please Enter country'),

+            array('Name', 'INPUT', array('name' => 'country', 'size' => '20', 'class' => "text field medium"), 'trim|required|char|min_length[2]|max_length[20]|xss_clean', 'tOOL TIP', 'Please Enter country'),

 

         );

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

@@ -167,13 +167,13 @@ 
       function build_currency_list_for_admin() {        

             $action = 'systems/currency_list_edit/';

             $action_remove = 'systems/currency_remove/';

-            $mode="popup";

+            $mode = "popup";

         

         $grid_field_arr = json_encode(array(

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

-            array("Name", "320", "currencyname", "", "", "","","true","center"),

-	    array("Code", "290", "currency", "", "", "","","true","center"),

-	    array(" Rate", "330", "currencyrate", "", "", "","","true","right"),

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

+            array("Name", "320", "currencyname", "", "", "", "", "true", "center"),

+	    array("Code", "290", "currency", "", "", "", "", "true", "center"),

+	    array(" Rate", "330", "currencyrate", "", "", "", "", "true", "right"),

                array("Action", "265", "", "", "", array("EDIT" => array("url" => "$action", "mode" => "$mode"),

                     "DELETE" => array("url" => "$action_remove", "mode" => "single")

                 ))

@@ -201,12 +201,12 @@ 
     function get_currency_form_fields() {

      

         

-        $form['forms'] = array(base_url() . 'systems/currency_save/', array('id' => 'system_form', 'method' => 'POST', 'name' => 'system_form'));

+        $form['forms'] = array(base_url().'systems/currency_save/', array('id' => 'system_form', 'method' => 'POST', 'name' => 'system_form'));

         $form['Currency List'] = array(

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

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

-			array('Code', 'INPUT', array('name' => 'currency', 'size' => '20','maxlength' => '3', 'class' => "text field medium"), 'trim|required|char|xss_clean', 'tOOL TIP', 'Please Enter country'),

-            array('Rate', 'INPUT', array('name' => 'currencyrate', 'size' => '20','maxlength' => '7', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter country'),

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

+			array('Code', 'INPUT', array('name' => 'currency', 'size' => '20', 'maxlength' => '3', 'class' => "text field medium"), 'trim|required|char|xss_clean', 'tOOL TIP', 'Please Enter country'),

+            array('Rate', 'INPUT', array('name' => 'currencyrate', 'size' => '20', 'maxlength' => '7', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter country'),

 

         );

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

@@ -215,21 +215,21 @@ 
     }

 

      function build_admin_currency_grid_buttons() {

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

-            array("Update Currencies","btn btn-line-blue" ,"fa fa-upload fa-lg", "button_action", "currencyupdate/update_currency/", 'single'),

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

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

+            array("Update Currencies", "btn btn-line-blue", "fa fa-upload fa-lg", "button_action", "currencyupdate/update_currency/", 'single'),

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

            ));

         return $buttons_json;

     }

  

   

-  function get_backup_database_form_fields($file_name,$id='') {

+  function get_backup_database_form_fields($file_name, $id = '') {

    $val = $id > 0 ? "backup_database.path.$id" : 'backup_database.path';

-      $form['forms'] = array(base_url() . 'systems/database_backup_save/',array('id' => 'backup_form', 'method' => 'POST', 'name' => 'backup_form'));

+      $form['forms'] = array(base_url().'systems/database_backup_save/', array('id' => 'backup_form', 'method' => 'POST', 'name' => 'backup_form'));

       $form['Database Information'] = array(

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

 	  array('Name', 'INPUT', array('name' => 'backup_name', 'size' => '20', 'class' => "text field medium"), 'required', 'tOOL TIP', ''),

-	  array('File Name', 'INPUT', array('name' => 'path', 'size' => '20', 'value'=>$file_name,'class' => "text field medium"), 'trim|required|is_unique[' . $val . ']', 'tOOL TIP', ''),

+	  array('File Name', 'INPUT', array('name' => 'path', 'size' => '20', 'value'=>$file_name, 'class' => "text field medium"), 'trim|required|is_unique['.$val.']', 'tOOL TIP', ''),

       );

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

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

@@ -237,10 +237,10 @@ 
   }

   function build_backupdastabase_list() {

         $grid_field_arr = json_encode(array(

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

-			array("Date", "260", "date", "date", "date", "convert_GMT_to","","true","center"),

-			array("Name", "295", "backup_name", "", "", "","","true","center"),

-			array("File Name", "480", "path", "", "", "","","true","center"),

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

+			array("Date", "260", "date", "date", "date", "convert_GMT_to", "", "true", "center"),

+			array("Name", "295", "backup_name", "", "", "", "", "true", "center"),

+			array("File Name", "480", "path", "", "", "", "", "true", "center"),

 			array("Action", "185", "", "", "",

 			array("EDIT_RESTORE" => array("url" => "systems/database_restore_one/", "mode" => ""),

 			"DOWNLOAD_DATABASE" => array("url" => "systems/database_download/", "mode" => ""),

@@ -249,9 +249,9 @@ 
         return $grid_field_arr;

     }

     function build_backupdastabase_buttons() {

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

-		  array("import","btn btn-line-blue" ,"fa fa-upload fa-lg", "button_action", "systems/database_import/", "popup"),	

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

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

+		  array("import", "btn btn-line-blue", "fa fa-upload fa-lg", "button_action", "systems/database_import/", "popup"),	

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

 						));

 	      return $buttons_json;

     }

Braces +3 added lines, -2 removed lines

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

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

 

-if (!defined('BASEPATH'))

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

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

 class Package_form {

 

web_interface/astpp/application/modules/systems/views/view_template_add_edit.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <? extend('master.php') ?>

-<?php error_reporting(E_ERROR);?>

+<?php error_reporting(E_ERROR); ?>

 <? startblock('extra_head') ?>

 

 <script type="text/javascript" src="<?php echo base_url(); ?>assets/tinymce/tinymce.min.js">

@@ -44,7 +44,7 @@ 
 	<div class="w-section inverse no-padding">

             <?php echo $form; ?>

 			<?php

-				if(isset($validation_errors) && $validation_errors != ''){ ?>

+				if (isset($validation_errors) && $validation_errors != '') { ?>

 				<script>

 					var ERR_STR = '<?php echo $validation_errors; ?>';

 					print_error(ERR_STR);

web_interface/astpp/application/modules/systems/views/view_systemconf.php

Indentation +15 added lines, -15 removed lines

@@ -180,25 +180,25 @@
                     <?php $count=ceil(sizeof($details)/2); $i=0; $class="tleft";?>

                     <?php foreach($details as$key=>$val){ ?>

                           <?php if($count==$i){

-                              echo '</div><div style="width:50%;float:left;">';

-                              $class="tright";

-                          } ?>

+							  echo '</div><div style="width:50%;float:left;">';

+							  $class="tright";

+						  } ?>

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

                             <div class="<?=$class?>" href='#'>

                             <label class="col-md-5 no-padding"><?php echo $val['display_name'];?> * </label>

                             <?php if(method_exists($this->common,$val['field_type'])){

-                                $option_array =  $this->common->$val['field_type'](); 

-                                $drpstr = '<select name="'.$val['name'].'" class="col-md-5 form-control selectpicker"  data-live-search="true">';

-                                      foreach($option_array as $option_key=>$option_val){

-                                        $selected = ($val['value'] == $option_key)? "selected='selected'":"";

-                                        $drpstr .= '<option value="'.$option_key.'"'.$selected.'>'.$option_val.'</option>';

-                                      }

-                                $drpstr .= '</select>';

-                                echo $drpstr;

-                                unset($drpstr);

-                            } else{

-                                echo '<input name="'.$val["name"].'" value="'.$val['value'].'" size="20" maxlength="100" class="col-md-5 form-control" type="text">'; 

-                            }?>

+								$option_array =  $this->common->$val['field_type'](); 

+								$drpstr = '<select name="'.$val['name'].'" class="col-md-5 form-control selectpicker"  data-live-search="true">';

+									  foreach($option_array as $option_key=>$option_val){

+										$selected = ($val['value'] == $option_key)? "selected='selected'":"";

+										$drpstr .= '<option value="'.$option_key.'"'.$selected.'>'.$option_val.'</option>';

+									  }

+								$drpstr .= '</select>';

+								echo $drpstr;

+								unset($drpstr);

+							} else{

+								echo '<input name="'.$val["name"].'" value="'.$val['value'].'" size="20" maxlength="100" class="col-md-5 form-control" type="text">'; 

+							}?>

                               <span class="demo"><?php echo str_replace('smtp',"SMTP",$val['comment']);?></span>

 

                             </div>

Spacing +17 added lines, -17 removed lines

@@ -1,5 +1,5 @@ 
 <? extend('left_panel_setting_master.php') ?>

-<?php error_reporting(E_ERROR);?>

+<?php error_reporting(E_ERROR); ?>

 <? startblock('extra_head') ?>

 <?php endblock() ?>

 

@@ -160,11 +160,11 @@ 
         <div class="pull-right">

             <ul class="breadcrumb">

                 <li>

-                    <a href="<?= base_url() . "systems/configuration/global"; ?>"> Global</a>

+                    <a href="<?= base_url()."systems/configuration/global"; ?>"> Global</a>

                 </li>

-                <?php if($group_title != "global") { ?>

+                <?php if ($group_title != "global") { ?>

                 <li class="active">

-                    <a href="<?= base_url() . "systems/configuration/".$group_title ; ?>"> <?php echo ucfirst($group_title); ?></a>

+                    <a href="<?= base_url()."systems/configuration/".$group_title; ?>"> <?php echo ucfirst($group_title); ?></a>

                 </li>

                 <?php } ?>

             </ul>

@@ -176,35 +176,35 @@ 
               <fieldset>

                <legend> <?=ucfirst($group_title)?></legend>

                   <div style="width:50%;float:left;">

-                    <?php $currency = Common_model::$global_config['system_config']['base_currency'];?>

-                    <?php $count=ceil(sizeof($details)/2); $i=0; $class="tleft";?>

-                    <?php foreach($details as$key=>$val){ ?>

-                          <?php if($count==$i){

+                    <?php $currency = Common_model::$global_config['system_config']['base_currency']; ?>

+                    <?php $count = ceil(sizeof($details) / 2); $i = 0; $class = "tleft"; ?>

+                    <?php foreach ($details as$key=>$val) { ?>

+                          <?php if ($count == $i) {

                               echo '</div><div style="width:50%;float:left;">';

-                              $class="tright";

+                              $class = "tright";

                           } ?>

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

                             <div class="<?=$class?>" href='#'>

-                            <label class="col-md-5 no-padding"><?php echo $val['display_name'];?> * </label>

-                            <?php if(method_exists($this->common,$val['field_type'])){

-                                $option_array =  $this->common->$val['field_type'](); 

+                            <label class="col-md-5 no-padding"><?php echo $val['display_name']; ?> * </label>

+                            <?php if (method_exists($this->common, $val['field_type'])) {

+                                $option_array = $this->common->$val['field_type'](); 

                                 $drpstr = '<select name="'.$val['name'].'" class="col-md-5 form-control selectpicker"  data-live-search="true">';

-                                      foreach($option_array as $option_key=>$option_val){

-                                        $selected = ($val['value'] == $option_key)? "selected='selected'":"";

+                                      foreach ($option_array as $option_key=>$option_val) {

+                                        $selected = ($val['value'] == $option_key) ? "selected='selected'" : "";

                                         $drpstr .= '<option value="'.$option_key.'"'.$selected.'>'.$option_val.'</option>';

                                       }

                                 $drpstr .= '</select>';

                                 echo $drpstr;

                                 unset($drpstr);

-                            } else{

+                            } else {

                                 echo '<input name="'.$val["name"].'" value="'.$val['value'].'" size="20" maxlength="100" class="col-md-5 form-control" type="text">'; 

                             }?>

-                              <span class="demo"><?php echo str_replace('smtp',"SMTP",$val['comment']);?></span>

+                              <span class="demo"><?php echo str_replace('smtp', "SMTP", $val['comment']); ?></span>

 

                             </div>

                           </div>  

 

-                      <?php $i++;?>

+                      <?php $i++; ?>

                     <?php }?>

                   </div>

               </fieldset>

web_interface/astpp/application/modules/systems/models/system_model.php

Indentation +166 added lines, -166 removed lines

@@ -22,33 +22,33 @@ 
 ###############################################################################
 class System_model extends CI_Model {
 
-    function System_model() {
-        parent::__construct();
-    }
+	function System_model() {
+		parent::__construct();
+	}
 
-    function getsystem_list($flag, $start, $limit) {
+	function getsystem_list($flag, $start, $limit) {
 
-        $this->db_model->build_search('configuration_search');
-        $where = "group_title NOT IN ('asterisk','osc','freepbx')";
-        $this->db->where($where);
-        if ($flag) {
-            $query = $this->db_model->select("*", "system", "", "group_title,name", "ASC", $limit, $start);
-        } else {
-            $query = $this->db_model->countQuery("*", "system", "");
-        }
-        return $query;
-    }
+		$this->db_model->build_search('configuration_search');
+		$where = "group_title NOT IN ('asterisk','osc','freepbx')";
+		$this->db->where($where);
+		if ($flag) {
+			$query = $this->db_model->select("*", "system", "", "group_title,name", "ASC", $limit, $start);
+		} else {
+			$query = $this->db_model->countQuery("*", "system", "");
+		}
+		return $query;
+	}
 
-    function gettemplate_list($flag="", $start, $limit="") {
+	function gettemplate_list($flag="", $start, $limit="") {
 
          
-        if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
-            $account_data = $this->session->userdata("accountinfo");
-            $reseller = $account_data['id'];
-            $this->db->where('reseller_id',$reseller);
-            $query = $this->db_model->select("*", "default_templates","","","","","");
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			$account_data = $this->session->userdata("accountinfo");
+			$reseller = $account_data['id'];
+			$this->db->where('reseller_id',$reseller);
+			$query = $this->db_model->select("*", "default_templates","","","","","");
 
-            if($query->num_rows() >0){
+			if($query->num_rows() >0){
 		$result =$query->result_array();
 		$match_array =array();
 		$unmatch_array= array();
@@ -56,14 +56,14 @@ 
 		$str=0;
 		foreach($result as $value)
 		{
-		    $this->db->where('name',$value['name']);
-		    $this->db->where('reseller_id',0);
-		    $query = $this->db_model->select("id", "default_templates","", "id", "ASC", $limit, $start);		
-		    $innerresult =$query->result_array();
-		    foreach($innerresult as $value)
-		    {                   
-		      $str.=$value['id'].",";
-		    }		
+			$this->db->where('name',$value['name']);
+			$this->db->where('reseller_id',0);
+			$query = $this->db_model->select("id", "default_templates","", "id", "ASC", $limit, $start);		
+			$innerresult =$query->result_array();
+			foreach($innerresult as $value)
+			{                   
+			  $str.=$value['id'].",";
+			}		
 		}            
 		$str= rtrim($str,',');
 		
@@ -71,164 +71,164 @@ 
 		$this->db->where('reseller_id',$reseller);
 		$this->db->or_where('reseller_id',0);
 		$this->db->where($where);
-            }
-            else
-            {
-               $this->db->where('reseller_id',0);
-            }
+			}
+			else
+			{
+			   $this->db->where('reseller_id',0);
+			}
               
-            if($flag) {
+			if($flag) {
 
 		$query = $this->db_model->select("*", "default_templates","", "id", "ASC", $limit, $start);
-	     }else {
+		 }else {
 
 		$query = $this->db_model->countQuery("*", "default_templates","");
 		
-	     }
+		 }
 	  } 
 	  else {
           
-            $where = array('reseller_id' => 0);
-            $this->db->where($where);
-            $this->db_model->build_search('template_search');
+			$where = array('reseller_id' => 0);
+			$this->db->where($where);
+			$this->db_model->build_search('template_search');
 		if ($flag) {
-		    $query = $this->db_model->select("*", "default_templates","", "id", "ASC", $limit, $start);
+			$query = $this->db_model->select("*", "default_templates","", "id", "ASC", $limit, $start);
 		} else {
-		    $query = $this->db_model->countQuery("*", "default_templates","");
+			$query = $this->db_model->countQuery("*", "default_templates","");
 		}
 	  }
 
 	  return $query;
-    }
+	}
  
-    function edit_configuration($add_array, $name) {
-        unset($add_array["action"]);
+	function edit_configuration($add_array, $name) {
+		unset($add_array["action"]);
                         
-        $this->db->where("name", $name);
-        $this->db->update("system", $add_array);
-        if($name == 'base_currency'){
+		$this->db->where("name", $name);
+		$this->db->update("system", $add_array);
+		if($name == 'base_currency'){
             
-            $screen_path = getcwd() . "/cron";
-            $screen_filename = "CurrencyUpdate" . strtotime('now');
-            $command = "cd " . $screen_path . " && /usr/bin/screen -d -m -S  $screen_filename php cron.php CurrencyUpdate";
-            exec($command);
-            $this->db->update("currency",array("currencyrate"=>'1'),array("currency"=>"INR"));
-        }
-    }
-
-    function edit_template($data, $id) {
-        unset($data["action"]);
-        $data["last_modified_date"] = date("Y-m-d H:i:s");
-        $this->db->where("id", $id);
-        $this->db->update("default_templates", $data);
-    }
-    function edit_resellertemplate($data, $id) {
-        $arraydata = $data;
-        if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
-            $account_data = $this->session->userdata("accountinfo");
-            $reseller = $account_data['id'];
-	    $array = $data; 	
-            $data = array('reseller_id' => $reseller);
-            $this->db->where("id", $id);
-        } 
-        unset($arraydata["action"]);
-        unset($arraydata["form"]);
-        unset($arraydata["page_title"]);       
-        $this->db->update("default_templates", $arraydata);
-    }
-    function remove_template($id) {
-        $this->db->where("id", $id);
-        $this->db->update("default_templates", array("status" => 2));
-        return true;
-    }
-    function add_resellertemplate($data)
-    {
-         unset($data["action"]);
-         unset($data['id']);
-         $this->db->insert('default_templates', $data);
-         return true;
-    }
-    function getcountry_list($flag, $start = 0, $limit = 0) {
-        $this->db_model->build_search('country_list_search');
-        if ($flag) {
-            $query = $this->db_model->select("*", "countrycode", '', "id", "ASC", $limit, $start);
-        } else {
-            $query = $this->db_model->countQuery("*", "countrycode", '');
-        }
-        return $query;
-    }
-
-    function add_country($add_array) {
-        unset($add_array["action"]);
-        $this->db->insert("countrycode", $add_array);
-        return true;
-    }
-
-     function edit_country($data, $id) {
-        unset($data["action"]);
-        $this->db->where("id", $id);
-        $this->db->update("countrycode", $data);
-    }
-
-    function remove_country($id) {
-        $this->db->where("id", $id);
-        $this->db->delete("countrycode");
-        return true;
-    }
-
-    function getcurrency_list($flag, $start = 0, $limit = 0) {
-         $this->db_model->build_search('currency_list_search');
+			$screen_path = getcwd() . "/cron";
+			$screen_filename = "CurrencyUpdate" . strtotime('now');
+			$command = "cd " . $screen_path . " && /usr/bin/screen -d -m -S  $screen_filename php cron.php CurrencyUpdate";
+			exec($command);
+			$this->db->update("currency",array("currencyrate"=>'1'),array("currency"=>"INR"));
+		}
+	}
+
+	function edit_template($data, $id) {
+		unset($data["action"]);
+		$data["last_modified_date"] = date("Y-m-d H:i:s");
+		$this->db->where("id", $id);
+		$this->db->update("default_templates", $data);
+	}
+	function edit_resellertemplate($data, $id) {
+		$arraydata = $data;
+		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
+			$account_data = $this->session->userdata("accountinfo");
+			$reseller = $account_data['id'];
+		$array = $data; 	
+			$data = array('reseller_id' => $reseller);
+			$this->db->where("id", $id);
+		} 
+		unset($arraydata["action"]);
+		unset($arraydata["form"]);
+		unset($arraydata["page_title"]);       
+		$this->db->update("default_templates", $arraydata);
+	}
+	function remove_template($id) {
+		$this->db->where("id", $id);
+		$this->db->update("default_templates", array("status" => 2));
+		return true;
+	}
+	function add_resellertemplate($data)
+	{
+		 unset($data["action"]);
+		 unset($data['id']);
+		 $this->db->insert('default_templates', $data);
+		 return true;
+	}
+	function getcountry_list($flag, $start = 0, $limit = 0) {
+		$this->db_model->build_search('country_list_search');
+		if ($flag) {
+			$query = $this->db_model->select("*", "countrycode", '', "id", "ASC", $limit, $start);
+		} else {
+			$query = $this->db_model->countQuery("*", "countrycode", '');
+		}
+		return $query;
+	}
+
+	function add_country($add_array) {
+		unset($add_array["action"]);
+		$this->db->insert("countrycode", $add_array);
+		return true;
+	}
+
+	 function edit_country($data, $id) {
+		unset($data["action"]);
+		$this->db->where("id", $id);
+		$this->db->update("countrycode", $data);
+	}
+
+	function remove_country($id) {
+		$this->db->where("id", $id);
+		$this->db->delete("countrycode");
+		return true;
+	}
+
+	function getcurrency_list($flag, $start = 0, $limit = 0) {
+		 $this->db_model->build_search('currency_list_search');
 	
 	$where=array('currency <>' =>Common_model::$global_config['system_config']['base_currency']);
-        if ($flag) {
-            $query = $this->db_model->select("*", "currency", $where, "id", "ASC", $limit, $start);
-        } else {
-            $query = $this->db_model->countQuery("*", "currency", $where);
-        }
-        return $query;
-    }
-
-    function add_currency($add_array) {
-        unset($add_array["action"]);
-        $this->db->insert("currency", $add_array);
-        return true;
-    }
-
-     function edit_currency($data, $id) {
-        unset($data["action"]);
-        $this->db->where("id", $id);
-        $this->db->update("currency", $data);
-    }
-
-    function remove_currency($id) {
-        $this->db->where("id", $id);
-        $this->db->delete("currency");
-        return true;
-    }
-    function backup_insert($add_array='')
-    {
+		if ($flag) {
+			$query = $this->db_model->select("*", "currency", $where, "id", "ASC", $limit, $start);
+		} else {
+			$query = $this->db_model->countQuery("*", "currency", $where);
+		}
+		return $query;
+	}
+
+	function add_currency($add_array) {
+		unset($add_array["action"]);
+		$this->db->insert("currency", $add_array);
+		return true;
+	}
+
+	 function edit_currency($data, $id) {
+		unset($data["action"]);
+		$this->db->where("id", $id);
+		$this->db->update("currency", $data);
+	}
+
+	function remove_currency($id) {
+		$this->db->where("id", $id);
+		$this->db->delete("currency");
+		return true;
+	}
+	function backup_insert($add_array='')
+	{
 	 unset($add_array["action"]);
-        $this->db->insert("backup_database", $add_array);
-        return true;
-    }
-     function getbackup_list($flag, $start, $limit) {
-
-        if ($flag) {
-            $query = $this->db_model->select("*", "backup_database", "", "date", "DESC", $limit, $start);
-        } else {
-            $query = $this->db_model->countQuery("*", "backup_database", "");
-        }
-        return $query;
-    }
-    function get_backup_data($id)
-    {
-      $where=array('id'=>$id);
-      $query = $this->db_model->getSelect("*", "backup_database", $where);
-      return $query;
-    }
+		$this->db->insert("backup_database", $add_array);
+		return true;
+	}
+	 function getbackup_list($flag, $start, $limit) {
+
+		if ($flag) {
+			$query = $this->db_model->select("*", "backup_database", "", "date", "DESC", $limit, $start);
+		} else {
+			$query = $this->db_model->countQuery("*", "backup_database", "");
+		}
+		return $query;
+	}
+	function get_backup_data($id)
+	{
+	  $where=array('id'=>$id);
+	  $query = $this->db_model->getSelect("*", "backup_database", $where);
+	  return $query;
+	}
    function import_database($filename,$target_path)
-    {
+	{
 		$this->db->insert("backup_database", array('backup_name'=>$filename , 'path'=>$target_path));
-        	return true;
-    }
+			return true;
+	}
 }

Spacing +37 added lines, -37 removed lines

@@ -39,50 +39,50 @@ 
         return $query;
     }
 
-    function gettemplate_list($flag="", $start, $limit="") {
+    function gettemplate_list($flag = "", $start, $limit = "") {
 
          
         if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
             $account_data = $this->session->userdata("accountinfo");
             $reseller = $account_data['id'];
-            $this->db->where('reseller_id',$reseller);
-            $query = $this->db_model->select("*", "default_templates","","","","","");
-
-            if($query->num_rows() >0){
-		$result =$query->result_array();
-		$match_array =array();
-		$unmatch_array= array();
-		$i=0;
-		$str=0;
-		foreach($result as $value)
+            $this->db->where('reseller_id', $reseller);
+            $query = $this->db_model->select("*", "default_templates", "", "", "", "", "");
+
+            if ($query->num_rows() > 0) {
+		$result = $query->result_array();
+		$match_array = array();
+		$unmatch_array = array();
+		$i = 0;
+		$str = 0;
+		foreach ($result as $value)
 		{
-		    $this->db->where('name',$value['name']);
-		    $this->db->where('reseller_id',0);
-		    $query = $this->db_model->select("id", "default_templates","", "id", "ASC", $limit, $start);		
-		    $innerresult =$query->result_array();
-		    foreach($innerresult as $value)
+		    $this->db->where('name', $value['name']);
+		    $this->db->where('reseller_id', 0);
+		    $query = $this->db_model->select("id", "default_templates", "", "id", "ASC", $limit, $start);		
+		    $innerresult = $query->result_array();
+		    foreach ($innerresult as $value)
 		    {                   
-		      $str.=$value['id'].",";
+		      $str .= $value['id'].",";
 		    }		
 		}            
-		$str= rtrim($str,',');
+		$str = rtrim($str, ',');
 		
 		$where = "id NOT IN ($str)";		
-		$this->db->where('reseller_id',$reseller);
-		$this->db->or_where('reseller_id',0);
+		$this->db->where('reseller_id', $reseller);
+		$this->db->or_where('reseller_id', 0);
 		$this->db->where($where);
             }
             else
             {
-               $this->db->where('reseller_id',0);
+               $this->db->where('reseller_id', 0);
             }
               
-            if($flag) {
+            if ($flag) {
 
-		$query = $this->db_model->select("*", "default_templates","", "id", "ASC", $limit, $start);
-	     }else {
+		$query = $this->db_model->select("*", "default_templates", "", "id", "ASC", $limit, $start);
+	     } else {
 
-		$query = $this->db_model->countQuery("*", "default_templates","");
+		$query = $this->db_model->countQuery("*", "default_templates", "");
 		
 	     }
 	  } 
@@ -92,9 +92,9 @@ 
             $this->db->where($where);
             $this->db_model->build_search('template_search');
 		if ($flag) {
-		    $query = $this->db_model->select("*", "default_templates","", "id", "ASC", $limit, $start);
+		    $query = $this->db_model->select("*", "default_templates", "", "id", "ASC", $limit, $start);
 		} else {
-		    $query = $this->db_model->countQuery("*", "default_templates","");
+		    $query = $this->db_model->countQuery("*", "default_templates", "");
 		}
 	  }
 
@@ -106,13 +106,13 @@ 
                         
         $this->db->where("name", $name);
         $this->db->update("system", $add_array);
-        if($name == 'base_currency'){
+        if ($name == 'base_currency') {
             
-            $screen_path = getcwd() . "/cron";
-            $screen_filename = "CurrencyUpdate" . strtotime('now');
-            $command = "cd " . $screen_path . " && /usr/bin/screen -d -m -S  $screen_filename php cron.php CurrencyUpdate";
+            $screen_path = getcwd()."/cron";
+            $screen_filename = "CurrencyUpdate".strtotime('now');
+            $command = "cd ".$screen_path." && /usr/bin/screen -d -m -S  $screen_filename php cron.php CurrencyUpdate";
             exec($command);
-            $this->db->update("currency",array("currencyrate"=>'1'),array("currency"=>"INR"));
+            $this->db->update("currency", array("currencyrate"=>'1'), array("currency"=>"INR"));
         }
     }
 
@@ -179,7 +179,7 @@ 
     function getcurrency_list($flag, $start = 0, $limit = 0) {
          $this->db_model->build_search('currency_list_search');
 	
-	$where=array('currency <>' =>Common_model::$global_config['system_config']['base_currency']);
+	$where = array('currency <>' =>Common_model::$global_config['system_config']['base_currency']);
         if ($flag) {
             $query = $this->db_model->select("*", "currency", $where, "id", "ASC", $limit, $start);
         } else {
@@ -205,7 +205,7 @@ 
         $this->db->delete("currency");
         return true;
     }
-    function backup_insert($add_array='')
+    function backup_insert($add_array = '')
     {
 	 unset($add_array["action"]);
         $this->db->insert("backup_database", $add_array);
@@ -222,13 +222,13 @@ 
     }
     function get_backup_data($id)
     {
-      $where=array('id'=>$id);
+      $where = array('id'=>$id);
       $query = $this->db_model->getSelect("*", "backup_database", $where);
       return $query;
     }
-   function import_database($filename,$target_path)
+   function import_database($filename, $target_path)
     {
-		$this->db->insert("backup_database", array('backup_name'=>$filename , 'path'=>$target_path));
+		$this->db->insert("backup_database", array('backup_name'=>$filename, 'path'=>$target_path));
         	return true;
     }
 }

Braces +3 added lines, -5 removed lines

@@ -71,8 +71,7 @@ 
 		$this->db->where('reseller_id',$reseller);
 		$this->db->or_where('reseller_id',0);
 		$this->db->where($where);
-            }
-            else
+            } else
             {
                $this->db->where('reseller_id',0);
             }
@@ -80,13 +79,12 @@ 
             if($flag) {
 
 		$query = $this->db_model->select("*", "default_templates","", "id", "ASC", $limit, $start);
-	     }else {
+	     } else {
 
 		$query = $this->db_model->countQuery("*", "default_templates","");
 		
 	     }
-	  } 
-	  else {
+	  } else {
           
             $where = array('reseller_id' => 0);
             $this->db->where($where);