Completed
Pull Request — v3.0 (#146)
by
unknown
125:06 queued 113:39
created
web_interface/astpp/application/modules/accounts/models/accounts_model.php 1 patch
Braces   +36 added lines, -30 removed lines patch added patch discarded remove patch
@@ -53,12 +53,12 @@  discard block
 block discarded – undo
53 53
         }*/
54 54
 		if(isset($accountinfo['local_call'])){
55 55
 	  $accountinfo['local_call']=0;
56
-		}else{
56
+		} else{
57 57
 	  $accountinfo['local_call']=1;
58 58
 		}
59 59
 		if ($accountinfo['type'] == 1){
60 60
 		$invoice_config = $accountinfo['invoice_config_flag'];
61
-		}else{
61
+		} else{
62 62
 		$invoice_config = "";		
63 63
 		}
64 64
 		unset($accountinfo['invoice_config_flag']);
@@ -300,17 +300,17 @@  discard block
 block discarded – undo
300 300
 		);
301 301
 		if(isset($add_array['is_recording']) &&  $add_array['is_recording'] != ''){
302 302
 		$is_recording=1;
303
-		}else{
303
+		} else{
304 304
 		$is_recording=0;
305 305
 		}
306 306
 		if(isset($add_array['allow_ip_management']) &&  $add_array['allow_ip_management'] != ''){
307 307
 		$allow_ip_management=1;
308
-		}else{
308
+		} else{
309 309
 		$allow_ip_management=0;
310 310
 		}
311 311
 		if(isset($add_array['local_call']) &&  $add_array['local_call'] != ''){
312 312
 		$local_call=1;
313
-		}else{
313
+		} else{
314 314
 		$local_call=0;
315 315
 		}
316 316
 		if ($sip_flag) {
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
478 478
 		  $current_id=$accountinfo['type'] ==1 ? $accountinfo['id'] : '0';
479 479
 		  if($accountdata['reseller_id'] == $current_id){
480 480
 			$this->common->mail_to_users('voip_account_refilled', $accountdata);
481
-		  }else{
481
+		  } else{
482 482
 			$this->common->mail_to_users('voip_child_account_refilled', $accountdata);
483 483
 		  }
484 484
 		}
@@ -506,7 +506,7 @@  discard block
 block discarded – undo
506 506
 		}
507 507
 		if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
508 508
 		  $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
509
-		}else{
509
+		} else{
510 510
 			$this->db->order_by('number','desc');
511 511
 		}
512 512
 		$result = $this->db->get('accounts');
@@ -535,12 +535,13 @@  discard block
 block discarded – undo
535 535
 			$this->db->where($type);
536 536
 		}
537 537
 		if ($flag) {
538
-			if (!$export)
539
-				$this->db->limit($limit, $start);
538
+			if (!$export) {
539
+							$this->db->limit($limit, $start);
540
+			}
540 541
 		}
541 542
 		if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
542 543
 		  $this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
543
-		}else{
544
+		} else{
544 545
 			$this->db->order_by('number','desc');
545 546
 		}
546 547
 		$result = $this->db->get('accounts');
@@ -614,10 +615,11 @@  discard block
 block discarded – undo
614 615
 
615 616
 	function get_account_number($accountid) {
616 617
 		$query = $this->db_model->getSelect("number", "accounts", array("id" => $accountid));
617
-		if ($query->num_rows() > 0)
618
-			return $query->row_array();
619
-		else
620
-			return false;
618
+		if ($query->num_rows() > 0) {
619
+					return $query->row_array();
620
+		} else {
621
+					return false;
622
+		}
621 623
 	}
622 624
 
623 625
 	function add_callerid($data) {
@@ -662,10 +664,11 @@  discard block
 block discarded – undo
662 664
 	function get_accounttax_by_id($account_id) {
663 665
 		$this->db->where("accountid", trim($account_id));
664 666
 		$query = $this->db->get("taxes_to_accounts");
665
-		if ($query->num_rows() > 0)
666
-			return $query->result_array();
667
-		else
668
-			return false;
667
+		if ($query->num_rows() > 0) {
668
+					return $query->result_array();
669
+		} else {
670
+					return false;
671
+		}
669 672
 	}
670 673
 
671 674
 	/**
@@ -678,29 +681,32 @@  discard block
 block discarded – undo
678 681
 		$this->db->where("number", $acc_num);
679 682
 		$query = $this->db->get("accounts");
680 683
 
681
-		if ($query->num_rows() > 0)
682
-			return $query->row_array();
683
-		else
684
-			return false;
684
+		if ($query->num_rows() > 0) {
685
+					return $query->row_array();
686
+		} else {
687
+					return false;
688
+		}
685 689
 	}
686 690
 
687 691
 	function get_account_by_number($id) {
688 692
 		$this->db->where("id", $id);
689 693
 		$query = $this->db->get("accounts");
690 694
 
691
-		if ($query->num_rows() > 0)
692
-			return $query->row_array();
693
-		else
694
-			return false;
695
+		if ($query->num_rows() > 0) {
696
+					return $query->row_array();
697
+		} else {
698
+					return false;
699
+		}
695 700
 	}
696 701
 
697 702
 	function get_currency_by_id($currency_id) {
698 703
 
699 704
 		$query = $this->db_model->getSelect("*", 'currency', array('id' => $currency_id));
700
-		if ($query->num_rows() > 0)
701
-			return $query->row_array();
702
-		else
703
-			return false;
705
+		if ($query->num_rows() > 0) {
706
+					return $query->row_array();
707
+		} else {
708
+					return false;
709
+		}
704 710
 	}
705 711
 
706 712
 
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/accounts/controllers/accounts.php 1 patch
Braces   +27 added lines, -20 removed lines patch added patch discarded remove patch
@@ -37,8 +37,9 @@  discard block
 block discarded – undo
37 37
 		$this->load->model('accounts_model');
38 38
 		$this->load->model('Astpp_common');
39 39
 		$this->protected_pages = array('account_list');
40
-		if ($this->session->userdata('user_login') == FALSE)
41
-			redirect(base_url() . '/login/login');
40
+		if ($this->session->userdata('user_login') == FALSE) {
41
+					redirect(base_url() . '/login/login');
42
+		}
42 43
 	}
43 44
 
44 45
 	function customer_list() {
@@ -377,13 +378,15 @@  discard block
 block discarded – undo
377 378
 		$where = array("accountid" => $accountid);
378 379
 		$instant_search=$this->session->userdata('left_panel_search_'.$accounttype.'_ipmap');
379 380
 		$like_str=!empty($instant_search) ? "(name like '%$instant_search%'  OR ip like '%$instant_search%' OR prefix like '%$instant_search%' OR created_date like '%$instant_search%' )" :null;
380
-		if(!empty($like_str))
381
-		$this->db->where($like_str);
381
+		if(!empty($like_str)) {
382
+				$this->db->where($like_str);
383
+		}
382 384
 		$count_all = $this->db_model->countQuery("*", "ip_map", $where);
383 385
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
384 386
 		$json_data = $paging_data["json_paging"];
385
-		if(!empty($like_str))
386
-		$this->db->where($like_str);
387
+		if(!empty($like_str)) {
388
+				$this->db->where($like_str);
389
+		}
387 390
 		$query = $this->db_model->select("*", "ip_map", $where, "id", "ASC", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
388 391
 		$grid_fields = json_decode($this->accounts_form->build_ip_list_for_customer($accountid, $accounttype));
389 392
 		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
@@ -472,15 +475,17 @@  discard block
 block discarded – undo
472 475
 		$json_data = array();
473 476
 		$instant_search=$this->session->userdata('left_panel_search_'.$accounttype.'_animap'); 
474 477
 		$like_str=!empty($instant_search) ? "(number like '%$instant_search%'  OR  creation_date like '%$instant_search%' )" :null;
475
-		if(!empty($like_str))
476
-		$this->db->where($like_str);
478
+		if(!empty($like_str)) {
479
+				$this->db->where($like_str);
480
+		}
477 481
 		$where = array("accountid" => $accountid);
478 482
 		$count_all = $this->db_model->countQuery("*", "ani_map", $where);
479 483
 
480 484
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
481 485
 		$json_data = $paging_data["json_paging"];
482
-		if(!empty($like_str))
483
-		$this->db->where($like_str);
486
+		if(!empty($like_str)) {
487
+				$this->db->where($like_str);
488
+		}
484 489
 		$query = $this->db_model->select("*", "ani_map", $where, "id", "ASC", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
485 490
 
486 491
 		$grid_fields = json_decode($this->accounts_form->build_animap_list_for_customer($accountid, $accounttype));
@@ -1043,7 +1048,7 @@  discard block
 block discarded – undo
1043 1048
 			$data['edit_id'] = $edit_id;
1044 1049
 			$data['accounttype'] = $accounttype;
1045 1050
 			$this->load->view('view_reseller_package_list', $data);
1046
-	   }else {
1051
+	   } else {
1047 1052
 			redirect(base_url() . 'accounts/reseller_list/');
1048 1053
 			exit;
1049 1054
 	   }
@@ -1321,14 +1326,14 @@  discard block
 block discarded – undo
1321 1326
 			$accountinfo = $this->accounts_model->get_account_by_number($post_array['id']);
1322 1327
 			if($accountinfo['reseller_id'] == 0){
1323 1328
 			   $where = array("accountid"=> 1);
1324
-		}else{
1329
+		} else{
1325 1330
 			$where = array("accountid"=> $accountinfo['id']);    
1326 1331
 		}
1327 1332
 		$query = $this->db_model->getSelect("*", "invoice_conf", $where);
1328 1333
 		if($query->num_rows >0){
1329 1334
 			$invoice_conf = $query->result_array();
1330 1335
 			$invoice_conf = $invoice_conf[0];
1331
-		}else{
1336
+		} else{
1332 1337
 			$query = $this->db_model->getSelect("*", "invoice_conf",array("accountid"=> 1));
1333 1338
 			$invoice_conf = $query->result_array();
1334 1339
 			$invoice_conf = $invoice_conf[0];            
@@ -1355,7 +1360,7 @@  discard block
 block discarded – undo
1355 1360
 					  'after_balance'=>$account_balance,
1356 1361
 					);
1357 1362
 			$this->db->insert("invoice_details", $insert_arr);
1358
-				}else{
1363
+				} else{
1359 1364
 			$this->load->module('invoices/invoices');
1360 1365
 			$invoice_id=$this->invoices->invoices->generate_receipt($post_array['id'],$post_array['credit'],$accountinfo,$last_invoice_ID+1,$invoice_prefix,$due_date);
1361 1366
 			$account_balance = $this->common->get_field_name('balance', 'accounts', $post_array['id']);
@@ -1788,8 +1793,9 @@  discard block
 block discarded – undo
1788 1793
 		$json_data['total'] = $config['total_rows'];
1789 1794
 		$perpage = $config['per_page'];
1790 1795
 		$start = ($page_no - 1) * $perpage;
1791
-		if ($start < 0)
1792
-			$start = 0;
1796
+		if ($start < 0) {
1797
+					$start = 0;
1798
+		}
1793 1799
 
1794 1800
 		$account_charge_list = $this->db_model->getAllJionQuery($table, $select, $where, $jionTable, $jionCondition, $type, $perpage, $start, $order_by, $order_type, "");
1795 1801
 		if ($account_charge_list->num_rows > 0) {
@@ -2132,8 +2138,9 @@  discard block
 block discarded – undo
2132 2138
 		$data['username'] = $this->session->userdata('user_name');
2133 2139
 		$data['page_title'] = 'Account Taxes';
2134 2140
 
2135
-		if ($action == false)
2136
-			$action = "list";
2141
+		if ($action == false) {
2142
+					$action = "list";
2143
+		}
2137 2144
 
2138 2145
 		if ($action == 'list') {
2139 2146
 			$this->load->view('view_account_taxes_list', $data);
@@ -2397,10 +2404,10 @@  discard block
 block discarded – undo
2397 2404
 	   $ip_map_result=(array)$this->db->get('ip_map')->first_row();
2398 2405
 	   if($ip_map_result['count'] > 0 ){
2399 2406
 		 echo 'FALSE';
2400
-	   }else{
2407
+	   } else{
2401 2408
 		 echo 'TRUE';
2402 2409
 	   }
2403
-	 }else{
2410
+	 } else{
2404 2411
 	  echo 'FALSE';
2405 2412
 	 }
2406 2413
     
Please login to merge, or discard this patch.
astpp/application/modules/accounts/libraries/accounts_form.php 1 patch
Braces   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -21,8 +21,9 @@  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 28
 class Accounts_form {
28 29
 	function __construct($library_name = '') {
@@ -279,8 +280,7 @@  discard block
 block discarded – undo
279 280
 			array(gettext('Tax'), 'tax_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'taxes_description', 'taxes', 'build_dropdown', 'where_arr', array('status' => 0, 'reseller_id' => $loginid), 'multi'),
280 281
 		);
281 282
 
282
-}
283
-else{
283
+} else{
284 284
 			$form[gettext('Billing Information')] = array(
285 285
 			array(gettext('Rate Group'), 'pricelist_id', 'SELECT', '', array("name" => "pricelist_id", 'rules' => 'required'), 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'pricelists', 'build_dropdown', 'where_arr', array("status" => "0", "reseller_id" => "0")),
286 286
             
@@ -442,8 +442,7 @@  discard block
 block discarded – undo
442 442
 			array('', 'HIDDEN', 'advance_search', '1', '', '', '')
443 443
 		);
444 444
         
445
-		}
446
-		else
445
+		} else
447 446
 		{
448 447
 		
449 448
 		$form['forms'] = array("", array('id' => "account_search"));
@@ -603,8 +602,9 @@  discard block
 block discarded – undo
603 602
 	function build_grid_buttons_customer() {
604 603
 		$logintype = $this->CI->session->userdata('userlevel_logintype');
605 604
 		$provider = null;
606
-		if ($logintype != 1)
607
-			$provider = array(gettext("Create Provider"), "btn btn-line-blue btn", "fa fa-plus-circle fa-lg", "button_action", "/accounts/provider_add/");
605
+		if ($logintype != 1) {
606
+					$provider = array(gettext("Create Provider"), "btn btn-line-blue btn", "fa fa-plus-circle fa-lg", "button_action", "/accounts/provider_add/");
607
+		}
608 608
 			 // array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);
609 609
 		$buttons_json = json_encode(array(
610 610
 			array(gettext("Create Customer"), "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/accounts/customer_add/"),
Please login to merge, or discard this patch.
astpp/application/modules/accounts/views/view_accounting_taxes_add.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -59,8 +59,9 @@
 block discarded – undo
59 59
 							if (isset($taxesList) && is_array($taxesList) && count($taxesList) > 0) {
60 60
 								echo "<table>";
61 61
 								foreach ($taxesList as $values) {
62
-									if ($i == 1)
63
-										echo"<tr>";
62
+									if ($i == 1) {
63
+																			echo"<tr>";
64
+									}
64 65
 									?>
65 66
                                 <td style="padding-left: 10px;">
66 67
                                     <input type="checkbox" id="tax_<?= $values->id; ?>"name="tax_<?= $values->id; ?>" value="<?= $values->id; ?>" <? if (in_array($values->id, $tax_ids)) {
Please login to merge, or discard this patch.
astpp/application/modules/accounts/views/view_bulk_account_creation.php 1 patch
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -60,11 +60,12 @@
 block discarded – undo
60 60
 						   $validation_array=json_decode($validation_errors);
61 61
 						   if(is_object($validation_array)){
62 62
 						   $validation_array = get_object_vars($validation_array);
63
-						   foreach($validation_array as $key=>$value)
64
-					  echo $value."<br/>";
63
+						   foreach($validation_array as $key=>$value) {
64
+						   					  echo $value."<br/>";
65
+						   }
66
+						   } else {
67
+						   					  echo $validation_errors;
65 68
 						   }
66
-						   else
67
-					  echo $validation_errors;
68 69
                            
69 70
 						}
70 71
 						?>
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/rates/models/rates_model.php 1 patch
Braces   +22 added lines, -17 removed lines patch added patch discarded remove patch
@@ -50,10 +50,11 @@  discard block
 block discarded – undo
50 50
 		$this->db_model->build_search('termination_rates_list_search');
51 51
 		$this->db->from('outbound_routes');
52 52
 		if ($flag) {
53
-			if ($export)
54
-				$this->db->limit($limit, $start);
53
+			if ($export) {
54
+							$this->db->limit($limit, $start);
55
+			}
55 56
 			$result = $this->db->get();
56
-		}else {
57
+		} else {
57 58
 			$result = $this->db->count_all_results();
58 59
 		}
59 60
 		return $result;
@@ -71,10 +72,11 @@  discard block
 block discarded – undo
71 72
        
72 73
 		$this->db_model->build_search('origination_rate_list_search');
73 74
 		if ($flag) {
74
-			if ($export)
75
-				$this->db->limit($limit, $start);
75
+			if ($export) {
76
+							$this->db->limit($limit, $start);
77
+			}
76 78
 			$result = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
77
-		}else {
79
+		} else {
78 80
 			$result = $this->db_model->countQuery("*", "routes", $where);
79 81
 		}
80 82
 // 	echo "<pre>";print_r($result->result());exit;
@@ -90,10 +92,11 @@  discard block
 block discarded – undo
90 92
 
91 93
 		$this->db_model->build_search('origination_rate_list_search');
92 94
 		if ($flag) {
93
-			if ($export)
94
-				$this->db->limit($limit, $start);
95
+			if ($export) {
96
+							$this->db->limit($limit, $start);
97
+			}
95 98
 			$result = $this->db_model->select("*", "routes", $where, "id", "ASC", $limit, $start);
96
-		}else {
99
+		} else {
97 100
 			$result = $this->db_model->countQuery("*", "routes", $where);
98 101
 		}
99 102
 		return $result;
@@ -301,10 +304,11 @@  discard block
 block discarded – undo
301 304
         }
302 305
         
303 306
         $updateflg = $this->db_model->build_batch_update_array($update_array);
304
-        if ($updateflg)
305
-            return $this->db->update("outbound_routes");
306
-        else
307
-            return false;
307
+        if ($updateflg) {
308
+                    return $this->db->update("outbound_routes");
309
+        } else {
310
+                    return false;
311
+        }
308 312
     }
309 313
     function origination_rate_batch_update($update_array) {
310 314
         $this->db_model->build_search('origination_rate_list_search');
@@ -313,10 +317,11 @@  discard block
 block discarded – undo
313 317
             $this->db->where("reseller_id", $account_data['id']);
314 318
         }
315 319
         $updateflg = $this->db_model->build_batch_update_array($update_array);
316
-        if ($updateflg)
317
-            return $this->db->update("routes");
318
-        else
319
-            return false;
320
+        if ($updateflg) {
321
+                    return $this->db->update("routes");
322
+        } else {
323
+                    return false;
324
+        }
320 325
     }
321 326
     function getreseller_rates_list($flag, $start = 0, $limit = 0, $export = false) {
322 327
         $this->db_model->build_search('resellerrates_list_search');
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/rates/libraries/rates_form.php 1 patch
Braces   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -20,8 +20,9 @@  discard block
 block discarded – undo
20 20
 # You should have received a copy of the GNU Affero General Public License
21 21
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
22 22
 ###############################################################################
23
-if (!defined('BASEPATH'))
24
-	exit('No direct script access allowed');
23
+if (!defined('BASEPATH')) {
24
+	exit('No direct script access allowed');
25
+}
25 26
 
26 27
 class rates_form {
27 28
 	function __construct($library_name = '') {
@@ -62,8 +63,9 @@  discard block
 block discarded – undo
62 63
 	function get_origination_rate_form_fields() {
63 64
 	 $logintype=$this->CI->session->userdata('userlevel_logintype');
64 65
 		$trunk=null;
65
-		if($logintype !=1)
66
-	  $trunk = array('Force Trunk', 'trunk_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', 'where_arr', array("status" => "0"));
66
+		if($logintype !=1) {
67
+			  $trunk = array('Force Trunk', 'trunk_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', 'where_arr', array("status" => "0"));
68
+		}
67 69
 		$form['forms'] = array(base_url() . 'rates/origination_rate_save/', array('id' => 'origination_rate_form', 'method' => 'POST', 'name' => 'origination_rate_form'));
68 70
 		$form['Rate Information'] = array(
69 71
 			array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),
@@ -165,8 +167,9 @@  discard block
 block discarded – undo
165 167
 	function origination_rate_batch_update_form() {
166 168
 	$logintype=$this->CI->session->userdata('userlevel_logintype');
167 169
 			$trunk=null;
168
-		if($logintype !=1)
169
-	  $trunk = array('Force Trunk', array('name'=> 'trunk_id[trunk_id]','id'=>'trunk_id'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', 'where_arr', array("status" => "0"),array('name'=>'trunk_id[operator]','class'=>'update_drp'), 'update_drp_type');
170
+		if($logintype !=1) {
171
+			  $trunk = array('Force Trunk', array('name'=> 'trunk_id[trunk_id]','id'=>'trunk_id'), 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'name', 'trunks', 'build_dropdown', 'where_arr', array("status" => "0"),array('name'=>'trunk_id[operator]','class'=>'update_drp'), 'update_drp_type');
172
+		}
170 173
 		$form['forms'] = array("rates/origination_rate_batch_update/",array('id' => "origination_rate_batch_update"));        
171 174
 		$form['Batch Update'] = array(
172 175
 			array('Connect Cost', 'INPUT', array('name' => 'connectcost[connectcost]','id'=>'connectcost', 'value' => '', 'size' => '20',  'class' => "text field "), '', 'Tool tips info', '1', array('name'=>'connectcost[operator]','class'=>'update_drp'), '', '', '', 'update_int_type', ''),
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/signup/models/signup_model.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@
 block discarded – undo
80 80
 						"status"=>0,
81 81
 						"assign_date"=>date('Y-m-d H:i:s')
82 82
 						 );
83
-			}else{
83
+			} else{
84 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',
Please login to merge, or discard this patch.
astpp/application/modules/signup/views/view_forgotpassword.php 1 patch
Braces   +11 added lines, -3 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 					<span class="login_error">
42 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>
@@ -78,10 +78,18 @@  discard block
 block discarded – undo
78 78
 										<div class="input-group col-md-12 margin-t-15 padding-r-32 padding-l-32">
79 79
 												<span class="input-group-addon"><i class="fa fa-envelope"></i></span>
80 80
 
81
-												<input type="text" class="form-control" id="email" name="email" placeholder="User Name OR Email" value = "<?php if (isset($value['email'])) echo  $value['email']; else ''; ?>" style="height:40px;">
81
+												<input type="text" class="form-control" id="email" name="email" placeholder="User Name OR Email" value = "<?php if (isset($value['email'])) {
82
+	echo  $value['email'];
83
+} else {
84
+	'';
85
+}
86
+?>" style="height:40px;">
82 87
 										</div> 
83 88
 
84
-												<?php if (isset($error['email'])) echo $error['email']; ?>              
89
+												<?php if (isset($error['email'])) {
90
+	echo $error['email'];
91
+}
92
+?>              
85 93
 											<div style="width: 97.67%; float: left;text-align: left; margin: 2% 22%;">
86 94
 													<span id="e_name" style="color:red;"> </span>
87 95
 											</div>
Please login to merge, or discard this patch.