mysociety / theyworkforyou

www/includes/easyparliament/user.php

Spacing +24 added lines, -24 removed lines

@@ -55,23 +55,23 @@ 
 */
 
 class USER {
-    public $user_id = "0";         // So we have an ID for non-logged in users reporting comments etc.
-    public $firstname = "Guest";   // So we have something to print for non-logged in users.
+    public $user_id = "0"; // So we have an ID for non-logged in users reporting comments etc.
+    public $firstname = "Guest"; // So we have something to print for non-logged in users.
     public $lastname = "";
-    public $password = "";         // This will be a hashed version of a plaintext pw.
+    public $password = ""; // This will be a hashed version of a plaintext pw.
     public $email = "";
     public $postcode = "";
     public $url = "";
-    public $lastvisit = "";        // Last time the logged-in user loaded a page (GMT).
+    public $lastvisit = ""; // Last time the logged-in user loaded a page (GMT).
     public $registrationtime = ""; // When they registered (GMT).
-    public $registrationip = "";   // Where they registered from.
-    public $optin = "";            // Int containing multiple binary opt-ins. (See top of User.php)
-    public $deleted = "";          // User can't log in or have their info displayed.
-    public $confirmed = '';        // boolean - Has the user confirmed via email?
-    public $facebook_id = '';      // Facebook ID for users who login with FB
-    public $facebook_token = '';   // Facebook token for users who login with FB
-    public $can_annotate = false;  // Can the user add annotations
-    public $organisation = '';     // The organisation the user belongs to
+    public $registrationip = ""; // Where they registered from.
+    public $optin = ""; // Int containing multiple binary opt-ins. (See top of User.php)
+    public $deleted = ""; // User can't log in or have their info displayed.
+    public $confirmed = ''; // boolean - Has the user confirmed via email?
+    public $facebook_id = ''; // Facebook ID for users who login with FB
+    public $facebook_token = ''; // Facebook token for users who login with FB
+    public $can_annotate = false; // Can the user add annotations
+    public $organisation = ''; // The organisation the user belongs to
     // Don't use the status to check access privileges - use the is_able_to() function.
     public $status = "Viewer";
 
@@ -324,12 +324,12 @@ 
         $confirmurl = 'https://' . DOMAIN . '/E/' . $urltoken;
 
         // Arrays we need to send a templated email.
-        $data =  [
+        $data = [
             'to'        => $details['email'],
             'template'  => 'email_confirmation',
         ];
 
-        $merge =  [
+        $merge = [
             'CONFIRMURL'    => $confirmurl,
         ];
 
@@ -367,12 +367,12 @@ 
         }
 
         // Arrays we need to send a templated email.
-        $data =  [
+        $data = [
             'to'        => $details['email'],
             'template'  => 'join_confirmation',
         ];
 
-        $merge =  [
+        $merge = [
             'CONFIRMURL'    => $confirmurl,
         ];
 
@@ -438,13 +438,13 @@ 
                 // Generates the password ....
                 for ($x = 0; $x < 6;) {
                     $y = rand(1, 1000);
-                    if($y > 350 && $y < 601) {
+                    if ($y > 350 && $y < 601) {
                         $d = chr(rand(48, 57));
                     }
-                    if($y < 351) {
+                    if ($y < 351) {
                         $d = chr(rand(65, 90));
                     }
-                    if($y > 600) {
+                    if ($y > 600) {
                         $d = chr(rand(97, 122));
                     }
                     if ($d != $o && !preg_match('#[O01lI]#', $d)) {
@@ -504,14 +504,14 @@ 
             return false;
         }
 
-        $data =  [
+        $data = [
             'to'            => $this->email(),
             'template'      => 'new_password',
         ];
 
         $URL = new \MySociety\TheyWorkForYou\Url("userlogin");
 
-        $merge =  [
+        $merge = [
             'EMAIL'         => $this->email(),
             'LOGINURL'      => "https://" . DOMAIN . $URL->generate(),
             'PASSWORD'      => $this->password(),
@@ -687,7 +687,7 @@ 
         // Maybe there's a way of fetching these from the DB,
         // so we don't duplicate them here...?
 
-        $statuses =  ["Viewer", "User", "Moderator", "Administrator", "Superuser"];
+        $statuses = ["Viewer", "User", "Moderator", "Administrator", "Superuser"];
 
         return $statuses;
 
@@ -1031,7 +1031,7 @@ 
             $date_now = gmdate("Y-m-d H:i:s");
             $this->db->query(
                 "UPDATE users SET lastvisit = :lastvisit WHERE user_id = :user_id",
-                [ ':lastvisit' => $date_now, ':user_id' => $this->user_id() ]
+                [':lastvisit' => $date_now, ':user_id' => $this->user_id()]
             );
 
             $this->lastvisit = $date_now;
@@ -1427,7 +1427,7 @@ 
 
             twfy_debug("THEUSER", "User with ID found to confirm: " . $this->user_id());
             // We'll need these to be set before logging the user in.
-            $this->email    = $q['email'];
+            $this->email = $q['email'];
 
             // Set that they're confirmed in the DB.
             $r = $this->db->query("UPDATE users