Completed
Push — v3.0 ( 23635d...e28df5 )
by Samir
23s
created
web_interface/astpp/application/modules/user/views/view_user_ipmap_list.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -21,24 +21,24 @@  discard block
 block discarded – undo
21 21
             <div class="col-md-12 no-padding color-three border_box"> 
22 22
                 <div class="pull-left">
23 23
                     <ul class="breadcrumb">
24
-                         <?php $accountinfo=$this->session->userdata('accountinfo');
25
-                          if($accountinfo['type']==1){ ?>
26
-                          <li><a href="<?= base_url() . "user/user_myprofile/"; ?>">My Profile</a></li>
27
-                          <?php }else{ ?>
24
+                         <?php $accountinfo = $this->session->userdata('accountinfo');
25
+                          if ($accountinfo['type'] == 1) { ?>
26
+                          <li><a href="<?= base_url()."user/user_myprofile/"; ?>">My Profile</a></li>
27
+                          <?php } else { ?>
28 28
 			    <li><a href="#">Configuration</a></li>
29 29
                           <?php }
30 30
                     ?>
31 31
                         
32 32
                         <li class='active'>
33
-                            <a href="<?= base_url() . "user/user_ipmap/"; ?>">IP Settings</a>
33
+                            <a href="<?= base_url()."user/user_ipmap/"; ?>">IP Settings</a>
34 34
                         </li>
35 35
                     </ul>
36 36
                 </div>
37
-                <?php if($accountinfo['type']==1) { ?>
37
+                <?php if ($accountinfo['type'] == 1) { ?>
38 38
                    <div class="pull-right">
39 39
                     <ul class="breadcrumb">
40 40
 		      <li class="active pull-right">
41
-		      <a href="<?= base_url() . "user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
41
+		      <a href="<?= base_url()."user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
42 42
                     </ul>
43 43
                    </div>
44 44
                 <?php }?>
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
                     <div class="margin-b-10 slice color-three pull-left content_border col-md-12" id="left_panel_form" style="cursor: pointer; display: none;">
55 55
                     <fieldset class="margin-b-20">
56 56
                         <legend>IP Settings</legend>
57
-                        <form method="post" name="ip_map" id="ip_map" action="<?= base_url() . "user/user_ipmap_action/add/" ?>">
57
+                        <form method="post" name="ip_map" id="ip_map" action="<?= base_url()."user/user_ipmap_action/add/" ?>">
58 58
                             <div class='col-md-4'> 
59 59
                                 <label class="col-md-1 no-padding">Name</label>
60 60
                                 <input class="col-md-2 form-control" name="name" size="16" type="text"/>
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/user/views/view_user_cdrs.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -21,16 +21,16 @@
 block discarded – undo
21 21
             <div class="col-md-12 no-padding color-three border_box"> 
22 22
                 <div class="pull-left">
23 23
                     <ul class="breadcrumb">
24
-                        <li><a href="<?= base_url() . "user/user_myprofile/"; ?>">My Profile</a></li>
24
+                        <li><a href="<?= base_url()."user/user_myprofile/"; ?>">My Profile</a></li>
25 25
                         <li>
26
-                            <a href="<?= base_url() . "user/user_cdrs/"; ?>">CDRs</a>
26
+                            <a href="<?= base_url()."user/user_cdrs/"; ?>">CDRs</a>
27 27
                         </li>
28 28
                     </ul>
29 29
                 </div>
30 30
                 <div class="pull-right">
31 31
                     <ul class="breadcrumb">
32 32
 		      <li class="active pull-right">
33
-		      <a href="<?= base_url() . "user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
33
+		      <a href="<?= base_url()."user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
34 34
                     </ul>
35 35
                 </div>
36 36
             </div>
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/user/models/user_model.php 1 patch
Spacing   +96 added lines, -96 removed lines patch added patch discarded remove patch
@@ -26,9 +26,9 @@  discard block
 block discarded – undo
26 26
 
27 27
     function user_model() {
28 28
         parent::__construct();
29
-        if(Common_model::$global_config['system_config']['opensips']==0){
29
+        if (Common_model::$global_config['system_config']['opensips'] == 0) {
30 30
 			$db_config = Common_model::$global_config['system_config'];
31
-			$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=";
31
+			$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=";
32 32
 			$this->opensips_db = $this->load->database($opensipdsn, true);
33 33
 	    }
34 34
     }
@@ -91,9 +91,9 @@  discard block
 block discarded – undo
91 91
             $this->db->select('count(id) as count');
92 92
         }
93 93
         if ($flag) {
94
-           if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
95
-            $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
96
-           }else{
94
+           if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined') {
95
+            $this->db->order_by($_GET['sortname'], ($_GET['sortorder'] == 'undefined') ? 'desc' : $_GET['sortorder']);
96
+           } else {
97 97
             $this->db->order_by('invoice_date', 'desc');
98 98
            }
99 99
         }
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
             }
108 108
         } else {
109 109
             if ($flag) {
110
-                $query = (object) array('num_rows' => 0);
110
+                $query = (object)array('num_rows' => 0);
111 111
             } else {
112 112
                 $query = 0;
113 113
             }
@@ -117,13 +117,13 @@  discard block
 block discarded – undo
117 117
 
118 118
     function get_user_charge_history($flag, $start = 0, $limit = 0) {
119 119
         $this->db_model->build_search('user_charge_history_search');
120
-        $accountinfo=$this->session->userdata('accountinfo');
121
-        $where['accountid']=$accountinfo['id'];
122
-        if($this->session->userdata('advance_search') != 1){
123
-             $where['created_date >=']=gmdate("Y-m-1 00:00:00");
124
-             $where['created_date <=']=gmdate("Y-m-d 23:59:59");
120
+        $accountinfo = $this->session->userdata('accountinfo');
121
+        $where['accountid'] = $accountinfo['id'];
122
+        if ($this->session->userdata('advance_search') != 1) {
123
+             $where['created_date >='] = gmdate("Y-m-1 00:00:00");
124
+             $where['created_date <='] = gmdate("Y-m-d 23:59:59");
125 125
         }
126
-	$where['item_type <>']='STANDARD';
126
+	$where['item_type <>'] = 'STANDARD';
127 127
         if ($flag) {
128 128
             $query = $this->db_model->select("*", "invoice_details", $where, "id", "DESC", $limit, $start);
129 129
         } else {
@@ -174,9 +174,9 @@  discard block
 block discarded – undo
174 174
         return true;
175 175
     }
176 176
     
177
-    function user_ipmap_list($flag,$limit='',$start=''){
178
-        $accountinfo=$this->session->userdata('accountinfo');
179
-        $where['accountid']=$accountinfo['id'];
177
+    function user_ipmap_list($flag, $limit = '', $start = '') {
178
+        $accountinfo = $this->session->userdata('accountinfo');
179
+        $where['accountid'] = $accountinfo['id'];
180 180
         $this->db_model->build_search('user_ipmap_search');
181 181
         if ($flag) {
182 182
          $query = $this->db_model->select("*", "ip_map", $where, "id", "ASC", $limit, $start);
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
         }
186 186
           return $query;
187 187
     }
188
-    function user_sipdevices_list($flag, $accountid = "",$start = "", $limit = "") {
188
+    function user_sipdevices_list($flag, $accountid = "", $start = "", $limit = "") {
189 189
         $where = array("accountid" => $accountid);
190 190
 		$this->db_model->build_search('user_sipdevices_search');
191 191
 		$query = array();
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
 			$add_array = $deviceinfo->result_array();
196 196
 			foreach ($add_array as $key => $value) {
197 197
 				$vars = json_decode($value['dir_vars']);
198
-				$vars_new = json_decode($value['dir_params'],true);
198
+				$vars_new = json_decode($value['dir_params'], true);
199 199
 				$passowrds = json_decode($value['dir_params']);
200 200
 				$query[] = array('id' => $value['id'],
201 201
 						'username' => $value['username'],
@@ -220,11 +220,11 @@  discard block
 block discarded – undo
220 220
 	return $query;
221 221
     }
222 222
     
223
-    function user_sipdevice_info($edit_id){
223
+    function user_sipdevice_info($edit_id) {
224 224
         $sipdevice_info = $this->db_model->getSelect("*", "sip_devices", array('id' => $edit_id));
225 225
         $sipdevice_arr = (array)$sipdevice_info->first_row();
226 226
         $vars = (array)json_decode($sipdevice_arr['dir_vars']);
227
-        $params = (array)json_decode($sipdevice_arr['dir_params'],true);
227
+        $params = (array)json_decode($sipdevice_arr['dir_params'], true);
228 228
         $query = array('id' => $sipdevice_arr['id'],
229 229
                         'fs_username' => $sipdevice_arr['username'],
230 230
                         'accountcode' => $sipdevice_arr['accountid'],
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
                         'fs_password' => $params['password']);
241 241
         return $query;
242 242
     }
243
-    function user_sipdevice_add($add_array){
243
+    function user_sipdevice_add($add_array) {
244 244
         $account_data = $this->session->userdata("accountinfo");
245 245
 	$parms_array = array('password' => $add_array['fs_password'],
246 246
 			'vm-enabled' => $add_array['voicemail_enabled'],
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
 			'vm-attach-file' => $add_array['voicemail_attach_file'],
250 250
 			'vm-keep-local-after-email' => $add_array['vm_keep_local_after_email'],
251 251
 			'vm-email-all-messages' => $add_array['vm_send_all_message']);
252
-			$add_array['status'] = isset($add_array['status'])?$add_array['status']:"0";
252
+			$add_array['status'] = isset($add_array['status']) ? $add_array['status'] : "0";
253 253
 			$parms_array_vars = array('effective_caller_id_name' => $add_array['effective_caller_id_name'],
254 254
 		    'effective_caller_id_number' => $add_array['effective_caller_id_number'],
255 255
 		    'user_context' => 'default');
@@ -260,12 +260,12 @@  discard block
 block discarded – undo
260 260
                            'status' => $add_array['status'],
261 261
                            'dir_params' => json_encode($parms_array),
262 262
                            'dir_vars' => json_encode($parms_array_vars),
263
-                            'sip_profile_id' => $this->common->get_field_name('id','sip_profiles',array('name'=>'default')));    
263
+                            'sip_profile_id' => $this->common->get_field_name('id', 'sip_profiles', array('name'=>'default')));    
264 264
 	$this->db->insert('sip_devices', $new_array);
265 265
 	$this->common->mail_to_users('add_sip_device', $account_data);
266 266
 	return true;
267 267
     }
268
-    function user_sipdevice_edit($add_array){
268
+    function user_sipdevice_edit($add_array) {
269 269
 	$parms_array = array('password' => $add_array['fs_password'],
270 270
 			'vm-enabled' => $add_array['voicemail_enabled'],
271 271
 			'vm-password' => $add_array['voicemail_password'],
@@ -277,62 +277,62 @@  discard block
 block discarded – undo
277 277
 	$parms_array_vars = array('effective_caller_id_name' => $add_array['effective_caller_id_name'],
278 278
 	'effective_caller_id_number' => $add_array['effective_caller_id_number'],);
279 279
 	$log_type = $this->session->userdata("logintype");
280
-	if($log_type == 0  || $log_type == 3 || $log_type == 1){
281
-		$add_array['sip_profile_id']=$this->common->get_field_name('id','sip_profiles',array('name'=>'default'));
280
+	if ($log_type == 0 || $log_type == 3 || $log_type == 1) {
281
+		$add_array['sip_profile_id'] = $this->common->get_field_name('id', 'sip_profiles', array('name'=>'default'));
282 282
 	}
283
-	$add_array['status'] = isset($add_array['status'])?$add_array['status']:"0";
284
-	$new_array = array('last_modified_date'=>gmdate('Y-m-d H:i:s'),'username' => $add_array['fs_username'],'status' => $add_array['status'],
283
+	$add_array['status'] = isset($add_array['status']) ? $add_array['status'] : "0";
284
+	$new_array = array('last_modified_date'=>gmdate('Y-m-d H:i:s'), 'username' => $add_array['fs_username'], 'status' => $add_array['status'],
285 285
 	 	 	   'dir_params' => json_encode($parms_array),
286 286
 			   'dir_vars' => json_encode($parms_array_vars), 'sip_profile_id' => $add_array['sip_profile_id']);		   
287
-	$this->db->update('sip_devices', $new_array,array('id'=>$add_array['id']));
287
+	$this->db->update('sip_devices', $new_array, array('id'=>$add_array['id']));
288 288
 	return true;
289 289
     }
290
-    function getuser_cdrs_list($flag, $start, $limit,$export=true) {
290
+    function getuser_cdrs_list($flag, $start, $limit, $export = true) {
291 291
         $this->db_model->build_search('user_cdrs_report_search');
292 292
         $account_data = $this->session->userdata("accountinfo");
293
-        $field_name='debit';
294
-        if($account_data['type']==0 || $account_data['type']==1){
295
-            $where['accountid']=$account_data['id'];
293
+        $field_name = 'debit';
294
+        if ($account_data['type'] == 0 || $account_data['type'] == 1) {
295
+            $where['accountid'] = $account_data['id'];
296 296
             
297 297
         }
298
-        if($account_data['type']==3){
299
-           $where['provider_id']=$account_data['id'];
300
-           $field_name='cost';
298
+        if ($account_data['type'] == 3) {
299
+           $where['provider_id'] = $account_data['id'];
300
+           $field_name = 'cost';
301 301
         }
302
-        $table_name=$account_data['type'] !=1 ? 'cdrs': 'reseller_cdrs';
303
-        if($this->session->userdata('advance_search') != 1){
304
-	    $where['callstart >= ']=date("Y-m-d")." 00:00:00";
305
-            $where['callstart <=']=date("Y-m-d")." 23:59:59";
302
+        $table_name = $account_data['type'] != 1 ? 'cdrs' : 'reseller_cdrs';
303
+        if ($this->session->userdata('advance_search') != 1) {
304
+	    $where['callstart >= '] = date("Y-m-d")." 00:00:00";
305
+            $where['callstart <='] = date("Y-m-d")." 23:59:59";
306 306
         }
307 307
         $this->db->where($where);
308 308
         $this->db->order_by("callstart desc");
309 309
         if ($flag) {
310
-            if (!$export)
310
+            if ( ! $export)
311 311
                 $this->db->limit($limit, $start);
312 312
             $this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,debit,cost,accountid,pricelist_id,calltype,is_recording,trunk_id,uniqueid');
313
-        }else {
313
+        } else {
314 314
             $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');
315 315
         }
316 316
         $result = $this->db->get($table_name);
317 317
         return $result;
318 318
     }
319 319
     
320
-    function user_fund_transfer($data){
320
+    function user_fund_transfer($data) {
321 321
 	$accountinfo = $this->session->userdata['accountinfo'];
322
-        $data["payment_by"] = $accountinfo['reseller_id'] > 0 ? $accountinfo['reseller_id'] : -1 ;
322
+        $data["payment_by"] = $accountinfo['reseller_id'] > 0 ? $accountinfo['reseller_id'] : -1;
323 323
         $data['accountid'] = $data['id'];
324 324
         $data['payment_mode'] = $data['payment_type'];
325
-        unset($data['action'],$data['id'],$data['account_currency'],$data['payment_type']);
325
+        unset($data['action'], $data['id'], $data['account_currency'], $data['payment_type']);
326 326
         if (isset($data)) {
327
-            $data['credit']=$data['credit'] =='' ?  0 : $data['credit'];
327
+            $data['credit'] = $data['credit'] == '' ? 0 : $data['credit'];
328 328
             $date = gmdate('Y-m-d H:i:s');
329
-            $accountid=$data['accountid'];
330
-            while($accountid > 0 ){
331
-                $customer_id=$accountid;
332
-                $accountid=$this->common_model->get_parent_info($accountid);
333
-                $parent_id=$accountid > 0 ? $accountid : -1;
334
-                $balance = $this->db_model->update_balance($data['credit'], $customer_id,$data['payment_mode']);
335
-                if($data['payment_mode'] == 0){
329
+            $accountid = $data['accountid'];
330
+            while ($accountid > 0) {
331
+                $customer_id = $accountid;
332
+                $accountid = $this->common_model->get_parent_info($accountid);
333
+                $parent_id = $accountid > 0 ? $accountid : -1;
334
+                $balance = $this->db_model->update_balance($data['credit'], $customer_id, $data['payment_mode']);
335
+                if ($data['payment_mode'] == 0) {
336 336
             		$insert_arr = array("accountid" => $customer_id,
337 337
 				    "credit" => $data['credit'],
338 338
 				    'payment_mode'=>$data['payment_mode'],
@@ -348,28 +348,28 @@  discard block
 block discarded – undo
348 348
     }
349 349
      function user_dashboard_recent_recharge_info()
350 350
     {
351
-	$accountinfo=$this->session->userdata('accountinfo');
352
-	$userlevel_logintype=$this->session->userdata('userlevel_logintype');
351
+	$accountinfo = $this->session->userdata('accountinfo');
352
+	$userlevel_logintype = $this->session->userdata('userlevel_logintype');
353 353
 	
354
-	$where_arr=array('payment_by'=>-1);
355
-	if($userlevel_logintype == 1){
356
-	  $where_arr=array('payment_by'=>$accountinfo['id']);
354
+	$where_arr = array('payment_by'=>-1);
355
+	if ($userlevel_logintype == 1) {
356
+	  $where_arr = array('payment_by'=>$accountinfo['id']);
357 357
 	}
358
-	if($userlevel_logintype == 0 || $userlevel_logintype == 3){
359
-	  $where_arr=array('accountid'=>$accountinfo['id']);
358
+	if ($userlevel_logintype == 0 || $userlevel_logintype == 3) {
359
+	  $where_arr = array('accountid'=>$accountinfo['id']);
360 360
 	}
361 361
         $this->db->where($where_arr);
362 362
         $this->db->select('id,accountid,credit,payment_date,notes');
363 363
         $this->db->from('payments');
364 364
         $this->db->limit(10);
365
-        $this->db->order_by('payment_date','desc');
365
+        $this->db->order_by('payment_date', 'desc');
366 366
 	return $this->db->get();
367 367
     }
368 368
     
369 369
     function get_user_rates_list($flag, $start = 0, $limit = 0) {
370 370
         $this->db_model->build_search('user_rates_list_search');
371 371
         $account_data = $this->session->userdata("accountinfo");
372
-        $where = array("pricelist_id" => $account_data["pricelist_id"],"status" => '0');
372
+        $where = array("pricelist_id" => $account_data["pricelist_id"], "status" => '0');
373 373
         if ($flag) {
374 374
             $query = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
375 375
         } else {
@@ -378,42 +378,42 @@  discard block
 block discarded – undo
378 378
         return $query;
379 379
     }
380 380
     function get_user_opensips($flag, $account_number = "", $start = "0", $limit = "0") {
381
-        $this->db_model->build_search_opensips($this->opensips_db,'user_opensips_search');	
382
-        $this->opensips_db->where('accountcode',$account_number);
381
+        $this->db_model->build_search_opensips($this->opensips_db, 'user_opensips_search');	
382
+        $this->opensips_db->where('accountcode', $account_number);
383 383
         if ($flag) {
384
-	      $this->opensips_db->limit($limit,$start);
384
+	      $this->opensips_db->limit($limit, $start);
385 385
         }
386 386
         $result = $this->opensips_db->get("subscriber");
387
-        if($result->num_rows() > 0){
388
-	  if($flag){
387
+        if ($result->num_rows() > 0) {
388
+	  if ($flag) {
389 389
 	    return $result;
390 390
 	  }
391
-	  else{
391
+	  else {
392 392
 	    return $result->num_rows();
393 393
 	  }
394
-        }else{
395
-         if($flag){
396
-	      $result=(object)array('num_rows'=>0);
394
+        } else {
395
+         if ($flag) {
396
+	      $result = (object)array('num_rows'=>0);
397 397
 	  }
398
-	  else{
399
-	      $result=0;
398
+	  else {
399
+	      $result = 0;
400 400
 	  }
401 401
 	  return $result;
402 402
         }
403 403
     }
404 404
     function user_opensips_add($data) {
405 405
         unset($data["action"]);
406
-        $data['creation_date']=gmdate("Y-m-d H:i:s");
407
-        $accountinfo=$this->session->userdata('accountinfo');
408
-	$data['reseller_id']=$accountinfo['type']==1 ? $accountinfo['id'] : 0;
406
+        $data['creation_date'] = gmdate("Y-m-d H:i:s");
407
+        $accountinfo = $this->session->userdata('accountinfo');
408
+	$data['reseller_id'] = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
409 409
         $this->opensips_db->insert("subscriber", $data);
410 410
     }
411 411
 
412 412
     function user_opensips_edit($data, $id) {
413 413
       unset($data["action"]);
414
-      $data=array("username"=>$data['username'],"password"=>$data['password'],"accountcode"=>$data['accountcode'],"domain"=>$data['domain']);
414
+      $data = array("username"=>$data['username'], "password"=>$data['password'], "accountcode"=>$data['accountcode'], "domain"=>$data['domain']);
415 415
       $this->opensips_db->where("id", $id);
416
-      $data['last_modified_date']=gmdate("Y-m-d H:i:s");
416
+      $data['last_modified_date'] = gmdate("Y-m-d H:i:s");
417 417
       $this->opensips_db->update("subscriber", $data);
418 418
     }
419 419
     function user_opensips_delete($id) {
@@ -421,12 +421,12 @@  discard block
 block discarded – undo
421 421
         $this->opensips_db->delete("subscriber");
422 422
         return true;
423 423
     }
424
-    function get_user_invoice_list($flag, $start = 0, $limit = 0){
424
+    function get_user_invoice_list($flag, $start = 0, $limit = 0) {
425 425
 	$this->db_model->build_search('user_invoice_list_search');
426
-	$accountinfo=$this->session->userdata('accountinfo');
427
-    $where = array("accountid" => $accountinfo['id'],'confirm'=>1);	
426
+	$accountinfo = $this->session->userdata('accountinfo');
427
+    $where = array("accountid" => $accountinfo['id'], 'confirm'=>1);	
428 428
 	$this->db->where($where);
429
-	$or_where= "(type='I' OR type='R')";
429
+	$or_where = "(type='I' OR type='R')";
430 430
 	$this->db->where($or_where);
431 431
         if ($flag) {
432 432
             $query = $this->db_model->select("*", "invoices", "", "invoice_date", "desc", $limit, $start);
@@ -437,7 +437,7 @@  discard block
 block discarded – undo
437 437
       
438 438
         return $query;
439 439
     }
440
-    function get_user_cdrs_info($flag,$accountid,$start = 0, $limit = 0){
440
+    function get_user_cdrs_info($flag, $accountid, $start = 0, $limit = 0) {
441 441
      if ($flag) {
442 442
             $query = $this->db_model->select("*", "reseller_cdrs", "", "invoice_date", "desc", $limit, $start);
443 443
             
@@ -447,38 +447,38 @@  discard block
 block discarded – undo
447 447
       
448 448
     }
449 449
     function get_invoiceconf($accountid) {
450
-        $return_array=array();
450
+        $return_array = array();
451 451
  	$logintype = $this->session->userdata('logintype');
452 452
         if ($logintype == 1 || $logintype == 5) {
453 453
           
454 454
 		$where = array("accountid" => $this->session->userdata["accountinfo"]['id']);
455
-        }else{
456
-       		 $where=array('id'=> $accountid);
455
+        } else {
456
+       		 $where = array('id'=> $accountid);
457 457
 	}      
458
-        $query = $this->db_model->getSelect("*","invoice_conf",$where);
459
-        foreach($query->result_array() as $key => $value)
458
+        $query = $this->db_model->getSelect("*", "invoice_conf", $where);
459
+        foreach ($query->result_array() as $key => $value)
460 460
         {
461
-            $return_array=$value;
461
+            $return_array = $value;
462 462
         }       
463 463
          return $return_array;
464 464
     }
465 465
     
466 466
     
467
-    function getprovider_cdrs_list($flag, $start, $limit,$export=true) {
467
+    function getprovider_cdrs_list($flag, $start, $limit, $export = true) {
468 468
         $this->db_model->build_search('user_provider_cdrs_report_search');
469 469
         $account_data = $this->session->userdata("accountinfo");
470
-        $where['provider_id']=$account_data['id'];
471
-        if($this->session->userdata('advance_search') != 1){
472
-	        $where['callstart >= ']=date("Y-m-d")." 00:00:00";
473
-            $where['callstart <=']=date("Y-m-d")." 23:59:59";
470
+        $where['provider_id'] = $account_data['id'];
471
+        if ($this->session->userdata('advance_search') != 1) {
472
+	        $where['callstart >= '] = date("Y-m-d")." 00:00:00";
473
+            $where['callstart <='] = date("Y-m-d")." 23:59:59";
474 474
         }
475 475
         $this->db->where($where);
476
-        $this->db->order_by("callstart","desc");
476
+        $this->db->order_by("callstart", "desc");
477 477
         if ($flag) {
478
-            if (!$export)
478
+            if ( ! $export)
479 479
                 $this->db->limit($limit, $start);
480 480
             $this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,cost,accountid,pricelist_id,calltype,is_recording,trunk_id,uniqueid');
481
-        }else {
481
+        } else {
482 482
             $this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(cost) as total_cost,group_concat(distinct(trunk_id)) as trunk_ids');
483 483
         }
484 484
         $result = $this->db->get('cdrs');
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.
astpp/application/modules/systems/views/view_template_add_edit.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <? extend('master.php') ?>
2
-<?php error_reporting(E_ERROR);?>
2
+<?php error_reporting(E_ERROR); ?>
3 3
 <? startblock('extra_head') ?>
4 4
 
5 5
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/tinymce/tinymce.min.js">
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 	<div class="w-section inverse no-padding">
45 45
             <?php echo $form; ?>
46 46
 			<?php
47
-				if(isset($validation_errors) && $validation_errors != ''){ ?>
47
+				if (isset($validation_errors) && $validation_errors != '') { ?>
48 48
 				<script>
49 49
 					var ERR_STR = '<?php echo $validation_errors; ?>';
50 50
 					print_error(ERR_STR);
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/systems/views/view_systemconf.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <? extend('left_panel_setting_master.php') ?>
2
-<?php error_reporting(E_ERROR);?>
2
+<?php error_reporting(E_ERROR); ?>
3 3
 <? startblock('extra_head') ?>
4 4
 <?php endblock() ?>
5 5
 
@@ -160,11 +160,11 @@  discard block
 block discarded – undo
160 160
         <div class="pull-right">
161 161
             <ul class="breadcrumb">
162 162
                 <li>
163
-                    <a href="<?= base_url() . "systems/configuration/global"; ?>"> Global</a>
163
+                    <a href="<?= base_url()."systems/configuration/global"; ?>"> Global</a>
164 164
                 </li>
165
-                <?php if($group_title != "global") { ?>
165
+                <?php if ($group_title != "global") { ?>
166 166
                 <li class="active">
167
-                    <a href="<?= base_url() . "systems/configuration/".$group_title ; ?>"> <?php echo ucfirst($group_title); ?></a>
167
+                    <a href="<?= base_url()."systems/configuration/".$group_title; ?>"> <?php echo ucfirst($group_title); ?></a>
168 168
                 </li>
169 169
                 <?php } ?>
170 170
             </ul>
@@ -176,35 +176,35 @@  discard block
 block discarded – undo
176 176
               <fieldset>
177 177
                <legend> <?=ucfirst($group_title)?></legend>
178 178
                   <div style="width:50%;float:left;">
179
-                    <?php $currency = Common_model::$global_config['system_config']['base_currency'];?>
180
-                    <?php $count=ceil(sizeof($details)/2); $i=0; $class="tleft";?>
181
-                    <?php foreach($details as$key=>$val){ ?>
182
-                          <?php if($count==$i){
179
+                    <?php $currency = Common_model::$global_config['system_config']['base_currency']; ?>
180
+                    <?php $count = ceil(sizeof($details) / 2); $i = 0; $class = "tleft"; ?>
181
+                    <?php foreach ($details as$key=>$val) { ?>
182
+                          <?php if ($count == $i) {
183 183
                               echo '</div><div style="width:50%;float:left;">';
184
-                              $class="tright";
184
+                              $class = "tright";
185 185
                           } ?>
186 186
                           <div class="col-md-12">
187 187
                             <div class="<?=$class?>" href='#'>
188
-                            <label class="col-md-5 no-padding"><?php echo $val['display_name'];?> * </label>
189
-                            <?php if(method_exists($this->common,$val['field_type'])){
190
-                                $option_array =  $this->common->$val['field_type'](); 
188
+                            <label class="col-md-5 no-padding"><?php echo $val['display_name']; ?> * </label>
189
+                            <?php if (method_exists($this->common, $val['field_type'])) {
190
+                                $option_array = $this->common->$val['field_type'](); 
191 191
                                 $drpstr = '<select name="'.$val['name'].'" class="col-md-5 form-control selectpicker"  data-live-search="true">';
192
-                                      foreach($option_array as $option_key=>$option_val){
193
-                                        $selected = ($val['value'] == $option_key)? "selected='selected'":"";
192
+                                      foreach ($option_array as $option_key=>$option_val) {
193
+                                        $selected = ($val['value'] == $option_key) ? "selected='selected'" : "";
194 194
                                         $drpstr .= '<option value="'.$option_key.'"'.$selected.'>'.$option_val.'</option>';
195 195
                                       }
196 196
                                 $drpstr .= '</select>';
197 197
                                 echo $drpstr;
198 198
                                 unset($drpstr);
199
-                            } else{
199
+                            } else {
200 200
                                 echo '<input name="'.$val["name"].'" value="'.$val['value'].'" size="20" maxlength="100" class="col-md-5 form-control" type="text">'; 
201 201
                             }?>
202
-                              <span class="demo"><?php echo str_replace('smtp',"SMTP",$val['comment']);?></span>
202
+                              <span class="demo"><?php echo str_replace('smtp', "SMTP", $val['comment']); ?></span>
203 203
 
204 204
                             </div>
205 205
                           </div>  
206 206
 
207
-                      <?php $i++;?>
207
+                      <?php $i++; ?>
208 208
                     <?php }?>
209 209
                   </div>
210 210
               </fieldset>
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/taxes/controllers/taxes.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
         $this->load->model('taxes_model');
34 34
 
35 35
         if ($this->session->userdata('user_login') == FALSE)
36
-            redirect(base_url() . '/astpp/login');
36
+            redirect(base_url().'/astpp/login');
37 37
     }
38 38
 
39 39
     function taxes_add() {
@@ -89,11 +89,11 @@  discard block
 block discarded – undo
89 89
 
90 90
     function taxes_delete($id) {
91 91
 		$this->db->select('taxes_description');
92
-		$this->db->where('id',$id);
93
-		$taxes_name=(array)$this->db->get('taxes')->first_row();
92
+		$this->db->where('id', $id);
93
+		$taxes_name = (array)$this->db->get('taxes')->first_row();
94 94
         $this->taxes_model->remove_taxes($id);
95 95
         $this->session->set_flashdata('astpp_notification', $taxes_name["taxes_description"].' Tax removed successfully!');
96
-        redirect(base_url() . 'taxes/taxes_list/');
96
+        redirect(base_url().'taxes/taxes_list/');
97 97
     }
98 98
 
99 99
     function taxes_list() {
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
     function taxes_list_json() {
110 110
         $json_data = array();
111 111
         $count_all = $this->taxes_model->get_taxes_list(false);
112
-        $paging_data =  $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
112
+        $paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
113 113
         $json_data = $paging_data["json_paging"];
114 114
 
115 115
         $query = $this->taxes_model->get_taxes_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
         $this->session->set_userdata('taxes_list_search', $this->input->post());
132 132
         }
133 133
         if (@$ajax_search != 1) {
134
-            redirect(base_url() . 'taxes/taxes_list/');
134
+            redirect(base_url().'taxes/taxes_list/');
135 135
         }
136 136
     }
137 137
 
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
     function taxes_delete_multiple() {
144 144
         $ids = $this->input->post("selected_ids", true);
145 145
         $where = "id IN ($ids)";
146
-        $taxes_where="taxes_id IN(".$ids.")";
146
+        $taxes_where = "taxes_id IN(".$ids.")";
147 147
         $this->db->where($taxes_where);
148 148
         $this->db->delete('taxes_to_accounts');
149 149
         $this->db->where($where);
Please login to merge, or discard this patch.