mysociety / theyworkforyou

www/includes/easyparliament/init.php

Spacing +6 added lines, -6 removed lines

@@ -17,10 +17,10 @@ 
 // 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", "%A, %e %B %Y");// Monday, 31 December 2003
-define("LONGDATEFORMAT", "%e %B %Y"); 	// 31 December 2003
-define("SHORTDATEFORMAT", "%e %b %Y");	// 31 Dec 2003
-define("TIMEFORMAT", "%l:%M %p");	// 11:59 pm
+define("LONGERDATEFORMAT", "%A, %e %B %Y"); // Monday, 31 December 2003
+define("LONGDATEFORMAT", "%e %B %Y"); // 31 December 2003
+define("SHORTDATEFORMAT", "%e %b %Y"); // 31 Dec 2003
+define("TIMEFORMAT", "%l:%M %p"); // 11:59 pm
 
 define("SHORTDATEFORMAT_SQL", "%e %b %Y"); // 31 Dec 2003
 define("TIMEFORMAT_SQL", "%l:%i %p"); // 11:59 PM
@@ -52,7 +52,7 @@ 
 textdomain('TheyWorkForYou');
 
 // Set the default timezone
-if(function_exists('date_default_timezone_set')) {
+if (function_exists('date_default_timezone_set')) {
     date_default_timezone_set(TIMEZONE);
 }
 
@@ -105,7 +105,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/commentlist.php

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

@@ -548,11 +548,11 @@
         }
         if ($limit != '') {
             # Can't use parameter as >1 argument
-            $limit = "LIMIT $limit";
+            $limit = "limit $limit";
         }
 
         // Finally, do the query!
-        $q = $this->db->query("SELECT $fields
+        $q = $this->db->query("select $fields
                         FROM 	comments
                         $join
                         WHERE $where

Spacing +12 added lines, -12 removed lines

@@ -102,7 +102,7 @@ 
         }
 
         // For getting the data.
-        $input =  [
+        $input = [
             'amount' =>  [
                 'user' => true,
             ],
@@ -238,7 +238,7 @@ 
                 // This does rely on both this and the previous query returning
                 // stuff in the same order...
                 foreach ($comments as $n => $commentdata) {
-                    $comments[$n]['body'] = $commentbodies[ $comments[$n]['comment_id'] ];
+                    $comments[$n]['body'] = $commentbodies[$comments[$n]['comment_id']];
                 }
             }
         }
@@ -283,7 +283,7 @@ 
         if (isset($args['pid']) && is_numeric($args['pid'])) {
             $where['person_id='] = $args['pid'];
         }
-        $input =  [
+        $input = [
             'amount' =>  [
                 'user' => true,
             ],
@@ -323,7 +323,7 @@ 
             'date(posted)>=' => $args['start_date'],
             'date(posted)<=' => $args['end_date'],
         ];
-        $input =  [
+        $input = [
             'amount' =>  [
                 'user' => true,
             ],
@@ -357,7 +357,7 @@ 
 
         $limit = $num * ($page - 1) . ',' . $num;
 
-        $input =  [
+        $input = [
             'amount' =>  [
                 'user' => true,
             ],
@@ -388,7 +388,7 @@ 
         // It returns the URL for the comment.
 
         $major 		= $urldata['major'];
-        $gid 		= $urldata['gid'];
+        $gid = $urldata['gid'];
         $comment_id = $urldata['comment_id'];
         $user_id = $urldata['user_id'] ?? false;
 
@@ -402,7 +402,7 @@ 
         $URL = new \MySociety\TheyWorkForYou\Url($page);
 
         $gid = fix_gid_from_db($gid); // In includes/utility.php
-        $URL->insert(['id' => $gid ]);
+        $URL->insert(['id' => $gid]);
         if ($user_id) {
             $URL->insert(['u' => $user_id]);
         }
@@ -480,7 +480,7 @@ 
         $limit = $input['limit'] ?? '';
 
         // The fields to fetch from db. 'table' => array ('field1', 'field2').
-        $fieldsarr =  [
+        $fieldsarr = [
             'comments' =>  ['comment_id', 'user_id', 'epobject_id', 'body', 'posted', 'modflagged', 'visible'],
             'hansard' =>  ['major', 'gid'],
         ];
@@ -493,7 +493,7 @@ 
 
         // Add on the stuff for getting a user's details.
         if (isset($amount['user']) && $amount['user'] == true) {
-            $fieldsarr['users'] =  ['firstname', 'lastname', 'user_id'];
+            $fieldsarr['users'] = ['firstname', 'lastname', 'user_id'];
             // Like doing "FROM comments, users" but it's easier to add
             // an "INNER JOIN..." automatically to the query.
             $join .= ' INNER JOIN users ON comments.user_id = users.user_id ';
@@ -504,7 +504,7 @@ 
             $fieldsarr['epobject'] = ['body'];
         }
 
-        $fieldsarr2 =  [];
+        $fieldsarr2 = [];
         // Construct the $fields clause.
         foreach ($fieldsarr as $table => $tablesfields) {
             foreach ($tablesfields as $n => $field) {
@@ -521,7 +521,7 @@ 
         $fields = implode(', ', $fieldsarr2);
 
 
-        $wherearr2 =  [];
+        $wherearr2 = [];
         $params = [];
         $i = 0;
         // Construct the $where clause.
@@ -550,7 +550,7 @@ 
                         ", $params);
 
         // Format the data into an array for returning.
-        $data =  [];
+        $data = [];
 
         // If you change stuff here, you might have to change it in
         // $COMMENT->_set_url() too...

www/includes/easyparliament/recess.php

Spacing +62 added lines, -62 removed lines

@@ -12,31 +12,31 @@ 
     ],
     2001 => [
         1 => ['less' => 8],
-        2 => ['between' => [15,26]],
-        4 => ['between' => [10,23]],
+        2 => ['between' => [15, 26]],
+        4 => ['between' => [10, 23]],
         5 => ['more' => 13],
         6 => ['less' => 13],
         7 => ['more' => 20],
         8 => ['all' => 1],
         9 => ['less' => 14, 'more' => 14],
-        10 => ['less' => 4, 'between' => [4,8, 8,15]],
-        12 => ['more' => 19] ],
+        10 => ['less' => 4, 'between' => [4, 8, 8, 15]],
+        12 => ['more' => 19]],
     2002 => [
         1 => ['less' => 8],
-        2 => ['between' => [14,25]],
+        2 => ['between' => [14, 25]],
         3 => ['more' => 26],
-        4 => ['less' => 3, 'between' => [3,10]],
+        4 => ['less' => 3, 'between' => [3, 10]],
         5 => ['more' => 24],
         6 => ['less' => 10],
         7 => ['more' => 24],
         8 => ['all' => 1],
         9 => ['less' => 19, 'more' => 24],
         10 => ['less' => 14],
-        12 => ['more' => 19] ],
+        12 => ['more' => 19]],
     2003 => [
         1 => ['less' => 7],
-        2 => ['between' => [13,24]],
-        4 => ['between' => [14,28]],
+        2 => ['between' => [13, 24]],
+        4 => ['between' => [14, 28]],
         5 => ['more' => 22],
         6 => ['less' => 3],
         7 => ['more' => 17],
@@ -46,18 +46,18 @@ 
         12 => ['more' => 18]],
     2004 => [
         1 => ['less' => 5],
-        2 => ['between' => [12,23]],
-        4 => ['between' => [1,19]],
+        2 => ['between' => [12, 23]],
+        4 => ['between' => [1, 19]],
         5 => ['more' => 27],
         6 => ['less' => 7],
         7 => ['more' => 22],
         8 => ['all' => 1],
         9 => ['less' => 7, 'more' => 16],
         10 => ['less' => 11],
-        12 => ['more' => 21] ],
+        12 => ['more' => 21]],
     2005 => [
         1 => ['less' => 10],
-        2 => ['between' => [10,21]],
+        2 => ['between' => [10, 21]],
         3 => ['more' => 24],
         4 => ['less' => 4, 'more' => 10],
         5 => ['less' => 11, 'more' => 26],
@@ -66,10 +66,10 @@ 
         8 => ['all' => 1],
         9 => ['all' => 1],
         10 => ['less' => 10],
-        12 => ['more' => 20] ],
+        12 => ['more' => 20]],
     2006 => [
         1 => ['less' => 9],
-        2 => ['between' => [16,27]],
+        2 => ['between' => [16, 27]],
         3 => ['more' => 30],
         4 => ['less' => 18],
         5 => ['more' => 25],
@@ -82,7 +82,7 @@ 
     ],
     2007 => [
         1 => ['less' => 8],
-        2 => ['between' => [8,19]],
+        2 => ['between' => [8, 19]],
         3 => ['more' => 29],
         4 => ['less' => 16],
         5 => ['more' => 24],
@@ -95,8 +95,8 @@ 
     ],
     2008 => [
         1 => ['less' => 7],
-        2 => ['between' => [7,18]],
-        4 => ['between' => [3,21]],
+        2 => ['between' => [7, 18]],
+        4 => ['between' => [3, 21]],
         5 => ['more' => 22],
         6 => ['less' => 2],
         7 => ['more' => 22],
@@ -107,8 +107,8 @@ 
     ],
     2009 => [
         1 => ['less' => 12],
-        2 => ['between' => [12,23]],
-        4 => ['between' => [2,20]],
+        2 => ['between' => [12, 23]],
+        4 => ['between' => [2, 20]],
         5 => ['more' => 21],
         6 => ['less' => 1],
         7 => ['more' => 21],
@@ -119,7 +119,7 @@ 
     ],
     2010 => [
         1 => ['less' => 5],
-        2 => ['between' => [10,22]],
+        2 => ['between' => [10, 22]],
         3 => ['more' => 30],
         4 => ['less' => 6, 'more' => 8],
         5 => ['less' => 18, 'more' => 27],
@@ -132,62 +132,62 @@ 
     ],
     2011 => [
         1 => ['less' => 10],
-        2 => ['between' => [17,28]],
-        4 => ['between' => [5,26]],
+        2 => ['between' => [17, 28]],
+        4 => ['between' => [5, 26]],
         5 => ['more' => 24],
         6 => ['less' => 7],
         7 => ['more' => 19],
         8 => ['all' => 1],
         9 => ['less' => 5, 'more' => 15],
         10 => ['less' => 10],
-        11 => ['between' => [15,21]],
+        11 => ['between' => [15, 21]],
         12 => ['more' => 20],
     ],
     2012 => [
         1 => ['less' => 10],
-        2 => ['between' => [9,20]],
+        2 => ['between' => [9, 20]],
         3 => ['more' => 27],
         4 => ['less' => 16],
         5 => ['more' => 24],
         6 => ['less' => 11],
         7 => ['more' => 17],
         8 => ['all' => 1],
-        9 => ['less' => 3,'more' => 18],
+        9 => ['less' => 3, 'more' => 18],
         10 => ['less' => 15],
-        11 => ['between' => [13,19]],
+        11 => ['between' => [13, 19]],
         12 => ['more' => 20],
     ],
     2013 => [
         1 => ['less' => 7],
-        2 => ['between' => [14,25]],
+        2 => ['between' => [14, 25]],
         3 => ['more' => 26],
         4 => ['less' => 15],
         5 => ['more' => 21],
         6 => ['less' => 3],
         7 => ['more' => 18],
         8 => ['all' => 1],
-        9 => ['less' => 2,'more' => 13],
+        9 => ['less' => 2, 'more' => 13],
         10 => ['less' => 8],
-        11 => ['between' => [12,18]],
+        11 => ['between' => [12, 18]],
         12 => ['more' => 19],
     ],
     2014 => [
         1 => ['less' => 6],
-        2 => ['between' => [13,24]],
-        4 => ['between' => [10,28]],
-        5 => ['between' => [1,6]],
+        2 => ['between' => [13, 24]],
+        4 => ['between' => [10, 28]],
+        5 => ['between' => [1, 6]],
     ],
     2015 => [
         7 => ['more' => 21],
         8 => ['all' => 1],
         9 => ['less' => 7, 'more' => 17],
         10 => ['less' => 12],
-        11 => ['between' => [10,16]],
+        11 => ['between' => [10, 16]],
         12 => ['more' => 17],
     ],
     2016 => [
         1 => ['less' => 5],
-        2 => ['between' => [11,22]],
+        2 => ['between' => [11, 22]],
     ],
 ];
 # Lords differences
@@ -199,15 +199,15 @@ 
 $GLOBALS['recessdates'][101][2010][12]['more'] = 22;
 $GLOBALS['recessdates'][101][2011] = [
     1 => ['less' => 10],
-    2 => ['between' => [16,28]],
-    4 => ['between' => [6,26]],
+    2 => ['between' => [16, 28]],
+    4 => ['between' => [6, 26]],
     5 => ['more' => 25],
     6 => ['less' => 6],
     7 => ['more' => 20],
     8 => ['all' => 1],
     9 => ['less' => 5, 'more' => 15],
     10 => ['less' => 3],
-    11 => ['between' => [16,21]],
+    11 => ['between' => [16, 21]],
     12 => ['more' => 21],
 ];
 
@@ -216,74 +216,74 @@ 
     1999 => [
         7 => ['more' => 2],
         8 => ['less' => 31],
-        10 => ['between' => [8,25]],
+        10 => ['between' => [8, 25]],
         12 => ['more' => 17],
     ],
     2000 => [
         1 => ['less' => 10],
-        4 => ['between' => [7,25]],
+        4 => ['between' => [7, 25]],
         7 => ['more' => 7],
         8 => ['all' => 1],
         9 => ['less' => 4],
-        10 => ['between' => [6,23]],
+        10 => ['between' => [6, 23]],
         12 => ['more' => 20],
     ],
     2001 => [
         1 => ['less' => 8],
-        2 => ['between' => [16,26]],
-        4 => ['between' => [6,23]],
+        2 => ['between' => [16, 26]],
+        4 => ['between' => [6, 23]],
         6 => ['more' => 29],
         7 => ['all' => 1],
         8 => ['all' => 1],
         9 => ['less' => 3],
-        10 => ['between' => [5,22]],
-        12 => ['more' => 21] ],
+        10 => ['between' => [5, 22]],
+        12 => ['more' => 21]],
     2002 => [
         1 => ['less' => 7],
-        2 => ['between' => [15,25]],
+        2 => ['between' => [15, 25]],
         3 => ['more' => 28],
         4 => ['less' => 15],
         7 => ['more' => 10],
         8 => ['all' => 1],
         9 => ['less' => 2],
-        10 => ['between' => [11,28]],
-        12 => ['more' => 20] ],
+        10 => ['between' => [11, 28]],
+        12 => ['more' => 20]],
     2003 => [
         1 => ['less' => 6],
-        4 => ['between' => [0,31]],
+        4 => ['between' => [0, 31]],
         5 => ['less' => 2],
         6 => ['more' => 27],
         7 => ['all' => 1],
         8 => ['all' => 1],
-        10 => ['between' => [10,27]],
+        10 => ['between' => [10, 27]],
         12 => ['more' => 19]],
     2004 => [
         1 => ['less' => 5],
-        2 => ['between' => [13,23]],
-        4 => ['between' => [2,19]],
+        2 => ['between' => [13, 23]],
+        4 => ['between' => [2, 19]],
         6 => ['more' => 25],
         7 => ['all' => 1],
         8 => ['less' => 30],
-        10 => ['between' => [10,23]],
-        12 => ['more' => 26] ],
+        10 => ['between' => [10, 23]],
+        12 => ['more' => 26]],
     2005 => [
         1 => ['less' => 8],
-        2 => ['between' => [11,21]],
+        2 => ['between' => [11, 21]],
         3 => ['more' => 24],
         4 => ['less' => 11],
         7 => ['more' => 1],
         8 => ['all' => 1],
         9 => ['less' => 5],
-        10 => ['between' => [7,24]],
-        12 => ['more' => 23] ],
+        10 => ['between' => [7, 24]],
+        12 => ['more' => 23]],
     2006 => [
         1 => ['less' => 9],
-        2 => ['between' => [10,20]],
+        2 => ['between' => [10, 20]],
         4 => ['less' => 18],
         7 => ['more' => 0],
         8 => ['all' => 1],
         9 => ['less' => 4],
-        10 => ['between' => [6,23]],
+        10 => ['between' => [6, 23]],
         12 => ['more' => 22],
     ],
     2007 => [
@@ -293,18 +293,18 @@ 
         7 => ['all' => 1],
         8 => ['all' => 1],
         9 => ['less' => 3],
-        10 => ['between' => [5,22]],
+        10 => ['between' => [5, 22]],
         12 => ['more' => 21],
     ],
     2008 => [
         1 => ['less' => 5],
-        2 => ['between' => [8,18]],
+        2 => ['between' => [8, 18]],
         3 => ['more' => 28],
         4 => ['less' => 14],
         6 => ['more' => 27],
         7 => ['all' => 1],
         8 => ['all' => 1],
-        10 => ['between' => [10,27]],
+        10 => ['between' => [10, 27]],
     ],
 ];
 

www/includes/easyparliament/searchengine.php

Spacing +6 added lines, -6 removed lines

@@ -84,7 +84,7 @@ 
         }
 
         # Force words to lower case
-        $this->query = preg_replace_callback('#(department|party):.+?\b#i', function ($m) {
+        $this->query = preg_replace_callback('#(department|party):.+?\b#i', function($m) {
             return strtolower($m[0]);
         }, $this->query);
 
@@ -162,9 +162,9 @@ 
                     } elseif ($value == 'lmqs') {
                         $newv = 9;
                     } elseif ($value == 'uk') {
-                        $newv = [1,2,3,4,6,101];
+                        $newv = [1, 2, 3, 4, 6, 101];
                     } elseif ($value == 'scotland') {
-                        $newv = [7,8];
+                        $newv = [7, 8];
                     } elseif ($value == 'wales') {
                         $newv = ($lang == 'cy' || LANGUAGE == 'cy') ? 11 : 10;
                     } elseif ($value == 'future') {
@@ -267,7 +267,7 @@ 
         $qd = preg_replace('#@[0-9]+#', '', $qd); # Strip position variable
         $qd = preg_replace('#^\((.*) AND_NOT M1[01]\)$#', '$1', $qd); # Strip Welsh handling
         # Date range
-        $qd = preg_replace_callback('#VALUE_RANGE 1 (\d+) (\d+)#', function ($m) {
+        $qd = preg_replace_callback('#VALUE_RANGE 1 (\d+) (\d+)#', function($m) {
             return preg_replace("#(\d{4})(\d\d)(\d\d)#", '$3/$2/$1', $m[1])
                 . ".." . preg_replace("#(\d{4})(\d\d)(\d\d)#", '$3/$2/$1', $m[2]);
         }, $qd);
@@ -293,7 +293,7 @@ 
         $qd = preg_replace('#\bU(\d+)\b#', 'segment:$1', $qd);
         $qd = preg_replace('#\bC(\d+)\b#', 'column:$1', $qd);
         $qd = preg_replace('#\bQ(.*?)\b#', 'gid:$1', $qd);
-        $qd = preg_replace_callback('#\bP(.*?)\b#', function ($m) {
+        $qd = preg_replace_callback('#\bP(.*?)\b#', function($m) {
             global $parties;
             $pu = ucfirst($m[1]);
             return "party:" . ($parties[$pu] ?? $m[1]);
@@ -305,7 +305,7 @@ 
         } elseif (strstr($qd, 'M7 OR M8')) {
             $qd = str_replace('M7 OR M8', 'section:scotland', $qd);
         }
-        $qd = preg_replace_callback('#\bM(\d+)\b#', function ($m) {
+        $qd = preg_replace_callback('#\bM(\d+)\b#', function($m) {
             global $hansardmajors;
             $title = $hansardmajors[$m[1]]["title"] ?? $m[1];
             return sprintf(gettext("in the '%s'"), $title);

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

@@ -333,15 +333,15 @@
         foreach ($merged as $row) {
             $from_id = str_replace('uk.org.publicwhip/person/', '', $row['gid_from']);
             $to_id = str_replace('uk.org.publicwhip/person/', '', $row['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(['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

www/includes/easyparliament/hansardlist.php

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

@@ -1753,7 +1753,7 @@
         }
 
         // Finally, do the query!
-        $q = $this->db->query("SELECT $fields
+        $q = $this->db->query("select $fields
                         FROM 	hansard
                         $join
                         WHERE $where

Spacing +84 added lines, -84 removed lines

@@ -53,7 +53,7 @@ 
 class HANSARDLIST {
     // This will be used to cache information about speakers on this page
     // so we don't have to keep fetching the same data from the DB.
-    public $speakers =  [];
+    public $speakers = [];
     /*
     $this->speakers[ $person_id ] = array (
         "name" => $name,
@@ -66,7 +66,7 @@ 
 
     // This will be used to cache mappings from epobject_id to gid,
     // so we don't have to continually fetch the same data in get_hansard_data().
-    public $epobjectid_to_gid =  [];
+    public $epobjectid_to_gid = [];
     /*
     $this->epobjectid_to_gid[ $epobject_id ] => $gid;
     */
@@ -143,7 +143,7 @@ 
             return false;
         }
 
-        $validviews =  ['calendar', 'date', 'gid', 'person', 'search', 'recent', 'recent_mostvotes', 'biggest_debates', 'recent_wrans', 'recent_wms', 'column', 'mp', 'bill', 'session', 'recent_debates', 'recent_pbc_debates', 'featured_gid'];
+        $validviews = ['calendar', 'date', 'gid', 'person', 'search', 'recent', 'recent_mostvotes', 'biggest_debates', 'recent_wrans', 'recent_wms', 'column', 'mp', 'bill', 'session', 'recent_debates', 'recent_pbc_debates', 'featured_gid'];
         if (in_array($view, $validviews)) {
 
             // What function do we call for this view?
@@ -234,7 +234,7 @@ 
                 [$year, $month, $date] = explode('-', $hdate);
                 $timestamp = gmmktime(0, 0, 0, $month, $date, $year);
 
-                $data =  [
+                $data = [
                     'hdate'		=> $hdate,
                     'timestamp'	=> $timestamp,
                     'listurl'	=> $URL->generate(),
@@ -277,7 +277,7 @@ 
             // so get the section info above this item.
 
             // For getting hansard data.
-            $input =  [
+            $input = [
                 'amount' =>  [
                     'body' => true,
                 ],
@@ -311,14 +311,14 @@ 
         twfy_debug(get_class($this), "getting an item's subsection");
 
         // What we return.
-        $subsectiondata =  [];
+        $subsectiondata = [];
 
         if ($itemdata['htype'] == '12' || $itemdata['htype'] == '13' || $itemdata['htype'] == '14') {
             // This item is a speech or procedural, so get the
             // subsection info above this item.
 
             // For getting hansard data.
-            $input =  [
+            $input = [
                 'amount' =>  [
                     'body' => true,
                 ],
@@ -416,7 +416,7 @@ 
             $wherearr['hansard.epobject_id='] = $prev_item_id;
 
             // For getting hansard data.
-            $input =  [
+            $input = [
                 'amount' =>  [
                     'body' => true,
                     'speaker' => true,
@@ -432,7 +432,7 @@ 
                 if ($itemdata['htype'] == '10' || $itemdata['htype'] == '11') {
                     // Linking to the prev (sub)section.
                     $thing = $hansardmajors[$this->major]['singular'];
-                    $nextprevdata['prev'] =  [
+                    $nextprevdata['prev'] = [
                         'body'		=> sprintf(gettext("Previous %s"), $thing),
                         'url'		=> $prevdata[0]['listurl'],
                         'title'		=> $prevdata[0]['body'],
@@ -445,7 +445,7 @@ 
                     } else {
                         $title = '';
                     }
-                    $nextprevdata['prev'] =  [
+                    $nextprevdata['prev'] = [
                         'body'		=> gettext('Previous speaker'),
                         'url'		=> $prevdata[0]['commentsurl'],
                         'title'		=> $title,
@@ -461,7 +461,7 @@ 
             $wherearr['hansard.epobject_id='] = $next_item_id;
 
             // For getting hansard data.
-            $input =  [
+            $input = [
                 'amount' =>  [
                     'body' => true,
                     'speaker' => true,
@@ -476,7 +476,7 @@ 
                 if ($itemdata['htype'] == '10' || $itemdata['htype'] == '11') {
                     // Linking to the next (sub)section.
                     $thing = $hansardmajors[$this->major]['singular'];
-                    $nextprevdata['next'] =  [
+                    $nextprevdata['next'] = [
                         'body'		=> sprintf(gettext("Next %s"), $thing),
                         'url'		=> $nextdata[0]['listurl'],
                         'title'		=> $nextdata[0]['body'],
@@ -489,7 +489,7 @@ 
                     } else {
                         $title = '';
                     }
-                    $nextprevdata['next'] =  [
+                    $nextprevdata['next'] = [
                         'body'		=> gettext('Next speaker'),
                         'url'		=> $nextdata[0]['commentsurl'],
                         'title'		=> $title,
@@ -536,11 +536,11 @@ 
         twfy_debug(get_class($this), "getting next/prev dates");
 
         // What we return.
-        $nextprevdata =  [];
+        $nextprevdata = [];
 
         $URL = new \MySociety\TheyWorkForYou\Url($this->listpage);
 
-        $looper =  ["next", "prev"];
+        $looper = ["next", "prev"];
 
         foreach ($looper as $n => $nextorprev) {
 
@@ -564,7 +564,7 @@ 
             // when displaying the first day of debates.
             if ($q && $q['hdate'] != null) {
 
-                $URL->insert([ 'd' => $q['hdate'] ]);
+                $URL->insert(['d' => $q['hdate']]);
 
                 if ($nextorprev == 'next') {
                     $body = gettext('Next day');
@@ -574,7 +574,7 @@ 
 
                 $title = format_date($q['hdate'], SHORTDATEFORMAT);
 
-                $nextprevdata[$nextorprev] =  [
+                $nextprevdata[$nextorprev] = [
                     'hdate' => $q['hdate'],
                     'url' => $URL->generate(),
                     'body' => $body,
@@ -588,7 +588,7 @@ 
         $thing = $hansardmajors[$this->major]['plural'];
         $URL->insert(['y' => $year]);
 
-        $nextprevdata['up'] =  [
+        $nextprevdata['up'] = [
             'body' 	=> sprintf(gettext("All of %s’s %s"), $year, $thing),
             'title'	=> '',
             'url' 	=> $URL->generate(),
@@ -645,7 +645,7 @@ 
 
 
         // Get all the data just for this epobject_id.
-        $input =  [
+        $input = [
             'amount' =>  [
                 'body' => true,
                 'speaker' => true,
@@ -686,7 +686,7 @@ 
             $this->check_gid_change($args['gid'], 'a', '');
 
             if (substr($args['gid'], -1) == 'L') {
-                $letts = ['a','b','c','d','e'];
+                $letts = ['a', 'b', 'c', 'd', 'e'];
                 for ($i = 0; $i < 4; $i++) {
                     $this->check_gid_change($args['gid'], $letts[$i], $letts[$i + 1]);
                 }
@@ -730,7 +730,7 @@ 
     }
 
     private function check_gid_change($gid, $from, $to) {
-        $input =  [
+        $input = [
             'amount' =>  [
                 'body' => true,
                 'speaker' => true,
@@ -758,7 +758,7 @@ 
         twfy_debug(get_class($this), "getting data by date");
 
         // Where we'll put all the data we want to render.
-        $data =  [];
+        $data = [];
 
         $date = $this->_validate_date($args);
 
@@ -772,7 +772,7 @@ 
 
             // Get all the sections for this date.
             // Then for each of those we'll get the subsections and rows.
-            $input =  [
+            $input = [
                 'amount' =>  [
                     'body' => true,
                     'comment' => true,
@@ -801,7 +801,7 @@ 
                     $sectionrow = $this->_get_section($sections[$n]);
 
                     // Get the subsections within the section.
-                    $input =  [
+                    $input = [
                         'amount' =>  [
                             'body' => true,
                             'comment' => true,
@@ -857,7 +857,7 @@ 
             $major = '';
         }
 
-        $data =  [];
+        $data = [];
 
         $q = $this->db->query("SELECT DISTINCT(hdate)
                         FROM 	hansard
@@ -932,7 +932,7 @@ 
 
         $speeches = [];
         foreach ($q as $row) {
-            $speech =  [
+            $speech = [
                 'subsection_id' => $row['subsection_id'],
                 'section_id' => $row['section_id'],
                 'htype' => $row['htype'],
@@ -949,7 +949,7 @@ 
             // Cache parent id to speed up _get_listurl
             $this->epobjectid_to_gid[$row['subsection_id']] = fix_gid_from_db($row['gid_subsection']);
 
-            $url_args =  ['p' => $row['person_id']];
+            $url_args = ['p' => $row['person_id']];
             $speech['listurl'] = $this->_get_listurl($speech, $url_args);
             $speeches[] = $speech;
         }
@@ -997,7 +997,7 @@ 
         }
 
         // What we'll return.
-        $data =  [];
+        $data = [];
 
         $data['info']['s'] = $args['s'];
 
@@ -1057,7 +1057,7 @@ 
 
         // Log this query so we can improve them - if it wasn't a "popular
         // query" link
-        if (! isset($args['pop']) or $args['pop'] != 1) {
+        if (!isset($args['pop']) or $args['pop'] != 1) {
             global $SEARCHLOG;
             $SEARCHLOG->add(
                 ['query' => $searchstring,
@@ -1185,7 +1185,7 @@ 
                 //////////////////////////
                 // 2. Create the URL to link to this bit of text.
 
-                $id_data =  [
+                $id_data = [
                     'major'            => $itemdata['major'],
                     'minor'            => $itemdata['minor'],
                     'htype'         => $itemdata['htype'],
@@ -1196,7 +1196,7 @@ 
 
                 // We append the query onto the end of the URL as variable 's'
                 // so we can highlight them on the debate/wrans list page.
-                $url_args =  ['s' => $searchstring];
+                $url_args = ['s' => $searchstring];
 
                 $itemdata['listurl'] = $this->_get_listurl($id_data, $url_args, $encode);
 
@@ -1249,14 +1249,14 @@ 
                     } else {
                         $listurl = '';
                     }
-                    $itemdata['parent'] =  [
+                    $itemdata['parent'] = [
                         'body' => $body,
                         'listurl' => $listurl,
                     ];
                     if ($itemdata['htype'] == 11) {
                         # Search result was a subsection heading; fetch the first entry
                         # from the wrans/wms to show under the heading
-                        $input =  [
+                        $input = [
                             'amount' => [
                                 'body' => true,
                                 'speaker' => true,
@@ -1502,7 +1502,7 @@ 
 
         $params[':major'] = $this->major;
         $params[':firstdate'] = $firstyear . '-' . $firstmonth . '-01';
-        $q =  $this->db->query("SELECT 	DISTINCT(hdate) AS hdate
+        $q = $this->db->query("SELECT 	DISTINCT(hdate) AS hdate
                         FROM		hansard
                         WHERE		major = :major
                         AND			hdate >= :firstdate
@@ -1570,7 +1570,7 @@ 
 
                 $YEARURL->insert(['y' => $firstyear - 1]);
 
-                $nextprev['prev'] =  [
+                $nextprev['prev'] = [
                     'body' => 'Previous year',
                     'title' => $firstyear - 1,
                     'url' => $YEARURL->generate(),
@@ -1579,8 +1579,8 @@ 
             } else {
                 // action is 'year'.
 
-                $nextprev['prev'] =  ['body' => 'Previous year'];
-                $nextprev['next'] =  ['body' => 'Next year'];
+                $nextprev['prev'] = ['body' => 'Previous year'];
+                $nextprev['next'] = ['body' => 'Next year'];
 
                 $q = $this->db->query("SELECT DATE_FORMAT(hdate, '%Y') AS year
                             FROM hansard WHERE major = :major
@@ -1669,13 +1669,13 @@ 
         // $input['limit'] as a string for the $limit clause, eg '21,20'.
 
         $amount 		= $input['amount'] ?? [];
-        $wherearr 		= $input['where'] ?? [];
+        $wherearr = $input['where'] ?? [];
         $order 			= $input['order'] ?? '';
         $limit 			= $input['limit'] ?? '';
 
 
         // The fields to fetch from db. 'table' => array ('field1', 'field2').
-        $fieldsarr =  [
+        $fieldsarr = [
             'hansard' =>  ['epobject_id', 'htype', 'gid', 'hpos', 'section_id', 'subsection_id', 'hdate', 'htime', 'source_url', 'major', 'minor', 'colnum'],
         ];
 
@@ -1688,14 +1688,14 @@ 
         if ((isset($amount['body']) && $amount['body'] == true) ||
             (isset($amount['comment']) && $amount['comment'] == true)
         ) {
-            $fieldsarr['epobject'] =  ['body'];
+            $fieldsarr['epobject'] = ['body'];
             $join = 'LEFT OUTER JOIN epobject ON hansard.epobject_id = epobject.epobject_id';
         } else {
             $join = '';
         }
 
 
-        $fieldsarr2 =  [];
+        $fieldsarr2 = [];
         // Construct the $fields clause.
         foreach ($fieldsarr as $table => $tablesfields) {
             foreach ($tablesfields as $n => $field) {
@@ -1704,7 +1704,7 @@ 
         }
         $fields = implode(', ', $fieldsarr2);
 
-        $wherearr2 =  [];
+        $wherearr2 = [];
         // Construct the $where clause.
         $i = 0;
         foreach ($wherearr as $key => $val) {
@@ -1862,7 +1862,7 @@ 
             // 'commentsurl' is the URL of the item on its own page, with comments.
 
             // All the things we need to work out a listurl!
-            $item_data =  [
+            $item_data = [
                 'major'			=> $this->major,
                 'minor' 		=> $item['minor'],
                 'htype' 		=> $item['htype'],
@@ -1910,7 +1910,7 @@ 
             if (isset($amount['comment']) && $amount['comment'] == true) {
 
                 // All the things we need to get the comment data.
-                $item_data =  [
+                $item_data = [
                     'htype' => $item['htype'],
                     'epobject_id' => $item['epobject_id'],
                 ];
@@ -2031,7 +2031,7 @@ 
                 $DATA->set_page_metadata('pbc_clause', 'url', "$pbc_url/$id");
                 $LISTURL->remove(['id']);
             } else {
-                $LISTURL->insert([ 'id' => $id_data['gid'] ]);
+                $LISTURL->insert(['id' => $id_data['gid']]);
             }
         } else {
             // A debate speech or question/answer, etc.
@@ -2043,10 +2043,10 @@ 
             // Find the gid of this item's (sub)section.
             $parent_gid = '';
 
-            if (isset($this->epobjectid_to_gid[ $parent_epobject_id ])) {
+            if (isset($this->epobjectid_to_gid[$parent_epobject_id])) {
                 // We've previously cached the gid for this epobject_id, so use that.
 
-                $parent_gid = $this->epobjectid_to_gid[ $parent_epobject_id ];
+                $parent_gid = $this->epobjectid_to_gid[$parent_epobject_id];
 
             } else {
                 // We haven't cached the gid, so fetch from db.
@@ -2064,7 +2064,7 @@ 
                     $parent_gid = fix_gid_from_db($r['gid']);
 
                     // Cache it for if we need it again:
-                    $this->epobjectid_to_gid[ $parent_epobject_id ] = $parent_gid;
+                    $this->epobjectid_to_gid[$parent_epobject_id] = $parent_gid;
                 }
             }
 
@@ -2075,7 +2075,7 @@ 
                     $DATA->set_page_metadata('pbc_clause', 'url', "$pbc_url/$parent_gid");
                     $LISTURL->remove(['id']);
                 } else {
-                    $LISTURL->insert([ 'id' => $parent_gid ]);
+                    $LISTURL->insert(['id' => $parent_gid]);
                 }
                 // Use a truncated form of this item's gid for the anchor.
                 $fragment = '#g' . gid_to_anchor($id_data['gid']);
@@ -2140,7 +2140,7 @@ 
         $URL->insert(['p' => $person_id]);
 
         $name = member_full_name($member['house'], $member['title'], $member['given_name'], $member['family_name'], $member['lordofname']);
-        $speaker =  [
+        $speaker = [
             'member_id' => $member['member_id'],
             "name" => $name,
             'house' => $member['house'],
@@ -2164,7 +2164,7 @@ 
     private function _get_speaker_alone($q, $person_id, $hdate, $htime, $major) {
         $members = $q->fetchAll();
         if (count($members) > 1) {
-            $members = array_filter($members, function ($m) use ($major) {
+            $members = array_filter($members, function($m) use ($major) {
                 $houses = \MySociety\TheyWorkForYou\Utility\House::majorToHouse($major);
                 return in_array($m['house'], $houses);
             });
@@ -2272,7 +2272,7 @@ 
                 )->first();
 
                 // Add this comment to the data structure.
-                $comment =  [
+                $comment = [
                     'comment_id' => $q['comment_id'],
                     'user_id'	=> $q['user_id'],
                     'body'		=> $q['body'],
@@ -2287,7 +2287,7 @@ 
         // or subsection itself, only the items within them. So
         // we don't get the most recent comment. Because there isn't one.
 
-        $return =  [
+        $return = [
             'totalcomments' => $totalcomments,
             'comment' => $comment,
         ];
@@ -2350,7 +2350,7 @@ 
         // If part of a Written Answer (just question or just answer), select the whole thing
         if (isset($itemdata['major']) && $hansardmajors[$itemdata['major']]['type'] == 'other' and ($itemdata['htype'] == '12' or $itemdata['htype'] == '13' or $itemdata['htype'] == '14')) {
             // find the gid of the subheading which holds this part
-            $input =  [
+            $input = [
                 'amount' => ['gid' => true],
                 'where' =>  [
                     'epobject_id=' => $itemdata['subsection_id'],
@@ -2366,7 +2366,7 @@ 
 
         # If a WMS main heading, go to next gid
         if (isset($itemdata['major']) && $itemdata['major'] == 4 && $itemdata['htype'] == '10') {
-            $input =  [
+            $input = [
                 'amount' => ['gid' => true],
                 'where' => [
                     'section_id=' => $itemdata['epobject_id'],
@@ -2446,7 +2446,7 @@ 
                 $nextprev['up']['url'] 		= $sectionrow['listurl'];
                 $nextprev['up']['title'] 	= $sectionrow['body'];
             }
-            $nextprev['up']['body']		= gettext('See the whole debate');
+            $nextprev['up']['body'] = gettext('See the whole debate');
         }
 
         // We can then access this from $PAGE and the templates.
@@ -2455,7 +2455,7 @@ 
         // Now get all the non-heading rows.
 
         // What data do we want for each item?
-        $amount =  [
+        $amount = [
             'body' => true,
             'speaker' => true,
             'comment' => true,
@@ -2466,7 +2466,7 @@ 
             // This item is a section, so we're displaying all the items within
             // it that aren't within a subsection.
 
-            $input =  [
+            $input = [
                 'amount' => $amount,
                 'where' =>  [
                     'section_id=' => $itemdata['epobject_id'],
@@ -2478,7 +2478,7 @@ 
             $data['rows'] = $this->_get_hansard_data($input);
             if (!count($data['rows']) || (count($data['rows']) == 1 && strstr($data['rows'][0]['body'], 'was asked'))) {
 
-                $input =  [
+                $input = [
                     'amount' =>  [
                         'body' => true,
                         'comment' => true,
@@ -2500,7 +2500,7 @@ 
         } elseif ($itemdata['htype'] == '11') {
             // This item is a subsection, so we're displaying everything within it.
 
-            $input =  [
+            $input = [
                 'amount' => $amount,
                 'where' =>  [
                     'subsection_id=' => $itemdata['epobject_id'],
@@ -2537,8 +2537,8 @@ 
 
         twfy_debug(get_class($this), "getting data by column");
 
-        $input = [ 'amount' => ['body' => true, 'comment' => true, 'speaker' => true],
-            'where' => [ 'hdate=' => $args['date'], 'major=' => $this->major, 'gid LIKE ' => '%.' . $args['column'] . '.%' ],
+        $input = ['amount' => ['body' => true, 'comment' => true, 'speaker' => true],
+            'where' => ['hdate=' => $args['date'], 'major=' => $this->major, 'gid LIKE ' => '%.' . $args['column'] . '.%'],
             'order' => 'hpos',
         ];
         $data = $this->_get_hansard_data($input);
@@ -2698,10 +2698,10 @@ 
                         ", [':major' => $this->major]);
 
         // What we return.
-        $data =  [];
+        $data = [];
         $speeches = [];
         foreach ($q as $row) {
-            $speech =  [
+            $speech = [
                 'subsection_id' => $row['subsection_id'],
                 'section_id' => $row['section_id'],
                 'htype' => $row['htype'],
@@ -2746,7 +2746,7 @@ 
             $data['rows'] = $speeches;
 
         } else {
-            $data['rows'] =  [];
+            $data['rows'] = [];
         }
 
         $data['info']['days'] = $days;
@@ -2798,7 +2798,7 @@ 
         if ($q) {
 
             // This array just used for getting further data about this debate.
-            $item_data =  [
+            $item_data = [
                 'major'         => $this->major,
                 'minor'         => $q['minor'],
                 'gid'           => fix_gid_from_db($q['gid']),
@@ -2862,7 +2862,7 @@ 
                                 ORDER BY hpos
                                 LIMIT 1
                                 ",
-                    [ ':object_id' => $item_data['epobject_id'] ]
+                    [':object_id' => $item_data['epobject_id']]
                 )->first();
                 $childbody = $r['body'];
                 $speaker = $this->_get_speaker($r['person_id'], $r['hdate'], $r['htime'], $this->major);
@@ -2901,7 +2901,7 @@ 
                 'more_url' => $more_url->generate(),
             ];
 
-            $data =  [
+            $data = [
                 'gid' => $args['gid'],
                 'major' => $this->major,
                 'info' => [],
@@ -2974,7 +2974,7 @@ 
         foreach ($q as $row) {
 
             // This array just used for getting further data about this debate.
-            $item_data =  [
+            $item_data = [
                 'major' => $this->major,
                 'gid' => fix_gid_from_db($row['gid']),
                 'htype' => $row['htype'],
@@ -3034,7 +3034,7 @@ 
 
         }
 
-        $data =  [
+        $data = [
             'info' => [],
             'data' => $data,
         ];
@@ -3098,7 +3098,7 @@ 
         foreach ($q as $row) {
 
             // This array just used for getting further data about this debate.
-            $item_data =  [
+            $item_data = [
                 'major' => $this->major,
                 'gid' => fix_gid_from_db($row['gid']),
                 'htype' => $row['htype'],
@@ -3107,8 +3107,8 @@ 
                 'epobject_id' => $row['epobject_id'],
             ];
 
-            $list_url 		= $this->_get_listurl($item_data);
-            $totalcomments	= $this->_get_comment_count_for_epobject($item_data);
+            $list_url = $this->_get_listurl($item_data);
+            $totalcomments = $this->_get_comment_count_for_epobject($item_data);
 
             $contentcount = $row['count'];
             $body = $row['body'];
@@ -3116,7 +3116,7 @@ 
 
 
             // This array will be added to $data, which is what gets returned.
-            $debate =  [
+            $debate = [
                 'contentcount'	=> $contentcount,
                 'body'			=> $body,
                 'hdate'			=> $hdate,
@@ -3156,7 +3156,7 @@ 
             $data[] = $debate;
         }
 
-        $data =  [
+        $data = [
             'info' => [],
             'data' => $data,
         ];
@@ -3244,7 +3244,7 @@ 
 
         foreach ($q as $row) {
             // This array just used for getting further data about this debate.
-            $item_data =  [
+            $item_data = [
                 'major' => $this->major,
                 'gid' => fix_gid_from_db($row['gid']),
                 'htype' => $row['htype'],
@@ -3253,8 +3253,8 @@ 
                 'epobject_id' => $row['epobject_id'],
             ];
 
-            $list_url 		= $this->_get_listurl($item_data);
-            $totalcomments	= $this->_get_comment_count_for_epobject($item_data);
+            $list_url = $this->_get_listurl($item_data);
+            $totalcomments = $this->_get_comment_count_for_epobject($item_data);
 
             $body = $row['body'];
             $hdate = $row['hdate'];
@@ -3282,7 +3282,7 @@ 
             $childbody = $r['body'];
             $speaker = $this->_get_speaker($r['person_id'], $r['hdate'], $r['htime'], $this->major);
 
-            $data[] =  [
+            $data[] = [
                 'body'			=> $body,
                 'hdate'			=> $hdate,
                 'list_url'		=> $list_url,
@@ -3298,7 +3298,7 @@ 
 
         }
 
-        $data =  [
+        $data = [
             'info' => [],
             'data' => $data,
         ];
@@ -3358,7 +3358,7 @@ 
     public function _get_data_by_bill($args) {
         global $DATA, $this_page;
         $data = [];
-        $input =  [
+        $input = [
             'amount' =>  [
                 'body' => true,
                 'comment' => true,
@@ -3380,7 +3380,7 @@ 
                 [$sitting, $part] = $this->_get_sitting($sectionrow['gid']);
                 $sectionrow['sitting'] = $sitting;
                 $sectionrow['part'] = $part;
-                $input =  [
+                $input = [
                     'amount' =>  [
                         'body' => true,
                         'comment' => true,
@@ -3451,8 +3451,8 @@ 
 
         $YEARURL = new \MySociety\TheyWorkForYou\Url('pbc_session');
         $nextprev = [];
-        $nextprev['prev'] =  ['body' => 'Previous session', 'title' => ''];
-        $nextprev['next'] =  ['body' => 'Next session', 'title' => ''];
+        $nextprev['prev'] = ['body' => 'Previous session', 'title' => ''];
+        $nextprev['next'] = ['body' => 'Next session', 'title' => ''];
         $q = $this->db->query(
             "SELECT session FROM bills WHERE session < :session ORDER BY session DESC LIMIT 1",
             [':session' => $session]

www/includes/easyparliament/templates/html/search/results.php

Braces +4 added lines, -2 removed lines

@@ -19,9 +19,11 @@
                     }
                     ?>
                   <h2><?= sprintf(gettext('%s in constituencies matching <em class="current-search-term">%s</em>'), $desc, _htmlentities($searchstring)) ?></h2>
-                <?php } elseif ($mp_types['former']) { // count($cons) <= 1?>
+                <?php } elseif ($mp_types['former']) {
+// count($cons) <= 1?>
                   <h2><?= sprintf(gettext('Former MP for <em class="current-search-term">%s</em>'), _htmlentities($searchstring)) ?></h2>
-                <?php } else { // count($cons) <= 1?>
+                <?php } else {
+// count($cons) <= 1?>
                   <h2><?= sprintf(gettext('MP for <em class="current-search-term">%s</em>'), _htmlentities($searchstring)) ?></h2>
                 <?php } ?>
                 <?php foreach ($cons as $member) { ?>

Indentation +5 added lines, -5 removed lines

@@ -9,12 +9,12 @@ 
         <div class="search-page__section search-page__section--results">
             <div class="search-page__section__primary">
               <?php
-              # XXX Hack
-              if (preg_match('#winter\s+f[eu]el#i', $searchstring)) { ?>
+                # XXX Hack
+                if (preg_match('#winter\s+f[eu]el#i', $searchstring)) { ?>
                 <h3 style="margin-bottom: 1em;" class="search-result__title"><a href="https://www.theyworkforyou.com/debates/?id=2024-09-10a.712.0">⭐️ Read the debate on the winter fuel regulations</a></h3>
               <?php
-              }
-          if (preg_match('#budget#i', $searchstring)) { ?>
+                }
+            if (preg_match('#budget#i', $searchstring)) { ?>
                 <h3 class="search-result__title"><a href="https://www.theyworkforyou.com/debates/?id=2024-10-30a.811.0#g811.2">Read the Budget speech</a></h3>
               <?php } ?>
 
@@ -65,7 +65,7 @@ 
                 <h2>
                   <?php
                             $term = sprintf('<em class="current-search-term">%s</em>', _htmlentities($searchdescription));
-                  if ($pagination_links) { ?>
+                    if ($pagination_links) { ?>
                     <?= sprintf(gettext('Results %s–%s of %s for %s'), $pagination_links['first_result'], $pagination_links['last_result'], $info['total_results'], $term) ?>
                   <?php } elseif ($info['total_results'] == 1) { ?>
                     <?= sprintf(gettext('The only result for %s'), $term) ?>

www/includes/easyparliament/templates/html/search/by-person.php

Spacing +10 added lines, -10 removed lines

@@ -13,15 +13,15 @@ 
                 <?php if ($error == 'No results' && isset($house) && $house != HOUSE_TYPE_ROYAL) { ?>
                   <ul class="search-result-display-options">
                       <li>
-                        <?php if ($house ==  HOUSE_TYPE_COMMONS) { ?>
+                        <?php if ($house == HOUSE_TYPE_COMMONS) { ?>
                           No results for MPs only
-                        <?php } elseif ($house ==  HOUSE_TYPE_LORDS) { ?>
+                        <?php } elseif ($house == HOUSE_TYPE_LORDS) { ?>
                           No results for Peers only
                         <?php } elseif ($house == HOUSE_TYPE_SCOTLAND) { ?>
                           No results for MSPs only
                         <?php } elseif ($house == HOUSE_TYPE_WALES) { ?>
                           <?= gettext('No results for MSs only') ?>
-                        <?php } elseif ($house ==  HOUSE_TYPE_NI) { ?>
+                        <?php } elseif ($house == HOUSE_TYPE_NI) { ?>
                           No results for MLAs only
                         <?php } ?>
                           |
@@ -47,37 +47,37 @@ 
                     <ul class="search-result-display-options">
                         <li><?= gettext('Results grouped by person') ?></li>
                         <li>
-                          <?php if ($house ==  HOUSE_TYPE_ROYAL) { ?>
+                          <?php if ($house == HOUSE_TYPE_ROYAL) { ?>
                             <?= gettext('Show All') ?>
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html') ?>"><?= gettext('Show All') ?></a>
                           <?php } ?>
                             |
-                          <?php if ($house ==  HOUSE_TYPE_COMMONS) { ?>
+                          <?php if ($house == HOUSE_TYPE_COMMONS) { ?>
                             MPs only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', ['house' => 1]) ?>">MPs only</a>
                           <?php } ?>
                             |
-                          <?php if ($house ==  HOUSE_TYPE_LORDS) { ?>
+                          <?php if ($house == HOUSE_TYPE_LORDS) { ?>
                             Peers only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', ['house' => 2]) ?>">Lords only</a>
                           <?php } ?>
                             |
-                          <?php if ($house ==  HOUSE_TYPE_SCOTLAND) { ?>
+                          <?php if ($house == HOUSE_TYPE_SCOTLAND) { ?>
                             MSPs only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', ['house' => 4]) ?>">MSPs only</a>
                           <?php } ?>
                             |
-                          <?php if ($house ==  HOUSE_TYPE_WALES) { ?>
+                          <?php if ($house == HOUSE_TYPE_WALES) { ?>
                             <?= gettext('MSs only') ?>
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', ['house' => 5]) ?>"><?= gettext('MSs only') ?></a>
                           <?php } ?>
                             |
-                          <?php if ($house ==  HOUSE_TYPE_NI) { ?>
+                          <?php if ($house == HOUSE_TYPE_NI) { ?>
                             MLAs only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', ['house' => HOUSE_TYPE_NI]) ?>">MLAs only</a>
@@ -118,7 +118,7 @@ 
                                 <?php if (isset($speaker['party'])) { ?>
                                   <span class="search-results-grouped__speaker-party">(<?= $speaker['party'] ?>)</span>
                                 <?php } ?>
-                                <?php if ($house !=  HOUSE_TYPE_LORDS) { ?>
+                                <?php if ($house != HOUSE_TYPE_LORDS) { ?>
                                   <?= isset($speaker['office']) ? ' - ' . join('; ', $speaker['office']) : '' ?>
                                 <?php } ?>
                               <?php } else { // no $pid?>

Braces +2 added lines, -1 removed lines

@@ -121,7 +121,8 @@
                                 <?php if ($house !=  HOUSE_TYPE_LORDS) { ?>
                                   <?= isset($speaker['office']) ? ' - ' . join('; ', $speaker['office']) : '' ?>
                                 <?php } ?>
-                              <?php } else { // no $pid?>
+                              <?php } else {
+// no $pid?>
                                 <?= $speaker['name'] ?>
                               <?php } ?>
                             </td>

www/includes/easyparliament/templates/html/section/_calendar.php

Indentation +112 added lines, -112 removed lines

@@ -1,43 +1,43 @@ 
 <div class="calendar">
   <?php if(isset($month)) {
-      // What is the first day of the month in question?
-      $firstDayOfMonth = mktime(0, 0, 0, $month, 1, $year);
-
-      // How many days does this month contain?
-      $numberDays = date('t', $firstDayOfMonth);
-
-      // What is the name of the month in question?
-      $monthName = strftime('%B', $firstDayOfMonth);
-
-      if (isset($info['onday'])) {
-          // 'onday' is like 'yyyy-mm-dd'.
-          $datebits = explode('-', $info['onday']);
-          if (count($datebits) > 2 && $datebits[0] == $year && $datebits[1] == $month) {
-              $toDay = $datebits[2];
-          } else {
-              $toDay = '';
-          }
-      } else {
-          // If this calendar is for this current, real world, month
-          // we get the value of today, so we can highlight it.
-          $nowDateComponents = getdate();
-
-          if ($nowDateComponents['year'] == $year && $nowDateComponents['mon'] == $month) {
-              $toDay = $nowDateComponents['mday'];
-          } else {
-              $toDay = '';
-          }
-      }
-
-      $dayOfWeek = strftime('%w', $firstDayOfMonth) - 1;
-
-      // Adjusted to cope with the week starting on Monday.
-      if ($dayOfWeek < 0) {
-          $dayOfWeek = 6;
-      }
-      ?>
+        // What is the first day of the month in question?
+        $firstDayOfMonth = mktime(0, 0, 0, $month, 1, $year);
+
+        // How many days does this month contain?
+        $numberDays = date('t', $firstDayOfMonth);
+
+        // What is the name of the month in question?
+        $monthName = strftime('%B', $firstDayOfMonth);
+
+        if (isset($info['onday'])) {
+            // 'onday' is like 'yyyy-mm-dd'.
+            $datebits = explode('-', $info['onday']);
+            if (count($datebits) > 2 && $datebits[0] == $year && $datebits[1] == $month) {
+                $toDay = $datebits[2];
+            } else {
+                $toDay = '';
+            }
+        } else {
+            // If this calendar is for this current, real world, month
+            // we get the value of today, so we can highlight it.
+            $nowDateComponents = getdate();
+
+            if ($nowDateComponents['year'] == $year && $nowDateComponents['mon'] == $month) {
+                $toDay = $nowDateComponents['mday'];
+            } else {
+                $toDay = '';
+            }
+        }
+
+        $dayOfWeek = strftime('%w', $firstDayOfMonth) - 1;
+
+        // Adjusted to cope with the week starting on Monday.
+        if ($dayOfWeek < 0) {
+            $dayOfWeek = 6;
+        }
+        ?>
   <?php }
-  if (!isset($years)) { ?>
+    if (!isset($years)) { ?>
     <div class="calendar__controls">
         <?php if (isset($prev)) { ?>
         <a href="<?= $prev['url'] ?>" class="calendar__controls__previous">&larr;</a>
@@ -75,93 +75,93 @@ 
             <tr>
 
 <?php
-          if ($dayOfWeek > 0) {
-              print "<td colspan=\"$dayOfWeek\">&nbsp;</td>";
-          }
+            if ($dayOfWeek > 0) {
+                print "<td colspan=\"$dayOfWeek\">&nbsp;</td>";
+            }
 
-  $currentDay = 1;
+    $currentDay = 1;
 
-  while ($currentDay <= $numberDays) {
+    while ($currentDay <= $numberDays) {
 
-      // Seventh column (Sunday) reached. Start a new row.
+        // Seventh column (Sunday) reached. Start a new row.
 
-      if ($dayOfWeek == 7) {
+        if ($dayOfWeek == 7) {
 
-          $dayOfWeek = 0;
-          ?></tr>
+            $dayOfWeek = 0;
+            ?></tr>
                 <tr><?php
-      }
-
-      $recess = recess_prettify($currentDay, $month, $year, $recess_major);
-
-      // Is this day actually Today in the real world?
-      // If so, higlight it.
-      // Also highlight days where there are no
-      // sittings - e.g. WH is only Tuesday-Thursday
-      if ($currentDay == $toDay) {
-          print '<td class="on"';
-          if ($recess[0] && $recess[0] != 1) {
-              print ' title="' . $recess[0] . '"';
-          }
-          print '>';
-      } elseif ($recess[0]) {
-          print '<td class="no"';
-          if ($recess[0] != 1) {
-              print ' title="' . $recess[0] . '"';
-          }
-          print '>';
-      } else {
-          print '<td>';
-      }
-
-      // Is the $currentDay a member of $dates? If so,
-      // the day should be linked.
-      if (in_array($currentDay, $dates)) {
-
-          $date = sprintf("%04d-%02d-%02d", $year, $month, $currentDay);
-
-          if ($currentDay == $toDay) {
-              print '<span>' . $currentDay . '</span></td>';
-          } else {
-              $day_section = $section;
-              if ($section == 'sp') {
-                  $day_section = 'spdebates';
-              }
-              $urls[$day_section . 'day']->insert(['d' => $date]);
-              print "<a href=\"" . $urls[$day_section . 'day']->generate() . "\">$currentDay</a></td>";
-          }
-
-          // $currentDay is not a member of $dates.
-
-      } else {
-
-          print '<span>' . $currentDay . '</span></td>';
-      }
-      // Increment counters
-
-      $currentDay++;
-      $dayOfWeek++;
-  }
-
-  // Complete the row of the last week in month, if necessary
-
-  if ($dayOfWeek != 7) {
-
-      $remainingDays = 7 - $dayOfWeek;
-      print "<td colspan=\"$remainingDays\">&nbsp;</td>";
-  }
-  ?>
+        }
+
+        $recess = recess_prettify($currentDay, $month, $year, $recess_major);
+
+        // Is this day actually Today in the real world?
+        // If so, higlight it.
+        // Also highlight days where there are no
+        // sittings - e.g. WH is only Tuesday-Thursday
+        if ($currentDay == $toDay) {
+            print '<td class="on"';
+            if ($recess[0] && $recess[0] != 1) {
+                print ' title="' . $recess[0] . '"';
+            }
+            print '>';
+        } elseif ($recess[0]) {
+            print '<td class="no"';
+            if ($recess[0] != 1) {
+                print ' title="' . $recess[0] . '"';
+            }
+            print '>';
+        } else {
+            print '<td>';
+        }
+
+        // Is the $currentDay a member of $dates? If so,
+        // the day should be linked.
+        if (in_array($currentDay, $dates)) {
+
+            $date = sprintf("%04d-%02d-%02d", $year, $month, $currentDay);
+
+            if ($currentDay == $toDay) {
+                print '<span>' . $currentDay . '</span></td>';
+            } else {
+                $day_section = $section;
+                if ($section == 'sp') {
+                    $day_section = 'spdebates';
+                }
+                $urls[$day_section . 'day']->insert(['d' => $date]);
+                print "<a href=\"" . $urls[$day_section . 'day']->generate() . "\">$currentDay</a></td>";
+            }
+
+            // $currentDay is not a member of $dates.
+
+        } else {
+
+            print '<span>' . $currentDay . '</span></td>';
+        }
+        // Increment counters
+
+        $currentDay++;
+        $dayOfWeek++;
+    }
+
+    // Complete the row of the last week in month, if necessary
+
+    if ($dayOfWeek != 7) {
+
+        $remainingDays = 7 - $dayOfWeek;
+        print "<td colspan=\"$remainingDays\">&nbsp;</td>";
+    }
+    ?>
             </tr>
         </tbody>
     </table>
   <?php if(!isset($years)) { ?>
     <div class="calendar__footer">
     <?php
-          $y = $urls['day'];
-      $y->reset();
-      $y->insert([ 'y' => $year ]);
-      $url = $y->generate();
-      ?>
+            $y = $urls['day'];
+        $y->reset();
+        $y->insert([ 'y' => $year ]);
+        $url = $y->generate();
+        ?>
     <a href="<?= $url ?>"><?= sprintf(gettext('See all of %s'), $year) ?></a>
     </div>
   <?php } ?>

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <div class="calendar">
-  <?php if(isset($month)) {
+  <?php if (isset($month)) {
       // What is the first day of the month in question?
       $firstDayOfMonth = mktime(0, 0, 0, $month, 1, $year);
 
@@ -154,12 +154,12 @@ 
             </tr>
         </tbody>
     </table>
-  <?php if(!isset($years)) { ?>
+  <?php if (!isset($years)) { ?>
     <div class="calendar__footer">
     <?php
           $y = $urls['day'];
       $y->reset();
-      $y->insert([ 'y' => $year ]);
+      $y->insert(['y' => $year]);
       $url = $y->generate();
       ?>
     <a href="<?= $url ?>"><?= sprintf(gettext('See all of %s'), $year) ?></a>

www/includes/easyparliament/templates/html/section/day.php

Indentation +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
             <ul class="business-list">
               <?php
                 $prevlevel = '';
-          foreach ($rows as $row) { ?>
+            foreach ($rows as $row) { ?>
                 <?php if ($row['htype'] == 10) {
                     if ($prevlevel == 'sub') { ?>
                     </ul>
@@ -49,7 +49,7 @@ 
                       <?php } ?>
                     </a>
                   <?php }
-                  if (isset($row['excerpt'])) { ?>
+                    if (isset($row['excerpt'])) { ?>
                     <p class="business-list__excerpt">
                         <?= trim_characters($row['excerpt'], 0, 200) ?>
                     </p>