mysociety / theyworkforyou

www/docs/admin/profile-message.php

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

@@ -91,6 +91,6 @@
     <span class="formw"><input type="submit" name="submit" value="Update"></span>
 </div>
 </form>
-EOF;
+eof;
     return $out;
 }

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
         if ($row['constituency']) {
             $desc .= ', ' . $row['constituency'];
         }
-        $out .= '<option value="'.$p_id.'">'.$desc.'</option>' . "\n";
+        $out .= '<option value="' . $p_id . '">' . $desc . '</option>' . "\n";
     }
 
     $out .= ' </select></span> </div> ';

tests/AlertsTest.php

Spacing +4 added lines, -4 removed lines

@@ -11,7 +11,7 @@ 
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/alerts.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/alerts.xml');
     }
 
     /**
@@ -31,7 +31,7 @@ 
     {
         $ALERT = new ALERT();
 
-        $response = $ALERT->fetch(0,0);
+        $response = $ALERT->fetch(0, 0);
 
         // Make sure we only get one response
         $this->assertEquals(1, count($response['data']));
@@ -48,7 +48,7 @@ 
     {
         $ALERT = new ALERT();
 
-        $response = $ALERT->fetch(1,0);
+        $response = $ALERT->fetch(1, 0);
 
         // Make sure we only get two responses
         $this->assertEquals(2, count($response['data']));
@@ -65,7 +65,7 @@ 
     {
         $ALERT = new ALERT();
 
-        $response = $ALERT->fetch_between(1,0, '2014-02-03', '2014-02-04');
+        $response = $ALERT->fetch_between(1, 0, '2014-02-03', '2014-02-04');
 
         // Make sure we only get one response
         $this->assertEquals(1, count($response['alerts']));

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

Braces +2 added lines, -1 removed lines

@@ -111,7 +111,8 @@
                                 <?php if ( $house !=  HOUSE_TYPE_LORDS) { ?>
                                   <?= isset($speaker['office']) ? ' - ' . join('; ', $speaker['office']) : '' ?>
                                 <?php } ?>
-                              <?php } else { // no $pid ?>
+                              <?php } else {
+// no $pid ?>
                                 <?= $speaker['name'] ?>
                               <?php } ?>
                             </td>

Spacing +24 added lines, -24 removed lines

@@ -9,19 +9,19 @@ 
             <div class="search-page__section__primary">
                 <h2><?= sprintf(gettext('Who says <em class="current-search-term">%s</em> the most?'), _htmlentities($searchstring)) ?></h2>
 
-              <?php if ( isset($error) ) { ?>
-                <?php if ( $error == 'No results' && isset( $house ) && $house != HOUSE_TYPE_ROYAL ) { ?>
+              <?php if (isset($error)) { ?>
+                <?php if ($error == 'No results' && isset($house) && $house != HOUSE_TYPE_ROYAL) { ?>
                   <ul class="search-result-display-options">
                       <li>
-                        <?php if ( $house ==  HOUSE_TYPE_COMMONS) { ?>
+                        <?php if ($house == HOUSE_TYPE_COMMONS) { ?>
                           No results for MPs only
-                        <?php } else if ( $house ==  HOUSE_TYPE_LORDS) { ?>
+                        <?php } else if ($house == HOUSE_TYPE_LORDS) { ?>
                           No results for Peers only
-                        <?php } else if ( $house == HOUSE_TYPE_SCOTLAND) { ?>
+                        <?php } else if ($house == HOUSE_TYPE_SCOTLAND) { ?>
                           No results for MSPs only
-                        <?php } else if ( $house == HOUSE_TYPE_WALES) { ?>
+                        <?php } else if ($house == HOUSE_TYPE_WALES) { ?>
                           <?= gettext('No results for MSs only') ?>
-                        <?php } else if ( $house ==  HOUSE_TYPE_NI) { ?>
+                        <?php } else if ($house == HOUSE_TYPE_NI) { ?>
                           No results for MLAs only
                         <?php } ?>
                           |
@@ -33,7 +33,7 @@ 
                 <?php } ?>
               <?php } ?>
 
-              <?php if ( $wtt ) { ?>
+              <?php if ($wtt) { ?>
                 <p><strong>Now, try reading what a couple of these Lords are saying,
                 to help you find someone appropriate. When you've found someone,
                 follow the "I want to write to (name of lord)" link on their results page
@@ -41,43 +41,43 @@ 
                 </strong></p>
               <?php } ?>
 
-              <?php if ( isset($speakers) && count($speakers) ) { ?>
+              <?php if (isset($speakers) && count($speakers)) { ?>
 
-                  <?php if ( !$wtt ) { ?>
+                  <?php if (!$wtt) { ?>
                     <ul class="search-result-display-options">
                         <li><?= gettext('Results grouped by person') ?></li>
                         <li>
-                          <?php if ( $house ==  HOUSE_TYPE_ROYAL) { ?>
+                          <?php if ($house == HOUSE_TYPE_ROYAL) { ?>
                             <?= gettext('Show All') ?>
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html') ?>"><?= gettext('Show All') ?></a>
                           <?php } ?>
                             |
-                          <?php if ( $house ==  HOUSE_TYPE_COMMONS) { ?>
+                          <?php if ($house == HOUSE_TYPE_COMMONS) { ?>
                             MPs only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', array('house'=>1)) ?>">MPs only</a>
                           <?php } ?>
                             |
-                          <?php if ( $house ==  HOUSE_TYPE_LORDS) { ?>
+                          <?php if ($house == HOUSE_TYPE_LORDS) { ?>
                             Peers only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', array('house'=>2)) ?>">Lords only</a>
                           <?php } ?>
                             |
-                          <?php if ( $house ==  HOUSE_TYPE_SCOTLAND) { ?>
+                          <?php if ($house == HOUSE_TYPE_SCOTLAND) { ?>
                             MSPs only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', array('house'=>4)) ?>">MSPs only</a>
                           <?php } ?>
                             |
-                          <?php if ( $house ==  HOUSE_TYPE_WALES) { ?>
+                          <?php if ($house == HOUSE_TYPE_WALES) { ?>
                             <?= gettext('MSs only') ?>
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', array('house'=>5)) ?>"><?= gettext('MSs only') ?></a>
                           <?php } ?>
                             |
-                          <?php if ( $house ==  HOUSE_TYPE_NI) { ?>
+                          <?php if ($house == HOUSE_TYPE_NI) { ?>
                             MLAs only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', array('house'=>HOUSE_TYPE_NI)) ?>">MLAs only</a>
@@ -98,25 +98,25 @@ 
                         </tr>
                     </thead>
                     <tbody>
-                      <?php foreach ( $speakers as $pid => $speaker ) { ?>
+                      <?php foreach ($speakers as $pid => $speaker) { ?>
 
-                        <?php if ( $wtt && $pid == 0 ) { continue; } // skip heading count for WTT lords list ?>
+                        <?php if ($wtt && $pid == 0) { continue; } // skip heading count for WTT lords list ?>
 
                         <tr>
                             <td><?= $speaker['count'] ?></td>
                             <td>
-                              <?php if ( $pid ) { ?>
-                                <?php if ( !$wtt || $speaker['left'] == '9999-12-31' ) { ?>
+                              <?php if ($pid) { ?>
+                                <?php if (!$wtt || $speaker['left'] == '9999-12-31') { ?>
                                   <a href="/search/?q=<?= _htmlentities($searchstring) ?>&amp;pid=<?= $pid ?><?= isset($wtt) && $speaker['left'] == '9999-12-31' ? '&amp;wtt=2' : '' ?>">
                                 <?php } ?>
                                 <?= isset($speaker['name']) ? $speaker['name'] : 'N/A' ?>
-                                <?php if ( !$wtt || $speaker['left'] == '9999-12-31' ) { ?>
+                                <?php if (!$wtt || $speaker['left'] == '9999-12-31') { ?>
                                   </a>
                                 <?php } ?>
-                                <?php if ( isset($speaker['party']) ) { ?>
+                                <?php if (isset($speaker['party'])) { ?>
                                   <span class="search-results-grouped__speaker-party">(<?= $speaker['party'] ?>)</span>
                                 <?php } ?>
-                                <?php if ( $house !=  HOUSE_TYPE_LORDS) { ?>
+                                <?php if ($house != HOUSE_TYPE_LORDS) { ?>
                                   <?= isset($speaker['office']) ? ' - ' . join('; ', $speaker['office']) : '' ?>
                                 <?php } ?>
                               <?php } else { // no $pid ?>
@@ -124,7 +124,7 @@ 
                               <?php } ?>
                             </td>
                             <td>
-                              <?php if ( format_date($speaker['pmindate'], 'M Y') == format_date($speaker['pmaxdate'], 'M Y') ) { ?>
+                              <?php if (format_date($speaker['pmindate'], 'M Y') == format_date($speaker['pmaxdate'], 'M Y')) { ?>
                                 <?= format_date($speaker['pmindate'], 'M Y') ?>
                               <?php } else { ?>
                                 <?= format_date($speaker['pmindate'], 'M Y') ?>&nbsp;&ndash;&nbsp;<?= format_date($speaker['pmaxdate'], 'M Y') ?>

www/docs/user/index.php

Indentation +3 added lines, -3 removed lines

@@ -107,10 +107,10 @@
 
 // if data has been submitted then handle that
 if (
-      get_http_var("submitted") == "true" && (
+        get_http_var("submitted") == "true" && (
         $this_page == 'useredit' || $this_page == 'otheruseredit' || $this_page == 'userjoin'
-      )
-   ) {
+        )
+    ) {
     // Put all the user-submitted data in an array.
     $data = $user->getUpdateDetails($this_page, $THEUSER);
     $data['ret'] = get_http_var("ret");

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
         // We need a user_id. So make sure that exists.
         // And make sure the user is allowed to do this!
         $template = 'user/form';
-        if (is_numeric( get_http_var("u") ) && $THEUSER->is_able_to("edituser")) {
+        if (is_numeric(get_http_var("u")) && $THEUSER->is_able_to("edituser")) {
 
             $data = $user->getUserDetails(get_http_var('u'));
             $data['showall'] = true;

classes/User.php

Spacing +11 added lines, -11 removed lines

@@ -32,10 +32,10 @@ 
         $data['url'] = $user->url();
         $data['email'] = $user->email();
         $data['optin'] = $user->optin() == true ? "Yes" : "No";
-        $data['postcode']	= $user->postcode();
+        $data['postcode'] = $user->postcode();
         $data['website']	= $user->url();
-        $data['registrationtime']	= $user->registrationtime();
-        $data['status']= $user->status();
+        $data['registrationtime'] = $user->registrationtime();
+        $data['status'] = $user->status();
         $data["deleted"] = $user->deleted();
         $data["confirmed"] = $user->confirmed();
         $data["status"] = $user->status();
@@ -242,10 +242,10 @@ 
         // Who are we updating? $THEUSER or someone else?
         if ($this_page == "otheruseredit") {
             $who = 'the user’s';
-            $success = $THEUSER->update_other_user ( $details );
+            $success = $THEUSER->update_other_user($details);
         } else {
             $who = 'your';
-            $success = $THEUSER->update_self ( $details );
+            $success = $THEUSER->update_self($details);
         }
 
 
@@ -277,12 +277,12 @@ 
         // If this goes well, the user will have their data
         // added to the database and a confirmation email
         // will be sent to them.
-        $success = $THEUSER->add ( $details );
+        $success = $THEUSER->add($details);
 
         $errors = array();
 
         if (!$success) {
-            $errors["db"] = "Sorry, we were unable to create an account for you. Please <a href=\"mailto:". str_replace('@', '&#64;', CONTACTEMAIL) . "\">let us know</a>. Thanks.";
+            $errors["db"] = "Sorry, we were unable to create an account for you. Please <a href=\"mailto:" . str_replace('@', '&#64;', CONTACTEMAIL) . "\">let us know</a>. Thanks.";
         }
 
         return $errors;
@@ -290,7 +290,7 @@ 
 
     public function getRep($cons_type, $mp_house) {
         global $THEUSER;
-        if ( !$THEUSER->has_postcode() ) {
+        if (!$THEUSER->has_postcode()) {
             return array();
         }
 
@@ -303,11 +303,11 @@ 
         // Scottish homepage
         try {
             $constituencies = \MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituencies($THEUSER->postcode());
-            if ( isset($constituencies[$cons_type]) ) {
+            if (isset($constituencies[$cons_type])) {
                 $constituency = $constituencies[$cons_type];
                 $MEMBER = new Member(array('constituency'=>$constituency, 'house'=> $mp_house));
             }
-        } catch ( MemberException $e ) {
+        } catch (MemberException $e) {
             return array();
         }
 
@@ -344,7 +344,7 @@ 
         $mreg = array();
         if ($THEUSER->isloggedin() && $THEUSER->postcode() != '' || $THEUSER->postcode_is_set()) {
             $reps = \MySociety\TheyWorkForYou\Member::getRegionalList($THEUSER->postcode, $mp_house, $cons_type);
-            foreach ( $reps as $rep ) {
+            foreach ($reps as $rep) {
                 $member = new \MySociety\TheyWorkForYou\Member(array('person_id' => $rep['person_id']));
                 $mreg[$rep['person_id']] = $this->constructMPData($member, $THEUSER, $mp_house);
             }

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(

classes/Topic.php

Spacing +3 added lines, -3 removed lines

@@ -53,7 +53,7 @@ 
 
     public function sctitle() {
         $title = $this->title;
-        if (strpos($title, 'The ') === 0 ) {
+        if (strpos($title, 'The ') === 0) {
             $title = lcfirst($title);
         }
 
@@ -242,7 +242,7 @@ 
             );
         } else {
             foreach ($sets as $set) {
-                if ($set == '' ) {
+                if ($set == '') {
                     continue;
                 }
                 $q = $this->db->query(
@@ -285,7 +285,7 @@ 
             );
         } else {
             foreach ($policies as $policy) {
-                if ($policy == '' ) {
+                if ($policy == '') {
                     continue;
                 }
                 $q = $this->db->query(

Indentation +19 added lines, -19 removed lines

@@ -33,7 +33,7 @@ 
         $this->db = new \ParlDB;
 
         if (is_null($data)) {
-          return;
+            return;
         }
 
         $this->id = $data['id'];
@@ -124,7 +124,7 @@ 
 
     private function _getContentIDs() {
         $q = $this->db->query(
-          "SELECT body, gid, ep.epobject_id FROM epobject ep
+            "SELECT body, gid, ep.epobject_id FROM epobject ep
            JOIN hansard h on ep.epobject_id = h.epobject_id
            JOIN topic_epobjects te on te.epobject_id = ep.epobject_id
            WHERE topic_key = :topic_key",
@@ -178,24 +178,24 @@ 
 
     public function addContent($gid) {
         $q = $this->db->query(
-          "SELECT epobject_id FROM hansard WHERE gid = :gid",
-          array(
+            "SELECT epobject_id FROM hansard WHERE gid = :gid",
+            array(
             ":gid" => $gid
-          )
+            )
         )->first();
 
         if (!$q) {
-          return false;
+            return false;
         }
 
         $epobject_id = $q['epobject_id'];
 
         $q = $this->db->query(
-          "INSERT INTO topic_epobjects (topic_key, epobject_id) VALUES (:topic, :ep_id)",
-          array(
+            "INSERT INTO topic_epobjects (topic_key, epobject_id) VALUES (:topic, :ep_id)",
+            array(
             ":topic" => $this->id,
             ":ep_id" => $epobject_id
-          )
+            )
         );
 
         return $q->success();
@@ -203,23 +203,23 @@ 
 
     public function deleteContent($id) {
         $q = $this->db->query(
-          "DELETE FROM topic_epobjects WHERE topic_key = :topic AND epobject_id = :ep_id",
-          array(
+            "DELETE FROM topic_epobjects WHERE topic_key = :topic AND epobject_id = :ep_id",
+            array(
             ":topic" => $this->id,
             ":ep_id" => $id
-          )
+            )
         );
 
         return $q->success();
     }
 
     public function getPolicySets() {
-      $q = $this->db->query(
+        $q = $this->db->query(
         "SELECT policyset FROM topic_policysets WHERE topic_key = :key",
         array(
-          ':key' => $this->id
+            ':key' => $this->id
         )
-      );
+        );
 
         $sets = array();
         foreach ($q as $row) {
@@ -256,12 +256,12 @@ 
     }
 
     public function getPolicies() {
-      $q = $this->db->query(
+        $q = $this->db->query(
         'SELECT policy_id FROM topic_policies WHERE topic_key = :key',
         array(
-          ':key' => $this->id
+            ':key' => $this->id
         )
-      );
+        );
 
         $policies = array();
         foreach ($q as $row) {
@@ -312,7 +312,7 @@ 
 
     public function save() {
         $q = $this->db->query(
-          "REPLACE INTO topics
+            "REPLACE INTO topics
           (id, title, slug, description, search_string, front_page, image)
           VALUES
           (:id, :title, :slug, :description, :search_string, :front_page, :image)",

www/docs/api/api_getHansard.php

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once INCLUDESPATH."easyparliament/member.php";
+include_once INCLUDESPATH . "easyparliament/member.php";
 
 function api_getHansard_front() {
 ?>
@@ -29,10 +29,10 @@ 
 }
 
 function api_getHansard_search($s) {
-    _api_getHansard_search( array(
+    _api_getHansard_search(array(
         's' => $s,
         'pid' => get_http_var('person')
-    ) );
+    ));
 }
 function api_getHansard_person($pid) {
     _api_getHansard_search(array(
@@ -41,7 +41,7 @@ 
 }
 
 function _api_getHansard_date($type, $d) {
-    $args = array ('date' => $d);
+    $args = array('date' => $d);
     $LIST = _api_getListObject($type);
     $LIST->display('date', $args, 'api');
 }
@@ -56,7 +56,7 @@ 
     $type = isset($array['type']) ? $array['type'] : '';
     $search = filter_user_input($search, 'strict');
     if ($pid) {
-        $search .= ($search?' ':'') . 'speaker:' . $pid;
+        $search .= ($search ? ' ' : '') . 'speaker:' . $pid;
     }
     if ($type) {
         $search .= " section:" . $type;
@@ -91,12 +91,12 @@ 
     }
 #    $query_desc_short = $SEARCHENGINE->query_description_short();
     $pagenum = get_http_var('page');
-    $args = array (
+    $args = array(
         's' => $search,
         'p' => $pagenum,
         'num' => get_http_var('num'),
         'pop' => 1,
-        'o' => ($o=='d' || $o=='r') ? $o : 'd',
+        'o' => ($o == 'd' || $o == 'r') ? $o : 'd',
     );
     $LIST = new HANSARDLIST();
     $data = $LIST->display('search', $args, 'none');

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

Braces +2 added lines, -1 removed lines

@@ -1,5 +1,6 @@
 <div class="debate-speech__division__your-mp">
-  <?php if ( !isset($main_vote_mp) || ! $main_vote_mp) { /* $main_vote_mp is true if an MP has been requested via the URL */ ?>
+  <?php if ( !isset($main_vote_mp) || ! $main_vote_mp) {
+/* $main_vote_mp is true if an MP has been requested via the URL */ ?>
     <div class="your-mp__header">
       <h3>How your <?= $division['members']['singular'] ?> voted</h3>
       <p>

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <div class="debate-speech__division__your-mp">
-  <?php if ( !isset($main_vote_mp) || ! $main_vote_mp) { /* $main_vote_mp is true if an MP has been requested via the URL */ ?>
+  <?php if (!isset($main_vote_mp) || !$main_vote_mp) { /* $main_vote_mp is true if an MP has been requested via the URL */ ?>
     <div class="your-mp__header">
       <h3>How your <?= $division['members']['singular'] ?> voted</h3>
       <p>
@@ -9,7 +9,7 @@ 
     </div>
   <?php } ?>
     <a href="<?= $data['mp_data']['mp_url'] ?>" class="your-mp__content">
-      <?php if ( isset($mp_vote) ) { ?>
+      <?php if (isset($mp_vote)) { ?>
         <span class="your-mp__vote your-mp__vote--<?= $mp_vote['vote'] ?>"><?php
           switch ($mp_vote['vote']) {
               case 'aye':
@@ -33,7 +33,7 @@ 
                   echo 'N/A';
           }
         ?></span>
-      <?php } else if ( isset($before_mp) || isset($after_mp) ) { ?>
+      <?php } else if (isset($before_mp) || isset($after_mp)) { ?>
         <span class="your-mp__vote">N/A</span>
       <?php } ?>
         <img class="your-mp__image" src="<?= $data['mp_data']['image'] ?>">
@@ -41,7 +41,7 @@ 
             <h2 class="people-list__person__name"><?= $data['mp_data']['name'] ?></h2>
             <p class="people-list__person__memberships">
                 <span class="people-list__person__constituency"><?= $data['mp_data']['constituency'] ?></span>
-                <span class="people-list__person__party <?= slugify( $data['mp_data']['party'] ) ?>"><?= $data['mp_data']['party'] ?></span>
+                <span class="people-list__person__party <?= slugify($data['mp_data']['party']) ?>"><?= $data['mp_data']['party'] ?></span>
             </p>
         </div>
     </a>

Indentation +15 added lines, -15 removed lines

@@ -11,28 +11,28 @@
     <a href="<?= $data['mp_data']['mp_url'] ?>" class="your-mp__content">
       <?php if ( isset($mp_vote) ) { ?>
         <span class="your-mp__vote your-mp__vote--<?= $mp_vote['vote'] ?>"><?php
-          switch ($mp_vote['vote']) {
-              case 'aye':
+            switch ($mp_vote['vote']) {
+                case 'aye':
                   echo 'Aye';
-                  break;
-              case 'no':
+                    break;
+                case 'no':
                   echo 'No';
-                  break;
-              case 'absent':
+                    break;
+                case 'absent':
                   echo 'Absent';
-                  break;
-              case 'both':
+                    break;
+                case 'both':
                   echo 'Abstain';
-                  break;
-              case 'tellaye':
+                    break;
+                case 'tellaye':
                   echo 'Aye (Teller)';
-                  break;
-              case 'tellno':
+                    break;
+                case 'tellno':
                   echo 'No (Teller)';
-                  break;
-              default:
+                    break;
+                default:
                   echo 'N/A';
-          }
+            }
         ?></span>
       <?php } else if ( isset($before_mp) || isset($after_mp) ) { ?>
         <span class="your-mp__vote">N/A</span>