mysociety / theyworkforyou

www/includes/easyparliament/comment.php

Spacing +17 added lines, -17 removed lines

@@ -31,8 +31,8 @@ 
     public $body = '';
     public $posted = '';
     public $visible = false;
-    public $modflagged = NULL;	// Is a datetime when set.
-    public $firstname = '';	// Of the person who posted it.
+    public $modflagged = NULL; // Is a datetime when set.
+    public $firstname = ''; // Of the person who posted it.
     public $lastname = '';
     public $url = '';
 
@@ -41,7 +41,7 @@ 
     public $exists = false;
 
 
-    public function __construct($comment_id='') {
+    public function __construct($comment_id = '') {
 
         $this->db = new ParlDB;
 
@@ -69,12 +69,12 @@ 
             if ($q->rows() > 0) {
 
                 $this->comment_id 	= $comment_id;
-                $this->user_id		= $q->field(0, 'user_id');
+                $this->user_id = $q->field(0, 'user_id');
                 $this->epobject_id	= $q->field(0, 'epobject_id');
-                $this->body			= $q->field(0, 'body');
-                $this->posted		= $q->field(0, 'posted');
-                $this->visible		= $q->field(0, 'visible');
-                $this->modflagged	= $q->field(0, 'modflagged');
+                $this->body = $q->field(0, 'body');
+                $this->posted = $q->field(0, 'posted');
+                $this->visible = $q->field(0, 'visible');
+                $this->modflagged = $q->field(0, 'modflagged');
 
                 // Sets the URL and username for this comment. Duh.
                 $this->_set_url();
@@ -104,9 +104,9 @@ 
     public function comments_enabled() { return $this->comments_enabled; }
 
 
-    public function display($format='html', $template='comments') {
+    public function display($format = 'html', $template = 'comments') {
 
-        $data['comments'][0] = array (
+        $data['comments'][0] = array(
             'comment_id'	=> $this->comment_id,
             'user_id'		=> $this->user_id,
             'epobject_id'	=> $this->epobject_id,
@@ -142,19 +142,19 @@ 
             $flag = 'NULL';
 
         } else {
-            $PAGE->error_message ("Why are you trying to switch this comment's modflag to '" . _htmlentities($switch) . "'!");
+            $PAGE->error_message("Why are you trying to switch this comment's modflag to '"._htmlentities($switch)."'!");
         }
 
         $q = $this->db->query("UPDATE comments
                         SET		modflagged = $flag
-                        WHERE 	comment_id = '" . $this->comment_id . "'
+                        WHERE 	comment_id = '".$this->comment_id."'
                         ");
 
         if ($q->success()) {
             $this->modflagged = $date;
             return true;
         } else {
-            $message = array (
+            $message = array(
                 'title' => 'Sorry',
                 'text' => "We couldn't update the annotation's modflag."
             );
@@ -171,12 +171,12 @@ 
         global $THEUSER, $PAGE;
 
         if ($THEUSER->is_able_to('deletecomment')) {
-            $q = $this->db->query("UPDATE comments SET visible = '0' WHERE comment_id = '" . $this->comment_id . "'");
+            $q = $this->db->query("UPDATE comments SET visible = '0' WHERE comment_id = '".$this->comment_id."'");
 
             if ($q->success()) {
                 return true;
             } else {
-                $message = array (
+                $message = array(
                     'title' => 'Sorry',
                     'text' => "We were unable to delete the annotation."
                 );
@@ -185,7 +185,7 @@ 
             }
 
         } else {
-            $message = array (
+            $message = array(
                 'title' => 'Sorry',
                 'text' => "You are not authorised to delete annotations."
             );
@@ -220,7 +220,7 @@ 
 
                 $URL = new \MySociety\TheyWorkForYou\Url($page);
                 $URL->insert(array('id'=>$gid));
-                $this->url = $URL->generate() . '#c' . $this->comment_id;
+                $this->url = $URL->generate().'#c'.$this->comment_id;
             }
         }
     }

www/includes/easyparliament/user.php

Spacing +124 added lines, -124 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;
 
@@ -143,16 +143,16 @@ 
             // we're going to show an error too, just in case.
             // *Should* never happen...
             return false;
-            twfy_debug("USER", "There is more than one user with an id of '" . _htmlentities($user_id) . "'");
+            twfy_debug("USER", "There is more than one user with an id of '"._htmlentities($user_id)."'");
 
         } else {
             return false;
-            twfy_debug("USER", "There is no user with an id of '" . _htmlentities($user_id) . "'");
+            twfy_debug("USER", "There is no user with an id of '"._htmlentities($user_id)."'");
         }
 
     }
 
-    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,24 +319,24 @@ 
             !isset($details['email']) ||
             $details['email'] == '' ||
             !isset($details['token']) ||
-            $details['token'] == '' ) {
+            $details['token'] == '') {
             return false;
         }
 
         // We prefix the registration token with the user's id and '-'.
         // Not for any particularly good reason, but we do.
 
-        $urltoken = $this->user_id . '-' . $details['token'];
+        $urltoken = $this->user_id.'-'.$details['token'];
 
-        $confirmurl = 'https://' . DOMAIN . '/E/' . $urltoken;
+        $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,17 +368,17 @@ 
         // We prefix the registration token with the user's id and '-'.
         // Not for any particularly good reason, but we do.
 
-        $urltoken = $this->user_id . '-' . $this->registrationtoken;
+        $urltoken = $this->user_id.'-'.$this->registrationtoken;
 
-        $confirmurl = 'https://' . DOMAIN . '/U/' . $urltoken;
+        $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,16 +502,16 @@ 
             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(),
+            '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;
 
@@ -803,7 +803,7 @@ 
                                 . $deletedsql
                                 . $confirmedsql
                                 . $emailsql
-                                . $statussql . "
+                                . $statussql."
                                 optin       = :optin
                         WHERE   user_id     = :user_id
                         ", array_merge($params, array(
@@ -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;
         }
 
@@ -965,7 +965,7 @@ 
             $date_now = gmdate("Y-m-d H:i:s");
             $q = $this->db->query("UPDATE users
                             SET     lastvisit = '$date_now'
-                            WHERE   user_id = '" . $this->user_id() . "'");
+                            WHERE   user_id = '".$this->user_id()."'");
 
             $this->lastvisit = $date_now;
         }
@@ -1004,83 +1004,83 @@ 
         // This error string is shared between both email and password errors to
         // prevent leaking of account existence.
 
-        $error_string = 'There is no user registered with an email of ' . _htmlentities($email) . ', or the given password is incorrect. If you are subscribed to email alerts, you are not necessarily registered on the website. If you register, you will be able to manage your email alerts, as well as leave annotations.';
+        $error_string = 'There is no user registered with an email of '._htmlentities($email).', or the given password is incorrect. If you are subscribed to email alerts, you are not necessarily registered on the website. If you register, you will be able to manage your email alerts, as well as leave annotations.';
 
         $q = $this->db->query("SELECT user_id, password, deleted, confirmed FROM users WHERE email = :email", array(':email' => $email));
 
         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);
+        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);
+        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);
-        twfy_debug("THEUSER", "Faceook login, cookie: " . $cookie);
+        $cookie = $this->user_id().".".md5($accessToken);
+        twfy_debug("THEUSER", "Faceook login, cookie: ".$cookie);
 
-        twfy_debug("USER", "logging in user from facebook " . $this->user_id);
+        twfy_debug("USER", "logging in user from facebook ".$this->user_id);
 
         $this->loggedin = True;
         $this->_login($returl, $expire, $cookie, 'facebook_id');
         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);
     }
@@ -1127,14 +1127,14 @@ 
         // user. We don't want it hanging around as it causes confusion.
         $this->unset_postcode_cookie();
 
-        twfy_debug("THEUSER", "expire is " . $expire);
+        twfy_debug("THEUSER", "expire is ".$expire);
 
         $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);
+            twfy_debug("THEUSER", "cookie expires at ".$expire);
             $cookie_expires = $expire;
         } else {
             twfy_debug("THEUSER", "cookie expires with session");
@@ -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;
             }
 
@@ -1292,7 +1292,7 @@ 
                     # This should probably be in the ALERT class
                     $this->db->query('update alerts set confirmed=1 where email = :email and criteria = :criteria', array(
                             ':email' => $this->email,
-                            ':criteria' => 'speaker:' . $pid
+                            ':criteria' => 'speaker:'.$pid
                         ));
                 } catch (MySociety\TheyWorkForYou\MemberException $e) {
                 }
@@ -1328,7 +1328,7 @@ 
         //
         // Note that this doesn't login or redirect the user.
 
-        twfy_debug("THEUSER", "Confirming user without token: " . $this->user_id());
+        twfy_debug("THEUSER", "Confirming user without token: ".$this->user_id());
         $q = $this->db->query("SELECT email, password, postcode
                         FROM    users
                         WHERE   user_id = :user_id
@@ -1338,9 +1338,9 @@ 
 
         if ($q->rows() == 1) {
 
-            twfy_debug("THEUSER", "User with ID found to confirm: " . $this->user_id());
+            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
@@ -1355,18 +1355,18 @@ 
                     # This should probably be in the ALERT class
                     $this->db->query('update alerts set confirmed=1 where email = :email and criteria = :criteria', array(
                             ':email' => $this->email,
-                            ':criteria' => 'speaker:' . $pid
+                            ':criteria' => 'speaker:'.$pid
                         ));
                 } catch (MySociety\TheyWorkForYou\MemberException $e) {
                 }
             }
 
             if ($r->success()) {
-                twfy_debug("THEUSER", "User with ID confirmed: " . $this->user_id());
+                twfy_debug("THEUSER", "User with ID confirmed: ".$this->user_id());
                 $this->confirmed = true;
                 return true;
             } else {
-                twfy_debug("THEUSER", "User with ID not confirmed: " . $this->user_id());
+                twfy_debug("THEUSER", "User with ID not confirmed: ".$this->user_id());
                 // Couldn't set them as confirmed in the DB.
                 return false;
             }
@@ -1374,7 +1374,7 @@ 
         } else {
             // Couldn't find this user in the DB. Maybe the token was
             // wrong or incomplete?
-            twfy_debug("THEUSER", "User with ID not found to confirm: " . $this->user_id());
+            twfy_debug("THEUSER", "User with ID not found to confirm: ".$this->user_id());
             return false;
         }
     }
@@ -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");
+        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,8 +1486,8 @@ 
                 }
 
                 if ($email && $email != $this->email) {
-                    $token = substr( password_hash($email . microtime(), PASSWORD_BCRYPT), 29, 16 );
-                    $data = $this->user_id() . '::' . $email;
+                    $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 )
                         VALUES
@@ -1503,7 +1503,7 @@ 
                     ));
 
                     // send confirmation email here
-                    if ( $r->success() ) {
+                    if ($r->success()) {
                         $newdetails['email'] = $email;
                         $newdetails['token'] = $token;
                         if ($confirm_email) {

www/includes/easyparliament/sidebars/sitenews.php

Spacing +2 added lines, -2 removed lines

@@ -5,7 +5,7 @@ 
 $url = $ARCHIVEURL->generate();
 
 $this->block_start(array('title'=>'News Archives', 'url'=>$url));
-include BASEDIR . '/news/sidebar_archives.php';
+include BASEDIR.'/news/sidebar_archives.php';
 $this->block_end();
 
 $this->block_start(array('title'=>'RSS/XML'));
@@ -13,7 +13,7 @@ 
 $rssurl = $RSSURL->generate();
 
 $HELPURL = new \MySociety\TheyWorkForYou\Url('help');
-$helpurl = $HELPURL->generate() . '#rss';
+$helpurl = $HELPURL->generate().'#rss';
 ?>
 
 <p><a href="<?php echo $rssurl; ?>">RSS feed of recent posts</a> (<a href="<?php echo $helpurl; ?>">?</a>)</p>

www/includes/easyparliament/sidebars/minisurvey.php

Spacing +11 added lines, -11 removed lines

@@ -10,9 +10,9 @@ 
  *
  */
 
-include_once INCLUDESPATH . "easyparliament/init.php";
-require_once INCLUDESPATH . "../../commonlib/phplib/random.php";
-require_once INCLUDESPATH . "../../commonlib/phplib/auth.php";
+include_once INCLUDESPATH."easyparliament/init.php";
+require_once INCLUDESPATH."../../commonlib/phplib/random.php";
+require_once INCLUDESPATH."../../commonlib/phplib/auth.php";
 
 // increment this each time you change the question so
 // the cookie magic works
@@ -33,10 +33,10 @@ 
 if ($hide_question) {
     $always_ask = 0;
     $show_survey_qn = $current_question;
-    setcookie('survey', $current_question, time()+60*60*24*365, '/');
+    setcookie('survey', $current_question, time() + 60 * 60 * 24 * 365, '/');
 } elseif ($has_answered_question == $current_question && !$always_ask) {
     $show_survey_qn = $current_question;
-    setcookie('survey', $current_question, time()+60*60*24*365, '/');
+    setcookie('survey', $current_question, time() + 60 * 60 * 24 * 365, '/');
 } elseif (isset($_COOKIE['survey'])) {
     $show_survey_qn = $_COOKIE['survey'];
 }
@@ -49,16 +49,16 @@ 
 if ($show_survey_qn < $current_question && !$has_answered_question) {
     $page_url = '';
     $hide_url = '';
-    if ( in_array( $this_page, array('mp', 'peer', 'msp', 'mla', 'royal') ) ) {
+    if (in_array($this_page, array('mp', 'peer', 'msp', 'mla', 'royal'))) {
         global $MEMBER;
-        $page_url = $MEMBER->url(true) . "?answered_survey=$current_question";
-        $hide_url = $MEMBER->url() . "?hide_survey=$current_question";
+        $page_url = $MEMBER->url(true)."?answered_survey=$current_question";
+        $hide_url = $MEMBER->url()."?hide_survey=$current_question";
     } else {
         $URL = new \MySociety\TheyWorkForYou\Url($this_page);
-        $URL->insert(array('answered_survey' => $current_question ));
-        $page_url = 'https://' . DOMAIN . $URL->generate();
+        $URL->insert(array('answered_survey' => $current_question));
+        $page_url = 'https://'.DOMAIN.$URL->generate();
         $URL = new \MySociety\TheyWorkForYou\Url($this_page);
-        $URL->insert(array('hide_survey' => $current_question ));
+        $URL->insert(array('hide_survey' => $current_question));
         $hide_url = $URL->generate();
     }
 

www/includes/easyparliament/commentlist.php

Spacing +45 added lines, -45 removed lines

@@ -42,7 +42,7 @@ 
     }
 
 
-    public function display ($view, $args=array(), $format='html') {
+    public function display($view, $args = array(), $format = 'html') {
         // $view is what we're viewing by:
         //	'ep' is all the comments attached to an epobject.
         //	'user' is all the comments written by a user.
@@ -66,7 +66,7 @@ 
 
         } else {
             // Don't have a valid $view;
-            $PAGE->error_message ("You haven't specified a view type.");
+            $PAGE->error_message("You haven't specified a view type.");
             return false;
         }
 
@@ -85,7 +85,7 @@ 
         return true;
     }
 
-    public function render($data, $format='html', $template='comments') {
+    public function render($data, $format = 'html', $template = 'comments') {
         include (INCLUDESPATH."easyparliament/templates/$format/$template.php");
     }
 
@@ -93,21 +93,21 @@ 
         // Get all the data attached to an epobject.
         global $PAGE;
 
-        twfy_debug (get_class($this), "getting data by epobject");
+        twfy_debug(get_class($this), "getting data by epobject");
 
         // What we return.
         $data = array();
         if (!is_numeric($args['epobject_id'])) {
-            $PAGE->error_message ("Sorry, we don't have a valid epobject id");
+            $PAGE->error_message("Sorry, we don't have a valid epobject id");
             return $data;
         }
 
         // For getting the data.
-        $input = array (
-            'amount' => array (
+        $input = array(
+            'amount' => array(
                 'user' => true
             ),
-            'where' => array (
+            'where' => array(
                 'comments.epobject_id=' => $args['epobject_id'],
                 #'visible=' => '1'
             ),
@@ -135,13 +135,13 @@ 
         // comments by things in $args?
         global $PAGE;
 
-        twfy_debug (get_class($this), "getting data by user");
+        twfy_debug(get_class($this), "getting data by user");
 
         // What we return.
         $data = array();
 
         if (!is_numeric($args['user_id'])) {
-            $PAGE->error_message ("Sorry, we don't have a valid user id");
+            $PAGE->error_message("Sorry, we don't have a valid user id");
             return $data;
         }
 
@@ -151,13 +151,13 @@ 
             $num = 10;
         }
 
-        if (isset($args['page']) && is_numeric($args['page']) && $args['page']>1) {
+        if (isset($args['page']) && is_numeric($args['page']) && $args['page'] > 1) {
             $page = $args['page'];
         } else {
             $page = 1;
         }
 
-        $limit = $num*($page-1) . ',' . $num;
+        $limit = $num * ($page - 1).','.$num;
 
         // We're getting the most recent comments posted to epobjects.
         // We're grouping them by epobject so we can just link to each hansard thing once.
@@ -193,10 +193,10 @@ 
 
         if ($q->rows() > 0) {
 
-            for ($n=0; $n<$q->rows(); $n++) {
+            for ($n = 0; $n < $q->rows(); $n++) {
 
                 // All the basic stuff...
-                $comments[$n] = array (
+                $comments[$n] = array(
                     'comment_id'		=> $q->field($n, 'comment_id'),
                     'posted'			=> $q->field($n, 'posted'),
                     'total_comments'	=> $q->field($n, 'total_comments'),
@@ -208,7 +208,7 @@ 
                 );
 
                 // Add the URL...
-                $urldata = array (
+                $urldata = array(
                     'major' 		=> $q->field($n, 'major'),
                     'gid'			=> $q->field($n, 'gid'),
                     'comment_id'	=> $q->field($n, 'comment_id'),
@@ -234,14 +234,14 @@ 
 
                 $commentbodies = array();
 
-                for ($n=0; $n<$r->rows(); $n++) {
-                    $commentbodies[ $r->field($n, 'comment_id') ] = $r->field($n, 'body');
+                for ($n = 0; $n < $r->rows(); $n++) {
+                    $commentbodies[$r->field($n, 'comment_id')] = $r->field($n, 'body');
                 }
 
                 // This does rely on both this and the previous query returning
                 // stuff in the same order...
                 foreach ($comments as $n => $commentdata) {
-                    $comments[$n]['body'] = $commentbodies[ $comments[$n]['comment_id'] ];
+                    $comments[$n]['body'] = $commentbodies[$comments[$n]['comment_id']];
                 }
             }
         }
@@ -249,7 +249,7 @@ 
         $data['comments'] = $comments;
         $data['results_per_page'] = $num;
         $data['page'] = $page;
-        $q = $this->db->query('SELECT COUNT(DISTINCT(epobject_id)) AS count FROM comments WHERE visible=1 AND user_id=' . $args['user_id']);
+        $q = $this->db->query('SELECT COUNT(DISTINCT(epobject_id)) AS count FROM comments WHERE visible=1 AND user_id='.$args['user_id']);
         $data['total_results'] = $q->field(0, 'count');
         return $data;
 
@@ -261,7 +261,7 @@ 
         // $args should contain 'num', indicating how many to get.
         // and perhaps pid too, for a particular person
 
-        twfy_debug (get_class($this), "getting data by recent");
+        twfy_debug(get_class($this), "getting data by recent");
 
         // What we return.
         $data = array();
@@ -278,7 +278,7 @@ 
             $page = 1;
         }
 
-        $limit = $num*($page-1) . ',' . $num;
+        $limit = $num * ($page - 1).','.$num;
 
         $where = array(
             'visible=' => '1'
@@ -286,8 +286,8 @@ 
         if (isset($args['pid']) && is_numeric($args['pid'])) {
             $where['person_id='] = $args['pid'];
         }
-        $input = array (
-            'amount' => array (
+        $input = array(
+            'amount' => array(
                 'user' => true
             ),
             'where'  => $where,
@@ -305,7 +305,7 @@ 
             $data['pid'] = $args['pid'];
             $q = 'SELECT title, given_name, family_name, lordofname, house FROM member m, person_names p WHERE m.person_id=p.person_id AND p.type="name" AND left_house="9999-12-31" AND m.person_id = :pid';
             $q = $this->db->query($q, array(':pid' => $args['pid']));
-            $data['full_name'] = member_full_name($q->field(0, 'house'), $q->field(0, 'title'), $q->field(0, 'given_name'), $q->field(0, 'family_name'), $q->field(0,'lordofname'));
+            $data['full_name'] = member_full_name($q->field(0, 'house'), $q->field(0, 'title'), $q->field(0, 'given_name'), $q->field(0, 'family_name'), $q->field(0, 'lordofname'));
             $q = 'SELECT COUNT(*) AS count FROM comments,hansard WHERE visible=1 AND comments.epobject_id = hansard.epobject_id and hansard.person_id = :pid';
             $params[':pid'] = $args['pid'];
         } else {
@@ -319,15 +319,15 @@ 
   public function _get_data_by_dates($args) {
     // $args should contain start_date and end_date
 
-        twfy_debug (get_class($this), "getting data by recent");
+        twfy_debug(get_class($this), "getting data by recent");
         $data = array();
         $where = array(
             'visible=' => '1',
             'date(posted)>=' => $args['start_date'],
             'date(posted)<=' => $args['end_date']
         );
-        $input = array (
-            'amount' => array (
+        $input = array(
+            'amount' => array(
                 'user' => true
             ),
             'where'  => $where,
@@ -341,7 +341,7 @@ 
     public function _get_data_by_search($args) {
         // $args should contain 'num', indicating how many to get.
 
-        twfy_debug (get_class($this), "getting data by search");
+        twfy_debug(get_class($this), "getting data by search");
 
         // What we return.
         $data = array();
@@ -358,13 +358,13 @@ 
             $page = 1;
         }
 
-        $limit = $num*($page-1) . ',' . $num;
+        $limit = $num * ($page - 1).','.$num;
 
-        $input = array (
-            'amount' => array (
+        $input = array(
+            'amount' => array(
                 'user'=> true
             ),
-            'where'  => array (
+            'where'  => array(
                 'comments.body LIKE' => "%$args[s]%"
             ),
             'order' => 'posted DESC',
@@ -391,7 +391,7 @@ 
         // It returns the URL for the comment.
 
         $major 		= $urldata['major'];
-        $gid 		= $urldata['gid'];
+        $gid = $urldata['gid'];
         $comment_id = $urldata['comment_id'];
         $user_id = isset($urldata['user_id']) ? $urldata['user_id'] : false;
 
@@ -405,11 +405,11 @@ 
         $URL = new \MySociety\TheyWorkForYou\Url($page);
 
         $gid = fix_gid_from_db($gid); // In includes/utility.php
-        $URL->insert(array('id' => $gid ));
+        $URL->insert(array('id' => $gid));
         if ($user_id) {
             $URL->insert(array('u' => $user_id));
         }
-        $url = $URL->generate() . '#c' . $comment_id;
+        $url = $URL->generate().'#c'.$comment_id;
 
         return $url;
     }
@@ -483,9 +483,9 @@ 
         $limit = isset($input['limit']) ? $input['limit'] : '';
 
         // The fields to fetch from db. 'table' => array ('field1', 'field2').
-        $fieldsarr = array (
-            'comments' => array ('comment_id', 'user_id', 'epobject_id', 'body', 'posted', 'modflagged', 'visible'),
-            'hansard' => array ('major', 'gid')
+        $fieldsarr = array(
+            'comments' => array('comment_id', 'user_id', 'epobject_id', 'body', 'posted', 'modflagged', 'visible'),
+            'hansard' => array('major', 'gid')
         );
 
         // Yes, we need the gid of a comment's associated hansard object
@@ -496,7 +496,7 @@ 
 
         // Add on the stuff for getting a user's details.
         if (isset($amount['user']) && $amount['user'] == true) {
-            $fieldsarr['users'] = array ('firstname', 'lastname', 'user_id');
+            $fieldsarr['users'] = array('firstname', 'lastname', 'user_id');
             // Like doing "FROM comments, users" but it's easier to add
             // an "INNER JOIN..." automatically to the query.
             $join .= ' INNER JOIN users ON comments.user_id = users.user_id ';
@@ -507,7 +507,7 @@ 
             $fieldsarr['epobject'] = array('body');
         }
 
-        $fieldsarr2 = array ();
+        $fieldsarr2 = array();
         // Construct the $fields clause.
         foreach ($fieldsarr as $table => $tablesfields) {
             foreach ($tablesfields as $n => $field) {
@@ -524,7 +524,7 @@ 
         $fields = implode(', ', $fieldsarr2);
 
 
-        $wherearr2 = array ();
+        $wherearr2 = array();
         $params = array();
         $i = 0;
         // Construct the $where clause.
@@ -533,7 +533,7 @@ 
             $params[":where$i"] = $val;
             $i++;
         }
-        $where = implode (" AND ", $wherearr2);
+        $where = implode(" AND ", $wherearr2);
 
         if ($order != '') {
             $order = "ORDER BY $order";
@@ -544,7 +544,7 @@ 
         }
 
         // Finally, do the query!
-        $q = $this->db->query ("SELECT $fields
+        $q = $this->db->query("SELECT $fields
                         FROM 	comments
                         $join
                         WHERE $where
@@ -553,7 +553,7 @@ 
                         ", $params);
 
         // Format the data into an array for returning.
-        $data = array ();
+        $data = array();
 
         if ($q->rows() > 0) {
 
@@ -563,7 +563,7 @@ 
             // We'll generate permalinks for each comment.
             // Assuming every comment is from the same major...
 
-            for ($n=0; $n<$q->rows(); $n++) {
+            for ($n = 0; $n < $q->rows(); $n++) {
 
                 // Put each row returned into its own array in $data.
                 foreach ($fieldsarr as $table => $tablesfields) {

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

Spacing +2 added lines, -2 removed lines

@@ -25,8 +25,8 @@
         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 ) );
-            print ' &nbsp; <a href="' . $URL->generate() . '">See this day &rarr;</a>';
+            $URL->insert(array('d' => $date));
+            print ' &nbsp; <a href="'.$URL->generate().'">See this day &rarr;</a>';
         }
         print "</h2>\n";
         print $list[$i] ? "<ul class='calendar'>\n" : "<dl class='calendar'>\n";

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

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

Spacing +11 added lines, -11 removed lines

@@ -40,13 +40,13 @@ 
 
 
             // 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.
@@ -60,7 +60,7 @@ 
             if (isset($data['info']['onday'])) {
                 // 'onday' is like 'yyyy-mm-dd'.
                 $datebits = explode('-', $data['info']['onday']);
-                if (count($datebits)>2 && $datebits[0] == $year && $datebits[1] == $month) {
+                if (count($datebits) > 2 && $datebits[0] == $year && $datebits[1] == $month) {
                     $toDay = $datebits[2];
                 } else {
                     $toDay = '';
@@ -149,11 +149,11 @@ 
                 // sittings - e.g. WH is only Tuesday-Thursday
                 if ($currentDay == $toDay) {
                     print '<td class="on"';
-                    if ($recess[0] && $recess[0]!=1) print ' title="'.$recess[0].'"';
+                    if ($recess[0] && $recess[0] != 1) print ' title="'.$recess[0].'"';
                     print '>';
                 } elseif ($recess[0]) {
                     print '<td class="no"';
-                    if ($recess[0]!=1) print ' title="'.$recess[0].'"';
+                    if ($recess[0] != 1) print ' title="'.$recess[0].'"';
                     print '>';
                 } else {
                     print '<td>';
@@ -161,22 +161,22 @@ 
 
                 // Is the $currentDay a member of $dates? If so,
                 // the day should be linked.
-                if (in_array($currentDay,$dates)) {
+                if (in_array($currentDay, $dates)) {
 
                     $date = sprintf("%04d-%02d-%02d", $year, $month, $currentDay);
 
                     if ($currentDay == $toDay) {
-                        print '<span>' . $currentDay . '</span></td>';
+                        print '<span>'.$currentDay.'</span></td>';
                     } else {
                         $DAYURL->insert(array('d'=>$date));
-                        print "<a href=\"" . $DAYURL->generate() . "\">$currentDay</a></td>";
+                        print "<a href=\"".$DAYURL->generate()."\">$currentDay</a></td>";
                     }
 
                     // $currentDay is not a member of $dates.
 
                 } else {
 
-                        print '<span>' . $currentDay . '</span></td>';
+                        print '<span>'.$currentDay.'</span></td>';
                 }
                 // Increment counters
 
@@ -209,7 +209,7 @@ 
             $year = $years[0];
             $URL = new \MySociety\TheyWorkForYou\Url($hansardmajors[$data['info']['major']]['page_year']);
             $URL->insert(array('y'=>$year));
-            print '<p><a href="' . $URL->generate() . '">See all of ' . $year . '</a></p>';
+            print '<p><a href="'.$URL->generate().'">See all of '.$year.'</a></p>';
         }
     }
 } else {

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

Spacing +10 added lines, -10 removed lines

@@ -44,7 +44,7 @@ 
         $last_result = $info['total_results'];
     }
 
-    print "\t\t\t\t<h3 style='font-weight:normal'>Results <strong>" . number_format($info['first_result']) . '-' . number_format($last_result) . '</strong> of ' . number_format($info['total_results']) . " for <strong>" . _htmlentities($searchdescription) . "</strong></h3>\n";
+    print "\t\t\t\t<h3 style='font-weight:normal'>Results <strong>".number_format($info['first_result']).'-'.number_format($last_result).'</strong> of '.number_format($info['total_results'])." for <strong>"._htmlentities($searchdescription)."</strong></h3>\n";
 
 } elseif ($info['total_results'] == 0) {
     echo '<h3 style="font-weight:normal">Your search for <strong>', _htmlentities($searchdescription), '</strong> did not match anything.</h3>';
@@ -54,7 +54,7 @@ 
     $u = new \MySociety\TheyWorkForYou\Url('search');
     $u->reset();
     $u->insert(array('s' => $info['spelling_correction']));
-    echo '<p><big>Did you mean: <a href="' . $u->generate(), '">', $info['spelling_correction'] . '</a>?</big></p>';
+    echo '<p><big>Did you mean: <a href="'.$u->generate(), '">', $info['spelling_correction'].'</a>?</big></p>';
 }
 
 if ($match = get_http_var('match')) {
@@ -66,35 +66,35 @@ 
 if (isset ($data['rows']) && count($data['rows']) > 0) {
 
     echo '<dl id="searchresults">';
-    for ($i=0; $i<count($data['rows']); $i++) {
+    for ($i = 0; $i < count($data['rows']); $i++) {
 
         $row = $data['rows'][$i];
         echo '<dt><a href="', $row['listurl'], '">';
         if (isset($row['parent']) && count($row['parent']) > 0) {
-            echo ('<strong>' . $row['parent']['body'] . '</strong>');
+            echo ('<strong>'.$row['parent']['body'].'</strong>');
         }
-        echo '</a> <small>(' . format_date($row['hdate'], LONGDATEFORMAT) . ')';
+        echo '</a> <small>('.format_date($row['hdate'], LONGDATEFORMAT).')';
         if (isset($row['video_status']) && ($row['video_status'] == 5 || $row['video_status'] == 7)) {
             echo ' <em>has video</em> ';
         }
         if (isset($row['collapsed']) && $row['collapsed'] && $row['subsection_id']) {
             $URL = new \MySociety\TheyWorkForYou\Url('search');
-            $URL->insert(array('s' => $info['s'] . " segment:$row[subsection_id]" ));
+            $URL->insert(array('s' => $info['s']." segment:$row[subsection_id]"));
             echo ' <a href="', $URL->generate(), '">See ', $row['collapsed'],
-            ' other result', $row['collapsed']>1?'s':'', ' from this ',
+            ' other result', $row['collapsed'] > 1 ? 's' : '', ' from this ',
             $hansardmajors[$row['major']]['singular'], '</a>';
         }
         echo '</small>';
         if ($match = get_http_var('match')) {
-            echo ' &ndash; <a href="/search/record.php?result=', $row['gid'] , '&amp;match=', _htmlspecialchars($match), '">This is the correct match</a>';
+            echo ' &ndash; <a href="/search/record.php?result=', $row['gid'], '&amp;match=', _htmlspecialchars($match), '">This is the correct match</a>';
         }
         echo '</dt> <dd><p>';
         if (isset($row['speaker']) && count($row['speaker'])) {
-            echo "<em>" . ucfirst($row['speaker']['name']) . "</em>";
+            echo "<em>".ucfirst($row['speaker']['name'])."</em>";
             if ($row['extract']) echo ": ";
         }
 
-        echo $row['extract'] . "</p></dd>\n";
+        echo $row['extract']."</p></dd>\n";
 
     }
 

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

Spacing +4 added lines, -4 removed lines

@@ -14,7 +14,7 @@ 
 if (isset($data['comments']) && count($data['comments']) > 0) {
     $title = 'Most recent annotations';
     if (isset($data['full_name'])) {
-        $title .= ' on things by ' . $data['full_name'];
+        $title .= ' on things by '.$data['full_name'];
     }
     $PAGE->block_start(array('id'=>'recentcomments', 'title'=>$title));
 
@@ -33,11 +33,11 @@ 
         $date = format_date($date, SHORTDATEFORMAT);
         $time = format_time($time, TIMEFORMAT);
 
-        $count = $n+1;
+        $count = $n + 1;
 
         $USERURL->insert(array('u'=>$comment['user_id']));
 
-        ?><a name="c<?php echo $count; ?>"></a><strong><?php echo _htmlentities($comment['firstname'] . ' ' . $comment['lastname']); ?>:</strong> <?php echo $commenttext; ?> <small>(<?php echo relative_time($comment['posted']); ?>)</small><br><a href="<?php echo $comment['url']; ?>">Read annotation</a> | <a href="<?php echo $USERURL->generate(); ?>" title="See more information about this user">All by this user</a> </li>
+        ?><a name="c<?php echo $count; ?>"></a><strong><?php echo _htmlentities($comment['firstname'].' '.$comment['lastname']); ?>:</strong> <?php echo $commenttext; ?> <small>(<?php echo relative_time($comment['posted']); ?>)</small><br><a href="<?php echo $comment['url']; ?>">Read annotation</a> | <a href="<?php echo $USERURL->generate(); ?>" title="See more information about this user">All by this user</a> </li>
 <?php
     }
     ?>
@@ -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);

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