mysociety / theyworkforyou

classes/SectionView/SectionView.php

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

@@ -512,7 +512,7 @@
             if ($row['totalcomments'] > 1) {
                 $morecount = $row['totalcomments'] - 1;
                 $plural = $morecount == 1 ? 'annotation' : 'annotations';
-                $linktext = "Read $morecount more $plural";
+                $linktext = "read $morecount more $plural";
             }
 
         } else {

Spacing +35 added lines, -35 removed lines

@@ -38,7 +38,7 @@ 
             $data = $this->addCommonData($data);
         } elseif ($date = get_http_var('d')) {
             $data = $this->display_day($date);
-            if ( !isset($data['template']) ) {
+            if (!isset($data['template'])) {
                 $data['template'] = 'section/day';
             }
             $data = $this->addCommonData($data);
@@ -46,7 +46,7 @@ 
             $data = $this->display_section_or_speech();
         } else {
             $data = $this->display_front();
-            if ( !isset($data['template']) ) {
+            if (!isset($data['template'])) {
                 $data['template'] = 'section/recent';
             }
             $data['search_sections'] = $this->getSearchSections();
@@ -68,10 +68,10 @@ 
         $data['recess_major'] = $this->getRecessMajor();
 
         $nextprev = $DATA->page_metadata($this_page, 'nextprev');
-        if ( isset($nextprev['next']['url']) ) {
+        if (isset($nextprev['next']['url'])) {
             $data['next'] = $nextprev['next'];
         }
-        if ( isset($nextprev['prev']['url']) ) {
+        if (isset($nextprev['prev']['url'])) {
             $data['prev'] = $nextprev['prev'];
         }
 
@@ -80,7 +80,7 @@ 
         if (!isset($data['title']) && $parent_page != '') {
             $data['title'] = $DATA->page_metadata($parent_page, 'title');
         }
-        if ( $parent_page ) {
+        if ($parent_page) {
             $data['parent_title'] = $DATA->page_metadata($parent_page, 'title');
         }
 
@@ -96,7 +96,7 @@ 
 
         $urls = array_merge($urls, $this->getViewUrls());
 
-        if ( isset($data['info']['page']) ) {
+        if (isset($data['info']['page'])) {
             $day = new \MySociety\TheyWorkForYou\Url($data['info']['page']);
             $urls['day'] = $day;
         }
@@ -140,7 +140,7 @@ 
             $DATA->set_page_metadata($this_page, 'title', $year);
         }
 
-        $args = array ( 'year' => $year );
+        $args = array('year' => $year);
         $data = $this->list->display('calendar', $args, 'none');
         return $data;
     }
@@ -148,7 +148,7 @@ 
     protected function display_column($date, $column) {
         global $this_page;
         $this_page = $this->page_base;
-        $args = array( 'date' => $date, 'column' => $column );
+        $args = array('date' => $date, 'column' => $column);
         $content = $this->list->display('column', $args, 'none');
 
         $data = array();
@@ -168,12 +168,12 @@ 
     protected function display_day($date) {
         global $this_page;
         $this_page = $this->page_base . 'day';
-        $args = array ( 'date' => get_http_var('d') );
+        $args = array('date' => get_http_var('d'));
         $data = $this->list->display('date', $args, 'none');
         list($year, $month, $day) = explode('-', $date);
-        $args = array( 'year' => $year, 'month' => $month, 'day' => $day);
+        $args = array('year' => $year, 'month' => $month, 'day' => $day);
         $calendar = $this->list->display('calendar', $args, 'none');
-        if ( isset($calendar['years']) ) {
+        if (isset($calendar['years'])) {
             $data['calendar'] = $calendar['years'];
         }
         return $data;
@@ -183,7 +183,7 @@ 
         global $DATA, $this_page, $THEUSER;
 
         # += as we *don't* want to override any already supplied argument
-        $args += array (
+        $args += array(
             'gid' => get_http_var('id'),
             's' => get_http_var('s'), // Search terms to be highlighted.
             'member_id' => get_http_var('m'), // Member's speeches to be highlighted.
@@ -200,14 +200,14 @@ 
             if ($this->major == 6) {
                 # Magically (as in I can't remember quite why), pbc_clause will
                 # contain the new URL without any change...
-                $URL->remove( array('id') );
+                $URL->remove(array('id'));
             } else {
-                $URL->insert( array('id'=>$e->getMessage()) );
+                $URL->insert(array('id'=>$e->getMessage()));
             }
             # put the search term back in so highlighting works.
             # NB: as we don't see the # part of the URL we lose this :(
-            if ( $args['s'] !== '' ) {
-                $URL->insert( array('s'=>$args['s']) );
+            if ($args['s'] !== '') {
+                $URL->insert(array('s'=>$args['s']));
             }
             redirect($URL->generate('none'), 301);
         }
@@ -284,7 +284,7 @@ 
         if (array_key_exists('text_heading', $data['info'])) {
             // avoid having Clause 1 etc as the alert text search string on PBC pages as it's
             // almost certainly not what the person wants
-            if ( $this->major == 6 ) {
+            if ($this->major == 6) {
                 $data['email_alert_text'] = $data['section_title'];
             } else {
                 $data['email_alert_text'] = $data['info']['text_heading'];
@@ -331,7 +331,7 @@ 
             $body = preg_replace('#<phrase class="honfriend" id="uk.org.publicwhip/member/(\d+)" name="([^"]*?)">(.*?\s*\((.*?)\))</phrase>#', '<a href="/mp/?m=$1" title="Our page on $2 - \'$3\'">$4</a>', $body);
             $body = preg_replace('#<phrase class="honfriend" name="([^"]*?)" person_id="uk.org.publicwhip/person/(\d+)">(.*?\s*\((.*?)\))</phrase>#', '<a href="/mp/?p=$2" title="Our page on $1 - \'$3\'">$4</a>', $body);
             $body = preg_replace_callback('#<phrase class="offrep" id="(.*?)/(\d+)-(\d+)-(\d+)\.(.*?)">(.*?)</phrase>#', function($matches) {
-                return '<a href="/search/?pop=1&s=date:' . $matches[2] . $matches[3] . $matches[4] . '+column:' . $matches[5] . '+section:' . $matches[1] .'">' . str_replace("Official Report", "Hansard", $matches[6]) . '</a>';
+                return '<a href="/search/?pop=1&s=date:' . $matches[2] . $matches[3] . $matches[4] . '+column:' . $matches[5] . '+section:' . $matches[1] . '">' . str_replace("Official Report", "Hansard", $matches[6]) . '</a>';
             }, $body);
             #$body = preg_replace('#<phrase class="offrep" id="((.*?)/(\d+)-(\d+)-(\d+)\.(.*?))">(.*?)</phrase>#e', "\"<a href='/search/?pop=1&amp;s=date:$3$4$5+column:$6+section:$2&amp;match=$1'>\" . str_replace('Official Report', 'Hansard', '$7') . '</a>'", $body);
             $bodies[] = $body;
@@ -364,7 +364,7 @@ 
         $data['section_title'] = '';
         $subsection_title = '';
         $rows = count($data['rows']);
-        for ($i=0; $i<$rows; $i++) {
+        for ($i = 0; $i < $rows; $i++) {
             $row = $data['rows'][$i];
             $htype = $row['htype'];
             // HPOS should be defined below if it's needed; otherwise default to 0
@@ -387,7 +387,7 @@ 
                 # Voting links
                 $data['rows'][$i]['voting_data'] = '';
                 if (isset($row['votes'])) {
-                    $data['rows'][$i]['voting_data'] = $this->generate_votes( $row['votes'], $row['epobject_id'], $row['gid'] );
+                    $data['rows'][$i]['voting_data'] = $this->generate_votes($row['votes'], $row['epobject_id'], $row['gid']);
                 }
 
                 # Annotation link
@@ -424,62 +424,62 @@ 
 
     private function getCountryDetails() {
         $details = array(
-            1 => array (
+            1 => array(
                 'country' => 'UK',
                 'assembly' => 'uk-commons',
                 'location' => '&ndash; in the House of Commons'
             ),
-            2 => array (
+            2 => array(
                 'country' => 'UK',
                 'assembly' => 'uk-commons',
                 'location' => '&ndash; in Westminster Hall'
             ),
-            3 => array (
+            3 => array(
                 'country' => 'UK',
                 'assembly' => 'uk-commons',
                 'location' => 'written question &ndash; answered'
             ),
-            4 => array (
+            4 => array(
                 'country' => 'UK',
                 'assembly' => 'uk-commons',
                 'location' => 'written statement &ndash; made'
             ),
-            5 => array (
+            5 => array(
                 'country' => 'NORTHERN IRELAND',
                 'assembly' => 'ni',
                 'location' => '&ndash; in the Northern Ireland Assembly'
             ),
-            6 => array (
+            6 => array(
                 'country' => 'UK',
                 'assembly' => 'uk-commons',
                 'location' => '&ndash; in a Public Bill Committee'
             ),
-            7 => array (
+            7 => array(
                 'country' => 'SCOTLAND',
                 'assembly' => 'scotland',
                 'location' => '&ndash; in the Scottish Parliament'
             ),
-            8 => array (
+            8 => array(
                 'country' => 'SCOTLAND',
                 'assembly' => 'scotland',
                 'location' => '&ndash; Scottish Parliament written question &ndash; answered'
             ),
-            9 => array (
+            9 => array(
                 'country' => 'LONDON',
                 'assembly' => 'london-assembly',
                 'location' => 'Questions to the Mayor of London &ndash; answered'
             ),
-            10 => array (
+            10 => array(
                 'country' => 'WALES',
                 'assembly' => 'senedd',
                 'location' => '&ndash; in the Welsh Parliament'
             ),
-            11 => array (
+            11 => array(
                 'country' => 'WALES',
                 'assembly' => 'senedd',
                 'location' => '&ndash; Senedd Cymru'
             ),
-            101 => array (
+            101 => array(
                 'country' => 'UK',
                 'assembly' => 'uk-lords',
                 'location' => '&ndash; in the House of Lords'
@@ -512,7 +512,7 @@ 
         global $DATA, $this_page;
         $this_page = $this->page_base . 'front';
         $data = array();
-        if ( $this->index_template ) {
+        if ($this->index_template) {
             $data['template'] = $this->index_template;
         }
 
@@ -522,7 +522,7 @@ 
 
         $content['calendar'] = $class->display('calendar', array('months' => 1), 'none');
 
-        if ( $rssurl = $DATA->page_metadata($this_page, 'rss') ) {
+        if ($rssurl = $DATA->page_metadata($this_page, 'rss')) {
             $content['rssurl'] = $rssurl;
         }
 
@@ -537,7 +537,7 @@ 
     }
 
     //$totalcomments, $comment, $commenturl
-    function generate_commentteaser ($row) {
+    function generate_commentteaser($row) {
         // Returns HTML for the one fragment of comment and link for the sidebar.
         // $totalcomments is the number of comments this item has on it.
         // $comment is an array like:

www/includes/easyparliament/templates/html/static/linktous.php

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

@@ -24,7 +24,7 @@
     </form>
 </div>
 <!-- TheyWorkForYou box, end -->
-END;
+end;
 print $link_to_us_form;
 ?>
 

www/includes/easyparliament/templates/html/scotland/index.php

Indentation +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
                 <div class="row nested-row">
                     <div class="homepage-in-the-news homepage-content-section">
                         <?php if ( $featured ) {
-                             include dirname(__FILE__) . "/../homepage/featured.php";
+                                include dirname(__FILE__) . "/../homepage/featured.php";
                         } ?>
                     </div>
                     <div class="homepage-create-alert homepage-content-section">

Spacing +4 added lines, -4 removed lines

@@ -11,10 +11,10 @@ 
                 </div>
                 <div class="row">
                     <div class="medium-9 columns">
-                    <?php if ( count($data['regional']) > 0 ) { ?>
+                    <?php if (count($data['regional']) > 0) { ?>
                         <ul class="homepage-rep-list">
                         <li>Your Regional MSPs:</li>
-                        <?php foreach ( $data['regional'] as $msp ) { ?>
+                        <?php foreach ($data['regional'] as $msp) { ?>
                             <li class="homepage-rep-list__rep"><a href="/msp/?p=<?= $msp['person_id'] ?>"><?= $msp['name'] ?></a></li>
                         <?php } ?>
                         </ul>
@@ -57,7 +57,7 @@ 
             <div class="panel panel--flushtop clearfix">
                 <div class="row nested-row">
                     <div class="homepage-in-the-news homepage-content-section">
-                        <?php if ( $featured ) {
+                        <?php if ($featured) {
                              include dirname(__FILE__) . "/../homepage/featured.php";
                         } ?>
                     </div>
@@ -104,7 +104,7 @@ 
 
                         <h2>Recently in Parliament</h2>
                         <ul class="recently__list"><?php
-                            foreach ( $debates['recent'] as $recent ) {
+                            foreach ($debates['recent'] as $recent) {
                                 include dirname(__FILE__) . '/../homepage/recent-debates.php';
                             }
                         ?></ul>

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

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

@@ -157,7 +157,7 @@
               <?php # XXX
                 if ($data['info']['major'] == 8 && preg_match('#\d{4}-\d\d-\d\d\.(.*?)\.q#', $speech['gid'], $m)) {
                     ?><p class="debate-speech__question_id"><small>
-                    <?= "Question $m[1]" ?>
+                    <?= "question $m[1]" ?>
                     </small></p>
               <?php } ?>
             </h2>

Indentation +4 added lines, -4 removed lines

@@ -12,9 +12,9 @@ 
         if ($hansardmajors[$data['info']['major']]['location'] == 'Scotland') {
             $body = preg_replace('# (S\d[O0WF]-\d+)[, ]#', ' <a href="/spwrans/?spid=$1">$1</a> ', $body);
             $body = preg_replace_callback('#<citation id="uk\.org\.publicwhip/(.*?)/(.*?)">\[(.*?)\]</citation>#', function($matches) {
-                   if ($matches[1] == 'spor') {
-                       $href_segment = 'sp/?g';
-                   } elseif ($matches[1] == 'spwa') {
+                    if ($matches[1] == 'spor') {
+                        $href_segment = 'sp/?g';
+                    } elseif ($matches[1] == 'spwa') {
                         $href_segment = 'spwrans/?';
                     } else {
                         $href_segment = 'debates/?';
@@ -191,7 +191,7 @@ 
                     $after_mp = $speech['after_mp'];
                 }
                 include dirname(__FILE__) . '/../divisions/_your_mp.php';
-              } ?>
+                } ?>
                 <div class="debate-speech__division__details">
                   <?php include dirname(__FILE__) . '/../divisions/_votes.php'; ?>
                 </div>

Spacing +16 added lines, -16 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-foreach($data['rows'] as $speech) { ?>
+foreach ($data['rows'] as $speech) { ?>
 
     <?php
 
@@ -63,27 +63,27 @@ 
     $source = array();
 
     $major = $data['info']['major'];
-    if ($major==1 || $major==2 || (($major==3 || $major==4) && isset($speech['speaker']['house'])) || $major==101 || $major==6) {
+    if ($major == 1 || $major == 2 || (($major == 3 || $major == 4) && isset($speech['speaker']['house'])) || $major == 101 || $major == 6) {
         $source['title'] = 'Citation: ';
-        if ($major==1 || $major==2) {
+        if ($major == 1 || $major == 2) {
             $source['title'] .= 'HC';
-        } elseif ($major==3 || $major==4) {
-            if ($speech['speaker']['house']==1) {
+        } elseif ($major == 3 || $major == 4) {
+            if ($speech['speaker']['house'] == 1) {
                 $source['title'] .= 'HC';
             } else {
                 $source['title'] .= 'HL';
             }
-        } elseif ($major==6) {
+        } elseif ($major == 6) {
             $source['title'] .= $data['section_title'];
         } else {
             $source['title'] .= 'HL';
         }
         $source['title'] .= ' Deb, ' . format_date($data['info']['date'], LONGDATEFORMAT) . ', c' . $speech['colnum'];
-        if ($major==2) {
+        if ($major == 2) {
             $source['title'] .= 'WH';
-        } elseif ($major==3) {
+        } elseif ($major == 3) {
             $source['title'] .= 'W';
-        } elseif ($major==4) {
+        } elseif ($major == 4) {
             $source['title'] .= 'WS';
         }
     }
@@ -120,7 +120,7 @@ 
             <div class="debate-speech__speaker-and-content">
             <?php } ?>
 
-          <?php if(isset($speech['speaker']) && count($speech['speaker']) > 0) { ?>
+          <?php if (isset($speech['speaker']) && count($speech['speaker']) > 0) { ?>
             <h2 class="debate-speech__speaker">
                 <?php
 
@@ -187,17 +187,17 @@ 
                 <?php if ($division['has_description']) { ?>
                 <div class="debate-speech__division__details">
                     <span class="policy-vote__text">
-                        <?php include( dirname(__FILE__) . '/../divisions/_vote_description.php'); ?>
+                        <?php include(dirname(__FILE__) . '/../divisions/_vote_description.php'); ?>
                     </span><br>
                 </div>
                 <?php } ?>
 
               <?php if (isset($speech['mp_vote'])) {
-                $mp_vote = array( 'vote' => $speech['mp_vote']['vote'] );
-                if ( isset($speech['before_mp']) ) {
+                $mp_vote = array('vote' => $speech['mp_vote']['vote']);
+                if (isset($speech['before_mp'])) {
                     $before_mp = $speech['before_mp'];
                 }
-                if ( isset($speech['after_mp']) ) {
+                if (isset($speech['after_mp'])) {
                     $after_mp = $speech['after_mp'];
                 }
                 include dirname(__FILE__) . '/../divisions/_your_mp.php';
@@ -209,7 +209,7 @@ 
             <div class="debate-speech__content"><?=$body ?></div>
             <?php } ?>
 
-            <?php if ( $section ) {
+            <?php if ($section) {
                 if ($speech['voting_data']) { ?>
 
                 <div class="debate-speech__question-answered">
@@ -347,7 +347,7 @@ 
                     $moreinfo[] = sprintf(ngettext('%s annotation', '%s annotations', $row['totalcomments']), $row['totalcomments']);
                 }
                 if (count($moreinfo) > 0) {
-                    print "<small>(" . implode (', ', $moreinfo) . ") </small>";
+                    print "<small>(" . implode(', ', $moreinfo) . ") </small>";
                 }
             } else {
                 // Nothing in this item, so no link.

www/includes/easyparliament/comment.php

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

@@ -31,7 +31,7 @@ 
     public $body = '';
     public $posted = '';
     public $visible = false;
-    public $modflagged = NULL;	// Is a datetime when set.
+    public $modflagged = null;	// Is a datetime when set.
     public $firstname = '';	// Of the person who posted it.
     public $lastname = '';
     public $url = '';
@@ -138,7 +138,7 @@ 
             $flag = "'$date'";
 
         } elseif ($switch == 'off') {
-            $date = NULL;
+            $date = null;
             $flag = 'NULL';
 
         } else {

Indentation +2 added lines, -2 removed lines

@@ -210,8 +210,8 @@
                             array(':epobject_id' => $this->epobject_id))->first();
 
             if ($q) {
-                 // If you change stuff here, you might have to change it in
-                 // $COMMENTLIST->_get_comment_data() too...
+                    // If you change stuff here, you might have to change it in
+                    // $COMMENTLIST->_get_comment_data() too...
 
                 $gid = fix_gid_from_db($q['gid']); // In includes/utility.php
 

Spacing +14 added lines, -14 removed lines

@@ -31,8 +31,8 @@ 
     public $body = '';
     public $posted = '';
     public $visible = false;
-    public $modflagged = NULL;	// Is a datetime when set.
-    public $firstname = '';	// Of the person who posted it.
+    public $modflagged = NULL; // Is a datetime when set.
+    public $firstname = ''; // Of the person who posted it.
     public $lastname = '';
     public $url = '';
 
@@ -41,7 +41,7 @@ 
     public $exists = false;
 
 
-    public function __construct($comment_id='') {
+    public function __construct($comment_id = '') {
 
         $this->db = new ParlDB;
 
@@ -69,12 +69,12 @@ 
             if ($q) {
 
                 $this->comment_id 	= $comment_id;
-                $this->user_id		= $q['user_id'];
+                $this->user_id = $q['user_id'];
                 $this->epobject_id	= $q['epobject_id'];
-                $this->body			= $q['body'];
-                $this->posted		= $q['posted'];
-                $this->visible		= $q['visible'];
-                $this->modflagged	= $q['modflagged'];
+                $this->body = $q['body'];
+                $this->posted = $q['posted'];
+                $this->visible = $q['visible'];
+                $this->modflagged = $q['modflagged'];
 
                 // Sets the URL and username for this comment. Duh.
                 $this->_set_url();
@@ -104,9 +104,9 @@ 
     public function comments_enabled() { return $this->comments_enabled; }
 
 
-    public function display($format='html', $template='comments') {
+    public function display($format = 'html', $template = 'comments') {
 
-        $data['comments'][0] = array (
+        $data['comments'][0] = array(
             'comment_id'	=> $this->comment_id,
             'user_id'		=> $this->user_id,
             'epobject_id'	=> $this->epobject_id,
@@ -142,7 +142,7 @@ 
             $flag = 'NULL';
 
         } else {
-            $PAGE->error_message ("Why are you trying to switch this comment's modflag to '" . _htmlentities($switch) . "'!");
+            $PAGE->error_message("Why are you trying to switch this comment's modflag to '" . _htmlentities($switch) . "'!");
         }
 
         $q = $this->db->query("UPDATE comments
@@ -154,7 +154,7 @@ 
             $this->modflagged = $date;
             return true;
         } else {
-            $message = array (
+            $message = array(
                 'title' => 'Sorry',
                 'text' => "We couldn't update the annotation's modflag."
             );
@@ -176,7 +176,7 @@ 
             if ($q->success()) {
                 return true;
             } else {
-                $message = array (
+                $message = array(
                     'title' => 'Sorry',
                     'text' => "We were unable to delete the annotation."
                 );
@@ -185,7 +185,7 @@ 
             }
 
         } else {
-            $message = array (
+            $message = array(
                 'title' => 'Sorry',
                 'text' => "You are not authorised to delete annotations."
             );

www/includes/easyparliament/staticpages/search_help.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 </li>
 
 <?php
-$user_agent = ( isset( $_SERVER['HTTP_USER_AGENT'] ) ) ? strtolower( $_SERVER['HTTP_USER_AGENT'] ) : '';
+$user_agent = (isset($_SERVER['HTTP_USER_AGENT'])) ? strtolower($_SERVER['HTTP_USER_AGENT']) : '';
 if (stristr($user_agent, 'Firefox/')) {
 ?>
      <li>You can also add TheyWorkForYou to <a href="http://mycroft.mozdev.org/download.html?name=theyworkforyou">Firefox's search box</a>.</li>

www/includes/easyparliament/commentlist.php

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

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

Spacing +39 added lines, -39 removed lines

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

www/docs/news/editme.php

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

@@ -20,7 +20,7 @@ 
 
 Read <a href="http://www.mysociety.org/2009/01/21/blimey-it-looks-like-the-internets-won/">our victory mySociety blog post</a>,
 and do join our mailing list. :-)
-EOT
+eot
 , '2009-01-21 15:30:00', 'Matthew'),
 
 48 => array('API keys, and improved internal links', <<<EOT
@@ -45,7 +45,7 @@ 
 crowd-sourcing game to match the reference to the exact speech, much like our
 <a href="https://www.theyworkforyou.com/video/">video matching</a> (nearly 80%
 of our archive done!). :)
-EOT
+eot
 , '2008-07-18 14:01:00', 'Matthew'),
 
 47 => array('Video on TheyWorkForYou', <<<EOT
@@ -57,7 +57,7 @@ 
 
 <a href="http://www.mysociety.org/2008/06/01/video-recordings-of-the-house-of-commons-on-theyworkforyoucom/">Etienne's post on the mySociety blog</a>
 has some background information on the project.
-EOT
+eot
 , '2008-06-02 18:56:00', 'Matthew'),
 
 46 => array('The Scottish Parliament', <<<EOT
@@ -89,7 +89,7 @@ 
 launching this now to mark the success in getting endorsements for our <a
 href="/freeourbills/">Free Our Bills campaign</a>, and we'll be rolling out
 more goodies as the campaign goes along.
-EOT
+eot
 , '2008-05-06 13:35:28', 'Matthew'),
 
 45 => array('Shadow ministers and spokespersons', <<<EOT
@@ -98,7 +98,7 @@ 
 This information is given both on a person's page and within any debates they
 speak in, which could help explain why your local MP is speaking on transport
 or foreign affairs a lot. :)
-EOT
+eot
 , '2008-04-30 08:25:00', 'Matthew'),
 
 44 => array('Please donate to help us expand TheyWorkForYou', <<<EOT
@@ -107,7 +107,7 @@ 
 Unfortunately, the server that TheyWorkForYou sits on is almost full, so we can&#8217;t launch their hard work. Boo!
 
 TheyWorkForYou isn&#8217;t an externally funded project, and we need funding from other sources to keep it growing and improving. So if the season has filled you with generosity of spirit, why not <a href="https://secure.mysociety.org/donate/">drop us a few pennies</a> to pay for some upgrades? Any extra beyond what we need will go into the general pot to keep <a href="http://www.mysociety.org/">mySociety</a> running and the developers from starving.
-EOT
+eot
 , '2007-12-21 10:07:35', 'Tom'),
 
 43 => array('The Queen in Parliament', <<<EOT
@@ -121,7 +121,7 @@ 
 or just look at past
 <a href="https://www.theyworkforyou.com/search/?pid=13935&pop=1">prorogation and Queen's speeches</a>
 more easily than anywhere else I've found.
-EOT
+eot
 , '2007-09-11 15:34:47', 'Matthew'),
 
 42 => array('Missing confirmation emails', <<<EOT
@@ -132,7 +132,7 @@ 
 few days have now been sent out, and I've got in touch
 with anyone who signed up in the days prior to
 that to let them know what happened.
-EOT
+eot
 , "2007-09-03 17:12:47", 'Matthew'),
 
 41 => array('The Northern Ireland Assembly', <<<EOT
@@ -172,7 +172,7 @@ 
 
 ATB,<br>
 <a href="http://www.dracos.co.uk/">Matthew Somerville</a>
-EOT
+eot
 , "2006-12-11 00:00:00", 'Matthew'),
 
 40 => array('TheyWorkForYou API', <<<EOT
@@ -191,7 +191,7 @@ 
 Here's my <a href="http://www.mysociety.org/2006/barcamp-london/">BarCamp
 Presentation</a> launching the API, and a <a href="http://www.dracos.co.uk/work/theyworkforyou/api/fabfarts/">couple</a>
 of <a href="http://www.mysociety.org/2006/09/02/battle-your-way-to-sedgefield/">applications</a> using it.
-EOT
+eot
 , "2006-09-02 17:10:00"),
 
 39 => array('New features over the last couple of months', <<<EOT
@@ -219,7 +219,7 @@ 
 and when searching a particular person's speeches, we no longer group the results by debate, which
 was confusing, as you obviously expected to see all the speeches for that person that matched your
 search terms.
-EOT
+eot
 , "2006-08-18 09:46:36"),
 
 38 => array("Got an idea for a useful website?", <<<EOT
@@ -227,7 +227,7 @@ 
 come up with an idea for a useful site like this one, and it beats all
 the other ideas, we'll build it for free. <a href="http://www.mysociety.org/proposals2006/submit">Submit an idea</a>
 or <a href="http://www.mysociety.org/proposals2006/view">read and comment on what other people have submitted</a>.
-EOT
+eot
 , "2006-06-06 06:06:06"),
 
 37 => array("We've added the Lords, and more", <<<EOT
@@ -237,14 +237,14 @@ 
 also added a feature to the search to help you identify which MPs or
 Lords are interested in a certain word or phrases. Just search as
 usual and then click 'Show use by person'.
-EOT
+eot
 , "2006-06-01 12:34:56"),
 
 36 => array("Changes to the Register of Members' Interests", <<<EOT
 One of the many things our site does, probably without you realising, is to track the Register of Members' Interests, in which MPs are "to provide information of any pecuniary interest or other material benefit which a Member receives which might reasonably be thought by others to influence his or her actions, speeches or votes in Parliament, or actions taken in the capacity of a Member of Parliament". The latest entry published on the official site has always been shown on MP pages (<a href="https://www.theyworkforyou.com/mp/tony_blair/sedgefield#register">here's Tony Blair's</a>), however we kept all previous editions of the Register safe and sound. And now, after a bit of coding, you can view a history of the Register, either <a href="https://www.theyworkforyou.com/regmem/?f=2005-12-14">comparing particular editions</a>, or for particular MPs (<a href="https://www.theyworkforyou.com/regmem/?p=10001">Diane Abbott</a>, for example). Entries only have to stay on the Register for a year, so this can make for some interesting reading.
 
 Happy New Year! :) <a href="https://www.theyworkforyou.com/regmem/">Changes to the Register of Members' Interests</a>
-EOT
+eot
 , "2006-01-01 12:36:00"),
 
 35 => array("TheyWorkForYou.com Wins Award", <<<EOT
@@ -253,14 +253,14 @@ 
 Thanks to the kind souls who nominated us. We enjoyed ourselves.
 
 
-EOT
+eot
 , "2005-07-05 23:54:13"),
 
 34 => array("NEW! Email this page to a friend", <<<EOT
 At the top right hand side of every (ex)MP's page, we've added a simple new feature: email the page to a friend.
 
 <a href="/mp/">Have a go</a>, and let all your friends know how easy it is to keep tabs on what your former MP did and said in your name during the last Parliament.
-EOT
+eot
 , "2005-04-14 23:43:50"),
 
 33 => array("Play with Pledgebank, Pound the Streets", <<<EOT
@@ -273,7 +273,7 @@ 
 </blockquote>
 
 If you're up for it, why not <a href="http://www.pledgebank.com/theywork">sign up now?</a>
-EOT
+eot
 , "2005-04-13 22:41:23"),
 
 32 => array("NEW! How MPs voted on Key Issues", <<<EOT
@@ -286,7 +286,7 @@ 
 This information is the result sophisticated mining of PublicWhip's detailed vote data covering hundreds of Parliamentary divisions.
 
 We hope it'll make it easier for you to keep track of where your MP really stands on key issues - after all, They Work For You.
-EOT
+eot
 , "2005-04-05 22:59:57"),
 
 31 => array("Channel 4 linking to TheyWorkForYou.com", <<<EOT
@@ -295,7 +295,7 @@ 
 We've done a special paint job for users coming from the Channel 4 site, just to make them feel welcome. You can see an example <a href="https://www.theyworkforyou.com/mp/c4/paul_keetch/hereford">here</a>.
 
 We'd love to know what you think of this paint job, as we're planning a redesign. As ever, <a href="/contact/">get in touch</a>.
-EOT
+eot
 , "2005-04-05 22:53:32"),
 
 30 => array("NEW! Email Alerts & Other Features", <<<EOT
@@ -357,7 +357,7 @@ 
     - Tom, on behalf of the TheyWorkForYou.com volunteers
 
      <a href="https://www.theyworkforyou.com/about/">https://www.theyworkforyou.com/about/</a>  - New volunteers welcome!
-EOT
+eot
 , "2005-02-24 22:02:44"),
 
 26 => array("New Release of TheyWorkForYou.com Source Code", <<<EOT
@@ -374,7 +374,7 @@ 
 Feel free to download it and have a play.
 
 Whilst you're at it, don't forget we also publish a full <a href="https://www.theyworkforyou.com/raw/">XML version of the Hansard data</a>.
-EOT
+eot
 , "2005-01-25 00:15:19"),
 
 25 => array("Search by Date", <<<EOT
@@ -386,7 +386,7 @@ 
 Next step on search is probably an RSS version of keyword searches. We're still very keen to improve overall relevancy of results - anyone out there fancy lending us a Google Appliance to play with?
 
 As ever, <a href="/contact/">contact us</a> if you've got any suggestions how we might improve the site, or if you fancy volunteering.
-EOT
+eot
 , "2005-01-25 00:16:09"),
 
 20 => array("New! Ministerial Statements now included", <<<EOT
@@ -404,7 +404,7 @@ 
 Next up: Select Committees, which promise to be an order of magnitude more challenging. We'll keep you posted.
 
 PS We're always on the lookout for new volunteers - <a href="/contact/">contact us</a> if you are keen to help in almost any capacity.
-EOT
+eot
 , "2005-01-17 17:44:47"),
 
 19 => array("NEW! Westminster Hall debates now available.", <<<EOT
@@ -422,7 +422,7 @@ 
 
 
 
-EOT
+eot
 , "2004-12-22 23:47:19"),
 
 18 => array("RSS feed of your MP's recent appearances", <<<EOT
@@ -436,7 +436,7 @@ 
 RSS is a simple way to publish & distribute content which is frequently updated  (<a href="http://news.bbc.co.uk/1/hi/help/3223484.stm">learn more here</a>.)
 
 Some enlightened MPs are now incorporating this useful feed of their Parliamentary activity into their websites. See <a href="http://www.richardallan.org.uk/">Richard Allen's</a> website for a good example.
-EOT
+eot
 , "2004-11-27 16:38:41"),
 
 16 => array("NEW! MPs' Expenses", <<<EOT
@@ -445,7 +445,7 @@ 
 For example, it is good to note that <a href="https://www.theyworkforyou.com/mp/?pid=10508#expenses">Barbara Roche</a>, a North London MP, does not claim excessive travel expenses.
 
 Bear in mind that proper democracy does cost money, so please think twice before using these data as a stick with which to beat your MP. An "expensive" MP might be providing excellent value for money. And vice versa.
-EOT
+eot
 , "2004-11-08 10:11:14"),
 
 11 => array("TheyWorkForYou.com Development Wiki now public", <<<EOT
@@ -461,7 +461,7 @@ 
 (dissemination is fine, but please don't post the link with the login details embedded in the url)
 
 In case you're wondering what we're up to, well, we're just rousing ourselves for another tilt at completing our vision before the next election is called, so if anyone python or php skills and fancies lending a hand, do <a href="/contact/">contact us</a>.
-EOT
+eot
 , "2004-10-01 23:14:13"),
 
 8 => array("New! Full Source Code Published", <<<EOT
@@ -481,7 +481,7 @@ 
 
 <a href="https://www.theyworkforyou.com/rss/mp/10508.rdf">https://www.theyworkforyou.com/rss/mp/10508.rdf</a>
     - Typical MP 'recent appearances' RSS feed, uses person id.
-EOT
+eot
 , "2004-07-18 22:58:23"),
 
 7 => array("Public Beta Now Live", <<<EOT
@@ -502,7 +502,7 @@ 
 More than the usuals,
 
 - <i><a href="https://www.theyworkforyou.com/about/" title="link to About Us page">The TheyWorkForYou.com Volunteers</a></i>
-EOT
+eot
 , "2004-06-06 03:02:53"),
 
 6 => array("Want to help make us complete?", <<<EOT
@@ -514,14 +514,14 @@ 
 
 Just <a href="/contact/">contact us</a>.
 
-EOT
+eot
 , "2004-05-21 22:15:22"),
 
 5 => array("Know someone who'd like this website?", <<<EOT
 If you know someone who would appreciate being a beta tester, please <a href="/contact/">contact us</a> with their details.
 
 Many thanks.
-EOT
+eot
 , "2004-05-21 22:55:24"),
 
 4 => array("Welcome to our private beta test", <<<EOT
@@ -538,7 +538,7 @@ 
 In the meantime, please enjoy being the first people to scribble in the margins of Hansard. May you be first of many.
 
 - <em>The TheyWorkForYou.com volunteers</em>
-EOT
+eot
 , "2004-05-21 22:55:24")
 );
 

www/docs/topic/image.php

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

@@ -8,7 +8,7 @@
     $topic = $topics->getTopic($slug);
 }
 
-if (!$slug || !isset($topic) || $topic === NULL) {
+if (!$slug || !isset($topic) || $topic === null) {
     header('HTTP/1.0 404 Not Found');
     exit();
 }