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

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

@@ -25,7 +25,7 @@ 
 
 */
 
-if (defined('XAPIANDB') AND XAPIANDB != '') {
+if (defined('XAPIANDB') and XAPIANDB != '') {
     if (file_exists('/usr/share/php/xapian.php')) {
         include_once '/usr/share/php/xapian.php';
     } else {
@@ -263,15 +263,15 @@ 
         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);
-            $qd = str_replace("S$from_id OR S$to_id", "S$to_id", $qd);
+            $qd = str_replace("(S$from_id OR S$to_id)", "s$to_id", $qd);
+            $qd = str_replace("s$from_id OR S$to_id", "s$to_id", $qd);
         }
 
         preg_match_all('#S(\d+)#', $qd, $m);
         foreach ($m[1] as $mm) {
             $member = new MEMBER(array('person_id' => $mm));
             $name = $member->full_name();
-            $qd = str_replace("S$mm", "speaker:$name", $qd);
+            $qd = str_replace("s$mm", "speaker:$name", $qd);
         }
 
         # Simplify display of excluded words

tests/HousesTest.php

Indentation +6 added lines, -6 removed lines

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

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

Braces +3 added lines, -1 removed lines

@@ -324,7 +324,9 @@
             while (1) {
                 $len = strlen($data);
                 $data = preg_replace("/<({$tags})(\s[^>]*)?(><\\/\\1>|\\/>)/", '', $data);
-                if ($len == strlen($data)) break;
+                if ($len == strlen($data)) {
+                    break;
+                }
             }
         }
 

classes/Data.php

Doc Comments +3 added lines

@@ -159,6 +159,9 @@
         }
     }
 
+    /**
+     * @param string $type
+     */
     private function getMetadata($args="", $type) {
         // $type is either 'page' or 'section'
         global $this_page, $this_section;

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

Doc Comments +12 added lines

@@ -175,6 +175,11 @@ 
     }
 
     // After SELECT.
+
+    /**
+     * @param integer $row_index
+     * @param string $column_name
+     */
     public function field($row_index, $column_name) {
         if ($this->rows > 0)
             return $this->data[$row_index][$column_name];
@@ -187,6 +192,10 @@ 
     }
 
     // After SELECT.
+
+    /**
+     * @param integer $row_index
+     */
     public function row($row_index) {
         if ($this->success && $this->rows > 0)
             return $this->data[$row_index];
@@ -224,6 +233,9 @@ 
         return $html;
     }
 
+    /**
+     * @param string $errormsg
+     */
     public function error($errormsg) {
         // When a query goes wrong...
         $this->success = false;

Indentation -1 removed lines

@@ -72,7 +72,6 @@
  * - `$this->field(n,col)` returns an empty string.
  * - `$this->insert_id()` returns `null`.
  * - `$this->affected_rows()` returns `null`.
-
  */
 
 class Query {

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

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

@@ -78,16 +78,16 @@ 
 class Query {
 
     public $success = true;
-    public $rows = NULL;
+    public $rows = null;
     public $data = array();
-    public $insert_id = NULL;
-    public $affected_rows = NULL;
+    public $insert_id = null;
+    public $affected_rows = null;
 
     public function __construct($conn) {
         $this->conn = $conn;
     }
 
-    public function query($sql="", $params = NULL) {
+    public function query($sql="", $params = null) {
 
         if (empty($sql)) {
             $this->success = false;
@@ -104,7 +104,7 @@ 
         twfy_debug ("SQL", $sql);
         twfy_debug ("SQL", print_r($params, 1));
 
-        if ($params !== NULL) {
+        if ($params !== null) {
             // Prepare and execute a statement
             $pdoStatement = $this->conn->prepare($sql);
 

www/docs/api/api_getPerson.php

Doc Comments +9 added lines

@@ -77,6 +77,9 @@ 
     }
 }
 
+/**
+ * @param MySociety\TheyWorkForYou\Db\Query $q
+ */
 function _api_getPerson_output($q, $flatten=false) {
     $output = array();
     $last_mod = 0;
@@ -95,10 +98,16 @@ 
     api_output($output, $last_mod);
 }
 
+/**
+ * @param integer $house
+ */
 function api_getPerson_constituency($constituency, $house) {
     _api_getPerson_constituency(array($constituency), $house);
 }
 
+/**
+ * @param integer $house
+ */
 function api_getPerson_postcode($pc, $house) {
     $pc = preg_replace('#[^a-z0-9 ]#i', '', $pc);
     $types = array();

Spacing +13 added lines, -13 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once INCLUDESPATH . 'easyparliament/member.php';
+include_once INCLUDESPATH.'easyparliament/member.php';
 
 function api_getPerson_front() {
 ?>
@@ -17,7 +17,7 @@ 
 <?php
 }
 
-function _api_getPerson_row($row, $has_party=FALSE) {
+function _api_getPerson_row($row, $has_party = FALSE) {
     global $parties;
     $row['full_name'] = member_full_name($row['house'], $row['title'], $row['given_name'],
         $row['family_name'], $row['lordofname']);
@@ -26,13 +26,13 @@ 
     }
     if ($row['house'] == 1) {
         $URL = new \MySociety\TheyWorkForYou\Url('mp');
-        $row['url'] = $URL->generate('none') . make_member_url($row['full_name'], $row['constituency'], $row['house'], $row['person_id']);
+        $row['url'] = $URL->generate('none').make_member_url($row['full_name'], $row['constituency'], $row['house'], $row['person_id']);
     }
     if ($has_party && isset($parties[$row['party']]))
         $row['party'] = $parties[$row['party']];
-    list($image,$sz) = MySociety\TheyWorkForYou\Utility\Member::findMemberImage($row['person_id']);
+    list($image, $sz) = MySociety\TheyWorkForYou\Utility\Member::findMemberImage($row['person_id']);
     if ($image) {
-        list($width, $height) = getimagesize(str_replace(IMAGEPATH, BASEDIR . '/images/', $image));
+        list($width, $height) = getimagesize(str_replace(IMAGEPATH, BASEDIR.'/images/', $image));
         $row['image'] = $image;
         $row['image_height'] = $height;
         $row['image_width'] = $width;
@@ -42,8 +42,8 @@ 
     if ($row['house'] == 1 && ($row['left_house'] == '9999-12-31' || (isset($dissolution[1]) && $row['left_house'] == $dissolution[1]))) {
         # Ministerialships and Select Committees
         $db = new ParlDB;
-        $q = $db->query('SELECT * FROM moffice WHERE to_date="9999-12-31" and person=' . $row['person_id'] . ' ORDER BY from_date DESC');
-        for ($i=0; $i<$q->rows(); $i++) {
+        $q = $db->query('SELECT * FROM moffice WHERE to_date="9999-12-31" and person='.$row['person_id'].' ORDER BY from_date DESC');
+        for ($i = 0; $i < $q->rows(); $i++) {
             $row['office'][] = $q->row($i);
         }
     }
@@ -55,7 +55,7 @@ 
     return $row;
 }
 
-function api_getPerson_id($id, $house='') {
+function api_getPerson_id($id, $house = '') {
     $db = new ParlDB;
     $params = array(
         ':person_id' => $id
@@ -77,10 +77,10 @@ 
     }
 }
 
-function _api_getPerson_output($q, $flatten=false) {
+function _api_getPerson_output($q, $flatten = false) {
     $output = array();
     $last_mod = 0;
-    for ($i=0; $i<$q->rows(); $i++) {
+    for ($i = 0; $i < $q->rows(); $i++) {
         $house = $q->field($i, 'house');
         $out = _api_getPerson_row($q->row($i), $house == HOUSE_TYPE_ROYAL ? false : true);
         $output[] = $out;
@@ -149,13 +149,13 @@ 
     $cons_params = array();
     $params = array(':house' => $house);
     foreach ($cons as $key => $constituency) {
-        $cons_params[] = ':constituency' . $key;
-        $params[':constituency' . $key] = $constituency;
+        $cons_params[] = ':constituency'.$key;
+        $params[':constituency'.$key] = $constituency;
     }
 
     $query_base = "SELECT member.*, p.title, p.given_name, p.family_name, p.lordofname
         FROM member, person_names p
-        WHERE constituency in (" . join(",", $cons_params) . ")
+        WHERE constituency in (" . join(",", $cons_params).")
             AND member.person_id = p.person_id AND p.type = 'name'
             AND p.start_date <= left_house AND left_house <= p.end_date
         AND house = :house";

Braces +18 added lines, -9 removed lines

@@ -28,8 +28,9 @@ 
         $URL = new \MySociety\TheyWorkForYou\Url('mp');
         $row['url'] = $URL->generate('none') . make_member_url($row['full_name'], $row['constituency'], $row['house'], $row['person_id']);
     }
-    if ($has_party && isset($parties[$row['party']]))
-        $row['party'] = $parties[$row['party']];
+    if ($has_party && isset($parties[$row['party']])) {
+            $row['party'] = $parties[$row['party']];
+    }
     list($image,$sz) = MySociety\TheyWorkForYou\Utility\Member::findMemberImage($row['person_id']);
     if ($image) {
         list($width, $height) = getimagesize(str_replace(IMAGEPATH, BASEDIR . '/images/', $image));
@@ -49,7 +50,9 @@ 
     }
 
     foreach ($row as $k => $r) {
-        if (is_string($r)) $row[$k] = html_entity_decode($r);
+        if (is_string($r)) {
+            $row[$k] = html_entity_decode($r);
+        }
     }
 
     return $row;
@@ -85,8 +88,9 @@ 
         $out = _api_getPerson_row($q->row($i), $house == HOUSE_TYPE_ROYAL ? false : true);
         $output[] = $out;
         $time = strtotime($q->field($i, 'lastupdate'));
-        if ($time > $last_mod)
-            $last_mod = $time;
+        if ($time > $last_mod) {
+                    $last_mod = $time;
+        }
     }
     # Only one MP, not an array
     if ($flatten && count($output) == 1 && $house == HOUSE_TYPE_COMMONS) {
@@ -134,13 +138,18 @@ 
 
     $cons = array();
     foreach ($constituencies as $constituency) {
-        if ($constituency == '') continue;
-        if ($constituency == 'Orkney ')
-            $constituency = 'Orkney & Shetland';
+        if ($constituency == '') {
+            continue;
+        }
+        if ($constituency == 'Orkney ') {
+                    $constituency = 'Orkney & Shetland';
+        }
 
         if ($house == HOUSE_TYPE_COMMONS) {
             $normalised = MySociety\TheyWorkForYou\Utility\Constituencies::normaliseConstituencyName($constituency);
-            if ($normalised) $constituency = $normalised;
+            if ($normalised) {
+                $constituency = $normalised;
+            }
         }
 
         $cons[] = $constituency;

classes/Db/Connection.php

Doc Comments +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
      * @param string $db_pass The password for the database user
      * @param string $db_name The name of the database
      *
-     * @return true If the connection has been created successfully.
+     * @return boolean If the connection has been created successfully.
      */
 
     public function init($db_host, $db_user, $db_pass, $db_name) {

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.");
     }
 
     /**

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

@@ -102,7 +102,7 @@
      * @return Query An object containing the results of the query.
      */
 
-    public function query($sql, $params = NULL) {
+    public function query($sql, $params = null) {
 
         $start = getmicrotime();
         $q = new \MySociety\TheyWorkForYou\Db\Query($this->conn);

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

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

@@ -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");

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

Braces +15 added lines, -13 removed lines

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