mysociety / theyworkforyou

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()) {

classes/Utility/Hansard.php

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
         $parts = parse_url($url);
         parse_str($parts['query'], $query);
 
-        if ( $query['id'] ) {
+        if ($query['id']) {
             if (strpos($parts['path'], 'lords') !== false) {
                 $gid = 'uk.org.publicwhip/lords/';
             } elseif (strpos($parts['path'], 'whall') !== false) {
@@ -30,13 +30,13 @@ 
 
 
     public static function gid_to_url($gid) {
-        if ( !$gid ) {
+        if (!$gid) {
             return '';
         }
         global $hansardmajors;
         $db = new \ParlDB();
 
-        $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", array( ':gid' => $gid ));
+        $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", array(':gid' => $gid));
         $url_gid = fix_gid_from_db($gid);
         $url = new \MySociety\TheyWorkForYou\Url($hansardmajors[$q->field(0, 'major')]['page']);
         $url->insert(array('id' => $url_gid));

classes/SectionView/NiView.php

Spacing +8 added lines, -8 removed lines

@@ -32,7 +32,7 @@ 
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'ni' )
+            array('section' => 'ni')
         );
     }
 
@@ -52,23 +52,23 @@ 
 
         $debates = $DEBATELIST->display('recent_debates', array('days' => 30, 'num' => 6), 'none');
         $MOREURL = new \MySociety\TheyWorkForYou\Url('nidebatesfront');
-        $MOREURL->insert( array( 'more' => 1 ) );
+        $MOREURL->insert(array('more' => 1));
 
         // this makes sure that we don't repeat this debate in the list below
         $random_debate = NULL;
-        if ( isset($debates['data']) && count($debates['data']) ) {
+        if (isset($debates['data']) && count($debates['data'])) {
             $random_debate = $debates['data'][0];
         }
 
         $recent = array();
-        if ( isset($debates['data']) && count($debates['data']) ) {
+        if (isset($debates['data']) && count($debates['data'])) {
             // at the start of a session there may be less than 6
             // debates
             $max = 6;
-            if ( count($debates['data']) < 6 ) {
+            if (count($debates['data']) < 6) {
                 $max = count($debates['data']);
             }
-            for ( $i = 1; $i < $max; $i++ ) {
+            for ($i = 1; $i < $max; $i++) {
                 $debate = $debates['data'][$i];
                 $debate['desc'] = "Northern Ireland Assembly debates";
                 $debate['more_url'] = $MOREURL->generate();
@@ -77,7 +77,7 @@ 
         }
 
         $featured = array();
-        if ( $random_debate ) {
+        if ($random_debate) {
             $featured = $random_debate;
             $featured['more_url'] = $MOREURL->generate();
             $featured['desc'] = 'Northern Ireland Assembly debate';
@@ -86,7 +86,7 @@ 
         }
 
         $data['featured'] = $featured;
-        $data['debates'] = array( 'recent' => $recent);
+        $data['debates'] = array('recent' => $recent);
 
         $data['regional'] = $this->getMLAList();
         $data['template'] = 'ni/index';

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

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

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

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

Spacing +4 added lines, -4 removed lines

@@ -66,7 +66,7 @@ 
 if (isset ($data['rows']) && count($data['rows']) > 0) {
 
     echo '<dl id="searchresults">';
-    for ($i=0; $i<count($data['rows']); $i++) {
+    for ($i = 0; $i < count($data['rows']); $i++) {
 
         $row = $data['rows'][$i];
         echo '<dt><a href="', $row['listurl'], '">';
@@ -79,14 +79,14 @@ 
         }
         if (isset($row['collapsed']) && $row['collapsed'] && $row['subsection_id']) {
             $URL = new \MySociety\TheyWorkForYou\Url('search');
-            $URL->insert(array('s' => $info['s'] . " segment:$row[subsection_id]" ));
+            $URL->insert(array('s' => $info['s'] . " segment:$row[subsection_id]"));
             echo ' <a href="', $URL->generate(), '">See ', $row['collapsed'],
-            ' other result', $row['collapsed']>1?'s':'', ' from this ',
+            ' other result', $row['collapsed'] > 1 ? 's' : '', ' from this ',
             $hansardmajors[$row['major']]['singular'], '</a>';
         }
         echo '</small>';
         if ($match = get_http_var('match')) {
-            echo ' &ndash; <a href="/search/record.php?result=', $row['gid'] , '&amp;match=', _htmlspecialchars($match), '">This is the correct match</a>';
+            echo ' &ndash; <a href="/search/record.php?result=', $row['gid'], '&amp;match=', _htmlspecialchars($match), '">This is the correct match</a>';
         }
         echo '</dt> <dd><p>';
         if (isset($row['speaker']) && count($row['speaker'])) {

www/includes/easyparliament/page.php

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

Spacing +46 added lines, -46 removed lines

@@ -42,7 +42,7 @@ 
     }
 
 
-    public function display ($view, $args=array(), $format='html') {
+    public function display($view, $args = array(), $format = 'html') {
         // $view is what we're viewing by:
         //	'ep' is all the comments attached to an epobject.
         //	'user' is all the comments written by a user.
@@ -60,13 +60,13 @@ 
 
         if ($view == 'ep' || $view == 'user' || $view == 'recent' || $view == 'search' || $view == 'dates') {
             // What function do we call for this view?
-            $function = '_get_data_by_'.$view;
+            $function = '_get_data_by_' . $view;
             // Get all the dta that's to be rendered.
             $data = $this->$function($args);
 
         } else {
             // Don't have a valid $view;
-            $PAGE->error_message ("You haven't specified a view type.");
+            $PAGE->error_message("You haven't specified a view type.");
             return false;
         }
 
@@ -85,29 +85,29 @@ 
         return true;
     }
 
-    public function render($data, $format='html', $template='comments') {
-        include (INCLUDESPATH."easyparliament/templates/$format/$template.php");
+    public function render($data, $format = 'html', $template = 'comments') {
+        include (INCLUDESPATH . "easyparliament/templates/$format/$template.php");
     }
 
     public function _get_data_by_ep($args) {
         // Get all the data attached to an epobject.
         global $PAGE;
 
-        twfy_debug (get_class($this), "getting data by epobject");
+        twfy_debug(get_class($this), "getting data by epobject");
 
         // What we return.
         $data = array();
         if (!is_numeric($args['epobject_id'])) {
-            $PAGE->error_message ("Sorry, we don't have a valid epobject id");
+            $PAGE->error_message("Sorry, we don't have a valid epobject id");
             return $data;
         }
 
         // For getting the data.
-        $input = array (
-            'amount' => array (
+        $input = array(
+            'amount' => array(
                 'user' => true
             ),
-            'where' => array (
+            'where' => array(
                 'comments.epobject_id=' => $args['epobject_id'],
                 #'visible=' => '1'
             ),
@@ -135,13 +135,13 @@ 
         // comments by things in $args?
         global $PAGE;
 
-        twfy_debug (get_class($this), "getting data by user");
+        twfy_debug(get_class($this), "getting data by user");
 
         // What we return.
         $data = array();
 
         if (!is_numeric($args['user_id'])) {
-            $PAGE->error_message ("Sorry, we don't have a valid user id");
+            $PAGE->error_message("Sorry, we don't have a valid user id");
             return $data;
         }
 
@@ -151,13 +151,13 @@ 
             $num = 10;
         }
 
-        if (isset($args['page']) && is_numeric($args['page']) && $args['page']>1) {
+        if (isset($args['page']) && is_numeric($args['page']) && $args['page'] > 1) {
             $page = $args['page'];
         } else {
             $page = 1;
         }
 
-        $limit = $num*($page-1) . ',' . $num;
+        $limit = $num * ($page - 1) . ',' . $num;
 
         // We're getting the most recent comments posted to epobjects.
         // We're grouping them by epobject so we can just link to each hansard thing once.
@@ -193,10 +193,10 @@ 
 
         if ($q->rows() > 0) {
 
-            for ($n=0; $n<$q->rows(); $n++) {
+            for ($n = 0; $n < $q->rows(); $n++) {
 
                 // All the basic stuff...
-                $comments[$n] = array (
+                $comments[$n] = array(
                     'comment_id'		=> $q->field($n, 'comment_id'),
                     'posted'			=> $q->field($n, 'posted'),
                     'total_comments'	=> $q->field($n, 'total_comments'),
@@ -208,7 +208,7 @@ 
                 );
 
                 // Add the URL...
-                $urldata = array (
+                $urldata = array(
                     'major' 		=> $q->field($n, 'major'),
                     'gid'			=> $q->field($n, 'gid'),
                     'comment_id'	=> $q->field($n, 'comment_id'),
@@ -234,14 +234,14 @@ 
 
                 $commentbodies = array();
 
-                for ($n=0; $n<$r->rows(); $n++) {
-                    $commentbodies[ $r->field($n, 'comment_id') ] = $r->field($n, 'body');
+                for ($n = 0; $n < $r->rows(); $n++) {
+                    $commentbodies[$r->field($n, 'comment_id')] = $r->field($n, 'body');
                 }
 
                 // This does rely on both this and the previous query returning
                 // stuff in the same order...
                 foreach ($comments as $n => $commentdata) {
-                    $comments[$n]['body'] = $commentbodies[ $comments[$n]['comment_id'] ];
+                    $comments[$n]['body'] = $commentbodies[$comments[$n]['comment_id']];
                 }
             }
         }
@@ -261,7 +261,7 @@ 
         // $args should contain 'num', indicating how many to get.
         // and perhaps pid too, for a particular person
 
-        twfy_debug (get_class($this), "getting data by recent");
+        twfy_debug(get_class($this), "getting data by recent");
 
         // What we return.
         $data = array();
@@ -278,7 +278,7 @@ 
             $page = 1;
         }
 
-        $limit = $num*($page-1) . ',' . $num;
+        $limit = $num * ($page - 1) . ',' . $num;
 
         $where = array(
             'visible=' => '1'
@@ -286,8 +286,8 @@ 
         if (isset($args['pid']) && is_numeric($args['pid'])) {
             $where['person_id='] = $args['pid'];
         }
-        $input = array (
-            'amount' => array (
+        $input = array(
+            'amount' => array(
                 'user' => true
             ),
             'where'  => $where,
@@ -305,7 +305,7 @@ 
             $data['pid'] = $args['pid'];
             $q = 'SELECT title, given_name, family_name, lordofname, house FROM member m, person_names p WHERE m.person_id=p.person_id AND p.type="name" AND left_house="9999-12-31" AND m.person_id = :pid';
             $q = $this->db->query($q, array(':pid' => $args['pid']));
-            $data['full_name'] = member_full_name($q->field(0, 'house'), $q->field(0, 'title'), $q->field(0, 'given_name'), $q->field(0, 'family_name'), $q->field(0,'lordofname'));
+            $data['full_name'] = member_full_name($q->field(0, 'house'), $q->field(0, 'title'), $q->field(0, 'given_name'), $q->field(0, 'family_name'), $q->field(0, 'lordofname'));
             $q = 'SELECT COUNT(*) AS count FROM comments,hansard WHERE visible=1 AND comments.epobject_id = hansard.epobject_id and hansard.person_id = :pid';
             $params[':pid'] = $args['pid'];
         } else {
@@ -319,15 +319,15 @@ 
   public function _get_data_by_dates($args) {
     // $args should contain start_date and end_date
 
-        twfy_debug (get_class($this), "getting data by recent");
+        twfy_debug(get_class($this), "getting data by recent");
         $data = array();
         $where = array(
             'visible=' => '1',
             'date(posted)>=' => $args['start_date'],
             'date(posted)<=' => $args['end_date']
         );
-        $input = array (
-            'amount' => array (
+        $input = array(
+            'amount' => array(
                 'user' => true
             ),
             'where'  => $where,
@@ -341,7 +341,7 @@ 
     public function _get_data_by_search($args) {
         // $args should contain 'num', indicating how many to get.
 
-        twfy_debug (get_class($this), "getting data by search");
+        twfy_debug(get_class($this), "getting data by search");
 
         // What we return.
         $data = array();
@@ -358,13 +358,13 @@ 
             $page = 1;
         }
 
-        $limit = $num*($page-1) . ',' . $num;
+        $limit = $num * ($page - 1) . ',' . $num;
 
-        $input = array (
-            'amount' => array (
+        $input = array(
+            'amount' => array(
                 'user'=> true
             ),
-            'where'  => array (
+            'where'  => array(
                 'comments.body LIKE' => "%$args[s]%"
             ),
             'order' => 'posted DESC',
@@ -391,7 +391,7 @@ 
         // It returns the URL for the comment.
 
         $major 		= $urldata['major'];
-        $gid 		= $urldata['gid'];
+        $gid = $urldata['gid'];
         $comment_id = $urldata['comment_id'];
         $user_id = isset($urldata['user_id']) ? $urldata['user_id'] : false;
 
@@ -405,7 +405,7 @@ 
         $URL = new \MySociety\TheyWorkForYou\Url($page);
 
         $gid = fix_gid_from_db($gid); // In includes/utility.php
-        $URL->insert(array('id' => $gid ));
+        $URL->insert(array('id' => $gid));
         if ($user_id) {
             $URL->insert(array('u' => $user_id));
         }
@@ -483,9 +483,9 @@ 
         $limit = isset($input['limit']) ? $input['limit'] : '';
 
         // The fields to fetch from db. 'table' => array ('field1', 'field2').
-        $fieldsarr = array (
-            'comments' => array ('comment_id', 'user_id', 'epobject_id', 'body', 'posted', 'modflagged', 'visible'),
-            'hansard' => array ('major', 'gid')
+        $fieldsarr = array(
+            'comments' => array('comment_id', 'user_id', 'epobject_id', 'body', 'posted', 'modflagged', 'visible'),
+            'hansard' => array('major', 'gid')
         );
 
         // Yes, we need the gid of a comment's associated hansard object
@@ -496,7 +496,7 @@ 
 
         // Add on the stuff for getting a user's details.
         if (isset($amount['user']) && $amount['user'] == true) {
-            $fieldsarr['users'] = array ('firstname', 'lastname', 'user_id');
+            $fieldsarr['users'] = array('firstname', 'lastname', 'user_id');
             // Like doing "FROM comments, users" but it's easier to add
             // an "INNER JOIN..." automatically to the query.
             $join .= ' INNER JOIN users ON comments.user_id = users.user_id ';
@@ -507,7 +507,7 @@ 
             $fieldsarr['epobject'] = array('body');
         }
 
-        $fieldsarr2 = array ();
+        $fieldsarr2 = array();
         // Construct the $fields clause.
         foreach ($fieldsarr as $table => $tablesfields) {
             foreach ($tablesfields as $n => $field) {
@@ -518,13 +518,13 @@ 
                 if ($table == 'epobject' && $field == 'body') {
                     $field .= ' AS hbody';
                 }
-                $fieldsarr2[] = $table.'.'.$field;
+                $fieldsarr2[] = $table . '.' . $field;
             }
         }
         $fields = implode(', ', $fieldsarr2);
 
 
-        $wherearr2 = array ();
+        $wherearr2 = array();
         $params = array();
         $i = 0;
         // Construct the $where clause.
@@ -533,7 +533,7 @@ 
             $params[":where$i"] = $val;
             $i++;
         }
-        $where = implode (" AND ", $wherearr2);
+        $where = implode(" AND ", $wherearr2);
 
         if ($order != '') {
             $order = "ORDER BY $order";
@@ -544,7 +544,7 @@ 
         }
 
         // Finally, do the query!
-        $q = $this->db->query ("SELECT $fields
+        $q = $this->db->query("SELECT $fields
                         FROM 	comments
                         $join
                         WHERE $where
@@ -553,7 +553,7 @@ 
                         ", $params);
 
         // Format the data into an array for returning.
-        $data = array ();
+        $data = array();
 
         if ($q->rows() > 0) {
 
@@ -563,7 +563,7 @@ 
             // We'll generate permalinks for each comment.
             // Assuming every comment is from the same major...
 
-            for ($n=0; $n<$q->rows(); $n++) {
+            for ($n = 0; $n < $q->rows(); $n++) {
 
                 // Put each row returned into its own array in $data.
                 foreach ($fieldsarr as $table => $tablesfields) {

www/includes/easyparliament/init.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");