mysociety / theyworkforyou

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

Indentation +33 added lines, -33 removed lines

@@ -124,32 +124,32 @@ 
                 <?php
 
                 $speaker = $speech['speaker'];
-              $speaker_name = ucfirst($speaker['name']);
-
-              [$image_url, $size] = MySociety\TheyWorkForYou\Utility\Member::findMemberImage(
-                  $speaker['person_id'],
-                  true,
-                  $data['info']['major'] == 101 ? 'lord' : 'general'
-              );
-
-              if (count($speaker['office'])) {
-                  $desc = [];
-                  foreach ($speaker['office'] as $off) {
-                      $desc[] = $off['pretty'];
-                  }
-                  $speaker_position = join(', ', $desc);
-              } else {
-                  $speaker_position = _htmlentities($speaker['party']);
-                  if ($speaker['house'] == 1
+                $speaker_name = ucfirst($speaker['name']);
+
+                [$image_url, $size] = MySociety\TheyWorkForYou\Utility\Member::findMemberImage(
+                    $speaker['person_id'],
+                    true,
+                    $data['info']['major'] == 101 ? 'lord' : 'general'
+                );
+
+                if (count($speaker['office'])) {
+                    $desc = [];
+                    foreach ($speaker['office'] as $off) {
+                        $desc[] = $off['pretty'];
+                    }
+                    $speaker_position = join(', ', $desc);
+                } else {
+                    $speaker_position = _htmlentities($speaker['party']);
+                    if ($speaker['house'] == 1
                       && $speaker['party'] != 'Speaker'
                       && $speaker['party'] != 'Deputy Speaker'
                       && $speaker['constituency']
-                  ) {
-                      $speaker_position .= ', ' . $speaker['constituency'];
-                  }
-              }
+                    ) {
+                        $speaker_position .= ', ' . $speaker['constituency'];
+                    }
+                }
 
-              ?>
+                ?>
                 <a href="<?= $speech['speaker']['url'] ?>">
                     <img src="<?= $image_url ?>" alt="Photo of <?= $speaker_name ?>">
                     <strong class="debate-speech__speaker__name"><?= $speaker_name ?></strong>
@@ -165,8 +165,8 @@ 
               <?php } ?>
 
               <?php # XXX
-              if ($data['info']['major'] == 8 && preg_match('#\d{4}-\d\d-\d\d\.(.*?)\.q#', $speech['gid'], $m)) {
-                  ?><p class="debate-speech__question_id"><small>
+                if ($data['info']['major'] == 8 && preg_match('#\d{4}-\d\d-\d\d\.(.*?)\.q#', $speech['gid'], $m)) {
+                    ?><p class="debate-speech__question_id"><small>
                     <?= "Question $m[1]" ?>
                     </small></p>
               <?php } ?>
@@ -193,15 +193,15 @@ 
                 <?php } ?>
 
               <?php if (isset($speech['mp_vote'])) {
-                  $mp_vote = [ 'vote' => $speech['mp_vote']['vote'] ];
-                  if (isset($speech['before_mp'])) {
-                      $before_mp = $speech['before_mp'];
-                  }
-                  if (isset($speech['after_mp'])) {
-                      $after_mp = $speech['after_mp'];
-                  }
-                  include dirname(__FILE__) . '/../divisions/_your_mp.php';
-              } ?>
+                    $mp_vote = [ 'vote' => $speech['mp_vote']['vote'] ];
+                    if (isset($speech['before_mp'])) {
+                        $before_mp = $speech['before_mp'];
+                    }
+                    if (isset($speech['after_mp'])) {
+                        $after_mp = $speech['after_mp'];
+                    }
+                    include dirname(__FILE__) . '/../divisions/_your_mp.php';
+                } ?>
                 <div class="debate-speech__division__details">
                   <?php include dirname(__FILE__) . '/../divisions/_votes.php'; ?>
                 </div>

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
             $body = preg_replace('# (S\d[O0WF]-\d+)[, ]#', ' <a href="/spwrans/?spid=$1">$1</a> ', $body);
             $body = preg_replace_callback(
                 '#<citation id="uk\.org\.publicwhip/(.*?)/(.*?)">\[(.*?)\]</citation>#',
-                function ($matches) {
+                function($matches) {
                     if ($matches[1] == 'spor') {
                         $href_segment = 'sp/?g';
                     } elseif ($matches[1] == 'spwa') {
@@ -193,7 +193,7 @@ 
                 <?php } ?>
 
               <?php if (isset($speech['mp_vote'])) {
-                  $mp_vote = [ 'vote' => $speech['mp_vote']['vote'] ];
+                  $mp_vote = ['vote' => $speech['mp_vote']['vote']];
                   if (isset($speech['before_mp'])) {
                       $before_mp = $speech['before_mp'];
                   }