mysociety / theyworkforyou

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

Spacing +95 added lines, -95 removed lines

@@ -56,21 +56,21 @@ 
 
 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 = "";            // 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";
 
@@ -116,22 +116,22 @@ 
             // 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->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->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;
 
@@ -149,7 +149,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.
@@ -231,7 +231,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
@@ -243,7 +243,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
                             ));
@@ -290,7 +290,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
@@ -311,7 +311,7 @@ 
             !isset($details['email']) ||
             $details['email'] == '' ||
             !isset($details['token']) ||
-            $details['token'] == '' ) {
+            $details['token'] == '') {
             return false;
         }
 
@@ -323,12 +323,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
@@ -368,12 +368,12 @@ 
         }
 
         // 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
@@ -435,23 +435,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;
                 }
 
@@ -469,7 +469,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
@@ -497,14 +497,14 @@ 
             return false;
         }
 
-        $data = array (
+        $data = array(
             'to'            => $this->email(),
             'template'      => 'new_password'
         );
 
         $URL = new \MySociety\TheyWorkForYou\Url("userlogin");
 
-        $merge = array (
+        $merge = array(
             'EMAIL'         => $this->email(),
             'LOGINURL'      => "https://" . DOMAIN . $URL->generate(),
             'PASSWORD'      => $this->password()
@@ -563,7 +563,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) {
@@ -642,7 +642,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;
 
@@ -660,7 +660,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;
 
@@ -815,7 +815,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;
         }
@@ -888,13 +888,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 {
@@ -907,30 +907,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;
         }
 
@@ -1001,67 +1001,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);
@@ -1071,7 +1071,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
@@ -1093,21 +1093,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);
     }
@@ -1123,7 +1123,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;
@@ -1161,7 +1161,7 @@ 
         }
     }
 
-    public function confirm_email($token, $redirect=true) {
+    public function confirm_email($token, $redirect = true) {
         $arg = '';
         if (strstr($token, '::')) $arg = '::';
         if (strstr($token, '-')) $arg = '-';
@@ -1174,24 +1174,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;
             }
 
@@ -1333,7 +1333,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
@@ -1380,14 +1380,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
@@ -1400,8 +1400,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;
                 }
             }
@@ -1449,8 +1449,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'];
@@ -1477,7 +1477,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 )
@@ -1494,7 +1494,7 @@ 
                     ));
 
                     // send confirmation email here
-                    if ( $r->success() ) {
+                    if ($r->success()) {
                         $newdetails['email'] = $email;
                         $newdetails['token'] = $token;
                         if ($confirm_email) {

www/docs/user/login/index.php

Spacing +5 added lines, -5 removed lines

@@ -19,14 +19,14 @@ 
 if (get_http_var("submitted") == "true") {
     // Form has been submitted, so check input.
 
-    $email 		= get_http_var("email");
+    $email = get_http_var("email");
     $password 	= get_http_var("password");
     $remember 	= get_http_var("remember");
 
     // The user may have tried to do something that requires being logged in.
     // In which case we should arrive here with that page's URL in 'ret'.
     // We can then send the user there after log in.
-    $returnurl 	= get_http_var("ret");
+    $returnurl = get_http_var("ret");
 
     $errors = array();
 
@@ -53,7 +53,7 @@ 
             if ($remember == "true") {
                 $expire = "never";
             } else {
-                $expire ="session";
+                $expire = "session";
             }
 
             // $returnurl is the url of where we'll send the user after login.
@@ -96,7 +96,7 @@ 
 }
 
 
-function display_page( $errors=array() ) {
+function display_page($errors = array()) {
     global $PAGE, $this_page, $THEUSER;
 
     $PAGE->page_start();
@@ -127,7 +127,7 @@ 
     <?php
 
         $PAGE->stripe_end(array(
-            array (
+            array(
                 'type' => 'include',
                 'content' => 'userlogin'
             )

tests/TWFY_Database_TestCase.php

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

@@ -25,7 +25,7 @@
 
     public function tearDown()
     {
-        $this->db = NULL;
+        $this->db = null;
 
         parent::tearDown();
     }

tests/HousesTest.php

Indentation +6 added lines, -6 removed lines

@@ -9,7 +9,7 @@ 
     /**
      * Test that the Royal edge-case house is correctly defined.
      */
-	public function testRoyalHouseDefined()
+    public function testRoyalHouseDefined()
     {
         $this->assertEquals(0, HOUSE_TYPE_ROYAL);
     }
@@ -17,7 +17,7 @@ 
     /**
      * Test that the House of Commons is correctly defined.
      */
-	public function testCommonsHouseDefined()
+    public function testCommonsHouseDefined()
     {
         $this->assertEquals(1, HOUSE_TYPE_COMMONS);
     }
@@ -25,7 +25,7 @@ 
     /**
      * Test that the House of Lords is correctly defined.
      */
-	public function testLordsHouseDefined()
+    public function testLordsHouseDefined()
     {
         $this->assertEquals(2, HOUSE_TYPE_LORDS);
     }
@@ -33,7 +33,7 @@ 
     /**
      * Test that the Northern Ireland Assembly is correctly defined.
      */
-	public function testNIHouseDefined()
+    public function testNIHouseDefined()
     {
         $this->assertEquals(3, HOUSE_TYPE_NI);
     }
@@ -41,7 +41,7 @@ 
     /**
      * Test that the Scottish Parliament is correctly defined.
      */
-	public function testScotlandHouseDefined()
+    public function testScotlandHouseDefined()
     {
         $this->assertEquals(4, HOUSE_TYPE_SCOTLAND);
     }
@@ -49,7 +49,7 @@ 
     /**
      * Test that the Assembly for Wales is correctly defined.
      */
-	public function testWalesHouseDefined()
+    public function testWalesHouseDefined()
     {
         $this->assertEquals(5, HOUSE_TYPE_WALES);
     }

www/includes/easyparliament/page.php

Braces +15 added lines, -13 removed lines

@@ -114,7 +114,10 @@ 
         //  'foot' - For the bottom stripe on hansard debates/wrans listings.
         // $id is the value of an id for this div (if blank, not used).
         ?>
-        <div class="stripe-<?php echo $type; ?><?php if ($extra_class != '') echo ' ' . $extra_class; ?>"<?php
+        <div class="stripe-<?php echo $type; ?><?php if ($extra_class != '') {
+    echo ' ' . $extra_class;
+}
+?>"<?php
         if ($id != '') {
             print ' id="' . $id . '"';
         }
@@ -479,7 +482,9 @@ 
 
         global $DATA, $this_page;
 
-        if ($this->page_started()) return;
+        if ($this->page_started()) {
+            return;
+        }
         // The page's HTML hasn't been started yet, so we'd better do it.
 
         // Set the page title (in the <title></title>).
@@ -629,7 +634,9 @@ 
             $URL->insert(array('adv' => 1));
                 echo '&nbsp;&nbsp; <a href="' . $URL->generate() . '">More&nbsp;options</a>';
                 echo '<br>';
-                if ($wtt) print '<input type="hidden" name="wtt" value="1">';
+                if ($wtt) {
+                    print '<input type="hidden" name="wtt" value="1">';
+                }
         } else { ?>
     <form action="http://www.writetothem.com/lords" method="get">
     <input type="hidden" name="pid" value="<?=_htmlentities(get_http_var('pid')) ?>">
@@ -743,8 +750,7 @@ 
             // The return url for after the user has logged in.
             if (get_http_var("ret") != "") {
                 $returl = get_http_var("ret");
-            }
-            else {
+            } else {
                 $returl = $glossary_returl;
             }
             ?>
@@ -808,15 +814,13 @@ 
                 else {
                     $letters[] = "<li class=\"on\">" . $letter . "</li>";
                 }
-            }
-            elseif (!empty($GLOSSARY->alphabet[$letter])) {
+            } elseif (!empty($GLOSSARY->alphabet[$letter])) {
                 $URL = new \MySociety\TheyWorkForYou\Url('glossary');
                 $URL->insert(array('az' => $letter));
                 $letter_link = $URL->generate('url');
 
                 $letters[] = "<li><a href=\"" . $letter_link . "\">" . $letter . "</a></li>";
-            }
-            else {
+            } else {
                 $letters[] = '<li>' . $letter . '</li>';
             }
         }
@@ -856,8 +860,7 @@ 
             $URL->insert(array("delete_confirm" => $term['glossary_id']));
             $delete_url = $URL->generate();
             $admin_links = "<br><small><a href=\"".$delete_url."\">delete</a></small>";
-        }
-        else {
+        } else {
             $admin_links = "";
         }
 
@@ -867,8 +870,7 @@ 
             $user_link = $URL->generate('url');
 
             $user_details = "\t\t\t\t<p><small>contributed by user <a href=\"" . $user_link . "\">" . $term['firstname'] . " " . $term['lastname'] . "</a></small>" . $admin_links . "</p>\n";
-        }
-        else {
+        } else {
             $user_details = "";
         }
 

Spacing +38 added lines, -38 removed lines

@@ -19,7 +19,7 @@ 
     public $within_stripe_sidebar = false;
 
     public function page_start() {
-        if ( !$this->page_started() ) {
+        if (!$this->page_started()) {
             $this->checkForAdmin();
             $this->displayHeader();
         }
@@ -32,7 +32,7 @@ 
 
         $data = $h->data;
         $data = array_merge($u->data, $data);
-        if ( isset($page_errors) ) {
+        if (isset($page_errors)) {
             $data['page_errors'] = $page_errors;
         }
         $data['banner_text'] = '';
@@ -52,7 +52,7 @@ 
                 $THISPAGE = new \MySociety\TheyWorkForYou\Url($this_page);
 
                 $LOGINURL = new \MySociety\TheyWorkForYou\Url('userlogin');
-                $LOGINURL->insert(array('ret' => $THISPAGE->generate('none') ));
+                $LOGINURL->insert(array('ret' => $THISPAGE->generate('none')));
 
                 $text = "<a href=\"" . $LOGINURL->generate() . "\">You'd better sign in!</a>";
             } else {
@@ -67,7 +67,7 @@ 
     }
 
     public function page_end() {
-        if ( !$this->page_started() ) {
+        if (!$this->page_started()) {
             $this->page_start();
         }
 
@@ -101,7 +101,7 @@ 
         }
     }
 
-    public function stripe_start($type='side', $id='', $extra_class = '') {
+    public function stripe_start($type = 'side', $id = '', $extra_class = '') {
         // $type is one of:
         //  'full' - a full width div
         //  'side' - a white stripe with a coloured sidebar.
@@ -131,7 +131,7 @@ 
     }
 
 
-    public function stripe_end ($contents = array(), $extra = '') {
+    public function stripe_end($contents = array(), $extra = '') {
         // $contents is an array containing 0 or more hashes.
         // Each hash has two values, 'type' and 'content'.
         // 'Type' could be one of these:
@@ -234,7 +234,7 @@ 
     public function include_sidebar_template($sidebarname) {
         global $this_page, $DATA;
 
-            $sidebarpath = INCLUDESPATH.'easyparliament/sidebars/'.$sidebarname.'.php';
+            $sidebarpath = INCLUDESPATH . 'easyparliament/sidebars/' . $sidebarname . '.php';
 
             if (file_exists($sidebarpath)) {
                 include $sidebarpath;
@@ -242,7 +242,7 @@ 
     }
 
 
-    public function block_start($data=array()) {
+    public function block_start($data = array()) {
         // Starts a 'block' div, used mostly on the home page,
         // on the MP page, and in the sidebars.
         // $data is a hash like this:
@@ -389,7 +389,7 @@ 
         if (is_string($message)) {
             // Sometimes we're just sending a single line to this function
             // rather like the bigger array...
-            $message = array (
+            $message = array(
                 'text' => $message
             );
         }
@@ -397,13 +397,13 @@ 
         // if the page has started then we're most likely in an old school page
         // so we should just print out the error, otherwise stick it in the error
         // global which will then be displayed by the header template
-        if ( $this->page_started() ) {
+        if ($this->page_started()) {
             $this->message($message, 'error');
         } else {
-            if ( !isset($page_errors) ) {
+            if (!isset($page_errors)) {
                 $page_errors = array();
             }
-            $page_errors[]  = $message;
+            $page_errors[] = $message;
         }
 
         if ($fatal) {
@@ -420,7 +420,7 @@ 
     }
 
 
-    public function message($message, $class='') {
+    public function message($message, $class = '') {
         // Generates a very simple but common page content.
         // Used for when a user logs out, or votes, or any simple thing
         // where there's a little message and probably a link elsewhere.
@@ -498,7 +498,7 @@ 
             if ($page_title != '') {
                 $page_title .= ': ';
             }
-            $page_title .= format_date ($info['date'], SHORTDATEFORMAT);
+            $page_title .= format_date($info['date'], SHORTDATEFORMAT);
         }
 
         if ($page_title != '') {
@@ -553,7 +553,7 @@ 
 
         if (isset($nextprev['up'])) {
 
-            $uplink = '<span class="up"><a href="' .  $nextprev['up']['url'] . '" title="' . $nextprev['up']['title'] . '">' . $nextprev['up']['body'] . '</a>';
+            $uplink = '<span class="up"><a href="' . $nextprev['up']['url'] . '" title="' . $nextprev['up']['title'] . '">' . $nextprev['up']['body'] . '</a>';
             if (get_http_var('s')) {
                 $URL = new \MySociety\TheyWorkForYou\Url($this_page);
                 $uplink .= '<br><a href="' . $URL->generate() . '">Remove highlighting</a>';
@@ -568,7 +568,7 @@ 
             $next = $nextprev['next'];
 
             if (isset($next['url'])) {
-                $nextlink = '<a href="' .  $next['url'] . '" title="' . $next['title'] . '" class="linkbutton">' . $next['body'] . ' &raquo;</a>';
+                $nextlink = '<a href="' . $next['url'] . '" title="' . $next['title'] . '" class="linkbutton">' . $next['body'] . ' &raquo;</a>';
             } else {
                 $nextlink = $next['body'] . ' &raquo;';
             }
@@ -585,7 +585,7 @@ 
     }
 
 
-    public function search_form($value='') {
+    public function search_form($value = '') {
         global $SEARCHENGINE;
         // Search box on the search page.
         // If $value is set then it will be displayed in the form.
@@ -615,7 +615,7 @@ 
             }
 
         echo '<div class="mainsearchbox">';
-        if ($wtt<2) {
+        if ($wtt < 2) {
                 echo '<form action="', $URL->generate(), '" method="get">';
                 if (get_http_var('o')) {
                     echo '<input type="hidden" name="o" value="', _htmlentities(get_http_var('o')), '">';
@@ -624,7 +624,7 @@ 
                     echo '<input type="hidden" name="house" value="', _htmlentities(get_http_var('house')), '">';
                 }
                 echo '<input type="text" name="q" value="', _htmlentities($value), '" size="50"> ';
-                echo '<input type="submit" value=" ', ($wtt?'Modify search':'Search'), ' ">';
+                echo '<input type="submit" value=" ', ($wtt ? 'Modify search' : 'Search'), ' ">';
                 $URL = new \MySociety\TheyWorkForYou\Url('search');
             $URL->insert(array('adv' => 1));
                 echo '&nbsp;&nbsp; <a href="' . $URL->generate() . '">More&nbsp;options</a>';
@@ -646,16 +646,16 @@ 
                     $ordering = 'd';
                 }
 
-                if ($ordering=='r') {
+                if ($ordering == 'r') {
                 print '<strong>Sorted by relevance</strong>';
                 } else {
                 printf("<a href='%s'>Sort by relevance</a>", $orderUrl->generate('html', array('o'=>'r')));
                 }
 
                 print "&nbsp;|&nbsp;";
-                if ($ordering=='d') {
+                if ($ordering == 'd') {
                 print '<strong>Sorted by date: newest</strong> / <a href="' . $orderUrl->generate('html', array('o'=>'o')) . '">oldest</a>';
-                } elseif ($ordering=='o') {
+                } elseif ($ordering == 'o') {
                 print '<strong>Sorted by date:</strong> <a href="' . $orderUrl->generate('html', array('o'=>'d')) . '">newest</a> / <strong>oldest</strong>';
                 } else {
                 printf("Sort by date: <a href='%s'>newest</a> / <a href='%s'>oldest</a>",
@@ -663,7 +663,7 @@ 
                 }
 
             print "&nbsp;|&nbsp;";
-            if ($ordering=='p') {
+            if ($ordering == 'p') {
                 print '<strong>Use by person</strong>';
             } else {
                 printf('<a href="%s">Show use by person</a>', $orderUrl->generate('html', array('o'=>'p')));
@@ -687,7 +687,7 @@ 
         include_once INCLUDESPATH . 'easyparliament/templates/html/search_advanced.php';
     }
 
-    public function login_form ($errors = array()) {
+    public function login_form($errors = array()) {
         // Used for /user/login/ and /user/prompt/
         // $errors is a hash of potential errors from a previous log in attempt.
         ?>
@@ -791,7 +791,7 @@ 
     public function glossary_atoz(&$GLOSSARY) {
     // Print out a nice list of lettered links to glossary pages
 
-        $letters = array ();
+        $letters = array();
 
         foreach ($GLOSSARY->alphabet as $letter => $eps) {
             // if we're writing out the current letter (list or item)
@@ -824,14 +824,14 @@ 
                     <div class="letters">
                         <ul>
     <?php
-        for ($n=0; $n<13; $n++) {
+        for ($n = 0; $n < 13; $n++) {
             print $letters[$n];
         }
         ?>
                         </ul>
                         <ul>
     <?php
-        for ($n=13; $n<26; $n++) {
+        for ($n = 13; $n < 26; $n++) {
             print $letters[$n];
         }
         ?>
@@ -850,12 +850,12 @@ 
 
         // add some extra controls for the administrators
         if ($this_page == "admin_glossary") {
-            print "<a id=\"gl".$term['glossary_id']."\"></a>";
+            print "<a id=\"gl" . $term['glossary_id'] . "\"></a>";
             print "<h3>" . $term['title'] . "</h3>";
             $URL = new \MySociety\TheyWorkForYou\Url('admin_glossary');
             $URL->insert(array("delete_confirm" => $term['glossary_id']));
             $delete_url = $URL->generate();
-            $admin_links = "<br><small><a href=\"".$delete_url."\">delete</a></small>";
+            $admin_links = "<br><small><a href=\"" . $delete_url . "\">delete</a></small>";
         }
         else {
             $admin_links = "";
@@ -878,9 +878,9 @@ 
             // Add a direct search link for current glossary item
             $URL = new \MySociety\TheyWorkForYou\Url('search');
             // remember to quote the term for phrase matching in search
-            $URL->insert(array('s' => '"'.$term['title'].'"'));
+            $URL->insert(array('s' => '"' . $term['title'] . '"'));
             $search_url = $URL->generate();
-            printf ("\t\t\t\t<p>Search hansard for \"<a href=\"%s\" title=\"View search results for this glossary item\">%s</a>\"</p>", $search_url, $term['title']);
+            printf("\t\t\t\t<p>Search hansard for \"<a href=\"%s\" title=\"View search results for this glossary item\">%s</a>\"</p>", $search_url, $term['title']);
         }
     }
 
@@ -955,7 +955,7 @@ 
 
             // Generate all the page links.
             $URL = new \MySociety\TheyWorkForYou\Url($this_page);
-            $URL->insert( array('wtt' => get_http_var('wtt')) );
+            $URL->insert(array('wtt' => get_http_var('wtt')));
             if (isset($pagedata['s'])) {
                 # XXX: Should be taken out in *one* place, not here + search_form etc.
                 $value = $pagedata['s'];
@@ -1093,7 +1093,7 @@ 
 
                 $body = trim_characters($report['body'], 0, 40);
 
-                $tabledata['rows'][] = array (
+                $tabledata['rows'][] = array(
                     _htmlentities($report['firstname'] . ' ' . $report['lastname']),
                     _htmlentities($body),
                     $report['reported'],
@@ -1124,13 +1124,13 @@ 
         // $page is the name of the page the dates should link to.
 
         // Create array containing abbreviations of days of week.
-        $daysOfWeek = array('Mon','Tue','Wed','Thu','Fri','Sat','Sun');
+        $daysOfWeek = array('Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun');
 
         // What is the first day of the month in question?
-        $firstDayOfMonth = mktime(0,0,0,$month,1,$year);
+        $firstDayOfMonth = mktime(0, 0, 0, $month, 1, $year);
 
         // How many days does this month contain?
-        $numberDays = date('t',$firstDayOfMonth);
+        $numberDays = date('t', $firstDayOfMonth);
 
         // Retrieve some information about the first day of the
         // month in question.
@@ -1211,7 +1211,7 @@ 
 
             // Is the $currentDay a member of $dateArray? If so,
             // the day should be linked.
-            if (in_array($currentDay,$dateArray)) {
+            if (in_array($currentDay, $dateArray)) {
 
                 $date = sprintf("%04d-%02d-%02d", $year, $month, $currentDay);
 
@@ -1312,7 +1312,7 @@ 
         // Returns HTML suitable for putting in the sidebar on Admin pages.
         global $this_page, $DATA;
 
-        $pages = array ('admin_home',
+        $pages = array('admin_home',
                 'admin_comments', 'admin_searchlogs', 'admin_popularsearches', 'admin_failedsearches',
                 'alert_stats', 'admin_statistics', 'admin_reportstats',
                 'admin_commentreports', 'admin_glossary', 'admin_glossary_pending', 'admin_badusers',

www/includes/easyparliament/templates/html/calendar_date.php

Braces +6 added lines, -3 removed lines

@@ -18,10 +18,13 @@
 # Content goes here
 foreach ($data['dates'] as $date => $day_events) {
     foreach ($order as $i => $chamber) {
-        if (!array_key_exists($chamber, $day_events))
-            continue;
+        if (!array_key_exists($chamber, $day_events)) {
+                    continue;
+        }
         $events = $day_events[$chamber];
-        if ($plural[$i]) $chamber .= 's';
+        if ($plural[$i]) {
+            $chamber .= 's';
+        }
         print "<h2 class='calendar'>$chamber";
         if (in_array($major[$i], $data['majors'])) {
             $URL = new \MySociety\TheyWorkForYou\Url($hansardmajors[$major[$i]]['page_all']);

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
         print "<h2 class='calendar'>$chamber";
         if (in_array($major[$i], $data['majors'])) {
             $URL = new \MySociety\TheyWorkForYou\Url($hansardmajors[$major[$i]]['page_all']);
-            $URL->insert( array( 'd' => $date ) );
+            $URL->insert(array('d' => $date));
             print ' &nbsp; <a href="' . $URL->generate() . '">See this day &rarr;</a>';
         }
         print "</h2>\n";

www/includes/easyparliament/templates/html/comments_recent.php

Braces +6 added lines, -2 removed lines

@@ -18,7 +18,9 @@ 
     }
     $PAGE->block_start(array('id'=>'recentcomments', 'title'=>$title));
 
-    if ($this_page != 'home') $PAGE->page_links($data);
+    if ($this_page != 'home') {
+        $PAGE->page_links($data);
+    }
     $USERURL = new \MySociety\TheyWorkForYou\Url('userview');
     ?>
                         <ul>
@@ -50,7 +52,9 @@ 
                         <p><a href="<?php echo $MOREURL->generate(); ?>#c<?php echo count($data['comments'])+1; ?>">See more annotations posted recently</a></p>
 <?php
     }
-    if ($this_page != 'home') $PAGE->page_links($data);
+    if ($this_page != 'home') {
+        $PAGE->page_links($data);
+    }
     $PAGE->block_end();
 }
 ?>

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
         $date = format_date($date, SHORTDATEFORMAT);
         $time = format_time($time, TIMEFORMAT);
 
-        $count = $n+1;
+        $count = $n + 1;
 
         $USERURL->insert(array('u'=>$comment['user_id']));
 
@@ -47,7 +47,7 @@ 
     if ($this_page == 'home') {
         $MOREURL = new \MySociety\TheyWorkForYou\Url('comments_recent');
         ?>
-                        <p><a href="<?php echo $MOREURL->generate(); ?>#c<?php echo count($data['comments'])+1; ?>">See more annotations posted recently</a></p>
+                        <p><a href="<?php echo $MOREURL->generate(); ?>#c<?php echo count($data['comments']) + 1; ?>">See more annotations posted recently</a></p>
 <?php
     }
     if ($this_page != 'home') $PAGE->page_links($data);

classes/Url.php

Braces +3 added lines, -2 removed lines

@@ -156,8 +156,9 @@
                 foreach ($var as $v) {
                     $url_args[] = "$key=" . urlencode(stripslashes($v));
                 }
-            } elseif ($var != null)
-                $url_args[] = "$key=" . urlencode(stripslashes($var));
+            } elseif ($var != null) {
+                            $url_args[] = "$key=" . urlencode(stripslashes($var));
+            }
         }
 
         $page_url = WEBPATH . $DATA->page_metadata($this->destinationpage, "url");

Spacing +4 added lines, -4 removed lines

@@ -42,7 +42,7 @@ 
 
         // These stores an associative array of key/value pairs that
         // we'll want passed on to other pages.
-        $this->session_vars = array ();
+        $this->session_vars = array();
 
         // Prevent things using $DATA running if it hasn't been set, ie in testing
         if (isset($DATA)) {
@@ -93,7 +93,7 @@ 
 
     public function reset() {
         // Call this to remove all the session_vars.
-        $this->session_vars = array ();
+        $this->session_vars = array();
     }
 
     /**
@@ -162,11 +162,11 @@ 
      *                            override just one or two of them.
      */
 
-    public function generate($encode = "html", $overrideVars=array()) {
+    public function generate($encode = "html", $overrideVars = array()) {
 
         global $DATA;
 
-        $url_args = array ();
+        $url_args = array();
 
         foreach (array_merge($this->session_vars, $overrideVars) as $key => $var) {
             if (is_array($var)) {

classes/SectionView/NiView.php

Spacing +8 added lines, -8 removed lines

@@ -32,7 +32,7 @@ 
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'ni' )
+            array('section' => 'ni')
         );
     }
 
@@ -52,23 +52,23 @@ 
 
         $debates = $DEBATELIST->display('recent_debates', array('days' => 30, 'num' => 6), 'none');
         $MOREURL = new \MySociety\TheyWorkForYou\Url('nidebatesfront');
-        $MOREURL->insert( array( 'more' => 1 ) );
+        $MOREURL->insert(array('more' => 1));
 
         // this makes sure that we don't repeat this debate in the list below
         $random_debate = NULL;
-        if ( isset($debates['data']) && count($debates['data']) ) {
+        if (isset($debates['data']) && count($debates['data'])) {
             $random_debate = $debates['data'][0];
         }
 
         $recent = array();
-        if ( isset($debates['data']) && count($debates['data']) ) {
+        if (isset($debates['data']) && count($debates['data'])) {
             // at the start of a session there may be less than 6
             // debates
             $max = 6;
-            if ( count($debates['data']) < 6 ) {
+            if (count($debates['data']) < 6) {
                 $max = count($debates['data']);
             }
-            for ( $i = 1; $i < $max; $i++ ) {
+            for ($i = 1; $i < $max; $i++) {
                 $debate = $debates['data'][$i];
                 $debate['desc'] = "Northern Ireland Assembly debates";
                 $debate['more_url'] = $MOREURL->generate();
@@ -77,7 +77,7 @@ 
         }
 
         $featured = array();
-        if ( $random_debate ) {
+        if ($random_debate) {
             $featured = $random_debate;
             $featured['more_url'] = $MOREURL->generate();
             $featured['desc'] = 'Northern Ireland Assembly debate';
@@ -86,7 +86,7 @@ 
         }
 
         $data['featured'] = $featured;
-        $data['debates'] = array( 'recent' => $recent);
+        $data['debates'] = array('recent' => $recent);
 
         $data['regional'] = $this->getMLAList();
         $data['template'] = 'ni/index';

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

@@ -42,7 +42,7 @@ 
 
         $data = array();
 
-        $data['popular_searches'] = NULL;
+        $data['popular_searches'] = null;
 
 
         $data['urls'] = $this->getURLs($data);
@@ -54,7 +54,7 @@ 
         $MOREURL->insert( array( 'more' => 1 ) );
 
         // this makes sure that we don't repeat this debate in the list below
-        $random_debate = NULL;
+        $random_debate = null;
         if ( isset($debates['data']) && count($debates['data']) ) {
             $random_debate = $debates['data'][0];
         }