mysociety / theyworkforyou

www/includes/easyparliament/templates/html/user/view_user.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
                 <div class="row">
                 <span class="label">Website</span>
-                <span class="formw"><?= $website == '' ? 'none' : '<a rel="nofollow" href="' . _htmlentities($website) . '">'. _htmlentities($website) . '</a>' ?></span>
+                <span class="formw"><?= $website == '' ? 'none' : '<a rel="nofollow" href="' . _htmlentities($website) . '">' . _htmlentities($website) . '</a>' ?></span>
                 </div>
 
                 <div class="row">

www/includes/easyparliament/templates/html/mp/_vote_footer.php

Spacing +2 added lines, -2 removed lines

@@ -6,9 +6,9 @@
     <a href="/help/#vote-descriptions">vote descriptions</a> and
     <a href="/help/#votingrecord">how the voting record is decided</a></p>
 
-  <?php if(isset($data['photo_attribution_text'])) { ?>
+  <?php if (isset($data['photo_attribution_text'])) { ?>
     <p>
-      <?php if(isset($data['photo_attribution_link'])) { ?>
+      <?php if (isset($data['photo_attribution_link'])) { ?>
         Profile photo:
         <a href="<?= $data['photo_attribution_link'] ?>"><?= $data['photo_attribution_text'] ?></a>
       <?php } else { ?>

www/docs/admin/users.php

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

@@ -20,7 +20,7 @@
     <input type="hidden" name="scrub" value="$email">
     <input type="submit" value="Delete user">
 </form>
-EOF;
+eof;
 }
 
 $user_data = array(

www/includes/easyparliament/templates/html/search/person.php

Spacing +2 added lines, -2 removed lines

@@ -2,12 +2,12 @@
     <img src="<?= $member->image()['url'] ?>" alt="">
     <h3 class="search-result__title"><a href="<?= $member->url() ?>"><?= $member->full_name() ?></a></h3>
     <?php $latest_membership = $member->getMostRecentMembership(); ?>
-    <?php if ( $latest_membership && $latest_membership['house'] != HOUSE_TYPE_ROYAL ) { ?>
+    <?php if ($latest_membership && $latest_membership['house'] != HOUSE_TYPE_ROYAL) { ?>
         <p class="search-result__description">
             <?= $latest_membership['current'] ? '' : 'Former' ?>
             <?= $latest_membership['party'] == 'Bishop' ? '' : $latest_membership['party'] ?>
             <?= $latest_membership['rep_name'] ?>
-            <?php if ( $latest_membership['constituency'] ) { ?>
+            <?php if ($latest_membership['constituency']) { ?>
                 for <?= $latest_membership['constituency'] ?>
             <?php } ?>
             (<?= format_date($latest_membership['start_date'], SHORTDATEFORMAT) ?> – <?= $latest_membership['current'] ? 'current' : format_date($latest_membership['end_date'], SHORTDATEFORMAT); ?>)

www/docs/api/api_getConstituencies.php

Braces +12 added lines, -4 removed lines

@@ -108,7 +108,9 @@ 
     $geometry = _api_getGeometry();
     $out = array();
     foreach ($geometry['data'] as $name => $data) {
-        if (!isset($data['centre_lat']) || !isset($data['centre_lon'])) continue;
+        if (!isset($data['centre_lat']) || !isset($data['centre_lon'])) {
+            continue;
+        }
         $distance = R_e * acos(
             sin(deg2rad($lat)) * sin(deg2rad($data['centre_lat']))
             + cos(deg2rad($lat)) * cos(deg2rad($data['centre_lat']))
@@ -125,8 +127,12 @@ 
         }
     }
     usort($out, function($a, $b) {
-        if ($a['distance'] > $b['distance']) return 1;
-        if ($a['distance'] < $b['distance']) return -1;
+        if ($a['distance'] > $b['distance']) {
+            return 1;
+        }
+        if ($a['distance'] < $b['distance']) {
+            return -1;
+        }
         return 0;
     });
     return $out;
@@ -145,7 +151,9 @@ 
  * smallest angle between them.
  */
 function _api_angle_between($a1, $a2) {
-    if (abs($a1 - $a2) > M_PI) return 2*M_PI - abs($a1 - $a2);
+    if (abs($a1 - $a2) > M_PI) {
+        return 2*M_PI - abs($a1 - $a2);
+    }
     return abs($a1 - $a2);
 }
 

Spacing +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
         and c_main.main_name and constituency.name like :constituency_name and constituency.from_date <= date(now())
         and date(now()) <= constituency.to_date
         order by name', array(
-        ':constituency_name' => '%' . $s .'%'
+        ':constituency_name' => '%' . $s . '%'
         ));
     $output = array();
     $done = array();
@@ -70,7 +70,7 @@ 
 function api_getConstituencies($date = 'now()') {
     $db = new ParlDB;
     $q = $db->query('select cons_id, name from constituency
-        where main_name and from_date <= date('.$date.') and date('.$date.') <= to_date
+        where main_name and from_date <= date('.$date . ') and date(' . $date . ') <= to_date
         order by name');
     $output = array();
     foreach ($q as $row) {
@@ -145,7 +145,7 @@ 
  * smallest angle between them.
  */
 function _api_angle_between($a1, $a2) {
-    if (abs($a1 - $a2) > M_PI) return 2*M_PI - abs($a1 - $a2);
+    if (abs($a1 - $a2) > M_PI) return 2 * M_PI - abs($a1 - $a2);
     return abs($a1 - $a2);
 }
 

classes/MiniSurvey.php

Spacing +6 added lines, -6 removed lines

@@ -23,10 +23,10 @@ 
 
         if ($hide_question) {
             $show_survey_qn = $current_question;
-            setcookie('survey', $current_question, time()+60*60*24*365, '/');
+            setcookie('survey', $current_question, time() + 60 * 60 * 24 * 365, '/');
         } elseif ($has_answered_question == $current_question && !$always_ask) {
             $show_survey_qn = $current_question;
-            setcookie('survey', $current_question, time()+60*60*24*365, '/');
+            setcookie('survey', $current_question, time() + 60 * 60 * 24 * 365, '/');
         } elseif (isset($_COOKIE['survey'])) {
             $show_survey_qn = $_COOKIE['survey'];
         }
@@ -36,18 +36,18 @@ 
 
             $page_url = '';
             $hide_url = '';
-            if ( in_array( $this_page, array('mp', 'peer', 'msp', 'mla', 'royal') ) ) {
+            if (in_array($this_page, array('mp', 'peer', 'msp', 'mla', 'royal'))) {
                 global $MEMBER;
-                if ( $MEMBER ) {
+                if ($MEMBER) {
                     $page_url = $MEMBER->url(true) . "?answered_survey=$current_question";
                     $hide_url = $MEMBER->url() . "?hide_survey=$current_question";
                 }
             } else {
                 $URL = new Url($this_page);
-                $URL->insert(array('answered_survey' => $current_question ));
+                $URL->insert(array('answered_survey' => $current_question));
                 $page_url = 'https://' . DOMAIN . $URL->generate();
                 $URL = new Url($this_page);
-                $URL->insert(array('hide_survey' => $current_question ));
+                $URL->insert(array('hide_survey' => $current_question));
                 $hide_url = $URL->generate();
             }
 

tests/PageTest.php

Indentation +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
         $this->assertRegexp('#<span class="person-header__about__position__role">\s*Labour\s*MP\s*</span>#', $page);
     }
 
-	public function testSittingMLA()
+    public function testSittingMLA()
     {
         $page = $this->fetch_page( array( 'pid' => 4, 'mla' => 1, 'url' => '/mp/4/test_current-mla' ) );
         $this->assertContains('Test Current-MLA', $page);
@@ -63,7 +63,7 @@ 
     /**
      * Ensure that the Speaker is given the correct constituency.
      */
-	public function testSpeaker()
+    public function testSpeaker()
     {
         $page = $this->fetch_page( array( 'pid' => 13, 'url' => '/mp/13/test_speaker/buckingham' ) );
         $this->assertRegexp('#<span class="person-header__about__position__role">\s*Speaker\s*MP\s*</span>#', $page);

Spacing +12 added lines, -12 removed lines

@@ -11,7 +11,7 @@ 
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/member.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/member.xml');
     }
 
     private function fetch_page($vars)
@@ -21,14 +21,14 @@ 
 
     public function testQueenie()
     {
-        $page = $this->fetch_page( array( 'royal' => 1, 'n' => 'elizabeth_the_second' ) );
+        $page = $this->fetch_page(array('royal' => 1, 'n' => 'elizabeth_the_second'));
         $this->assertContains('Elizabeth the Second', $page);
         $this->assertContains('Coronated on 2 June 1953', $page);
     }
 
     public function testSittingMP()
     {
-        $page = $this->fetch_page( array( 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency' ) );
+        $page = $this->fetch_page(array('pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency'));
         $this->assertContains('Test Current-MP', $page);
         $this->assertRegexp('#<span class="person-header__about__position__constituency">\s*Test Westminster Constituency\s*</span>#', $page);
         $this->assertRegexp('#<span class="person-header__about__position__role">\s*Labour\s*MP\s*</span>#', $page);
@@ -36,7 +36,7 @@ 
 
 	public function testSittingMLA()
     {
-        $page = $this->fetch_page( array( 'pid' => 4, 'mla' => 1, 'url' => '/mp/4/test_current-mla' ) );
+        $page = $this->fetch_page(array('pid' => 4, 'mla' => 1, 'url' => '/mp/4/test_current-mla'));
         $this->assertContains('Test Current-MLA', $page);
         $this->assertRegexp('#<span class="person-header__about__position__constituency">\s*Test Northern Ireland Constituency\s*</span>#', $page);
         $this->assertRegexp('#<span class="person-header__about__position__role">\s*Sinn Féin\s*MLA\s*</span>#', $page);
@@ -47,7 +47,7 @@ 
      */
     public function testSittingSinnFeinMP()
     {
-        $page = $this->fetch_page( array( 'pid' => 15, 'url' => '/mp/15/test_current-sf-mp/test_westminster_constituency' ) );
+        $page = $this->fetch_page(array('pid' => 15, 'url' => '/mp/15/test_current-sf-mp/test_westminster_constituency'));
         $this->assertContains('Sinn F&eacute;in MPs do not take their seats in Parliament.', $page);
     }
 
@@ -56,7 +56,7 @@ 
      */
     public function testSittingNonSinnFeinMP()
     {
-        $page = $this->fetch_page( array( 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency' ) );
+        $page = $this->fetch_page(array('pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency'));
         $this->assertNotContains('Sinn F&eacute;in MPs do not take their seats in Parliament.', $page);
     }
 
@@ -65,7 +65,7 @@ 
      */
 	public function testSpeaker()
     {
-        $page = $this->fetch_page( array( 'pid' => 13, 'url' => '/mp/13/test_speaker/buckingham' ) );
+        $page = $this->fetch_page(array('pid' => 13, 'url' => '/mp/13/test_speaker/buckingham'));
         $this->assertRegexp('#<span class="person-header__about__position__role">\s*Speaker\s*MP\s*</span>#', $page);
     }
 
@@ -75,25 +75,25 @@ 
         # makes sure it is empty in case there's something hanging
         # about in memcached
         $banner->set_text('');
-        $page = $this->fetch_page( array( 'url' => '/' ) );
+        $page = $this->fetch_page(array('url' => '/'));
         $this->assertNotContains('<div class="banner">', $page);
         $this->assertNotContains('This is a banner', $page);
 
         $banner->set_text('This is a banner');
-        $page = $this->fetch_page( array( 'url' => '/' ) );
+        $page = $this->fetch_page(array('url' => '/'));
         $this->assertContains('This is a banner', $page);
 
         $banner->set_text('');
-        $page = $this->fetch_page( array( 'url' => '/' ) );
+        $page = $this->fetch_page(array('url' => '/'));
         $this->assertNotContains('<div class="banner">', $page);
         $this->assertNotContains('This is a banner', $page);
     }
 
     public function testNewMPMessage() {
-        $page = $this->fetch_page( array( 'pid' => 17, 'url' => '/mp/17/recent_mp/test_westminster_constituency' ) );
+        $page = $this->fetch_page(array('pid' => 17, 'url' => '/mp/17/recent_mp/test_westminster_constituency'));
         $this->assertNotContains('is a recently elected MP', $page);
         $this->db->query('UPDATE member SET entered_house = NOW() WHERE person_id = 17');
-        $page = $this->fetch_page( array( 'pid' => 17, 'url' => '/mp/17/recent_mp/test_westminster_constituency' ) );
+        $page = $this->fetch_page(array('pid' => 17, 'url' => '/mp/17/recent_mp/test_westminster_constituency'));
         $this->assertContains('is a recently elected MP', $page);
     }
 

www/includes/easyparliament/templates/html/divisions/_vote_summary.php

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <p>
     <a href="#for"><?= $division['for'] ?> for</a>,
     <a href="#against"><?= $division['against'] ?> against</a><?php
-  if ($division['both'] > 0) { ?>,
+    if ($division['both'] > 0) { ?>,
     <a href="#both"><?= $division['both'] ?> abstained</a><?php
-  }
-  if ($division['absent'] > 0) { ?>,
+    }
+    if ($division['absent'] > 0) { ?>,
     <a href="#absent"><?= $division['absent'] ?> absent</a><?php
-  } ?>.
+    } ?>.
 </p>

scripts/alertmailer.php

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

@@ -339,7 +339,7 @@
 
     $data .= '====================';
     $sentemails++;
-    mlog("SEND $sentemails : Sending email to $current[email] ... ");
+    mlog("send $sentemails : Sending email to $current[email] ... ");
     $d = array('to' => $current['email'], 'template' => $template);
     $m = array(
         'DATA' => $data,

Spacing +1 added lines, -1 removed lines

@@ -217,7 +217,7 @@
         #        unset($SEARCHENGINE);
         $total_results = $data['info']['total_results'];
         $queries++;
-        mlog(", hits " . $total_results . ", time " . (getmicrotime()-$start) . "\n");
+        mlog(", hits " . $total_results . ", time " . (getmicrotime() - $start) . "\n");
     } else {
         mlog("  ACTION $active/$outof CACHE HIT : Using cached result for '$criteria_batch'\n");
         $data = $results[$criteria_batch];