Completed
Push — v3.0 ( e28df5...5be1a9 )
by Samir
13:00
created
astpp/application/modules/signup/views/view_confirmpassword.php 1 patch
Braces   +20 added lines, -4 removed lines patch added patch discarded remove patch
@@ -77,16 +77,32 @@
 block discarded – undo
77 77
 <div class="col-md-12 margin-t-20 padding-r-32 padding-l-32">
78 78
 <label class="col-md-5 no-padding" style="text-align: left;">Password</label>
79 79
 <div class="col-md-7 no-padding">
80
-<input type="text" name="password" required value="<?php if (isset($value['password'])) echo  $value['password']; else ''; ?>" id="password" size="15" maxlength="40" class="form-control"  />
81
-<div class='error-style col-md-12 no-padding' style='color:red; font-size: 13px;' id="une"><?php if (isset($error['password'])) echo $error['password']; ?></div>
80
+<input type="text" name="password" required value="<?php if (isset($value['password'])) {
81
+	echo  $value['password'];
82
+} else {
83
+	'';
84
+}
85
+?>" id="password" size="15" maxlength="40" class="form-control"  />
86
+<div class='error-style col-md-12 no-padding' style='color:red; font-size: 13px;' id="une"><?php if (isset($error['password'])) {
87
+	echo $error['password'];
88
+}
89
+?></div>
82 90
 </div>
83 91
 </div>
84 92
 
85 93
 <div class="col-md-12 margin-t-10 padding-r-32 padding-l-32">
86 94
 <label class="col-md-5 no-padding" style="text-align: left;">Confirm Password</label>
87 95
 <div class="col-md-7 no-padding">
88
-<input type="text" name="confirmpassword" required value="<?php if (isset($value['confirm_password'])) echo  $value['confirm_password']; else ''; ?>" id="confirm_password" size="15" maxlength="40" class="form-control"  />
89
-<div class='error-style col-md-12' style='color:red; font-size: 13px;' id="conpas"><?php if (isset($error['confirm_password'])) echo $error['confirm_password']; ?></div>
96
+<input type="text" name="confirmpassword" required value="<?php if (isset($value['confirm_password'])) {
97
+	echo  $value['confirm_password'];
98
+} else {
99
+	'';
100
+}
101
+?>" id="confirm_password" size="15" maxlength="40" class="form-control"  />
102
+<div class='error-style col-md-12' style='color:red; font-size: 13px;' id="conpas"><?php if (isset($error['confirm_password'])) {
103
+	echo $error['confirm_password'];
104
+}
105
+?></div>
90 106
 </div>
91 107
 </div>
92 108
 
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/signup/views/view_signup.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@
 block discarded – undo
97 97
 					<span class="login_error">
98 98
                         <?php if (isset($astpp_notification)){ ?>
99 99
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
100
-						<?php }else{
100
+						<?php } else{
101 101
 						 echo "&nbsp;";
102 102
 						} ?>
103 103
                     </span>
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/systems/models/system_model.php 1 patch
Braces   +3 added lines, -5 removed lines patch added patch discarded remove patch
@@ -71,8 +71,7 @@  discard block
 block discarded – undo
71 71
 		$this->db->where('reseller_id',$reseller);
72 72
 		$this->db->or_where('reseller_id',0);
73 73
 		$this->db->where($where);
74
-			}
75
-			else
74
+			} else
76 75
 			{
77 76
 			   $this->db->where('reseller_id',0);
78 77
 			}
@@ -80,13 +79,12 @@  discard block
 block discarded – undo
80 79
 			if($flag) {
81 80
 
82 81
 		$query = $this->db_model->select("*", "default_templates","", "id", "ASC", $limit, $start);
83
-		 }else {
82
+		 } else {
84 83
 
85 84
 		$query = $this->db_model->countQuery("*", "default_templates","");
86 85
 		
87 86
 		 }
88
-	  } 
89
-	  else {
87
+	  } else {
90 88
           
91 89
 			$where = array('reseller_id' => 0);
92 90
 			$this->db->where($where);
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/systems/controllers/systems.php 1 patch
Braces   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -33,8 +33,9 @@  discard block
 block discarded – undo
33 33
 		$this->load->model('system_model');
34 34
 		$this->load->dbutil();
35 35
 
36
-		if ($this->session->userdata('user_login') == FALSE)
37
-			redirect(base_url() . '/astpp/login');
36
+		if ($this->session->userdata('user_login') == FALSE) {
37
+					redirect(base_url() . '/astpp/login');
38
+		}
38 39
 	}
39 40
 
40 41
 	function configuration_edit($edit_id = '') {
@@ -106,7 +107,7 @@  discard block
 block discarded – undo
106 107
 		}
107 108
 				$this->session->set_flashdata('astpp_errormsg', ucfirst($group_title).' Settings updated sucessfully!');
108 109
 			redirect(base_url() . 'systems/configuration/'.$group_title);
109
-		}else{
110
+		} else{
110 111
 	 	$this->load->view('view_systemconf', $data);
111 112
 	}
112 113
 	}
@@ -167,8 +168,7 @@  discard block
 block discarded – undo
167 168
 			 $account_data = $this->session->userdata("accountinfo");
168 169
 			 $reseller = $account_data['id'];
169 170
 			 $this->resellertemplate_save($add_array,$reseller);
170
-		}
171
-		else
171
+		} else
172 172
 		{
173 173
 			$this->admintemplate_save($add_array);
174 174
 		}
@@ -494,12 +494,12 @@  discard block
 block discarded – undo
494 494
 	  $data['page_title'] = 'Database Backup';
495 495
 	  if($add_array['id'] != ''){
496 496
       
497
-	  }else{
497
+	  } else{
498 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;
@@ -524,7 +524,7 @@  discard block
 block discarded – undo
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
 		   }
@@ -572,7 +572,7 @@  discard block
 block discarded – undo
572 572
 			  exec($run_restore);
573 573
 			  $this->session->set_flashdata('astpp_errormsg', 'Database Restore successfully.');
574 574
 			  redirect(base_url() . 'systems/database_restore/');
575
-			}else{
575
+			} else{
576 576
 			  $this->session->set_flashdata('astpp_notification', 'File not exists!');
577 577
 			  redirect(base_url() . 'systems/database_restore/');
578 578
 			}
@@ -623,7 +623,7 @@  discard block
 block discarded – undo
623 623
 			$query = $this->system_model->import_database($filename,$_FILES['userfile']['name']);
624 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{
626
+		} else{
627 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
 		}
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/systems/libraries/system_form.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,8 +21,9 @@
 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'))
25
-	exit('No direct script access allowed');
24
+if (!defined('BASEPATH')) {
25
+	exit('No direct script access allowed');
26
+}
26 27
 
27 28
 class System_form {
28 29
 
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/pricing/controllers/pricing.php 1 patch
Braces   +7 added lines, -5 removed lines patch added patch discarded remove patch
@@ -32,8 +32,9 @@  discard block
 block discarded – undo
32 32
 		$this->load->library('astpp/form');
33 33
 		$this->load->model('pricing_model');
34 34
 
35
-		if ($this->session->userdata('user_login') == FALSE)
36
-			redirect(base_url() . '/astpp/login');
35
+		if ($this->session->userdata('user_login') == FALSE) {
36
+					redirect(base_url() . '/astpp/login');
37
+		}
37 38
 	}
38 39
 
39 40
 	function price_add($type = "") {
@@ -84,15 +85,16 @@  discard block
 block discarded – undo
84 85
 				exit;
85 86
 			}
86 87
 			$this->load->view('view_price_add_edit', $data);
87
-	   }else {
88
+	   } else {
88 89
 			$data['page_title'] = 'Create Price Details';
89 90
 			if ($this->form_validation->run() == FALSE) {
90 91
 				$data['validation_errors'] = validation_errors();
91 92
 				echo $data['validation_errors'];
92 93
 				exit;
93 94
 			} else {
94
-		if(isset($add_array['trunk_id']) && !empty($add_array['trunk_id']))
95
-				$trunk_id=$add_array['trunk_id'];
95
+		if(isset($add_array['trunk_id']) && !empty($add_array['trunk_id'])) {
96
+						$trunk_id=$add_array['trunk_id'];
97
+		}
96 98
 				unset($add_array['trunk_id']);
97 99
 				$priceid=$this->pricing_model->add_price($add_array);
98 100
 		if(isset($trunk_id) && $trunk_id != ''){
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/pricing/libraries/pricing_form.php 1 patch
Braces   +4 added lines, -4 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'))
25
-	exit('No direct script access allowed');
24
+if (!defined('BASEPATH')) {
25
+	exit('No direct script access allowed');
26
+}
26 27
 
27 28
 class pricing_form {
28 29
 	function __construct($library_name = '') {
@@ -41,8 +42,7 @@  discard block
 block discarded – undo
41 42
 		array('Markup(%)', 'INPUT', array('name' => 'markup', 'value' => "0" ,  'size' => '20',  'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter account number'),
42 43
 		array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Select Status', '', '', '', 'set_status'),
43 44
 		);
44
-	}
45
-	else{
45
+	} else{
46 46
 	  $form['Rate Group Information'] = array(
47 47
 		array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),
48 48
 		array('', 'HIDDEN', array('name' => 'status', 'value' => '1'), '', '', ''),
Please login to merge, or discard this patch.
astpp/application/modules/refill_coupon/models/refill_coupon_model.php 1 patch
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -33,10 +33,11 @@
 block discarded – undo
33 33
 		$reseller_id=$accountinfo['type']==1 ? $accountinfo['id'] : 0;
34 34
 		$where=array('reseller_id'=>$reseller_id);
35 35
 		if ($flag) {
36
-		if($export)
37
-		  $query = $this->db_model->select("*", "refill_coupon",$where, "id", "ASC",'','');
38
-		else
39
-		$query = $this->db_model->select("*", "refill_coupon",$where, "id", "ASC", $limit, $start);
36
+		if($export) {
37
+				  $query = $this->db_model->select("*", "refill_coupon",$where, "id", "ASC",'','');
38
+		} else {
39
+				$query = $this->db_model->select("*", "refill_coupon",$where, "id", "ASC", $limit, $start);
40
+		}
40 41
 		} else {
41 42
 			$query = $this->db_model->countQuery("*", "refill_coupon",$where);
42 43
 		}
Please login to merge, or discard this patch.
astpp/application/modules/refill_coupon/controllers/refill_coupon.php 1 patch
Braces   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -32,8 +32,9 @@  discard block
 block discarded – undo
32 32
 		  $this->load->library("refill_coupon_form");
33 33
 		  $this->load->library("astpp/form");
34 34
 		  $this->load->library("session");
35
-		  if ($this->session->userdata('user_login') == FALSE)
36
-			redirect(base_url() . 'login/login');
35
+		  if ($this->session->userdata('user_login') == FALSE) {
36
+		  			redirect(base_url() . 'login/login');
37
+		  }
37 38
 	  }
38 39
 	function refill_coupon_list(){
39 40
 	if($this->session->userdata('logintype') == 0 || $this->session->userdata('logintype') == 3){
@@ -120,8 +121,7 @@  discard block
 block discarded – undo
120 121
 				$data['validation_errors'] = validation_errors();
121 122
 				echo $data['validation_errors'];
122 123
 				exit;
123
-		}
124
-		else {    
124
+		} else {    
125 125
 		  if($account_length<=strlen($add_array['prefix'])){
126 126
 			  echo json_encode(array("count_error"=>"You Can Not Create ".$add_array['count']." Accounts with ".$add_array['prefix']." prefix."));
127 127
 			  exit;      
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 		  if($currentlength > 0 && $add_array['count'] > $currentlength){
134 134
 			echo json_encode(array("count_error"=>"You Can Create Maximum ".$currentlength." accounts with ".$add_array['prefix']." prefix"));
135 135
 			exit;      
136
-		  }else{
136
+		  } else{
137 137
 			$this->refill_coupon_model->add_refill_coupon($add_array);
138 138
 			echo json_encode(array("SUCCESS"=> "Refill coupon created successfully!"));
139 139
 			exit;
Please login to merge, or discard this patch.