mysociety / theyworkforyou

www/docs/api/api_getPerson.php

Doc Comments +9 added lines

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

Braces +18 added lines, -9 removed lines

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

www/includes/easyparliament/init.php

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

@@ -92,7 +92,7 @@
 include_once (INCLUDESPATH."easyparliament/user.php");
 
 // Test to see if this is a new-style template using the renderer class.
-if (! isset($new_style_template) OR $new_style_template !== TRUE) {
+if (! isset($new_style_template) or $new_style_template !== true) {
 
     // This is an old-style page. Use the old page classes.
     include_once (INCLUDESPATH."easyparliament/page.php");

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/page.php

Braces +15 added lines, -13 removed lines

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

Spacing +39 added lines, -39 removed lines

@@ -19,7 +19,7 @@ 
     public $within_stripe_sidebar = false;
 
     public function page_start() {
-        if ( !$this->page_started() ) {
+        if (!$this->page_started()) {
             $this->checkForAdmin();
             $this->displayHeader();
         }
@@ -32,7 +32,7 @@ 
 
         $data = $h->data;
         $data = array_merge($u->data, $data);
-        if ( isset($page_errors) ) {
+        if (isset($page_errors)) {
             $data['page_errors'] = $page_errors;
         }
         $data['banner_text'] = '';
@@ -52,7 +52,7 @@ 
                 $THISPAGE = new \MySociety\TheyWorkForYou\Url($this_page);
 
                 $LOGINURL = new \MySociety\TheyWorkForYou\Url('userlogin');
-                $LOGINURL->insert(array('ret' => $THISPAGE->generate('none') ));
+                $LOGINURL->insert(array('ret' => $THISPAGE->generate('none')));
 
                 $text = "<a href=\"" . $LOGINURL->generate() . "\">You'd better sign in!</a>";
             } else {
@@ -67,7 +67,7 @@ 
     }
 
     public function page_end() {
-        if ( !$this->page_started() ) {
+        if (!$this->page_started()) {
             $this->page_start();
         }
 
@@ -101,7 +101,7 @@ 
         }
     }
 
-    public function stripe_start($type='side', $id='', $extra_class = '') {
+    public function stripe_start($type = 'side', $id = '', $extra_class = '') {
         // $type is one of:
         //  'full' - a full width div
         //  'side' - a white stripe with a coloured sidebar.
@@ -131,7 +131,7 @@ 
     }
 
 
-    public function stripe_end ($contents = array(), $extra = '') {
+    public function stripe_end($contents = array(), $extra = '') {
         // $contents is an array containing 0 or more hashes.
         // Each hash has two values, 'type' and 'content'.
         // 'Type' could be one of these:
@@ -234,7 +234,7 @@ 
     public function include_sidebar_template($sidebarname) {
         global $this_page, $DATA;
 
-            $sidebarpath = INCLUDESPATH.'easyparliament/sidebars/'.$sidebarname.'.php';
+            $sidebarpath = INCLUDESPATH . 'easyparliament/sidebars/' . $sidebarname . '.php';
 
             if (file_exists($sidebarpath)) {
                 include $sidebarpath;
@@ -242,7 +242,7 @@ 
     }
 
 
-    public function block_start($data=array()) {
+    public function block_start($data = array()) {
         // Starts a 'block' div, used mostly on the home page,
         // on the MP page, and in the sidebars.
         // $data is a hash like this:
@@ -389,7 +389,7 @@ 
         if (is_string($message)) {
             // Sometimes we're just sending a single line to this function
             // rather like the bigger array...
-            $message = array (
+            $message = array(
                 'text' => $message
             );
         }
@@ -397,13 +397,13 @@ 
         // if the page has started then we're most likely in an old school page
         // so we should just print out the error, otherwise stick it in the error
         // global which will then be displayed by the header template
-        if ( $this->page_started() ) {
+        if ($this->page_started()) {
             $this->message($message, 'error');
         } else {
-            if ( !isset($page_errors) ) {
+            if (!isset($page_errors)) {
                 $page_errors = array();
             }
-            $page_errors[]  = $message;
+            $page_errors[] = $message;
         }
 
         if ($fatal) {
@@ -420,7 +420,7 @@ 
     }
 
 
-    public function message($message, $class='') {
+    public function message($message, $class = '') {
         // Generates a very simple but common page content.
         // Used for when a user logs out, or votes, or any simple thing
         // where there's a little message and probably a link elsewhere.
@@ -498,7 +498,7 @@ 
             if ($page_title != '') {
                 $page_title .= ': ';
             }
-            $page_title .= format_date ($info['date'], SHORTDATEFORMAT);
+            $page_title .= format_date($info['date'], SHORTDATEFORMAT);
         }
 
         if ($page_title != '') {
@@ -553,7 +553,7 @@ 
 
         if (isset($nextprev['up'])) {
 
-            $uplink = '<span class="up"><a href="' .  $nextprev['up']['url'] . '" title="' . $nextprev['up']['title'] . '">' . $nextprev['up']['body'] . '</a>';
+            $uplink = '<span class="up"><a href="' . $nextprev['up']['url'] . '" title="' . $nextprev['up']['title'] . '">' . $nextprev['up']['body'] . '</a>';
             if (get_http_var('s')) {
                 $URL = new \MySociety\TheyWorkForYou\Url($this_page);
                 $uplink .= '<br><a href="' . $URL->generate() . '">Remove highlighting</a>';
@@ -568,7 +568,7 @@ 
             $next = $nextprev['next'];
 
             if (isset($next['url'])) {
-                $nextlink = '<a href="' .  $next['url'] . '" title="' . $next['title'] . '" class="linkbutton">' . $next['body'] . ' &raquo;</a>';
+                $nextlink = '<a href="' . $next['url'] . '" title="' . $next['title'] . '" class="linkbutton">' . $next['body'] . ' &raquo;</a>';
             } else {
                 $nextlink = $next['body'] . ' &raquo;';
             }
@@ -585,7 +585,7 @@ 
     }
 
 
-    public function search_form($value='') {
+    public function search_form($value = '') {
         global $SEARCHENGINE;
         // Search box on the search page.
         // If $value is set then it will be displayed in the form.
@@ -615,7 +615,7 @@ 
             }
 
         echo '<div class="mainsearchbox">';
-        if ($wtt<2) {
+        if ($wtt < 2) {
                 echo '<form action="', $URL->generate(), '" method="get">';
                 if (get_http_var('o')) {
                     echo '<input type="hidden" name="o" value="', _htmlentities(get_http_var('o')), '">';
@@ -624,7 +624,7 @@ 
                     echo '<input type="hidden" name="house" value="', _htmlentities(get_http_var('house')), '">';
                 }
                 echo '<input type="text" name="q" value="', _htmlentities($value), '" size="50"> ';
-                echo '<input type="submit" value=" ', ($wtt?'Modify search':'Search'), ' ">';
+                echo '<input type="submit" value=" ', ($wtt ? 'Modify search' : 'Search'), ' ">';
                 $URL = new \MySociety\TheyWorkForYou\Url('search');
             $URL->insert(array('adv' => 1));
                 echo '&nbsp;&nbsp; <a href="' . $URL->generate() . '">More&nbsp;options</a>';
@@ -646,16 +646,16 @@ 
                     $ordering = 'd';
                 }
 
-                if ($ordering=='r') {
+                if ($ordering == 'r') {
                 print '<strong>Sorted by relevance</strong>';
                 } else {
                 printf("<a href='%s'>Sort by relevance</a>", $orderUrl->generate('html', array('o'=>'r')));
                 }
 
                 print "&nbsp;|&nbsp;";
-                if ($ordering=='d') {
+                if ($ordering == 'd') {
                 print '<strong>Sorted by date: newest</strong> / <a href="' . $orderUrl->generate('html', array('o'=>'o')) . '">oldest</a>';
-                } elseif ($ordering=='o') {
+                } elseif ($ordering == 'o') {
                 print '<strong>Sorted by date:</strong> <a href="' . $orderUrl->generate('html', array('o'=>'d')) . '">newest</a> / <strong>oldest</strong>';
                 } else {
                 printf("Sort by date: <a href='%s'>newest</a> / <a href='%s'>oldest</a>",
@@ -663,7 +663,7 @@ 
                 }
 
             print "&nbsp;|&nbsp;";
-            if ($ordering=='p') {
+            if ($ordering == 'p') {
                 print '<strong>Use by person</strong>';
             } else {
                 printf('<a href="%s">Show use by person</a>', $orderUrl->generate('html', array('o'=>'p')));
@@ -687,7 +687,7 @@ 
         include_once INCLUDESPATH . 'easyparliament/templates/html/search_advanced.php';
     }
 
-    public function login_form ($errors = array()) {
+    public function login_form($errors = array()) {
         // Used for /user/login/ and /user/prompt/
         // $errors is a hash of potential errors from a previous log in attempt.
         ?>
@@ -791,7 +791,7 @@ 
     public function glossary_atoz(&$GLOSSARY) {
     // Print out a nice list of lettered links to glossary pages
 
-        $letters = array ();
+        $letters = array();
 
         foreach ($GLOSSARY->alphabet as $letter => $eps) {
             // if we're writing out the current letter (list or item)
@@ -824,14 +824,14 @@ 
                     <div class="letters">
                         <ul>
     <?php
-        for ($n=0; $n<13; $n++) {
+        for ($n = 0; $n < 13; $n++) {
             print $letters[$n];
         }
         ?>
                         </ul>
                         <ul>
     <?php
-        for ($n=13; $n<26; $n++) {
+        for ($n = 13; $n < 26; $n++) {
             print $letters[$n];
         }
         ?>
@@ -850,12 +850,12 @@ 
 
         // add some extra controls for the administrators
         if ($this_page == "admin_glossary") {
-            print "<a id=\"gl".$term['glossary_id']."\"></a>";
+            print "<a id=\"gl" . $term['glossary_id'] . "\"></a>";
             print "<h3>" . $term['title'] . "</h3>";
             $URL = new \MySociety\TheyWorkForYou\Url('admin_glossary');
             $URL->insert(array("delete_confirm" => $term['glossary_id']));
             $delete_url = $URL->generate();
-            $admin_links = "<br><small><a href=\"".$delete_url."\">delete</a></small>";
+            $admin_links = "<br><small><a href=\"" . $delete_url . "\">delete</a></small>";
         }
         else {
             $admin_links = "";
@@ -878,9 +878,9 @@ 
             // Add a direct search link for current glossary item
             $URL = new \MySociety\TheyWorkForYou\Url('search');
             // remember to quote the term for phrase matching in search
-            $URL->insert(array('s' => '"'.$term['title'].'"'));
+            $URL->insert(array('s' => '"' . $term['title'] . '"'));
             $search_url = $URL->generate();
-            printf ("\t\t\t\t<p>Search hansard for \"<a href=\"%s\" title=\"View search results for this glossary item\">%s</a>\"</p>", $search_url, $term['title']);
+            printf("\t\t\t\t<p>Search hansard for \"<a href=\"%s\" title=\"View search results for this glossary item\">%s</a>\"</p>", $search_url, $term['title']);
         }
     }
 
@@ -955,7 +955,7 @@ 
 
             // Generate all the page links.
             $URL = new \MySociety\TheyWorkForYou\Url($this_page);
-            $URL->insert( array('wtt' => get_http_var('wtt')) );
+            $URL->insert(array('wtt' => get_http_var('wtt')));
             if (isset($pagedata['s'])) {
                 # XXX: Should be taken out in *one* place, not here + search_form etc.
                 $value = $pagedata['s'];
@@ -1093,7 +1093,7 @@ 
 
                 $body = trim_characters($report['body'], 0, 40);
 
-                $tabledata['rows'][] = array (
+                $tabledata['rows'][] = array(
                     _htmlentities($report['firstname'] . ' ' . $report['lastname']),
                     _htmlentities($body),
                     $report['reported'],
@@ -1124,13 +1124,13 @@ 
         // $page is the name of the page the dates should link to.
 
         // Create array containing abbreviations of days of week.
-        $daysOfWeek = array('Mon','Tue','Wed','Thu','Fri','Sat','Sun');
+        $daysOfWeek = array('Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun');
 
         // What is the first day of the month in question?
-        $firstDayOfMonth = mktime(0,0,0,$month,1,$year);
+        $firstDayOfMonth = mktime(0, 0, 0, $month, 1, $year);
 
         // How many days does this month contain?
-        $numberDays = date('t',$firstDayOfMonth);
+        $numberDays = date('t', $firstDayOfMonth);
 
         // Retrieve some information about the first day of the
         // month in question.
@@ -1211,7 +1211,7 @@ 
 
             // Is the $currentDay a member of $dateArray? If so,
             // the day should be linked.
-            if (in_array($currentDay,$dateArray)) {
+            if (in_array($currentDay, $dateArray)) {
 
                 $date = sprintf("%04d-%02d-%02d", $year, $month, $currentDay);
 
@@ -1312,8 +1312,8 @@ 
         // Returns HTML suitable for putting in the sidebar on Admin pages.
         global $this_page, $DATA;
 
-        $pages = array ('admin_home',
-                'admin_comments','admin_trackbacks', 'admin_searchlogs', 'admin_popularsearches', 'admin_failedsearches',
+        $pages = array('admin_home',
+                'admin_comments', 'admin_trackbacks', 'admin_searchlogs', 'admin_popularsearches', 'admin_failedsearches',
                 'alert_stats', 'admin_statistics', 'admin_reportstats',
                 'admin_commentreports', 'admin_glossary', 'admin_glossary_pending', 'admin_badusers',
                 'admin_photos', 'admin_mpurls', 'admin_policies', 'admin_banner', 'admin_featured', 'admin_topics'

www/includes/easyparliament/templates/html/calendar_date.php

Braces +6 added lines, -3 removed lines

@@ -18,10 +18,13 @@
 # Content goes here
 foreach ($data['dates'] as $date => $day_events) {
     foreach ($order as $i => $chamber) {
-        if (!array_key_exists($chamber, $day_events))
-            continue;
+        if (!array_key_exists($chamber, $day_events)) {
+                    continue;
+        }
         $events = $day_events[$chamber];
-        if ($plural[$i]) $chamber .= 's';
+        if ($plural[$i]) {
+            $chamber .= 's';
+        }
         print "<h2 class='calendar'>$chamber";
         if (in_array($major[$i], $data['majors'])) {
             $URL = new \MySociety\TheyWorkForYou\Url($hansardmajors[$major[$i]]['page_all']);

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
         print "<h2 class='calendar'>$chamber";
         if (in_array($major[$i], $data['majors'])) {
             $URL = new \MySociety\TheyWorkForYou\Url($hansardmajors[$major[$i]]['page_all']);
-            $URL->insert( array( 'd' => $date ) );
+            $URL->insert(array('d' => $date));
             print ' &nbsp; <a href="' . $URL->generate() . '">See this day &rarr;</a>';
         }
         print "</h2>\n";

www/includes/easyparliament/templates/html/comments_recent.php

Braces +6 added lines, -2 removed lines

@@ -18,7 +18,9 @@ 
     }
     $PAGE->block_start(array('id'=>'recentcomments', 'title'=>$title));
 
-    if ($this_page != 'home') $PAGE->page_links($data);
+    if ($this_page != 'home') {
+        $PAGE->page_links($data);
+    }
     $USERURL = new \MySociety\TheyWorkForYou\Url('userview');
     ?>
                         <ul>
@@ -50,7 +52,9 @@ 
                         <p><a href="<?php echo $MOREURL->generate(); ?>#c<?php echo count($data['comments'])+1; ?>">See more annotations posted recently</a></p>
 <?php
     }
-    if ($this_page != 'home') $PAGE->page_links($data);
+    if ($this_page != 'home') {
+        $PAGE->page_links($data);
+    }
     $PAGE->block_end();
 }
 ?>

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
         $date = format_date($date, SHORTDATEFORMAT);
         $time = format_time($time, TIMEFORMAT);
 
-        $count = $n+1;
+        $count = $n + 1;
 
         $USERURL->insert(array('u'=>$comment['user_id']));
 
@@ -47,7 +47,7 @@ 
     if ($this_page == 'home') {
         $MOREURL = new \MySociety\TheyWorkForYou\Url('comments_recent');
         ?>
-                        <p><a href="<?php echo $MOREURL->generate(); ?>#c<?php echo count($data['comments'])+1; ?>">See more annotations posted recently</a></p>
+                        <p><a href="<?php echo $MOREURL->generate(); ?>#c<?php echo count($data['comments']) + 1; ?>">See more annotations posted recently</a></p>
 <?php
     }
     if ($this_page != 'home') $PAGE->page_links($data);

scripts/mprss.php

Indentation +45 added lines, -45 removed lines

@@ -20,49 +20,49 @@ 
 
 $starttime = time();
 for ($personrow=0; $personrow<$q->rows(); $personrow++) {
-	$person_id = $q->field($personrow, 'person_id');
+    $person_id = $q->field($personrow, 'person_id');
 
-	$args = array ( 'person_id' => $person_id );
-	$speeches = $HANSARDLIST->display('person', $args, 'none');
+    $args = array ( 'person_id' => $person_id );
+    $speeches = $HANSARDLIST->display('person', $args, 'none');
 
-	// Some data about this person that we'll need for the feed.
-	$MEMBER = new MEMBER(array('person_id' => $person_id));
-	$MPURL = new \MySociety\TheyWorkForYou\Url('mp');
-	$MPURL->insert(array('pid'=>$person_id));
-	$mpurl = $MPURL->generate();
+    // Some data about this person that we'll need for the feed.
+    $MEMBER = new MEMBER(array('person_id' => $person_id));
+    $MPURL = new \MySociety\TheyWorkForYou\Url('mp');
+    $MPURL->insert(array('pid'=>$person_id));
+    $mpurl = $MPURL->generate();
 
-	$date = gmdate('Y-m-d');
-	$time = gmdate('H:i:s');
-	$datenow = $date . 'T' . $time . '+00:00';
+    $date = gmdate('Y-m-d');
+    $time = gmdate('H:i:s');
+    $datenow = $date . 'T' . $time . '+00:00';
 
-	// Prepare the meat of the RSS file.
-	$items = '';
-	$entries = '';
-	if (isset ($speeches['rows']) && count($speeches['rows']) > 0) {
+    // Prepare the meat of the RSS file.
+    $items = '';
+    $entries = '';
+    if (isset ($speeches['rows']) && count($speeches['rows']) > 0) {
 
-		foreach ($speeches['rows'] as $n => $row) {
+        foreach ($speeches['rows'] as $n => $row) {
 
-			// While we're linking to individual speeches,
-			// the text is the body of the parent, ie (sub)section.
-			$title = _htmlentities(str_replace('&#8212;', '-', $row['parent']['body']));
+            // While we're linking to individual speeches,
+            // the text is the body of the parent, ie (sub)section.
+            $title = _htmlentities(str_replace('&#8212;', '-', $row['parent']['body']));
 
-			$link = isset($row['listurl']) ? $row['listurl'] : '';
-			$link = 'https://' . DOMAIN . $link;
+            $link = isset($row['listurl']) ? $row['listurl'] : '';
+            $link = 'https://' . DOMAIN . $link;
 
-			$description = _htmlentities(trim_characters($row['body'], 0, 200));
-			$contentencoded = $row['body'];
+            $description = _htmlentities(trim_characters($row['body'], 0, 200));
+            $contentencoded = $row['body'];
 
-			$hdate = format_date($row['hdate'], 'Y-m-d');
-			if ($row['htime'] != NULL) {
-				$htime = format_time($row['htime'], 'H:i:s');
-			} else {
-				$htime = '00:00:00';
-			}
+            $hdate = format_date($row['hdate'], 'Y-m-d');
+            if ($row['htime'] != NULL) {
+                $htime = format_time($row['htime'], 'H:i:s');
+            } else {
+                $htime = '00:00:00';
+            }
 
-			$date = $hdate . 'T' . $htime . '+00:00';
+            $date = $hdate . 'T' . $htime . '+00:00';
 
-			$items .= '<rdf:li rdf:resource="' . $link . '" />' . "\n";
-			$entries .= "<item rdf:about=\"$link\">
+            $items .= '<rdf:li rdf:resource="' . $link . '" />' . "\n";
+            $entries .= "<item rdf:about=\"$link\">
 	<title>$title</title>
 	<link>$link</link>
 	<description>$description</description>
@@ -71,11 +71,11 @@ 
 </item>
 ";
 
-		}
-	}
+        }
+    }
 
-	// Prepare the whole text of the RSS file.
-	$rsstext = '<?xml version="1.0" encoding="utf-8"?>
+    // Prepare the whole text of the RSS file.
+    $rsstext = '<?xml version="1.0" encoding="utf-8"?>
 <rdf:RDF
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -101,15 +101,15 @@ 
 
 </rdf:RDF>';
 
-	// Write the text to the file...
-	$filename = $rsspath . $person_id . '.rdf';
-	$fh = @fopen($filename, "w");
-	if (!$fh) { # Problem writing, just carry on
-		echo "Could not write to file ($filename)\n";
-		continue;
-	}
-	fwrite($fh, $rsstext);
-	fclose ($fh);
+    // Write the text to the file...
+    $filename = $rsspath . $person_id . '.rdf';
+    $fh = @fopen($filename, "w");
+    if (!$fh) { # Problem writing, just carry on
+        echo "Could not write to file ($filename)\n";
+        continue;
+    }
+    fwrite($fh, $rsstext);
+    fclose ($fh);
 }
 
 #print "Took " . (time()-$starttime) . " seconds\n";

classes/Search/Normal.php

Doc Comments +3 added lines

@@ -188,6 +188,9 @@
         return $items;
     }
 
+    /**
+     * @param \MySociety\TheyWorkForYou\Url $url
+     */
     private function generate_pagination_links($data, $url, $first, $last) {
         $links = array();
 

www/docs/mp/index.php

Switch Indentation +20 added lines, -20 removed lines

@@ -731,26 +731,26 @@
 function person_error_page($message) {
     global $this_page;
     switch($this_page) {
-    case 'mla':
-        $rep = 'MLA';
-        $SEARCHURL = '/postcode/';
-        $MPSURL = new \MySociety\TheyWorkForYou\Url('mlas');
-        break;
-    case 'msp':
-        $rep = 'MSP';
-        $SEARCHURL = '/postcode/';
-        $MPSURL = new \MySociety\TheyWorkForYou\Url('msps');
-        break;
-    case 'peer':
-        $rep = 'Lord';
-        $SEARCHURL = '';
-        $MPSURL = new \MySociety\TheyWorkForYou\Url('peers');
-        break;
-    default:
-        $rep = 'MP';
-        $SEARCHURL = new \MySociety\TheyWorkForYou\Url('mp');
-        $SEARCHURL = $SEARCHURL->generate();
-        $MPSURL = new \MySociety\TheyWorkForYou\Url('mps');
+        case 'mla':
+            $rep = 'MLA';
+            $SEARCHURL = '/postcode/';
+            $MPSURL = new \MySociety\TheyWorkForYou\Url('mlas');
+            break;
+        case 'msp':
+            $rep = 'MSP';
+            $SEARCHURL = '/postcode/';
+            $MPSURL = new \MySociety\TheyWorkForYou\Url('msps');
+            break;
+        case 'peer':
+            $rep = 'Lord';
+            $SEARCHURL = '';
+            $MPSURL = new \MySociety\TheyWorkForYou\Url('peers');
+            break;
+        default:
+            $rep = 'MP';
+            $SEARCHURL = new \MySociety\TheyWorkForYou\Url('mp');
+            $SEARCHURL = $SEARCHURL->generate();
+            $MPSURL = new \MySociety\TheyWorkForYou\Url('mps');
     }
 
     $data = array(

Spacing +53 added lines, -53 removed lines

@@ -118,7 +118,7 @@ 
     }
     if ($pid) {
         $URL = new \MySociety\TheyWorkForYou\Url('search');
-        $URL->insert( array('pid'=>$pid, 'pop'=>1) );
+        $URL->insert(array('pid'=>$pid, 'pop'=>1));
         header('Location: ' . $URL->generate('none'));
         exit;
     }
@@ -149,7 +149,7 @@ 
     } elseif ($THEUSER->postcode_is_set()) {
         get_mp_by_user_postcode($THEUSER->postcode());
     } else {
-        twfy_debug ('MP', "We don't have any way of telling what MP to display");
+        twfy_debug('MP', "We don't have any way of telling what MP to display");
         throw new MySociety\TheyWorkForYou\MemberException('Sorry, but we can’t tell which representative to display.');
     }
     if (!isset($MEMBER) || !$MEMBER->valid) {
@@ -216,7 +216,7 @@ 
     if (!$MEMBER->current_member(HOUSE_TYPE_SCOTLAND)) {
         $title .= ', former';
     }
-    $title .= ' MSP, '.$MEMBER->constituency();
+    $title .= ' MSP, ' . $MEMBER->constituency();
 }
 
 $positions = array();
@@ -310,7 +310,7 @@ 
 $data['eu_stance'] = $MEMBER->getEUStance();
 
 # People who are or were MPs and Lords potentially have voting records, except Sinn Fein MPs
-$data['has_voting_record'] = ( ($MEMBER->house(HOUSE_TYPE_COMMONS) && $MEMBER->party() != 'Sinn Féin') || $MEMBER->house(HOUSE_TYPE_LORDS) );
+$data['has_voting_record'] = (($MEMBER->house(HOUSE_TYPE_COMMONS) && $MEMBER->party() != 'Sinn Féin') || $MEMBER->house(HOUSE_TYPE_LORDS));
 # Everyone who is currently somewhere has email alert signup, apart from current Sinn Fein MPs who are not MLAs
 $data['has_email_alerts'] = ($MEMBER->current_member_anywhere() && !($MEMBER->current_member(HOUSE_TYPE_COMMONS) && $MEMBER->party() == 'Sinn Féin' && !$MEMBER->current_member(HOUSE_TYPE_NI)));
 $data['has_expenses'] = $data['leave_date'] > '2004-01-01';
@@ -336,9 +336,9 @@ 
 
 $data['this_page'] = $this_page;
 $data['current_assembly'] = 'westminster';
-if ( $this_page == 'msp' || $this_page == 'yourmsp' ) {
+if ($this_page == 'msp' || $this_page == 'yourmsp') {
     $data['current_assembly'] = 'scotland';
-} else if ( $this_page == 'mla' || $this_page == 'yourmla' ) {
+} else if ($this_page == 'mla' || $this_page == 'yourmla') {
     $data['current_assembly'] = 'ni';
 }
 
@@ -354,11 +354,11 @@ 
         $divisions = new MySociety\TheyWorkForYou\Divisions($MEMBER);
         $policySummaries = $divisions->getMemberDivisionDetails();
 
-        $policyOptions = array( 'summaries' => $policySummaries);
+        $policyOptions = array('summaries' => $policySummaries);
 
         // Generate voting segments
         $set_descriptions = $policiesList->getSetDescriptions();
-        if ( $policy_set && array_key_exists($policy_set, $set_descriptions) ) {
+        if ($policy_set && array_key_exists($policy_set, $set_descriptions)) {
           $data['key_votes_segments'] = array(
               array(
                   'key' => $policy_set,
@@ -476,7 +476,7 @@ 
 
     case 'recent':
         $policiesList = new MySociety\TheyWorkForYou\Policies;
-        $positions = new MySociety\TheyWorkForYou\PolicyPositions( $policiesList, $MEMBER );
+        $positions = new MySociety\TheyWorkForYou\PolicyPositions($policiesList, $MEMBER);
         $divisions = new MySociety\TheyWorkForYou\Divisions($MEMBER, $positions, $policiesList);
 
         $data['divisions'] = $divisions->getRecentMemberDivisions();
@@ -487,15 +487,15 @@ 
 
     case 'divisions':
         $policyID = get_http_var('policy');
-        if ( $policyID ) {
-            $policiesList = new MySociety\TheyWorkForYou\Policies( $policyID );
+        if ($policyID) {
+            $policiesList = new MySociety\TheyWorkForYou\Policies($policyID);
         } else {
             $policiesList = new MySociety\TheyWorkForYou\Policies;
         }
-        $positions = new MySociety\TheyWorkForYou\PolicyPositions( $policiesList, $MEMBER );
+        $positions = new MySociety\TheyWorkForYou\PolicyPositions($policiesList, $MEMBER);
         $divisions = new MySociety\TheyWorkForYou\Divisions($MEMBER, $positions, $policiesList);
 
-        if ( $policyID ) {
+        if ($policyID) {
             $data['policydivisions'] = $divisions->getMemberDivisionsForPolicy($policyID);
         } else {
             $data['policydivisions'] = $divisions->getAllMemberDivisionsByPolicy();
@@ -572,7 +572,7 @@ 
 
         // generate party policy diffs
         $party = new MySociety\TheyWorkForYou\Party($MEMBER->party());
-        $positions = new MySociety\TheyWorkForYou\PolicyPositions( $policiesList, $MEMBER );
+        $positions = new MySociety\TheyWorkForYou\PolicyPositions($policiesList, $MEMBER);
         $party_positions = $party->getAllPolicyPositions($policiesList);
         $policy_diffs = $MEMBER->getPartyPolicyDiffs($party, $policiesList, $positions, true);
 
@@ -626,16 +626,16 @@ 
     global $THEUSER;
     $pc = preg_replace('#[^a-z0-9]#i', '', $pc);
     if (!validate_postcode($pc)) {
-        twfy_debug ('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
-        throw new MySociety\TheyWorkForYou\MemberException('Sorry, '._htmlentities($pc) .' isn’t a valid postcode');
+        twfy_debug('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
+        throw new MySociety\TheyWorkForYou\MemberException('Sorry, ' . _htmlentities($pc) . ' isn’t a valid postcode');
     }
-    twfy_debug ('MP', "MP lookup by postcode");
+    twfy_debug('MP', "MP lookup by postcode");
     $constituency = strtolower(MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituency($pc));
     if ($constituency == "connection_timed_out") {
         throw new MySociety\TheyWorkForYou\MemberException('Sorry, we couldn’t check your postcode right now, as our postcode lookup server is under quite a lot of load.');
     } elseif ($constituency == "") {
-        twfy_debug ('MP', "Can't display an MP, as submitted postcode didn't match a constituency");
-        throw new MySociety\TheyWorkForYou\MemberException('Sorry, '._htmlentities($pc) .' isn’t a known postcode');
+        twfy_debug('MP', "Can't display an MP, as submitted postcode didn't match a constituency");
+        throw new MySociety\TheyWorkForYou\MemberException('Sorry, ' . _htmlentities($pc) . ' isn’t a known postcode');
     } else {
         // Redirect to the canonical MP page, with a person id.
         $MEMBER = new MySociety\TheyWorkForYou\Member(array('constituency' => $constituency, 'house' => HOUSE_TYPE_COMMONS));
@@ -647,11 +647,11 @@ 
     }
 }
 
-function get_person_by_name($name, $const='') {
+function get_person_by_name($name, $const = '') {
     $MEMBER = new MySociety\TheyWorkForYou\Member(array('name' => $name, 'constituency' => $const));
     // Edge case, only attempt further detection if this isn't the Queen.
     if ($name !== 'elizabeth the second' || $const) {
-        twfy_debug ('MP', 'Redirecting for MP found by name/constituency');
+        twfy_debug('MP', 'Redirecting for MP found by name/constituency');
         member_redirect($MEMBER);
     }
     return $MEMBER;
@@ -685,7 +685,7 @@ 
  * Redirect to the canonical page for a member.
  */
 
-function member_redirect (&$MEMBER, $code = 301, $pagetype = NULL) {
+function member_redirect(&$MEMBER, $code = 301, $pagetype = NULL) {
     // We come here after creating a MEMBER object by various methods.
     // Now we redirect to the canonical MP page, with a person_id.
     if ($MEMBER->person_id()) {
@@ -702,7 +702,7 @@ 
         } else {
             $pagetype = '';
         }
-        header('Location: ' . $url . $pagetype, true, $code );
+        header('Location: ' . $url . $pagetype, true, $code);
         exit;
     }
 }
@@ -730,7 +730,7 @@ 
 
 function person_error_page($message) {
     global $this_page;
-    switch($this_page) {
+    switch ($this_page) {
     case 'mla':
         $rep = 'MLA';
         $SEARCHURL = '/postcode/';
@@ -768,7 +768,7 @@ 
  * Generate the summary of this person's held positions.
  */
 
-function person_summary_description ($MEMBER) {
+function person_summary_description($MEMBER) {
     $entered_house = $MEMBER->entered_house();
     $current_member = $MEMBER->current_member();
     $left_house = $MEMBER->left_house();
@@ -779,7 +779,7 @@ 
     }
     $desc = '';
     foreach ($MEMBER->houses() as $house) {
-        if ($house==HOUSE_TYPE_COMMONS && isset($entered_house[HOUSE_TYPE_LORDS]))
+        if ($house == HOUSE_TYPE_COMMONS && isset($entered_house[HOUSE_TYPE_LORDS]))
             continue; # Same info is printed further down
 
         if (!$current_member[$house]) $desc .= 'Former ';
@@ -800,17 +800,17 @@ 
                 $desc .= $last['from'] . ' ';
             }
         }
-        if ($house==HOUSE_TYPE_COMMONS || $house==HOUSE_TYPE_NI || $house==HOUSE_TYPE_SCOTLAND) {
+        if ($house == HOUSE_TYPE_COMMONS || $house == HOUSE_TYPE_NI || $house == HOUSE_TYPE_SCOTLAND) {
             $desc .= ' ';
-            if ($house==HOUSE_TYPE_COMMONS) $desc .= '<abbr title="Member of Parliament">MP</abbr>';
-            if ($house==HOUSE_TYPE_NI) $desc .= '<abbr title="Member of the Legislative Assembly">MLA</abbr>';
-            if ($house==HOUSE_TYPE_SCOTLAND) $desc .= '<abbr title="Member of the Scottish Parliament">MSP</abbr>';
+            if ($house == HOUSE_TYPE_COMMONS) $desc .= '<abbr title="Member of Parliament">MP</abbr>';
+            if ($house == HOUSE_TYPE_NI) $desc .= '<abbr title="Member of the Legislative Assembly">MLA</abbr>';
+            if ($house == HOUSE_TYPE_SCOTLAND) $desc .= '<abbr title="Member of the Scottish Parliament">MSP</abbr>';
             if ($party_br) {
                 $desc .= " ($party_br)";
             }
             $desc .= ' for ' . $left_house[$house]['constituency'];
         }
-        if ($house==HOUSE_TYPE_LORDS && $party != 'Bishop') $desc .= ' Peer';
+        if ($house == HOUSE_TYPE_LORDS && $party != 'Bishop') $desc .= ' Peer';
         $desc .= ', ';
     }
     $desc = preg_replace('#, $#', '', $desc);
@@ -827,7 +827,7 @@ 
  * @return string A HTML summary of this person's rebellion rate.
  */
 
-function person_rebellion_rate ($member) {
+function person_rebellion_rate($member) {
 
     // Rebellion string may be empty.
     $rebellion_string = '';
@@ -866,7 +866,7 @@ 
     // benefit unfortunately.
     twfy_debug_timestamp();
 
-    $person_id= $member->person_id();
+    $person_id = $member->person_id();
 
     $memcache = new MySociety\TheyWorkForYou\Memcache;
     $recent = $memcache->get('recent_appear:' . $person_id);
@@ -877,7 +877,7 @@ 
         $SEARCHENGINE = new \SEARCHENGINE($searchstring);
 
         $hansard = new MySociety\TheyWorkForYou\Hansard();
-        $args = array (
+        $args = array(
             's' => $searchstring,
             'p' => 1,
             'num' => 3,
@@ -892,7 +892,7 @@ 
     twfy_debug_timestamp();
 
     $MOREURL = new \MySociety\TheyWorkForYou\Url('search');
-    $MOREURL->insert( array('pid'=>$person_id, 'pop'=>1) );
+    $MOREURL->insert(array('pid'=>$person_id, 'pop'=>1));
 
     $out['more_href'] = $MOREURL->generate() . '#n4';
     $out['more_text'] = 'More of ' . ucfirst($member->full_name()) . '&rsquo;s recent appearances';
@@ -1101,7 +1101,7 @@ 
         }
     }
 
-    foreach ( $wtt_stats_years as $year ) {
+    foreach ($wtt_stats_years as $year) {
         $wtt_displayed = display_writetothem_numbers($year, $extra_info);
         if ($wtt_displayed) {
             $out[] = $wtt_displayed;
@@ -1131,23 +1131,23 @@ 
         }
         */
 
-        if (display_stats_line('comments_on_speeches', 'People have made <a href="' . WEBPATH . 'comments/recent/?pid='.$member->person_id().'">', 'annotation', "</a> on this MP&rsquo;s speeches", '', $extra_info)) {
-            $out[] = display_stats_line('comments_on_speeches', 'People have made <a href="' . WEBPATH . 'comments/recent/?pid='.$member->person_id().'">', 'annotation', "</a> on this MP&rsquo;s speeches", '', $extra_info);
+        if (display_stats_line('comments_on_speeches', 'People have made <a href="' . WEBPATH . 'comments/recent/?pid=' . $member->person_id() . '">', 'annotation', "</a> on this MP&rsquo;s speeches", '', $extra_info)) {
+            $out[] = display_stats_line('comments_on_speeches', 'People have made <a href="' . WEBPATH . 'comments/recent/?pid=' . $member->person_id() . '">', 'annotation', "</a> on this MP&rsquo;s speeches", '', $extra_info);
         }
         if (display_stats_line('reading_age', 'This MP&rsquo;s speeches, in Hansard, are readable by an average ', '', ' year old, going by the <a href="https://en.wikipedia.org/wiki/Flesch-Kincaid_Readability_Test">Flesch-Kincaid Grade Level</a> score', '', $extra_info)) {
             $out[] = display_stats_line('reading_age', 'This MP&rsquo;s speeches, in Hansard, are readable by an average ', '', ' year old, going by the <a href="https://en.wikipedia.org/wiki/Flesch-Kincaid_Readability_Test">Flesch-Kincaid Grade Level</a> score', '', $extra_info);
         }
     }
 
-    if (isset($extra_info['number_of_alerts']) && ($extra_info['number_of_alerts']>0 || $has_email_alerts)) {
-        $line = '<strong>' . _htmlentities($extra_info['number_of_alerts']) . '</strong> ' . ($extra_info['number_of_alerts']==1?'person is':'people are') . ' tracking ';
+    if (isset($extra_info['number_of_alerts']) && ($extra_info['number_of_alerts'] > 0 || $has_email_alerts)) {
+        $line = '<strong>' . _htmlentities($extra_info['number_of_alerts']) . '</strong> ' . ($extra_info['number_of_alerts'] == 1 ? 'person is' : 'people are') . ' tracking ';
         if ($member->house_disp == HOUSE_TYPE_COMMONS) $line .= 'this MP';
         elseif ($member->house_disp == HOUSE_TYPE_LORDS) $line .= 'this peer';
         elseif ($member->house_disp == HOUSE_TYPE_NI) $line .= 'this MLA';
         elseif ($member->house_disp == HOUSE_TYPE_SCOTLAND) $line .= 'this MSP';
         elseif ($member->house_disp == HOUSE_TYPE_ROYAL) $line .= $member->full_name();
         if ($has_email_alerts) {
-            $line .= ' &mdash; <a href="' . WEBPATH . 'alert/?pid='.$member->person_id().'">email me updates on '. $member->full_name(). '&rsquo;s activity</a>';
+            $line .= ' &mdash; <a href="' . WEBPATH . 'alert/?pid=' . $member->person_id() . '">email me updates on ' . $member->full_name() . '&rsquo;s activity</a>';
         }
 
         $out[] = $line;
@@ -1177,25 +1177,25 @@ 
 }
 
 function display_stats_line_house($house, $category, $blurb, $type, $inwhat, $extra_info, $minister, $afterstuff) {
-    if ($category == 'wrans_asked_inlastyear' || $category == 'debate_sectionsspoken_inlastyear' || $category =='comments_on_speeches' ||
-        $category == 'Lwrans_asked_inlastyear' || $category == 'Ldebate_sectionsspoken_inlastyear' || $category =='Lcomments_on_speeches') {
-        if ($extra_info[$category]==0) {
+    if ($category == 'wrans_asked_inlastyear' || $category == 'debate_sectionsspoken_inlastyear' || $category == 'comments_on_speeches' ||
+        $category == 'Lwrans_asked_inlastyear' || $category == 'Ldebate_sectionsspoken_inlastyear' || $category == 'Lcomments_on_speeches') {
+        if ($extra_info[$category] == 0) {
             $blurb = preg_replace('#<a.*?>#', '', $blurb);
             $inwhat = preg_replace('#<\/a>#', '', $inwhat);
         }
     }
-    if ($house==HOUSE_TYPE_LORDS) $inwhat = str_replace('MP', 'Lord', $inwhat);
+    if ($house == HOUSE_TYPE_LORDS) $inwhat = str_replace('MP', 'Lord', $inwhat);
     $line = $blurb;
     $line .= '<strong>' . $extra_info[$category];
     if ($type) $line .= ' ' . make_plural($type, $extra_info[$category]);
     $line .= '</strong>';
     $line .= $inwhat;
-    if ($minister===2) {
+    if ($minister === 2) {
         $line .= ' &#8212; Speakers/ deputy speakers do not ask written questions';
     } elseif ($minister)
         $line .= ' &#8212; Ministers do not ask written questions';
     else {
-        $type = ($house==HOUSE_TYPE_COMMONS?'MP':($house==HOUSE_TYPE_LORDS?'Lord':'MLA'));
+        $type = ($house == HOUSE_TYPE_COMMONS ? 'MP' : ($house == HOUSE_TYPE_LORDS ? 'Lord' : 'MLA'));
         if (!get_http_var('rem') && isset($extra_info[$category . '_quintile'])) {
             $line .= ' &#8212; ';
             $q = $extra_info[$category . '_quintile'];
@@ -1240,7 +1240,7 @@ 
         if ($a == 'very high') $a = 'a very high';
         $extra_info["writetothem_responsiveness_fuzzy_response_description_$year"] = $a;
 
-        return display_stats_line("writetothem_responsiveness_fuzzy_response_description_$year", 'Replied within 2 or 3 weeks to <a href="https://www.writetothem.com/stats/'.$year.'/mps" title="From WriteToThem.com">', "", "</a> <!-- Mean: " . $mean . " --> number of messages sent via WriteToThem.com during ".$year.", according to constituents", "", $extra_info);
+        return display_stats_line("writetothem_responsiveness_fuzzy_response_description_$year", 'Replied within 2 or 3 weeks to <a href="https://www.writetothem.com/stats/' . $year . '/mps" title="From WriteToThem.com">', "", "</a> <!-- Mean: " . $mean . " --> number of messages sent via WriteToThem.com during " . $year . ", according to constituents", "", $extra_info);
     }
 
 }
@@ -1248,7 +1248,7 @@ 
 function get_all_writetothem_strings($member, $wtt_stats_years) {
     $extra_info = $member->extra_info();
     $strings = array();
-    foreach ( $wtt_stats_years as $year ) {
+    foreach ($wtt_stats_years as $year) {
 
         if (isset($extra_info["writetothem_responsiveness_mean_$year"])) {
             $a = $extra_info["writetothem_responsiveness_fuzzy_response_description_$year"];
@@ -1264,7 +1264,7 @@ 
         return;
     }
 
-    $reg = array( 'date' => '', 'data' => '<p>Nil</p>' );
+    $reg = array('date' => '', 'data' => '<p>Nil</p>');
     if (isset($extra_info['register_member_interests_date'])) {
         $reg['date'] = format_date($extra_info['register_member_interests_date'], SHORTDATEFORMAT);
     }
@@ -1299,7 +1299,7 @@ 
             $dissolution['params']);
     }
     $mcon = array(); $mreg = array();
-    for ($i=0; $i<$q->rows(); $i++) {
+    for ($i = 0; $i < $q->rows(); $i++) {
         $house = $q->field($i, 'house');
         $pid = $q->field($i, 'person_id');
         $cons = $q->field($i, 'constituency');
@@ -1337,8 +1337,8 @@ 
         }
     }
 
-    foreach($mreg as $reg) {
-        $data['members'][] = array (
+    foreach ($mreg as $reg) {
+        $data['members'][] = array(
             'url' => '/' . $rep_type . '/?p=' . $reg['person_id'],
             'name' => $reg['given_name'] . ' ' . $reg['family_name']
         );

Braces +145 added lines, -64 removed lines

@@ -62,16 +62,36 @@ 
 $constituency = strtolower(str_replace('_', ' ', get_http_var('c')));
 
 // Fix for names with non-ASCII characters
-if ($name == 'sion simon') $name = 'si\xf4n simon';
-if ($name == 'sian james') $name = 'si\xe2n james';
-if ($name == 'lembit opik') $name = 'lembit \xf6pik';
-if ($name == 'bairbre de brun') $name = 'bairbre de br\xfan';
-if ($name == 'daithi mckay') $name = 'daith\xed mckay';
-if ($name == 'caral ni chuilin') $name = 'car\xe1l n\xed chuil\xedn';
-if ($name == 'caledon du pre') $name = 'caledon du pr\xe9';
-if ($name == 'sean etchingham') $name = 'se\xe1n etchingham';
-if ($name == 'john tinne') $name = 'john tinn\xe9';
-if ($name == 'renee short') $name = 'ren\xe9e short';
+if ($name == 'sion simon') {
+    $name = 'si\xf4n simon';
+}
+if ($name == 'sian james') {
+    $name = 'si\xe2n james';
+}
+if ($name == 'lembit opik') {
+    $name = 'lembit \xf6pik';
+}
+if ($name == 'bairbre de brun') {
+    $name = 'bairbre de br\xfan';
+}
+if ($name == 'daithi mckay') {
+    $name = 'daith\xed mckay';
+}
+if ($name == 'caral ni chuilin') {
+    $name = 'car\xe1l n\xed chuil\xedn';
+}
+if ($name == 'caledon du pre') {
+    $name = 'caledon du pr\xe9';
+}
+if ($name == 'sean etchingham') {
+    $name = 'se\xe1n etchingham';
+}
+if ($name == 'john tinne') {
+    $name = 'john tinn\xe9';
+}
+if ($name == 'renee short') {
+    $name = 'ren\xe9e short';
+}
 
 // Fix for common misspellings, name changes etc
 $name_fix = array(
@@ -103,7 +123,9 @@ 
 }
 
 // Fixes for Ynys Mon, and a Unicode URL
-if ($constituency == 'ynys mon') $constituency = "ynys m\xf4n";
+if ($constituency == 'ynys mon') {
+    $constituency = "ynys m\xf4n";
+}
 if (preg_match("#^ynys m\xc3\xb4n#i", $constituency)) {
     $constituency = "ynys m\xf4n";
 }
@@ -126,11 +148,17 @@ 
 
 /////////////////////////////////////////////////////////
 // DETERMINE TYPE OF REPRESENTITIVE
-if (get_http_var('peer')) $this_page = 'peer';
-elseif (get_http_var('royal')) $this_page = 'royal';
-elseif (get_http_var('mla')) $this_page = 'mla';
-elseif (get_http_var('msp')) $this_page = 'msp';
-else $this_page = 'mp';
+if (get_http_var('peer')) {
+    $this_page = 'peer';
+} elseif (get_http_var('royal')) {
+    $this_page = 'royal';
+} elseif (get_http_var('mla')) {
+    $this_page = 'mla';
+} elseif (get_http_var('msp')) {
+    $this_page = 'msp';
+} else {
+    $this_page = 'mp';
+}
 
 try {
     if (is_numeric($pid)) {
@@ -179,8 +207,9 @@ 
 $desc = "Read $member_name's contributions to Parliament, including speeches and questions";
 
 // Enhance description if this is a current member
-if ($MEMBER->current_member_anywhere())
+if ($MEMBER->current_member_anywhere()) {
     $desc .= ', investigate their voting record, and get email alerts on their activity';
+}
 
 // Enhance title if this is a member of the Commons
 if ($MEMBER->house(HOUSE_TYPE_COMMONS)) {
@@ -188,8 +217,10 @@ 
         $title .= ', former';
     }
     $title .= ' MP';
-    if ($MEMBER->constituency()) $title .= ', ' . $MEMBER->constituency();
-}
+    if ($MEMBER->constituency()) {
+        $title .= ', ' . $MEMBER->constituency();
+    }
+    }
 
 // Enhance title if this is a member of NIA
 if ($MEMBER->house(HOUSE_TYPE_NI)) {
@@ -202,8 +233,10 @@ 
         $title .= ', former';
     }
     $title .= ' MLA';
-    if ($MEMBER->constituency()) $title .= ', ' . $MEMBER->constituency();
-}
+    if ($MEMBER->constituency()) {
+        $title .= ', ' . $MEMBER->constituency();
+    }
+    }
 
 // Enhance title if this is a member of Scottish Parliament
 if ($MEMBER->house(HOUSE_TYPE_SCOTLAND)) {
@@ -224,14 +257,18 @@ 
 // Position if this is a member of the Commons
 if ($MEMBER->house(HOUSE_TYPE_COMMONS)) {
     $position = $MEMBER->current_member(HOUSE_TYPE_COMMONS) ? 'MP' : 'Former MP';
-    if ($MEMBER->constituency()) $position .= ', ' . $MEMBER->constituency();
+    if ($MEMBER->constituency()) {
+        $position .= ', ' . $MEMBER->constituency();
+    }
     $positions[] = $position;
 }
 
 // Position if this is a member of NIA
 if ($MEMBER->house(HOUSE_TYPE_NI)) {
     $position = $MEMBER->current_member(HOUSE_TYPE_NI) ? 'MLA' : 'Former MLA';
-    if ($MEMBER->constituency()) $position .= ', ' . $MEMBER->constituency();
+    if ($MEMBER->constituency()) {
+        $position .= ', ' . $MEMBER->constituency();
+    }
     $positions[] = $position;
 }
 
@@ -265,8 +302,9 @@ 
 
 // Build the RSS link and add it to page data.
 $feedurl = $DATA->page_metadata('mp_rss', 'url') . $MEMBER->person_id() . '.rdf';
-if (file_exists(BASEDIR . '/' . $feedurl))
+if (file_exists(BASEDIR . '/' . $feedurl)) {
     $DATA->set_page_metadata($this_page, 'rss', $feedurl);
+}
 
 // Prepare data for the template
 $data['full_name'] = $MEMBER->full_name();
@@ -692,11 +730,13 @@ 
         $url = $MEMBER->url();
         $params = array();
         foreach ($_GET as $key => $value) {
-            if (substr($key, 0, 4) == 'utm_' || $key == 'gclid')
-                $params[] = "$key=$value";
+            if (substr($key, 0, 4) == 'utm_' || $key == 'gclid') {
+                            $params[] = "$key=$value";
+            }
+        }
+        if (count($params)) {
+                    $url .= '?' . join('&', $params);
         }
-        if (count($params))
-            $url .= '?' . join('&', $params);
         if ($pagetype) {
             $pagetype = '/' . $pagetype;
         } else {
@@ -773,16 +813,21 @@ 
     $current_member = $MEMBER->current_member();
     $left_house = $MEMBER->left_house();
 
-    if (in_array(HOUSE_TYPE_ROYAL, $MEMBER->houses())) { # Royal short-circuit
+    if (in_array(HOUSE_TYPE_ROYAL, $MEMBER->houses())) {
+# Royal short-circuit
         return '<strong>Acceded on ' . $entered_house[HOUSE_TYPE_ROYAL]['date_pretty']
             . '<br>Coronated on 2 June 1953</strong></li>';
     }
     $desc = '';
     foreach ($MEMBER->houses() as $house) {
-        if ($house==HOUSE_TYPE_COMMONS && isset($entered_house[HOUSE_TYPE_LORDS]))
-            continue; # Same info is printed further down
+        if ($house==HOUSE_TYPE_COMMONS && isset($entered_house[HOUSE_TYPE_LORDS])) {
+                    continue;
+        }
+        # Same info is printed further down
 
-        if (!$current_member[$house]) $desc .= 'Former ';
+        if (!$current_member[$house]) {
+            $desc .= 'Former ';
+        }
 
         $party = $left_house[$house]['party'];
         $party_br = '';
@@ -790,8 +835,9 @@ 
             $party_br = $m[2];
             $party = $m[1];
         }
-        if ($party != 'unknown')
-            $desc .= _htmlentities($party);
+        if ($party != 'unknown') {
+                    $desc .= _htmlentities($party);
+        }
         if ($party == 'Speaker' || $party == 'Deputy Speaker') {
             $desc .= ', and ';
             # XXX: Might go horribly wrong if something odd happens
@@ -802,15 +848,23 @@ 
         }
         if ($house==HOUSE_TYPE_COMMONS || $house==HOUSE_TYPE_NI || $house==HOUSE_TYPE_SCOTLAND) {
             $desc .= ' ';
-            if ($house==HOUSE_TYPE_COMMONS) $desc .= '<abbr title="Member of Parliament">MP</abbr>';
-            if ($house==HOUSE_TYPE_NI) $desc .= '<abbr title="Member of the Legislative Assembly">MLA</abbr>';
-            if ($house==HOUSE_TYPE_SCOTLAND) $desc .= '<abbr title="Member of the Scottish Parliament">MSP</abbr>';
+            if ($house==HOUSE_TYPE_COMMONS) {
+                $desc .= '<abbr title="Member of Parliament">MP</abbr>';
+            }
+            if ($house==HOUSE_TYPE_NI) {
+                $desc .= '<abbr title="Member of the Legislative Assembly">MLA</abbr>';
+            }
+            if ($house==HOUSE_TYPE_SCOTLAND) {
+                $desc .= '<abbr title="Member of the Scottish Parliament">MSP</abbr>';
+            }
             if ($party_br) {
                 $desc .= " ($party_br)";
             }
             $desc .= ' for ' . $left_house[$house]['constituency'];
         }
-        if ($house==HOUSE_TYPE_LORDS && $party != 'Bishop') $desc .= ' Peer';
+        if ($house==HOUSE_TYPE_LORDS && $party != 'Bishop') {
+            $desc .= ' Peer';
+        }
         $desc .= ', ';
     }
     $desc = preg_replace('#, $#', '', $desc);
@@ -1073,10 +1127,13 @@ 
     # Find latest entered house
     $entered_house = null;
     foreach ($member->entered_house() as $h => $eh) {
-        if (!$entered_house || $eh['date'] > $entered_house) $entered_house = $eh['date'];
+        if (!$entered_house || $eh['date'] > $entered_house) {
+            $entered_house = $eh['date'];
+        }
+    }
+    if ($entered_house > $year_ago) {
+            $since_text = 'since joining Parliament';
     }
-    if ($entered_house > $year_ago)
-        $since_text = 'since joining Parliament';
 
     $MOREURL = new \MySociety\TheyWorkForYou\Url('search');
     $section = 'section:debates section:whall section:lords section:ni';
@@ -1089,10 +1146,12 @@ 
         $MOREURL->insert(array('pid'=>$member->person_id(), 's'=>'section:wrans', 'pop'=>1));
         // We assume that if they've answered a question, they're a minister
         $minister = 0; $Lminister = false;
-        if (isset($extra_info['wrans_answered_inlastyear']) && $extra_info['wrans_answered_inlastyear'] > 0 && $extra_info['wrans_asked_inlastyear'] == 0)
-            $minister = 1;
-        if (isset($extra_info['Lwrans_answered_inlastyear']) && $extra_info['Lwrans_answered_inlastyear'] > 0 && $extra_info['Lwrans_asked_inlastyear'] == 0)
-            $Lminister = true;
+        if (isset($extra_info['wrans_answered_inlastyear']) && $extra_info['wrans_answered_inlastyear'] > 0 && $extra_info['wrans_asked_inlastyear'] == 0) {
+                    $minister = 1;
+        }
+        if (isset($extra_info['Lwrans_answered_inlastyear']) && $extra_info['Lwrans_answered_inlastyear'] > 0 && $extra_info['Lwrans_asked_inlastyear'] == 0) {
+                    $Lminister = true;
+        }
         if ($member->party() == 'SPK' || $member->party() == 'CWM' || $member->party() == 'DCWM') {
             $minister = 2;
         }
@@ -1141,11 +1200,17 @@ 
 
     if (isset($extra_info['number_of_alerts']) && ($extra_info['number_of_alerts']>0 || $has_email_alerts)) {
         $line = '<strong>' . _htmlentities($extra_info['number_of_alerts']) . '</strong> ' . ($extra_info['number_of_alerts']==1?'person is':'people are') . ' tracking ';
-        if ($member->house_disp == HOUSE_TYPE_COMMONS) $line .= 'this MP';
-        elseif ($member->house_disp == HOUSE_TYPE_LORDS) $line .= 'this peer';
-        elseif ($member->house_disp == HOUSE_TYPE_NI) $line .= 'this MLA';
-        elseif ($member->house_disp == HOUSE_TYPE_SCOTLAND) $line .= 'this MSP';
-        elseif ($member->house_disp == HOUSE_TYPE_ROYAL) $line .= $member->full_name();
+        if ($member->house_disp == HOUSE_TYPE_COMMONS) {
+            $line .= 'this MP';
+        } elseif ($member->house_disp == HOUSE_TYPE_LORDS) {
+            $line .= 'this peer';
+        } elseif ($member->house_disp == HOUSE_TYPE_NI) {
+            $line .= 'this MLA';
+        } elseif ($member->house_disp == HOUSE_TYPE_SCOTLAND) {
+            $line .= 'this MSP';
+        } elseif ($member->house_disp == HOUSE_TYPE_ROYAL) {
+            $line .= $member->full_name();
+        }
         if ($has_email_alerts) {
             $line .= ' &mdash; <a href="' . WEBPATH . 'alert/?pid='.$member->person_id().'">email me updates on '. $member->full_name(). '&rsquo;s activity</a>';
         }
@@ -1169,10 +1234,12 @@ 
 
 function display_stats_line($category, $blurb, $type, $inwhat, $afterstuff, $extra_info, $minister = false, $Lminister = false) {
     $return = false;
-    if (isset($extra_info[$category]))
-        $return = display_stats_line_house(HOUSE_TYPE_COMMONS, $category, $blurb, $type, $inwhat, $extra_info, $minister, $afterstuff);
-    if (isset($extra_info["L$category"]))
-        $return = display_stats_line_house(HOUSE_TYPE_LORDS, "L$category", $blurb, $type, $inwhat, $extra_info, $Lminister, $afterstuff);
+    if (isset($extra_info[$category])) {
+            $return = display_stats_line_house(HOUSE_TYPE_COMMONS, $category, $blurb, $type, $inwhat, $extra_info, $minister, $afterstuff);
+    }
+    if (isset($extra_info["L$category"])) {
+            $return = display_stats_line_house(HOUSE_TYPE_LORDS, "L$category", $blurb, $type, $inwhat, $extra_info, $Lminister, $afterstuff);
+    }
     return $return;
 }
 
@@ -1184,17 +1251,21 @@ 
             $inwhat = preg_replace('#<\/a>#', '', $inwhat);
         }
     }
-    if ($house==HOUSE_TYPE_LORDS) $inwhat = str_replace('MP', 'Lord', $inwhat);
+    if ($house==HOUSE_TYPE_LORDS) {
+        $inwhat = str_replace('MP', 'Lord', $inwhat);
+    }
     $line = $blurb;
     $line .= '<strong>' . $extra_info[$category];
-    if ($type) $line .= ' ' . make_plural($type, $extra_info[$category]);
+    if ($type) {
+        $line .= ' ' . make_plural($type, $extra_info[$category]);
+    }
     $line .= '</strong>';
     $line .= $inwhat;
     if ($minister===2) {
         $line .= ' &#8212; Speakers/ deputy speakers do not ask written questions';
-    } elseif ($minister)
-        $line .= ' &#8212; Ministers do not ask written questions';
-    else {
+    } elseif ($minister) {
+            $line .= ' &#8212; Ministers do not ask written questions';
+    } else {
         $type = ($house==HOUSE_TYPE_COMMONS?'MP':($house==HOUSE_TYPE_LORDS?'Lord':'MLA'));
         if (!get_http_var('rem') && isset($extra_info[$category . '_quintile'])) {
             $line .= ' &#8212; ';
@@ -1233,11 +1304,21 @@ 
         $mean = $extra_info["writetothem_responsiveness_mean_$year"];
 
         $a = $extra_info["writetothem_responsiveness_fuzzy_response_description_$year"];
-        if ($a == 'very low') $a = 'a very low';
-        if ($a == 'low') $a = 'a low';
-        if ($a == 'medium') $a = 'a medium';
-        if ($a == 'high') $a = 'a high';
-        if ($a == 'very high') $a = 'a very high';
+        if ($a == 'very low') {
+            $a = 'a very low';
+        }
+        if ($a == 'low') {
+            $a = 'a low';
+        }
+        if ($a == 'medium') {
+            $a = 'a medium';
+        }
+        if ($a == 'high') {
+            $a = 'a high';
+        }
+        if ($a == 'very high') {
+            $a = 'a very high';
+        }
         $extra_info["writetothem_responsiveness_fuzzy_response_description_$year"] = $a;
 
         return display_stats_line("writetothem_responsiveness_fuzzy_response_description_$year", 'Replied within 2 or 3 weeks to <a href="https://www.writetothem.com/stats/'.$year.'/mps" title="From WriteToThem.com">', "", "</a> <!-- Mean: " . $mean . " --> number of messages sent via WriteToThem.com during ".$year.", according to constituents", "", $extra_info);

classes/Homepage.php

Spacing +10 added lines, -10 removed lines

@@ -57,14 +57,14 @@ 
         $gid = $featured->get_gid();
         $gidCheck = new Gid($gid);
         $gid = $gidCheck->checkForRedirect();
-        if ( $gid ) {
+        if ($gid) {
             $title = $featured->get_title();
             $context = $featured->get_context();
             $related = $featured->get_related();
             $item = $this->getFeaturedDebate($gid, $title, $context, $related);
         } else {
             $item = $debatelist->display('recent_debates', array('days' => 7, 'num' => 1), 'none');
-            if ( isset($item['data']) && count($item['data']) ) {
+            if (isset($item['data']) && count($item['data'])) {
                 $item = $item['data'][0];
                 $more_url = new Url('debates');
                 $item['more_url'] = $more_url->generate();
@@ -95,8 +95,8 @@ 
         $item['featured'] = true;
 
         $related_debates = array();
-        foreach ( $related as $related_gid ) {
-            if ( $related_gid ) {
+        foreach ($related as $related_gid) {
+            if ($related_gid) {
                 $related_item = $debatelist->display('featured_gid', array('gid' => $related_gid), 'none');
                 $related_debates[] = $related_item['data'];
             }
@@ -121,21 +121,21 @@ 
 
         $recent_content = array();
 
-        foreach ( $this->recent_types as $class => $recent ) {
+        foreach ($this->recent_types as $class => $recent) {
             $class = "\\$class";
             $instance = new $class();
             $more_url = new Url($recent[1]);
-            if ( $recent[0] == 'recent_pbc_debates' ) {
-                $content = array( 'data' => $instance->display($recent[0], array('num' => 5), 'none') );
+            if ($recent[0] == 'recent_pbc_debates') {
+                $content = array('data' => $instance->display($recent[0], array('num' => 5), 'none'));
             } else {
                 $content = $instance->display($recent[0], array('days' => 7, 'num' => 1), 'none');
-                if ( isset($content['data']) && count($content['data']) ) {
+                if (isset($content['data']) && count($content['data'])) {
                     $content = $content['data'][0];
                 } else {
                     $content = array();
                 }
             }
-            if ( $content ) {
+            if ($content) {
                 $content['more_url'] = $more_url->generate();
                 $content['desc'] = $recent[2];
                 $recent_content[] = $content;
@@ -154,7 +154,7 @@ 
             WHERE event_date >= :date
             AND deleted = 0
             ORDER BY event_date, chamber, pos",
-            array( ':date' => $date )
+            array(':date' => $date)
         );
 
         if (!$q->rows()) {