mysociety / theyworkforyou

www/includes/test/utility_test.php

Indentation +2 added lines, -2 removed lines

@@ -12,11 +12,11 @@
 
 class UtilityTest extends UnitTestCase{
 
-  public function testVerpEnvelopeSenderCanCreateStandardSender() {
+    public function testVerpEnvelopeSenderCanCreateStandardSender() {
     $sender = twfy_verp_envelope_sender('aperson@a.nother.dom');
     $expected_sender = 'twfy+aperson=a.nother.dom@' + EMAILDOMAIN;
     $this->assertEqual($sender, $expected_sender, 'verp_envelope_sender can create a sender for a standard address');
-  }
+    }
 
 }
 

Spacing +3 added lines, -3 removed lines

@@ -3,18 +3,18 @@
  * SimpleTest tests for the functions in utility.php
  * $Id: utility_test.php,v 1.3 2009-06-25 12:23:58 louise Exp $
  */
-error_reporting (E_ALL);
+error_reporting(E_ALL);
 ini_set("display_errors", 1);
 include_once dirname(__FILE__) . '/../../../conf/general';
 include_once '../utility.php';
 include_once 'simpletest/unit_tester.php';
 include_once 'simpletest/reporter.php';
 
-class UtilityTest extends UnitTestCase{
+class UtilityTest extends UnitTestCase {
 
   public function testVerpEnvelopeSenderCanCreateStandardSender() {
     $sender = twfy_verp_envelope_sender('aperson@a.nother.dom');
-    $expected_sender = 'twfy+aperson=a.nother.dom@' + EMAILDOMAIN;
+    $expected_sender = 'twfy+aperson=a.nother.dom@' +EMAILDOMAIN;
     $this->assertEqual($sender, $expected_sender, 'verp_envelope_sender can create a sender for a standard address');
   }
 

www/includes/easyparliament/init.php

Braces +3 added lines, -1 removed lines

@@ -41,7 +41,9 @@
 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
 

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

Spacing +22 added lines, -22 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,21 +12,21 @@ 
 ********************************************************************************/
 
 // In case we need to switch these off globally at some point...
-define ("ALLOWCOMMENTS", true);
+define("ALLOWCOMMENTS", 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.
@@ -40,7 +40,7 @@ 
 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
 
@@ -69,39 +69,39 @@ 
 
 // 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);
     }
 }
 
 $filter = new \MySociety\TheyWorkForYou\Utility\LibFilter;
 
-include_once (INCLUDESPATH."easyparliament/user.php");
+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");
+    include_once (INCLUDESPATH . "easyparliament/page.php");
 
 }
 
-include_once (INCLUDESPATH."easyparliament/hansardlist.php");
-include_once (INCLUDESPATH."dbtypes.php");
-include_once (INCLUDESPATH."easyparliament/commentlist.php");
-include_once (INCLUDESPATH."easyparliament/comment.php");
+include_once (INCLUDESPATH . "easyparliament/hansardlist.php");
+include_once (INCLUDESPATH . "dbtypes.php");
+include_once (INCLUDESPATH . "easyparliament/commentlist.php");
+include_once (INCLUDESPATH . "easyparliament/comment.php");
 
 // Added in as new module by Richard Allan MP
-include_once (INCLUDESPATH."easyparliament/alert.php");
+include_once (INCLUDESPATH . "easyparliament/alert.php");
 
 twfy_debug_timestamp("at end of init.php");

www/includes/easyparliament/metadata.php

Indentation +3 added lines, -3 removed lines

@@ -530,7 +530,7 @@ 
         'url'			=> 'peer/'
     ),
     'peers' => array (
-         'menu'			=> array (
+            'menu'			=> array (
             'text'			=> 'Lords',
             'title'			=> "List of all Lords"
         ),
@@ -539,7 +539,7 @@ 
         'url'			=> 'peers/'
     ),
 'overview' => array (
-     'menu'			=> array (
+        'menu'			=> array (
         'text'			=> 'Overview',
         'title'			=> "Overview of the UK Parliament"
     ),
@@ -591,7 +591,7 @@ 
         'url'			=> 'rss/mp/'
     ),
     'mps' => array (
-         'menu'			=> array (
+            'menu'			=> array (
             'text'			=> 'MPs',
             'title'			=> "List of all Members of Parliament (MPs)"
         ),

Spacing +245 added lines, -245 removed lines

@@ -65,10 +65,10 @@ 
 
 */
 
-$this->page = array (
+$this->page = array(
 
 // Things used on EVERY page, unless overridden for a page:
-    'default' => array (
+    'default' => array(
         'parent'	=> '',
         'session_vars' => array('super_debug'),
         'sitetitle'		=> 'TheyWorkForYou',
@@ -78,122 +78,122 @@ 
 
 // KEEP THE PAGES IN ALPHABETICAL ORDER! TA.
 
-    'about' => array (
+    'about' => array(
         'title'			=> 'About us',
         'url'			=> 'about/'
     ),
-    'parliaments' => array (
+    'parliaments' => array(
         'title' 	=> 'Parliaments and assemblies',
         'url'       => 'parliaments/'
     ),
 
-    'alert_stats' => array (
+    'alert_stats' => array(
         'title'			=> 'Email alerts statistics',
         'parent'		=> 'admin',
         'url'			=> 'admin/alert_stats.php',
     ),
-    'admin_badusers' => array (
+    'admin_badusers' => array(
         'title'			=> 'Bad users',
         'parent'		=> 'admin',
         'url'			=> 'admin/badusers.php'
     ),
-    'admin_home' => array (
+    'admin_home' => array(
         'title'			=> 'Home',
         'parent'		=> 'admin',
         'url'			=> 'admin/'
     ),
-    'admin_comments' => array (
+    'admin_comments' => array(
         'title'			=> 'Recent comments',
         'parent'		=> 'admin',
         'url'			=> 'admin/comments.php'
     ),
-    'admin_commentreport' => array (
+    'admin_commentreport' => array(
         'title'			=> 'Processing a comment report',
         'parent'		=> 'admin',
         'url'			=> 'admin/report.php',
-        'session_vars'	=> array ('rid', 'cid')
+        'session_vars'	=> array('rid', 'cid')
     ),
-    'admin_commentreports' => array (
+    'admin_commentreports' => array(
         'title'			=> 'Outstanding comment reports',
         'parent'		=> 'admin',
         'url'			=> 'admin/reports.php'
     ),
-    'admin_failedsearches' => array (
+    'admin_failedsearches' => array(
         'title'			=> 'Failed searches',
         'parent'		=> 'admin',
         'url'			=> 'admin/failedsearches.php'
     ),
-    'admin_glossary' => array (
+    'admin_glossary' => array(
         'title'			=> 'Manage glossary entries',
         'parent'		=> 'admin',
         'url'			=> 'admin/glossary.php'
     ),
-    'admin_glossary_pending' => array (
+    'admin_glossary_pending' => array(
         'title'			=> 'Review pending glossary entries',
         'parent'		=> 'admin',
         'url'			=> 'admin/glossary_pending.php'
     ),
-    'admin_searchlogs' => array (
+    'admin_searchlogs' => array(
         'title'			=> 'Recent searches',
         'parent'		=> 'admin',
         'url'			=> 'admin/searchlogs.php'
     ),
-    'admin_popularsearches' => array (
+    'admin_popularsearches' => array(
         'title'			=> 'Popular searches in last 30 days (first 1000)',
         'parent'		=> 'admin',
         'url'			=> 'admin/popularsearches.php'
     ),
-    'admin_statistics' => array (
+    'admin_statistics' => array(
         'title'			=> 'General statistics',
         'parent'		=> 'admin',
         'url'			=> 'admin/statistics.php'
     ),
-    'admin_reportstats' => array (
+    'admin_reportstats' => array(
         'title'			=> 'Reporting statistics',
         'parent'		=> 'admin',
         'url'			=> 'admin/reporting_stats.php'
     ),
-    'admin_photos' => array (
+    'admin_photos' => array(
         'title'			=> 'Photo upload/attribution',
         'parent'		=> 'admin',
         'url'			=> 'admin/photos.php',
     ),
-    'admin_profile_message' => array (
+    'admin_profile_message' => array(
         'title'			=> 'Profile message banner',
         'parent'		=> 'admin',
         'url'			=> 'admin/profile-message.php',
     ),
-    'admin_mpurls' => array (
+    'admin_mpurls' => array(
         'title'			=> 'MP Websites',
         'parent'		=> 'admin',
         'url'			=> 'admin/websites.php',
     ),
-    'admin_policies' => array (
+    'admin_policies' => array(
         'title'			=> 'MP Policy details',
         'parent'		=> 'admin',
         'url'			=> 'admin/policies.php',
     ),
-    'admin_banner' => array (
+    'admin_banner' => array(
         'title'			=> 'Edit Banner',
         'parent'		=> 'admin',
         'url'			=> 'admin/banner.php',
     ),
-    'admin_featured' => array (
+    'admin_featured' => array(
         'title'			=> 'Featured debates',
         'parent'		=> 'admin',
         'url'			=> 'admin/featured.php',
     ),
-    'admin_topics' => array (
+    'admin_topics' => array(
         'title'			=> 'Topics',
         'parent'		=> 'admin',
         'url'			=> 'admin/topics.php',
     ),
-    'admin_edittopics' => array (
+    'admin_edittopics' => array(
         'title'			=> 'Edit Topic',
         'parent'		=> 'admin_topics',
         'url'			=> 'admin/edittopic.php',
     ),
-    'admin_wikipedia' => array (
+    'admin_wikipedia' => array(
         'title' => 'Wikipedia links',
         'parent' => 'admin',
         'url' => 'admin/wikipedia.php',
@@ -201,8 +201,8 @@ 
 
 // Added by Richard Allan for email alert functions
 
-    'alert' => array (
-        'menu'			=> array (
+    'alert' => array(
+        'menu'			=> array(
             'text'			=> 'Email Alerts',
             'title'			=> "Set up alerts for updates on an MP or Peer by email",
             'sidebar'		=> 'alert'
@@ -211,30 +211,30 @@ 
         'title'			=> 'TheyWorkForYou Email Alerts',
         'url'			=> 'alert/',
     ),
-    'alertwelcome' => array (
+    'alertwelcome' => array(
         'title'			=> 'Email Alerts',
         'url'			=> 'alert/',
     ),
 
 // End of ALERTS additions
 
-    'api_front'		=> array (
-        'menu'			=> array (
+    'api_front'		=> array(
+        'menu'			=> array(
             'text'			=> 'API',
             'title'			=> 'Access our data'
         ),
         'title'			=> 'TheyWorkForYou API',
         'url'			=> 'api/'
     ),
-    'api_doc_front'		=> array (
-        'menu'			=> array (
+    'api_doc_front'		=> array(
+        'menu'			=> array(
             'text'			=> 'API',
             'title'			=> 'Access our data'
         ),
         'parent'		=> 'api_front',
         'url'			=> 'api/'
     ),
-    'api_key'		=> array (
+    'api_key'		=> array(
         'title'			=> 'Plan and keys',
         'parent'		=> 'api_front',
         'url'			=> 'api/key'
@@ -245,69 +245,69 @@ 
         'url' => 'boundaries/',
     ),
 
-    'calendar_summary' => array (
-        'menu'			=> array (
+    'calendar_summary' => array(
+        'menu'			=> array(
             'text'			=> 'Upcoming',
             'title'			=> '',
         ),
         'parent'		=> 'hansard',
         'url'			=> 'calendar/'
     ),
-    'calendar_future_head' => array (
+    'calendar_future_head' => array(
         'parent'		=> 'calendar_summary',
         'title'			=> 'Upcoming business',
         'url'			=> 'calendar/'
     ),
-    'calendar_future' => array (
+    'calendar_future' => array(
         'parent'		=> 'calendar_future_head',
         'url'			=> 'calendar/'
     ),
-    'calendar_today_head' => array (
+    'calendar_today_head' => array(
         'parent'		=> 'calendar_summary',
         'title'			=> 'Today’s business',
         'url'			=> 'calendar/'
     ),
-    'calendar_today' => array (
+    'calendar_today' => array(
         'parent'		=> 'calendar_today_head',
         'url'			=> 'calendar/'
     ),
-    'calendar_past_head' => array (
+    'calendar_past_head' => array(
         'parent'		=> 'calendar_summary',
         'title'			=> 'Previous business',
         'url'			=> 'calendar/'
     ),
-    'calendar_past' => array (
+    'calendar_past' => array(
         'parent'		=> 'calendar_past_head',
         'url'			=> 'calendar/'
     ),
 
-    'cards' => array (
+    'cards' => array(
         'title'			=> 'MP Stats Cards',
         'url'			=> 'cards/'
     ),
 
-    'campaign_foi' => array (
+    'campaign_foi' => array(
         'title'			=> 'Freedom of Information (Parliament) Order 2009',
         'url'			=> 'foiorder2009/'
     ),
-    'campaign' => array (
+    'campaign' => array(
         'title'			=> '', #Free Our Bills!',
         'url'			=> 'freeourbills/'
     ),
-    'campaign_edm' => array (
+    'campaign_edm' => array(
         'title'			=> 'Early Day Motion',
         'parent'		=> 'campaign',
         'url'			=> 'freeourbills/'
     ),
 
-    'commentreport' => array (
+    'commentreport' => array(
         'title'			=> 'Reporting a comment',
         'url'			=> 'report/',
-        'session_vars'	=> array ('id')
+        'session_vars'	=> array('id')
     ),
 
-    'comments_recent' => array (
-        'menu'			=> array (
+    'comments_recent' => array(
+        'menu'			=> array(
             'text'			=> 'Recent comments',
             'title'			=> "Recently posted comments"
         ),
@@ -316,8 +316,8 @@ 
         'url'			=> 'comments/recent/'
     ),
 
-    'contact' => array (
-        'menu'			=> array (
+    'contact' => array(
+        'menu'			=> array(
             'text'			=> 'Contact',
             'title'			=> '',
         ),
@@ -328,23 +328,23 @@ 
         'title' => 'News',
         'url' => 'https://www.mysociety.org/category/projects/theyworkforyou/'
     ),
-    'debate'  => array (
+    'debate'  => array(
         'parent'		=> 'debatesfront',
         'url'			=> 'debates/',
-        'session_vars'	=> array ('id'),
+        'session_vars'	=> array('id'),
     ),
-    'debates'  => array (
+    'debates'  => array(
         'parent'		=> 'debatesfront',
         'url'			=> 'debates/',
-        'session_vars'	=> array ('id'),
+        'session_vars'	=> array('id'),
     ),
-    'debatesday' => array (
+    'debatesday' => array(
         'parent'		=> 'debatesfront',
-        'session_vars'	=> array ('d'),
+        'session_vars'	=> array('d'),
         'url'			=> 'debates/',
     ),
-    'alldebatesfront' => array (
-        'menu'			=> array (
+    'alldebatesfront' => array(
+        'menu'			=> array(
             'text'			=> 'Debates',
             'title'			=> "Debates in the House of Commons, Westminster Hall, and the House of Lords"
         ),
@@ -353,8 +353,8 @@ 
         'rss'			=> 'rss/debates.rss',
         'url'			=> 'debates/'
     ),
-    'debatesfront' => array (
-        'menu'			=> array (
+    'debatesfront' => array(
+        'menu'			=> array(
             'text'			=> 'Commons debates',
             'title'			=> "Debates in the House of Commons"
         ),
@@ -363,12 +363,12 @@ 
         'rss'			=> 'rss/debates.rss',
         'url'			=> 'debates/'
     ),
-    'debatesyear' => array (
+    'debatesyear' => array(
         'parent'		=> 'debatesfront',
         'url'			=> 'debates/'
     ),
-    'divisions_recent' => array (
-        'menu'			=> array (
+    'divisions_recent' => array(
+        'menu'			=> array(
             'text'			=> 'Recent Votes',
             'title'			=> ''
         ),
@@ -376,13 +376,13 @@ 
         'title'			=> 'Recent Votes',
         'url'			=> 'divisions/'
     ),
-    'divisions_vote' => array (
+    'divisions_vote' => array(
         'parent'		=> 'divisions_recent',
         'title'			=> 'Vote',
         'url'			=> 'divisions/division.php',
         'session_vars'	=> array('vote'),
     ),
-    'epvote' => array (
+    'epvote' => array(
         'url'			=> 'vote/'
     ),
 
@@ -391,19 +391,19 @@ 
         'title'			=> 'TheyWorkForYou Google gadget',
     ),
 
-    'glossary' => array (
+    'glossary' => array(
         'heading'		=> 'Glossary',
         'parent'		=> 'help_us_out',
         'url'			=> 'glossary/'
     ),
-    'glossary_item' => array (
+    'glossary_item' => array(
         'heading'		=> 'Glossary heading',
         'parent'		=> 'help_us_out',
         'url'			=> 'glossary/',
-        'session_vars'	=> array ('g')
+        'session_vars'	=> array('g')
     ),
-    'hansard' => array (
-        'menu'			=> array (
+    'hansard' => array(
+        'menu'			=> array(
             'text'			=> 'UK Parliament',
             'title'			=> "Houses of Parliament debates, Written Answers, Statements, Westminster Hall debates, and Bill Committees"
         ),
@@ -411,16 +411,16 @@ 
         'url'			=> ''
     ),
         // Hansard landing page
-        'hansard_landing' => array (
+        'hansard_landing' => array(
                 'title'                 => 'Hansard',
                 'url'                   => 'search-hansard/',
         ),
-    'help' => array (
+    'help' => array(
         'title'			=> 'Help - Frequently Asked Questions',
         'url'			=> 'help/'
     ),
-    'help_us_out' => array (
-        'menu'			=> array (
+    'help_us_out' => array(
+        'menu'			=> array(
             'text'			=> 'Glossary',
             'title'			=> "Parliament's jargon explained"
         ),
@@ -429,88 +429,88 @@ 
         'url'			=> 'addterm/',
         'sidebar'		=> 'glossary_add'
     ),
-    'home' => array (
+    'home' => array(
         'title'			=> "UK Parliament",
         'rss'			=> 'news/index.rdf',
         'url'			=> ''
     ),
-    'houserules' => array (
+    'houserules' => array(
         'title'			=> 'House rules',
         'url'			=> 'houserules/'
     ),
 
-    'linktous' => array (
+    'linktous' => array(
         'title'			=> 'Link to us',
         'heading'		=> 'How to link to us',
         'url'			=> 'help/linktous/'
     ),
-    'api' => array (
+    'api' => array(
         'title'			=> 'API',
         'heading'		=> 'API - Query the TheyWorkForYou database',
         'url'			=> 'api/'
     ),
-    'data' => array (
+    'data' => array(
         'title'			=> 'Raw Data',
         'heading'		=> 'Raw data (XML) - the data behind TheyWorkForYou and Public Whip',
         'url'			=> 'http://parser.theyworkforyou.com'
     ),
-    'pombola' => array (
+    'pombola' => array(
         'title'			=> 'Pombola',
         'heading'		=> 'mySociety\'s platform for running a Parliamentary monitoring site like this',
         'url'			=> 'https://www.mysociety.org/projects/parliamentarymonitoring/pombola'
     ),
-    'devmailinglist' => array (
+    'devmailinglist' => array(
         'title'			=> 'Developer mailing list',
         'heading'		=> 'Developer mailing list',
         'url'			=> 'https://groups.google.com/a/mysociety.org/forum/#!forum/theyworkforyou'
     ),
-    'code' => array (
+    'code' => array(
         'title'			=> 'Source code',
         'heading'		=> 'TheyWorkForYou Source code',
         'url'			=> 'https://github.com/mysociety/theyworkforyou'
     ),
-    'irc' => array (
+    'irc' => array(
         'title'			=> 'IRC chat channel',
         'heading'		=> 'IRC chat channel',
         'url'			=> 'http://www.irc.mysociety.org/'
     ),
-    'newzealand' => array (
+    'newzealand' => array(
         'title'			=> 'New Zealand',
         'heading'		=> 'They Work For You - New Zealand',
         'url'			=> 'http://www.theyworkforyou.co.nz/'
     ),
-    'australia' => array (
+    'australia' => array(
         'title'			=> 'Australia',
         'heading'		=> 'Open Australia',
         'url'			=> 'http://www.openaustralia.org/'
     ),
-    'ireland' => array (
+    'ireland' => array(
         'title'			=> 'Ireland',
         'heading'		=> 'TheyWorkForYou for the Houses of the Oireachtas',
         'url'			=> 'http://www.kildarestreet.com/'
     ),
-    'mzalendo' => array (
+    'mzalendo' => array(
         'title'			=> 'Mzalendo',
         'heading'		=> 'Keeping an eye on the Kenyan Parliament',
         'url'			=> 'http://info.mzalendo.com/'
     ),
-    'lordsdebate'  => array (
+    'lordsdebate'  => array(
         'parent'		=> 'lordsdebatesfront',
         'url'			=> 'lords/',
-        'session_vars'	=> array ('id'),
+        'session_vars'	=> array('id'),
     ),
-    'lordsdebates'  => array (
+    'lordsdebates'  => array(
         'parent'		=> 'lordsdebatesfront',
         'url'			=> 'lords/',
-        'session_vars'	=> array ('id'),
+        'session_vars'	=> array('id'),
     ),
-    'lordsdebatesday' => array (
+    'lordsdebatesday' => array(
         'parent'		=> 'lordsdebatesfront',
-        'session_vars'	=> array ('d'),
+        'session_vars'	=> array('d'),
         'url'			=> 'lords/',
     ),
-    'lordsdebatesfront' => array (
-        'menu'			=> array (
+    'lordsdebatesfront' => array(
+        'menu'			=> array(
             'text'			=> 'Lords debates',
             'title'			=> "House of Lords debates"
         ),
@@ -519,24 +519,24 @@ 
         'rss'			=> 'rss/lords.rss',
         'url'			=> 'lords/'
     ),
-    'lordsdebatesyear' => array (
+    'lordsdebatesyear' => array(
         'parent'		=> 'lordsdebatesfront',
         'url'			=> 'lords/'
     ),
 
         // Parliament landing page
-        'parliament_landing' => array (
+        'parliament_landing' => array(
                 'title'                 => 'Parliament',
                 'url'                   => 'parliament/',
         ),
 
-    'peer' => array (
+    'peer' => array(
         'parent'		=> 'peers',
         'title'			=> 'Peer',
         'url'			=> 'peer/'
     ),
-    'peers' => array (
-         'menu'			=> array (
+    'peers' => array(
+         'menu'			=> array(
             'text'			=> 'Lords',
             'title'			=> "List of all Lords"
         ),
@@ -544,8 +544,8 @@ 
         'title'			=> '',
         'url'			=> 'peers/'
     ),
-'overview' => array (
-     'menu'			=> array (
+'overview' => array(
+     'menu'			=> array(
         'text'			=> 'Overview',
         'title'			=> "Overview of the UK Parliament"
     ),
@@ -554,50 +554,50 @@ 
     'rss'			=> 'news/index.rdf',
     'url'			=> ''
 ),
-    'mla' => array (
+    'mla' => array(
         'parent'		=> 'mlas',
         'title'			=> 'Find your MLA',
         'url'			=> 'mla/'
     ),
-    'mlas' => array (
+    'mlas' => array(
         'parent'		=> 'ni_home',
-        'menu'			=> array (
+        'menu'			=> array(
             'text'			=> 'MLAs',
             'title'			=> "List of all Members of the Northern Ireland Assembly (MLAs)"
         ),
         'title'			=> '',
         'url'			=> 'mlas/'
     ),
-    'msps' => array (
+    'msps' => array(
         'parent'		=> 'sp_home',
-        'menu'			=> array (
+        'menu'			=> array(
             'text'			=> 'MSPs',
             'title'			=> "List of Members of the Scottish Parliament (MSPs)"
         ),
         'title'			=> '',
         'url'			=> 'msps/'
     ),
-    'msp' => array (
+    'msp' => array(
         'parent'		=> 'msps',
         'title'			=> 'Find your MSP',
         'url'			=> 'msp/'
     ),
     /* Not 'Your MP', whose name is 'yourmp'... */
-    'mp' => array (
+    'mp' => array(
         'parent'			=> 'mps',
         'title'			=> 'Find your MP',
         'url'			=> 'mp/'
     ),
-    'emailfriend' => array (
+    'emailfriend' => array(
         'title'			=> 'Send this page to a friend',
         'url'			=> 'email/'
     ),
     // The directory MPs' RSS feeds are stored in.
-    'mp_rss' => array (
+    'mp_rss' => array(
         'url'			=> 'rss/mp/'
     ),
-    'mps' => array (
-         'menu'			=> array (
+    'mps' => array(
+         'menu'			=> array(
             'text'			=> 'MPs',
             'title'			=> "List of all Members of Parliament (MPs)"
         ),
@@ -608,16 +608,16 @@ 
 
     /* Northern Ireland Assembly */
     'ni_home' => array(
-        'menu'			=> array (
+        'menu'			=> array(
             'text'			=> 'Northern Ireland Assembly',
             'title'			=> 'Full authority over <em>transferred matters</em>, which include agriculture, education, employment, the environment and health'
         ),
         'title'			=> 'Northern Ireland Assembly',
         'url'			=> 'ni/'
     ),
-    'nioverview' => array (
+    'nioverview' => array(
         'parent'		=> 'ni_home',
-        'menu'			=> array (
+        'menu'			=> array(
             'text'			=> 'Debates',
             'title'			=> "Overview of the Northern Ireland Assembly debates"
         ),
@@ -625,23 +625,23 @@ 
         'rss'			=> 'rss/ni.rss',
         'url'			=> 'ni/'
     ),
-    'nidebate'  => array (
+    'nidebate'  => array(
         'parent'		=> 'nidebatesfront',
         'url'			=> 'ni/',
-        'session_vars'	=> array ('id'),
+        'session_vars'	=> array('id'),
     ),
-    'nidebates'  => array (
+    'nidebates'  => array(
         'parent'		=> 'nidebatesfront',
         'url'			=> 'ni/',
-        'session_vars'	=> array ('id'),
+        'session_vars'	=> array('id'),
     ),
-    'nidebatesday' => array (
+    'nidebatesday' => array(
         'parent'		=> 'nidebatesfront',
-        'session_vars'	=> array ('d'),
+        'session_vars'	=> array('d'),
         'url'			=> 'ni/',
     ),
-    'nidebatesfront' => array (
-        'menu'			=> array (
+    'nidebatesfront' => array(
+        'menu'			=> array(
             'text'			=> 'Debates',
             'title'			=> "Northern Ireland Assembly debates"
         ),
@@ -650,7 +650,7 @@ 
         'rss'			=> 'rss/ni.rss',
         'url'			=> 'ni/'
     ),
-    'nidebatesyear' => array (
+    'nidebatesyear' => array(
         'parent'		=> 'nidebatesfront',
         'url'			=> 'ni/'
     ),
@@ -658,7 +658,7 @@ 
     /* London Assembly */
 
     'london_home' => array(
-        'menu'          => array (
+        'menu'          => array(
             'text'      => 'London Assembly',
             'title'     => 'Members of the London Assembly, answers from the Mayor of London'
         ),
@@ -666,9 +666,9 @@ 
         'url'           => 'london/'
     ),
 
-    'london-assembly-members' => array (
+    'london-assembly-members' => array(
         'parent'        => 'london_home',
-        'menu'          => array (
+        'menu'          => array(
             'text'      => 'London Assembly Members',
             'title'     => "List of Members of the London Assembly)"
         ),
@@ -676,48 +676,48 @@ 
         'url'           => 'london-assembly-members/'
     ),
 
-    'london-assembly-member' => array (
+    'london-assembly-member' => array(
         'parent'        => 'london-assembly-members',
         'title'         => 'Find your London Assembly Member',
         'url'           => 'london-assembly-member/'
     ),
 
-    'lmqs' => array (
+    'lmqs' => array(
         'parent'		=> 'london_home',
         'url'			=> 'london/',
-        'session_vars'	=> array ('id')
+        'session_vars'	=> array('id')
     ),
-    'lmqsday'  => array (
+    'lmqsday'  => array(
         'parent'		=> 'london_home',
         'url'			=> 'london/',
     ),
-    'lmqsfront' => array (
+    'lmqsfront' => array(
         'parent'		=> 'london_home',
-        'menu'			=> array (
+        'menu'			=> array(
             'text'			=> 'Questions to the Mayor of London',
             'title'			=> "Questions to the Mayor of London"
         ),
         'title'			=> 'questions to the Mayor of London',
         'url'			=> 'london/',
     ),
-    'lmqsyear' => array (
+    'lmqsyear' => array(
         'parent'		=> 'london_home',
         'url'			=> 'london/',
     ),
 
-    'otheruseredit' => array (
+    'otheruseredit' => array(
         'pg'			=> 'editother',
         'title'			=> "Editing a user's data",
         'url'			=> 'user/'
     ),
-    'privacy' => array (
+    'privacy' => array(
         'title'			=> 'Privacy Policy',
         'url'			=> 'privacy/'
     ),
 
     /* Public bill committees */
-    'pbc_front' => array (
-        'menu'			=> array (
+    'pbc_front' => array(
+        'menu'			=> array(
             'text'			=> 'Bill Committees',
             'title'			=> "Public Bill Committees (formerly Standing Committees) debates"
         ),
@@ -735,17 +735,17 @@ 
         'title' => '',
         'url' => 'pbc/',
         'parent' => 'pbc_front',
-        'session_vars'	=> array ('bill'),
+        'session_vars'	=> array('bill'),
     ),
     'pbc_clause' => array(
         'parent'		=> 'pbc_front',
         'url'			=> 'pbc/',
-        'session_vars'	=> array ('id'),
+        'session_vars'	=> array('id'),
     ),
     'pbc_speech' => array(
         'parent'		=> 'pbc_front',
         'url'			=> 'pbc/',
-        'session_vars'	=> array ('id'),
+        'session_vars'	=> array('id'),
     ),
 
     'people' => array(
@@ -757,62 +757,62 @@ 
         'url'			=> '',
     ),
 
-    'raw' => array (
+    'raw' => array(
         'title'			=> 'Raw data',
         'url'			=> 'raw/'
     ),
 
-    'regmem' => array (
+    'regmem' => array(
         'title'			=> 'Changes to the Register of Members\' Interests',
         'url'			=> 'regmem/'
     ),
 
-    'regmem_date' => array (
+    'regmem_date' => array(
         'url'			=> 'regmem/',
         'parent'		=> 'regmem'
     ),
 
-    'regmem_mp' => array (
+    'regmem_mp' => array(
         'url'			=> 'regmem/',
         'parent'		=> 'regmem'
     ),
 
-    'regmem_diff' => array (
+    'regmem_diff' => array(
         'url'			=> 'regmem/',
         'parent'		=> 'regmem'
     ),
 
-    'royal' => array (
+    'royal' => array(
         'parent'        => 'hansard',
         'title'         => 'Royal',
         'url'           => 'royal/',
     ),
 
-    'topic' => array (
+    'topic' => array(
         'parent'        => 'topics',
         'url'           => 'topic/topic.php',
     ),
 
-    'topics' => array (
+    'topics' => array(
         'title'        => 'Topics',
         'url'          => 'topic/',
     ),
 
-    'search'		=> array (
+    'search'		=> array(
         'sidebar'		=> 'search',
         'url'			=> 'search/',
         'robots'		=> 'noindex, nofollow',
         'heading'		=> '',
-        'session_vars'	=> array ('q', 's', 'pid', 'o', 'pop')
+        'session_vars'	=> array('q', 's', 'pid', 'o', 'pop')
     ),
-    'search_help'		=> array (
+    'search_help'		=> array(
         'sidebar'		=> 'search',
         'title'			=> 'Help with searching',
         'url'			=> 'search/'
     ),
 
-    'sitenews'		=> array (
-        'menu'			=> array (
+    'sitenews'		=> array(
+        'menu'			=> array(
             'text'			=> 'TheyWorkForYou news',
             'title'			=> "News about changes to this website"
         ),
@@ -822,68 +822,68 @@ 
         'title'			=> 'TheyWorkForYou news',
         'url'			=> 'news/'
     ),
-    'sitenews_archive'		=> array (
+    'sitenews_archive'		=> array(
         'parent'		=> 'sitenews',
         'rss'			=> 'news/index.rdf',
         'sidebar'		=> 'sitenews',
         'title'			=> 'Archive',
         'url'			=> 'news/archives/'
     ),
-    'sitenews_atom' 	=> array (
+    'sitenews_atom' 	=> array(
         'url'			=> 'news/atom.xml'
     ),
-    'sitenews_date'	=> array (
+    'sitenews_date'	=> array(
         'parent'		=> 'sitenews',
         'rss'			=> 'news/index.rdf',
         'sidebar'		=> 'sitenews'
     ),
-    'sitenews_individual'	=> array (
+    'sitenews_individual'	=> array(
         'parent'		=> 'sitenews',
         'rss'			=> 'news/index.rdf',
         'sidebar'		=> 'sitenews',
     ),
-    'sitenews_rss1' 	=> array (
+    'sitenews_rss1' 	=> array(
         'url'			=> 'news/index.rdf'
     ),
-    'sitenews_rss2' 	=> array (
+    'sitenews_rss2' 	=> array(
         'url'			=> 'news/index.xml'
     ),
 
     /* Scottish Parliament */
     'sp_home' => array(
-        'menu'			=> array (
+        'menu'			=> array(
             'text'			=> 'Scottish Parliament',
             'title'			=> 'Scottish education, health, agriculture, justice, prisons and other devolved areas. Some tax-varying powers'
         ),
         'title'			=> 'Scottish Parliament',
         'url'			=> 'scotland/'
     ),
-    'spoverview' => array (
+    'spoverview' => array(
         'parent'		=> 'sp_home',
-        'menu'			=> array (
+        'menu'			=> array(
             'text'			=> 'Overview',
             'title'			=> "Overview of the Scottish Parliament"
         ),
         'title'			=> '',
         'url'			=> 'scotland/'
     ),
-    'spdebate'  => array (
+    'spdebate'  => array(
         'parent'		=> 'spdebatesfront',
         'url'			=> 'sp/',
-        'session_vars'	=> array ('id'),
+        'session_vars'	=> array('id'),
     ),
-    'spdebates'  => array (
+    'spdebates'  => array(
         'parent'		=> 'spdebatesfront',
         'url'			=> 'sp/',
-        'session_vars'	=> array ('id'),
+        'session_vars'	=> array('id'),
     ),
-    'spdebatesday' => array (
+    'spdebatesday' => array(
         'parent'		=> 'spdebatesfront',
-        'session_vars'	=> array ('d'),
+        'session_vars'	=> array('d'),
         'url'			=> 'sp/',
     ),
-    'spdebatesfront' => array (
-        'menu'			=> array (
+    'spdebatesfront' => array(
+        'menu'			=> array(
             'text'			=> 'Debates',
             'title'			=> ''
         ),
@@ -892,21 +892,21 @@ 
         'url'			=> 'sp/'
     ),
 
-    'spdebatesyear' => array (
+    'spdebatesyear' => array(
         'parent'		=> 'spdebatesfront',
         'url'			=> 'sp/'
     ),
-    'spwrans'  => array (
+    'spwrans'  => array(
         'parent'		=> 'spwransfront',
         'url'			=> 'spwrans/',
         #'session_vars'	=> array ('id'),
     ),
-    'spwransday'  => array (
+    'spwransday'  => array(
         'parent'		=> 'spwransfront',
         'url'			=> 'spwrans/'
     ),
-    'spwransfront'  => array (
-        'menu'			=> array (
+    'spwransfront'  => array(
+        'menu'			=> array(
             'text'			=> 'Written Answers',
             'title'			=> ''
         ),
@@ -919,31 +919,31 @@ 
         'title'			=> 'For questions asked by ',
         'url'			=> 'spwrans/'
     ),
-    'spwransyear' => array (
+    'spwransyear' => array(
         'parent'		=> 'spwransfront',
         'url'			=> 'spwrans/'
     ),
 
     // Topic pages
 
-    'topic' => array (
+    'topic' => array(
         'url'           => 'topic/',
         'title'         => 'Topics'
     ),
 
-    'topicbenefits' => array (
+    'topicbenefits' => array(
         'url'           => 'topic/benefits',
         'parent'        => 'topic',
         'title'         => 'Benefits'
     ),
 
-    'topiccrimestats' => array (
+    'topiccrimestats' => array(
         'url'           => 'topic/crime-stats',
         'parent'        => 'topic',
         'title'         => 'Crime Statistics'
     ),
 
-    'topicnhs' => array (
+    'topicnhs' => array(
         'url'           => 'topic/nhs',
         'parent'        => 'topic',
         'title'         => 'NHS'
@@ -958,29 +958,29 @@ 
         'url'			=> 'user/alerts/',
         'parent'		=> 'userviewself'
     ),
-    'userchangepc' => array (
+    'userchangepc' => array(
         'title'			=> 'Change your postcode',
         'url'			=> 'user/changepc/'
     ),
-    'userconfirm' => array (
+    'userconfirm' => array(
         'url'			=> 'user/confirm/'
     ),
-    'userconfirmed' => array (
+    'userconfirmed' => array(
         'sidebar'		=> 'userconfirmed',
         'title'			=> 'Welcome to TheyWorkForYou!',
         'url'			=> 'user/confirm/'
     ),
-    'userconfirmfailed' => array (
+    'userconfirmfailed' => array(
         'title'			=> 'Oops!',
         'url'			=> 'user/confirm/'
     ),
-    'useredit' => array (
+    'useredit' => array(
         'pg'			=> 'edit',
         'title'			=> 'Edit your details',
         'url'			=> 'user/'
     ),
-    'userjoin' => array (
-                'menu'                  => array (
+    'userjoin' => array(
+                'menu'                  => array(
                         'text'                  => 'Join',
                         'title'                 => "Joining is free and allows you to annotate speeches"
                 ),
@@ -989,8 +989,8 @@ 
                 'title'                 => 'Join TheyWorkForYou',
                 'url'                   => 'user/'
         ),
-    'getinvolved' => array (
-        'menu'			=> array (
+    'getinvolved' => array(
+        'menu'			=> array(
             'text'			=> 'Get involved',
             'title'			=> "Contribute to TheyWorkForYou"
         ),
@@ -999,8 +999,8 @@ 
         'title'			=> 'Contribute to TheyWorkForYou',
         'url'			=> 'getinvolved/'
     ),
-    'userlogin' => array (
-        'menu'			=> array (
+    'userlogin' => array(
+        'menu'			=> array(
             'text'			=> 'Sign in',
             'title'			=> "If you've already joined , sign in to add annotations"
         ),
@@ -1009,33 +1009,33 @@ 
         'url'			=> 'user/login/'
     ),
 
-    'userlogout' => array (
-        'menu'			=> array (
+    'userlogout' => array(
+        'menu'			=> array(
             'text'			=> 'Sign out',
             'title'			=> "Sign out"
         ),
         'url'			=> 'user/logout/'
     ),
-    'userpassword' => array (
+    'userpassword' => array(
         'title'			=> 'Change password',
         'url'			=> 'user/password/'
     ),
-    'userprompt' => array (
+    'userprompt' => array(
         'title'			=> 'Please sign in',
         'url'			=> 'user/prompt/'
     ),
-    'userview' => array (
+    'userview' => array(
         'session_vars'	=> array('u'),
         'url'			=> 'user/'
     ),
-    'userviewself' => array (
-        'menu'			=> array (
+    'userviewself' => array(
+        'menu'			=> array(
             'text'			=> 'Your details',
             'title'			=> "View and edit your details"
         ),
         'url'			=> 'user/'
     ),
-    'userwelcome' => array (
+    'userwelcome' => array(
         'title'			=> 'Welcome!',
         'url'			=> 'user/'
     ),
@@ -1063,23 +1063,23 @@ 
     ),
 
     /* Westminster Hall */
-    'whall'  => array (
+    'whall'  => array(
         'parent'		=> 'whallfront',
         'url'			=> 'whall/',
-        'session_vars'	=> array ('id'),
+        'session_vars'	=> array('id'),
     ),
-    'whalls'  => array (
+    'whalls'  => array(
         'parent'		=> 'whallfront',
         'url'			=> 'whall/',
-        'session_vars'	=> array ('id'),
+        'session_vars'	=> array('id'),
     ),
-    'whallday' => array (
+    'whallday' => array(
         'parent'		=> 'whallfront',
-        'session_vars'	=> array ('d'),
+        'session_vars'	=> array('d'),
         'url'			=> 'whall/',
     ),
-    'whallfront' => array (
-        'menu'			=> array (
+    'whallfront' => array(
+        'menu'			=> array(
             'text'			=> 'Westminster Hall',
             'title'			=> "Westminster Hall debates"
         ),
@@ -1088,23 +1088,23 @@ 
         'rss'			=> 'rss/whall.rss',
         'url'			=> 'whall/'
     ),
-    'whallyear' => array (
+    'whallyear' => array(
         'parent'		=> 'whallfront',
         'url'			=> 'whall/'
     ),
 
-    'wms' => array (
+    'wms' => array(
         'parent'		=> 'wranswmsfront',
         'url'			=> 'wms/',
         'session_vars'	=> array('id')
     ),
-    'wmsday' => array (
+    'wmsday' => array(
         'parent'		=> 'wmsfront',
         'session_vars'	=> array('d'),
         'url'			=> 'wms/'
     ),
-    'wmsfront' => array (
-        'menu'			=> array (
+    'wmsfront' => array(
+        'menu'			=> array(
             'text'			=> 'Written Ministerial Statements',
             'title'			=> ''
         ),
@@ -1113,22 +1113,22 @@ 
         'rss'			=> 'rss/wms.rss',
         'url'			=> 'wms/'
     ),
-    'wmsyear' => array (
+    'wmsyear' => array(
         'parent'		=> 'wmsfront',
         'url'			=> 'wms/'
     ),
 
-    'wrans'  => array (
+    'wrans'  => array(
         'parent'		=> 'wranswmsfront',
         'url'			=> 'wrans/',
-        'session_vars'	=> array ('id')
+        'session_vars'	=> array('id')
     ),
-    'wransday'  => array (
+    'wransday'  => array(
         'parent'		=> 'wransfront',
         'url'			=> 'wrans/'
     ),
-    'wransfront'  => array (
-        'menu'			=> array (
+    'wransfront'  => array(
+        'menu'			=> array(
             'text'			=> 'Written Answers',
             'title'			=> "Written Answers"
         ),
@@ -1141,13 +1141,13 @@ 
         'title'			=> 'For questions asked by ',
         'url'			=> 'wrans/'
     ),
-    'wransyear' => array (
+    'wransyear' => array(
         'parent'		=> 'wransfront',
         'url'			=> 'wrans/'
     ),
 
-    'wranswmsfront'  => array (
-        'menu'			=> array (
+    'wranswmsfront'  => array(
+        'menu'			=> array(
             'text'			=> 'Written Answers',
             'title'			=> 'Written Answers and Statements',
         ),
@@ -1164,8 +1164,8 @@ 
         'title' => 'Your representative',
         'url' => 'your/',
     ),
-    'yourmp' => array (
-        'menu'			=> array (
+    'yourmp' => array(
+        'menu'			=> array(
             'text'			=> 'Your MP',
             'title'			=> "Find out about your Member of Parliament"
         ),
@@ -1174,8 +1174,8 @@ 
         'url'			=> 'mp/',
         'parent'			=> 'mps',
     ),
-    'yourmp_recent' => array (
-        'menu'			=> array (
+    'yourmp_recent' => array(
+        'menu'			=> array(
             'text'			=> 'Recent appearances',
             'title'			=> "Recent speeches and written answers by this MP"
         ),
@@ -1183,8 +1183,8 @@ 
         'title'			=> "Your MP's recent appearances in parliament",
         'url'			=> 'mp/?recent=1'
     ),
-    'yourmsp' => array (
-        'menu'			=> array (
+    'yourmsp' => array(
+        'menu'			=> array(
             'text'			=> 'Your MSPs',
             'title'			=> "Find out about your Members of the Scottish Parliament"
         ),
@@ -1193,8 +1193,8 @@ 
         'title'			=> 'Your MSPs',
         'url'			=> 'msp/'
     ),
-    'yourmla' => array (
-        'menu'			=> array (
+    'yourmla' => array(
+        'menu'			=> array(
             'text'			=> 'Your MLAs',
             'title'			=> "Find out about your Members of the Legislative Assembly"
         ),
@@ -1210,38 +1210,38 @@ 
 // The text displayed on the page itself will also be this,
 // UNLESS the section has a 'heading', in which case that's used instead.
 
-$this->section = array (
+$this->section = array(
 
 
-    'about' => array (
+    'about' => array(
         'title' 	=> 'About Us'
     ),
-    'admin' => array (
+    'admin' => array(
         'title'		=> 'Admin'
     ),
-    'debates' => array (
+    'debates' => array(
         'title' 	=> 'Debates',
         'heading'	=> 'House of Commons Debates'
     ),
-    'help_us_out' => array (
+    'help_us_out' => array(
         'title' 	=> 'Help Us Out'
     ),
-    'hansard' => array (
+    'hansard' => array(
         'title' 	=> 'Hansard'
     ),
-    'home' => array (
+    'home' => array(
         'title' 	=> 'Home'
     ),
-    'mp' => array (
+    'mp' => array(
         'title' 	=> 'Your MP'
     ),
-    'search' => array (
+    'search' => array(
         'title' 	=> 'Search'
     ),
-    'sitenews' => array (
+    'sitenews' => array(
         'title' 	=> 'TheyWorkForYou news'
     ),
-    'wrans' => array (
+    'wrans' => array(
         'title' 	=> 'Written Answers'
     )
 

www/includes/easyparliament/commentlist.php

Indentation +2 added lines, -2 removed lines

@@ -318,7 +318,7 @@ 
         return $data;
     }
 
-  public function _get_data_by_dates($args) {
+    public function _get_data_by_dates($args) {
     // $args should contain start_date and end_date
 
         twfy_debug (get_class($this), "getting data by recent");
@@ -338,7 +338,7 @@ 
         $commentsdata = $this->_get_comment_data($input);
         $data['comments'] = $commentsdata;
         return $data;
-  }
+    }
 
     public function _get_data_by_search($args) {
         // $args should contain 'num', indicating how many to get.

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

@@ -542,11 +542,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 +39 added lines, -39 removed lines

@@ -42,7 +42,7 @@ 
     }
 
 
-    public function display ($view, $args=array(), $format='html') {
+    public function display($view, $args = array(), $format = 'html') {
         // $view is what we're viewing by:
         //	'ep' is all the comments attached to an epobject.
         //	'user' is all the comments written by a user.
@@ -60,13 +60,13 @@ 
 
         if ($view == 'ep' || $view == 'user' || $view == 'recent' || $view == 'search' || $view == 'dates') {
             // What function do we call for this view?
-            $function = '_get_data_by_'.$view;
+            $function = '_get_data_by_' . $view;
             // Get all the dta that's to be rendered.
             $data = $this->$function($args);
 
         } else {
             // Don't have a valid $view;
-            $PAGE->error_message ("You haven't specified a view type.");
+            $PAGE->error_message("You haven't specified a view type.");
             return false;
         }
 
@@ -85,29 +85,29 @@ 
         return true;
     }
 
-    public function render($data, $format='html', $template='comments') {
-        include (INCLUDESPATH."easyparliament/templates/$format/$template.php");
+    public function render($data, $format = 'html', $template = 'comments') {
+        include (INCLUDESPATH . "easyparliament/templates/$format/$template.php");
     }
 
     public function _get_data_by_ep($args) {
         // Get all the data attached to an epobject.
         global $PAGE;
 
-        twfy_debug (get_class($this), "getting data by epobject");
+        twfy_debug(get_class($this), "getting data by epobject");
 
         // What we return.
         $data = array();
         if (!is_numeric($args['epobject_id'])) {
-            $PAGE->error_message ("Sorry, we don't have a valid epobject id");
+            $PAGE->error_message("Sorry, we don't have a valid epobject id");
             return $data;
         }
 
         // For getting the data.
-        $input = array (
-            'amount' => array (
+        $input = array(
+            'amount' => array(
                 'user' => true
             ),
-            'where' => array (
+            'where' => array(
                 'comments.epobject_id=' => $args['epobject_id'],
                 #'visible=' => '1'
             ),
@@ -135,13 +135,13 @@ 
         // comments by things in $args?
         global $PAGE;
 
-        twfy_debug (get_class($this), "getting data by user");
+        twfy_debug(get_class($this), "getting data by user");
 
         // What we return.
         $data = array();
 
         if (!is_numeric($args['user_id'])) {
-            $PAGE->error_message ("Sorry, we don't have a valid user id");
+            $PAGE->error_message("Sorry, we don't have a valid user id");
             return $data;
         }
 
@@ -151,13 +151,13 @@ 
             $num = 10;
         }
 
-        if (isset($args['page']) && is_numeric($args['page']) && $args['page']>1) {
+        if (isset($args['page']) && is_numeric($args['page']) && $args['page'] > 1) {
             $page = $args['page'];
         } else {
             $page = 1;
         }
 
-        $limit = $num*($page-1) . ',' . $num;
+        $limit = $num * ($page - 1) . ',' . $num;
 
         // We're getting the most recent comments posted to epobjects.
         // We're grouping them by epobject so we can just link to each hansard thing once.
@@ -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']];
                 }
             }
         }
@@ -258,7 +258,7 @@ 
         // $args should contain 'num', indicating how many to get.
         // and perhaps pid too, for a particular person
 
-        twfy_debug (get_class($this), "getting data by recent");
+        twfy_debug(get_class($this), "getting data by recent");
 
         // What we return.
         $data = array();
@@ -275,7 +275,7 @@ 
             $page = 1;
         }
 
-        $limit = $num*($page-1) . ',' . $num;
+        $limit = $num * ($page - 1) . ',' . $num;
 
         $where = array(
             'visible=' => '1'
@@ -283,8 +283,8 @@ 
         if (isset($args['pid']) && is_numeric($args['pid'])) {
             $where['person_id='] = $args['pid'];
         }
-        $input = array (
-            'amount' => array (
+        $input = array(
+            'amount' => array(
                 'user' => true
             ),
             'where'  => $where,
@@ -316,15 +316,15 @@ 
   public function _get_data_by_dates($args) {
     // $args should contain start_date and end_date
 
-        twfy_debug (get_class($this), "getting data by recent");
+        twfy_debug(get_class($this), "getting data by recent");
         $data = array();
         $where = array(
             'visible=' => '1',
             'date(posted)>=' => $args['start_date'],
             'date(posted)<=' => $args['end_date']
         );
-        $input = array (
-            'amount' => array (
+        $input = array(
+            'amount' => array(
                 'user' => true
             ),
             'where'  => $where,
@@ -338,7 +338,7 @@ 
     public function _get_data_by_search($args) {
         // $args should contain 'num', indicating how many to get.
 
-        twfy_debug (get_class($this), "getting data by search");
+        twfy_debug(get_class($this), "getting data by search");
 
         // What we return.
         $data = array();
@@ -355,13 +355,13 @@ 
             $page = 1;
         }
 
-        $limit = $num*($page-1) . ',' . $num;
+        $limit = $num * ($page - 1) . ',' . $num;
 
-        $input = array (
-            'amount' => array (
+        $input = array(
+            'amount' => array(
                 'user'=> true
             ),
-            'where'  => array (
+            'where'  => array(
                 'comments.body LIKE' => "%$args[s]%"
             ),
             'order' => 'posted DESC',
@@ -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 = isset($urldata['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(array('id' => $gid ));
+        $URL->insert(array('id' => $gid));
         if ($user_id) {
             $URL->insert(array('u' => $user_id));
         }
@@ -480,9 +480,9 @@ 
         $limit = isset($input['limit']) ? $input['limit'] : '';
 
         // The fields to fetch from db. 'table' => array ('field1', 'field2').
-        $fieldsarr = array (
-            'comments' => array ('comment_id', 'user_id', 'epobject_id', 'body', 'posted', 'modflagged', 'visible'),
-            'hansard' => array ('major', 'gid')
+        $fieldsarr = array(
+            'comments' => array('comment_id', 'user_id', 'epobject_id', 'body', 'posted', 'modflagged', 'visible'),
+            'hansard' => array('major', 'gid')
         );
 
         // Yes, we need the gid of a comment's associated hansard object
@@ -493,7 +493,7 @@ 
 
         // Add on the stuff for getting a user's details.
         if (isset($amount['user']) && $amount['user'] == true) {
-            $fieldsarr['users'] = array ('firstname', 'lastname', 'user_id');
+            $fieldsarr['users'] = array('firstname', 'lastname', 'user_id');
             // Like doing "FROM comments, users" but it's easier to add
             // an "INNER JOIN..." automatically to the query.
             $join .= ' INNER JOIN users ON comments.user_id = users.user_id ';
@@ -504,7 +504,7 @@ 
             $fieldsarr['epobject'] = array('body');
         }
 
-        $fieldsarr2 = array ();
+        $fieldsarr2 = array();
         // Construct the $fields clause.
         foreach ($fieldsarr as $table => $tablesfields) {
             foreach ($tablesfields as $n => $field) {
@@ -515,13 +515,13 @@ 
                 if ($table == 'epobject' && $field == 'body') {
                     $field .= ' AS hbody';
                 }
-                $fieldsarr2[] = $table.'.'.$field;
+                $fieldsarr2[] = $table . '.' . $field;
             }
         }
         $fields = implode(', ', $fieldsarr2);
 
 
-        $wherearr2 = array ();
+        $wherearr2 = array();
         $params = array();
         $i = 0;
         // Construct the $where clause.
@@ -530,7 +530,7 @@ 
             $params[":where$i"] = $val;
             $i++;
         }
-        $where = implode (" AND ", $wherearr2);
+        $where = implode(" AND ", $wherearr2);
 
         if ($order != '') {
             $order = "ORDER BY $order";
@@ -541,7 +541,7 @@ 
         }
 
         // Finally, do the query!
-        $q = $this->db->query ("SELECT $fields
+        $q = $this->db->query("SELECT $fields
                         FROM 	comments
                         $join
                         WHERE $where
@@ -550,7 +550,7 @@ 
                         ", $params);
 
         // Format the data into an array for returning.
-        $data = array ();
+        $data = array();
 
         // If you change stuff here, you might have to change it in
         // $COMMENT->_set_url() too...

www/includes/easyparliament/searchengine.php

Indentation +2 added lines, -2 removed lines

@@ -333,7 +333,7 @@ 
     }
 
     public function get_spelling_correction() {
-         if (!defined('XAPIANDB') || !XAPIANDB)
+            if (!defined('XAPIANDB') || !XAPIANDB)
             return null;
 
         $qd = $this->queryparser->get_corrected_query_string();
@@ -559,7 +559,7 @@ 
             {
                 $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 {
@@ -275,15 +275,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(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

Spacing +29 added lines, -29 removed lines

@@ -96,10 +96,10 @@ 
         // Split words up into individual words, and quoted phrases
         preg_match_all('/(' .
             '"|' . # match either a quote, or...
-            '(?:(?<![' .$this->wordchars. '])-)?' . # optionally a - (exclude)
+            '(?:(?<![' . $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];
@@ -124,8 +124,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;
@@ -138,8 +138,8 @@ 
                     elseif ($value == 'sp') $newv = 7;
                     elseif ($value == 'spwrans' || $value == 'spwran') $newv = 8;
                     elseif ($value == 'lmqs') $newv = 9;
-                    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);
@@ -173,7 +173,7 @@ 
             $this->query .= " $from..$to";
         } elseif ($from) {
             $this->query = str_ireplace("from:$from", '', $this->query);
-            $this->query .= " $from..".date('Ymd');
+            $this->query .= " $from.." . date('Ymd');
         } elseif ($to) {
             $this->query = str_ireplace("to:$to", '', $this->query);
             $this->query .= " 19990101..$to";
@@ -190,7 +190,7 @@ 
 
         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;
@@ -221,7 +221,7 @@ 
         foreach ($m[1] as $phrase) {
             $phrase_new = preg_replace('# PHRASE \d+#', '', $phrase);
             #$this->phrases[] = preg_split('#\s+#', $phrase_new);
-            $qd = str_replace("($phrase)", '"'.$phrase_new.'"', $qd);
+            $qd = str_replace("($phrase)", '"' . $phrase_new . '"', $qd);
         }
         preg_match_all('#\(([^(]*? NEAR [^(]*?)\)#', $qd, $m);
         foreach ($m[1] as $mm) {
@@ -352,7 +352,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;
 
@@ -425,13 +425,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);
@@ -452,13 +452,13 @@ 
                 array_push($this->created, join('', unpack('N', $doc->get_value(2)))); # XXX Needs fixing
             }
             twfy_debug("SEARCH", "gid: $gid relevancy: $relevancy% weight: $weight");
-            array_push($this->gids, "uk.org.publicwhip/".$gid);
+            array_push($this->gids, "uk.org.publicwhip/" . $gid);
             array_push($this->collapsed, $collapsed);
             array_push($this->relevances, $relevancy);
             $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() {
@@ -499,7 +499,7 @@ 
         $body = str_replace($this->specialchars, $this->specialchars_upper, $body);
         $body = mb_convert_encoding($body, "UTF-8", "HTML-ENTITIES");
         $body = str_replace($this->specialchars_upper, $this->specialchars, $body);
-        $splitextract = preg_split('/(<[^>]*>|[0-9,.]+|['.$this->wordcharsnodigit.']+)/', $body, -1, PREG_SPLIT_DELIM_CAPTURE);
+        $splitextract = preg_split('/(<[^>]*>|[0-9,.]+|[' . $this->wordcharsnodigit . ']+)/', $body, -1, PREG_SPLIT_DELIM_CAPTURE);
         $hlextract = "";
         foreach ($splitextract as $extractword) {
             if (preg_match('/^<[^>]*>$/', $extractword)) {
@@ -547,7 +547,7 @@ 
         */
 
         foreach ($this->phrases as $phrase) {
-            $phrasematch = join($phrase, '[^'.$this->wordchars.']+');
+            $phrasematch = join($phrase, '[^' . $this->wordchars . ']+');
             array_push($findwords, "/\b($phrasematch)\b(?!(?>[^<>]*>))/i");
             $replacewords[] = "<span class=\"hi\">\\1</span>";
         }
@@ -565,12 +565,12 @@ 
 
         // 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))
+            $phrasematch = join($phrase, '[^' . $this->wordchars . ']+');
+            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;
                     }
                 }
@@ -578,7 +578,7 @@ 
         }
         if ($pos != -1) return $pos;
 
-        $splitextract = preg_split('/([0-9,.]+|['.$this->wordcharsnodigit.']+)/', $lcbody, -1, PREG_SPLIT_DELIM_CAPTURE);
+        $splitextract = preg_split('/([0-9,.]+|[' . $this->wordcharsnodigit . ']+)/', $lcbody, -1, PREG_SPLIT_DELIM_CAPTURE);
         $stemmed_words = array_map(array($this, 'stem'), $this->words);
         foreach ($splitextract as $extractword) {
             $extractword = preg_replace('/&$/', '', $extractword);
@@ -588,7 +588,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;
                 }
             }
@@ -597,11 +597,11 @@ 
         if ($pos != -1) return $pos;
 
         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 (ctype_digit($word)) $word = '(?:' . $word . '|' . number_format($word) . ')';
+            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;
                     }
                 }
@@ -611,11 +611,11 @@ 
         if ($pos != -1) return $pos;
 
         foreach ($this->words as $word) {
-            if (ctype_digit($word)) $word = '(?:'.$word.'|'.number_format($word).')';
+            if (ctype_digit($word)) $word = '(?:' . $word . '|' . number_format($word) . ')';
             if (preg_match('/(' . $word . ')/', $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;
                     }
                 }

Braces +102 added lines, -49 removed lines

@@ -38,8 +38,9 @@ 
     public $error;
 
     public function __construct($query) {
-        if (!defined('XAPIANDB') || !XAPIANDB)
-            return null;
+        if (!defined('XAPIANDB') || !XAPIANDB) {
+                    return null;
+        }
 
         global $xapiandb, $PAGE;
         if (!$xapiandb) {
@@ -54,8 +55,12 @@ 
             }
         }
         $this->query = $query;
-        if (!isset($this->stemmer)) $this->stemmer = new XapianStem('english');
-        if (!isset($this->enquire)) $this->enquire = new XapianEnquire($xapiandb);
+        if (!isset($this->stemmer)) {
+            $this->stemmer = new XapianStem('english');
+        }
+        if (!isset($this->enquire)) {
+            $this->enquire = new XapianEnquire($xapiandb);
+        }
         if (!isset($this->queryparser)) {
             $this->queryparser = new XapianQueryParser();
             $this->datevaluerange = new XapianDateValueRangeProcessor(1);
@@ -111,7 +116,9 @@ 
         foreach ($all_words as $word) {
             if ($word == '"') {
                 $in_quote = !$in_quote;
-                if ($in_quote) array_push($this->phrases, array());
+                if ($in_quote) {
+                    array_push($this->phrases, array());
+                }
                 if (!$in_quote && !count($this->phrases[count($this->phrases) - 1])) {
                     array_pop($this->phrases);
                 }
@@ -124,23 +131,39 @@ 
             if (strpos($word, ':') !== false) {
                 $items = explode(":", strtolower($word));
                 $type = $items[0];
-                if (substr($type, 0, 1)=='-') $type = substr($type, 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;
-                    elseif ($value == 'whall' || $value == 'westminster' || $value == 'westminhall') $newv = 2;
-                    elseif ($value == 'wrans' || $value == 'wran') $newv = 3;
-                    elseif ($value == 'wms' || $value == 'statements' || $value == 'statement') $newv = 4;
-                    elseif ($value == 'lordsdebates' || $value == 'lords') $newv = 101;
-                    elseif ($value == 'ni' || $value == 'nidebates') $newv = 5;
-                    elseif ($value == 'pbc' || $value == 'standing') $newv = 6;
-                    elseif ($value == 'sp') $newv = 7;
-                    elseif ($value == 'spwrans' || $value == 'spwran') $newv = 8;
-                    elseif ($value == 'lmqs') $newv = 9;
-                    elseif ($value == 'uk') $newv = array(1,2,3,4,6,101);
-                    elseif ($value == 'scotland') $newv = array(7,8);
-                    elseif ($value == 'future') $newv = 'F';
+                    if ($value == 'debates' || $value == 'debate') {
+                        $newv = 1;
+                    } elseif ($value == 'whall' || $value == 'westminster' || $value == 'westminhall') {
+                        $newv = 2;
+                    } elseif ($value == 'wrans' || $value == 'wran') {
+                        $newv = 3;
+                    } elseif ($value == 'wms' || $value == 'statements' || $value == 'statement') {
+                        $newv = 4;
+                    } elseif ($value == 'lordsdebates' || $value == 'lords') {
+                        $newv = 101;
+                    } elseif ($value == 'ni' || $value == 'nidebates') {
+                        $newv = 5;
+                    } elseif ($value == 'pbc' || $value == 'standing') {
+                        $newv = 6;
+                    } elseif ($value == 'sp') {
+                        $newv = 7;
+                    } elseif ($value == 'spwrans' || $value == 'spwran') {
+                        $newv = 8;
+                    } elseif ($value == 'lmqs') {
+                        $newv = 9;
+                    } 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);
                     } else {
@@ -149,8 +172,12 @@ 
                     $this->query = str_ireplace("$type:$value", $newv, $this->query);
                 } elseif ($type == 'groupby') {
                     $newv = $value;
-                    if ($value == 'debates' || $value == 'debate') $newv = 'debate';
-                    if ($value == 'speech' || $value == 'speeches') $newv = 'speech';
+                    if ($value == 'debates' || $value == 'debate') {
+                        $newv = 'debate';
+                    }
+                    if ($value == 'speech' || $value == 'speeches') {
+                        $newv = 'speech';
+                    }
                     $this->query = str_ireplace("$type:$value", '', $this->query);
                     array_push($this->prefixed, array($type, $newv));
                 } elseif ($type == 'from') {
@@ -265,7 +292,9 @@ 
             $end = $this->queryparser->unstem_end($mm);
             while (!$iter->equals($end)) {
                 $tt = $iter->get_term();
-                if (!in_array($tt, $used)) break;
+                if (!in_array($tt, $used)) {
+                    break;
+                }
                 $iter->next();
             }
             $used[] = $tt;
@@ -344,8 +373,9 @@ 
     }
 
     public function get_spelling_correction() {
-         if (!defined('XAPIANDB') || !XAPIANDB)
-            return null;
+         if (!defined('XAPIANDB') || !XAPIANDB) {
+                     return null;
+         }
 
         $qd = $this->queryparser->get_corrected_query_string();
         return $qd;
@@ -353,8 +383,9 @@ 
 
     // Perform partial query to get a count of number of matches
     public function run_count($first_result, $results_per_page, $sort_order='relevance') {
-        if (!defined('XAPIANDB') || !XAPIANDB)
-            return null;
+        if (!defined('XAPIANDB') || !XAPIANDB) {
+                    return null;
+        }
 
         $start = getmicrotime();
 
@@ -384,16 +415,18 @@ 
                 $collapsed = true;
                 if ($items[1] == 'speech')
                     ; // no collapse key
-                elseif ($items[1] == 'debate')
-                    $this->enquire->set_collapse_key(3);
-                else
-                    $PAGE->error_message("Unknown group by '$items[1]' ignored");
+                elseif ($items[1] == 'debate') {
+                                    $this->enquire->set_collapse_key(3);
+                } else {
+                                    $PAGE->error_message("Unknown group by '$items[1]' ignored");
+                }
             }
         }
 
         // default to grouping by subdebate, i.e. by page
-        if (!$collapsed)
-            $this->enquire->set_collapse_key(3);
+        if (!$collapsed) {
+                    $this->enquire->set_collapse_key(3);
+        }
 
         /*
         XXX Helping to debug possible Xapian bug
@@ -473,8 +506,9 @@ 
 
     // Puts HTML highlighting round all the matching words in the text
     public function highlight($body) {
-        if (!defined('XAPIANDB') || !XAPIANDB)
-            return $body;
+        if (!defined('XAPIANDB') || !XAPIANDB) {
+                    return $body;
+        }
 
         $stemmed_words = array_map(array($this, 'stem'), $this->words);
         if (is_array($body)) {
@@ -492,8 +526,9 @@ 
     private $specialchars_upper = array('<', '>', '"', '&');
 
     public function highlight_internal($body, $stemmed_words) {
-        if (!defined('XAPIANDB') || !XAPIANDB)
-            return $body;
+        if (!defined('XAPIANDB') || !XAPIANDB) {
+                    return $body;
+        }
 
         # Does html_entity_decode without the htmlspecialchars
         $body = str_replace($this->specialchars, $this->specialchars_upper, $body);
@@ -514,7 +549,9 @@ 
             $hl = false;
             $matchword = $this->stem($extractword);
             foreach ($stemmed_words as $word) {
-                if ($word == '') continue;
+                if ($word == '') {
+                    continue;
+                }
                 if ($matchword == $word) {
                     $hl = true;
                     break;
@@ -566,8 +603,7 @@ 
         // 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] );
                 if ($wordpos) {
                    if ( ($wordpos < $pos) || ($pos==-1) ) {
@@ -576,17 +612,25 @@ 
                 }
             }
         }
-        if ($pos != -1) return $pos;
+        if ($pos != -1) {
+            return $pos;
+        }
 
         $splitextract = preg_split('/([0-9,.]+|['.$this->wordcharsnodigit.']+)/', $lcbody, -1, PREG_SPLIT_DELIM_CAPTURE);
         $stemmed_words = array_map(array($this, 'stem'), $this->words);
         foreach ($splitextract as $extractword) {
             $extractword = preg_replace('/&$/', '', $extractword);
-            if (!$extractword) continue;
+            if (!$extractword) {
+                continue;
+            }
             $wordpos = strpos($lcbody, $extractword);
-            if (!$wordpos) continue;
+            if (!$wordpos) {
+                continue;
+            }
             foreach ($stemmed_words as $word) {
-                if ($word == '') continue;
+                if ($word == '') {
+                    continue;
+                }
                 $matchword = $this->stem($extractword);
                 if ($matchword == $word && ($wordpos < $pos || $pos==-1)) {
                     $pos = $wordpos;
@@ -594,10 +638,14 @@ 
             }
         }
         // only look for earlier words if phrases weren't found
-        if ($pos != -1) return $pos;
+        if ($pos != -1) {
+            return $pos;
+        }
 
         foreach ($this->words as $word) {
-            if (ctype_digit($word)) $word = '(?:'.$word.'|'.number_format($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 ($wordpos) {
@@ -608,10 +656,14 @@ 
             }
         }
         // only look for something containing the word (ie. something stemmed, but doesn't work all the time) if no whole word was found
-        if ($pos != -1) return $pos;
+        if ($pos != -1) {
+            return $pos;
+        }
 
         foreach ($this->words as $word) {
-            if (ctype_digit($word)) $word = '(?:'.$word.'|'.number_format($word).')';
+            if (ctype_digit($word)) {
+                $word = '(?:'.$word.'|'.number_format($word).')';
+            }
             if (preg_match('/(' . $word . ')/', $lcbody, $matches)) {
                 $wordpos = strpos( $lcbody, $matches[0] );
                 if ($wordpos) {
@@ -622,8 +674,9 @@ 
             }
         }
 
-        if ($pos == -1)
-            $pos = 0;
+        if ($pos == -1) {
+                    $pos = 0;
+        }
 
         return $pos;
     }

www/includes/easyparliament/glossary.php

Braces +14 added lines, -15 removed lines

@@ -107,19 +107,19 @@ 
             if (isset($args['glossary_id']) && ($args['glossary_id'] != "")) {
                 $next = 0; $first_term = null;
                 foreach ($this->terms as $term) {
-                    if (!$first_term) $first_term = $term;
+                    if (!$first_term) {
+                        $first_term = $term;
+                    }
                     $last_term = $term;
                     if ($next == 1) {
                         $this->next_term = $term;
                         break;
-                    }
-                    elseif ($term['glossary_id'] == $args['glossary_id']) {
+                    } elseif ($term['glossary_id'] == $args['glossary_id']) {
                         $this->glossary_id = $args['glossary_id'];
                         $this->current_term = $term;
                         $next = 1;
 
-                    }
-                    else {
+                    } else {
                         $this->previous_term = $term;
                     }
                 }
@@ -134,8 +134,7 @@ 
             }
 
             return ($this->num_terms);
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -278,8 +277,9 @@ 
 
         // check for any glossary terms to replace
         foreach ($this->replace_order as $glossary_id => $count) {
-            if ($glossary_id == $this->glossary_id)
-                continue;
+            if ($glossary_id == $this->glossary_id) {
+                            continue;
+            }
 
             $term_body = $this->terms[$glossary_id]['body'];
             $term_title = $this->terms[$glossary_id]['title'];
@@ -290,12 +290,10 @@ 
             // catch glossary terms within their own definitions
             if ($glossary_id == $this->glossary_id) {
                 $replacewords[] = "<strong>\\1</strong>";
-            }
-            else {
+            } else {
                 if ($this_page == "admin_glossary") {
                     $link_url = "#gl".$glossary_id;
-                }
-                else {
+                } else {
                     $link_url = $URL->generate('url');
                 }
                 $title = _htmlentities(trim_characters($term_body, 0, 80));
@@ -304,8 +302,9 @@ 
         }
         // Highlight all occurrences of another glossary term in the definition.
         $body = preg_replace($findwords, $replacewords, $body, 1);
-        if (isset($this->glossary_id))
-            $body = preg_replace("/(?<![>\.\'\/])\b(" . $this->terms[$this->glossary_id]['title'] . ")\b(?![<\'])/i", '<strong>\\1</strong>', $body, 1);
+        if (isset($this->glossary_id)) {
+                    $body = preg_replace("/(?<![>\.\'\/])\b(" . $this->terms[$this->glossary_id]['title'] . ")\b(?![<\'])/i", '<strong>\\1</strong>', $body, 1);
+        }
 
         // Replace any phrases in wikipedia
         // TODO: Merge this code into above, so our gloss and wikipedia

Spacing +15 added lines, -15 removed lines

@@ -21,20 +21,20 @@ 
 */
 
 // This handles basic insertion and approval functions for all epobjects
-include_once INCLUDESPATH."easyparliament/searchengine.php";
+include_once INCLUDESPATH . "easyparliament/searchengine.php";
 
 class GLOSSARY {
 
-    public $num_terms;			// how many glossary entries do we have
+    public $num_terms; // how many glossary entries do we have
                             // (changes depending on how GLOSSARY is called
-    public $hansard_count;		// how many times does the phrase appear in hansard?
-    public $query;				// search term
-    public $glossary_id;		// if this is set then we only have 1 glossary term
-    public $current_term;		// will only be set if we have a valid epobject_id
+    public $hansard_count; // how many times does the phrase appear in hansard?
+    public $query; // search term
+    public $glossary_id; // if this is set then we only have 1 glossary term
+    public $current_term; // will only be set if we have a valid epobject_id
     public $current_letter;
 
     // constructor...
-    public function __construct($args=array()) {
+    public function __construct($args = array()) {
     // We can optionally start the glossary with one of several arguments
     //		1. glossary_id - treat the glossary as a single term
     //		2. glossary_term - search within glossary for a term
@@ -73,16 +73,16 @@ 
 
             // These stop stupid submissions.
             // everything should be lowercase.
-            $this->stopwords = array( "the", "of", "to", "and", "for", "in", "a", "on", "is", "that", "will", "secretary", "are", "ask", "state", "have", "be", "has", "by", "with", "i", "not", "what", "as", "it", "hon", "he", "which", "from", "if", "been", "this", "s", "we", "at", "government", "was", "my", "an", "department", "there", "make", "or", "made", "their", "all", "but", "they", "how", "debate" );
+            $this->stopwords = array("the", "of", "to", "and", "for", "in", "a", "on", "is", "that", "will", "secretary", "are", "ask", "state", "have", "be", "has", "by", "with", "i", "not", "what", "as", "it", "hon", "he", "which", "from", "if", "been", "this", "s", "we", "at", "government", "was", "my", "an", "department", "there", "make", "or", "made", "their", "all", "but", "they", "how", "debate");
 
     }
 
-    public function get_glossary_item($args=array()) {
+    public function get_glossary_item($args = array()) {
         // Search for and fetch glossary item with title or glossary_id
         // We could also search glossary text that contains the title text, for cross references
 
         $this->alphabet = array();
-        foreach (range ("A", "Z") as $letter) {
+        foreach (range("A", "Z") as $letter) {
             $this->alphabet[$letter] = array();
         }
 
@@ -138,7 +138,7 @@ 
         }
     }
 
-    public function search_glossary($args=array()) {
+    public function search_glossary($args = array()) {
         // Search for and fetch glossary item with a title
         // Useful for the search page, and nowhere else (so far)
 
@@ -190,12 +190,12 @@ 
         global $THEUSER;
 
         if ($data['title'] == '') {
-            error ("Sorry, you can't define a term without a title");
+            error("Sorry, you can't define a term without a title");
             return false;
         }
 
         if ($data['body'] == '') {
-            error ("You haven't entered a definition!");
+            error("You haven't entered a definition!");
             return false;
         }
 
@@ -248,7 +248,7 @@ 
         }
     }
 
-    public function glossarise($body, $tokenize=0, $urlize=0) {
+    public function glossarise($body, $tokenize = 0, $urlize = 0) {
     // Turn a body of text into a link-up wonderland of glossary joy
 
         global $this_page;
@@ -291,7 +291,7 @@ 
             }
             else {
                 if ($this_page == "admin_glossary") {
-                    $link_url = "#gl".$glossary_id;
+                    $link_url = "#gl" . $glossary_id;
                 }
                 else {
                     $link_url = $URL->generate('url');

www/includes/easyparliament/templates/html/mp/error.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 
             <p><?= $error ?></p>
 
-        <?php if ( $rep_search_url ) { ?>
+        <?php if ($rep_search_url) { ?>
         </div>
 
         <div class="full-page__unit">

www/includes/easyparliament/templates/html/mp/votes.php

Indentation +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
                               <?php foreach ($segment['votes']->positions as $key_vote) {
 
                                 if (isset($policy_last_update[$key_vote['policy_id']]) && $policy_last_update[$key_vote['policy_id']] > $most_recent) {
-                                  $most_recent = $policy_last_update[$key_vote['policy_id']];
+                                    $most_recent = $policy_last_update[$key_vote['policy_id']];
                                 }
 
                                 if ( $key_vote['has_strong'] || $key_vote['position'] == 'has never voted on' ) {
@@ -81,7 +81,7 @@ 
 
                                 include '_vote_description.php';
 
-                              } ?>
+                                } ?>
                             </ul>
 
                             <div class="share-vote-descriptions">

Braces +5 added lines, -2 removed lines

@@ -110,13 +110,16 @@
 
                         <?php endif; ?>
 
-                    <?php else: ?>
+                    <?php else {
+    : ?>
 
                         <div class="panel">
                             <p>This person has not voted on any of the key issues which we keep track of.</p>
                         </div>
 
-                    <?php endif; ?>
+                    <?php endif;
+}
+?>
 
                 <?php endif; ?>
 

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
                                   $most_recent = $policy_last_update[$key_vote['policy_id']];
                                 }
 
-                                if ( $key_vote['has_strong'] || $key_vote['position'] == 'has never voted on' ) {
+                                if ($key_vote['has_strong'] || $key_vote['position'] == 'has never voted on') {
                                     $description = ucfirst($key_vote['desc']);
                                 } else {
                                     $description = sprintf(

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

@@ -48,7 +48,7 @@ 
 
                 <?php if ($has_voting_record): ?>
 
-                    <?php $displayed_votes = FALSE; ?>
+                    <?php $displayed_votes = false; ?>
 
                     <?php foreach ($key_votes_segments as $segment): ?>
 
@@ -105,7 +105,7 @@ 
 
                         </div>
 
-                            <?php $displayed_votes = TRUE; ?>
+                            <?php $displayed_votes = true; ?>
 
                         <?php endif; ?>
 

www/includes/easyparliament/templates/html/mp/recent.php

Indentation +4 added lines, -4 removed lines

@@ -38,11 +38,11 @@ 
                 if ( isset($divisions) && $divisions ) {
                     if ($has_voting_record) {
                         foreach ($divisions as $division) {
-                          $displayed_votes = TRUE;
+                            $displayed_votes = TRUE;
 
-                          if ($current_date != $division['date']) {
+                            if ($current_date != $division['date']) {
                             if ($current_date != '' ) {
-                              print('</ul></div>');
+                                print('</ul></div>');
                             }
                             $current_date = $division['date'];
                             $sidebar_links[] = $division['date'];
@@ -51,7 +51,7 @@ 
                             <h2><?= strftime('%e %b %Y', strtotime($division['date'])) ?></h2>
                              <ul class="vote-descriptions policy-votes">
                           <?php }
-                          include('_division_description.php');
+                            include('_division_description.php');
                         }
                         echo('</div>');
                     }

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

@@ -30,15 +30,15 @@
 
                 <?php
 
-                $displayed_votes = FALSE;
-                $show_all = TRUE;
+                $displayed_votes = false;
+                $show_all = true;
                 $current_date = '';
                 $sidebar_links = array();
 
                 if ( isset($divisions) && $divisions ) {
                     if ($has_voting_record) {
                         foreach ($divisions as $division) {
-                          $displayed_votes = TRUE;
+                          $displayed_votes = true;
 
                           if ($current_date != $division['date']) {
                             if ($current_date != '' ) {

Spacing +3 added lines, -3 removed lines

@@ -35,13 +35,13 @@ 
                 $current_date = '';
                 $sidebar_links = array();
 
-                if ( isset($divisions) && $divisions ) {
+                if (isset($divisions) && $divisions) {
                     if ($has_voting_record) {
                         foreach ($divisions as $division) {
                           $displayed_votes = TRUE;
 
                           if ($current_date != $division['date']) {
-                            if ($current_date != '' ) {
+                            if ($current_date != '') {
                               print('</ul></div>');
                             }
                             $current_date = $division['date'];
@@ -67,7 +67,7 @@ 
 
             <div class="sidebar__unit in-page-nav">
                 <ul data-magellan-expedition="fixed">
-                  <?php foreach($sidebar_links as $date) { ?>
+                  <?php foreach ($sidebar_links as $date) { ?>
                     <li data-magellan-arrival="<?= strftime('%Y-%m-%d', strtotime($date)) ?>">
                         <a href="#<?= strftime('%Y-%m-%d', strtotime($date)) ?>">
                             <?= strftime('%e %b %Y', strtotime($date)) ?>