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"><?= 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; ?>

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';

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

Braces +5 added lines, -2 removed lines

@@ -146,13 +146,16 @@
 
                         <?php endif; ?>
 
-                    <?php else: ?>
+                    <?php else {
+    : ?>
 
                         <div class="panel">
                             <p>This person has not voted on any of the key issues which we keep track of.</p>
                         </div>
 
-                    <?php endif; ?>
+                    <?php endif;
+}
+?>
 
                 <?php endif; ?>
                 <?php include('_covid19_panel.php'); ?>

Indentation +3 added lines, -3 removed lines

@@ -115,7 +115,7 @@ 
 
                         include '_vote_description.php';
 
-                      } ?>
+                        } ?>
                     </ul>
 
                     <?php } ?>
@@ -156,7 +156,7 @@ 
                                 $policy_group = $segment['key'];
 
                                 if (isset($policy_last_update[$policy_id]) && $policy_last_update[$policy_id] > $most_recent) {
-                                  $most_recent = $policy_last_update[$policy_id];
+                                    $most_recent = $policy_last_update[$policy_id];
                                 }
 
                                 if ( $key_vote['has_strong'] || $key_vote['position'] == 'has never voted on' ) {
@@ -198,7 +198,7 @@ 
 
                                 include '_vote_description.php';
 
-                              } ?>
+                                } ?>
                             </ul>
 
                             <div class="share-vote-descriptions">

Spacing +3 added lines, -3 removed lines

@@ -94,7 +94,7 @@ 
                         $policy_direction = $key_vote["person_position"];
                         $policy_group = "highlighted";
                         $party_score_difference = $key_vote["score_difference"];
-                        $party_position = $key_vote['party_position'] ;
+                        $party_position = $key_vote['party_position'];
                         $comparison_party = $data["comparison_party"];
                         $current_party_comparison = $data["current_party_comparison"];
                         $unslugified_comparison_party = ucwords(str_replace('-', ' ', $comparison_party));
@@ -159,7 +159,7 @@ 
                                   $most_recent = $policy_last_update[$policy_id];
                                 }
 
-                                if ( $key_vote['has_strong'] || $key_vote['position'] == 'has never voted on' ) {
+                                if ($key_vote['has_strong'] || $key_vote['position'] == 'has never voted on') {
                                     $description = ucfirst($key_vote['desc']);
                                 } else {
                                     $description = sprintf(
@@ -188,7 +188,7 @@ 
                                     $party_position = $diff['party_position'];
                                     $party_score_difference = $diff["score_difference"];
                                     if ($sorted_diffs[$policy_id]['score_difference'] > $min_diff_score && $party_member_count > 1) {
-                                        $party_voting_line = sprintf( 'Comparable %s MPs %s.', $unslugified_comparison_party, $diff['party_position']);
+                                        $party_voting_line = sprintf('Comparable %s MPs %s.', $unslugified_comparison_party, $diff['party_position']);
                                     }
                                 } else {
                                     $party_voting_line = null;

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

Indentation +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
                 <div class="row nested-row">
                     <div class="homepage-featured-content homepage-content-section">
                         <?php if ( $featured ) {
-                             include dirname(__FILE__) . "/../homepage/featured.php";
+                                include dirname(__FILE__) . "/../homepage/featured.php";
                         } ?>
                     </div>
                     <div class="homepage-create-alert homepage-content-section">

Spacing +4 added lines, -4 removed lines

@@ -11,10 +11,10 @@ 
                 </div>
                 <div class="row">
                     <div class="medium-9 columns">
-                    <?php if ( count($data['regional']) > 0 ) { ?>
+                    <?php if (count($data['regional']) > 0) { ?>
                         <ul class="homepage-rep-list">
                         <li>Your Regional MSPs:</li>
-                        <?php foreach ( $data['regional'] as $msp ) { ?>
+                        <?php foreach ($data['regional'] as $msp) { ?>
                             <li class="homepage-rep-list__rep"><a href="/msp/?p=<?= $msp['person_id'] ?>"><?= $msp['name'] ?></a></li>
                         <?php } ?>
                         </ul>
@@ -57,7 +57,7 @@ 
             <div class="panel panel--flushtop clearfix">
                 <div class="row nested-row">
                     <div class="homepage-featured-content homepage-content-section">
-                        <?php if ( $featured ) {
+                        <?php if ($featured) {
                              include dirname(__FILE__) . "/../homepage/featured.php";
                         } ?>
                     </div>
@@ -104,7 +104,7 @@ 
 
                         <h2>Recently in Parliament</h2>
                         <ul class="recently__list"><?php
-                            foreach ( $debates['recent'] as $recent ) {
+                            foreach ($debates['recent'] as $recent) {
                                 include dirname(__FILE__) . '/../homepage/recent-debates.php';
                             }
                         ?></ul>