mysociety / theyworkforyou

www/includes/test/utility_test.php

Indentation +2 added lines, -2 removed lines

@@ -12,11 +12,11 @@
 
 class UtilityTest extends UnitTestCase{
 
-  public function testVerpEnvelopeSenderCanCreateStandardSender() {
+    public function testVerpEnvelopeSenderCanCreateStandardSender() {
     $sender = twfy_verp_envelope_sender('aperson@a.nother.dom');
     $expected_sender = 'twfy+aperson=a.nother.dom@' + EMAILDOMAIN;
     $this->assertEqual($sender, $expected_sender, 'verp_envelope_sender can create a sender for a standard address');
-  }
+    }
 
 }
 

Spacing +3 added lines, -3 removed lines

@@ -3,18 +3,18 @@
  * SimpleTest tests for the functions in utility.php
  * $Id: utility_test.php,v 1.3 2009-06-25 12:23:58 louise Exp $
  */
-error_reporting (E_ALL);
+error_reporting(E_ALL);
 ini_set("display_errors", 1);
 include_once dirname(__FILE__) . '/../../../conf/general';
 include_once '../utility.php';
 include_once 'simpletest/unit_tester.php';
 include_once 'simpletest/reporter.php';
 
-class UtilityTest extends UnitTestCase{
+class UtilityTest extends UnitTestCase {
 
   public function testVerpEnvelopeSenderCanCreateStandardSender() {
     $sender = twfy_verp_envelope_sender('aperson@a.nother.dom');
-    $expected_sender = 'twfy+aperson=a.nother.dom@' + EMAILDOMAIN;
+    $expected_sender = 'twfy+aperson=a.nother.dom@' +EMAILDOMAIN;
     $this->assertEqual($sender, $expected_sender, 'verp_envelope_sender can create a sender for a standard address');
   }
 

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

Braces +5 added lines, -2 removed lines

@@ -110,13 +110,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; ?>
 

Indentation +2 added lines, -2 removed lines

@@ -76,7 +76,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' ) {
@@ -111,7 +111,7 @@ 
 
                                 include '_vote_description.php';
 
-                              } ?>
+                                } ?>
                             </ul>
 
                             <div class="share-vote-descriptions">

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,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(
@@ -101,7 +101,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 (%s).', $comparison_party, $diff['party_position'], $diff['party_voting_summary']);
+                                        $party_voting_line = sprintf('Comparable %s MPs %s (%s).', $comparison_party, $diff['party_position'], $diff['party_voting_summary']);
                                     }
                                 } else {
                                     $party_voting_line = null;

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

Braces +5 added lines, -2 removed lines

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

Indentation +5 added lines, -5 removed lines

@@ -83,7 +83,7 @@ 
 
                             include '_vote_description.php';
 
-                          } ?>
+                            } ?>
                         </ul>
 
                         <p>We have <b>lots more</b> plain English analysis of <?= $full_name ?>&rsquo;s voting record  on issues like health, welfare, taxation and more. Visit <a href="<?= $member_url ?>/votes"><?= $full_name ?>&rsquo;s full vote analysis page</a> for more.</p>
@@ -130,7 +130,7 @@ 
 
                             include '_vote_description.php';
 
-                          } ?>
+                            } ?>
                         </ul>
 
                         <p>We have <b>lots more</b> plain English analysis of <?= $full_name ?>&rsquo;s voting record on issues like health, welfare, taxation and more. Visit <a href="<?= $member_url ?>/votes"><?= $full_name ?>&rsquo;s full vote analysis page</a> for more.</p>
@@ -159,7 +159,7 @@ 
 
                             include '_vote_description.php';
 
-                          } ?>
+                            } ?>
                         </ul>
 
                         <p class="voting-information-provenance">
@@ -403,7 +403,7 @@ 
                         <a href="https://www.publicwhip.org.uk/mp.php?id=uk.org.publicwhip/member/<?= $member_id ?>&amp;showall=yes">Public Whip</a>.</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'])) { ?>
                         Profile photo:
@@ -413,7 +413,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 +8 added lines, -8 removed lines

@@ -62,7 +62,7 @@ 
                 </div>
               <?php endif; ?>
 
-                <?php if ( !$current_member[HOUSE_TYPE_COMMONS] ) { ?>
+                <?php if (!$current_member[HOUSE_TYPE_COMMONS]) { ?>
                     <?php if (count($policyPositions->positions) > 0) { ?>
                     <div class="panel">
                         <a name="votes"></a>
@@ -114,7 +114,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"];
                             $party_voting_line = sprintf("%s, %s", $party, $diff['party_voting_summary']);
@@ -136,9 +136,9 @@ 
 
                         <p>We have <b>lots more</b> plain English analysis of <?= $full_name ?>&rsquo;s voting record on issues like health, welfare, taxation and more. Visit <a href="<?= $member_url ?>/votes"><?= $full_name ?>&rsquo;s full vote analysis page</a> for more.</p>
 
-                    <?php elseif (count($policyPositions->positions) > 0 ): ?>
+                    <?php elseif (count($policyPositions->positions) > 0): ?>
                         <?php if (count($party_positions) && $party_member_count > 1) { ?>
-                            <?php if ($current_party_comparison <> $comparison_party){ ?> 
+                            <?php if ($current_party_comparison <> $comparison_party) { ?> 
                                 <p>
                                     <?= $full_name ?> is a <?= $party ?> MP, but has changed parties or become independent.
                                 </p>
@@ -180,7 +180,7 @@ 
                         </p>
 
                         <p>We have <b>lots more</b> plain English analysis of <?= $full_name ?>&rsquo;s voting record  on issues like health, welfare, taxation and more. Visit <a href="<?= $member_url ?>/votes"><?= $full_name ?>&rsquo;s full vote analysis page</a> for more.</p>
-                    <?php elseif (count($policyPositions->positions) == 0 ): ?>
+                    <?php elseif (count($policyPositions->positions) == 0): ?>
 
                         <p>No votes to display.</p>
 
@@ -414,10 +414,10 @@ 
                         of sources. Voting information from
                         <a href="https://www.publicwhip.org.uk/mp.php?id=uk.org.publicwhip/member/<?= $member_id ?>&amp;showall=yes">Public Whip</a>.</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'])) { ?>
                         Profile photo:
                         <a href="<?= $data['photo_attribution_link'] ?>"><?= $data['photo_attribution_text'] ?></a>
                       <?php } else { ?>

www/includes/easyparliament/templates/html/section/column.php

Indentation +2 added lines, -2 removed lines

@@ -32,8 +32,8 @@
         </div>
     </div>
   <?php } else {
-      $section = false; include '_section_content.php';
-  } ?>
+        $section = false; include '_section_content.php';
+    } ?>
 
 </div>
 

Spacing +2 added lines, -2 removed lines

@@ -19,11 +19,11 @@
 </div>
 <div class="full-page">
 
-  <?php if ( count($data['rows']) == 0 ) { ?>
+  <?php if (count($data['rows']) == 0) { ?>
     <div class="debate-speech">
         <div class="full-page__row">
             <div class="full-page__unit">
-                <?php if ( $current_assembly != 'uk-commons' && $current_assembly != 'uk-lords' ) { ?>
+                <?php if ($current_assembly != 'uk-commons' && $current_assembly != 'uk-lords') { ?>
                     We only have information about columns for debates in the House of Commons and the House of Lords.
                 <?php } else { ?>
                     We can't find anything in column <?= $column ?> on <?= $debate_day_human ?>.

www/includes/easyparliament/templates/html/section/day.php

Indentation +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
                       <?php } ?>
                     </a>
                   <?php }
-                  if ( isset($row['excerpt']) ) { ?>
+                    if ( isset($row['excerpt']) ) { ?>
                     <p class="business-list__excerpt">
                         <?= trim_characters($row['excerpt'], 0, 200 ) ?>
                     </p>

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

@@ -84,6 +84,6 @@
       <?php } ?>
     </div>
 
-    <?php $search_title = "Search $title"; include '_search.php'; ?>
+    <?php $search_title = "search $title"; include '_search.php'; ?>
 
 </div>

Spacing +14 added lines, -14 removed lines

@@ -6,32 +6,32 @@ 
                 <?= $parent_title ?>
             </h1>
             <p class="business-section__header__date">
-                <?= format_date( $info['date'], LONGERDATEFORMAT ) ?>
+                <?= format_date($info['date'], LONGERDATEFORMAT) ?>
             </p>
         </div>
-      <?php if ( isset($rows) ) { ?>
+      <?php if (isset($rows)) { ?>
         <div class="business-section__primary">
             <ul class="business-list">
               <?php
                 $prevlevel = '';
-                foreach ( $rows as $row ) { ?>
-                <?php if ( $row['htype'] == 10 ) {
-                    if ( $prevlevel == 'sub' ) { ?>
+                foreach ($rows as $row) { ?>
+                <?php if ($row['htype'] == 10) {
+                    if ($prevlevel == 'sub') { ?>
                     </ul>
                     </li>
-                    <?php } elseif ( $prevlevel == 'top' ) { ?>
+                    <?php } elseif ($prevlevel == 'top') { ?>
                     </li>
                     <?php } ?>
                     <li>
                 <?php } else {
-                    if ( $prevlevel == '' ) { ?>
+                    if ($prevlevel == '') { ?>
                     <li>
-                    <?php } elseif ( $prevlevel == 'top' ) { ?>
+                    <?php } elseif ($prevlevel == 'top') { ?>
                     <ul>
                     <li>
                     <?php } ?>
                 <?php } ?>
-                  <?php if ( isset($row['excerpt']) && strstr($row['excerpt'], "was asked&#8212;") ) { ?>
+                  <?php if (isset($row['excerpt']) && strstr($row['excerpt'], "was asked&#8212;")) { ?>
                     <div class="business-list__title">
                         <h3>
                             <?= $row['body'] ?>
@@ -42,26 +42,26 @@ 
                         <h3>
                             <?= $row['body'] ?>
                         </h3>
-                      <?php if ( isset($row['contentcount']) && $row['contentcount'] > 0 ) { ?>
+                      <?php if (isset($row['contentcount']) && $row['contentcount'] > 0) { ?>
                         <span class="business-list__meta">
                             <?= $row['contentcount'] == 1 ? '1 speech' : $row['contentcount'] . ' speeches' ?>
                         </span>
                       <?php } ?>
                     </a>
                   <?php }
-                  if ( isset($row['excerpt']) ) { ?>
+                  if (isset($row['excerpt'])) { ?>
                     <p class="business-list__excerpt">
-                        <?= trim_characters($row['excerpt'], 0, 200 ) ?>
+                        <?= trim_characters($row['excerpt'], 0, 200) ?>
                     </p>
                   <?php } ?>
-                <?php if ( $row['htype'] == 10 ) {
+                <?php if ($row['htype'] == 10) {
                     $prevlevel = 'top';
                 } else {
                     $prevlevel = 'sub'; ?>
                 </li>
                 <?php } ?>
               <?php } ?>
-                <?php if ( $prevlevel == 'sub' ) { ?>
+                <?php if ($prevlevel == 'sub') { ?>
                 </ul>
                 </li>
                 <?php } ?>

www/includes/easyparliament/templates/html/ni/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 MLAs 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 MLAs: </li>
-                        <?php foreach ( $data['regional'] as $mla ) { ?>
+                        <?php foreach ($data['regional'] as $mla) { ?>
                             <li class="homepage-rep-list__rep"><a href="/mla/?p=<?= $mla['person_id'] ?>"><?= $mla['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 in the Northern Ireland Assembly</h2>
                         <ul class="recently__list"><?php
-                            foreach ( $debates['recent'] as $recent ) {
+                            foreach ($debates['recent'] as $recent) {
                                 include dirname(__FILE__) . '/../homepage/recent-debates.php';
                             }
                         ?></ul>

www/includes/easyparliament/templates/html/topic/topic.php

Braces +3 added lines, -1 removed lines

@@ -58,10 +58,12 @@
                     to <a href="<?= $member_url ?>/votes">see all their votes</a>.
                 </p>
 
-              <?php else: ?>
+              <?php else {
+    : ?>
                 <ul class="vote-descriptions">
                   <?php
                   $policy_ids = array();
+}
 
                   foreach ($positions as $position) {
                       if (!in_array($position['policy_id'], $policy_ids)) {

Indentation +17 added lines, -17 removed lines

@@ -61,23 +61,23 @@
               <?php else: ?>
                 <ul class="vote-descriptions">
                   <?php
-                  $policy_ids = array();
-
-                  foreach ($positions as $position) {
-                      if (!in_array($position['policy_id'], $policy_ids)) {
-                          $description = ucfirst($position['desc']);
-                          $link = sprintf(
-                              '%s/divisions?policy=%s',
-                              $member_url,
-                              $position['policy_id']
-                          );
-                          $link_text = $position['position'] != 'has never voted on' ? 'Show votes' : 'Details';
-                          $key_vote = $position;
-                          include(dirname(__DIR__) . '/mp/_vote_description.php');
-
-                          $policy_ids[] = $position['policy_id'];
-                      }
-                  } ?>
+                    $policy_ids = array();
+
+                    foreach ($positions as $position) {
+                        if (!in_array($position['policy_id'], $policy_ids)) {
+                            $description = ucfirst($position['desc']);
+                            $link = sprintf(
+                                '%s/divisions?policy=%s',
+                                $member_url,
+                                $position['policy_id']
+                            );
+                            $link_text = $position['position'] != 'has never voted on' ? 'Show votes' : 'Details';
+                            $key_vote = $position;
+                            include(dirname(__DIR__) . '/mp/_vote_description.php');
+
+                            $policy_ids[] = $position['policy_id'];
+                        }
+                    } ?>
                 </ul>
 
               <?php endif; ?>

www/includes/easyparliament/templates/api/hansard_gid.php

Indentation +1 added lines, -1 removed lines

@@ -67,4 +67,4 @@
     api_output($out);
 } else {
     api_error('Nothing');
-   }
+    }

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 $out = array();
 if (isset ($data['rows'])) {
-    for ($i=0; $i<count($data['rows']); $i++) {
+    for ($i = 0; $i < count($data['rows']); $i++) {
         $row = $data['rows'][$i];
         if (count($row) == 0) {
             continue;

www/includes/easyparliament/templates/api/hansard_date.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 
 if (isset ($data['rows'])) {
     $out = array();
-    for ($i=0; $i<count($data['rows']); $i++) {
+    for ($i = 0; $i < count($data['rows']); $i++) {
         $row = $data['rows'][$i];
 
         if ($row['htype'] == '10' && isset($row['excerpt']) && strstr($row['excerpt'], "was asked&#8212;")) {
@@ -40,7 +40,7 @@ 
         if ($row['htype'] == '10') {
             $out[] = array('entry' => $entry, 'subs' => array());
         } else {
-            $out[sizeof($out)-1]['subs'][] = $entry;
+            $out[sizeof($out) - 1]['subs'][] = $entry;
         }
 
     }