mysociety / theyworkforyou

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

Indentation +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
         </div>
 
       <?php } else {
-      $pc_form = ($type == 'mlas' || $type == 'msps' || $type == 'mss');
+        $pc_form = ($type == 'mlas' || $type == 'msps' || $type == 'mss');
 ?>
 
         <form action="/<?= $pc_form ? 'postcode' : 'search' ?>/">

Spacing +15 added lines, -15 removed lines

@@ -28,7 +28,7 @@ 
                           <?= sprintf(gettext('Based on postcode <strong>%s</strong>'), $mp_data['postcode']) ?>
                           <a href="<?= $mp_data['change_url'] ?>"><?= gettext('(Change postcode)') ?></a>
                       </p>
-                    <?php if ( isset( $mp_data ) && $type != 'mlas' ) { ?>
+                    <?php if (isset($mp_data) && $type != 'mlas') { ?>
                       <h3><?php
                         if ($mp_data['former']) {
                             printf(gettext('Your former %s is'), $rep_name);
@@ -46,8 +46,8 @@ 
                         </p>
                     </a>
                     <?php }
-                    if ( isset($reps) ) {
-                        if ( isset($mp_data) && $type != 'mlas' ) { ?>
+                    if (isset($reps)) {
+                        if (isset($mp_data) && $type != 'mlas') { ?>
                     <div class="people-list__your-mp__replist-header">
                         <?php } ?>
                       <h3><?php
@@ -66,7 +66,7 @@ 
                         }
                         ?></h3>
                     </div>
-                        <?php foreach ( $reps as $rep ) { ?>
+                        <?php foreach ($reps as $rep) { ?>
                     <a href="<?= $rep['mp_url'] ?>" class="people-list__person">
                     <img class="people-list__person__image" src="<?= $rep['image'] ?>">
                         <h2 class="people-list__person__name"><?= $rep['name'] ?></h2>
@@ -89,7 +89,7 @@ 
             <div class="search-page__section search-page__section--search">
                 <div class="search-page__section__primary">
                     <p class="search-page-main-inputs">
-                    <?php if ( $type == 'peers' ) { ?>
+                    <?php if ($type == 'peers') { ?>
                         <label for="find-mp-by-name-or-postcode"><?= sprintf(gettext('Find %s by name:'), $rep_plural) ?></label>
                     <?php } elseif ($pc_form) { ?>
                         <label for="find-mp-by-name-or-postcode"><?= sprintf(gettext('Find your %s by postcode:'), $rep_name) ?></label>
@@ -137,12 +137,12 @@ 
             <div class="search-page__section__primary">
             <h2><?= sprintf(gettext('All %s'), $rep_plural) ?></h2>
 
-                <?php if ( $type != 'peers' ) { ?>
+                <?php if ($type != 'peers') { ?>
                 <ul class="search-result-display-options">
-                    <?php if ( $order == 'given_name' ) { ?>
+                    <?php if ($order == 'given_name') { ?>
                     <li><?= gettext('<strong>Sorted by</strong> First name') ?></li>
                     <li><?= gettext('Sort by') ?> <a href="<?= $urls['by_last'] ?>"><?= gettext('Last name') ?></a> / <a href="<?= $urls['by_party'] ?>"><?= gettext('Party') ?></a></li>
-                    <?php } else if ( $order == 'party' ) { ?>
+                    <?php } else if ($order == 'party') { ?>
                     <li><?= gettext('<strong>Sorted by</strong> Party') ?></li>
                     <li><?= gettext('Sort by') ?> <a href="<?= $urls['by_first'] ?>"><?= gettext('First name') ?></a> / <a href="<?= $urls['by_last'] ?>"><?= gettext('Last name') ?></a></li>
                     <?php } else { ?>
@@ -152,7 +152,7 @@ 
                 </ul>
                 <?php } else { ?>
                 <ul class="search-result-display-options">
-                    <?php if ( $order == 'party' ) { ?>
+                    <?php if ($order == 'party') { ?>
                     <li><?= gettext('<strong>Sorted by</strong> Party') ?></li>
                     <li>Sort by <a href="<?= $urls['by_name'] ?>"><?= gettext('Name') ?></a></li>
                     <?php } else { ?>
@@ -202,10 +202,10 @@ 
                     }
                 }
                 $initial_link = '';
-                foreach ( $data as $person ) {
+                foreach ($data as $person) {
                     if ($order != 'party') {
-                        $initial = substr( strtoupper($person[$a_to_z_key]), 0, 1);
-                        if ( $initial != $current_initial ) {
+                        $initial = substr(strtoupper($person[$a_to_z_key]), 0, 1);
+                        if ($initial != $current_initial) {
                             $current_initial = $initial;
                             $initial_link = "name=\"$initial\" ";
                         } else {
@@ -219,7 +219,7 @@ 
                 </noscript>
                         <h2 class="people-list__person__name"><?= ucfirst($person['name']) ?></h2>
                         <p class="people-list__person__memberships">
-                        <?php if ( $person['constituency'] ) { ?>
+                        <?php if ($person['constituency']) { ?>
                         <span class="people-list__person__constituency"><?= $person['constituency'] ?></span>
                         <?php } ?>
                         <span class="people-list__person__party <?= slugify($person['party']) ?>"><?= $person['party'] ?></span>
@@ -237,7 +237,7 @@ 
                 <a href="<?= $urls['by_csv'] ?>"><?= gettext('Download this list as a CSV') ?></a>
                     <?= gettext('suitable for Excel') ?>
                 </p>
-                <?php if ( $type == 'mps' ) { ?>
+                <?php if ($type == 'mps') { ?>
                 <style>
                 .js #past-list-dates { display: none; }
                 </style>
@@ -282,7 +282,7 @@ 
                     </p>
                 </form>
 
-                <?php } else if ( $type == 'msps' ) { ?>
+                <?php } else if ($type == 'msps') { ?>
                     <p class="past-list-dates" id="past-list-dates">
                         <a href="<?= $urls['plain'] ?>?date=2011-05-05">MSPs at 2011 election</a>
                         <a href="<?= $urls['plain'] ?>?date=2007-05-03">MSPs at 2007 election</a>

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"><?= gettext('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/user/index.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 
           <div class="row">
             <span class="label"><?= gettext('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>
 
           <?php if ($facebook_user) { ?>

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

Braces +5 added lines, -2 removed lines

@@ -217,11 +217,14 @@
                         <?= $recent_appearances['additional_links'] ?>
                         <?php endif; ?>
 
-                    <?php else: ?>
+                    <?php else {
+    : ?>
 
                         <p><?=gettext('No recent appearances to display.') ?></p>
 
-                    <?php endif; ?>
+                    <?php endif;
+}
+?>
 
                 </div>
                 <?php endif; ?>

Indentation +2 added lines, -2 removed lines

@@ -279,7 +279,7 @@ 
                         printf(gettext('Voting information from <a href="%s">Public Whip</a>.'), "https://www.publicwhip.org.uk/mp.php?id=uk.org.publicwhip/member/ $member_id&amp;showall=yes"); ?></p>
 
                   <?php if($image && $image['exists']) {
-                      if(isset($data['photo_attribution_text'])) { ?>
+                        if(isset($data['photo_attribution_text'])) { ?>
                     <p>
                       <?php if(isset($data['photo_attribution_link'])) { ?>
                         <?= gettext('Profile photo:') ?>
@@ -289,7 +289,7 @@ 
                       <?php } ?>
                     </p>
                   <?php }
-                  } else { ?>
+                    } else { ?>
                     <p>
                         We&rsquo;re missing a photo of <?= $full_name ?>.
                         If you have a photo <em>that you can release under

Spacing +3 added lines, -3 removed lines

@@ -278,10 +278,10 @@
                     <p><?php print gettext('This data was produced by TheyWorkForYou from a variety of sources.') . ' ';
                         printf(gettext('Voting information from <a href="%s">Public Whip</a>.'), "https://www.publicwhip.org.uk/mp.php?id=uk.org.publicwhip/member/ $member_id&amp;showall=yes"); ?></p>
 
-                  <?php if($image && $image['exists']) {
-                      if(isset($data['photo_attribution_text'])) { ?>
+                  <?php if ($image && $image['exists']) {
+                      if (isset($data['photo_attribution_text'])) { ?>
                     <p>
-                      <?php if(isset($data['photo_attribution_link'])) { ?>
+                      <?php if (isset($data['photo_attribution_link'])) { ?>
                         <?= gettext('Profile photo:') ?>
                         <a href="<?= $data['photo_attribution_link'] ?>"><?= $data['photo_attribution_text'] ?></a>
                       <?php } else { ?>

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

Spacing +2 added lines, -2 removed lines

@@ -3,9 +3,9 @@
 
     <p><?= gettext('For an explanation of the vote descriptions please see our page about <a href="/voting-information">voting information on TheyWorkForYou</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'])) { ?>
         <?= gettext('Profile photo:') ?>
         <a href="<?= $data['photo_attribution_link'] ?>"><?= $data['photo_attribution_text'] ?></a>
       <?php } else { ?>

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

Indentation +4 added lines, -4 removed lines

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

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

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (!function_exists('print_voter')) {
-  function print_voter($vote){
+  function print_voter($vote) {
     echo sprintf(
       '<li><a href="/mp/?p=%d">%s</a> <span class="party">%s%s</span></li>',
       $vote['person_id'],
@@ -28,7 +28,7 @@ 
     <?php if (count($tellers) > 0) { ?>
       <h4><?= gettext('Tellers') ?></h4>
       <ul class="division-names">
-        <?php foreach($tellers as $teller) {
+        <?php foreach ($tellers as $teller) {
           print_voter($teller);
         } ?>
       </p>

Indentation +12 added lines, -12 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 
 if (!function_exists('print_voter')) {
-  function print_voter($vote){
+    function print_voter($vote){
     echo sprintf(
-      '<li><a href="/mp/?p=%d">%s</a> <span class="party">%s%s</span></li>',
-      $vote['person_id'],
-      $vote['name'],
-      gettext($vote['party']),
-      $vote['proxy'] ? " (proxy vote cast by $vote[proxy])" : ''
+        '<li><a href="/mp/?p=%d">%s</a> <span class="party">%s%s</span></li>',
+        $vote['person_id'],
+        $vote['name'],
+        gettext($vote['party']),
+        $vote['proxy'] ? " (proxy vote cast by $vote[proxy])" : ''
     );
-  }
+    }
 }
 
 if (count($votes) > 0) { ?>
@@ -18,18 +18,18 @@ 
       <?php $tellers = array(); ?>
       <ul class="division-names js-vote-accordion" data-show-all="<?= gettext('Show All') ?>">
         <?php foreach ($votes as $vote) {
-          if ($vote['teller']) {
-              $tellers[] = $vote;
-          } else {
+            if ($vote['teller']) {
+                $tellers[] = $vote;
+            } else {
             print_voter($vote);
-          }
+            }
         } ?>
       </ul>
     <?php if (count($tellers) > 0) { ?>
       <h4><?= gettext('Tellers') ?></h4>
       <ul class="division-names">
         <?php foreach($tellers as $teller) {
-          print_voter($teller);
+            print_voter($teller);
         } ?>
       </p>
     <?php } ?>

classes/AlertView/Standard.php

Spacing +15 added lines, -15 removed lines

@@ -180,7 +180,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
                 }
             }
@@ -200,17 +200,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
@@ -235,7 +235,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 {
@@ -262,11 +262,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);
@@ -275,29 +275,29 @@ 
                 $this->data['member_displaysearch'] = $alertsearch_display;
                 $this->data['member'] = $MEMBER;
 
-                if ( isset($this->data['mistakes']['postcode_and']) ) {
+                if (isset($this->data['mistakes']['postcode_and'])) {
                     $constituencies = \MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituencies($postcode);
-                    if ( isset($constituencies['SPC']) ) {
+                    if (isset($constituencies['SPC'])) {
                         $MEMBER = new \MEMBER(array('constituency' => $constituencies['SPC'], 'house' => HOUSE_TYPE_SCOTLAND));
                         $this->data['scottish_alertsearch'] = str_replace("$postcode", "speaker:" . $MEMBER->person_id, $tidy_alertsearch);
                         $this->data['scottish_member'] = $MEMBER;
-                    } elseif ( isset($constituencies['WAC']) ) {
+                    } elseif (isset($constituencies['WAC'])) {
                         $MEMBER = new \MEMBER(array('constituency' => $constituencies['WAC'], 'house' => HOUSE_TYPE_WALES));
                         $this->data['welsh_alertsearch'] = str_replace("$postcode", "speaker:" . $MEMBER->person_id, $tidy_alertsearch);
                         $this->data['welsh_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/SectionView/SeneddView.php

Spacing +8 added lines, -8 removed lines

@@ -40,7 +40,7 @@ 
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'wales' )
+            array('section' => 'wales')
         );
     }
 
@@ -59,23 +59,23 @@ 
 
         $debates = $DEBATELIST->display('recent_debates', array('days' => 30, 'num' => 6), 'none');
         $MOREURL = new \MySociety\TheyWorkForYou\Url('senedddebatesfront');
-        $MOREURL->insert( array( 'more' => 1 ) );
+        $MOREURL->insert(array('more' => 1));
 
         // this makes sure that we don't repeat this debate in the list below
         $random_debate = null;
-        if ( isset($debates['data']) && count($debates['data']) ) {
+        if (isset($debates['data']) && count($debates['data'])) {
             $random_debate = $debates['data'][0];
         }
 
         $recent = array();
-        if ( isset($debates['data']) && count($debates['data']) ) {
+        if (isset($debates['data']) && count($debates['data'])) {
             // at the start of a session there may be less than 6
             // debates
             $max = 6;
-            if ( count($debates['data']) < 6 ) {
+            if (count($debates['data']) < 6) {
                 $max = count($debates['data']);
             }
-            for ( $i = 1; $i < $max; $i++ ) {
+            for ($i = 1; $i < $max; $i++) {
                 $debate = $debates['data'][$i];
                 $debate['desc'] = "Senedd";
                 $debate['more_url'] = $MOREURL->generate();
@@ -84,7 +84,7 @@ 
         }
 
         $featured = array();
-        if ( $random_debate ) {
+        if ($random_debate) {
             $featured = $random_debate;
             $featured['more_url'] = $MOREURL->generate();
             $featured['desc'] = 'Senedd';
@@ -93,7 +93,7 @@ 
         }
 
         $data['featured'] = $featured;
-        $data['debates'] = array( 'recent' => $recent);
+        $data['debates'] = array('recent' => $recent);
 
         $data['regional'] = $this->getMSList();
         $data['template'] = 'senedd/index';