mysociety / theyworkforyou

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>

www/includes/easyparliament/user.php

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

Spacing +77 added lines, -77 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";
 
@@ -142,7 +142,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.
@@ -224,7 +224,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. And double slash would be treated as single and
@@ -237,7 +237,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
                             ));
@@ -284,7 +284,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
@@ -305,7 +305,7 @@ 
             !isset($details['email']) ||
             $details['email'] == '' ||
             !isset($details['token']) ||
-            $details['token'] == '' ) {
+            $details['token'] == '') {
             return false;
         }
 
@@ -317,12 +317,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
@@ -362,12 +362,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
@@ -429,23 +429,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;
                 }
 
@@ -463,7 +463,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
@@ -491,14 +491,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()
@@ -553,7 +553,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))->first();
             if ($q) {
                 if ($return_id) {
@@ -628,7 +628,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;
 
@@ -646,7 +646,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;
 
@@ -801,7 +801,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;
         }
@@ -874,13 +874,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 {
@@ -893,30 +893,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;
         }
 
@@ -942,7 +942,7 @@ 
             // Set last_visit to now.
             $date_now = gmdate("Y-m-d H:i:s");
             $this->db->query("UPDATE users SET lastvisit = :lastvisit WHERE user_id = :user_id",
-                [ ':lastvisit' => $date_now, ':user_id' => $this->user_id() ]);
+                [':lastvisit' => $date_now, ':user_id' => $this->user_id()]);
 
             $this->lastvisit = $date_now;
         }
@@ -998,55 +998,55 @@ 
 
             } 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);
@@ -1056,7 +1056,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
@@ -1078,21 +1078,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);
     }
@@ -1108,7 +1108,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;
@@ -1146,7 +1146,7 @@ 
         }
     }
 
-    public function confirm_email($token, $redirect=true) {
+    public function confirm_email($token, $redirect = true) {
         $arg = '';
         if (strstr($token, '::')) $arg = '::';
         if (strstr($token, '-')) $arg = '-';
@@ -1159,24 +1159,24 @@ 
             FROM    tokens
             WHERE   token = :token
             AND   type = 'E'
-        ", array (':token' => $registrationtoken))->first();
+        ", array(':token' => $registrationtoken))->first();
 
         if ($q) {
             $expires = $q['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['data']);
+            list($user_id, $email) = explode('::', $q['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;
             }
 
@@ -1325,7 +1325,7 @@ 
 
             twfy_debug("THEUSER", "User with ID found to confirm: " . $this->user_id());
             // We'll need these to be set before logging the user in.
-            $this->email    = $q['email'];
+            $this->email = $q['email'];
 
             // Set that they're confirmed in the DB.
             $r = $this->db->query("UPDATE users
@@ -1372,14 +1372,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
@@ -1392,8 +1392,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;
                 }
             }
@@ -1441,8 +1441,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'];
@@ -1469,7 +1469,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 )
@@ -1486,7 +1486,7 @@ 
                     ));
 
                     // send confirmation email here
-                    if ( $r->success() ) {
+                    if ($r->success()) {
                         $newdetails['email'] = $email;
                         $newdetails['token'] = $token;
                         if ($confirm_email) {

www/docs/user/login/fb.php

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

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'
             )

classes/Memcache.php

Spacing +4 added lines, -4 removed lines

@@ -26,9 +26,9 @@ 
 
     public function set($key, $value, $timeout = 3600) {
         if (class_exists('\Memcached')) {
-            self::$memcache->set(OPTION_TWFY_DB_NAME.':'.$key, $value, $timeout);
+            self::$memcache->set(OPTION_TWFY_DB_NAME . ':' . $key, $value, $timeout);
         } else {
-            self::$memcache->set(OPTION_TWFY_DB_NAME.':'.$key, $value, MEMCACHE_COMPRESSED, $timeout);
+            self::$memcache->set(OPTION_TWFY_DB_NAME . ':' . $key, $value, MEMCACHE_COMPRESSED, $timeout);
         }
     }
 
@@ -36,9 +36,9 @@ 
         // see http://php.net/manual/en/memcache.get.php#112056 for explanation of this
         $was_found = false;
         if (class_exists('\Memcached')) {
-            $value = self::$memcache->get(OPTION_TWFY_DB_NAME.':'.$key, null, $was_found);
+            $value = self::$memcache->get(OPTION_TWFY_DB_NAME . ':' . $key, null, $was_found);
         } else {
-            $value = self::$memcache->get(OPTION_TWFY_DB_NAME.':'.$key, $was_found);
+            $value = self::$memcache->get(OPTION_TWFY_DB_NAME . ':' . $key, $was_found);
         }
         if ($was_found === false) {
             return false; // mmmmm

classes/Search.php

Spacing +16 added lines, -16 removed lines

@@ -19,7 +19,7 @@ 
         $this->searchstring = $argparser->construct_search_string();
         $this->searchkeyword = $argparser->searchkeyword;
 
-        if ( !$this->searchstring ) {
+        if (!$this->searchstring) {
             $data = $this->get_form_params($data);
             $data['searchstring'] = '';
             $data['template'] = 'search/results';
@@ -28,14 +28,14 @@ 
 
         $this->searchstring = filter_user_input($this->searchstring, 'strict');
         $warnings = $this->validate_search_string();
-        if ( $warnings ) {
+        if ($warnings) {
             $data['warnings'] = $warnings;
             $data['template'] = 'search/results';
             $data['searchstring'] = $this->searchstring;
             $data = $this->get_form_params($data);
             return $data;
         } else {
-            if (get_http_var('o')=='p') {
+            if (get_http_var('o') == 'p') {
                 $search = new Search\ByUsage();
                 $data = $search->search($this->searchstring);
                 $data['template'] = 'search/by-person';
@@ -52,7 +52,7 @@ 
             $data['person_name'] = $MEMBER->full_name();
         }
 
-        if ( isset($data['info']['spelling_correction']) ) {
+        if (isset($data['info']['spelling_correction'])) {
             $data['info']['spelling_correction_display'] = $this->prettifySearchString($data['info']['spelling_correction']);
         }
 
@@ -144,15 +144,15 @@ 
         $data['search_keyword'] = $this->searchkeyword;
 
         $is_adv = false;
-        foreach ( array('to', 'from', 'person', 'section', 'column', 'phrase', 'exclude' ) as $var ) {
+        foreach (array('to', 'from', 'person', 'section', 'column', 'phrase', 'exclude') as $var) {
             $key = "search_$var";
-            $data[$key] = get_http_var( $var );
-            if ( $data[$key] ) {
+            $data[$key] = get_http_var($var);
+            if ($data[$key]) {
                 $is_adv = true;
             }
         }
 
-        if ( isset($data['search_section']) ) {
+        if (isset($data['search_section'])) {
             $data['search_section_pretty'] = $this->prettify_search_section($data['search_section']);
         }
 
@@ -162,16 +162,16 @@ 
 
     private function set_wtt_options($data) {
         $data['wtt'] = '';
-        if ( $wtt = get_http_var('wtt') ) {
+        if ($wtt = get_http_var('wtt')) {
             $data['wtt'] = $wtt;
-            if ( $wtt == 2 && $pid = get_http_var('pid') ) {
+            if ($wtt == 2 && $pid = get_http_var('pid')) {
                 $data['pid'] = null;
                 try {
                     $lord = new Member(array('person_id' => $pid, 'house' => 2));
-                } catch ( MemberException $e ) {
+                } catch (MemberException $e) {
                     return $data;
                 }
-                if ( $lord->valid ) {
+                if ($lord->valid) {
                     $data['pid'] = $pid;
                     $data['wtt_lord_name'] = $lord->full_name();
                 }
@@ -196,11 +196,11 @@ 
             $url->insert(array('q' => $value));
         }
 
-        if ( $params ) {
-            if ( get_http_var('house') ) {
+        if ($params) {
+            if (get_http_var('house')) {
                 $url->insert(array('house' => get_http_var('house')));
             }
-            if ( get_http_var('wtt') ) {
+            if (get_http_var('wtt')) {
                 $url->insert(array('wtt' => get_http_var('wtt')));
             }
         } else {
@@ -214,7 +214,7 @@ 
         global $DATA, $this_page;
 
         $pagetitle = '';
-        if ( isset($data['search_type']) && $data['search_type'] == 'person' ) {
+        if (isset($data['search_type']) && $data['search_type'] == 'person') {
             if (isset($data['wtt']) && $data['wtt'] > 0) {
                 $pagetitle = 'League table of Lords who say ' . $data['pagetitle'];
             } else {

classes/Utility/Video.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 {
 
     public static function dbConnect() {
-        $connstr = 'host='.OPTION_BBC_DB_HOST.' port='.OPTION_BBC_DB_PORT.' dbname='.OPTION_BBC_DB_NAME.' user='.OPTION_BBC_DB_USER.' password='.OPTION_BBC_DB_PASS;
+        $connstr = 'host=' . OPTION_BBC_DB_HOST . ' port=' . OPTION_BBC_DB_PORT . ' dbname=' . OPTION_BBC_DB_NAME . ' user=' . OPTION_BBC_DB_USER . ' password=' . OPTION_BBC_DB_PASS;
         $videodb = pg_connect($connstr);
 
         return $videodb;

tests/MemberTest.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/member.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/member.xml');
     }
 
     /**

tests/TopicsTest.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/topics.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/topics.xml');
     }
 
     private function fetch_topics_page($vars)