Completed
Branch master (84c25f)
by Nick
32:17
created
classes/User.php 1 patch
Braces   +24 added lines, -12 removed lines patch added patch discarded remove patch
@@ -62,7 +62,8 @@  discard block
 block discarded – undo
62 62
             $details = $this->getUserDetails();
63 63
             $details["password"] = '';
64 64
             $details["emailpublic"] = false;
65
-        } else {
65
+        }
66
+        else {
66 67
             $details["firstname"] = trim(get_http_var("firstname"));
67 68
             $details["lastname"] = trim(get_http_var("lastname"));
68 69
 
@@ -96,14 +97,16 @@  discard block
 block discarded – undo
96 97
             if (get_http_var("deleted") != "") {
97 98
                 $deleted = get_http_var("deleted");
98 99
                 $details["deleted"] = $deleted[0] == "true" ? true : false;
99
-            } else {
100
+            }
101
+            else {
100 102
                 $details['deleted'] = false;
101 103
             }
102 104
 
103 105
             if (get_http_var("confirmed") != "") {
104 106
                 $confirmed = get_http_var("confirmed");
105 107
                 $details["confirmed"] = $confirmed[0] == "true" ? true : false;
106
-            } else {
108
+            }
109
+            else {
107 110
                 $details['confirmed'] = false;
108 111
             }
109 112
         }
@@ -139,11 +142,13 @@  discard block
 block discarded – undo
139 142
                 if ($details["email"] == "") {
140 143
                     $errors["email"] = "Please enter an email address";
141 144
 
142
-                } elseif (!validate_email($details["email"])) {
145
+                }
146
+                elseif (!validate_email($details["email"])) {
143 147
                     // validate_email() is in includes/utilities.php
144 148
                     $errors["email"] = "Please enter a valid email address";
145 149
 
146
-                } else {
150
+                }
151
+                else {
147 152
 
148 153
                     $USER = new \USER;
149 154
                     $id_of_user_with_this_addresss = $USER->email_exists($details["email"], true);
@@ -159,7 +164,8 @@  discard block
 block discarded – undo
159 164
                             $errors["email"] = "Someone else has already joined with this email address";
160 165
                         }
161 166
 
162
-                    } else {
167
+                    }
168
+                    else {
163 169
                         // User is joining. Check no one is already here with this email.
164 170
                         if ($this_page == "userjoin" && $id_of_user_with_this_addresss) {
165 171
                             $errors["email"] = "There is already a user with this email address";
@@ -175,7 +181,8 @@  discard block
 block discarded – undo
175 181
                 if ($details["password"] == "") {
176 182
                     $errors["password"] = "Please enter a password";
177 183
 
178
-                } elseif (strlen($details["password"]) < 6) {
184
+                }
185
+                elseif (strlen($details["password"]) < 6) {
179 186
                     $errors["password"] = "Please enter at least six characters";
180 187
                 }
181 188
 
@@ -187,7 +194,8 @@  discard block
 block discarded – undo
187 194
                     $errors["password"] = "The passwords did not match. Please try again.";
188 195
                 }
189 196
 
190
-            } else {
197
+            }
198
+            else {
191 199
 
192 200
                 // Update details pages.
193 201
 
@@ -205,7 +213,8 @@  discard block
 block discarded – undo
205 213
         if ($details["postcode"] != "") {
206 214
             if (!validate_postcode($details["postcode"])) {
207 215
                 $errors["postcode"] = "Sorry, this isn't a valid UK postcode.";
208
-            } else {
216
+            }
217
+            else {
209 218
                 try {
210 219
                     $mp = new \MySociety\TheyWorkForYou\Member(array(
211 220
                         'postcode' => $details['postcode'],
@@ -244,7 +253,8 @@  discard block
 block discarded – undo
244 253
         if ($this_page == "otheruseredit") {
245 254
             $who = 'the user&rsquo;s';
246 255
             $success = $THEUSER->update_other_user ( $details );
247
-        } else {
256
+        }
257
+        else {
248 258
             $who = 'your';
249 259
             $success = $THEUSER->update_self ( $details );
250 260
         }
@@ -255,7 +265,8 @@  discard block
 block discarded – undo
255 265
 
256 266
             if ($this_page == 'otheruseredit') {
257 267
                 $this_page = "userview";
258
-            } else {
268
+            }
269
+            else {
259 270
                 $this_page = "userviewself";
260 271
             }
261 272
 
@@ -264,7 +275,8 @@  discard block
 block discarded – undo
264 275
             }
265 276
 
266 277
 
267
-        } else {
278
+        }
279
+        else {
268 280
             $results['errors'] = array("db" => "Sorry, we were unable to update $who details. Please <a href=\"mailto:" . str_replace('@', '&#64;', CONTACTEMAIL) . "\">let us know</a> what you were trying to change. Thanks.");
269 281
         }
270 282
 
Please login to merge, or discard this patch.