mysociety / theyworkforyou

www/docs/topic/topic.php

Spacing +3 added lines, -3 removed lines

@@ -54,12 +54,12 @@ 
                 $pc = get_http_var('pc');
                 $pc = preg_replace('#[^a-z0-9]#i', '', $pc);
                 if (validate_postcode($pc)) {
-                    twfy_debug ('MP', "MP lookup by postcode");
+                    twfy_debug('MP', "MP lookup by postcode");
                     $constituency = strtolower(Utility\Postcode::postcodeToConstituency($pc));
                     if ($constituency == "connection_timed_out") {
                         throw new \Exception('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");
+                        twfy_debug('MP', "Can't display an MP, as submitted postcode didn't match a constituency");
                         throw new \Exception('Sorry, ' . _htmlentities($pc) . ' isn’t a known postcode');
                     } else {
                         // Generate the Member object
@@ -70,7 +70,7 @@ 
                         }
                     }
                 } else {
-                    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.");
                     throw new \Exception('Sorry, ' . _htmlentities($pc) . ' isn’t a valid postcode');
                 }
             } catch (\Exception $e) {

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

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
     $stances = array();
 
     foreach ($segment['votes']->positions as $key_vote) {
-        if ( $key_vote['has_strong'] || $key_vote['position'] == 'has never voted on' ) {
+        if ($key_vote['has_strong'] || $key_vote['position'] == 'has never voted on') {
             $stance = strip_tags($key_vote['desc'], '<b>');
             $stance = ucfirst($stance);
             $stance = preg_replace('#</?b[^>]*>#i', '*', $stance);

Indentation +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 
     echo '<?xml version="1.0" encoding="utf-8"?>';
 
- ?>
+    ?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg width="1000" height="500" viewBox="0 0 1000 500" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" font-family="Source Sans Pro">
 

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

@@ -44,7 +44,7 @@
     <text font-size="24" font-weight="normal" fill="#000000">
         <?php foreach ($lines as $j=>$line) { ?>
             <tspan x="40" y="<?= $stance_y + $stance_padding_top + $stance_baseline_offset + ($stance_lineheight * $j) ?>"><?php
-                if (strpos($line, '*') !== False) {
+                if (strpos($line, '*') !== false) {
                     echo preg_replace(
                         '#(?:^|[*])([^\r\n *][^*\n]*[^\r\n *])(?:$|[*])#i',
                         '$1',

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

Indentation +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
                 <div class="row nested-row">
                     <div class="homepage-in-the-news 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

@@ -4,10 +4,10 @@ 
             <div class="hero__mp-search__wrap">
                 <h1>Do your Assembly Members represent you?</h1>
                 <div class="row collapse">
-                    <?php if ( count($data['regional']) > 0 ) { ?>
+                    <?php if (count($data['regional']) > 0) { ?>
                         <ul class="homepage-rep-list">
                             <li>Your Assembly Memberss: </li>
-                        <?php foreach ( $data['regional'] as $member ) { ?>
+                        <?php foreach ($data['regional'] as $member) { ?>
                             <li class="homepage-rep-list__rep"><a href="/london-assembly-member/?p=<?= $member['person_id'] ?>"><?= $member['name'] ?></a></li>
                         <?php } ?>
                         </ul>
@@ -40,7 +40,7 @@ 
             <div class="panel panel--flushtop clearfix">
                 <div class="row nested-row">
                     <div class="homepage-in-the-news homepage-content-section">
-                        <?php if ( $featured ) {
+                        <?php if ($featured) {
                              include dirname(__FILE__) . "/../homepage/featured.php";
                         } ?>
                     </div>
@@ -85,7 +85,7 @@ 
                     <div class="homepage-recently homepage-content-section">
                         <h2>Recently answered questions to the Mayor of London</h2>
                         <ul class="recently__list"><?php
-                            foreach ( $debates['recent'] as $recent ) {
+                            foreach ($debates['recent'] as $recent) {
                                 include dirname(__FILE__) . '/../homepage/recent-debates.php';
                             }
                         ?></ul>

classes/Utility/House.php

Spacing +5 added lines, -5 removed lines

@@ -50,35 +50,35 @@
 
     public static function getCountryDetails($house) {
         $details = array(
-            HOUSE_TYPE_COMMONS => array (
+            HOUSE_TYPE_COMMONS => array(
                 'country' => 'UK',
                 'assembly' => 'uk-commons',
                 'location' => '– in the House of Commons',
                 'cons_type' => 'WMC',
                 'assembly_name' => 'House of Commons',
             ),
-            HOUSE_TYPE_NI => array (
+            HOUSE_TYPE_NI => array(
                 'country' => 'NORTHERN IRELAND',
                 'assembly' => 'ni',
                 'location' => '– in the Northern Ireland Assembly',
                 'cons_type' => 'NIE',
                 'assembly_name' => 'Northern Ireland Assembly',
             ),
-            HOUSE_TYPE_SCOTLAND => array (
+            HOUSE_TYPE_SCOTLAND => array(
                 'country' => 'SCOTLAND',
                 'assembly' => 'scotland',
                 'location' => '– in the Scottish Parliament',
                 'cons_type' => 'SPC',
                 'assembly_name' => 'Scottish Parliament',
             ),
-            HOUSE_TYPE_LORDS => array (
+            HOUSE_TYPE_LORDS => array(
                 'country' => 'UK',
                 'assembly' => 'uk-lords',
                 'location' => '– in the House of Lords',
                 'cons_type' => '',
                 'assembly_name' => 'House of Lords',
             ),
-            HOUSE_TYPE_LONDON_ASSEMBLY => array (
+            HOUSE_TYPE_LONDON_ASSEMBLY => array(
                 'country' => 'UK',
                 'assembly' => 'london-assembly',
                 'location' => '– in the London Assembly',

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

Spacing +2 added lines, -2 removed lines

@@ -5,9 +5,9 @@
     <p>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'])) { ?>
         Profile photo:
         <a href="<?= $data['photo_attribution_link'] ?>"><?= $data['photo_attribution_text'] ?></a>
       <?php } else { ?>

classes/SectionView/LondonView.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'lmqs', 'title' => 'Mayoral Questions' )
+            array('section' => 'lmqs', 'title' => 'Mayoral Questions')
         );
     }
 }

www/docs/api/key.php

Braces +2 added lines, -1 removed lines

@@ -155,7 +155,8 @@
     # The subscription has been created, but it is possible that the
     # payment failed (card error), or we need to do 3DS or similar
     $pi = $invoice->payment_intent;
-    if (!$pi) { # Free plan
+    if (!$pi) {
+# Free plan
         return;
     }
     if ($pi->status == 'requires_payment_method' || $pi->status == 'requires_source') {

Spacing +2 added lines, -2 removed lines

@@ -40,9 +40,9 @@
 
             try {
                 $invoice = $sub->latest_invoice;
-                $invoice->pay([ 'expand' => [ 'payment_intent' ] ]);
+                $invoice->pay(['expand' => ['payment_intent']]);
             } catch (\Stripe\Error\Card $e) {
-                $invoice = \Stripe\Invoice::retrieve($sub->latest_invoice, ['expand' => [ 'payment_intent'] ]);
+                $invoice = \Stripe\Invoice::retrieve($sub->latest_invoice, ['expand' => ['payment_intent']]);
             }
         } else {
             $invoice = $sub->latest_invoice;

www/docs/api/hook.php

Spacing +2 added lines, -2 removed lines

@@ -53,10 +53,10 @@
         # Update the invoice's PaymentIntent and Charge to say it came from TWFY (for CSV export)
         # Both are shown in the Stripe admin, annoyingly
         if ($obj->payment_intent) {
-            \Stripe\PaymentIntent::update($obj->payment_intent, [ 'description' => 'TheyWorkForYou' ]);
+            \Stripe\PaymentIntent::update($obj->payment_intent, ['description' => 'TheyWorkForYou']);
         }
         if ($obj->charge) {
-            \Stripe\Charge::update($obj->charge, [ 'description' => 'TheyWorkForYou' ]);
+            \Stripe\Charge::update($obj->charge, ['description' => 'TheyWorkForYou']);
         }
     } catch (\Stripe\Error\Base $e) {
     }

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

Indentation +9 added lines, -9 removed lines

@@ -128,24 +128,24 @@ 
       <?php } ?>
 
       <?php
-          if(
-              (isset($members) && count($members)) ||
+            if(
+                (isset($members) && count($members)) ||
               (isset($constituencies) && count($constituencies) > 0) ||
               ($alertsearch)
-          ) {
-              /* We need to disambiguate the user's instructions */
-              $member_options = false;
-      ?>
+            ) {
+                /* We need to disambiguate the user's instructions */
+                $member_options = false;
+        ?>
         <div class="alert-section alert-section--disambiguation">
             <div class="alert-section__primary">
 
               <?php if (isset($members) && count($members)) {
-                  $member_options = true; ?>
+                    $member_options = true; ?>
                 <h3>Sign up for alerts when people matching <i><?= _htmlspecialchars($alertsearch) ?></i> speaks</h3>
                 <ul>
                   <?php
                     foreach ($members as $row) {
-                  ?>
+                    ?>
                     <li>
                         <form action="<?= $actionurl ?>" method="post">
                             <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>">
@@ -165,7 +165,7 @@ 
               <?php } ?>
 
               <?php if (isset($constituencies) && count($constituencies) > 0) {
-                  $member_options = true; ?>
+                    $member_options = true; ?>
                 <h3>Sign up for alerts when MPs for constituencies matching <i><?= _htmlspecialchars($alertsearch) ?></i> speaks</h3>
                 <ul>
                 <?php foreach ($constituencies as $constituency => $member) { ?>

Spacing +20 added lines, -20 removed lines

@@ -1,7 +1,7 @@ 
 <div class="full-page">
     <div class="full-page__row">
 
-      <?php if ( $message ) { ?>
+      <?php if ($message) { ?>
         <div class="alert-section alert-section--feedback">
             <div class="alert-section__primary">
                 <h3><?= $message['title'] ?></h3>
@@ -12,10 +12,10 @@ 
         </div>
       <?php } ?>
 
-      <?php if ( $results ) { ?>
+      <?php if ($results) { ?>
         <div class="alert-section alert-section--feedback">
             <div class="alert-section__primary">
-              <?php if ( $results == 'alert-confirmed' ) { ?>
+              <?php if ($results == 'alert-confirmed') { ?>
                 <h3>Your alert has been confirmed</h3>
                 <p>
                     You will now receive email alerts for the following criteria:
@@ -45,32 +45,32 @@ 
                 </div>
                 </noscript>
 
-              <?php } elseif ( $results == 'alert-suspended' ) { ?>
+              <?php } elseif ($results == 'alert-suspended') { ?>
                 <h3>Alert suspended</h3>
                 <p>
                     You can reactivate the alert at any time, from the sidebar below.
                 </p>
 
-              <?php } elseif ( $results == 'alert-resumed' ) { ?>
+              <?php } elseif ($results == 'alert-resumed') { ?>
                 <h3>Alert resumed</h3>
                 <p>
                     You will now receive email alerts on any day when there
                     are entries in Hansard that match your criteria.
                 </p>
 
-              <?php } elseif ( $results == 'alert-deleted' ) { ?>
+              <?php } elseif ($results == 'alert-deleted') { ?>
                 <h3>Alert deleted</h3>
                 <p>
                     You will no longer receive this alert.
                 </p>
 
-              <?php } elseif ( $results == 'all-alerts-deleted' ) { ?>
+              <?php } elseif ($results == 'all-alerts-deleted') { ?>
                 <h3>All alerts deleted</h3>
                 <p>
                     You will no longer receive any alerts.
                 </p>
 
-              <?php } elseif ( $results == 'alert-fail' ) { ?>
+              <?php } elseif ($results == 'alert-fail') { ?>
                 <h3>Hmmm, something&rsquo;s not right</h3>
                 <p>
                     The link you followed to reach this page appears to be incomplete.
@@ -86,14 +86,14 @@ 
                     and let us know, and we'll help out!
                 </p>
 
-              <?php } elseif ( $results == 'alert-added' ) { ?>
+              <?php } elseif ($results == 'alert-added') { ?>
                 <h3>Your alert has been added</h3>
                 <p>
                     You will now receive email alerts on any day when
                     <?= _htmlspecialchars($criteria) ?> in parliament.
                 </p>
 
-              <?php } elseif ( $results == 'alert-confirmation' ) { ?>
+              <?php } elseif ($results == 'alert-confirmation') { ?>
                 <h3>We&rsquo;re nearly done&hellip;</h3>
                 <p>
                     You should receive an email shortly which will contain a link.
@@ -101,20 +101,20 @@ 
                     and receive future alerts. Thanks.
                 </p>
 
-              <?php } elseif ( $results == 'alert-exists' ) { ?>
+              <?php } elseif ($results == 'alert-exists') { ?>
                 <h3>You&rsquo;re already subscribed to that!</h3>
                 <p>
                     It&rsquo;s good to know you&rsquo;re keen though.
                 </p>
 
-              <?php } elseif ( $results == 'alert-already-signed' ) { ?>
+              <?php } elseif ($results == 'alert-already-signed') { ?>
                 <h3>We&rsquo;re nearly done</h3>
                 <p>
                     You should receive an email shortly which will contain a link.
                     You will need to follow that link to confirm your email address to receive the alert. Thanks.
                 </p>
 
-              <?php } elseif ( $results == 'alert-fail' ) { ?>
+              <?php } elseif ($results == 'alert-fail') { ?>
                 <h3>Alert could not be created</h3>
                 <p>
                     Sorry, we were unable to create that alert. Please
@@ -128,7 +128,7 @@ 
       <?php } ?>
 
       <?php
-          if(
+          if (
               (isset($members) && count($members)) ||
               (isset($constituencies) && count($constituencies) > 0) ||
               ($alertsearch)
@@ -152,7 +152,7 @@ 
                             <input type="hidden" name="email" value="<?= _htmlspecialchars($email) ?>">
                             <input type="hidden" name="pid" value="<?= $row['person_id'] ?>">
                             When
-                            <?= member_full_name($row['house'], $row['title'], $row['given_name'], $row['family_name'], $row['lordofname'] ) ?>
+                            <?= member_full_name($row['house'], $row['title'], $row['given_name'], $row['family_name'], $row['lordofname']) ?>
                             <?php if ($row['constituency']) { ?>
                                 (<?= $row['constituency'] ?>)
                             <?php } ?>
@@ -183,7 +183,7 @@ 
               <?php } ?>
 
               <?php if ($alertsearch) {
-                if ( $member_options ) { ?>
+                if ($member_options) { ?>
                 <h3>Sign up for alerts for topics</h3>
                 <?php } else { ?>
                 <h3>Great! Can you just confirm what you mean?</h3>
@@ -197,7 +197,7 @@ 
                             Receive alerts when <?= _htmlspecialchars($alertsearch_pretty) ?>
                             <input type="submit" class="button small" value="Subscribe">
                         </form>
-                      <?php if ( isset($mistakes['multiple']) ) { ?>
+                      <?php if (isset($mistakes['multiple'])) { ?>
                         <em class="error">
                             You have used a comma in your search term &ndash;
                             are you sure this is what you want? You cannot
@@ -206,7 +206,7 @@ 
                             for each individual term.
                         </em>
                       <?php } ?>
-                      <?php if ( isset($mistakes['postcode_and']) ) { ?>
+                      <?php if (isset($mistakes['postcode_and'])) { ?>
                         <em class="error">
                             You have used a postcode and something else in your
                             search term &ndash; are you sure this is what you
@@ -255,11 +255,11 @@ 
             <div class="alert-section__secondary">
               <?php if ($email_verified) { ?>
 
-                  <?php if ( $alerts ) { ?>
+                  <?php if ($alerts) { ?>
                     <?php include('_list.php'); ?>
                   <?php } ?>
 
-                  <?php if ( $current_mp ) { ?>
+                  <?php if ($current_mp) { ?>
                     <h3>Your MP alert</h3>
                     <ul class="alerts-manage__list">
                         <li>