View GitHub Repository ASTPP

Schedule Inspection
Subscribe
Passed
Pull Request — v3.0 (#165)
by
unknown
12:17
created
Status
Category
Toggle Patches
web_interface/astpp/application/modules/login/views/view_login.php 1 patch
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -16,7 +16,7 @@  discard block
 
 block discarded – undo
16 16 
 	?>
17 17 
 	Log In | <?php echo $invoiceconf['website_title']; ?>
18 18 
 	<?php
19 
-		}else{
19 
+		} else{
20 20 
 	?>
21 21 
 	Log In | ASTPP - Open Source Voip Billing Solution
22 22 
 	<?php
 
@@ -56,7 +56,7 @@  discard block
 
 block discarded – undo
56 56 
                         <div class="col-md-4 col-md-offset-4">&nbsp;<span class="login_error">
57 57 
                         <?php if (isset($astpp_notification)){ ?>
58 58 
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
59 
-                    <?php }else{
59 
+                    <?php } else{
60 60 
 						 echo "&nbsp;";
61 61 
 					} ?>
62 62 
                     </span></div> <br/>
 
@@ -72,7 +72,7 @@  discard block
 
 block discarded – undo
72 72 
 							<?php
73 73 
 							if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
74 74 
 								$logo = $this->session->userdata['user_logo'];
75 
-							}else{
75 
+							} else{
76 76 
 								$logo = 'logo.png';
77 77 
 							}
78 78
Please login to merge, or discard this patch.
astpp/application/modules/signup/views/view_forgotpassword.php 1 patch
Braces   +13 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -16,7 +16,7 @@  discard block
 
 block discarded – undo
16 16 
 	?>
17 17 
 	Forgot Password | <?php echo $invoiceconf['website_title']; ?>
18 18 
 	<?php
19 
-		}else{
19 
+		} else{
20 20 
 	?>
21 21 
 	Forgot Password | ASTPP - Open Source Voip Billing Solution
22 22 
 	<?php
 
@@ -59,7 +59,7 @@  discard block
 
 block discarded – undo
59 59 
 					<span class="login_error">
60 60 
                         <?php if (isset($astpp_notification)){ ?>
61 61 
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
62 
-						<?php }else{
62 
+						<?php } else{
63 63 
 						 echo "&nbsp;";
64 64 
 						} ?>
65 65 
                     </span>
 
@@ -77,7 +77,7 @@  discard block
 
 block discarded – undo
77 77 
 													  <?php
78 78 
 														if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
79 79 
 															$logo = $this->session->userdata['user_logo'];
80 
-														}else{
80 
+														} else{
81 81 
 															$logo = 'logo.png';
82 82 
 														}
83 83 
 														
@@ -104,10 +104,18 @@  discard block
 
 block discarded – undo
104 104 
 										<div class="input-group col-md-12 margin-t-15 padding-r-32 padding-l-32">
105 105 
 												<span class="input-group-addon"><i class="fa fa-envelope"></i></span>
106 106
107 
-												<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;">
107 
+												<input type="text" class="form-control" id="email" name="email" placeholder="User Name OR Email" value = "<?php if (isset($value['email'])) {
108 
+	echo  $value['email'];
109 
+} else {
110 
+	'';
111 
+}
112 
+?>" style="height:40px;">
108 113 
 										</div>
109 114
110 
-												<?php if (isset($error['email'])) echo $error['email']; ?>
115 
+												<?php if (isset($error['email'])) {
116 
+	echo $error['email'];
117 
+}
118 
+?>
111 119 
 											<div style="width: 97.67%; float: left;text-align: left; margin: 2% 22%;">
112 120 
 													<span id="e_name" style="color:red;"> </span>
113 121 
 											</div>
Please login to merge, or discard this patch.
astpp/application/modules/signup/views/view_successpassword.php 1 patch
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -16,7 +16,7 @@  discard block
 
 block discarded – undo
16 16 
 	?>
17 17 
 	Forgot Password | <?php echo $invoiceconf['website_title']; ?>
18 18 
 	<?php
19 
-		}else{
19 
+		} else{
20 20 
 	?>
21 21 
 	Forgot Password | ASTPP - Open Source Voip Billing Solution
22 22 
 	<?php
 
@@ -73,7 +73,7 @@  discard block
 
 block discarded – undo
73 73 
 					<?php
74 74 
 					if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
75 75 
 					$logo = $this->session->userdata['user_logo'];
76 
-					}else{
76 
+					} else{
77 77 
 					$logo = 'logo.png';
78 78 
 					}
79 79
Please login to merge, or discard this patch.
astpp/application/modules/signup/views/view_confirmpassword.php 1 patch
Braces   +22 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -16,7 +16,7 @@  discard block
 
 block discarded – undo
16 16 
 	?>
17 17 
 	Forgot Password | <?php echo $invoiceconf['website_title']; ?>
18 18 
 	<?php
19 
-		}else{
19 
+		} else{
20 20 
 	?>
21 21 
 	Forgot Password | ASTPP - Open Source Voip Billing Solution
22 22 
 	<?php
 
@@ -71,7 +71,7 @@  discard block
 
 block discarded – undo
71 71 
 			  <?php
72 72 
 					if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
73 73 
 						$logo = $this->session->userdata['user_logo'];
74 
-					}else{
74 
+					} else{
75 75 
 						$logo = 'logo.png';
76 76 
 					}
77 77 
 
@@ -103,16 +103,32 @@  discard block
 
 block discarded – undo
103 103 
 <div class="col-md-12 margin-t-20 padding-r-32 padding-l-32">
104 104 
 <label class="col-md-5 no-padding" style="text-align: left;">Password</label>
105 105 
 <div class="col-md-7 no-padding">
106 
-<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"  />
107 
-<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>
106 
+<input type="text" name="password" required value="<?php if (isset($value['password'])) {
107 
+	echo  $value['password'];
108 
+} else {
109 
+	'';
110 
+}
111 
+?>" id="password" size="15" maxlength="40" class="form-control"  />
112 
+<div class='error-style col-md-12 no-padding' style='color:red; font-size: 13px;' id="une"><?php if (isset($error['password'])) {
113 
+	echo $error['password'];
114 
+}
115 
+?></div>
108 116 
 </div>
109 117 
 </div>
110 118
111 119 
 <div class="col-md-12 margin-t-10 padding-r-32 padding-l-32">
112 120 
 <label class="col-md-5 no-padding" style="text-align: left;">Confirm Password</label>
113 121 
 <div class="col-md-7 no-padding">
114 
-<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"  />
115 
-<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>
122 
+<input type="text" name="confirmpassword" required value="<?php if (isset($value['confirm_password'])) {
123 
+	echo  $value['confirm_password'];
124 
+} else {
125 
+	'';
126 
+}
127 
+?>" id="confirm_password" size="15" maxlength="40" class="form-control"  />
128 
+<div class='error-style col-md-12' style='color:red; font-size: 13px;' id="conpas"><?php if (isset($error['confirm_password'])) {
129 
+	echo $error['confirm_password'];
130 
+}
131 
+?></div>
116 132 
 </div>
117 133 
 </div>
118 134
Please login to merge, or discard this patch.
astpp/application/modules/signup/views/view_signup_inactive.php 1 patch
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -16,7 +16,7 @@  discard block
 
 block discarded – undo
16 16 
 	?>
17 17 
 	Signup | <?php echo $invoiceconf['website_title']; ?>
18 18 
 	<?php
19 
-		}else{
19 
+		} else{
20 20 
 	?>
21 21 
 	Signup | ASTPP - Open Source Voip Billing Solution
22 22 
 	<?php
 
@@ -72,7 +72,7 @@  discard block
 
 block discarded – undo
72 72 
 					  <?php
73 73 
 						if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
74 74 
 						$logo = $this->session->userdata['user_logo'];
75 
-						}else{
75 
+						} else{
76 76 
 						$logo = 'logo.png';
77 77 
 						}
78 78
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/signup/views/view_signup_active.php 1 patch
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -16,7 +16,7 @@  discard block
 
 block discarded – undo
16 16 
 	?>
17 17 
 	Signup | <?php echo $invoiceconf['website_title']; ?>
18 18 
 	<?php
19 
-		}else{
19 
+		} else{
20 20 
 	?>
21 21 
 	Signup | ASTPP - Open Source Voip Billing Solution
22 22 
 	<?php
 
@@ -55,7 +55,7 @@  discard block
 
 block discarded – undo
55 55 
 			<div class="col-md-4 col-md-offset-4">&nbsp;<span class="login_error">
56 56 
                         <?php if (isset($astpp_notification)){ ?>
57 57 
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
58 
-                    <?php }else{
58 
+                    <?php } else{
59 59 
 						 echo "&nbsp;";
60 60 
 					}
61 61 
 			$astpp_err_msg = $this->session->flashdata('astpp_signupmsg');
 
@@ -78,7 +78,7 @@  discard block
 
 block discarded – undo
78 78 
                            	<?php
79 79 
 							if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
80 80 
 							$logo = $this->session->userdata['user_logo'];
81 
-							}else{
81 
+							} else{
82 82 
 							$logo = 'logo.png';
83 83 
 							}
84 84
Please login to merge, or discard this patch.
web_interface/astpp/application/modules/signup/views/view_signup.php 1 patch
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -16,7 +16,7 @@  discard block
 
 block discarded – undo
16 16 
 	?>
17 17 
 	Signup | <?php echo $invoiceconf['website_title']; ?>
18 18 
 	<?php
19 
-		}else{
19 
+		} else{
20 20 
 	?>
21 21 
 	Signup | ASTPP - Open Source Voip Billing Solution
22 22 
 	<?php

@@ -115,7 +115,7 @@  discard block
 
 block discarded – undo
115 115 
 					<span class="login_error">
116 116 
                         <?php if (isset($astpp_notification)){ ?>
117 117 
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
118 
-						<?php }else{
118 
+						<?php } else{
119 119 
 						 echo "&nbsp;";
120 120 
 						} ?>
121 121 
                     </span>

@@ -134,7 +134,7 @@  discard block
 
 block discarded – undo
134 134 
 													 <?php
135 135 
 														if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
136 136 
 															$logo = $this->session->userdata['user_logo'];
137 
-														}else{
137 
+														} else{
138 138 
 															$logo = 'logo.png';
139 139 
 														}
140 140
Please login to merge, or discard this patch.
astpp/application/modules/signup/views/view_signup_success.php 1 patch
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -16,7 +16,7 @@  discard block
 
 block discarded – undo
16 16 
 	?>
17 17 
 	Signup | <?php echo $invoiceconf['website_title']; ?>
18 18 
 	<?php
19 
-		}else{
19 
+		} else{
20 20 
 	?>
21 21 
 	Signup | ASTPP - Open Source Voip Billing Solution
22 22 
 	<?php

@@ -55,7 +55,7 @@  discard block
 
 block discarded – undo
55 55 
 			<div class="col-md-4 col-md-offset-4">&nbsp;<span class="login_error">
56 56 
                         <?php if (isset($astpp_notification)){ ?>
57 57 
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
58 
-                    <?php }else{
58 
+                    <?php } else{
59 59 
 						 echo "&nbsp;";
60 60 
 					}
61 61 
 			$astpp_err_msg = $this->session->flashdata('astpp_signupmsg');

@@ -77,7 +77,7 @@  discard block
 
 block discarded – undo
77 77 
                             	<?php
78 78 
 							if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
79 79 
 							$logo = $this->session->userdata['user_logo'];
80 
-							}else{
80 
+							} else{
81 81 
 							$logo = 'logo.png';
82 82 
 							}
83 83
Please login to merge, or discard this patch.
astpp/application/modules/signup/views/view_forgot_success.php 1 patch
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -16,7 +16,7 @@  discard block
 
 block discarded – undo
16 16 
 	?>
17 17 
 	Forgot Password | <?php echo $invoiceconf['website_title']; ?>
18 18 
 	<?php
19 
-		}else{
19 
+		} else{
20 20 
 	?>
21 21 
 	Forgot Password | ASTPP - Open Source Voip Billing Solution
22 22 
 	<?php
 
@@ -57,7 +57,7 @@  discard block
 
 block discarded – undo
57 57 
 			<div class="col-md-4 col-md-offset-4">&nbsp;<span class="login_error">
58 58 
                         <?php if (isset($astpp_notification)){ ?>
59 59 
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
60 
-                    <?php }else{
60 
+                    <?php } else{
61 61 
 						 echo "&nbsp;";
62 62 
 					}
63 63 
 			$astpp_err_msg = $this->session->flashdata('astpp_signupmsg');
 
@@ -76,7 +76,7 @@  discard block
 
 block discarded – undo
76 76 
                             	<?php
77 77 
 							if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
78 78 
 							$logo = $this->session->userdata['user_logo'];
79 
-							}else{
79 
+							} else{
80 80 
 							$logo = 'logo.png';
81 81 
 							}
82 82
Please login to merge, or discard this patch.