mysociety / theyworkforyou

scripts/populate-policy-images.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 }
 
 $count = 0;
-while ( ( $policy = fgetcsv($file) ) !== FALSE ) {
+while ( ( $policy = fgetcsv($file) ) !== false ) {
     if ( intval($policy[0]) ) {
         $policy_id = $policy[0];
         $img_id = $policy[1] ? $policy[1] : $policy_id;

Spacing +4 added lines, -4 removed lines

@@ -33,7 +33,7 @@ 
     exit(1);
 }
 
-if ( !file_exists($csvfile) ) {
+if (!file_exists($csvfile)) {
     print "$csvfile cannot be found\n";
     exit(1);
 }
@@ -46,8 +46,8 @@ 
 }
 
 $count = 0;
-while ( ( $policy = fgetcsv($file) ) !== FALSE ) {
-    if ( intval($policy[0]) ) {
+while (($policy = fgetcsv($file)) !== FALSE) {
+    if (intval($policy[0])) {
         $policy_id = $policy[0];
         $img_id = $policy[1] ? $policy[1] : $policy_id;
         $title = $policy[2];
@@ -69,7 +69,7 @@ 
                 ':image_attribution' => $attribution,
                 ':license_url' => $licence_url)
         );
-        if ( $q->success() ) {
+        if ($q->success()) {
             $count += $q->affected_rows();
         } else {
             print "failed to update data for $policy_id\n";

tests/Bootstrap.php

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -8,9 +8,9 @@ 
 // Test to make sure we have the test DB environment variables. If not, this isn't testing, so abort.
 // Define the DB connection constants before we do anything else.
 if (
-    isset($_SERVER['TWFY_TEST_DB_HOST']) AND
-    isset($_SERVER['TWFY_TEST_DB_USER']) AND
-    isset($_SERVER['TWFY_TEST_DB_PASS']) AND
+    isset($_SERVER['TWFY_TEST_DB_HOST']) and
+    isset($_SERVER['TWFY_TEST_DB_USER']) and
+    isset($_SERVER['TWFY_TEST_DB_PASS']) and
     isset($_SERVER['TWFY_TEST_DB_NAME'])
 ) {
 
@@ -37,7 +37,7 @@ 
 }
 
 // Explicitly declare we're in testing (avoids trying deploy-only things)
-define('TESTING', TRUE);
+define('TESTING', true);
 
 // Load up the init script (handles the rest of the config, DB connection etc)
 include_once('www/includes/easyparliament/init.php');

Spacing +2 added lines, -2 removed lines

@@ -21,13 +21,13 @@
     define('OPTION_TWFY_DB_NAME', $_SERVER['TWFY_TEST_DB_NAME']);
     
     // Define the base directory
-    define ("BASEDIR", dirname(__FILE__) . '/../www/docs'); 
+    define("BASEDIR", dirname(__FILE__) . '/../www/docs'); 
 
     # point to the default mapit
     define('OPTION_MAPIT_URL', 'https://mapit.mysociety.org/');
 
     // If there isn't a config file (most likely this is running an automated test) copy one in.
-    if ( ! file_exists(dirname(__FILE__) . '/../conf/general')) {
+    if (!file_exists(dirname(__FILE__) . '/../conf/general')) {
         copy(dirname(__FILE__) . '/../conf/general-example', dirname(__FILE__) . '/../conf/general');
     }
 

www/docs/alert/update-mp/index.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-$new_style_template = TRUE;
+$new_style_template = true;
 
 include_once '../../../includes/easyparliament/init.php';
 include_once INCLUDESPATH . 'easyparliament/member.php';

www/docs/user/login/fb.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
     If the input is not OK, the form is displayed again with error messages.
 */
 
-$new_style_template = TRUE;
+$new_style_template = true;
 
 include_once '../../../includes/easyparliament/init.php';
 # need to include this as login code uses error_message

Indentation +3 added lines, -3 removed lines

@@ -27,11 +27,11 @@
 
 $data['fb_login_url'] = $login->getLoginURL();
 if (isset($data['token'])) {
-  $success = $login->loginUser($data['token']);
-  if (!$success) {
+    $success = $login->loginUser($data['token']);
+    if (!$success) {
     $data['error'] = 'Could not login using Facebook token';
     \MySociety\TheyWorkForYou\Renderer::output('login/facebook', $data);
-  }
+    }
 } else {
     \MySociety\TheyWorkForYou\Renderer::output('login/facebook', $data);
 }

classes/User.php

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 class User {
-    public function getUserDetails($user_id = False) {
+    public function getUserDetails($user_id = false) {
         global $THEUSER;
 
         $user = $THEUSER;
@@ -250,7 +250,7 @@ 
             }
 
             if ($details['email'] != $THEUSER->email()) {
-                $results['email_changed'] = True;
+                $results['email_changed'] = true;
             }
 
 

Doc Comments +3 added lines

@@ -321,6 +321,9 @@
         return array();
     }
 
+    /**
+     * @param Member $member
+     */
     private function constructMPData($member, $user, $mp_house) {
         $mp_data = array();
         $mp_data['name'] = $member->full_name();

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);
             }

www/docs/user/index.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
         // And make sure the user is allowed to do this!
 
         $template = 'user/form';
-        if (is_numeric( get_http_var("u") ) && $THEUSER->is_able_to("edituser")) {
+        if (is_numeric(get_http_var("u")) && $THEUSER->is_able_to("edituser")) {
 
             $data = $user->getUserDetails(get_http_var('u'));
             $data['showall'] = true;

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -5,7 +5,7 @@ 
  * page so leave it like that for now.
  */
 
-$new_style_template = TRUE;
+$new_style_template = true;
 
 include_once '../../includes/easyparliament/init.php';
 # need to include this as login code uses error_message
@@ -127,7 +127,7 @@ 
                 $data['errors'] = $results['errors'];
                 $template = 'user/form';
             } else {
-                $data['edited'] = True;
+                $data['edited'] = true;
                 if (isset($results['email_changed'])) {
                     $data['email_changed'] = $results['email_changed'];
                 }

Indentation +4 added lines, -4 removed lines

@@ -106,12 +106,12 @@
 
 // if data has been submitted then handle that
 if (
-      get_http_var("submitted") == "true" && (
+        get_http_var("submitted") == "true" && (
         $this_page == 'useredit' || $this_page == 'otheruseredit' || $this_page == 'userjoin'
-      )
-   ) {
+        )
+    ) {
     // Put all the user-submitted data in an array.
-     $data = $user->getUpdateDetails($this_page, $THEUSER);
+        $data = $user->getUpdateDetails($this_page, $THEUSER);
 
     if ($this_page == 'useredit') {
         $data['facebook_user'] = $THEUSER->facebook_user();

www/includes/easyparliament/templates/html/user/form.php

Indentation +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
                   <span class="label">Security status:</span>
                   <span class="formw"><select name="status">
                   <?php
-                  foreach ($statuses as $n => $status_name) { ?>
+                    foreach ($statuses as $n => $status_name) { ?>
                     <option value="<?= $status_name ?>"<?= $status_name == $status ? ' selected' : '' ?>>
                       <?= $status_name ?>
                     </option>

Spacing +1 added lines, -1 removed lines

@@ -174,7 +174,7 @@
 
                 <input type="hidden" name="submitted" value="true">
 
-                <?php if (isset($ret) && $ret != '' ) { ?>
+                <?php if (isset($ret) && $ret != '') { ?>
                     <input type="hidden" name="ret" value="<?= _htmlentities($ret) ?>">
                 <?php } ?>
 

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
                 <input type="hidden" name="pg" value="edit">
               </form>
             <?php } else { ?>
-              <?php if (isset($showall) && $showall == True && isset($user_id)) { ?>
+              <?php if (isset($showall) && $showall == true && isset($user_id)) { ?>
               <h1>Edit the user&rsquo;s details</h1>
               <?php } else { ?>
               <h1>Edit your details</h1>
@@ -142,7 +142,7 @@ 
                     <input type="radio" name="emailpublic" id="emailpublicfalse" value="false" <?= $emailpublic == 'No' ? ' checked' : '' ?>> <label for="emailpublicfalse">No</label></span>
                 </div>
 
-                <?php if (isset($showall) && $showall == True) { ?>
+                <?php if (isset($showall) && $showall == true) { ?>
                   <?php if (isset($errors['status'])) { ?>
                   <p class="error">
                       <?= $errors['status'] ?>
@@ -210,7 +210,7 @@ 
                     <input type="hidden" name="pg" value="<?= $pg ?>">
                 <?php } ?>
 
-                <?php if (isset($showall) && $showall == True && isset($user_id)) { ?>
+                <?php if (isset($showall) && $showall == true && isset($user_id)) { ?>
                     <input type="hidden" name="u" value="<?= _htmlentities($user_id) ?>">
                 <?php } ?>
 

www/includes/easyparliament/templates/html/user/index.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
           <h1>Your details</h1>
           <?php if (isset($edited)) { ?>
             <p>
-              <strong>have been updated<?= isset($email_changed) && $email_changed == True ? " and we&rsquo;ve sent a confirmation email to your new email address" : '' ?>.</strong>
+              <strong>have been updated<?= isset($email_changed) && $email_changed == true ? " and we&rsquo;ve sent a confirmation email to your new email address" : '' ?>.</strong>
             </p>
           <?php } else { ?>
           <p>

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 
           <div class="row">
             <span class="label">Website</span>
-            <span class="formw"><?= $website == '' ? 'none' : '<a href="' . _htmlentities($website) . '">'. _htmlentities($website) . '</a>' ?></span>
+            <span class="formw"><?= $website == '' ? 'none' : '<a href="' . _htmlentities($website) . '">' . _htmlentities($website) . '</a>' ?></span>
           </div>
 
           <?php if ($facebook_user) { ?>

www/includes/easyparliament/user.php

Indentation +27 added lines, -27 removed lines

@@ -851,8 +851,8 @@ 
         if ($cookie == '') {
             $cookie = get_cookie_var("facebook_id");
             if ($cookie != '') {
-              $this->facebook_user = True;
-              twfy_debug("THEUSER", "is facebook login");
+                $this->facebook_user = True;
+                twfy_debug("THEUSER", "is facebook login");
             }
         }
 
@@ -873,36 +873,36 @@ 
                     // And make sure the user hasn't been "deleted".
 
                     if ($this->facebook_user) {
-                      if (md5($this->facebook_token()) == $matches[2] && $this->deleted() == false) {
-                          twfy_debug ("THEUSER", "init SUCCESS: setting as logged in");
-                          $this->loggedin = true;
-                      } elseif (md5 ($this->facebook_token()) != $matches[2]) {
-                          twfy_debug ("THEUSER", "init FAILED: Facebook token doesn't match cookie");
-                          $this->loggedin = false;
-                      } else {
-                          twfy_debug ("THEUSER", "init FAILED: User is deleted");
-                          $this->loggedin = false;
-                      }
+                        if (md5($this->facebook_token()) == $matches[2] && $this->deleted() == false) {
+                            twfy_debug ("THEUSER", "init SUCCESS: setting as logged in");
+                            $this->loggedin = true;
+                        } elseif (md5 ($this->facebook_token()) != $matches[2]) {
+                            twfy_debug ("THEUSER", "init FAILED: Facebook token doesn't match cookie");
+                            $this->loggedin = false;
+                        } else {
+                            twfy_debug ("THEUSER", "init FAILED: User is deleted");
+                            $this->loggedin = false;
+                        }
                     } else {
-                      if (md5($this->password()) == $matches[2] && $this->deleted() == false) {
-                          // The correct password is in the cookie,
-                          // and the user isn't deleted, so set the user to be logged in.
+                        if (md5($this->password()) == $matches[2] && $this->deleted() == false) {
+                            // The correct password is in the cookie,
+                            // and the user isn't deleted, so set the user to be logged in.
 
-                          // This would be an appropriate place to call other functions
-                          // that might set user info that only a logged-in user is going
-                          // to need. Their preferences and saved things or something.
+                            // This would be an appropriate place to call other functions
+                            // that might set user info that only a logged-in user is going
+                            // to need. Their preferences and saved things or something.
 
 
-                          twfy_debug ("THEUSER init SUCCEEDED", "setting as logged in");
-                          $this->loggedin = true;
+                            twfy_debug ("THEUSER init SUCCEEDED", "setting as logged in");
+                            $this->loggedin = true;
 
-                      } elseif (md5 ($this->password()) != $matches[2]) {
-                          twfy_debug ("THEUSER init FAILED", "Password doesn't match cookie");
-                          $this->loggedin = false;
-                      } else {
-                          twfy_debug ("THEUSER init FAILED", "User is deleted");
-                          $this->loggedin = false;
-                      }
+                        } elseif (md5 ($this->password()) != $matches[2]) {
+                            twfy_debug ("THEUSER init FAILED", "Password doesn't match cookie");
+                            $this->loggedin = false;
+                        } else {
+                            twfy_debug ("THEUSER init FAILED", "User is deleted");
+                            $this->loggedin = false;
+                        }
                     }
 
                 } else {

Braces +27 added lines, -9 removed lines

@@ -445,9 +445,15 @@ 
                 // Generates the password ....
                 for ($x=0; $x < 6;) {
                     $y = rand(1,1000);
-                    if($y>350 && $y<601) $d=chr(rand(48,57));
-                    if($y<351) $d=chr(rand(65,90));
-                    if($y>600) $d=chr(rand(97,122));
+                    if($y>350 && $y<601) {
+                        $d=chr(rand(48,57));
+                    }
+                    if($y<351) {
+                        $d=chr(rand(65,90));
+                    }
+                    if($y>600) {
+                        $d=chr(rand(97,122));
+                    }
                     if ($d!=$o && !preg_match('#[O01lI]#', $d)) {
                         $o=$d; $pwd.=$d; $x++;
                     }
@@ -1171,8 +1177,12 @@ 
 
     public function confirm_email($token, $redirect=true) {
         $arg = '';
-        if (strstr($token, '::')) $arg = '::';
-        if (strstr($token, '-')) $arg = '-';
+        if (strstr($token, '::')) {
+            $arg = '::';
+        }
+        if (strstr($token, '-')) {
+            $arg = '-';
+        }
         list($user_id, $registrationtoken) = explode($arg, $token);
 
         if (!is_numeric($user_id) || $registrationtoken == '') {
@@ -1254,8 +1264,12 @@ 
 
         // Split the token into its parts.
         $arg = '';
-        if (strstr($token, '::')) $arg = '::';
-        if (strstr($token, '-')) $arg = '-';
+        if (strstr($token, '::')) {
+            $arg = '::';
+        }
+        if (strstr($token, '-')) {
+            $arg = '-';
+        }
         list($user_id, $registrationtoken) = explode($arg, $token);
 
         if (!is_numeric($user_id) || $registrationtoken == '') {
@@ -1385,15 +1399,19 @@ 
         // not-logged-in users.
 
         $this->postcode = $pc;
-        if (!headers_sent()) // if in debug mode
+        if (!headers_sent()) {
+            // if in debug mode
             setcookie (POSTCODE_COOKIE, $pc, time()+7*86400, "/", COOKIEDOMAIN);
+        }
 
         twfy_debug('USER', "Set the cookie named '" . POSTCODE_COOKIE . " to '$pc' for " . COOKIEDOMAIN . " domain");
     }
 
     public function unset_postcode_cookie() {
-        if (!headers_sent()) // if in debug mode
+        if (!headers_sent()) {
+            // if in debug mode
             setcookie (POSTCODE_COOKIE, '', time() - 3600, '/', COOKIEDOMAIN);
+        }
     }
 
     // mostly here for updating from facebook where we do not need

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -872,7 +872,7 @@ 
         if ($cookie == '') {
             $cookie = get_cookie_var("facebook_id");
             if ($cookie != '') {
-              $this->facebook_user = True;
+              $this->facebook_user = true;
               twfy_debug("THEUSER", "is facebook login");
             }
         }
@@ -1074,7 +1074,7 @@ 
 
         twfy_debug("USER", "logging in user from facebook " . $this->user_id);
 
-        $this->loggedin = True;
+        $this->loggedin = true;
         $this->_login($returl, $expire, $cookie, 'facebook_id');
         return true;
     }

Doc Comments +10 added lines

@@ -1080,6 +1080,9 @@ 
         return true;
     }
 
+    /**
+     * @param string $expire
+     */
     public function login($returl="", $expire) {
 
         // This is used to log the user in. Duh.
@@ -1121,6 +1124,10 @@ 
         $this->_login($returl, $expire, $cookie);
     }
 
+    /**
+     * @param string|null $returl
+     * @param string $cookie
+     */
     private function _login($returl, $expire, $cookie, $cookie_name = 'epuser_id') {
         // Unset any existing postcode cookie.
         // This will be the postcode the user set for themselves as a non-logged-in
@@ -1170,6 +1177,9 @@ 
         }
     }
 
+    /**
+     * @param string $token
+     */
     public function confirm_email($token, $redirect=true) {
         $arg = '';
         if (strstr($token, '::')) $arg = '::';

Spacing +97 added lines, -97 removed lines

@@ -56,22 +56,22 @@ 
 
 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 $emailpublic = "";      // boolean - can other users see this user's email?
+    public $emailpublic = ""; // boolean - can other users see this user's 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 = "";            // boolean - Do they want emails from us?
-    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 $registrationip = ""; // Where they registered from.
+    public $optin = ""; // boolean - Do they want emails from us?
+    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
     // Don't use the status to check access privileges - use the is_able_to() function.
     public $status = "Viewer";
 
@@ -118,23 +118,23 @@ 
             // We've got a user, so set them up.
 
             $this->user_id              = $user_id;
-            $this->firstname            = $q->field(0,"firstname");
-            $this->lastname             = $q->field(0,"lastname");
-            $this->password             = $q->field(0,"password");
-            $this->email                = $q->field(0,"email");
-            $this->emailpublic = $q->field(0,"emailpublic") == 1 ? true : false;
-            $this->postcode             = $q->field(0,"postcode");
-            $this->facebook_id          = $q->field(0,"facebook_id");
-            $this->facebook_token       = $q->field(0,"facebook_token");
-            $this->url                  = $q->field(0,"url");
-            $this->lastvisit            = $q->field(0,"lastvisit");
+            $this->firstname            = $q->field(0, "firstname");
+            $this->lastname             = $q->field(0, "lastname");
+            $this->password             = $q->field(0, "password");
+            $this->email                = $q->field(0, "email");
+            $this->emailpublic = $q->field(0, "emailpublic") == 1 ? true : false;
+            $this->postcode             = $q->field(0, "postcode");
+            $this->facebook_id          = $q->field(0, "facebook_id");
+            $this->facebook_token       = $q->field(0, "facebook_token");
+            $this->url                  = $q->field(0, "url");
+            $this->lastvisit            = $q->field(0, "lastvisit");
             $this->registrationtoken    = $q->field(0, 'registrationtoken');
-            $this->registrationtime     = $q->field(0,"registrationtime");
-            $this->registrationip       = $q->field(0,"registrationip");
-            $this->optin = $q->field(0,"optin") == 1 ? true : false;
-            $this->status               = $q->field(0,"status");
-            $this->deleted = $q->field(0,"deleted") == 1 ? true : false;
-            $this->confirmed = $q->field(0,"confirmed") == 1 ? true : false;
+            $this->registrationtime     = $q->field(0, "registrationtime");
+            $this->registrationip       = $q->field(0, "registrationip");
+            $this->optin = $q->field(0, "optin") == 1 ? true : false;
+            $this->status               = $q->field(0, "status");
+            $this->deleted = $q->field(0, "deleted") == 1 ? true : false;
+            $this->confirmed = $q->field(0, "confirmed") == 1 ? true : false;
 
             return true;
 
@@ -152,7 +152,7 @@ 
 
     }
 
-    public function add($details, $confirmation_required=true) {
+    public function add($details, $confirmation_required = true) {
         // Adds a new user's info into the db.
         // Then optionally (and usually) calls another function to
         // send them a confirmation email.
@@ -239,7 +239,7 @@ 
             // This will be sent to them via email, so we can confirm they exist.
             // The token will be the first 16 characters of a hash.
 
-            $token = substr( password_hash($details["email"] . microtime(), PASSWORD_BCRYPT), 29, 16 );
+            $token = substr(password_hash($details["email"] . microtime(), PASSWORD_BCRYPT), 29, 16);
 
             // Full stops don't work well at the end of URLs in emails,
             // so replace them. We won't be doing anything clever with the hash
@@ -251,7 +251,7 @@ 
             $r = $this->db->query("UPDATE users
                             SET registrationtoken = :registrationtoken
                             WHERE   user_id = :user_id
-                            ", array (
+                            ", array(
                                 ':registrationtoken' => $this->registrationtoken,
                                 ':user_id' => $this->user_id
                             ));
@@ -298,7 +298,7 @@ 
     }
 
     public function add_facebook_id($facebook_id) {
-        $q = $this->db->query ("UPDATE users SET facebook_id = :facebook_id WHERE email = :email",
+        $q = $this->db->query("UPDATE users SET facebook_id = :facebook_id WHERE email = :email",
             array(
                 ':facebook_id' => $facebook_id,
                 ':email' => $this->email
@@ -319,7 +319,7 @@ 
             !isset($details['email']) ||
             $details['email'] == '' ||
             !isset($details['token']) ||
-            $details['token'] == '' ) {
+            $details['token'] == '') {
             return false;
         }
 
@@ -331,12 +331,12 @@ 
         $confirmurl = 'https://' . DOMAIN . '/E/' . $urltoken;
 
         // Arrays we need to send a templated email.
-        $data = array (
+        $data = array(
             'to'        => $details['email'],
             'template'  => 'email_confirmation'
         );
 
-        $merge = array (
+        $merge = array(
             'FIRSTNAME'     => $details['firstname'],
             'LASTNAME'      => $details['lastname'],
             'CONFIRMURL'    => $confirmurl
@@ -373,12 +373,12 @@ 
         $confirmurl = 'https://' . DOMAIN . '/U/' . $urltoken;
 
         // Arrays we need to send a templated email.
-        $data = array (
+        $data = array(
             'to'        => $details['email'],
             'template'  => 'join_confirmation'
         );
 
-        $merge = array (
+        $merge = array(
             'FIRSTNAME'     => $details['firstname'],
             'LASTNAME'      => $details['lastname'],
             'CONFIRMURL'    => $confirmurl
@@ -440,23 +440,23 @@ 
             $this->email = $email;
             for (;;) {
 
-                $pwd=null;
-                $o=null;
+                $pwd = null;
+                $o = null;
 
                 // Generates the password ....
-                for ($x=0; $x < 6;) {
-                    $y = rand(1,1000);
-                    if($y>350 && $y<601) $d=chr(rand(48,57));
-                    if($y<351) $d=chr(rand(65,90));
-                    if($y>600) $d=chr(rand(97,122));
-                    if ($d!=$o && !preg_match('#[O01lI]#', $d)) {
-                        $o=$d; $pwd.=$d; $x++;
+                for ($x = 0; $x < 6;) {
+                    $y = rand(1, 1000);
+                    if ($y > 350 && $y < 601) $d = chr(rand(48, 57));
+                    if ($y < 351) $d = chr(rand(65, 90));
+                    if ($y > 600) $d = chr(rand(97, 122));
+                    if ($d != $o && !preg_match('#[O01lI]#', $d)) {
+                        $o = $d; $pwd .= $d; $x++;
                     }
                 }
 
                 // If the PW fits your purpose (e.g. this regexpression) return it, else make a new one
                 // (You can change this regular-expression how you want ....)
-                if (preg_match("/^[a-zA-Z]{1}([a-zA-Z]+[0-9][a-zA-Z]+)+/",$pwd)) {
+                if (preg_match("/^[a-zA-Z]{1}([a-zA-Z]+[0-9][a-zA-Z]+)+/", $pwd)) {
                     break;
                 }
 
@@ -474,7 +474,7 @@ 
 
         $passwordforDB = password_hash($pwd, PASSWORD_BCRYPT);
 
-        $q = $this->db->query ("UPDATE users SET password = :password WHERE email = :email",
+        $q = $this->db->query("UPDATE users SET password = :password WHERE email = :email",
             array(
                 ':password' => $passwordforDB,
                 ':email' => $email
@@ -502,14 +502,14 @@ 
             return false;
         }
 
-        $data = array (
+        $data = array(
             'to'            => $this->email(),
             'template'      => 'new_password'
         );
 
         $URL = new URL("userlogin");
 
-        $merge = array (
+        $merge = array(
             'EMAIL'         => $this->email(),
             'LOGINURL'      => "https://" . DOMAIN . $URL->generate(),
             'PASSWORD'      => $this->password()
@@ -568,7 +568,7 @@ 
     public function facebook_id_exists($id, $return_id = false) {
         // Returns true if there's a user with this facebook id.
 
-        if ($id!= "") {
+        if ($id != "") {
             $q = $this->db->query("SELECT user_id FROM users WHERE facebook_id = :id", array(':id' => $id));
             if ($q->rows() > 0) {
                 if ($return_id) {
@@ -647,7 +647,7 @@ 
                 /* Everyone */              return true;
 
             default:
-                $PAGE->error_message ("You need to set permissions for '$action'!");
+                $PAGE->error_message("You need to set permissions for '$action'!");
 
                 return false;
 
@@ -665,7 +665,7 @@ 
         // Maybe there's a way of fetching these from the DB,
         // so we don't duplicate them here...?
 
-        $statuses = array ("Viewer", "User", "Moderator", "Administrator", "Superuser");
+        $statuses = array("Viewer", "User", "Moderator", "Administrator", "Superuser");
 
         return $statuses;
 
@@ -823,7 +823,7 @@ 
             return $details;
 
         } else {
-            $PAGE->error_message ("Sorry, we were unable to update user id '" . _htmlentities($details["user_id"]) . "'");
+            $PAGE->error_message("Sorry, we were unable to update user id '" . _htmlentities($details["user_id"]) . "'");
 
             return false;
         }
@@ -896,13 +896,13 @@ 
 
                     if ($this->facebook_user) {
                       if (md5($this->facebook_token()) == $matches[2] && $this->deleted() == false) {
-                          twfy_debug ("THEUSER", "init SUCCESS: setting as logged in");
+                          twfy_debug("THEUSER", "init SUCCESS: setting as logged in");
                           $this->loggedin = true;
-                      } elseif (md5 ($this->facebook_token()) != $matches[2]) {
-                          twfy_debug ("THEUSER", "init FAILED: Facebook token doesn't match cookie");
+                      } elseif (md5($this->facebook_token()) != $matches[2]) {
+                          twfy_debug("THEUSER", "init FAILED: Facebook token doesn't match cookie");
                           $this->loggedin = false;
                       } else {
-                          twfy_debug ("THEUSER", "init FAILED: User is deleted");
+                          twfy_debug("THEUSER", "init FAILED: User is deleted");
                           $this->loggedin = false;
                       }
                     } else {
@@ -915,30 +915,30 @@ 
                           // to need. Their preferences and saved things or something.
 
 
-                          twfy_debug ("THEUSER init SUCCEEDED", "setting as logged in");
+                          twfy_debug("THEUSER init SUCCEEDED", "setting as logged in");
                           $this->loggedin = true;
 
-                      } elseif (md5 ($this->password()) != $matches[2]) {
-                          twfy_debug ("THEUSER init FAILED", "Password doesn't match cookie");
+                      } elseif (md5($this->password()) != $matches[2]) {
+                          twfy_debug("THEUSER init FAILED", "Password doesn't match cookie");
                           $this->loggedin = false;
                       } else {
-                          twfy_debug ("THEUSER init FAILED", "User is deleted");
+                          twfy_debug("THEUSER init FAILED", "User is deleted");
                           $this->loggedin = false;
                       }
                     }
 
                 } else {
-                    twfy_debug ("THEUSER init FAILED", "didn't get 1 row from db");
+                    twfy_debug("THEUSER init FAILED", "didn't get 1 row from db");
                     $this->loggedin = false;
                 }
 
             } else {
-                twfy_debug ("THEUSER init FAILED", "cookie's user_id is not numeric");
+                twfy_debug("THEUSER init FAILED", "cookie's user_id is not numeric");
                 $this->loggedin = false;
             }
 
         } else {
-            twfy_debug ("THEUSER init FAILED", "cookie is not of the correct form");
+            twfy_debug("THEUSER init FAILED", "cookie is not of the correct form");
             $this->loggedin = false;
         }
 
@@ -1010,67 +1010,67 @@ 
 
         if ($q->rows() == 1) {
             // OK.
-            $dbpassword = $q->field(0,"password");
+            $dbpassword = $q->field(0, "password");
             if (password_verify($userenteredpassword, $dbpassword)) {
-                $this->user_id  = $q->field(0,"user_id");
+                $this->user_id  = $q->field(0, "user_id");
                 $this->password = $dbpassword;
                 // We'll need these when we're going to log in.
-                $this->deleted  = $q->field(0,"deleted") == 1 ? true : false;
-                $this->confirmed = $q->field(0,"confirmed") == 1 ? true : false;
+                $this->deleted  = $q->field(0, "deleted") == 1 ? true : false;
+                $this->confirmed = $q->field(0, "confirmed") == 1 ? true : false;
 
                 return true;
 
             } else {
                 // Failed.
-                return array ("invalidemail" => $error_string);
+                return array("invalidemail" => $error_string);
 
             }
 
         } else {
             // Failed.
-            return array ("invalidemail" => $error_string);
+            return array("invalidemail" => $error_string);
         }
 
     }
 
     public function has_postcode() {
         $has_postcode = false;
-        if ( $this->isloggedin() && $this->postcode() != '' || $this->postcode_is_set() ) {
+        if ($this->isloggedin() && $this->postcode() != '' || $this->postcode_is_set()) {
             $has_postcode = true;
         }
         return $has_postcode;
     }
 
 
-    public function facebook_login($returl="", $expire, $accessToken) {
+    public function facebook_login($returl = "", $expire, $accessToken) {
         global $PAGE;
 
         twfy_debug("THEUSER", "Faceook login, user_id " . $this->user_id);
         twfy_debug("THEUSER", "Faceook login, facebook_id " . $this->facebook_id);
         twfy_debug("THEUSER", "Faceook login, email" . $this->email);
         if ($this->facebook_id() == "") {
-            $PAGE->error_message ("We don't have a facebook id for this user.", true);
+            $PAGE->error_message("We don't have a facebook id for this user.", true);
 
             return;
         }
 
         twfy_debug("THEUSER", "Faceook login, facebook_token: " . $accessToken);
 
-        $q = $this->db->query ("UPDATE users SET facebook_token = :token WHERE email = :email",
+        $q = $this->db->query("UPDATE users SET facebook_token = :token WHERE email = :email",
             array(
                 ':token' => $accessToken,
                 ':email' => $this->email
             ));
 
         if (!$q->success()) {
-            $PAGE->error_message ("There was a problem logging you in", true);
+            $PAGE->error_message("There was a problem logging you in", true);
             twfy_debug("THEUSER", "Faceook login, failed to set accessToken");
 
             return false;
         }
 
         // facebook login users probably don't have a password
-        $cookie = $this->user_id() . "." . md5 ($accessToken);
+        $cookie = $this->user_id() . "." . md5($accessToken);
         twfy_debug("THEUSER", "Faceook login, cookie: " . $cookie);
 
         twfy_debug("USER", "logging in user from facebook " . $this->user_id);
@@ -1080,7 +1080,7 @@ 
         return true;
     }
 
-    public function login($returl="", $expire) {
+    public function login($returl = "", $expire) {
 
         // This is used to log the user in. Duh.
         // You should already have checked the user's email and password using
@@ -1102,21 +1102,21 @@ 
 
         // Various checks about the user - if they fail, we exit.
         if ($this->user_id() == "" || $this->password == "") {
-            $PAGE->error_message ("We don't have the user_id or password to make the cookie.", true);
+            $PAGE->error_message("We don't have the user_id or password to make the cookie.", true);
 
             return;
         } elseif ($this->deleted) {
-            $PAGE->error_message ("This user has been deleted.", true);
+            $PAGE->error_message("This user has been deleted.", true);
 
             return;
         } elseif (!$this->confirmed) {
-            $PAGE->error_message ("You have not yet confirmed your account by clicking the link in the confirmation email we sent to you. If you don't have the email, you can <a href='/user/login/?resend=" . $this->user_id() . "'>have it resent</a>. If it still doesn't arrive, get in touch.", true);
+            $PAGE->error_message("You have not yet confirmed your account by clicking the link in the confirmation email we sent to you. If you don't have the email, you can <a href='/user/login/?resend=" . $this->user_id() . "'>have it resent</a>. If it still doesn't arrive, get in touch.", true);
 
             return;
         }
 
         // Reminder: $this->password is actually a hashed version of the plaintext pw.
-        $cookie = $this->user_id() . "." . md5 ($this->password());
+        $cookie = $this->user_id() . "." . md5($this->password());
 
         $this->_login($returl, $expire, $cookie);
     }
@@ -1132,7 +1132,7 @@ 
         $cookie_expires = 0;
         if ($expire == 'never') {
             twfy_debug("THEUSER", "cookie never expires");
-            $cookie_expires = time()+86400*365*20;
+            $cookie_expires = time() + 86400 * 365 * 20;
         } elseif (is_int($expire) && $expire > time()) {
             twfy_debug("THEUSER", "cookie expires at " . $expire);
             $cookie_expires = $expire;
@@ -1170,7 +1170,7 @@ 
         }
     }
 
-    public function confirm_email($token, $redirect=true) {
+    public function confirm_email($token, $redirect = true) {
         $arg = '';
         if (strstr($token, '::')) $arg = '::';
         if (strstr($token, '-')) $arg = '-';
@@ -1183,24 +1183,24 @@ 
             FROM    tokens
             WHERE   token = :token
             AND   type = 'E'
-        ", array (':token' => $registrationtoken));
+        ", array(':token' => $registrationtoken));
 
         if ($q->rows() == 1) {
             $expires = $q->field(0, 'expires');
             $expire_time = strtotime($expires);
-            if ( $expire_time < time() ) {
+            if ($expire_time < time()) {
                 global $PAGE;
                 if ($PAGE && $redirect) {
-                    $PAGE->error_message ("Sorry, that token seems to have expired");
+                    $PAGE->error_message("Sorry, that token seems to have expired");
                 }
 
                 return false;
             }
 
-            list( $user_id, $email ) = explode('::', $q->field(0, 'data'));
+            list($user_id, $email) = explode('::', $q->field(0, 'data'));
 
             // if we are logged in as someone else don't change the email
-            if ( $this->user_id() != 0 && $this->user_id() != $user_id ) {
+            if ($this->user_id() != 0 && $this->user_id() != $user_id) {
                 return false;
             }
 
@@ -1340,7 +1340,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->field(0, 'email');
+            $this->email = $q->field(0, 'email');
 
             // Set that they're confirmed in the DB.
             $r = $this->db->query("UPDATE users
@@ -1387,14 +1387,14 @@ 
 
         $this->postcode = $pc;
         if (!headers_sent()) // if in debug mode
-            setcookie (POSTCODE_COOKIE, $pc, time()+7*86400, "/", COOKIEDOMAIN);
+            setcookie(POSTCODE_COOKIE, $pc, time() + 7 * 86400, "/", COOKIEDOMAIN);
 
         twfy_debug('USER', "Set the cookie named '" . POSTCODE_COOKIE . " to '$pc' for " . COOKIEDOMAIN . " domain");
     }
 
     public function unset_postcode_cookie() {
         if (!headers_sent()) // if in debug mode
-            setcookie (POSTCODE_COOKIE, '', time() - 3600, '/', COOKIEDOMAIN);
+            setcookie(POSTCODE_COOKIE, '', time() - 3600, '/', COOKIEDOMAIN);
     }
 
     // mostly here for updating from facebook where we do not need
@@ -1407,8 +1407,8 @@ 
 
             // this is checked elsewhere but just in case we check here and
             // bail out to be on the safe side
-            if ( isset($details['email'] ) ) {
-                if ( $details['email'] != $this->email() && $this->email_exists( $details['email'] ) ) {
+            if (isset($details['email'])) {
+                if ($details['email'] != $this->email() && $this->email_exists($details['email'])) {
                     return false;
                 }
             }
@@ -1457,8 +1457,8 @@ 
             // this is checked elsewhere but just in case we check here and
             // bail out to be on the safe side
             $email = '';
-            if ( isset($details['email'] ) ) {
-                if ( $details['email'] != $this->email() && $this->email_exists( $details['email'] ) ) {
+            if (isset($details['email'])) {
+                if ($details['email'] != $this->email() && $this->email_exists($details['email'])) {
                     return false;
                 }
                 $email = $details['email'];
@@ -1486,7 +1486,7 @@ 
                 }
 
                 if ($email && $email != $this->email) {
-                    $token = substr( password_hash($email . microtime(), PASSWORD_BCRYPT), 29, 16 );
+                    $token = substr(password_hash($email . microtime(), PASSWORD_BCRYPT), 29, 16);
                     $data = $this->user_id() . '::' . $email;
                     $r = $this->db->query("INSERT INTO tokens
                         ( expires, token, type, data )
@@ -1503,7 +1503,7 @@ 
                     ));
 
                     // send confirmation email here
-                    if ( $r->success() ) {
+                    if ($r->success()) {
                         $newdetails['email'] = $email;
                         $newdetails['token'] = $token;
                         if ($confirm_email) {