Completed
Pull Request — v3.0 (#146)
by
unknown
23:15 queued 10:50
created
astpp/application/modules/rates/views/view_import_origination_rate.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
               <div class="col-md-12">
16 16
             	<div class="w-box">
17 17
                    <span  style="margin-left:10px; text-align: center;background-color: none;color:#DD191D;">
18
-                    <? if(isset($error) && !empty($error)) {
18
+                    <? if (isset($error) && ! empty($error)) {
19 19
 						echo $error;
20 20
 					}?>
21 21
                    </span>            	
@@ -31,19 +31,19 @@  discard block
 block discarded – undo
31 31
                            <div class="col-md-12 no-padding">
32 32
                                <label class="col-md-3">Rate Group:</label>
33 33
                                <div>
34
-                               <? $pricelists = form_dropdown('pricelist_id', $this->db_model->build_dropdown("id,name", "pricelists","where_arr", array("reseller_id" => "0", "status" => "0")), '');
34
+                               <? $pricelists = form_dropdown('pricelist_id', $this->db_model->build_dropdown("id,name", "pricelists", "where_arr", array("reseller_id" => "0", "status" => "0")), '');
35 35
 									echo $pricelists;
36 36
 							   ?>
37 37
                                </div>
38 38
                            </div>
39 39
 				<?
40
-				 $logintype=$this->session->userdata('userlevel_logintype');
40
+				 $logintype = $this->session->userdata('userlevel_logintype');
41 41
 					   // $trunk=null;
42
-				 if($logintype !=1) { ?>
42
+				 if ($logintype != 1) { ?>
43 43
                            <div class="col-md-12 no-padding">
44 44
                                <label class="col-md-3">Force Trunk:</label>
45 45
                                <div>
46
-                               <? $trunklist = form_dropdown_all('trunk_id', $this->db_model->build_dropdown("id,name", "trunks","where_arr", array("status" => "0")), '');
46
+                               <? $trunklist = form_dropdown_all('trunk_id', $this->db_model->build_dropdown("id,name", "trunks", "where_arr", array("status" => "0")), '');
47 47
 									echo $trunklist;
48 48
 							   ?>
49 49
                                </div>
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 <?}?>    
101 101
         
102 102
 <?php
103
-	if(isset($csv_tmp_data) && !empty($csv_tmp_data)){ ?>
103
+	if (isset($csv_tmp_data) && ! empty($csv_tmp_data)) { ?>
104 104
 
105 105
 <section class="slice color-three">
106 106
 	<div class="w-section inverse no-padding">
@@ -109,14 +109,14 @@  discard block
 block discarded – undo
109 109
              <div class="col-md-12 margin-t-10">
110 110
             <form id="import_form" name="import_form" action="<?=base_url()?>rates/origination_rate_import_file/<?= $pricelistid?>/<?=$trunkid?><?=$check_header?>/" method="POST">
111 111
             <table width="100%" border="1"  class="details_table table">
112
-                <?  $cnt =7;
113
-					foreach($csv_tmp_data as $csv_key => $csv_value){
114
-						if($csv_key <  15){
112
+                <?  $cnt = 7;
113
+					foreach ($csv_tmp_data as $csv_key => $csv_value) {
114
+						if ($csv_key < 15) {
115 115
 							echo "<tr>";
116
-							foreach($csv_value as $field_name => $field_val){
117
-								if($csv_key == 0){
116
+							foreach ($csv_value as $field_name => $field_val) {
117
+								if ($csv_key == 0) {
118 118
 									echo "<th>".ucfirst($field_name)."</th>";
119
-								}else{
119
+								} else {
120 120
 									echo "<td class='portlet-content'>".$field_val."</td>";   
121 121
 								}
122 122
 							}
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/signup/models/signup_model.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -51,49 +51,49 @@
 block discarded – undo
51 51
 		$data['reseller_id'] = $data['key_unique'];	
52 52
 		unset($data['agreeCheck']);
53 53
 		unset($data['key_unique']);
54
-		$data['creation']=gmdate('Y-m-d H:i:s');
54
+		$data['creation'] = gmdate('Y-m-d H:i:s');
55 55
 		$data['expiry'] = date('Y-m-d H:i:s', strtotime('+10 years'));
56
-		$this->db->insert("accounts",$data);
56
+		$this->db->insert("accounts", $data);
57 57
 		return   $this->db->insert_id();
58 58
 		}
59 59
 
60
-	function check_user($accno,$email,$balance)
60
+	function check_user($accno, $email, $balance)
61 61
 	{
62
-		$info = array("number"=>$accno,"email"=>$email,"status"=>1);
62
+		$info = array("number"=>$accno, "email"=>$email, "status"=>1);
63 63
 						$this->db->where($info);
64 64
 						$this->db->select('*');
65
-		$acc_res=$this->db->get('accounts');
66
-		if($acc_res->num_rows() > 0)	
65
+		$acc_res = $this->db->get('accounts');
66
+		if ($acc_res->num_rows() > 0)	
67 67
 		{         
68
-						$acc_res=$acc_res->result_array();
69
-						$acc_res=$acc_res[0];
70
-						$this->db->where('pricelist_id',$acc_res['pricelist_id']);
68
+						$acc_res = $acc_res->result_array();
69
+						$acc_res = $acc_res[0];
70
+						$this->db->where('pricelist_id', $acc_res['pricelist_id']);
71 71
 						$this->db->select("*");
72
-						$charge_res=$this->db->get('charges');
72
+						$charge_res = $this->db->get('charges');
73 73
                         
74
-			if($charge_res->num_rows() > 0){
75
-			$charge_res=$charge_res->result_array();
76
-						$charge_res=$charge_res[0];
77
-						$charge_acc_arr=array(
74
+			if ($charge_res->num_rows() > 0) {
75
+			$charge_res = $charge_res->result_array();
76
+						$charge_res = $charge_res[0];
77
+						$charge_acc_arr = array(
78 78
 						"charge_id"=>$charge_res['id'],
79 79
 						"accountid"=>$acc_res['id'],
80 80
 						"status"=>0,
81 81
 						"assign_date"=>date('Y-m-d H:i:s')
82 82
 						 );
83
-			}else{
84
-			$charge_res=$charge_res->result_array();
83
+			} else {
84
+			$charge_res = $charge_res->result_array();
85 85
 			//echo "<pre>"; print_r($charge_res); exit;
86 86
 			$charge_acc_arr = array("charge_id"=>'id',
87 87
 						"accountid"=>$acc_res['id'],
88 88
 						"assign_date"=>date('Y-m-d H:i:s'));
89 89
 			}
90
-						$result=$this->db->insert("charge_to_account",$charge_acc_arr);
91
-			$update = array("status" => 0,"balance" => $balance );
90
+						$result = $this->db->insert("charge_to_account", $charge_acc_arr);
91
+			$update = array("status" => 0, "balance" => $balance);
92 92
 			$this->db->where($info);
93 93
 			$result = $this->db->update('accounts', $update);
94
-			$sip_device_update = array('username'=>$accno,"status"=>1);
94
+			$sip_device_update = array('username'=>$accno, "status"=>1);
95 95
 			return 1;
96
-		} else{
96
+		} else {
97 97
 			return 0;
98 98
 		}
99 99
 	}
Please login to merge, or discard this patch.
astpp/application/modules/signup/views/view_forgotpassword.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,9 +39,9 @@
 block discarded – undo
39 39
             <div class="row">
40 40
                 <div class="col-md-4 col-md-offset-4">&nbsp;
41 41
 					<span class="login_error">
42
-                        <?php if (isset($astpp_notification)){ ?>
42
+                        <?php if (isset($astpp_notification)) { ?>
43 43
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
44
-						<?php }else{
44
+						<?php } else {
45 45
 						 echo "&nbsp;";
46 46
 						} ?>
47 47
                     </span>
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/signup/views/view_signup_active.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -35,9 +35,9 @@
 block discarded – undo
35 35
             <div class="row">
36 36
 
37 37
 			<div class="col-md-4 col-md-offset-4">&nbsp;<span class="login_error">
38
-                        <?php if (isset($astpp_notification)){ ?>
38
+                        <?php if (isset($astpp_notification)) { ?>
39 39
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
40
-                    <?php }else{
40
+                    <?php } else {
41 41
 						 echo "&nbsp;";
42 42
 					} 
43 43
 			$astpp_err_msg = $this->session->flashdata('astpp_signupmsg');
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/signup/views/view_signup.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -95,9 +95,9 @@
 block discarded – undo
95 95
             <div class="row">
96 96
                 <div class="col-md-4 col-md-offset-4">&nbsp;
97 97
 					<span class="login_error">
98
-                        <?php if (isset($astpp_notification)){ ?>
98
+                        <?php if (isset($astpp_notification)) { ?>
99 99
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
100
-						<?php }else{
100
+						<?php } else {
101 101
 						 echo "&nbsp;";
102 102
 						} ?>
103 103
                     </span>
Please login to merge, or discard this patch.
astpp/application/modules/signup/views/view_signup_success.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -35,9 +35,9 @@
 block discarded – undo
35 35
             <div class="row">
36 36
 
37 37
 			<div class="col-md-4 col-md-offset-4">&nbsp;<span class="login_error">
38
-                        <?php if (isset($astpp_notification)){ ?>
38
+                        <?php if (isset($astpp_notification)) { ?>
39 39
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
40
-                    <?php }else{
40
+                    <?php } else {
41 41
 						 echo "&nbsp;";
42 42
 					} 
43 43
 			$astpp_err_msg = $this->session->flashdata('astpp_signupmsg');
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/systems/models/system_model.php 1 patch
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -39,50 +39,50 @@  discard block
 block discarded – undo
39 39
 		return $query;
40 40
 	}
41 41
 
42
-	function gettemplate_list($flag="", $start, $limit="") {
42
+	function gettemplate_list($flag = "", $start, $limit = "") {
43 43
 
44 44
          
45 45
 		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
46 46
 			$account_data = $this->session->userdata("accountinfo");
47 47
 			$reseller = $account_data['id'];
48
-			$this->db->where('reseller_id',$reseller);
49
-			$query = $this->db_model->select("*", "default_templates","","","","","");
50
-
51
-			if($query->num_rows() >0){
52
-		$result =$query->result_array();
53
-		$match_array =array();
54
-		$unmatch_array= array();
55
-		$i=0;
56
-		$str=0;
57
-		foreach($result as $value)
48
+			$this->db->where('reseller_id', $reseller);
49
+			$query = $this->db_model->select("*", "default_templates", "", "", "", "", "");
50
+
51
+			if ($query->num_rows() > 0) {
52
+		$result = $query->result_array();
53
+		$match_array = array();
54
+		$unmatch_array = array();
55
+		$i = 0;
56
+		$str = 0;
57
+		foreach ($result as $value)
58 58
 		{
59
-			$this->db->where('name',$value['name']);
60
-			$this->db->where('reseller_id',0);
61
-			$query = $this->db_model->select("id", "default_templates","", "id", "ASC", $limit, $start);		
62
-			$innerresult =$query->result_array();
63
-			foreach($innerresult as $value)
59
+			$this->db->where('name', $value['name']);
60
+			$this->db->where('reseller_id', 0);
61
+			$query = $this->db_model->select("id", "default_templates", "", "id", "ASC", $limit, $start);		
62
+			$innerresult = $query->result_array();
63
+			foreach ($innerresult as $value)
64 64
 			{                   
65
-			  $str.=$value['id'].",";
65
+			  $str .= $value['id'].",";
66 66
 			}		
67 67
 		}            
68
-		$str= rtrim($str,',');
68
+		$str = rtrim($str, ',');
69 69
 		
70 70
 		$where = "id NOT IN ($str)";		
71
-		$this->db->where('reseller_id',$reseller);
72
-		$this->db->or_where('reseller_id',0);
71
+		$this->db->where('reseller_id', $reseller);
72
+		$this->db->or_where('reseller_id', 0);
73 73
 		$this->db->where($where);
74 74
 			}
75 75
 			else
76 76
 			{
77
-			   $this->db->where('reseller_id',0);
77
+			   $this->db->where('reseller_id', 0);
78 78
 			}
79 79
               
80
-			if($flag) {
80
+			if ($flag) {
81 81
 
82
-		$query = $this->db_model->select("*", "default_templates","", "id", "ASC", $limit, $start);
83
-		 }else {
82
+		$query = $this->db_model->select("*", "default_templates", "", "id", "ASC", $limit, $start);
83
+		 } else {
84 84
 
85
-		$query = $this->db_model->countQuery("*", "default_templates","");
85
+		$query = $this->db_model->countQuery("*", "default_templates", "");
86 86
 		
87 87
 		 }
88 88
 	  } 
@@ -92,9 +92,9 @@  discard block
 block discarded – undo
92 92
 			$this->db->where($where);
93 93
 			$this->db_model->build_search('template_search');
94 94
 		if ($flag) {
95
-			$query = $this->db_model->select("*", "default_templates","", "id", "ASC", $limit, $start);
95
+			$query = $this->db_model->select("*", "default_templates", "", "id", "ASC", $limit, $start);
96 96
 		} else {
97
-			$query = $this->db_model->countQuery("*", "default_templates","");
97
+			$query = $this->db_model->countQuery("*", "default_templates", "");
98 98
 		}
99 99
 	  }
100 100
 
@@ -106,13 +106,13 @@  discard block
 block discarded – undo
106 106
                         
107 107
 		$this->db->where("name", $name);
108 108
 		$this->db->update("system", $add_array);
109
-		if($name == 'base_currency'){
109
+		if ($name == 'base_currency') {
110 110
             
111
-			$screen_path = getcwd() . "/cron";
112
-			$screen_filename = "CurrencyUpdate" . strtotime('now');
113
-			$command = "cd " . $screen_path . " && /usr/bin/screen -d -m -S  $screen_filename php cron.php CurrencyUpdate";
111
+			$screen_path = getcwd()."/cron";
112
+			$screen_filename = "CurrencyUpdate".strtotime('now');
113
+			$command = "cd ".$screen_path." && /usr/bin/screen -d -m -S  $screen_filename php cron.php CurrencyUpdate";
114 114
 			exec($command);
115
-			$this->db->update("currency",array("currencyrate"=>'1'),array("currency"=>"INR"));
115
+			$this->db->update("currency", array("currencyrate"=>'1'), array("currency"=>"INR"));
116 116
 		}
117 117
 	}
118 118
 
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 	function getcurrency_list($flag, $start = 0, $limit = 0) {
180 180
 		 $this->db_model->build_search('currency_list_search');
181 181
 	
182
-	$where=array('currency <>' =>Common_model::$global_config['system_config']['base_currency']);
182
+	$where = array('currency <>' =>Common_model::$global_config['system_config']['base_currency']);
183 183
 		if ($flag) {
184 184
 			$query = $this->db_model->select("*", "currency", $where, "id", "ASC", $limit, $start);
185 185
 		} else {
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
 		$this->db->delete("currency");
206 206
 		return true;
207 207
 	}
208
-	function backup_insert($add_array='')
208
+	function backup_insert($add_array = '')
209 209
 	{
210 210
 	 unset($add_array["action"]);
211 211
 		$this->db->insert("backup_database", $add_array);
@@ -222,13 +222,13 @@  discard block
 block discarded – undo
222 222
 	}
223 223
 	function get_backup_data($id)
224 224
 	{
225
-	  $where=array('id'=>$id);
225
+	  $where = array('id'=>$id);
226 226
 	  $query = $this->db_model->getSelect("*", "backup_database", $where);
227 227
 	  return $query;
228 228
 	}
229
-   function import_database($filename,$target_path)
229
+   function import_database($filename, $target_path)
230 230
 	{
231
-		$this->db->insert("backup_database", array('backup_name'=>$filename , 'path'=>$target_path));
231
+		$this->db->insert("backup_database", array('backup_name'=>$filename, 'path'=>$target_path));
232 232
 			return true;
233 233
 	}
234 234
 }
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/systems/controllers/systems.php 1 patch
Spacing   +79 added lines, -79 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 		$this->load->dbutil();
35 35
 
36 36
 		if ($this->session->userdata('user_login') == FALSE)
37
-			redirect(base_url() . '/astpp/login');
37
+			redirect(base_url().'/astpp/login');
38 38
 	}
39 39
 
40 40
 	function configuration_edit($edit_id = '') {
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 			$this->session->set_userdata('configuration_search', $action);
59 59
 		}
60 60
 		if (@$ajax_search != 1) {
61
-			redirect(base_url() . 'systems/configuration/');
61
+			redirect(base_url().'systems/configuration/');
62 62
 		}
63 63
 	}
64 64
 
@@ -84,29 +84,29 @@  discard block
 block discarded – undo
84 84
 		}
85 85
 	}
86 86
 
87
-	function configuration($group_title='') {
88
-	if($group_title==""){
89
-		redirect(base_url() . '/dashboard');
87
+	function configuration($group_title = '') {
88
+	if ($group_title == "") {
89
+		redirect(base_url().'/dashboard');
90 90
 	}
91
-	if($group_title=="email"){
91
+	if ($group_title == "email") {
92 92
 		  $data['test_email_flag'] = true;
93 93
 	}
94 94
 		$data['username'] = $this->session->userdata('user_name');
95 95
 		$data['page_title'] = ucfirst($group_title);
96
-	$data['group_title']=$group_title;
97
-	$where=array("group_title"=>$group_title);
96
+	$data['group_title'] = $group_title;
97
+	$where = array("group_title"=>$group_title);
98 98
 	$details = $this->db_model->getSelect("*", "system", $where);
99
-	$data['details']=$details->result_array();
99
+	$data['details'] = $details->result_array();
100 100
 	$add_array = $this->input->post();
101
- 	if (!empty($add_array)) {
101
+ 	if ( ! empty($add_array)) {
102 102
 
103
-		foreach($add_array as $key=>$val){
104
-			$update_array=array('value'=>$val);
103
+		foreach ($add_array as $key=>$val) {
104
+			$update_array = array('value'=>$val);
105 105
 			$this->system_model->edit_configuration($update_array, $key);
106 106
 		}
107 107
 				$this->session->set_flashdata('astpp_errormsg', ucfirst($group_title).' Settings updated sucessfully!');
108
-			redirect(base_url() . 'systems/configuration/'.$group_title);
109
-		}else{
108
+			redirect(base_url().'systems/configuration/'.$group_title);
109
+		} else {
110 110
 	 	$this->load->view('view_systemconf', $data);
111 111
 	}
112 112
 	}
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
167 167
 			 $account_data = $this->session->userdata("accountinfo");
168 168
 			 $reseller = $account_data['id'];
169
-			 $this->resellertemplate_save($add_array,$reseller);
169
+			 $this->resellertemplate_save($add_array, $reseller);
170 170
 		}
171 171
 		else
172 172
 		{
@@ -174,12 +174,12 @@  discard block
 block discarded – undo
174 174
 		}
175 175
 	}
176 176
     
177
-	function resellertemplate_save($data,$resellerid)
177
+	function resellertemplate_save($data, $resellerid)
178 178
 	{
179
-		$where = array('name' => $data['name'],'reseller_id'=>$resellerid);
179
+		$where = array('name' => $data['name'], 'reseller_id'=>$resellerid);
180 180
 		$count = $this->db_model->countQuery("*", "default_templates", $where);
181 181
 		$data['form'] = $this->form->build_form($this->system_form->get_template_form_fields(), $data);
182
-		if($count >0)
182
+		if ($count > 0)
183 183
 		{
184 184
 			$data['page_title'] = 'Edit Template';
185 185
 			if ($this->form_validation->run() == FALSE) {
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
                 
189 189
 				$this->system_model->edit_resellertemplate($data, $data['id']);
190 190
 				$this->session->set_flashdata('astpp_errormsg', 'Template updated successfully!');
191
-				redirect(base_url() . 'systems/template/');
191
+				redirect(base_url().'systems/template/');
192 192
 				exit;
193 193
 			}
194 194
 		} else {
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 				 $data['reseller_id'] = $resellerid;
200 200
 				$this->system_model->add_resellertemplate($data);
201 201
 				$this->session->set_flashdata('astpp_errormsg', 'Template added successfully!');
202
-				redirect(base_url() . 'systems/template/');
202
+				redirect(base_url().'systems/template/');
203 203
 				exit;
204 204
 			}
205 205
 		}
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
 				 unset($data['page_title']);
218 218
 				$this->system_model->edit_template($data, $data['id']);
219 219
 				$this->session->set_flashdata('astpp_errormsg', 'Template updated successfully!');
220
-				redirect(base_url() . 'systems/template/');
220
+				redirect(base_url().'systems/template/');
221 221
 				exit;
222 222
 			}
223 223
 		} else {
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
 				 unset($data['form']);
229 229
 				$this->system_model->add_template($data);
230 230
 				$this->session->set_flashdata('astpp_errormsg', 'Template added successfully!');
231
-				redirect(base_url() . 'systems/template/');
231
+				redirect(base_url().'systems/template/');
232 232
 				exit;
233 233
 			}
234 234
 		}
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
 			$this->session->set_userdata('template_search', $action);
246 246
 		}
247 247
 		if (@$ajax_search != 1) {
248
-			redirect(base_url() . 'systems/template/');
248
+			redirect(base_url().'systems/template/');
249 249
 		}
250 250
 	}
251 251
 
@@ -293,7 +293,7 @@  discard block
 block discarded – undo
293 293
 			$this->session->set_userdata('country_list_search', $action);
294 294
 		}
295 295
 		if (@$ajax_search != 1) {
296
-			redirect(base_url() . 'systems/country_list/');
296
+			redirect(base_url().'systems/country_list/');
297 297
 		}
298 298
 	}
299 299
 
@@ -352,9 +352,9 @@  discard block
 block discarded – undo
352 352
     
353 353
 	function country_remove($id) {
354 354
 		$this->system_model->remove_country($id);
355
-		$country=$this->common->get_field_name('country','countrycode',$id);
355
+		$country = $this->common->get_field_name('country', 'countrycode', $id);
356 356
 		$this->session->set_flashdata('astpp_notification', $country.'Country removed successfully!');
357
-		redirect(base_url() . 'systems/country_list/');
357
+		redirect(base_url().'systems/country_list/');
358 358
 	}
359 359
 
360 360
 	function country_delete_multiple() {
@@ -405,7 +405,7 @@  discard block
 block discarded – undo
405 405
 			$this->session->set_userdata('currency_list_search', $action);
406 406
 		}
407 407
 		if (@$ajax_search != 1) {
408
-			redirect(base_url() . 'systems/currency_list/');
408
+			redirect(base_url().'systems/currency_list/');
409 409
 		}
410 410
 	}
411 411
 
@@ -464,10 +464,10 @@  discard block
 block discarded – undo
464 464
 	}
465 465
     
466 466
 	 function currency_remove($id) {
467
-		$currencyname=$this->common->get_field_name('currencyname','currency',$id);
467
+		$currencyname = $this->common->get_field_name('currencyname', 'currency', $id);
468 468
 		$this->system_model->remove_currency($id);
469
-		$this->session->set_flashdata('astpp_notification',$currencyname. ' Currency removed successfully!');
470
-		redirect(base_url() . 'systems/currency_list/');
469
+		$this->session->set_flashdata('astpp_notification', $currencyname.' Currency removed successfully!');
470
+		redirect(base_url().'systems/currency_list/');
471 471
 	}
472 472
 
473 473
 	function currency_delete_multiple() {
@@ -478,53 +478,53 @@  discard block
 block discarded – undo
478 478
 	}
479 479
 	function database_backup()
480 480
 	{
481
-		$data=array();
481
+		$data = array();
482 482
 		$data['username'] = $this->session->userdata('user_name');
483 483
 		$data['page_title'] = 'Database Backup';
484
-		$filename=$this->db->database."_".date("YmdHms").".sql.gz";
484
+		$filename = $this->db->database."_".date("YmdHms").".sql.gz";
485 485
 		$data['form'] = $this->form->build_form($this->system_form->get_backup_database_form_fields($filename), '');
486 486
 		$this->load->view('view_database_backup', $data);
487 487
 	}
488 488
 	function database_backup_save()
489 489
 	{ 
490 490
 
491
-	  $add_array=$this->input->post();
491
+	  $add_array = $this->input->post();
492 492
       
493
-	  $data['form'] = $this->form->build_form($this->system_form->get_backup_database_form_fields($add_array['path'],$add_array['id']),$add_array);
493
+	  $data['form'] = $this->form->build_form($this->system_form->get_backup_database_form_fields($add_array['path'], $add_array['id']), $add_array);
494 494
 	  $data['page_title'] = 'Database Backup';
495
-	  if($add_array['id'] != ''){
495
+	  if ($add_array['id'] != '') {
496 496
       
497
-	  }else{
498
-		   if($this->form_validation->run() == FALSE) {
497
+	  } else {
498
+		   if ($this->form_validation->run() == FALSE) {
499 499
 				$data['validation_errors'] = validation_errors();
500 500
 				echo $data['validation_errors'];
501 501
 				exit;
502
-		  }else{
502
+		  } else {
503 503
 			 $db_name     = $this->db->database;
504 504
 			 $db_username = $this->db->username;
505 505
 			 $db_password = $this->db->password;
506 506
 			 $db_hostname = $this->db->hostname;
507 507
 			 $filename = $add_array['path'];
508
-			 $backup_file=DATABASE_DIRECTORY.$filename;
509
-			if (substr($backup_file,-3)=='.gz'){
510
-				  $backup_file = substr($backup_file,0,-3);
511
-				  $do_gzip=1;
508
+			 $backup_file = DATABASE_DIRECTORY.$filename;
509
+			if (substr($backup_file, -3) == '.gz') {
510
+				  $backup_file = substr($backup_file, 0, -3);
511
+				  $do_gzip = 1;
512 512
 			}
513 513
 
514
-		   $run_backup="/usr/bin/mysqldump -all --databases ".$db_name." -u'".$db_username."' -p'".$db_password."' > '$backup_file'";
515
-		   $error_zip=0;
516
-		   exec($run_backup,$output,$error);
517
-		   if ($do_gzip){
514
+		   $run_backup = "/usr/bin/mysqldump -all --databases ".$db_name." -u'".$db_username."' -p'".$db_password."' > '$backup_file'";
515
+		   $error_zip = 0;
516
+		   exec($run_backup, $output, $error);
517
+		   if ($do_gzip) {
518 518
 			  $gzip = $this->config->item('gzip-path');
519 519
 			  $run_gzip = $gzip." ".$backup_file;
520
-			  exec($run_gzip,$output,$error_zip);
520
+			  exec($run_gzip, $output, $error_zip);
521 521
 		   }
522 522
           
523
-		   if($error == 0 && $error_zip == 0 ){      
523
+		   if ($error == 0 && $error_zip == 0) {      
524 524
 			  $this->system_model->backup_insert($add_array);
525 525
 			  echo json_encode(array("SUCCESS"=> $add_array['backup_name']." backup exported successfully!"));
526 526
 			  exit;
527
-		   }else{
527
+		   } else {
528 528
 				echo 'An error occur when the system tried to backup of the database. Please check yours system settings for the backup section';
529 529
 				exit;
530 530
 		   }
@@ -541,7 +541,7 @@  discard block
 block discarded – undo
541 541
 	{
542 542
 	$json_data = array();
543 543
 		$count_all = $this->system_model->getbackup_list(false, "", "");
544
-		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'],$_GET['page']);
544
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
545 545
 		$json_data = $paging_data["json_paging"];
546 546
 
547 547
 		$query = $this->system_model->getbackup_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
@@ -551,56 +551,56 @@  discard block
 block discarded – undo
551 551
 		echo json_encode($json_data);
552 552
 	exit;
553 553
 	}
554
-	function database_restore_one($id='')
554
+	function database_restore_one($id = '')
555 555
 	{
556 556
 	   $result = $this->system_model->get_backup_data($id);
557
-	   $result_array=$result->result_array();
558
-	   if($result->num_rows() > 0)
557
+	   $result_array = $result->result_array();
558
+	   if ($result->num_rows() > 0)
559 559
 	   {
560 560
 			$db_name     = $this->db->database;
561 561
 			$db_username = $this->db->username;
562 562
 			$db_password = $this->db->password;
563 563
 			$db_hostname = $this->db->hostname;            
564
-			$path=DATABASE_DIRECTORY.$result_array[0]['path'];
565
-			if(file_exists($path)){
566
-			  if (substr($path,-3)=='.gz') {
564
+			$path = DATABASE_DIRECTORY.$result_array[0]['path'];
565
+			if (file_exists($path)) {
566
+			  if (substr($path, -3) == '.gz') {
567 567
 							$GUNZIP_EXE = $this->config->item('gunzip-path');
568 568
 							$run_gzip = $GUNZIP_EXE." < ".$path." | ";
569 569
 			  }
570
-			  $MYSQL="/usr/bin/mysql";
570
+			  $MYSQL = "/usr/bin/mysql";
571 571
 			  $run_restore = $run_gzip.$MYSQL." -h".$db_hostname." -u".$db_username." -p".$db_password." ".$db_name;
572 572
 			  exec($run_restore);
573 573
 			  $this->session->set_flashdata('astpp_errormsg', 'Database Restore successfully.');
574
-			  redirect(base_url() . 'systems/database_restore/');
575
-			}else{
574
+			  redirect(base_url().'systems/database_restore/');
575
+			} else {
576 576
 			  $this->session->set_flashdata('astpp_notification', 'File not exists!');
577
-			  redirect(base_url() . 'systems/database_restore/');
577
+			  redirect(base_url().'systems/database_restore/');
578 578
 			}
579 579
 	  }
580
-	  redirect(base_url() . 'systems/database_restore/');
580
+	  redirect(base_url().'systems/database_restore/');
581 581
 	}
582 582
 
583
- function database_download($id=''){
583
+ function database_download($id = '') {
584 584
     
585 585
 	$result = $this->system_model->get_backup_data($id);
586
-	$result_array=$result->result_array();
587
-	if($result->num_rows() > 0)
586
+	$result_array = $result->result_array();
587
+	if ($result->num_rows() > 0)
588 588
 	{
589
-	  $path=$result_array[0]['path'];
589
+	  $path = $result_array[0]['path'];
590 590
 	  $filename = basename($path);
591 591
 	  $len = filesize($path);
592 592
       
593 593
 	  header("Content-Encoding: binary");
594 594
 	  header("Content-Type: application/octet-stream");
595
-	  header( "content-length: " . $len );
596
-	  header( "content-disposition: attachment; filename=" . $filename );
595
+	  header("content-length: ".$len);
596
+	  header("content-disposition: attachment; filename=".$filename);
597 597
 	  header("Expires: 0");
598 598
 	  header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
599 599
 	  header("Cache-Control: private");
600 600
 	  header("Pragma: public");
601 601
 	  ob_clean();
602
-	  $fp=fopen( $path, "r" );
603
-	  fpassthru( $fp );
602
+	  $fp = fopen($path, "r");
603
+	  fpassthru($fp);
604 604
 	  exit;
605 605
 	}
606 606
 	}
@@ -614,17 +614,17 @@  discard block
 block discarded – undo
614 614
    function database_import_file()
615 615
 	{
616 616
 		$filename = $_POST['fname'];
617
-		$upload_greeting_file= $_FILES['userfile']['name'];
618
-		$db_file = explode(".",$upload_greeting_file); 
619
-		if( $db_file[1] == 'csv' || $db_file[1] == 'tar' || $db_file[1] == 'sql'){
620
-			$target_path = basename( $_FILES['userfile']['name']);
621
-			move_uploaded_file($_FILES["userfile"]["tmp_name"], $target_path );
617
+		$upload_greeting_file = $_FILES['userfile']['name'];
618
+		$db_file = explode(".", $upload_greeting_file); 
619
+		if ($db_file[1] == 'csv' || $db_file[1] == 'tar' || $db_file[1] == 'sql') {
620
+			$target_path = basename($_FILES['userfile']['name']);
621
+			move_uploaded_file($_FILES["userfile"]["tmp_name"], $target_path);
622 622
           
623
-			$query = $this->system_model->import_database($filename,$_FILES['userfile']['name']);
624
-			$this->session->set_flashdata('astpp_errormsg',"The file ".  basename( $_FILES['userfile']['name'])." has been uploaded");
623
+			$query = $this->system_model->import_database($filename, $_FILES['userfile']['name']);
624
+			$this->session->set_flashdata('astpp_errormsg', "The file ".basename($_FILES['userfile']['name'])." has been uploaded");
625 625
 			redirect(base_url()."systems/database_restore/");            
626
-		}else{
627
-			$this->session->set_flashdata('astpp_notification',"There is a some issue or invalid file format.");
626
+		} else {
627
+			$this->session->set_flashdata('astpp_notification', "There is a some issue or invalid file format.");
628 628
 			redirect(base_url()."systems/database_restore/");            
629 629
 		}
630 630
 	}
@@ -634,7 +634,7 @@  discard block
 block discarded – undo
634 634
 	  $this->db->where($where);
635 635
 	  $this->db->delete("backup_database");
636 636
 	  $this->session->set_flashdata('astpp_errormsg', 'Database backup deleted successfully.');      
637
-	  redirect(base_url() . 'systems/database_restore/');
637
+	  redirect(base_url().'systems/database_restore/');
638 638
 	  return true;
639 639
 	}
640 640
 	function database_backup_delete_multiple() {
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/systems/libraries/system_form.php 1 patch
Spacing   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -21,19 +21,19 @@  discard block
 block discarded – undo
21 21
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
22 22
 ###############################################################################
23 23
 
24
-if (!defined('BASEPATH'))
24
+if ( ! defined('BASEPATH'))
25 25
 	exit('No direct script access allowed');
26 26
 
27 27
 class System_form {
28 28
 
29 29
 	function get_template_form_fields() {
30 30
 
31
-		$form['forms'] = array(base_url() . 'systems/template_save/', array("template_form", "name" => "template_form"));
31
+		$form['forms'] = array(base_url().'systems/template_save/', array("template_form", "name" => "template_form"));
32 32
 		$form['Email Template'] = array(
33 33
 			array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),
34
-			array(' Name', 'INPUT', array('name' => 'name', 'size' => '20',  'readonly' => true, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),
35
-			array('Subject', 'INPUT', array('name' => 'subject', 'size' => '20',  'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),
36
-			array('Body', 'TEXTAREA', array('name' => 'template', 'id' => 'template', 'size' => '20',  'class' => "textarea medium"), 'trim|required', 'tOOL TIP', ''),
34
+			array(' Name', 'INPUT', array('name' => 'name', 'size' => '20', 'readonly' => true, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),
35
+			array('Subject', 'INPUT', array('name' => 'subject', 'size' => '20', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),
36
+			array('Body', 'TEXTAREA', array('name' => 'template', 'id' => 'template', 'size' => '20', 'class' => "textarea medium"), 'trim|required', 'tOOL TIP', ''),
37 37
 		);
38 38
 		$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/\')');
39 39
 		$form['button_save'] = array('name' => 'action', 'content' => 'Save', 'value' => 'save', 'type' => 'submit', 'class' => 'btn btn-line-parrot');
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 		$form['Search'] = array(
47 47
             
48 48
 			array(' Name', 'INPUT', array('name' => 'name[name]', '', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'name[name-string]', '', '', '', 'search_string_type', ''),
49
-			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', '', '', ''),
49
+			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', '', '', ''),
50 50
 			array('', 'HIDDEN', 'advance_search', '1', '', '', '')
51 51
 		);
52 52
 		$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 @@  discard block
 block discarded – undo
56 56
 
57 57
 	function get_configuration_form_fields() {
58 58
 
59
-		$form['forms'] = array(base_url() . 'systems/configuration_save/', array("id" => "config_form", "name" => "config_form"));
59
+		$form['forms'] = array(base_url().'systems/configuration_save/', array("id" => "config_form", "name" => "config_form"));
60 60
 		$form['Edit Settings '] = array(
61 61
 			array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),
62
-			array('Name', 'INPUT', array('name' => 'name', 'size' => '20',  'readonly' => true, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),
62
+			array('Name', 'INPUT', array('name' => 'name', 'size' => '20', 'readonly' => true, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),
63 63
 			array('Value', 'INPUT', array('name' => 'value', 'size' => '20', 'class' => "text field medium"), 'trim|required', 'tOOL TIP', ''),
64
-			array('Comment', 'INPUT', array('name' => 'comment', 'size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', ''),
64
+			array('Comment', 'INPUT', array('name' => 'comment', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),
65 65
 		);
66 66
 
67 67
 		$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 @@  discard block
 block discarded – undo
77 77
 			array('Name', 'INPUT', array('name' => 'name[name]', '', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'name[name-string]', '', '', '', 'search_string_type', ''),
78 78
 			array('Value', 'INPUT', array('name' => 'value[value]', '', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'value[value-string]', '', '', '', 'search_string_type', ''),
79 79
 			array('Description', 'INPUT', array('name' => 'comment[comment]', '', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'comment[comment-string]', '', '', '', 'search_string_type', ''),
80
-			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'),
80
+			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'),
81 81
 			array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),
82 82
 			array('', 'HIDDEN', 'advance_search', '1', '', '', '')
83 83
 		);
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 			array("Value", "190", "value", "", "", ""),
93 93
 			array("Description", "320", "comment", "", "", ""),
94 94
 			array("Group", "120", "group_title", "", "", ""),
95
-			array("Action", "442", "", "", "",array("EDIT" => array("url" => "systems/configuration_edit/", "mode" => "popup"),
95
+			array("Action", "442", "", "", "", array("EDIT" => array("url" => "systems/configuration_edit/", "mode" => "popup"),
96 96
 			))
97 97
 				));
98 98
 		return $grid_field_arr;
@@ -105,9 +105,9 @@  discard block
 block discarded – undo
105 105
 	}
106 106
 
107 107
 	function build_template_list_for_admin() {
108
-		$grid_field_arr = json_encode(array(array("Name", "425", "name", "", "", "","","true","center"),
109
-			array("Subject", "650", "subject", "", "", "","","true","center"),
110
-			array("Action", "200", "", "", "",array("EDIT" => array("url" => "systems/template_edit/", "mode" => "single"),
108
+		$grid_field_arr = json_encode(array(array("Name", "425", "name", "", "", "", "", "true", "center"),
109
+			array("Subject", "650", "subject", "", "", "", "", "true", "center"),
110
+			array("Action", "200", "", "", "", array("EDIT" => array("url" => "systems/template_edit/", "mode" => "single"),
111 111
 			))
112 112
 				));
113 113
 		return $grid_field_arr;
@@ -116,10 +116,10 @@  discard block
 block discarded – undo
116 116
 	function build_country_list_for_admin() {     
117 117
 			$action = 'systems/country_list_edit/';
118 118
 			$action_remove = 'systems/country_remove/';
119
-			$mode="popup";
119
+			$mode = "popup";
120 120
 		$grid_field_arr = json_encode(array(
121
-		array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "50", "", "", "", "","","false","center"),
122
-			array("Name", "705", "country", "", "", "","","true","center"),
121
+		array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "50", "", "", "", "", "", "false", "center"),
122
+			array("Name", "705", "country", "", "", "", "", "true", "center"),
123 123
 			   array("Action", "100", "", "", "", array("EDIT" => array("url" => "$action", "mode" => "$mode"),
124 124
 					"DELETE" => array("url" => "$action_remove", "mode" => "single")
125 125
 				))
@@ -128,8 +128,8 @@  discard block
 block discarded – undo
128 128
 	 }
129 129
     
130 130
 	 function build_admin_grid_buttons() {
131
-		$buttons_json = json_encode(array(array("Create","btn btn-line-warning btn","fa fa-plus-circle fa-lg", "button_action", "systems/country_add/", "popup"),
132
-			array("Delete",  "btn btn-line-danger","fa fa-times-circle fa-lg", "button_action", "systems/country_delete_multiple"),
131
+		$buttons_json = json_encode(array(array("Create", "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "systems/country_add/", "popup"),
132
+			array("Delete", "btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "systems/country_delete_multiple"),
133 133
 		   ));
134 134
 		return $buttons_json;
135 135
 	}
@@ -153,10 +153,10 @@  discard block
 block discarded – undo
153 153
 	 function get_country_form_fields() {
154 154
      
155 155
         
156
-		$form['forms'] = array(base_url() . 'systems/country_save/', array('id' => 'system_form', 'method' => 'POST', 'name' => 'system_form'));
156
+		$form['forms'] = array(base_url().'systems/country_save/', array('id' => 'system_form', 'method' => 'POST', 'name' => 'system_form'));
157 157
 		$form['Country List'] = array(
158 158
 			array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),
159
-			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'),
159
+			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'),
160 160
 
161 161
 		);
162 162
 		$form['button_save'] = array('name' => 'action', 'content' => 'Save', 'value' => 'save', 'id' => 'submit', 'type' => 'button', 'class' => 'btn btn-line-parrot');
@@ -167,13 +167,13 @@  discard block
 block discarded – undo
167 167
 	  function build_currency_list_for_admin() {        
168 168
 			$action = 'systems/currency_list_edit/';
169 169
 			$action_remove = 'systems/currency_remove/';
170
-			$mode="popup";
170
+			$mode = "popup";
171 171
         
172 172
 		$grid_field_arr = json_encode(array(
173
-		array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "70", "", "", "", "","","false","center"),
174
-			array("Name", "320", "currencyname", "", "", "","","true","center"),
175
-		array("Code", "290", "currency", "", "", "","","true","center"),
176
-		array(" Rate", "330", "currencyrate", "", "", "","","true","right"),
173
+		array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "70", "", "", "", "", "", "false", "center"),
174
+			array("Name", "320", "currencyname", "", "", "", "", "true", "center"),
175
+		array("Code", "290", "currency", "", "", "", "", "true", "center"),
176
+		array(" Rate", "330", "currencyrate", "", "", "", "", "true", "right"),
177 177
 			   array("Action", "265", "", "", "", array("EDIT" => array("url" => "$action", "mode" => "$mode"),
178 178
 					"DELETE" => array("url" => "$action_remove", "mode" => "single")
179 179
 				))
@@ -201,12 +201,12 @@  discard block
 block discarded – undo
201 201
 	function get_currency_form_fields() {
202 202
      
203 203
         
204
-		$form['forms'] = array(base_url() . 'systems/currency_save/', array('id' => 'system_form', 'method' => 'POST', 'name' => 'system_form'));
204
+		$form['forms'] = array(base_url().'systems/currency_save/', array('id' => 'system_form', 'method' => 'POST', 'name' => 'system_form'));
205 205
 		$form['Currency List'] = array(
206 206
 			array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),
207
-			array('Name', 'INPUT', array('name' => 'currencyname', 'size' => '20','maxlength' => '40',  'class' => "text field medium"), 'trim|required|char|xss_clean', 'tOOL TIP', 'Please Enter country'),
208
-			array('Code', 'INPUT', array('name' => 'currency', 'size' => '20','maxlength' => '3', 'class' => "text field medium"), 'trim|required|char|xss_clean', 'tOOL TIP', 'Please Enter country'),
209
-			array('Rate', 'INPUT', array('name' => 'currencyrate', 'size' => '20','maxlength' => '7', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter country'),
207
+			array('Name', 'INPUT', array('name' => 'currencyname', 'size' => '20', 'maxlength' => '40', 'class' => "text field medium"), 'trim|required|char|xss_clean', 'tOOL TIP', 'Please Enter country'),
208
+			array('Code', 'INPUT', array('name' => 'currency', 'size' => '20', 'maxlength' => '3', 'class' => "text field medium"), 'trim|required|char|xss_clean', 'tOOL TIP', 'Please Enter country'),
209
+			array('Rate', 'INPUT', array('name' => 'currencyrate', 'size' => '20', 'maxlength' => '7', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter country'),
210 210
 
211 211
 		);
212 212
 		$form['button_save'] = array('name' => 'action', 'content' => 'Save', 'value' => 'save', 'id' => 'submit', 'type' => 'button', 'class' => 'btn btn-line-parrot');
@@ -215,21 +215,21 @@  discard block
 block discarded – undo
215 215
 	}
216 216
 
217 217
 	 function build_admin_currency_grid_buttons() {
218
-		$buttons_json = json_encode(array(array("Create","btn btn-line-warning btn","fa fa-plus-circle fa-lg", "button_action", "systems/currency_add/", "popup"),
219
-			array("Update Currencies","btn btn-line-blue" ,"fa fa-upload fa-lg", "button_action", "currencyupdate/update_currency/", 'single'),
220
-			array("Delete","btn btn-line-danger","fa fa-times-circle fa-lg", "button_action", "systems/currency_delete_multiple"),
218
+		$buttons_json = json_encode(array(array("Create", "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "systems/currency_add/", "popup"),
219
+			array("Update Currencies", "btn btn-line-blue", "fa fa-upload fa-lg", "button_action", "currencyupdate/update_currency/", 'single'),
220
+			array("Delete", "btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "systems/currency_delete_multiple"),
221 221
 		   ));
222 222
 		return $buttons_json;
223 223
 	}
224 224
  
225 225
   
226
-  function get_backup_database_form_fields($file_name,$id='') {
226
+  function get_backup_database_form_fields($file_name, $id = '') {
227 227
    $val = $id > 0 ? "backup_database.path.$id" : 'backup_database.path';
228
-	  $form['forms'] = array(base_url() . 'systems/database_backup_save/',array('id' => 'backup_form', 'method' => 'POST', 'name' => 'backup_form'));
228
+	  $form['forms'] = array(base_url().'systems/database_backup_save/', array('id' => 'backup_form', 'method' => 'POST', 'name' => 'backup_form'));
229 229
 	  $form['Database Information'] = array(
230 230
 	  array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),
231 231
 	  array('Name', 'INPUT', array('name' => 'backup_name', 'size' => '20', 'class' => "text field medium"), 'required', 'tOOL TIP', ''),
232
-	  array('File Name', 'INPUT', array('name' => 'path', 'size' => '20', 'value'=>$file_name,'class' => "text field medium"), 'trim|required|is_unique[' . $val . ']', 'tOOL TIP', ''),
232
+	  array('File Name', 'INPUT', array('name' => 'path', 'size' => '20', 'value'=>$file_name, 'class' => "text field medium"), 'trim|required|is_unique['.$val.']', 'tOOL TIP', ''),
233 233
 	  );
234 234
 	  $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\')');
235 235
 	  $form['button_save'] = array('name' => 'action', 'content' => 'Save', 'value' => 'save', 'id' => 'submit', 'type' => 'button', 'class' => 'btn btn-line-parrot');
@@ -237,10 +237,10 @@  discard block
 block discarded – undo
237 237
   }
238 238
   function build_backupdastabase_list() {
239 239
 		$grid_field_arr = json_encode(array(
240
-			array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "50", "", "", "", "","","false","center"),
241
-			array("Date", "260", "date", "date", "date", "convert_GMT_to","","true","center"),
242
-			array("Name", "295", "backup_name", "", "", "","","true","center"),
243
-			array("File Name", "480", "path", "", "", "","","true","center"),
240
+			array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "50", "", "", "", "", "", "false", "center"),
241
+			array("Date", "260", "date", "date", "date", "convert_GMT_to", "", "true", "center"),
242
+			array("Name", "295", "backup_name", "", "", "", "", "true", "center"),
243
+			array("File Name", "480", "path", "", "", "", "", "true", "center"),
244 244
 			array("Action", "185", "", "", "",
245 245
 			array("EDIT_RESTORE" => array("url" => "systems/database_restore_one/", "mode" => ""),
246 246
 			"DOWNLOAD_DATABASE" => array("url" => "systems/database_download/", "mode" => ""),
@@ -249,9 +249,9 @@  discard block
 block discarded – undo
249 249
 		return $grid_field_arr;
250 250
 	}
251 251
 	function build_backupdastabase_buttons() {
252
-		$buttons_json = json_encode(array(array("Create","btn btn-line-warning btn","fa fa-plus-circle fa-lg", "button_action", "systems/database_backup/", "popup"),
253
-		  array("import","btn btn-line-blue" ,"fa fa-upload fa-lg", "button_action", "systems/database_import/", "popup"),	
254
-		array("Delete","btn btn-line-danger","fa fa-times-circle fa-lg", "button_action", "systems/database_backup_delete_multiple")
252
+		$buttons_json = json_encode(array(array("Create", "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "systems/database_backup/", "popup"),
253
+		  array("import", "btn btn-line-blue", "fa fa-upload fa-lg", "button_action", "systems/database_import/", "popup"),	
254
+		array("Delete", "btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "systems/database_backup_delete_multiple")
255 255
 						));
256 256
 		  return $buttons_json;
257 257
 	}
Please login to merge, or discard this patch.