mysociety / theyworkforyou

tests/SearchTest.php

Indentation +4 added lines, -4 removed lines

@@ -7,8 +7,8 @@ 
 
 class SearchTest extends FetchPageTestCase
 {
-	public function setUp()
-	{
+    public function setUp()
+    {
         parent::setUp();
         include_once('www/includes/easyparliament/searchengine.php');
     }
@@ -87,7 +87,7 @@ 
      *
      * @group xapian
      */
-	public function testSearchNormal()
+    public function testSearchNormal()
     {
         $SEARCHENGINE = new SEARCHENGINE('test');
 
@@ -102,7 +102,7 @@ 
      *
      * @group xapian
      */
-	public function testSearchLink()
+    public function testSearchLink()
     {
         $SEARCHENGINE = new SEARCHENGINE('test');
 

Spacing +12 added lines, -12 removed lines

@@ -26,11 +26,11 @@ 
     public function testConstituencySearch()
     {
         $this->assertEquals(
-            array( array( 'Alyn and Deeside' ), false ),
+            array(array('Alyn and Deeside'), false),
             \MySociety\TheyWorkForYou\Utility\Search::searchConstituenciesByQuery('Alyn')
         );
         $this->assertEquals(
-            array( array( 'Alyn and Deeside' ), false ),
+            array(array('Alyn and Deeside'), false),
             \MySociety\TheyWorkForYou\Utility\Search::searchConstituenciesByQuery('Alyn and Deeside')
         );
     }
@@ -119,7 +119,7 @@ 
      */
     public function testSearchPage()
     {
-        $page = $this->fetch_page( array( ) );
+        $page = $this->fetch_page(array( ));
         $this->assertContains('Search', $page);
     }
 
@@ -130,7 +130,7 @@ 
      */
     public function testSearchPageMP()
     {
-        $page = $this->fetch_page( array( 'q' => 'Mary Smith' ) );
+        $page = $this->fetch_page(array('q' => 'Mary Smith'));
         $this->assertContains('Mary Smith', $page);
         $this->assertContains('MP, Amber Valley', $page);
     }
@@ -142,7 +142,7 @@ 
      */
     public function testSearchPageMultipleMP()
     {
-        $page = $this->fetch_page( array( 'q' => 'Jones' ) );
+        $page = $this->fetch_page(array('q' => 'Jones'));
         $this->assertContains('People matching <em class="current-search-term">Jones</em>', $page);
         $this->assertContains('Andrew Jones', $page);
         $this->assertContains('Simon Jones', $page);
@@ -154,7 +154,7 @@ 
      * @group xapian
      */
     public function testSearchPageCons() {
-        $page = $this->fetch_page( array( 'q' => 'Amber' ) );
+        $page = $this->fetch_page(array('q' => 'Amber'));
         $this->assertContains('MP for <em class="current-search-term">Amber</em>', $page);
         $this->assertContains('Mary Smith', $page);
     }
@@ -166,7 +166,7 @@ 
      * @group xapian
      */
     public function testSearchPageConsWithNoMp() {
-        $page = $this->fetch_page( array( 'q' => 'Alyn' ) );
+        $page = $this->fetch_page(array('q' => 'Alyn'));
         $this->assertNotContains('MP for <em class="current-search-term">Alyn</em>', $page);
         $this->assertNotContains('MPs in constituencies matching', $page);
     }
@@ -178,7 +178,7 @@ 
      * @group xapian
      */
     public function testSearchPageMultipleCons() {
-        $page = $this->fetch_page( array( 'q' => 'Liverpool' ) );
+        $page = $this->fetch_page(array('q' => 'Liverpool'));
         $this->assertContains('MPs in constituencies matching <em class="current-search-term">Liverpool</em>', $page);
         $this->assertContains('Susan Brown', $page);
         $this->assertContains('MP, Liverpool, Riverside', $page);
@@ -192,7 +192,7 @@ 
      * @group xapian
      */
     public function testSearchPageGlossary() {
-        $page = $this->fetch_page( array( 'q' => 'other place' ) );
+        $page = $this->fetch_page(array('q' => 'other place'));
         $this->assertContains('Glossary items matching', $page);
         $this->assertContains('<a href="/glossary/?gl=1">&ldquo;other place', $page);
     }
@@ -203,7 +203,7 @@ 
      * @group xapian
      */
     public function testSearchPageSpellCorrect() {
-        $page = $this->fetch_page( array( 'q' => 'plice' ) );
+        $page = $this->fetch_page(array('q' => 'plice'));
         $this->assertContains('Did you mean <a href="/search/?q=place">place', $page);
     }
 
@@ -213,7 +213,7 @@ 
      * @group xapian
      */
     public function testSearchBySpeakerNoResults() {
-        $page = $this->fetch_page( array( 'q' => 'splice', 'o' => 'p' ) );
+        $page = $this->fetch_page(array('q' => 'splice', 'o' => 'p'));
         $this->assertContains('Who says splice the most', $page);
         $this->assertContains('No results', $page);
     }
@@ -240,7 +240,7 @@ 
      * @group xapian
      */
     public function testSearchPageRSS() {
-        $page = $this->fetch_page( array( 'q' => 'test' ) );
+        $page = $this->fetch_page(array('q' => 'test'));
         $this->assertContains('<a href="/search/rss/?s=test">get an RSS feed', $page);
     }
 

classes/Renderer.php

Indentation +5 added lines, -5 removed lines

@@ -84,12 +84,12 @@
         // Require the templates and output
 
         if ($template_only) {
-          require_once INCLUDESPATH . 'easyparliament/templates/html/' . $template . '.php';
+            require_once INCLUDESPATH . 'easyparliament/templates/html/' . $template . '.php';
         } else {
-          header('Content-Type: text/html; charset=utf-8');
-          require_once INCLUDESPATH . 'easyparliament/templates/html/header.php';
-          require_once INCLUDESPATH . 'easyparliament/templates/html/' . $template . '.php';
-          require_once INCLUDESPATH . 'easyparliament/templates/html/footer.php';
+            header('Content-Type: text/html; charset=utf-8');
+            require_once INCLUDESPATH . 'easyparliament/templates/html/header.php';
+            require_once INCLUDESPATH . 'easyparliament/templates/html/' . $template . '.php';
+            require_once INCLUDESPATH . 'easyparliament/templates/html/footer.php';
         }
     }
 

Spacing +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
         $user = new Renderer\User();
         $data = array_merge($user->data, $data);
 
-        if ( isset($page_errors) ) {
+        if (isset($page_errors)) {
             $data['page_errors'] = $page_errors;
         }
 
@@ -95,14 +95,14 @@ 
 
     private static function addCommonURLs($data) {
         $urls = array();
-        if ( isset($data['urls']) ) {
+        if (isset($data['urls'])) {
             $urls = $data['urls'];
         }
 
         $common_urls = array('search', 'alert');
 
-        foreach ( $common_urls as $path ) {
-            if (!isset($urls[$path]) ) {
+        foreach ($common_urls as $path) {
+            if (!isset($urls[$path])) {
                 $url = new Url($path);
                 $urls[$path] = $url->generate();
             }

classes/AlertView/Standard.php

Braces +3 added lines, -1 removed lines

@@ -127,7 +127,9 @@
         }
 
         $text = $this->data['alertsearch'];
-        if (!$text) $text = $this->data['keyword'];
+        if (!$text) {
+            $text = $this->data['keyword'];
+        }
 
         if ($this->data['submitted'] && !$this->data['pid'] && !$text) {
             $errors['alertsearch'] = 'Please enter what you want to be alerted about';

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

@@ -12,7 +12,7 @@
 class Standard extends \MySociety\TheyWorkForYou\AlertView {
     public $data;
 
-    public function __construct($THEUSER = NULL) {
+    public function __construct($THEUSER = null) {
         parent::__construct($THEUSER);
         $this->data = array();
     }

Spacing +14 added lines, -14 removed lines

@@ -177,7 +177,7 @@ 
                 try {
                     $MEMBER = new \MEMBER(array('constituency'=>$constituency, 'house' => 1));
                     $cons[$constituency] = $MEMBER;
-                } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
+                } catch (\MySociety\TheyWorkForYou\MemberException $e) {
                     // do nothing
                 }
             }
@@ -197,17 +197,17 @@ 
 
         // If this goes well, the alert will be added to the database and a confirmation email
         // will be sent to them.
-        $success = $this->alert->add( $this->data, $confirm );
+        $success = $this->alert->add($this->data, $confirm);
 
-        if ($success>0 && !$confirm) {
+        if ($success > 0 && !$confirm) {
             $result = 'alert-added';
-        } elseif ($success>0) {
+        } elseif ($success > 0) {
             $result = 'alert-confirmation';
         } elseif ($success == -2) {
             // we need to make sure we know that the person attempting to sign up
             // for the alert has that email address to stop people trying to work
             // out what alerts they are signed up to
-            if ( $this->data['email_verified'] || ( $this->user->loggedin && $this->user->email() == $this->data['email'] ) ) {
+            if ($this->data['email_verified'] || ($this->user->loggedin && $this->user->email() == $this->data['email'])) {
                 $result = 'alert-exists';
             } else {
                 // don't throw an error message as that implies that they have already signed
@@ -232,7 +232,7 @@ 
 
 
     private function formatSearchTerms() {
-        if ( $this->data['alertsearch'] ) {
+        if ($this->data['alertsearch']) {
             $this->data['alertsearch_pretty'] = \MySociety\TheyWorkForYou\Utility\Alert::prettifyCriteria($this->data['alertsearch']);
             $this->data['search_text'] = $this->data['alertsearch'];
         } else {
@@ -265,11 +265,11 @@ 
     }
 
     private function formatSearchMemberData() {
-        if ( isset($this->data['postcode']) ) {
+        if (isset($this->data['postcode'])) {
             try {
                 $postcode = $this->data['postcode'];
 
-                $MEMBER = new \MEMBER( array('postcode' => $postcode) );
+                $MEMBER = new \MEMBER(array('postcode' => $postcode));
                 // move the postcode to the front just to be tidy
                 $tidy_alertsearch = $postcode . " " . trim(str_replace("$postcode", "", $this->data['alertsearch']));
                 $alertsearch_display = str_replace("$postcode ", "", $tidy_alertsearch);
@@ -278,25 +278,25 @@ 
                 $this->data['member_displaysearch'] = $alertsearch_display;
                 $this->data['member'] = $MEMBER;
 
-                if ( $this->data['scottish_text'] ) {
+                if ($this->data['scottish_text']) {
                     $constituencies = \MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituencies($postcode);
-                    if ( isset($constituencies['SPC']) ) {
+                    if (isset($constituencies['SPC'])) {
                         $MEMBER = new \MEMBER(array('constituency' => $constituencies['SPC'], 'house' => 4));
                         $this->data['scottish_alertsearch'] = str_replace("$postcode", "speaker:" . $MEMBER->person_id, $tidy_alertsearch);
                         $this->data['scottish_member'] = $MEMBER;
                     }
                 }
-            } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
+            } catch (\MySociety\TheyWorkForYou\MemberException $e) {
                 $this->data['member_error'] = 1;
             }
         }
 
-        if ( $this->data['pid'] ) {
-            $MEMBER = new \MEMBER( array('person_id' => $this->data['pid']) );
+        if ($this->data['pid']) {
+            $MEMBER = new \MEMBER(array('person_id' => $this->data['pid']));
             $this->data['pid_member'] = $MEMBER;
         }
 
-        if ( $this->data['keyword'] ) {
+        if ($this->data['keyword']) {
             $this->data['display_keyword'] = \MySociety\TheyWorkForYou\Utility\Alert::prettifyCriteria($this->data['keyword']);
         }
     }

classes/Renderer/Header.php

Indentation +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
     private function get_page_url() {
         $protocol = 'https://';
         if (DEVSITE) {
-          $protocol = 'http://';
+            $protocol = 'http://';
         }
         $url = $protocol . DOMAIN;
         if (array_key_exists('REQUEST_URI', $_SERVER)) {

Spacing +4 added lines, -4 removed lines

@@ -135,7 +135,7 @@ 
         if (isset($nextprev[$linktype]) && isset($nextprev[$linktype]['url'])) {
 
             if (isset($nextprev[$linktype]['body'])) {
-                $linktitle = _htmlentities( trim_characters($nextprev[$linktype]['body'], 0, 40) );
+                $linktitle = _htmlentities(trim_characters($nextprev[$linktype]['body'], 0, 40));
                 if (isset($nextprev[$linktype]['speaker']) &&
                     count($nextprev[$linktype]['speaker']) > 0) {
                     $linktitle = $nextprev[$linktype]['speaker']['name'] . ': ' . $linktitle;
@@ -162,10 +162,10 @@ 
 
         if ($nextprev) {
             // Four different kinds of back/forth links we might build.
-            $links = array ("first", "prev", "up", "next", "last");
+            $links = array("first", "prev", "up", "next", "last");
 
             foreach ($links as $type) {
-                if ( $link = $this->generate_next_prev_link( $nextprev, $type ) ) {
+                if ($link = $this->generate_next_prev_link($nextprev, $type)) {
 
                     $this->data['header_links'][] = $link;
                 }
@@ -258,7 +258,7 @@ 
         // Page names mapping to those in metadata.php.
         // Links in the top menu, and the sublinks we see if
         // we're within that section.
-        $nav_items = array (
+        $nav_items = array(
             array('home'),
             array('hansard', 'mps', 'peers', 'alldebatesfront', 'wranswmsfront', 'pbc_front', 'divisions_recent', 'calendar_summary'),
             array('sp_home', 'spoverview', 'msps', 'spdebatesfront', 'spwransfront'),

Braces +12 added lines, -4 removed lines

@@ -81,7 +81,9 @@ 
 
             $parent_page = $DATA->page_metadata($this_page, 'parent');
             if ($parent_title = $DATA->page_metadata($parent_page, 'title')) {
-                if ($this->data['page_title']) $this->data['page_title'] .= ': ';
+                if ($this->data['page_title']) {
+                    $this->data['page_title'] .= ': ';
+                }
                 $this->data['page_title'] .= $parent_title;
             }
 
@@ -103,7 +105,9 @@ 
         // Meta keywords
         if (!$this->data['meta_keywords'] = $DATA->page_metadata($this_page, "meta_keywords")) {
             $this->data['meta_keywords'] = $this->keywords_title;
-            if ($this->data['meta_keywords']) $this->data['meta_keywords'] .= ', ';
+            if ($this->data['meta_keywords']) {
+                $this->data['meta_keywords'] .= ', ';
+            }
             $this->data['meta_keywords'] .= 'Hansard, Official Report, Parliament, government, House of Commons, House of Lords, MP, Peer, Member of Parliament, MPs, Peers, Lords, Commons, Scottish Parliament, Northern Ireland Assembly, MSP, MLA, MSPs, MLAs';
         }
 
@@ -204,7 +208,9 @@ 
             $p = $parent;
             while ($p) {
                 $p = $DATA->page_metadata($p, 'parent');
-                if ($p) $parents[] = $p;
+                if ($p) {
+                    $parents[] = $p;
+                }
             }
 
             $top_highlight = array_pop($parents);
@@ -279,7 +285,9 @@ 
             $menudata = $DATA->page_metadata($toppage, 'menu');
             $text = $menudata['text'];
             $title = $menudata['title'];
-            if (!$title) continue;
+            if (!$title) {
+                continue;
+            }
 
             //get link and description for the menu ans add it to the array
             $class = $toppage == $this->nav_highlights['top'] ? 'on' : '';

classes/Renderer/Footer.php

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
 
     public $data;
 
-    private $about_links = array ('help', 'about', 'linktous', 'houserules', 'blog', 'news', 'contact', 'privacy');
+    private $about_links = array('help', 'about', 'linktous', 'houserules', 'blog', 'news', 'contact', 'privacy');
     private $assemblies_links = array('hansard', 'sp_home', 'ni_home', 'wales_home');
     private $international_links = array('newzealand', 'australia', 'ireland', 'mzalendo');
     private $tech_links = array('code', 'api', 'data', 'pombola', 'devmailinglist', 'irc');
@@ -28,10 +28,10 @@ 
     public function __construct() {
         $this->data = array();
 
-        $this->data['about'] = $this->get_menu_links( $this->about_links );
-        $this->data['assemblies'] = $this->get_menu_links( $this->assemblies_links );
-        $this->data['international'] = $this->get_menu_links( $this->international_links );
-        $this->data['tech'] = $this->get_menu_links( $this->tech_links );
+        $this->data['about'] = $this->get_menu_links($this->about_links);
+        $this->data['assemblies'] = $this->get_menu_links($this->assemblies_links);
+        $this->data['international'] = $this->get_menu_links($this->international_links);
+        $this->data['tech'] = $this->get_menu_links($this->tech_links);
     }
 
     /**

classes/Office.php

Indentation +25 added lines, -25 removed lines

@@ -19,12 +19,12 @@ 
     public $source;
 
     /**
-    * To String
-    *
-    * Return the office title as a string.
-    *
-    * @return string The title of the office, or "Unnamed Office"
-    */
+     * To String
+     *
+     * Return the office title as a string.
+     *
+     * @return string The title of the office, or "Unnamed Office"
+     */
 
     public function __toString() {
         if (isset ($this->title)){
@@ -35,25 +35,25 @@ 
     }
 
     /**
-    * Pretty Dates
-    *
-    * Return a string containing prettified dates of this office.
-    *
-    * 2004-05-28 and 2004-05-13 are the first dates for data scraped from the
-    * old selctee/privsec pages on parliament.uk (you can see this in
-    * cmpages/chgpages' privsec0001_2004-06-08.html and
-    * selctee0001_2004-06-08.html). So if the date is those dates for those two
-    * things, you don't want to display it because it's not a known start date,
-    * it could have been before that date. 2005-11-10 is because the PPS changes
-    * did not all happen on that date but the website did not update until that
-    * date so it outputs "before" in either from/to date in that case.
-    * 2009-01-16 is the last date before the page disappeared off parliament.uk
-    * entirely so that displays that fact that after then we don't know.
-    *
-    * @todo https://github.com/mysociety/theyworkforyou/issues/632
-    *
-    * @return string The dates of this office in a readable form.
-    */
+     * Pretty Dates
+     *
+     * Return a string containing prettified dates of this office.
+     *
+     * 2004-05-28 and 2004-05-13 are the first dates for data scraped from the
+     * old selctee/privsec pages on parliament.uk (you can see this in
+     * cmpages/chgpages' privsec0001_2004-06-08.html and
+     * selctee0001_2004-06-08.html). So if the date is those dates for those two
+     * things, you don't want to display it because it's not a known start date,
+     * it could have been before that date. 2005-11-10 is because the PPS changes
+     * did not all happen on that date but the website did not update until that
+     * date so it outputs "before" in either from/to date in that case.
+     * 2009-01-16 is the last date before the page disappeared off parliament.uk
+     * entirely so that displays that fact that after then we don't know.
+     *
+     * @todo https://github.com/mysociety/theyworkforyou/issues/632
+     *
+     * @return string The dates of this office in a readable form.
+     */
 
     public function pretty_dates() {
 

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

@@ -64,7 +64,7 @@
         $output = '';
 
         if (
-            !($this->source == 'chgpages/selctee' && $this->from_date == '2004-05-28') AND
+            !($this->source == 'chgpages/selctee' && $this->from_date == '2004-05-28') and
             !($this->source == 'chgpages/privsec' && $this->from_date == '2004-05-13')
         ) {
             if ($this->source == 'chgpages/privsec' && $this->from_date == '2005-11-10') {

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
     */
 
     public function __toString() {
-        if (isset ($this->title)){
+        if (isset ($this->title)) {
             return (string) $this->title;
         } else {
             return 'Unnamed Office';
@@ -70,7 +70,7 @@ 
             if ($this->source == 'chgpages/privsec' && $this->from_date == '2005-11-10') {
                 $output .= 'before ';
             }
-            $output .= format_date($this->from_date,SHORTDATEFORMAT) . ' ';
+            $output .= format_date($this->from_date, SHORTDATEFORMAT) . ' ';
         }
 
         $output .= 'to ';

Braces +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
     */
 
     public function __toString() {
-        if (isset ($this->title)){
+        if (isset ($this->title)) {
             return (string) $this->title;
         } else {
             return 'Unnamed Office';

classes/Search/Normal.php

Braces +3 added lines, -1 removed lines

@@ -141,7 +141,9 @@
 
     private function find_members() {
         $searchstring = trim(preg_replace('#-?[a-z]+:[a-z0-9]+#', '', $this->searchstring));
-        if (!$searchstring) return array();
+        if (!$searchstring) {
+            return array();
+        }
 
         $members = array();
 

Spacing +21 added lines, -21 removed lines

@@ -12,12 +12,12 @@ 
         }
 
         $o = get_http_var('o');
-        $args = array (
+        $args = array(
             's' => $this->searchstring,
             'p' => $pagenum,
             'num' => get_http_var('num'),
             'pop' => get_http_var('pop'),
-            'o' => ($o=='d' || $o=='r' || $o=='o') ? $o : 'd',
+            'o' => ($o == 'd' || $o == 'r' || $o == 'o') ? $o : 'd',
         );
 
         return $args;
@@ -55,9 +55,9 @@ 
         }
 
         $sort_order = 'newest';
-        if ( $args['o'] == 'o' ) {
+        if ($args['o'] == 'o') {
             $sort_order = 'oldest';
-        } else if ( $args['o'] == 'r' ) {
+        } else if ($args['o'] == 'r') {
             $sort_order = 'relevance';
         }
 
@@ -73,7 +73,7 @@ 
             return array('error' => $SEARCHENGINE->error);
         } else {
             $LIST = new \HANSARDLIST();
-            $data = $LIST->display('search', $args , 'none');
+            $data = $LIST->display('search', $args, 'none');
             $data['search_type'] = 'normal';
             $data['sort_order'] = $sort_order;
             $data['members'] = $members;
@@ -93,10 +93,10 @@ 
             return false;
         }
 
-        list ($constituencies, ) = \MySociety\TheyWorkForYou\Utility\Search::searchConstituenciesByQuery($searchterm);
+        list ($constituencies,) = \MySociety\TheyWorkForYou\Utility\Search::searchConstituenciesByQuery($searchterm);
 
         $constituency = "";
-        if (count($constituencies)==1) {
+        if (count($constituencies) == 1) {
             $constituency = $constituencies[0];
         }
 
@@ -112,12 +112,12 @@ 
 
                 $MEMBER = new \MySociety\TheyWorkForYou\Member(array('constituency'=>$constituency, 'house' => 1));
                 $cons[] = $MEMBER;
-                if ( $MEMBER->current_member(1) ) {
+                if ($MEMBER->current_member(1)) {
                     $mp_types['mp']++;
                 } else {
                     $mp_types['former']++;
                 }
-            } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
+            } catch (\MySociety\TheyWorkForYou\MemberException $e) {
                 $cons = array();
             }
         } elseif (count($constituencies)) {
@@ -125,12 +125,12 @@ 
                 try {
                     $MEMBER = new \MySociety\TheyWorkForYou\Member(array('constituency'=>$constituency, 'house' => 1));
                     $cons[] = $MEMBER;
-                    if ( $MEMBER->current_member(1) ) {
+                    if ($MEMBER->current_member(1)) {
                         $mp_types['mp']++;
                     } else {
                         $mp_types['former']++;
                     }
-                } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
+                } catch (\MySociety\TheyWorkForYou\MemberException $e) {
                     continue;
                 }
             }
@@ -201,7 +201,7 @@ 
             $link = array(
                 'url' => $url->generate(),
                 'page' => $n,
-                'current' => ( $n == $data['page'] )
+                'current' => ($n == $data['page'])
             );
 
             $links[] = $link;
@@ -242,27 +242,27 @@ 
             $numlinks = $this->generate_pagination_links($data, $URL, $firstpage, $lastpage);
 
             $pagelinks['nums'] = $numlinks;
-            $pagelinks['first_result'] = $page == 1 ? 1 : ( ( $page - 1 ) * $results_per_page ) + 1;
-            $pagelinks['last_result'] = $page == $numpages ? $total_results : $pagelinks['first_result'] + ( $results_per_page - 1 );
+            $pagelinks['first_result'] = $page == 1 ? 1 : (($page - 1) * $results_per_page) + 1;
+            $pagelinks['last_result'] = $page == $numpages ? $total_results : $pagelinks['first_result'] + ($results_per_page - 1);
 
-            if ( $page != 1 ) {
+            if ($page != 1) {
                 $prev_page = $page - 1;
-                $URL->insert(array( 'p' => $prev_page ) );
+                $URL->insert(array('p' => $prev_page));
                 $pagelinks['prev'] = array(
                     'url' => $URL->generate()
                 );
-                $URL->insert(array( 'p' => 1 ) );
+                $URL->insert(array('p' => 1));
                 $pagelinks['firstpage'] = array(
                     'url' => $URL->generate()
                 );
             }
             if ($page != $numpages) {
                 $next_page = $page + 1;
-                $URL->insert(array( 'p' => $next_page ) );
+                $URL->insert(array('p' => $next_page));
                 $pagelinks['next'] = array(
                     'url' => $URL->generate()
                 );
-                $URL->insert(array( 'p' => $numpages ) );
+                $URL->insert(array('p' => $numpages));
                 $pagelinks['lastpage'] = array(
                     'url' => $URL->generate()
                 );
@@ -279,7 +279,7 @@ 
         $links['rss'] = $DATA->page_metadata($this_page, 'rss');
 
         if ($SEARCHENGINE) {
-            $links['email'] = '/alert/?' . ($this->searchstring ? 'alertsearch='.urlencode($this->searchstring) : '');
+            $links['email'] = '/alert/?' . ($this->searchstring ? 'alertsearch=' . urlencode($this->searchstring) : '');
             $links['email_desc'] = $SEARCHENGINE->query_description_long();
         }
 
@@ -293,7 +293,7 @@ 
             $search_engine = new \SEARCHENGINE($filter_ss);
             $links['email_section'] = $links['email'];
             $links['email_desc_section'] = $links['email_desc'];
-            $links['email'] = '/alert/?' . ($filter_ss ? 'alertsearch='.urlencode($filter_ss) : '');
+            $links['email'] = '/alert/?' . ($filter_ss ? 'alertsearch=' . urlencode($filter_ss) : '');
             $links['email_desc'] = $search_engine->query_description_long();
         }
 

classes/SectionView/SpView.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'sp' )
+            array('section' => 'sp')
         );
     }
 }

classes/SectionView/WransView.php

Spacing +6 added lines, -6 removed lines

@@ -12,13 +12,13 @@ 
 
     protected function display_front() {
         global $DATA, $this_page;
-        if ( get_http_var('type') == 'wrans') {
+        if (get_http_var('type') == 'wrans') {
             return parent::display_front();
         }
 
         $data = array();
 
-        $args = array( 'months' => 1 );
+        $args = array('months' => 1);
         $WRANSLIST = new \WRANSLIST;
 
         $wrans = array();
@@ -50,10 +50,10 @@ 
 
     protected function getSearchSections() {
         $sections = array(
-            array( 'section' => 'wrans', 'title' => 'Written Answers' ),
+            array('section' => 'wrans', 'title' => 'Written Answers'),
         );
-        if ( get_http_var('type') == '') {
-            $sections[] = array( 'section' => 'wms', 'title' => 'Written Ministerial Statements' );
+        if (get_http_var('type') == '') {
+            $sections[] = array('section' => 'wms', 'title' => 'Written Ministerial Statements');
         }
         return $sections;
     }
@@ -62,7 +62,7 @@ 
     # speech bar the first (assuming that's the question)
     private $votelinks_so_far = 0;
 
-    protected function generate_votes ($votes, $id, $gid) {
+    protected function generate_votes($votes, $id, $gid) {
         /*
         Returns HTML for the 'Does this answer the question?' links (wrans) in the sidebar.
         $votes = => array (