mysociety / theyworkforyou

www/includes/easyparliament/searchengine.php

Spacing +36 added lines, -36 removed lines

@@ -46,7 +46,7 @@ 
             if (strstr(XAPIANDB, ":")) {
                 //ini_set('display_errors', 'On');
                 list ($xapian_host, $xapian_port) = explode(":", XAPIANDB);
-                twfy_debug("SEARCH", "Using Xapian remote backend: " . $xapian_host . " port " . $xapian_port);
+                twfy_debug("SEARCH", "Using Xapian remote backend: ".$xapian_host." port ".$xapian_port);
                 $xapiandb_remote = remote_open($xapian_host, intval($xapian_port));
                 $xapiandb = new XapianDatabase($xapiandb_remote);
             } else {
@@ -92,12 +92,12 @@ 
         $this->prefixed = array();
 
         // Split words up into individual words, and quoted phrases
-        preg_match_all('/(' .
-            '"|' . # match either a quote, or...
-            '(?:(?<![' .$this->wordchars. '])-)?' . # optionally a - (exclude)
+        preg_match_all('/('.
+            '"|'.# match either a quote, or...
+            '(?:(?<!['.$this->wordchars.'])-)?'.# optionally a - (exclude)
             # if at start of word (i.e. not preceded by a word character, in
             # which case it is probably a hyphenated-word)
-            '['.$this->wordchars.']+' . # followed by a string of word-characters
+            '['.$this->wordchars.']+'.# followed by a string of word-characters
             ')/', $this->query, $all_words);
         if ($all_words) {
             $all_words = $all_words[0];
@@ -122,8 +122,8 @@ 
             if (strpos($word, ':') !== false) {
                 $items = explode(":", strtolower($word));
                 $type = $items[0];
-                if (substr($type, 0, 1)=='-') $type = substr($type, 1);
-                $value = strtolower(join(":", array_slice($items,1)));
+                if (substr($type, 0, 1) == '-') $type = substr($type, 1);
+                $value = strtolower(join(":", array_slice($items, 1)));
                 if ($type == 'section') {
                     $newv = $value;
                     if ($value == 'debates' || $value == 'debate') $newv = 1;
@@ -135,11 +135,11 @@ 
                     elseif ($value == 'pbc' || $value == 'standing') $newv = 6;
                     elseif ($value == 'sp') $newv = 7;
                     elseif ($value == 'spwrans' || $value == 'spwran') $newv = 8;
-                    elseif ($value == 'uk') $newv = array(1,2,3,4,6,101);
-                    elseif ($value == 'scotland') $newv = array(7,8);
+                    elseif ($value == 'uk') $newv = array(1, 2, 3, 4, 6, 101);
+                    elseif ($value == 'scotland') $newv = array(7, 8);
                     elseif ($value == 'future') $newv = 'F';
                     if (is_array($newv)) {
-                        $newv = 'major:' . join(' major:', $newv);
+                        $newv = 'major:'.join(' major:', $newv);
                     } else {
                         $newv = "major:$newv";
                     }
@@ -179,15 +179,15 @@ 
         # Merged people
         $db = new ParlDB;
         $merged = $db->query('SELECT * FROM gidredirect WHERE gid_from LIKE :gid_from', array(':gid_from' => "uk.org.publicwhip/person/%"));
-        for ($n=0; $n<$merged->rows(); $n++) {
+        for ($n = 0; $n < $merged->rows(); $n++) {
             $from_id = str_replace('uk.org.publicwhip/person/', '', $merged->field($n, 'gid_from'));
             $to_id = str_replace('uk.org.publicwhip/person/', '', $merged->field($n, 'gid_to'));
             $this->query = preg_replace("#speaker:($from_id|$to_id)#i", "(speaker:$from_id OR speaker:$to_id)", $this->query);
         }
 
-        twfy_debug("SEARCH", "prefixed: " . var_export($this->prefixed, true));
+        twfy_debug("SEARCH", "prefixed: ".var_export($this->prefixed, true));
 
-        twfy_debug("SEARCH", "query -- ". $this->query);
+        twfy_debug("SEARCH", "query -- ".$this->query);
         $flags = XapianQueryParser::FLAG_BOOLEAN | XapianQueryParser::FLAG_LOVEHATE |
             XapianQueryParser::FLAG_WILDCARD | XapianQueryParser::FLAG_SPELLING_CORRECTION;
         $flags = $flags | XapianQueryParser::FLAG_PHRASE;
@@ -205,7 +205,7 @@ 
         # Now parse the parsed query back into a query string, yummy
 
         $qd = $query->get_description();
-        twfy_debug("SEARCH", "queryparser original description -- " . $qd);
+        twfy_debug("SEARCH", "queryparser original description -- ".$qd);
         $qd = substr($qd, 14, -1); # Strip Xapian::Query()
         $qd = preg_replace('#:\(.*?\)#', '', $qd); # Don't need pos or weight
         # Date range
@@ -256,11 +256,11 @@ 
                 $iter->next();
             }
             $used[] = $tt;
-            $qd = preg_replace('#' . preg_quote($mm, '#') . '#', $tt, $qd, 1);
+            $qd = preg_replace('#'.preg_quote($mm, '#').'#', $tt, $qd, 1);
         }
 
         # Speakers
-        for ($n=0; $n<$merged->rows(); $n++) {
+        for ($n = 0; $n < $merged->rows(); $n++) {
             $from_id = str_replace('uk.org.publicwhip/person/', '', $merged->field($n, 'gid_from'));
             $to_id = str_replace('uk.org.publicwhip/person/', '', $merged->field($n, 'gid_to'));
             $qd = str_replace("(S$from_id OR S$to_id)", "S$to_id", $qd);
@@ -278,7 +278,7 @@ 
         $qd = preg_replace('#AND_NOT ([a-z0-9"]+)#', '-$1', $qd);
         preg_match_all('#AND_NOT \((.*?)\)#', $qd, $m);
         foreach ($m[1] as $mm) {
-            $mmn = '-' . join(' -', explode(' OR ', $mm));
+            $mmn = '-'.join(' -', explode(' OR ', $mm));
             $qd = str_replace("AND_NOT ($mm)", $mmn, $qd);
         }
 
@@ -297,9 +297,9 @@ 
         $this->query_desc = trim($qd);
 
         #print 'DEBUG: ' . $query->get_description();
-        twfy_debug("SEARCH", "words: " . var_export($this->words, true));
-        twfy_debug("SEARCH", "phrases: " . var_export($this->phrases, true));
-        twfy_debug("SEARCH", "queryparser description -- " . $this->query_desc);
+        twfy_debug("SEARCH", "words: ".var_export($this->words, true));
+        twfy_debug("SEARCH", "phrases: ".var_export($this->phrases, true));
+        twfy_debug("SEARCH", "queryparser description -- ".$this->query_desc);
 
         $this->valid = true;
     }
@@ -339,7 +339,7 @@ 
     }
 
     // Perform partial query to get a count of number of matches
-    public function run_count($first_result, $results_per_page, $sort_order='relevance') {
+    public function run_count($first_result, $results_per_page, $sort_order = 'relevance') {
         if (!defined('XAPIANDB') || !XAPIANDB)
             return null;
 
@@ -412,13 +412,13 @@ 
         #}
 
         $duration = getmicrotime() - $start;
-        twfy_debug ("SEARCH", "Search count took $duration seconds.");
+        twfy_debug("SEARCH", "Search count took $duration seconds.");
 
         return $count;
     }
 
     // Perform the full search...
-    public function run_search($first_result, $results_per_page, $sort_order='relevance') {
+    public function run_search($first_result, $results_per_page, $sort_order = 'relevance') {
         $start = getmicrotime();
 
         #$matches = $this->enquire->get_mset($first_result, $results_per_page);
@@ -445,7 +445,7 @@ 
             $iter->next();
         }
         $duration = getmicrotime() - $start;
-        twfy_debug ("SEARCH", "Run search took $duration seconds.");
+        twfy_debug("SEARCH", "Run search took $duration seconds.");
     }
     // ... use these to get the results
     public function get_gids() {
@@ -510,7 +510,7 @@ 
             if ($hl) {
                 $hlextract .= "<span class=\"hi\">$extractword</span>$endswithamp";
             } else {
-                $hlextract .= $extractword . $endswithamp;
+                $hlextract .= $extractword.$endswithamp;
             }
         }
         $body = preg_replace("#</span>\s+<span class=\"hi\">#", " ", $hlextract);
@@ -547,17 +547,17 @@ 
 
     // Find the position of the first of the search words/phrases in $body.
     public function position_of_first_word($body) {
-        $lcbody = ' ' . html_entity_decode(strtolower($body)) . ' '; // spaces to make regexp mapping easier
+        $lcbody = ' '.html_entity_decode(strtolower($body)).' '; // spaces to make regexp mapping easier
         $pos = -1;
 
         // look for phrases
         foreach ($this->phrases as $phrase) {
             $phrasematch = join($phrase, '[^'.$this->wordchars.']+');
-            if (preg_match('/([^'.$this->wordchars.']' . $phrasematch . '[^A-Za-z0-9])/', $lcbody, $matches))
+            if (preg_match('/([^'.$this->wordchars.']'.$phrasematch.'[^A-Za-z0-9])/', $lcbody, $matches))
             {
-                $wordpos = strpos( $lcbody, $matches[0] );
+                $wordpos = strpos($lcbody, $matches[0]);
                 if ($wordpos) {
-                   if ( ($wordpos < $pos) || ($pos==-1) ) {
+                   if (($wordpos < $pos) || ($pos == -1)) {
                         $pos = $wordpos;
                     }
                 }
@@ -575,7 +575,7 @@ 
             foreach ($stemmed_words as $word) {
                 if ($word == '') continue;
                 $matchword = $this->stem($extractword);
-                if ($matchword == $word && ($wordpos < $pos || $pos==-1)) {
+                if ($matchword == $word && ($wordpos < $pos || $pos == -1)) {
                     $pos = $wordpos;
                 }
             }
@@ -585,10 +585,10 @@ 
 
         foreach ($this->words as $word) {
             if (ctype_digit($word)) $word = '(?:'.$word.'|'.number_format($word).')';
-            if (preg_match('/([^'.$this->wordchars.']' . $word . '[^'.$this->wordchars. '])/', $lcbody, $matches)) {
-                $wordpos = strpos( $lcbody, $matches[0] );
+            if (preg_match('/([^'.$this->wordchars.']'.$word.'[^'.$this->wordchars.'])/', $lcbody, $matches)) {
+                $wordpos = strpos($lcbody, $matches[0]);
                 if ($wordpos) {
-                    if ( ($wordpos < $pos) || ($pos==-1) ) {
+                    if (($wordpos < $pos) || ($pos == -1)) {
                         $pos = $wordpos;
                     }
                 }
@@ -599,10 +599,10 @@ 
 
         foreach ($this->words as $word) {
             if (ctype_digit($word)) $word = '(?:'.$word.'|'.number_format($word).')';
-            if (preg_match('/(' . $word . ')/', $lcbody, $matches)) {
-                $wordpos = strpos( $lcbody, $matches[0] );
+            if (preg_match('/('.$word.')/', $lcbody, $matches)) {
+                $wordpos = strpos($lcbody, $matches[0]);
                 if ($wordpos) {
-                    if ( ($wordpos < $pos) || ($pos==-1) ) {
+                    if (($wordpos < $pos) || ($pos == -1)) {
                         $pos = $wordpos;
                     }
                 }

classes/Utility/LibFilter.php

Spacing +8 added lines, -8 removed lines

@@ -155,7 +155,7 @@ 
     public function escape_comments($data) {
 
         $data = preg_replace_callback("/<!--(.*?)-->/s", function($matches) {
-                return '<!--' . HtmlSpecialChars($this->StripSingle($matches[1])) . '-->';
+                return '<!--'.HtmlSpecialChars($this->StripSingle($matches[1])).'-->';
             }, $data);
 
         return $data;
@@ -209,7 +209,7 @@ 
             }, $data);
 
         foreach (array_keys($this->tag_counts) as $tag) {
-            for ($i=0; $i<$this->tag_counts[$tag]; $i++) {
+            for ($i = 0; $i < $this->tag_counts[$tag]; $i++) {
                 $data .= "</$tag>";
             }
         }
@@ -244,9 +244,9 @@ 
             $ending = $matches[3];
             if (in_array($name, array_keys($this->allowed))) {
                 $params = "";
-                preg_match_all("/([a-z0-9]+)=([\"'])(.*?)\\2/si", $body, $matches_2, PREG_SET_ORDER);		# <foo a="b" />
-                preg_match_all("/([a-z0-9]+)(=)([^\"\s']+)/si", $body, $matches_1, PREG_SET_ORDER);		# <foo a=b />
-                preg_match_all("/([a-z0-9]+)=([\"'])([^\"']*?)\s*$/si", $body, $matches_3, PREG_SET_ORDER);	# <foo a="b />
+                preg_match_all("/([a-z0-9]+)=([\"'])(.*?)\\2/si", $body, $matches_2, PREG_SET_ORDER); # <foo a="b" />
+                preg_match_all("/([a-z0-9]+)(=)([^\"\s']+)/si", $body, $matches_1, PREG_SET_ORDER); # <foo a=b />
+                preg_match_all("/([a-z0-9]+)=([\"'])([^\"']*?)\s*$/si", $body, $matches_3, PREG_SET_ORDER); # <foo a="b />
                 $matches = array_merge($matches_1, $matches_2, $matches_3);
 
                 foreach ($matches as $match) {
@@ -302,7 +302,7 @@ 
 
         if (preg_match("/^([^:]+)\:/si", $data, $matches)) {
             if (!in_array($matches[1], $this->allowed_protocols)) {
-                $data = '#'.substr($data, strlen($matches[1])+1);
+                $data = '#'.substr($data, strlen($matches[1]) + 1);
             }
         }
 
@@ -352,7 +352,7 @@ 
         # if there are less than 5, just allow it as-is
         #
 
-        if (strlen($data_notags)<5) {
+        if (strlen($data_notags) < 5) {
             return $data;
         }
 
@@ -562,7 +562,7 @@ 
     # inside strings. within general text, we decode hex/dec entities.
     #
 
-    public function decode_entities($data, $in_attribute=1) {
+    public function decode_entities($data, $in_attribute = 1) {
 
         $data = preg_replace_callback('!(&)#(\d+);?!', array($this, 'decode_dec_entity'), $data);
         $data = preg_replace_callback('!(&)#x([0-9a-f]+);?!i', array($this, 'decode_hex_entity'), $data);

classes/Data.php

Spacing +9 added lines, -9 removed lines

@@ -54,7 +54,7 @@ 
 
     public function __construct() {
 
-        include_once METADATAPATH;	// defined in config.php
+        include_once METADATAPATH; // defined in config.php
 
     }
 
@@ -114,7 +114,7 @@ 
      */
 
     public function set_page_metadata($page, $key, $value) {
-        $this->setMetadata(array("page"=>$page,"key"=>$key,"value"=>$value));
+        $this->setMetadata(array("page"=>$page, "key"=>$key, "value"=>$value));
     }
 
     /**
@@ -126,7 +126,7 @@ 
      */
 
     public function set_section_metadata($section, $key, $value) {
-        $this->setMetadata(array("section"=>$section,"key"=>$key,"value"=>$value));
+        $this->setMetadata(array("section"=>$section, "key"=>$key, "value"=>$value));
     }
 
     /**
@@ -150,7 +150,7 @@ 
      */
 
     public function test_for_metadata($type, $item, $key) {
-        $dataarray =& $this->$type;
+        $dataarray = & $this->$type;
 
         if (isset($dataarray[$item][$key])) {
             return true;
@@ -159,7 +159,7 @@ 
         }
     }
 
-    private function getMetadata($args="", $type) {
+    private function getMetadata($args = "", $type) {
         // $type is either 'page' or 'section'
         global $this_page, $this_section;
 
@@ -173,7 +173,7 @@ 
         }
 
         twfy_debug("DATA", "$type: $item, $key");
-        $dataarray =& $this->$type;
+        $dataarray = & $this->$type;
 
         if ($this->test_for_metadata($type, $item, $key)) {
             $return = $dataarray[$item][$key];
@@ -188,7 +188,7 @@ 
             $debugtext = "No metadata found for key '$key'";
         }
 
-        twfy_debug("DATA", "$debugtext, returning '" . (is_scalar($return) ? $return : gettype($return)) . "'.");
+        twfy_debug("DATA", "$debugtext, returning '".(is_scalar($return) ? $return : gettype($return))."'.");
 
         return $return;
     }
@@ -206,9 +206,9 @@ 
         $key = $args["key"];
         $value = $args["value"];
 
-        twfy_debug("DATA", "Setting: ".$type."[".$item."][".$key."] = '" . print_r($value, 1) . "'");
+        twfy_debug("DATA", "Setting: ".$type."[".$item."][".$key."] = '".print_r($value, 1)."'");
 
-        $dataarray =& $this->$type;
+        $dataarray = & $this->$type;
         $dataarray[$item][$key] = $value;
     }
 

classes/Db/Query.php

Spacing +8 added lines, -8 removed lines

@@ -87,7 +87,7 @@ 
         $this->conn = $conn;
     }
 
-    public function query($sql="", $params = NULL) {
+    public function query($sql = "", $params = NULL) {
 
         if (empty($sql)) {
             $this->success = false;
@@ -101,8 +101,8 @@ 
             return;
         }
 
-        twfy_debug ("SQL", $sql);
-        twfy_debug ("SQL", print_r($params, 1));
+        twfy_debug("SQL", $sql);
+        twfy_debug("SQL", print_r($params, 1));
 
         if ($params !== NULL) {
             // Prepare and execute a statement
@@ -128,12 +128,12 @@ 
 
         // Test the query actually worked
         if (!$pdoStatement) {
-            $this->error($this->conn->errorCode() . ': ' . $this->conn->errorInfo()[2]);
+            $this->error($this->conn->errorCode().': '.$this->conn->errorInfo()[2]);
         }
 
         if (!$this->success) return;
 
-        if ( (!$pdoStatement) or (empty($pdoStatement)) ) {
+        if ((!$pdoStatement) or (empty($pdoStatement))) {
             // A failed query.
             $this->success = false;
 
@@ -155,7 +155,7 @@ 
             }
             $this->affected_rows = $pdoStatement->rowCount();
 
-            twfy_debug ("SQLRESULT", array($this, 'displayResult'));
+            twfy_debug("SQLRESULT", array($this, 'displayResult'));
             // mysql_free_result($q);
         }
     }
@@ -202,7 +202,7 @@ 
             $html .= "<table border=\"1\">\n<tr>\n";
 
             foreach (array_keys($this->data[0]) as $fieldname) {
-                $html .= "<th>" . _htmlentities($fieldname) . "</th>";
+                $html .= "<th>"._htmlentities($fieldname)."</th>";
             }
             $html .= "</tr>\n";
 
@@ -213,7 +213,7 @@ 
                         // Don't want to risk this data being displayed on any page.
                         $html .= "<td>**MASKED**</td>";
                     } else {
-                        $html .= "<td>" . _htmlentities($field) . "</td>";
+                        $html .= "<td>"._htmlentities($field)."</td>";
                     }
                 }
                 $html .= "</tr>\n";

www/includes/easyparliament/init.php

Spacing +19 added lines, -19 removed lines

@@ -4,7 +4,7 @@ 
 First some things to help make our PHP nicer and betterer
 ********************************************************************************/
 
-error_reporting (E_ALL);
+error_reporting(E_ALL);
 
 /********************************************************************************
 Now some constants that are the same for live and dev versions
@@ -12,36 +12,36 @@ 
 ********************************************************************************/
 
 // In case we need to switch these off globally at some point...
-define ("ALLOWCOMMENTS", true);
-define ("ALLOWTRACKBACKS", true);
+define("ALLOWCOMMENTS", true);
+define("ALLOWTRACKBACKS", true);
 
 // These variables are so we can keep date/time formats consistent across the site
 // and change them easily.
 // Formats here: http://www.php.net/manual/en/function.date.php
-define ("LONGERDATEFORMAT",		"l, j F Y");// Monday, 31 December 2003
-define ("LONGDATEFORMAT", 		"j F Y"); 	// 31 December 2003
-define ("SHORTDATEFORMAT", 		"j M Y");	// 31 Dec 2003
-define ("TIMEFORMAT", 			"g:i a");	// 11:59 pm
+define("LONGERDATEFORMAT", "l, j F Y"); // Monday, 31 December 2003
+define("LONGDATEFORMAT", "j F Y"); // 31 December 2003
+define("SHORTDATEFORMAT", "j M Y"); // 31 Dec 2003
+define("TIMEFORMAT", "g:i a"); // 11:59 pm
 
-define ("SHORTDATEFORMAT_SQL",	"%e %b %Y"); // 31 Dec 2003
-define ("TIMEFORMAT_SQL", 		"%l:%i %p"); // 11:59 PM
+define("SHORTDATEFORMAT_SQL", "%e %b %Y"); // 31 Dec 2003
+define("TIMEFORMAT_SQL", "%l:%i %p"); // 11:59 PM
 
 // Where we store the postcode of users if they search for an MP by postcode.
-define ('POSTCODE_COOKIE', 		'eppc');
+define('POSTCODE_COOKIE', 'eppc');
 
 /********************************************************************************
 And now all the files we'll include on every page.
 ********************************************************************************/
 
 // The Composer autoloader, which also handles our internal autoloading magic.
-require_once dirname(__FILE__) . '/../../../vendor/autoload.php';
+require_once dirname(__FILE__).'/../../../vendor/autoload.php';
 
-include_once dirname(__FILE__) . '/../../../conf/general';
-include_once INCLUDESPATH . 'utility.php';
+include_once dirname(__FILE__).'/../../../conf/general';
+include_once INCLUDESPATH.'utility.php';
 twfy_debug_timestamp("after including utility.php");
 
 // Set the default timezone
-if(function_exists('date_default_timezone_set')) date_default_timezone_set(TIMEZONE);
+if (function_exists('date_default_timezone_set')) date_default_timezone_set(TIMEZONE);
 
 // Only do clever things with errors if we're not testing, otherwise show as default
 
@@ -70,18 +70,18 @@ 
 
 // The time the page starts, so we can display the total at the end.
 // getmicrotime() is in utiltity.php.
-define ("STARTTIME", getmicrotime());
+define("STARTTIME", getmicrotime());
 if (!isset($_SERVER['WINDIR'])) {
     $rusage = getrusage();
-    define ('STARTTIMES', $rusage['ru_stime.tv_sec']*1000000 + $rusage['ru_stime.tv_usec']);
-    define ('STARTTIMEU', $rusage['ru_utime.tv_sec']*1000000 + $rusage['ru_utime.tv_usec']);
+    define('STARTTIMES', $rusage['ru_stime.tv_sec'] * 1000000 + $rusage['ru_stime.tv_usec']);
+    define('STARTTIMEU', $rusage['ru_utime.tv_sec'] * 1000000 + $rusage['ru_utime.tv_usec']);
 }
 
 $DATA = new \MySociety\TheyWorkForYou\Data;
 
 class ParlDB extends \MySociety\TheyWorkForYou\Db\Connection {
     public function __construct() {
-        $this->init (OPTION_TWFY_DB_HOST, OPTION_TWFY_DB_USER, OPTION_TWFY_DB_PASS, OPTION_TWFY_DB_NAME);
+        $this->init(OPTION_TWFY_DB_HOST, OPTION_TWFY_DB_USER, OPTION_TWFY_DB_PASS, OPTION_TWFY_DB_NAME);
     }
 }
 
@@ -92,7 +92,7 @@ 
 include_once (INCLUDESPATH."easyparliament/user.php");
 
 // Test to see if this is a new-style template using the renderer class.
-if (! isset($new_style_template) OR $new_style_template !== TRUE) {
+if (!isset($new_style_template) OR $new_style_template !== TRUE) {
 
     // This is an old-style page. Use the old page classes.
     include_once (INCLUDESPATH."easyparliament/page.php");

classes/Db/Connection.php

Spacing +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
         // These vars come from config.php.
 
         if (!$global_connection) {
-            $dsn = 'mysql:charset=utf8;dbname=' . $db_name . ';host=' . $db_host;
+            $dsn = 'mysql:charset=utf8;dbname='.$db_name.';host='.$db_host;
 
             try {
                 $conn = new \PDO($dsn, $db_user, $db_pass);
@@ -111,7 +111,7 @@ 
         $duration = getmicrotime() - $start;
         global $mysqltotalduration;
         $mysqltotalduration += $duration;
-        twfy_debug ("SQL", "Complete after $duration seconds.");
+        twfy_debug("SQL", "Complete after $duration seconds.");
         // We could also output $q->mysql_info() here, but that's for
         // PHP >= 4.3.0.
         return $q;
@@ -126,7 +126,7 @@ 
 
     public function display_total_duration() {
         global $mysqltotalduration;
-        twfy_debug ("TIME", "Total time for MySQL queries on this page: " . $mysqltotalduration . " seconds.");
+        twfy_debug("TIME", "Total time for MySQL queries on this page: ".$mysqltotalduration." seconds.");
     }
 
     /**

www/includes/easyparliament/page.php

Spacing +74 added lines, -74 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-include_once INCLUDESPATH . '../../commonlib/phplib/gaze.php';
-include_once INCLUDESPATH . 'easyparliament/member.php';
+include_once INCLUDESPATH.'../../commonlib/phplib/gaze.php';
+include_once INCLUDESPATH.'easyparliament/member.php';
 
 class PAGE {
 
@@ -19,7 +19,7 @@ 
     public $within_stripe_sidebar = false;
 
     public function page_start() {
-        if ( !$this->page_started() ) {
+        if (!$this->page_started()) {
             $this->checkForAdmin();
             $this->displayHeader();
         }
@@ -32,12 +32,12 @@ 
 
         $data = $h->data;
         $data = array_merge($u->data, $data);
-        if ( isset($page_errors) ) {
+        if (isset($page_errors)) {
             $data['page_errors'] = $page_errors;
         }
         $data['banner_text'] = '';
         extract($data);
-        require_once INCLUDESPATH . 'easyparliament/templates/html/header.php';
+        require_once INCLUDESPATH.'easyparliament/templates/html/header.php';
 
         echo '<div class="full-page legacy-page static-page"> <div class="full-page__row"> <div class="panel">';
 
@@ -52,9 +52,9 @@ 
                 $THISPAGE = new \MySociety\TheyWorkForYou\Url($this_page);
 
                 $LOGINURL = new \MySociety\TheyWorkForYou\Url('userlogin');
-                $LOGINURL->insert(array('ret' => $THISPAGE->generate('none') ));
+                $LOGINURL->insert(array('ret' => $THISPAGE->generate('none')));
 
-                $text = "<a href=\"" . $LOGINURL->generate() . "\">You'd better sign in!</a>";
+                $text = "<a href=\"".$LOGINURL->generate()."\">You'd better sign in!</a>";
             } else {
                 $text = "That's all folks!";
             }
@@ -67,14 +67,14 @@ 
     }
 
     public function page_end() {
-        if ( !$this->page_started() ) {
+        if (!$this->page_started()) {
             $this->page_start();
         }
 
         echo '</div></div></div>';
         $footer = new MySociety\TheyWorkForYou\Renderer\Footer();
         $footer_links = $footer->data;
-        require_once INCLUDESPATH . 'easyparliament/templates/html/footer.php';
+        require_once INCLUDESPATH.'easyparliament/templates/html/footer.php';
     }
 
     public function page_started() {
@@ -101,7 +101,7 @@ 
         }
     }
 
-    public function stripe_start($type='side', $id='', $extra_class = '') {
+    public function stripe_start($type = 'side', $id = '', $extra_class = '') {
         // $type is one of:
         //  'full' - a full width div
         //  'side' - a white stripe with a coloured sidebar.
@@ -114,9 +114,9 @@ 
         //  'foot' - For the bottom stripe on hansard debates/wrans listings.
         // $id is the value of an id for this div (if blank, not used).
         ?>
-        <div class="stripe-<?php echo $type; ?><?php if ($extra_class != '') echo ' ' . $extra_class; ?>"<?php
+        <div class="stripe-<?php echo $type; ?><?php if ($extra_class != '') echo ' '.$extra_class; ?>"<?php
         if ($id != '') {
-            print ' id="' . $id . '"';
+            print ' id="'.$id.'"';
         }
         ?>>
             <div class="main">
@@ -131,7 +131,7 @@ 
     }
 
 
-    public function stripe_end ($contents = array(), $extra = '') {
+    public function stripe_end($contents = array(), $extra = '') {
         // $contents is an array containing 0 or more hashes.
         // Each hash has two values, 'type' and 'content'.
         // 'Type' could be one of these:
@@ -242,7 +242,7 @@ 
     }
 
 
-    public function block_start($data=array()) {
+    public function block_start($data = array()) {
         // Starts a 'block' div, used mostly on the home page,
         // on the MP page, and in the sidebars.
         // $data is a hash like this:
@@ -255,7 +255,7 @@ 
         $this->blockbody_open = false;
 
         if (isset($data['id']) && $data['id'] != '') {
-            $id = ' id="' . $data['id'] . '"';
+            $id = ' id="'.$data['id'].'"';
         } else {
             $id = '';
         }
@@ -263,7 +263,7 @@ 
         $title = isset($data['title']) ? $data['title'] : '';
 
         if (isset($data['url'])) {
-            $title = '<a href="' . $data['url'] . '">' . $title . '</a>';
+            $title = '<a href="'.$data['url'].'">'.$title.'</a>';
         }
         ?>
                 <div class="block"<?php echo $id; ?>>
@@ -389,7 +389,7 @@ 
         if (is_string($message)) {
             // Sometimes we're just sending a single line to this function
             // rather like the bigger array...
-            $message = array (
+            $message = array(
                 'text' => $message
             );
         }
@@ -397,13 +397,13 @@ 
         // if the page has started then we're most likely in an old school page
         // so we should just print out the error, otherwise stick it in the error
         // global which will then be displayed by the header template
-        if ( $this->page_started() ) {
+        if ($this->page_started()) {
             $this->message($message, 'error');
         } else {
-            if ( !isset($page_errors) ) {
+            if (!isset($page_errors)) {
                 $page_errors = array();
             }
-            $page_errors[]  = $message;
+            $page_errors[] = $message;
         }
 
         if ($fatal) {
@@ -420,7 +420,7 @@ 
     }
 
 
-    public function message($message, $class='') {
+    public function message($message, $class = '') {
         // Generates a very simple but common page content.
         // Used for when a user logs out, or votes, or any simple thing
         // where there's a little message and probably a link elsewhere.
@@ -434,7 +434,7 @@ 
         // $class is a class name that will be applied to the message's HTML elements.
 
         if ($class != '') {
-            $class = ' class="' . $class . '"';
+            $class = ' class="'.$class.'"';
         }
 
         $need_to_close_stripe = false;
@@ -468,7 +468,7 @@ 
     }
 
     public function informational($text) {
-        print '<div class="informational left">' . $text . '</div>';
+        print '<div class="informational left">'.$text.'</div>';
     }
 
     public function set_hansard_headings($info) {
@@ -498,7 +498,7 @@ 
             if ($page_title != '') {
                 $page_title .= ': ';
             }
-            $page_title .= format_date ($info['date'], SHORTDATEFORMAT);
+            $page_title .= format_date($info['date'], SHORTDATEFORMAT);
         }
 
         if ($page_title != '') {
@@ -537,15 +537,15 @@ 
             $prev = $nextprev['prev'];
 
             if (isset($prev['url'])) {
-                $prevlink = '<a href="' . $prev['url'] . '" title="' . $prev['title'] . '" class="linkbutton">&laquo; ' . $prev['body'] . '</a>';
+                $prevlink = '<a href="'.$prev['url'].'" title="'.$prev['title'].'" class="linkbutton">&laquo; '.$prev['body'].'</a>';
 
             } else {
-                $prevlink = '&laquo; ' . $prev['body'];
+                $prevlink = '&laquo; '.$prev['body'];
             }
         }
 
         if ($prevlink != '') {
-            $prevlink = '<span class="prev">' . $prevlink . '</span>';
+            $prevlink = '<span class="prev">'.$prevlink.'</span>';
         }
 
 
@@ -553,10 +553,10 @@ 
 
         if (isset($nextprev['up'])) {
 
-            $uplink = '<span class="up"><a href="' .  $nextprev['up']['url'] . '" title="' . $nextprev['up']['title'] . '">' . $nextprev['up']['body'] . '</a>';
+            $uplink = '<span class="up"><a href="'.$nextprev['up']['url'].'" title="'.$nextprev['up']['title'].'">'.$nextprev['up']['body'].'</a>';
             if (get_http_var('s')) {
                 $URL = new \MySociety\TheyWorkForYou\Url($this_page);
-                $uplink .= '<br><a href="' . $URL->generate() . '">Remove highlighting</a>';
+                $uplink .= '<br><a href="'.$URL->generate().'">Remove highlighting</a>';
             }
             $uplink .= '</span>';
         }
@@ -568,14 +568,14 @@ 
             $next = $nextprev['next'];
 
             if (isset($next['url'])) {
-                $nextlink = '<a href="' .  $next['url'] . '" title="' . $next['title'] . '" class="linkbutton">' . $next['body'] . ' &raquo;</a>';
+                $nextlink = '<a href="'.$next['url'].'" title="'.$next['title'].'" class="linkbutton">'.$next['body'].' &raquo;</a>';
             } else {
-                $nextlink = $next['body'] . ' &raquo;';
+                $nextlink = $next['body'].' &raquo;';
             }
         }
 
         if ($nextlink != '') {
-            $nextlink = '<span class="next">' . $nextlink . '</span>';
+            $nextlink = '<span class="next">'.$nextlink.'</span>';
         }
 
 
@@ -585,7 +585,7 @@ 
     }
 
 
-    public function search_form($value='') {
+    public function search_form($value = '') {
         global $SEARCHENGINE;
         // Search box on the search page.
         // If $value is set then it will be displayed in the form.
@@ -615,7 +615,7 @@ 
             }
 
         echo '<div class="mainsearchbox">';
-        if ($wtt<2) {
+        if ($wtt < 2) {
                 echo '<form action="', $URL->generate(), '" method="get">';
                 if (get_http_var('o')) {
                     echo '<input type="hidden" name="o" value="', _htmlentities(get_http_var('o')), '">';
@@ -624,10 +624,10 @@ 
                     echo '<input type="hidden" name="house" value="', _htmlentities(get_http_var('house')), '">';
                 }
                 echo '<input type="text" name="q" value="', _htmlentities($value), '" size="50"> ';
-                echo '<input type="submit" value=" ', ($wtt?'Modify search':'Search'), ' ">';
+                echo '<input type="submit" value=" ', ($wtt ? 'Modify search' : 'Search'), ' ">';
                 $URL = new \MySociety\TheyWorkForYou\Url('search');
             $URL->insert(array('adv' => 1));
-                echo '&nbsp;&nbsp; <a href="' . $URL->generate() . '">More&nbsp;options</a>';
+                echo '&nbsp;&nbsp; <a href="'.$URL->generate().'">More&nbsp;options</a>';
                 echo '<br>';
                 if ($wtt) print '<input type="hidden" name="wtt" value="1">';
         } else { ?>
@@ -646,24 +646,24 @@ 
                     $ordering = 'd';
                 }
 
-                if ($ordering=='r') {
+                if ($ordering == 'r') {
                 print '<strong>Sorted by relevance</strong>';
                 } else {
                 printf("<a href='%s'>Sort by relevance</a>", $orderUrl->generate('html', array('o'=>'r')));
                 }
 
                 print "&nbsp;|&nbsp;";
-                if ($ordering=='d') {
-                print '<strong>Sorted by date: newest</strong> / <a href="' . $orderUrl->generate('html', array('o'=>'o')) . '">oldest</a>';
-                } elseif ($ordering=='o') {
-                print '<strong>Sorted by date:</strong> <a href="' . $orderUrl->generate('html', array('o'=>'d')) . '">newest</a> / <strong>oldest</strong>';
+                if ($ordering == 'd') {
+                print '<strong>Sorted by date: newest</strong> / <a href="'.$orderUrl->generate('html', array('o'=>'o')).'">oldest</a>';
+                } elseif ($ordering == 'o') {
+                print '<strong>Sorted by date:</strong> <a href="'.$orderUrl->generate('html', array('o'=>'d')).'">newest</a> / <strong>oldest</strong>';
                 } else {
                 printf("Sort by date: <a href='%s'>newest</a> / <a href='%s'>oldest</a>",
                     $orderUrl->generate('html', array('o'=>'d')), $orderUrl->generate('html', array('o'=>'o')));
                 }
 
             print "&nbsp;|&nbsp;";
-            if ($ordering=='p') {
+            if ($ordering == 'p') {
                 print '<strong>Use by person</strong>';
             } else {
                 printf('<a href="%s">Show use by person</a>', $orderUrl->generate('html', array('o'=>'p')));
@@ -684,10 +684,10 @@ 
     }
 
     public function advanced_search_form() {
-        include_once INCLUDESPATH . 'easyparliament/templates/html/search_advanced.php';
+        include_once INCLUDESPATH.'easyparliament/templates/html/search_advanced.php';
     }
 
-    public function login_form ($errors = array()) {
+    public function login_form($errors = array()) {
         // Used for /user/login/ and /user/prompt/
         // $errors is a hash of potential errors from a previous log in attempt.
         ?>
@@ -791,7 +791,7 @@ 
     public function glossary_atoz(&$GLOSSARY) {
     // Print out a nice list of lettered links to glossary pages
 
-        $letters = array ();
+        $letters = array();
 
         foreach ($GLOSSARY->alphabet as $letter => $eps) {
             // if we're writing out the current letter (list or item)
@@ -802,11 +802,11 @@ 
                     $URL->insert(array('az' => $letter));
                     $letter_link = $URL->generate('url');
 
-                    $letters[] = "<li class=\"on\"><a href=\"" . $letter_link . "\">" . $letter . "</a></li>";
+                    $letters[] = "<li class=\"on\"><a href=\"".$letter_link."\">".$letter."</a></li>";
                 }
                 // otherwise in list view show no link
                 else {
-                    $letters[] = "<li class=\"on\">" . $letter . "</li>";
+                    $letters[] = "<li class=\"on\">".$letter."</li>";
                 }
             }
             elseif (!empty($GLOSSARY->alphabet[$letter])) {
@@ -814,24 +814,24 @@ 
                 $URL->insert(array('az' => $letter));
                 $letter_link = $URL->generate('url');
 
-                $letters[] = "<li><a href=\"" . $letter_link . "\">" . $letter . "</a></li>";
+                $letters[] = "<li><a href=\"".$letter_link."\">".$letter."</a></li>";
             }
             else {
-                $letters[] = '<li>' . $letter . '</li>';
+                $letters[] = '<li>'.$letter.'</li>';
             }
         }
         ?>
                     <div class="letters">
                         <ul>
     <?php
-        for ($n=0; $n<13; $n++) {
+        for ($n = 0; $n < 13; $n++) {
             print $letters[$n];
         }
         ?>
                         </ul>
                         <ul>
     <?php
-        for ($n=13; $n<26; $n++) {
+        for ($n = 13; $n < 26; $n++) {
             print $letters[$n];
         }
         ?>
@@ -851,7 +851,7 @@ 
         // add some extra controls for the administrators
         if ($this_page == "admin_glossary") {
             print "<a id=\"gl".$term['glossary_id']."\"></a>";
-            print "<h3>" . $term['title'] . "</h3>";
+            print "<h3>".$term['title']."</h3>";
             $URL = new \MySociety\TheyWorkForYou\Url('admin_glossary');
             $URL->insert(array("delete_confirm" => $term['glossary_id']));
             $delete_url = $URL->generate();
@@ -866,13 +866,13 @@ 
             $URL->insert(array('u' => $term['user_id']));
             $user_link = $URL->generate('url');
 
-            $user_details = "\t\t\t\t<p><small>contributed by user <a href=\"" . $user_link . "\">" . $term['firstname'] . " " . $term['lastname'] . "</a></small>" . $admin_links . "</p>\n";
+            $user_details = "\t\t\t\t<p><small>contributed by user <a href=\"".$user_link."\">".$term['firstname']." ".$term['lastname']."</a></small>".$admin_links."</p>\n";
         }
         else {
             $user_details = "";
         }
 
-        print "\t\t\t\t<p class=\"glossary-body\">" . $term['body'] . "</p>\n" . $user_details;
+        print "\t\t\t\t<p class=\"glossary-body\">".$term['body']."</p>\n".$user_details;
 
         if ($this_page == "glossary_item") {
             // Add a direct search link for current glossary item
@@ -880,7 +880,7 @@ 
             // remember to quote the term for phrase matching in search
             $URL->insert(array('s' => '"'.$term['title'].'"'));
             $search_url = $URL->generate();
-            printf ("\t\t\t\t<p>Search hansard for \"<a href=\"%s\" title=\"View search results for this glossary item\">%s</a>\"</p>", $search_url, $term['title']);
+            printf("\t\t\t\t<p>Search hansard for \"<a href=\"%s\" title=\"View search results for this glossary item\">%s</a>\"</p>", $search_url, $term['title']);
         }
     }
 
@@ -912,7 +912,7 @@ 
         $URL = new \MySociety\TheyWorkForYou\Url('glossary');
         $URL->remove(array("g"));
         $glossary_link = $URL->generate('url');
-        print "<small><a href=\"" . $glossary_link . "\">Browse the glossary</a></small>";
+        print "<small><a href=\"".$glossary_link."\">Browse the glossary</a></small>";
     }
 
     public function glossary_links() {
@@ -955,13 +955,13 @@ 
 
             // Generate all the page links.
             $URL = new \MySociety\TheyWorkForYou\Url($this_page);
-            $URL->insert( array('wtt' => get_http_var('wtt')) );
+            $URL->insert(array('wtt' => get_http_var('wtt')));
             if (isset($pagedata['s'])) {
                 # XXX: Should be taken out in *one* place, not here + search_form etc.
                 $value = $pagedata['s'];
                 if (preg_match_all('#speaker:(\d+)#', $value, $m) == 1) {
                     $person_id = $m[1][0];
-                    $value = str_replace('speaker:' . $person_id, '', $value);
+                    $value = str_replace('speaker:'.$person_id, '', $value);
                     $URL->insert(array('pid' => $person_id));
                     }
                 $URL->insert(array('s' => $value));
@@ -980,7 +980,7 @@ 
                 }
 
                 if ($n != $page) {
-                    $pagelinks[] = '<a href="' . $URL->generate() . '">' . $n . '</a>';
+                    $pagelinks[] = '<a href="'.$URL->generate().'">'.$n.'</a>';
                 } else {
                     $pagelinks[] = "<strong>$n</strong>";
                 }
@@ -1001,7 +1001,7 @@ 
 <?php
             }
 
-            echo "\t\t\t\t" . implode(' ', $pagelinks);
+            echo "\t\t\t\t".implode(' ', $pagelinks);
 
             if ($page != $numpages) {
                 $nextpage = $page + 1;
@@ -1027,7 +1027,7 @@ 
         if ($data['user_id'] > 0) {
             $USERURL = new \MySociety\TheyWorkForYou\Url('userview');
             $USERURL->insert(array('id'=>$data['user_id']));
-            $username = '<a href="' . $USERURL->generate() . '">' . _htmlentities($data['user_name']) . '</a>';
+            $username = '<a href="'.$USERURL->generate().'">'._htmlentities($data['user_name']).'</a>';
         } else {
             $username = _htmlentities($data['user_name']);
         }
@@ -1086,15 +1086,15 @@ 
                         'rid' => $report['report_id'],
                         'cid' => $report['comment_id'],
                     ));
-                    $editlink = '<a href="' . $EDITURL->generate() . '">View</a>';
+                    $editlink = '<a href="'.$EDITURL->generate().'">View</a>';
                 } else {
                     $editlink = 'Locked';
                 }
 
                 $body = trim_characters($report['body'], 0, 40);
 
-                $tabledata['rows'][] = array (
-                    _htmlentities($report['firstname'] . ' ' . $report['lastname']),
+                $tabledata['rows'][] = array(
+                    _htmlentities($report['firstname'].' '.$report['lastname']),
                     _htmlentities($body),
                     $report['reported'],
                     $editlink
@@ -1124,13 +1124,13 @@ 
         // $page is the name of the page the dates should link to.
 
         // Create array containing abbreviations of days of week.
-        $daysOfWeek = array('Mon','Tue','Wed','Thu','Fri','Sat','Sun');
+        $daysOfWeek = array('Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun');
 
         // What is the first day of the month in question?
-        $firstDayOfMonth = mktime(0,0,0,$month,1,$year);
+        $firstDayOfMonth = mktime(0, 0, 0, $month, 1, $year);
 
         // How many days does this month contain?
-        $numberDays = date('t',$firstDayOfMonth);
+        $numberDays = date('t', $firstDayOfMonth);
 
         // Retrieve some information about the first day of the
         // month in question.
@@ -1211,13 +1211,13 @@ 
 
             // Is the $currentDay a member of $dateArray? If so,
             // the day should be linked.
-            if (in_array($currentDay,$dateArray)) {
+            if (in_array($currentDay, $dateArray)) {
 
                 $date = sprintf("%04d-%02d-%02d", $year, $month, $currentDay);
 
                 $DAYURL->insert(array('d'=>$date));
 
-                $calendar .= "<a href=\"" . $DAYURL->generate() . "\">$currentDay</a></td>";
+                $calendar .= "<a href=\"".$DAYURL->generate()."\">$currentDay</a></td>";
 
                 // $currentDay is not a member of $dateArray.
 
@@ -1312,8 +1312,8 @@ 
         // Returns HTML suitable for putting in the sidebar on Admin pages.
         global $this_page, $DATA;
 
-        $pages = array ('admin_home',
-                'admin_comments','admin_trackbacks', 'admin_searchlogs', 'admin_popularsearches', 'admin_failedsearches',
+        $pages = array('admin_home',
+                'admin_comments', 'admin_trackbacks', 'admin_searchlogs', 'admin_popularsearches', 'admin_failedsearches',
                 'alert_stats', 'admin_statistics', 'admin_reportstats',
                 'admin_commentreports', 'admin_glossary', 'admin_glossary_pending', 'admin_badusers',
                 'admin_photos', 'admin_mpurls', 'admin_policies', 'admin_banner', 'admin_featured', 'admin_topics'
@@ -1326,9 +1326,9 @@ 
 
             if ($page != $this_page) {
                 $URL = new \MySociety\TheyWorkForYou\Url($page);
-                $title = '<a href="' . $URL->generate() . '">' . $title . '</a>';
+                $title = '<a href="'.$URL->generate().'">'.$title.'</a>';
             } else {
-                $title = '<strong>' . $title . '</strong>';
+                $title = '<strong>'.$title.'</strong>';
             }
 
             $links[] = $title;
@@ -1336,7 +1336,7 @@ 
 
         $html = "<ul>\n";
 
-        $html .= "<li>" . implode("</li>\n<li>", $links) . "</li>\n";
+        $html .= "<li>".implode("</li>\n<li>", $links)."</li>\n";
 
         $html .= "</ul>\n";
 

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