mysociety / theyworkforyou

classes/FacebookLogin.php

Doc Comments +3 added lines

@@ -23,6 +23,9 @@
         return $this->fb;
     }
 
+    /**
+     * @return string
+     */
     public function getLoginURL() {
         $helper = $this->getFacebookObject()->getRedirectLoginHelper();
         $permissions = ['email'];

Indentation +24 added lines, -24 removed lines

@@ -13,11 +13,11 @@ 
 
     public function getFacebookObject() {
         if (!isset($this->fb)) {
-          $this->fb = new \Facebook\Facebook([
+            $this->fb = new \Facebook\Facebook([
             'app_id' => FACEBOOK_APP_ID,
             'app_secret' => FACEBOOK_APP_SECRET,
             'default_graph_version' => 'v2.2',
-          ]);
+            ]);
         }
 
         return $this->fb;
@@ -30,46 +30,46 @@ 
     }
 
     public function handleFacebookRedirect() {
-      $helper = $this->getFacebookObject()->getRedirectLoginHelper();
+        $helper = $this->getFacebookObject()->getRedirectLoginHelper();
 
-      $data = array('login_url' => $this->getLoginURL());
+        $data = array('login_url' => $this->getLoginURL());
 
-      try {
+        try {
         $accessToken = $helper->getAccessToken();
-      } catch(\Facebook\Exceptions\FacebookResponseException $e) {
+        } catch(\Facebook\Exceptions\FacebookResponseException $e) {
         $data['error'] = 'Graph returned an error: ' . $e->getMessage();
         return $data;
-      } catch(\Facebook\Exceptions\FacebookSDKException $e) {
+        } catch(\Facebook\Exceptions\FacebookSDKException $e) {
         $data['error'] = 'Facebook SDK returned an error: ' . $e->getMessage();
         return $data;
-      }
+        }
 
-      $token = $this->checkAccessToken($accessToken);
+        $token = $this->checkAccessToken($accessToken);
 
-      if ($token) {
-          return array('token' => $token);
-      } else {
-          $data['error'] = 'Problem getting Facebook token';
-          return $data;
-      }
+        if ($token) {
+            return array('token' => $token);
+        } else {
+            $data['error'] = 'Problem getting Facebook token';
+            return $data;
+        }
     }
 
 
     private function checkAccessToken($accessToken) {
-      if (!isset($accessToken)) {
-          return False;
-      }
+        if (!isset($accessToken)) {
+            return False;
+        }
 
-      if (! $accessToken->isLongLived()) {
+        if (! $accessToken->isLongLived()) {
         $oAuth2Client = $this->getFacebookObject()->getOAuth2Client();
         try {
-          $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);
+            $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);
         } catch (\Facebook\Exceptions\FacebookSDKException $e) {
-          return False;
+            return False;
+        }
         }
-      }
 
-      return $accessToken;
+        return $accessToken;
     }
 
     public function loginUser($accessToken) {
@@ -158,7 +158,7 @@ 
             'optin' => $THEUSER->optin(),
             'emailpublic' => False,
             'password' => '',
-         );
+            );
 
         $THEUSER->update_self_no_confirm($details);
     }

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

@@ -57,7 +57,7 @@ 
 
     private function checkAccessToken($accessToken) {
       if (!isset($accessToken)) {
-          return False;
+          return false;
       }
 
       if (! $accessToken->isLongLived()) {
@@ -65,7 +65,7 @@ 
         try {
           $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);
         } catch (\Facebook\Exceptions\FacebookSDKException $e) {
-          return False;
+          return false;
         }
       }
 
@@ -86,7 +86,7 @@ 
         $expires = intval($accessToken->getExpiresAt()->format('U'));
         twfy_debug("THEUSER", "Facebook access token expires at " . $expires);
 
-        $success = False;
+        $success = false;
         if ($user_id) {
             twfy_debug("THEUSER", "Faceook user exists in the database: " . $user_id);
             $success = $THEUSER->init($user_id);
@@ -112,7 +112,7 @@ 
             return $logged_in;
         }
 
-        return False;
+        return false;
     }
 
     public function createUser($accessToken, $user) {
@@ -128,9 +128,9 @@ 
             'url' => '',
             'status' => '',
             'password' => '',
-            'optin' => False,
-            'emailpublic' => False,
-            'mp_alert' => False,
+            'optin' => false,
+            'emailpublic' => false,
+            'mp_alert' => false,
             'facebook_id' => $user['id']
         );
         $added = $THEUSER->add($details, false);
@@ -156,7 +156,7 @@ 
             'postcode' => $THEUSER->postcode(),
             'url' => $THEUSER->url(),
             'optin' => $THEUSER->optin(),
-            'emailpublic' => False,
+            'emailpublic' => false,
             'password' => '',
          );
 

Spacing +3 added lines, -3 removed lines

@@ -36,10 +36,10 @@ 
 
       try {
         $accessToken = $helper->getAccessToken();
-      } catch(\Facebook\Exceptions\FacebookResponseException $e) {
+      } catch (\Facebook\Exceptions\FacebookResponseException $e) {
         $data['error'] = 'Graph returned an error: ' . $e->getMessage();
         return $data;
-      } catch(\Facebook\Exceptions\FacebookSDKException $e) {
+      } catch (\Facebook\Exceptions\FacebookSDKException $e) {
         $data['error'] = 'Facebook SDK returned an error: ' . $e->getMessage();
         return $data;
       }
@@ -60,7 +60,7 @@ 
           return False;
       }
 
-      if (! $accessToken->isLongLived()) {
+      if (!$accessToken->isLongLived()) {
         $oAuth2Client = $this->getFacebookObject()->getOAuth2Client();
         try {
           $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);

classes/Model/Featured.php

Doc Comments +8 added lines

@@ -52,6 +52,11 @@ 
         $this->_set('featured_related', $related);
     }
 
+    /**
+     * @param string $key
+     *
+     * @return string
+     */
     private function _get($key) {
         $text = NULL;
 
@@ -72,6 +77,9 @@ 
         return $text;
     }
 
+    /**
+     * @param string $key
+     */
     private function _set($key, $value) {
         if ( trim($value) == '' ) {
             $value = NULL;

Spacing +4 added lines, -4 removed lines

@@ -64,7 +64,7 @@ 
 
         if ($q->rows) {
             $text = $q->field(0, 'value');
-            if ( trim($text) == '' ) {
+            if (trim($text) == '') {
                 $text = NULL;
             }
         }
@@ -73,7 +73,7 @@ 
     }
 
     private function _set($key, $value) {
-        if ( trim($value) == '' ) {
+        if (trim($value) == '') {
             $value = NULL;
         }
         $check_q = $this->db->query(
@@ -82,7 +82,7 @@ 
                 ':key' => $key
             )
         );
-        if ( $check_q->rows ) {
+        if ($check_q->rows) {
             $set_q = $this->db->query("UPDATE editorial set value = :value WHERE item = :key",
                 array(
                     ':key' => $key,
@@ -98,7 +98,7 @@ 
             );
         }
 
-        if ( $set_q->success() ) {
+        if ($set_q->success()) {
             return true;
         }
         return false;

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

@@ -53,7 +53,7 @@ 
     }
 
     private function _get($key) {
-        $text = NULL;
+        $text = null;
 
         $q = $this->db->query(
             "SELECT value FROM editorial WHERE item = :key",
@@ -65,7 +65,7 @@ 
         if ($q->rows) {
             $text = $q->field(0, 'value');
             if ( trim($text) == '' ) {
-                $text = NULL;
+                $text = null;
             }
         }
 
@@ -74,7 +74,7 @@ 
 
     private function _set($key, $value) {
         if ( trim($value) == '' ) {
-            $value = NULL;
+            $value = null;
         }
         $check_q = $this->db->query(
             "SELECT value FROM editorial WHERE item = :key",

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 +24 added lines, -24 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,22 +12,22 @@ 
 ********************************************************************************/
 
 // In case we need to switch these off globally at some point...
-define ("ALLOWCOMMENTS", true);
-define ("ALLOWTRACKBACKS", true);
+define("ALLOWCOMMENTS", true);
+define("ALLOWTRACKBACKS", true);
 
 // These variables are so we can keep date/time formats consistent across the site
 // and change them easily.
 // Formats here: http://www.php.net/manual/en/function.date.php
-define ("LONGERDATEFORMAT",		"l, j F Y");// Monday, 31 December 2003
-define ("LONGDATEFORMAT", 		"j F Y"); 	// 31 December 2003
-define ("SHORTDATEFORMAT", 		"j M Y");	// 31 Dec 2003
-define ("TIMEFORMAT", 			"g:i a");	// 11:59 pm
+define("LONGERDATEFORMAT", "l, j F Y"); // Monday, 31 December 2003
+define("LONGDATEFORMAT", "j F Y"); // 31 December 2003
+define("SHORTDATEFORMAT", "j M Y"); // 31 Dec 2003
+define("TIMEFORMAT", "g:i a"); // 11:59 pm
 
-define ("SHORTDATEFORMAT_SQL",	"%e %b %Y"); // 31 Dec 2003
-define ("TIMEFORMAT_SQL", 		"%l:%i %p"); // 11:59 PM
+define("SHORTDATEFORMAT_SQL", "%e %b %Y"); // 31 Dec 2003
+define("TIMEFORMAT_SQL", "%l:%i %p"); // 11:59 PM
 
 // Where we store the postcode of users if they search for an MP by postcode.
-define ('POSTCODE_COOKIE', 		'eppc');
+define('POSTCODE_COOKIE', 'eppc');
 
 /********************************************************************************
 And now all the files we'll include on every page.
@@ -41,7 +41,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
 
@@ -70,40 +70,40 @@ 
 
 // 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/trackback.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/trackback.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 +235 added lines, -235 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,117 +78,117 @@ 
 
 // 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_trackbacks' => array (
+    'admin_trackbacks' => array(
         'title'			=> 'Recent trackbacks',
         'parent'		=> 'admin',
         'url'			=> 'admin/trackbacks.php'
     ),
-    'admin_photos' => array (
+    'admin_photos' => array(
         'title'			=> 'Photo upload/attribution',
         'parent'		=> 'admin',
         'url'			=> 'admin/photos.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',
@@ -196,8 +196,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'
@@ -206,30 +206,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'			=> 'API Keys',
         'parent'		=> 'api_front',
         'url'			=> 'api/key'
@@ -240,69 +240,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"
         ),
@@ -311,8 +311,8 @@ 
         'url'			=> 'comments/recent/'
     ),
 
-    'contact' => array (
-        'menu'			=> array (
+    'contact' => array(
+        'menu'			=> array(
             'text'			=> 'Contact',
             'title'			=> '',
         ),
@@ -323,23 +323,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"
         ),
@@ -348,8 +348,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"
         ),
@@ -358,12 +358,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'			=> ''
         ),
@@ -371,12 +371,12 @@ 
         'title'			=> 'Recent Votes',
         'url'			=> 'divisions/'
     ),
-    'divisions_vote' => array (
+    'divisions_vote' => array(
         'parent'		=> 'divisions_recent',
         'title'			=> 'Vote',
         'url'			=> 'divisions/division.php'
     ),
-    'epvote' => array (
+    'epvote' => array(
         'url'			=> 'vote/'
     ),
 
@@ -385,19 +385,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"
         ),
@@ -405,16 +405,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"
         ),
@@ -423,88 +423,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"
         ),
@@ -513,24 +513,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"
         ),
@@ -538,8 +538,8 @@ 
         'title'			=> '',
         'url'			=> 'peers/'
     ),
-'overview' => array (
-     'menu'			=> array (
+'overview' => array(
+     'menu'			=> array(
         'text'			=> 'Overview',
         'title'			=> "Overview of the UK Parliament"
     ),
@@ -548,50 +548,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)"
         ),
@@ -602,16 +602,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"
         ),
@@ -619,23 +619,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"
         ),
@@ -644,24 +644,24 @@ 
         'rss'			=> 'rss/ni.rss',
         'url'			=> 'ni/'
     ),
-    'nidebatesyear' => array (
+    'nidebatesyear' => array(
         'parent'		=> 'nidebatesfront',
         'url'			=> 'ni/'
     ),
 
-    '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"
         ),
@@ -679,17 +679,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(
@@ -701,62 +701,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"
         ),
@@ -766,68 +766,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'			=> ''
         ),
@@ -836,21 +836,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'			=> ''
         ),
@@ -863,38 +863,38 @@ 
         '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'
     ),
 
     // The URL 3rd parties need to ping something here.
-    'trackback' => array (
+    'trackback' => array(
         'url'			=> 'trackback/'
     ),
 
@@ -907,29 +907,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"
                 ),
@@ -938,8 +938,8 @@ 
                 'title'                 => 'Join TheyWorkForYou',
                 'url'                   => 'user/'
         ),
-    'getinvolved' => array (
-        'menu'			=> array (
+    'getinvolved' => array(
+        'menu'			=> array(
             'text'			=> 'Get involved',
             'title'			=> "Contribute to TheyWorkForYou"
         ),
@@ -948,8 +948,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"
         ),
@@ -958,33 +958,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/'
     ),
@@ -1012,23 +1012,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"
         ),
@@ -1037,23 +1037,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'			=> ''
         ),
@@ -1062,22 +1062,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"
         ),
@@ -1090,13 +1090,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',
         ),
@@ -1113,8 +1113,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"
         ),
@@ -1123,8 +1123,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"
         ),
@@ -1132,8 +1132,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"
         ),
@@ -1142,8 +1142,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"
         ),
@@ -1159,38 +1159,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/people.php

Braces +25 added lines, -18 removed lines

@@ -107,15 +107,17 @@ 
             $query .= 'LEFT OUTER JOIN personinfo ON member.person_id = personinfo.person_id AND data_key="' . $personinfo_key . '" ';
         }
         $query .= ' JOIN person_names p ON p.person_id = member.person_id AND p.type = "name" ';
-        if (isset($args['date']))
-            $query .= 'AND start_date <= :date AND :date <= end_date ';
-        else
-            $query .= 'AND end_date="9999-12-31" ';
+        if (isset($args['date'])) {
+                    $query .= 'AND start_date <= :date AND :date <= end_date ';
+        } else {
+                    $query .= 'AND end_date="9999-12-31" ';
+        }
         $query .= 'WHERE house=' . $args['house'] . ' ';
-        if (isset($args['date']))
-            $query .= 'AND entered_house <= :date AND :date <= left_house ';
-        elseif (!isset($args['all']) || $args['house'] == 1)
-            $query .= 'AND left_house = (SELECT MAX(left_house) FROM member) ';
+        if (isset($args['date'])) {
+                    $query .= 'AND entered_house <= :date AND :date <= left_house ';
+        } elseif (!isset($args['all']) || $args['house'] == 1) {
+                    $query .= 'AND left_house = (SELECT MAX(left_house) FROM member) ';
+        }
 
         if (isset($args['order'])) {
             $order = $args['order'];
@@ -174,8 +176,9 @@ 
                 $data[$p_id] = $narray;
             }
         }
-        if ($args['house'] == 2 && ($order == 'name' || $order == 'constituency'))
-            uasort($data, array($this, 'by_peer_name'));
+        if ($args['house'] == 2 && ($order == 'name' || $order == 'constituency')) {
+                    uasort($data, array($this, 'by_peer_name'));
+        }
 
         $data = array (
             'info' => array (
@@ -188,14 +191,18 @@ 
 
     }
     public function by_peer_name($a, $b) {
-        if (!$a['family_name'] && !$b['family_name'])
-            return strcmp($a['lordofname'], $b['lordofname']);
-        if (!$a['family_name'])
-            return strcmp($a['lordofname'], $b['family_name']);
-        if (!$b['family_name'])
-            return strcmp($a['family_name'], $b['lordofname']);
-        if (strcmp($a['family_name'], $b['family_name']))
-            return strcmp($a['family_name'], $b['family_name']);
+        if (!$a['family_name'] && !$b['family_name']) {
+                    return strcmp($a['lordofname'], $b['lordofname']);
+        }
+        if (!$a['family_name']) {
+                    return strcmp($a['lordofname'], $b['family_name']);
+        }
+        if (!$b['family_name']) {
+                    return strcmp($a['family_name'], $b['lordofname']);
+        }
+        if (strcmp($a['family_name'], $b['family_name'])) {
+                    return strcmp($a['family_name'], $b['family_name']);
+        }
         return strcmp($a['lordofname'], $b['lordofname']);
     }
 

Spacing +9 added lines, -9 removed lines

@@ -14,7 +14,7 @@ 
         $this->db = new ParlDB;
     }
 
-    public function display ($view, $args=array(), $format='html') {
+    public function display($view, $args = array(), $format = 'html') {
         global $PAGE;
 
         $validviews = array('mps', 'peers', 'mlas', 'msps');
@@ -22,13 +22,13 @@ 
         if (in_array($view, $validviews)) {
 
             // What function do we call for this view?
-            $function = '_get_data_by_'.$view;
+            $function = '_get_data_by_' . $view;
 
             // Get all the data that's to be rendered.
             $data = $this->$function($args);
 
         } else {
-            $PAGE->error_message ("You haven't specified a view type.");
+            $PAGE->error_message("You haven't specified a view type.");
             return false;
         }
 
@@ -39,7 +39,7 @@ 
 
 
 
-    public function render($view, $data, $format='html') {
+    public function render($view, $data, $format = 'html') {
         // Once we have the data that's to be rendered,
         // include the template.
 
@@ -49,7 +49,7 @@ 
         }
 
         //This should really be a single template? (rjp)
-        include (INCLUDESPATH."easyparliament/templates/$format/people_$view" . ".php");
+        include (INCLUDESPATH . "easyparliament/templates/$format/people_$view" . ".php");
         return true;
 
     }
@@ -131,7 +131,7 @@ 
         $q = $this->db->query($query . "ORDER BY $sqlorder", $params);
 
         $data = array();
-        for ($row=0; $row<$q->rows(); $row++) {
+        for ($row = 0; $row < $q->rows(); $row++) {
             $p_id = $q->field($row, 'person_id');
             $dept = $q->field($row, 'dept');
             $pos = $q->field($row, 'position');
@@ -144,7 +144,7 @@ 
                     $q->field($row, 'lordofname'));
                 $constituency = $q->field($row, 'constituency');
                 $url = make_member_url($name, $constituency, $args['house'], $p_id);
-                $narray = array (
+                $narray = array(
                     'person_id' 	=> $p_id,
                     'given_name' => $q->field($row, 'given_name'),
                     'family_name' => $q->field($row, 'family_name'),
@@ -177,8 +177,8 @@ 
         if ($args['house'] == 2 && ($order == 'name' || $order == 'constituency'))
             uasort($data, array($this, 'by_peer_name'));
 
-        $data = array (
-            'info' => array (
+        $data = array(
+            'info' => array(
                 'order' => $order
             ),
             'data' => $data

www/includes/easyparliament/editqueue.php

Braces +4 added lines, -8 removed lines

@@ -174,8 +174,7 @@ 
                             WHERE edit_id=" . $approval_id . ";");
             if (!$q->success()) {
                 break;
-            }
-            else {
+            } else {
                 // Now send them an email telling them they've been approved
 
 
@@ -216,8 +215,7 @@ 
                             WHERE edit_id=" . $decline_id . ";");
             if (!$q->success()) {
                 break;
-            }
-            else {
+            } else {
                 // Scrub that one from the list of pending items
                 unset ($this->pending[$decline_id]);
             }
@@ -255,8 +253,7 @@ 
             $this->update_pending_count();
 
             return true;
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -368,8 +365,7 @@ 
                             WHERE edit_id=" . $approval_id . ";");
             if (!$q->success()) {
                 break;
-            }
-            else {
+            } else {
                 // Scrub that one from the list of pending items
                 unset ($this->pending[$approval_id]);
             }

Spacing +5 added lines, -5 removed lines

@@ -84,10 +84,10 @@ 
 
         if ($q->success()) {
             // Set the object variables up.
-            $this->editqueue_id 	= $q->insert_id();
+            $this->editqueue_id = $q->insert_id();
             $this->title			= $data['title'];
             $this->body				= $data['body'];
-            $this->posted			= $data['posted'];
+            $this->posted = $data['posted'];
 
             return $this->editqueue_id;
 
@@ -167,7 +167,7 @@ 
             // the new epobject id and approval details.
             $q = $this->db->query("UPDATE editqueue
                             SET
-                            epobject_id_l='" .  $this->current_epobject_id. "',
+                            epobject_id_l='" .  $this->current_epobject_id . "',
                             editor_id='" . addslashes($THEUSER->user_id()) . "',
                             approved='1',
                             decided='" . $timestamp . "'
@@ -249,7 +249,7 @@ 
         $q = $this->db->query("SELECT eq.edit_id, eq.user_id, u.firstname, u.lastname, eq.glossary_id, eq.title, eq.body, eq.submitted FROM editqueue AS eq, users AS u WHERE eq.user_id = u.user_id AND eq.approved IS NULL ORDER BY eq.submitted DESC;");
         if ($q->success() && $q->rows()) {
             for ($i = 0; $i < ($q->rows()); $i++) {
-                $this->pending[	$q->field($i,"edit_id") ] = $q->row($i);
+                $this->pending[$q->field($i, "edit_id")] = $q->row($i);
             }
 
             $this->update_pending_count();
@@ -361,7 +361,7 @@ 
             // the new epobject id and approval details.
             $q = $this->db->query("UPDATE editqueue
                             SET
-                            glossary_id='" .  $this->current_epobject_id. "',
+                            glossary_id='" .  $this->current_epobject_id . "',
                             editor_id='" . addslashes($THEUSER->user_id()) . "',
                             approved='1',
                             decided='" . $timestamp . "'

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 +22 added lines, -22 removed lines

@@ -21,21 +21,21 @@ 
 */
 
 // This handles basic insertion and approval functions for all epobjects
-include_once INCLUDESPATH."easyparliament/editqueue.php";
-include_once INCLUDESPATH."easyparliament/searchengine.php";
+include_once INCLUDESPATH . "easyparliament/editqueue.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
@@ -74,16 +74,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();
         }
 
@@ -92,11 +92,11 @@ 
             WHERE g.glossary_id=eq.glossary_id AND u.user_id=eq.user_id AND g.visible=1 AND eq.approved=1
             ORDER by g.title");
         if ($q->success() && $q->rows()) {
-            for ($i=0; $i < $q->rows(); $i++) {
-                $this->terms[ $q->field($i,"glossary_id") ] = $q->row($i);
+            for ($i = 0; $i < $q->rows(); $i++) {
+                $this->terms[$q->field($i, "glossary_id")] = $q->row($i);
                 // Now add the epobject to the alphabet navigation.
-                $first_letter = strtoupper(substr($q->field($i,"title"),0,1));
-                $this->alphabet[$first_letter][] = $q->field($i,"glossary_id");
+                $first_letter = strtoupper(substr($q->field($i, "title"), 0, 1));
+                $this->alphabet[$first_letter][] = $q->field($i, "glossary_id");
             }
 
             $this->num_terms = $q->rows();
@@ -139,7 +139,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)
 
@@ -154,8 +154,8 @@ 
             ORDER by g.title";
         $q = $this->db->query($query);
         if ($q->success() && $q->rows()) {
-            for ($i=0; $i < $q->rows(); $i++) {
-                $this->search_matches[ $q->field($i,"glossary_id") ] = $q->row($i);
+            for ($i = 0; $i < $q->rows(); $i++) {
+                $this->search_matches[$q->field($i, "glossary_id")] = $q->row($i);
             }
             $this->num_search_matches = $q->rows();
         }
@@ -191,12 +191,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;
         }
 
@@ -249,7 +249,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;
@@ -292,7 +292,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">