mysociety / theyworkforyou

tests/AlertsPageTest.php

Spacing +7 added lines, -7 removed lines

@@ -11,7 +11,7 @@ 
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/alertspage.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/alertspage.xml');
     }
 
     private function fetch_page($vars)
@@ -21,37 +21,37 @@ 
 
     public function testFetchPage()
     {
-        $page = $this->fetch_page( array() );
+        $page = $this->fetch_page(array());
         $this->assertContains('TheyWorkForYou Email Alerts', $page);
     }
 
     public function testKeywordOnly() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'elephant'));
         $this->assertContains('Receive alerts when [elephant] is mentioned', $page);
     }
 
     public function testPostCodeOnly() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'SE17 3HE') );
+        $page = $this->fetch_page(array('alertsearch' => 'SE17 3HE'));
         $this->assertContains('when Mrs Test Current-MP', $page);
     }
 
     public function testPostCodeWithKeyWord()
     {
-        $page = $this->fetch_page( array( 'alertsearch' => 'SE17 3HE elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'SE17 3HE elephant'));
         $this->assertContains('You have used a postcode and something else', $page);
         $this->assertContains('Mentions of [elephant] by your MP, Mrs Test Current-MP', $page);
         $this->assertNotContains('by your MSP', $page);
     }
 
     public function testScottishPostcodeWithKeyword() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'PH6 2DB elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'PH6 2DB elephant'));
         $this->assertContains('You have used a postcode and something else', $page);
         $this->assertContains('Mentions of [elephant] by your MP, Mr Test2 Current-MP', $page);
         $this->assertContains('Mentions of [elephant] by your MSP, Mrs Test Current-MSP', $page);
     }
 
     public function testPostcodeAndKeywordWithNoSittingMP() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'OX1 4LF elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'OX1 4LF elephant'));
         $this->assertContains('You have used a postcode and something else', $page);
         $this->assertNotContains('Did you mean to get alerts for when your MP', $page);
     }

tests/SectionTest.php

Spacing +8 added lines, -8 removed lines

@@ -20,13 +20,13 @@ 
 
     public function testDebatesFront() {
         foreach ($this->types as $type) {
-            $this->fetch_page( array( 'type' => $type ) );
+            $this->fetch_page(array('type' => $type));
         }
     }
 
     public function testDebatesYear() {
         foreach ($this->types as $type) {
-            $page = $this->fetch_page( array( 'type' => $type, 'y' => '2014' ) );
+            $page = $this->fetch_page(array('type' => $type, 'y' => '2014'));
             $this->assertContains('<div class="calendar">', $page);
             $this->assertContains('January', $page);
             $this->assertRegExp('/<td colspan="2">&nbsp;<\/td><td[^>]*><a href="\/' . $type . '\/\?d=2014-01-01">1<\/a><\/td><td[^>]*><span>2<\/span><\/td>/', $page);
@@ -35,7 +35,7 @@ 
 
     public function testDebatesDay() {
         foreach ($this->types as $type) {
-            $page = $this->fetch_page( array( 'type' => $type, 'd' => '2014-01-01' ) );
+            $page = $this->fetch_page(array('type' => $type, 'd' => '2014-01-01'));
             $this->assertContains('Wednesday,  1 January 2014', $page);
             $this->assertContains('HeadingA', $page);
             if ($type == 'wrans') {
@@ -60,7 +60,7 @@ 
                 continue;
             }
 
-            $page = $this->fetch_page( array( 'type' => $type, 'id' => '2014-01-01b.1.1' ) );
+            $page = $this->fetch_page(array('type' => $type, 'id' => '2014-01-01b.1.1'));
             if ($type == 'wrans') {
                 $this->assertRegexp("#All .*?written answers on  1 Jan 2014#i", $page);
                 $this->assertContains("QuestionA", $page);
@@ -72,7 +72,7 @@ 
 
     public function testDebatesSubheading() {
         foreach ($this->types as $type) {
-            $page = $this->fetch_page( array( 'type' => $type, 'id' => '2014-01-01b.1.2' ) );
+            $page = $this->fetch_page(array('type' => $type, 'id' => '2014-01-01b.1.2'));
             $this->assertContains("HeadingA", $page);
             if ($type == 'spwrans') {
                 $this->assertContains("QuestionA", $page);
@@ -101,7 +101,7 @@ 
 
     public function testDebatesSpeech() {
         foreach ($this->types as $type) {
-            $page = $this->fetch_page( array( 'type' => $type, 'id' => '2014-01-01b.1.3' ) );
+            $page = $this->fetch_page(array('type' => $type, 'id' => '2014-01-01b.1.3'));
             if ($type == 'wrans' || $type == 'spwrans' || $type == 'wms') {
                 $this->assertRegexp("#Location: .*?/$type/\?id=2014-01-01b\.1\.2#", $page);
             } else {
@@ -125,13 +125,13 @@ 
      * @group xapian
      */
     public function testGlossaryAndSearchHighlights() {
-            $page = $this->fetch_page( array( 'type' => 'lords', 's' => 'constituency', 'id' => '2014-02-02b.1.3' ) );
+            $page = $this->fetch_page(array('type' => 'lords', 's' => 'constituency', 'id' => '2014-02-02b.1.3'));
             $this->assertContains("constituency", $page);
             $this->assertContains("<span class=\"hi\"><a href=\"/glossary/?gl=1\" title=\"In a general election, each Constituency chooses an MP to represent them....\" class=\"glossary\">constituency</a></span>", $page);
     }
 
     public function testGidRedirect() {
-        $page = $this->fetch_page( array( 'type' => 'wrans', 'id' => '2014-01-01a.187335.h' ) );
+        $page = $this->fetch_page(array('type' => 'wrans', 'id' => '2014-01-01a.187335.h'));
         $this->assertRegexp("#Location: .*?/wrans/\?id=2014-01-01b\.1\.2#", $page);
     }
 }

scripts/alertmailer.php

Spacing +1 added lines, -1 removed lines

@@ -245,7 +245,7 @@
     $data = $DEBATELIST->_get_data_by_search($args);
     $total_results = $data['info']['total_results'];
     $queries++;
-    mlog(", hits " . $total_results . ", time " . (getmicrotime()-$start) . "\n");
+    mlog(", hits " . $total_results . ", time " . (getmicrotime() - $start) . "\n");
 
     # Divisions
     if (preg_match('#^speaker:(\d+)$#', $criteria_raw, $m)) {

www/docs/postcode/index.php

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
 
 $pc = preg_replace('#[^a-z0-9]#i', '', $pc);
 if (!validate_postcode($pc)) {
-    twfy_debug ('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
+    twfy_debug('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
     postcode_error("Sorry, " . _htmlentities($pc) . " isn't a valid postcode");
 }
 
@@ -60,7 +60,7 @@ 
     exit;
 }
 
-function fetch_mp($pc, $constituencies, $house=null) {
+function fetch_mp($pc, $constituencies, $house = null) {
     global $THEUSER;
     $args = array('constituency' => $constituencies['WMC']);
     if ($house) {
@@ -68,7 +68,7 @@ 
     }
     try {
         $MEMBER = new MEMBER($args);
-    } catch (MySociety\TheyWorkForYou\MemberException $e){
+    } catch (MySociety\TheyWorkForYou\MemberException $e) {
         postcode_error($e->getMessage());
     }
     if ($MEMBER->person_id()) {

www/docs/mp/index.php

Spacing +30 added lines, -30 removed lines

@@ -139,7 +139,7 @@ 
     }
     if ($pid) {
         $URL = new \MySociety\TheyWorkForYou\Url('search');
-        $URL->insert( array('pid'=>$pid, 'pop'=>1) );
+        $URL->insert(array('pid'=>$pid, 'pop'=>1));
         header('Location: ' . $URL->generate('none'));
         exit;
     }
@@ -189,7 +189,7 @@ 
     } elseif ($THEUSER->postcode_is_set()) {
         get_mp_by_user_postcode($THEUSER->postcode());
     } else {
-        twfy_debug ('MP', "We don't have any way of telling what MP to display");
+        twfy_debug('MP', "We don't have any way of telling what MP to display");
         throw new MySociety\TheyWorkForYou\MemberException('Sorry, but we can’t tell which representative to display.');
     }
     if (!isset($MEMBER) || !$MEMBER->valid) {
@@ -261,7 +261,7 @@ 
     if (!$MEMBER->current_member(HOUSE_TYPE_SCOTLAND)) {
         $title .= ', former';
     }
-    $title .= ' MSP, '.$MEMBER->constituency();
+    $title .= ' MSP, ' . $MEMBER->constituency();
 }
 
 // Enhance title if this is a member of Welsh Parliament
@@ -275,7 +275,7 @@ 
     if (!$MEMBER->current_member(HOUSE_TYPE_WALES)) {
         $title .= ', former';
     }
-    $title .= ' MS, '.$MEMBER->constituency();
+    $title .= ' MS, ' . $MEMBER->constituency();
 }
 
 $known_for = '';
@@ -345,7 +345,7 @@ 
 $data['eu_stance'] = $MEMBER->getEUStance();
 
 # People who are or were MPs and Lords potentially have voting records, except Sinn Fein MPs
-$data['has_voting_record'] = ( ($MEMBER->house(HOUSE_TYPE_COMMONS) && $MEMBER->party() != 'Sinn Féin') || $MEMBER->house(HOUSE_TYPE_LORDS) );
+$data['has_voting_record'] = (($MEMBER->house(HOUSE_TYPE_COMMONS) && $MEMBER->party() != 'Sinn Féin') || $MEMBER->house(HOUSE_TYPE_LORDS));
 # Everyone who is currently somewhere has email alert signup, apart from current Sinn Fein MPs who are not MLAs
 $data['has_email_alerts'] = ($MEMBER->current_member_anywhere() && !($MEMBER->current_member(HOUSE_TYPE_COMMONS) && $MEMBER->party() == 'Sinn Féin' && !$MEMBER->current_member(HOUSE_TYPE_NI)));
 $data['has_expenses'] = $data['leave_date'] > '2004-01-01';
@@ -385,11 +385,11 @@ 
         $divisions = new MySociety\TheyWorkForYou\Divisions($MEMBER);
         $policySummaries = $divisions->getMemberDivisionDetails();
 
-        $policyOptions = array( 'summaries' => $policySummaries);
+        $policyOptions = array('summaries' => $policySummaries);
 
         // Generate voting segments
         $set_descriptions = $policiesList->getSetDescriptions();
-        if ( $policy_set && array_key_exists($policy_set, $set_descriptions) ) {
+        if ($policy_set && array_key_exists($policy_set, $set_descriptions)) {
             $sets = array($policy_set);
             $data['og_image'] = $MEMBER->url(true) . "/policy_set_png?policy_set=" . $policy_set;
             $data['page_title'] = $set_descriptions[$policy_set] . ' ' . $title . ' - TheyWorkForYou';
@@ -431,15 +431,15 @@ 
 
     case 'divisions':
         $policyID = get_http_var('policy');
-        if ( $policyID ) {
-            $policiesList = new MySociety\TheyWorkForYou\Policies( $policyID );
+        if ($policyID) {
+            $policiesList = new MySociety\TheyWorkForYou\Policies($policyID);
         } else {
             $policiesList = new MySociety\TheyWorkForYou\Policies;
         }
-        $positions = new MySociety\TheyWorkForYou\PolicyPositions( $policiesList, $MEMBER );
+        $positions = new MySociety\TheyWorkForYou\PolicyPositions($policiesList, $MEMBER);
         $divisions = new MySociety\TheyWorkForYou\Divisions($MEMBER, $positions, $policiesList);
 
-        if ( $policyID ) {
+        if ($policyID) {
             $data['policydivisions'] = $divisions->getMemberDivisionsForPolicy($policyID);
         } else {
             $data['policydivisions'] = $divisions->getAllMemberDivisionsByPolicy();
@@ -515,16 +515,16 @@ 
     global $THEUSER;
     $pc = preg_replace('#[^a-z0-9]#i', '', $pc);
     if (!validate_postcode($pc)) {
-        twfy_debug ('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
-        throw new MySociety\TheyWorkForYou\MemberException('Sorry, '._htmlentities($pc) .' isn’t a valid postcode');
+        twfy_debug('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
+        throw new MySociety\TheyWorkForYou\MemberException('Sorry, ' . _htmlentities($pc) . ' isn’t a valid postcode');
     }
-    twfy_debug ('MP', "MP lookup by postcode");
+    twfy_debug('MP', "MP lookup by postcode");
     $constituency = strtolower(MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituency($pc));
     if ($constituency == "connection_timed_out") {
         throw new MySociety\TheyWorkForYou\MemberException('Sorry, we couldn’t check your postcode right now, as our postcode lookup server is under quite a lot of load.');
     } elseif ($constituency == "") {
-        twfy_debug ('MP', "Can't display an MP, as submitted postcode didn't match a constituency");
-        throw new MySociety\TheyWorkForYou\MemberException('Sorry, '._htmlentities($pc) .' isn’t a known postcode');
+        twfy_debug('MP', "Can't display an MP, as submitted postcode didn't match a constituency");
+        throw new MySociety\TheyWorkForYou\MemberException('Sorry, ' . _htmlentities($pc) . ' isn’t a known postcode');
     } else {
         // Redirect to the canonical MP page, with a person id.
         $MEMBER = new MySociety\TheyWorkForYou\Member(array('constituency' => $constituency, 'house' => HOUSE_TYPE_COMMONS));
@@ -536,11 +536,11 @@ 
     }
 }
 
-function get_person_by_name($name, $const='') {
+function get_person_by_name($name, $const = '') {
     $MEMBER = new MySociety\TheyWorkForYou\Member(array('name' => $name, 'constituency' => $const));
     // Edge case, only attempt further detection if this isn't the Queen.
     if (($name !== 'elizabeth the second' && $name !== 'prince charles') || $const) {
-        twfy_debug ('MP', 'Redirecting for MP found by name/constituency');
+        twfy_debug('MP', 'Redirecting for MP found by name/constituency');
         member_redirect($MEMBER);
     }
     return $MEMBER;
@@ -577,7 +577,7 @@ 
  * Redirect to the canonical page for a member.
  */
 
-function member_redirect (&$MEMBER, $code = 301, $pagetype = NULL) {
+function member_redirect(&$MEMBER, $code = 301, $pagetype = NULL) {
     // We come here after creating a MEMBER object by various methods.
     // Now we redirect to the canonical MP page, with a person_id.
     if ($MEMBER->person_id()) {
@@ -596,7 +596,7 @@ 
         } else {
             $pagetype = '';
         }
-        header('Location: ' . $url . $pagetype, true, $code );
+        header('Location: ' . $url . $pagetype, true, $code);
         exit;
     }
 }
@@ -624,7 +624,7 @@ 
 
 function person_error_page($message) {
     global $this_page;
-    switch($this_page) {
+    switch ($this_page) {
         case 'mla':
             $rep = 'MLA';
             $SEARCHURL = '/postcode/';
@@ -662,7 +662,7 @@ 
  * Generate the summary of this person's held positions.
  */
 
-function person_summary_description ($MEMBER) {
+function person_summary_description($MEMBER) {
     $entered_house = $MEMBER->entered_house();
     $current_member = $MEMBER->current_member();
     $left_house = $MEMBER->left_house();
@@ -678,7 +678,7 @@ 
     }
     $desc = '';
     foreach ($MEMBER->houses() as $house) {
-        if ($house==HOUSE_TYPE_COMMONS && isset($entered_house[HOUSE_TYPE_LORDS])) {
+        if ($house == HOUSE_TYPE_COMMONS && isset($entered_house[HOUSE_TYPE_LORDS])) {
             # Same info is printed further down
             continue;
         }
@@ -751,7 +751,7 @@ 
  * @return string A HTML summary of this person's rebellion rate.
  */
 
-function person_rebellion_rate ($member) {
+function person_rebellion_rate($member) {
 
     // Rebellion string may be empty.
     $rebellion_string = '';
@@ -800,7 +800,7 @@ 
         $SEARCHENGINE = new \SEARCHENGINE($searchstring);
 
         $hansard = new MySociety\TheyWorkForYou\Hansard();
-        $args = array (
+        $args = array(
             's' => $searchstring,
             'p' => 1,
             'num' => 3,
@@ -815,7 +815,7 @@ 
     twfy_debug_timestamp();
 
     $MOREURL = new \MySociety\TheyWorkForYou\Url('search');
-    $MOREURL->insert( array('pid'=>$person_id, 'pop'=>1) );
+    $MOREURL->insert(array('pid'=>$person_id, 'pop'=>1));
 
     $out['more_href'] = $MOREURL->generate() . '#n4';
     $out['more_text'] = sprintf(gettext('More of %s’s recent appearances'), ucfirst($member->full_name()));
@@ -989,7 +989,7 @@ 
         return;
     }
 
-    $reg = array( 'date' => '', 'data' => '<p>Nil</p>' );
+    $reg = array('date' => '', 'data' => '<p>Nil</p>');
     if (isset($extra_info['register_member_interests_date'])) {
         $reg['date'] = format_date($extra_info['register_member_interests_date'], SHORTDATEFORMAT);
     }
@@ -1079,8 +1079,8 @@ 
         }
     }
 
-    foreach($mreg as $reg) {
-        $data['members'][] = array (
+    foreach ($mreg as $reg) {
+        $data['members'][] = array(
             'url' => '/' . $rep_type . '/?p=' . $reg['person_id'],
             'name' => $reg['given_name'] . ' ' . $reg['family_name']
         );
@@ -1149,7 +1149,7 @@ 
     # comparison which is Commons only
     $data['party_member_count'] = $party->getCurrentMemberCount(HOUSE_TYPE_COMMONS);
 
-    $positions = new MySociety\TheyWorkForYou\PolicyPositions( $policiesList, $MEMBER, [
+    $positions = new MySociety\TheyWorkForYou\PolicyPositions($policiesList, $MEMBER, [
         'summaries' => $policySummaries,
     ]);
     $policy_diffs = $MEMBER->getPartyPolicyDiffs($partyCohort, $policiesList, $positions, $only_diffs);

www/includes/easyparliament/page.php

Spacing +33 added lines, -33 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() . '">' . gettext('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.
@@ -134,7 +134,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:
@@ -237,7 +237,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;
@@ -245,7 +245,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:
@@ -392,7 +392,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
             );
         }
@@ -400,13 +400,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) {
@@ -423,7 +423,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.
@@ -513,7 +513,7 @@ 
             if ($page_title != '') {
                 $page_title .= ': ';
             }
-            $page_title .= format_date ($info['date'], SHORTDATEFORMAT);
+            $page_title .= format_date($info['date'], SHORTDATEFORMAT);
         }
 
         if ($page_title != '') {
@@ -568,7 +568,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() . '">' . gettext('Remove highlighting') . '</a>';
@@ -583,7 +583,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;';
             }
@@ -600,7 +600,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.
@@ -630,7 +630,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')), '">';
@@ -663,16 +663,16 @@ 
                     $ordering = 'd';
                 }
 
-                if ($ordering=='r') {
+                if ($ordering == 'r') {
                 print '<strong>' . gettext('Sorted by relevance') . '</strong>';
                 } else {
                 printf(gettext("<a href='%s'>Sort by relevance</a>"), $orderUrl->generate('html', array('o'=>'r')));
                 }
 
                 print "&nbsp;|&nbsp;";
-                if ($ordering=='d') {
+                if ($ordering == 'd') {
                 print '<strong>' . gettext('Sorted by date:') . ' ' . gettext('newest') . '</strong> / <a href="' . $orderUrl->generate('html', array('o'=>'o')) . '">' . gettext('oldest') . '</a>';
-                } elseif ($ordering=='o') {
+                } elseif ($ordering == 'o') {
                 print '<strong>' . gettext('Sorted by date:') . '</strong> <a href="' . $orderUrl->generate('html', array('o'=>'d')) . '">' . gettext('newest') . '</a> / <strong>' . gettext('oldest') . '</strong>';
                 } else {
                 print gettext("Sort by date:") . ' ';
@@ -685,7 +685,7 @@ 
                 }
 
             print "&nbsp;|&nbsp;";
-            if ($ordering=='p') {
+            if ($ordering == 'p') {
                 print '<strong>' . gettext('Use by person') . '</strong>';
             } else {
                 printf('<a href="%s">', $orderUrl->generate('html', array('o'=>'p')));
@@ -706,7 +706,7 @@ 
         echo '</form> </div>';
     }
 
-    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.
         ?>
@@ -809,7 +809,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)
@@ -840,14 +840,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];
         }
         ?>
@@ -866,12 +866,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 = "";
         }
@@ -892,9 +892,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']);
         }
     }
 
@@ -969,7 +969,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'];
@@ -1107,7 +1107,7 @@ 
 
                 $body = trim_characters($report['body'], 0, 40);
 
-                $tabledata['rows'][] = array (
+                $tabledata['rows'][] = array(
                     _htmlentities($report['firstname'] . ' ' . $report['lastname']),
                     _htmlentities($body),
                     $report['reported'],
@@ -1189,7 +1189,7 @@ 
         // Returns HTML suitable for putting in the sidebar on Admin pages.
         global $this_page, $DATA;
 
-        $pages = array ('admin_home',
+        $pages = array('admin_home',
                 'admin_comments', 'admin_searchlogs', 'admin_popularsearches', 'admin_failedsearches',
                 'alert_stats', 'admin_statistics', 'admin_reportstats',
                 'admin_commentreports', 'admin_glossary', 'admin_glossary_pending', 'admin_badusers',

www/includes/easyparliament/alert.php

Spacing +14 added lines, -14 removed lines

@@ -41,7 +41,7 @@ 
     public $token_checked = null;
     private $alert_id = "";
     public $email = "";
-    public $criteria = "";		// Sets the terms that are used to produce the search results.
+    public $criteria = ""; // Sets the terms that are used to produce the search results.
 
     private $db;
 
@@ -72,7 +72,7 @@ 
             $contents = array('criteria' => $row['criteria'], 'count' => $row['cnt']);
             $data[] = $contents;
         }
-        $data = array ('alerts' => $data);
+        $data = array('alerts' => $data);
         return $data;
     }
 
@@ -100,12 +100,12 @@ 
 
         $data = $q->fetchAll();
         $info = "Alert";
-        $data = array ('info' => $info, 'data' => $data);
+        $data = array('info' => $info, 'data' => $data);
 
         return $data;
     }
 
-    public function add($details, $confirmation_email=false, $instantly_confirm=true) {
+    public function add($details, $confirmation_email = false, $instantly_confirm = true) {
 
         // Adds a new alert's info into the database.
         // Then calls another function to send them a confirmation email.
@@ -170,7 +170,7 @@ 
             // This gives a code for their email address which is then joined
             // to the timestamp so as to provide a unique ID for each alert.
 
-            $token = substr( password_hash($details["email"] . microtime(), PASSWORD_BCRYPT), 29, 16 );
+            $token = substr(password_hash($details["email"] . microtime(), PASSWORD_BCRYPT), 29, 16);
 
             // Full stops don't work well at the end of URLs in emails, so
             // replace them. And double slash would be treated as single and
@@ -244,19 +244,19 @@ 
 
         $urltoken = $this->alert_id . '-' . $this->registrationtoken;
 
-        if ( isset($details['confirm_base']) && $details['confirm_base'] !== '' ) {
+        if (isset($details['confirm_base']) && $details['confirm_base'] !== '') {
             $confirmurl = $details['confirm_base'] . $urltoken;
         } else {
             $confirmurl = 'https://' . DOMAIN . '/A/' . $urltoken;
         }
 
         // Arrays we need to send a templated email.
-        $data = array (
+        $data = array(
             'to' 		=> $details['email'],
             'template' 	=> 'alert_confirmation'
         );
 
-        $merge = array (
+        $merge = array(
             'CONFIRMURL'	=> $confirmurl,
             'CRITERIA'	=> $this->criteria_pretty()
         );
@@ -270,7 +270,7 @@ 
     }
 
     public function send_already_signedup_email($details) {
-        $data = array (
+        $data = array(
             'to' 		=> $details['email'],
             'template' 	=> 'alert_already_signedup'
         );
@@ -278,7 +278,7 @@ 
         $criteria = \MySociety\TheyWorkForYou\Utility\Alert::detailsToCriteria($details);
         $this->criteria = $criteria;
 
-        $merge = array (
+        $merge = array(
             'CRITERIA'	=> $this->criteria_pretty()
         );
 
@@ -449,20 +449,20 @@ 
     public function email() { return $this->email; }
     public function criteria() { return $this->criteria; }
     public function criteria_pretty($html = false) {
-        $criteria = explode(' ',$this->criteria);
+        $criteria = explode(' ', $this->criteria);
         $spokenby = array_values(\MySociety\TheyWorkForYou\Utility\Search::speakerNamesForIDs($this->criteria));
         $words = array();
         foreach ($criteria as $c) {
-            if (!preg_match('#^speaker:(\d+)#',$c,$m)) {
+            if (!preg_match('#^speaker:(\d+)#', $c, $m)) {
                 $words[] = $c;
             }
         }
         $criteria = '';
         if (count($words)) {
-            $criteria .= ($html?'<li>':'* ') . sprintf(gettext('Mentions of [%s]'), implode(' ', $words)) . ($html?'</li>':'') . "\n";
+            $criteria .= ($html ? '<li>' : '* ') . sprintf(gettext('Mentions of [%s]'), implode(' ', $words)) . ($html ? '</li>' : '') . "\n";
         }
         if ($spokenby) {
-            $criteria .= ($html?'<li>':'* ') . sprintf(gettext("Things by %s"), implode(' or ', $spokenby)) . ($html?'</li>':'') . "\n";
+            $criteria .= ($html ? '<li>' : '* ') . sprintf(gettext("Things by %s"), implode(' or ', $spokenby)) . ($html ? '</li>' : '') . "\n";
         }
         return $criteria;
     }

www/includes/easyparliament/searchengine.php

Spacing +30 added lines, -30 removed lines

@@ -37,7 +37,7 @@ 
     public $valid = false;
     public $error;
 
-    public function __construct($query, $lang='') {
+    public function __construct($query, $lang = '') {
         if (!defined('XAPIANDB') || !XAPIANDB)
             return null;
 
@@ -96,10 +96,10 @@ 
         // Split words up into individual words, and quoted phrases
         preg_match_all('/(' .
             '"|' . # match either a quote, or...
-            '(?:(?<![' .$this->wordchars. '])-)?' . # optionally a - (exclude)
+            '(?:(?<![' . $this->wordchars . '])-)?' . # optionally a - (exclude)
             # if at start of word (i.e. not preceded by a word character, in
             # which case it is probably a hyphenated-word)
-            '['.$this->wordchars.']+' . # followed by a string of word-characters
+            '[' . $this->wordchars . ']+' . # followed by a string of word-characters
             ')/', $this->query, $all_words);
         if ($all_words) {
             $all_words = $all_words[0];
@@ -124,8 +124,8 @@ 
             if (strpos($word, ':') !== false) {
                 $items = explode(":", strtolower($word));
                 $type = $items[0];
-                if (substr($type, 0, 1)=='-') $type = substr($type, 1);
-                $value = strtolower(join(":", array_slice($items,1)));
+                if (substr($type, 0, 1) == '-') $type = substr($type, 1);
+                $value = strtolower(join(":", array_slice($items, 1)));
                 if ($type == 'section') {
                     $newv = $value;
                     if ($value == 'debates' || $value == 'debate') $newv = 1;
@@ -138,8 +138,8 @@ 
                     elseif ($value == 'sp') $newv = 7;
                     elseif ($value == 'spwrans' || $value == 'spwran') $newv = 8;
                     elseif ($value == 'lmqs') $newv = 9;
-                    elseif ($value == 'uk') $newv = array(1,2,3,4,6,101);
-                    elseif ($value == 'scotland') $newv = array(7,8);
+                    elseif ($value == 'uk') $newv = array(1, 2, 3, 4, 6, 101);
+                    elseif ($value == 'scotland') $newv = array(7, 8);
                     elseif ($value == 'wales') $newv = ($lang == 'cy' || LANGUAGE == 'cy') ? 11 : 10;
                     elseif ($value == 'future') $newv = 'F';
                     if (is_array($newv)) {
@@ -174,7 +174,7 @@ 
             $this->query .= " $from..$to";
         } elseif ($from) {
             $this->query = str_ireplace("from:$from", '', $this->query);
-            $this->query .= " $from..".date('Ymd');
+            $this->query .= " $from.." . date('Ymd');
         } elseif ($to) {
             $this->query = str_ireplace("to:$to", '', $this->query);
             $this->query .= " 19990101..$to";
@@ -191,7 +191,7 @@ 
 
         twfy_debug("SEARCH", "prefixed: " . var_export($this->prefixed, true));
 
-        twfy_debug("SEARCH", "query -- ". $this->query);
+        twfy_debug("SEARCH", "query -- " . $this->query);
         $flags = XapianQueryParser::FLAG_BOOLEAN | XapianQueryParser::FLAG_LOVEHATE |
             XapianQueryParser::FLAG_WILDCARD | XapianQueryParser::FLAG_SPELLING_CORRECTION;
         $flags = $flags | XapianQueryParser::FLAG_PHRASE;
@@ -244,7 +244,7 @@ 
         foreach ($m[1] as $phrase) {
             $phrase_new = preg_replace('# PHRASE \d+#', '', $phrase);
             #$this->phrases[] = preg_split('#\s+#', $phrase_new);
-            $qd = str_replace("($phrase)", '"'.$phrase_new.'"', $qd);
+            $qd = str_replace("($phrase)", '"' . $phrase_new . '"', $qd);
         }
         preg_match_all('#\(([^(]*? NEAR [^(]*?)\)#', $qd, $m);
         foreach ($m[1] as $mm) {
@@ -374,7 +374,7 @@ 
     }
 
     // Perform partial query to get a count of number of matches
-    public function run_count($first_result, $results_per_page, $sort_order='relevance') {
+    public function run_count($first_result, $results_per_page, $sort_order = 'relevance') {
         if (!defined('XAPIANDB') || !XAPIANDB)
             return null;
 
@@ -447,13 +447,13 @@ 
         #}
 
         $duration = getmicrotime() - $start;
-        twfy_debug ("SEARCH", "Search count took $duration seconds.");
+        twfy_debug("SEARCH", "Search count took $duration seconds.");
 
         return $count;
     }
 
     // Perform the full search...
-    public function run_search($first_result, $results_per_page, $sort_order='relevance') {
+    public function run_search($first_result, $results_per_page, $sort_order = 'relevance') {
         $start = getmicrotime();
 
         #$matches = $this->enquire->get_mset($first_result, $results_per_page);
@@ -474,13 +474,13 @@ 
                 array_push($this->created, join('', unpack('N', $doc->get_value(2)))); # XXX Needs fixing
             }
             twfy_debug("SEARCH", "gid: $gid relevancy: $relevancy% weight: $weight");
-            array_push($this->gids, "uk.org.publicwhip/".$gid);
+            array_push($this->gids, "uk.org.publicwhip/" . $gid);
             array_push($this->collapsed, $collapsed);
             array_push($this->relevances, $relevancy);
             $iter->next();
         }
         $duration = getmicrotime() - $start;
-        twfy_debug ("SEARCH", "Run search took $duration seconds.");
+        twfy_debug("SEARCH", "Run search took $duration seconds.");
     }
     // ... use these to get the results
     public function get_gids() {
@@ -521,7 +521,7 @@ 
         $body = str_replace($this->specialchars, $this->specialchars_upper, $body);
         $body = mb_convert_encoding($body, "UTF-8", "HTML-ENTITIES");
         $body = str_replace($this->specialchars_upper, $this->specialchars, $body);
-        $splitextract = preg_split('/(<[^>]*>|[0-9,.]+|['.$this->wordcharsnodigit.']+)/', $body, -1, PREG_SPLIT_DELIM_CAPTURE);
+        $splitextract = preg_split('/(<[^>]*>|[0-9,.]+|[' . $this->wordcharsnodigit . ']+)/', $body, -1, PREG_SPLIT_DELIM_CAPTURE);
         $hlextract = "";
         foreach ($splitextract as $extractword) {
             if (preg_match('/^<[^>]*>$/', $extractword)) {
@@ -569,7 +569,7 @@ 
         */
 
         foreach ($this->phrases as $phrase) {
-            $phrasematch = join($phrase, '[^'.$this->wordchars.']+');
+            $phrasematch = join($phrase, '[^' . $this->wordchars . ']+');
             array_push($findwords, "/\b($phrasematch)\b(?!(?>[^<>]*>))/i");
             $replacewords[] = "<span class=\"hi\">\\1</span>";
         }
@@ -587,12 +587,12 @@ 
 
         // look for phrases
         foreach ($this->phrases as $phrase) {
-            $phrasematch = join($phrase, '[^'.$this->wordchars.']+');
-            if (preg_match('/([^'.$this->wordchars.']' . $phrasematch . '[^A-Za-z0-9])/', $lcbody, $matches))
+            $phrasematch = join($phrase, '[^' . $this->wordchars . ']+');
+            if (preg_match('/([^' . $this->wordchars . ']' . $phrasematch . '[^A-Za-z0-9])/', $lcbody, $matches))
             {
-                $wordpos = strpos( $lcbody, $matches[0] );
+                $wordpos = strpos($lcbody, $matches[0]);
                 if ($wordpos) {
-                    if ( ($wordpos < $pos) || ($pos==-1) ) {
+                    if (($wordpos < $pos) || ($pos == -1)) {
                         $pos = $wordpos;
                     }
                 }
@@ -600,7 +600,7 @@ 
         }
         if ($pos != -1) return $pos;
 
-        $splitextract = preg_split('/([0-9,.]+|['.$this->wordcharsnodigit.']+)/', $lcbody, -1, PREG_SPLIT_DELIM_CAPTURE);
+        $splitextract = preg_split('/([0-9,.]+|[' . $this->wordcharsnodigit . ']+)/', $lcbody, -1, PREG_SPLIT_DELIM_CAPTURE);
         $stemmed_words = array_map(array($this, 'stem'), $this->words);
         foreach ($splitextract as $extractword) {
             $extractword = preg_replace('/&$/', '', $extractword);
@@ -610,7 +610,7 @@ 
             foreach ($stemmed_words as $word) {
                 if ($word == '') continue;
                 $matchword = $this->stem($extractword);
-                if ($matchword == $word && ($wordpos < $pos || $pos==-1)) {
+                if ($matchword == $word && ($wordpos < $pos || $pos == -1)) {
                     $pos = $wordpos;
                 }
             }
@@ -619,11 +619,11 @@ 
         if ($pos != -1) return $pos;
 
         foreach ($this->words as $word) {
-            if (ctype_digit($word)) $word = '(?:'.$word.'|'.number_format($word).')';
-            if (preg_match('/([^'.$this->wordchars.']' . $word . '[^'.$this->wordchars. '])/', $lcbody, $matches)) {
-                $wordpos = strpos( $lcbody, $matches[0] );
+            if (ctype_digit($word)) $word = '(?:' . $word . '|' . number_format($word) . ')';
+            if (preg_match('/([^' . $this->wordchars . ']' . $word . '[^' . $this->wordchars . '])/', $lcbody, $matches)) {
+                $wordpos = strpos($lcbody, $matches[0]);
                 if ($wordpos) {
-                    if ( ($wordpos < $pos) || ($pos==-1) ) {
+                    if (($wordpos < $pos) || ($pos == -1)) {
                         $pos = $wordpos;
                     }
                 }
@@ -633,11 +633,11 @@ 
         if ($pos != -1) return $pos;
 
         foreach ($this->words as $word) {
-            if (ctype_digit($word)) $word = '(?:'.$word.'|'.number_format($word).')';
+            if (ctype_digit($word)) $word = '(?:' . $word . '|' . number_format($word) . ')';
             if (preg_match('/(' . $word . ')/', $lcbody, $matches)) {
-                $wordpos = strpos( $lcbody, $matches[0] );
+                $wordpos = strpos($lcbody, $matches[0]);
                 if ($wordpos) {
-                    if ( ($wordpos < $pos) || ($pos==-1) ) {
+                    if (($wordpos < $pos) || ($pos == -1)) {
                         $pos = $wordpos;
                     }
                 }

www/includes/easyparliament/templates/html/homepage/recent-votes.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php if ( count($divisions) > 0 ) { ?>
+<?php if (count($divisions) > 0) { ?>
     <h2 style="position: relative;">
         <?= gettext('Recent Votes') ?>
         <div class="meta excerpt__category"><a href="/divisions/"><?= gettext('Show all recent votes') ?></a></div>