mysociety / theyworkforyou

classes/User.php

Spacing +11 added lines, -11 removed lines

@@ -33,10 +33,10 @@ 
         $data['email'] = $user->email();
         $data['emailpublic'] = $user->emailpublic() == true ? "Yes" : "No";
         $data['optin'] = $user->optin() == true ? "Yes" : "No";
-        $data['postcode']	= $user->postcode();
+        $data['postcode'] = $user->postcode();
         $data['website']	= $user->url();
-        $data['registrationtime']	= $user->registrationtime();
-        $data['status']= $user->status();
+        $data['registrationtime'] = $user->registrationtime();
+        $data['status'] = $user->status();
         $data["deleted"] = $user->deleted();
         $data["confirmed"] = $user->confirmed();
         $data["status"] = $user->status();
@@ -243,10 +243,10 @@ 
         // Who are we updating? $THEUSER or someone else?
         if ($this_page == "otheruseredit") {
             $who = 'the user’s';
-            $success = $THEUSER->update_other_user ( $details );
+            $success = $THEUSER->update_other_user($details);
         } else {
             $who = 'your';
-            $success = $THEUSER->update_self ( $details );
+            $success = $THEUSER->update_self($details);
         }
 
 
@@ -278,12 +278,12 @@ 
         // If this goes well, the user will have their data
         // added to the database and a confirmation email
         // will be sent to them.
-        $success = $THEUSER->add ( $details );
+        $success = $THEUSER->add($details);
 
         $errors = array();
 
         if (!$success) {
-            $errors["db"] = "Sorry, we were unable to create an account for you. Please <a href=\"mailto:". str_replace('@', '&#64;', CONTACTEMAIL) . "\">let us know</a>. Thanks.";
+            $errors["db"] = "Sorry, we were unable to create an account for you. Please <a href=\"mailto:" . str_replace('@', '&#64;', CONTACTEMAIL) . "\">let us know</a>. Thanks.";
         }
 
         return $errors;
@@ -291,7 +291,7 @@ 
 
     public function getRep($cons_type, $mp_house) {
         global $THEUSER;
-        if ( !$THEUSER->has_postcode() ) {
+        if (!$THEUSER->has_postcode()) {
             return array();
         }
 
@@ -304,11 +304,11 @@ 
         // Scottish homepage
         try {
             $constituencies = \MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituencies($THEUSER->postcode());
-            if ( isset($constituencies[$cons_type]) ) {
+            if (isset($constituencies[$cons_type])) {
                 $constituency = $constituencies[$cons_type];
                 $MEMBER = new Member(array('constituency'=>$constituency, 'house'=> $mp_house));
             }
-        } catch ( MemberException $e ) {
+        } catch (MemberException $e) {
             return array();
         }
 
@@ -345,7 +345,7 @@ 
         $mreg = array();
         if ($THEUSER->isloggedin() && $THEUSER->postcode() != '' || $THEUSER->postcode_is_set()) {
             $reps = \MySociety\TheyWorkForYou\Member::getRegionalList($THEUSER->postcode, $mp_house, $cons_type);
-            foreach ( $reps as $rep ) {
+            foreach ($reps as $rep) {
                 $member = new \MySociety\TheyWorkForYou\Member(array('person_id' => $rep['person_id']));
                 $mreg[$rep['person_id']] = $this->constructMPData($member, $THEUSER, $mp_house);
             }

Braces +24 added lines, -12 removed lines

@@ -62,7 +62,8 @@ 
             $details = $this->getUserDetails();
             $details["password"] = '';
             $details["emailpublic"] = false;
-        } else {
+        }
+        else {
             $details["firstname"] = trim(get_http_var("firstname"));
             $details["lastname"] = trim(get_http_var("lastname"));
 
@@ -96,14 +97,16 @@ 
             if (get_http_var("deleted") != "") {
                 $deleted = get_http_var("deleted");
                 $details["deleted"] = $deleted[0] == "true" ? true : false;
-            } else {
+            }
+            else {
                 $details['deleted'] = false;
             }
 
             if (get_http_var("confirmed") != "") {
                 $confirmed = get_http_var("confirmed");
                 $details["confirmed"] = $confirmed[0] == "true" ? true : false;
-            } else {
+            }
+            else {
                 $details['confirmed'] = false;
             }
         }
@@ -139,11 +142,13 @@ 
                 if ($details["email"] == "") {
                     $errors["email"] = "Please enter an email address";
 
-                } elseif (!validate_email($details["email"])) {
+                }
+                elseif (!validate_email($details["email"])) {
                     // validate_email() is in includes/utilities.php
                     $errors["email"] = "Please enter a valid email address";
 
-                } else {
+                }
+                else {
 
                     $USER = new \USER;
                     $id_of_user_with_this_addresss = $USER->email_exists($details["email"], true);
@@ -159,7 +164,8 @@ 
                             $errors["email"] = "Someone else has already joined with this email address";
                         }
 
-                    } else {
+                    }
+                    else {
                         // User is joining. Check no one is already here with this email.
                         if ($this_page == "userjoin" && $id_of_user_with_this_addresss) {
                             $errors["email"] = "There is already a user with this email address";
@@ -175,7 +181,8 @@ 
                 if ($details["password"] == "") {
                     $errors["password"] = "Please enter a password";
 
-                } elseif (strlen($details["password"]) < 6) {
+                }
+                elseif (strlen($details["password"]) < 6) {
                     $errors["password"] = "Please enter at least six characters";
                 }
 
@@ -187,7 +194,8 @@ 
                     $errors["password"] = "The passwords did not match. Please try again.";
                 }
 
-            } else {
+            }
+            else {
 
                 // Update details pages.
 
@@ -205,7 +213,8 @@ 
         if ($details["postcode"] != "") {
             if (!validate_postcode($details["postcode"])) {
                 $errors["postcode"] = "Sorry, this isn't a valid UK postcode.";
-            } else {
+            }
+            else {
                 try {
                     $mp = new \MySociety\TheyWorkForYou\Member(array(
                         'postcode' => $details['postcode'],
@@ -244,7 +253,8 @@ 
         if ($this_page == "otheruseredit") {
             $who = 'the user&rsquo;s';
             $success = $THEUSER->update_other_user ( $details );
-        } else {
+        }
+        else {
             $who = 'your';
             $success = $THEUSER->update_self ( $details );
         }
@@ -255,7 +265,8 @@ 
 
             if ($this_page == 'otheruseredit') {
                 $this_page = "userview";
-            } else {
+            }
+            else {
                 $this_page = "userviewself";
             }
 
@@ -264,7 +275,8 @@ 
             }
 
 
-        } else {
+        }
+        else {
             $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.");
         }