mysociety / theyworkforyou

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

Indentation +3 added lines, -3 removed lines

@@ -79,7 +79,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>
@@ -119,7 +119,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>
@@ -148,7 +148,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>

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-include_once INCLUDESPATH . "easyparliament/templates/html/mp/header.php";
+include_once INCLUDESPATH."easyparliament/templates/html/mp/header.php";
 
 // if this is set to a year for which we have WTT responsiveness stats then
 // it'll display a banner with the MPs stats, assuming we have them for the
@@ -58,7 +58,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 @@ 
                                 $party,
                                 $party_positions[$policy_id]['position']
                             );
-                            $link = $member_url . '/divisions?policy=' . $policy_id;
+                            $link = $member_url.'/divisions?policy='.$policy_id;
                             $show_link = true;
 
                             include '_vote_description.php';
@@ -124,7 +124,7 @@ 
 
                         <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) { ?>
                         <p>
                         <?= $full_name ?> is a <?= $party ?> MP, and on the <b>vast majority</b> of issues votes the <b>same way</b> as other <?= $party ?> MPs.
@@ -152,7 +152,7 @@ 
                         </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>
-                    <?php elseif (count($policyPositions->positions) == 0 ): ?>
+                    <?php elseif (count($policyPositions->positions) == 0): ?>
 
                         <p>No votes to display.</p>
 

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

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

@@ -105,7 +105,7 @@
                         <ul class="vote-descriptions">
                           <?php foreach ($sorted_diffs as $policy_id => $score) {
 
-                            $key_vote = NULL;
+                            $key_vote = null;
                             $description = sprintf(
                                 '%s <b>%s</b> %s, while most %s MPs <b>%s</b>.',
                                 $full_name,

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

Spacing +8 added lines, -8 removed lines

@@ -1,11 +1,11 @@ 
     <div class="regional-header regional-header--<?= $current_assembly ?>">
         <div class="regional-header__overlay"></div>
-        <div class="person-header <?= $this_page ?> <?= (isset($data['photo_attribution_text'])?'has-data-attribution':'') ?>">
+        <div class="person-header <?= $this_page ?> <?= (isset($data['photo_attribution_text']) ? 'has-data-attribution' : '') ?>">
             <div class="full-page__row">
                 <div class="full-page__unit">
                     <div class="person-header__content">
                         <div class="person-name">
-                          <?php if ( $image ) { ?>
+                          <?php if ($image) { ?>
                             <div class="mp-image">
                                 <img src="<?= $image['url'] ?>" height="48">
                             </div>
@@ -17,10 +17,10 @@ 
                               <?php } ?>
                             </div>
                         </div>
-                        <?php if($image && $image['exists']): ?>
-                            <?php if(isset($data['photo_attribution_text'])) { ?>
+                        <?php if ($image && $image['exists']): ?>
+                            <?php if (isset($data['photo_attribution_text'])) { ?>
                                 <div class="person-data-attribution">
-                                  <?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 { ?>
                                     Profile photo: <?= $data['photo_attribution_text'] ?>
@@ -38,10 +38,10 @@ 
                             </div>
                         <?php endif; ?>
                         <div class="person-constituency">
-                          <?php if ( $constituency && $this_page != 'peer' && $this_page != 'royal' ) { ?>
+                          <?php if ($constituency && $this_page != 'peer' && $this_page != 'royal') { ?>
                             <span class="constituency"><?= $constituency ?></span>
                           <?php } ?>
-                          <?php if ( $party ) { ?>
+                          <?php if ($party) { ?>
                             <span class="party <?= $party_short ?>"><?= $party ?></span>
                           <?php } ?>
                         </div>
@@ -58,7 +58,7 @@ 
                                     echo "?person=uk.org.publicwhip/person/$person_id";
                                 }
                                 if ($the_users_mp) {
-                                    echo "?a=WMC&amp;pc=" . _htmlentities(urlencode($user_postcode));
+                                    echo "?a=WMC&amp;pc="._htmlentities(urlencode($user_postcode));
                                 }
                             ?>" class="button wtt" onclick="trackLinkClick(this, 'Links', 'WriteToThem', 'Person'); return false;"><img src="/style/img/envelope.png">Send a message</a>
 

Braces +5 added lines, -2 removed lines

@@ -27,7 +27,8 @@ 
                                   <?php } ?>
                                 </div>
                             <?php } ?>
-                        <?php else: ?>
+                        <?php else {
+    : ?>
                             <div class="person-data-attribution">
                                 We&rsquo;re missing a photo of <?= $full_name ?>. If you have a
                                 photo <em>that you can release under a Creative Commons Attribution-ShareAlike
@@ -36,7 +37,9 @@ 
                                 Please do not email us about copyrighted photos elsewhere on the internet; we can&rsquo;t
                                 use them.
                             </div>
-                        <?php endif; ?>
+                        <?php endif;
+}
+?>
                         <div class="person-constituency">
                           <?php if ( $constituency && $this_page != 'peer' && $this_page != 'royal' ) { ?>
                             <span class="constituency"><?= $constituency ?></span>

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

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <li>
     <?= $description ?>
-    <?php if ( $show_link ) { ?>
+    <?php if ($show_link) { ?>
         <a class="vote-description__source" href="<?= $link ?>">Show votes</a>
         <?php if (isset($key_vote)) { ?>
         <a class="vote-description__evidence" href="<?= $link ?>"><?= $key_vote['summary'] ?></a>

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

Indentation +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
     echo '<?xml version="1.0" encoding="iso-8859-1"?>';
 
- ?>
+    ?>
 <!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="Droid Sans, Trebuchet">
 

Spacing +2 added lines, -2 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);
@@ -56,7 +56,7 @@ 
                 if (strpos($line, '*') !== False) {
                     echo preg_replace(
                         '#(?:^|[*])([^\r\n *][^*\n]*[^\r\n *])(?:$|[*])#i',
-                        $tspan_bold_open . '$1' . $tspan_bold_close,
+                        $tspan_bold_open.'$1'.$tspan_bold_close,
                         $line
                     );
                 } else {

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

@@ -53,7 +53,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',
                         $tspan_bold_open . '$1' . $tspan_bold_close,

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

Spacing +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
 twfy_debug("TEMPLATE", "hansard_recentvotes.php");
 
 if (isset ($data['rows']) && count($data['rows']) > 0) {
-    $PAGE->block_start(array('title'=>'Most interesting speeches from past ' . $data['info']['days'] . ' days'));
+    $PAGE->block_start(array('title'=>'Most interesting speeches from past '.$data['info']['days'].' days'));
 ?>
                         <ol>
 <?php
@@ -25,13 +25,13 @@ 
         $title = $row['parent']['body'];
 
         if (isset($row['listurl'])) {
-            $title = "<a href=\"" . $row['listurl'] . "\">$title</a>";
+            $title = "<a href=\"".$row['listurl']."\">$title</a>";
         }
 
         if (isset($row['speaker']) && isset($row['speaker']['member_id'])) {
             $URL = new URL('member');
             $URL->insert(array('id'=>$row['speaker']['member_id']));
-            $member = '<a href="' . $URL->generate() . '">' . $row['speaker']['name'] . '</a>: ';
+            $member = '<a href="'.$URL->generate().'">'.$row['speaker']['name'].'</a>: ';
         } else {
             $member = '';
         }

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

Spacing +4 added lines, -4 removed lines

@@ -22,19 +22,19 @@
         if (isset($row['listurl'])) {
             // So we can link to the 'More recent appearances' precisely.
             $count = $n + 1;
-            $text = "<a name=\"n$count\"></a><strong><a href=\"" . $row['listurl'] . "\">$text</a></strong> ";
+            $text = "<a name=\"n$count\"></a><strong><a href=\"".$row['listurl']."\">$text</a></strong> ";
         }
 
-        $text .= '<small>' . format_date($row['hdate'], SHORTDATEFORMAT);
+        $text .= '<small>'.format_date($row['hdate'], SHORTDATEFORMAT);
 
         if ($hansardmajors[$row['major']]['type'] == 'debate') {
             $plural = $row['total_speeches'] == 1 ? 'speech' : 'speeches';
-            $text .= ' (' . $row['total_speeches'] . " $plural)";
+            $text .= ' ('.$row['total_speeches']." $plural)";
         }
 
         $text .= '</small>';
 
-        $text = "\t\t\t\t<p>$text<br>\n\t\t\t\t&#8220;" . trim_characters($row['body'], 0, 200) . "&#8221;</p>\n";
+        $text = "\t\t\t\t<p>$text<br>\n\t\t\t\t&#8220;".trim_characters($row['body'], 0, 200)."&#8221;</p>\n";
 
         print $text;
     }

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

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
           <?php if (isset($data['user_signed_in']) && isset($data['already_signed_up'])): ?>
             <div class="alerts-message alerts-message--reminder">
                 <h2>You are already signed up</h2>
-                <p>You are already receiving alerts when your MP<?= isset($data['mp_name']) ? ', ' . $data['mp_name'] . ',' : '' ?> speaks in Parliament or receives an answer to a written question.</p>
+                <p>You are already receiving alerts when your MP<?= isset($data['mp_name']) ? ', '.$data['mp_name'].',' : '' ?> speaks in Parliament or receives an answer to a written question.</p>
                 <p><a href="/alert/" class="button radius">Show my email settings</a></p>
             </div>
            <?php endif ?>

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

Indentation +9 added lines, -9 removed lines

@@ -122,25 +122,25 @@ 
       <?php } ?>
 
       <?php
-          if(
-              (isset($members) && $members->rows() > 0) ||
+            if(
+                (isset($members) && $members->rows() > 0) ||
               (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) && $members->rows() > 0) {
-                  $member_options = true; ?>
+                    $member_options = true; ?>
                 <h3>Sign up for alerts when people matching <i><?= _htmlspecialchars($alertsearch) ?></i> speaks</h3>
                 <ul>
                   <?php
                     $q = $members;
                     for ($n=0; $n<$q->rows(); $n++) {
-                  ?>
+                    ?>
                     <li>
                         <form action="<?= $actionurl ?>" method="post">
                             <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>">
@@ -160,7 +160,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 +24 added lines, -24 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,26 +45,26 @@ 
                 </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 == '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.
@@ -80,14 +80,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.
@@ -95,20 +95,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
@@ -122,7 +122,7 @@ 
       <?php } ?>
 
       <?php
-          if(
+          if (
               (isset($members) && $members->rows() > 0) ||
               (isset($constituencies) && count($constituencies) > 0) ||
               ($alertsearch)
@@ -139,7 +139,7 @@ 
                 <ul>
                   <?php
                     $q = $members;
-                    for ($n=0; $n<$q->rows(); $n++) {
+                    for ($n = 0; $n < $q->rows(); $n++) {
                   ?>
                     <li>
                         <form action="<?= $actionurl ?>" method="post">
@@ -147,7 +147,7 @@ 
                             <input type="hidden" name="email" value="<?= _htmlspecialchars($email) ?>">
                             <input type="hidden" name="pid" value="<?= $q->field($n, 'person_id') ?>">
                             When
-                            <?= member_full_name($q->field($n, 'house'), $q->field($n, 'title'), $q->field($n, 'given_name'), $q->field($n, 'family_name'), $q->field($n, 'lordofname') ) ?>
+                            <?= member_full_name($q->field($n, 'house'), $q->field($n, 'title'), $q->field($n, 'given_name'), $q->field($n, 'family_name'), $q->field($n, 'lordofname')) ?>
                             <?php if ($q->field($n, 'constituency')) { ?>
                                 (<?= $q->field($n, 'constituency') ?>)
                             <?php } ?>
@@ -178,7 +178,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>
@@ -192,7 +192,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
@@ -201,7 +201,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
@@ -222,7 +222,7 @@ 
                             <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>">
                             <input type="hidden" name="email" value="<?= _htmlspecialchars($email) ?>">
                             <input type="hidden" name="keyword" value="<?= _htmlspecialchars($member_alertsearch) ?>">
-                            Mentions of [<?= _htmlspecialchars($member_displaysearch) ?>] by <?= $mp_display_text . $member->full_name() ?>
+                            Mentions of [<?= _htmlspecialchars($member_displaysearch) ?>] by <?= $mp_display_text.$member->full_name() ?>
                             <input type="submit" class="button small" value="Subscribe">
                         </form>
                     </li>
@@ -350,17 +350,17 @@ 
             <div class="alert-section__secondary">
               <?php if ($email_verified) { ?>
 
-                  <?php if ( $alerts ) { ?>
+                  <?php if ($alerts) { ?>
                     <h3>Your current email alerts</h3>
                     <ul class="alerts-manage__list">
-                      <?php foreach ( $alerts as $alert ) { ?>
+                      <?php foreach ($alerts as $alert) { ?>
                         <li>
                             When <?= _htmlspecialchars($alert['criteria']) ?>.
                             <form action="<?= $actionurl ?>" method="POST">
                                 <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
-                              <?php if ( $alert['status'] == 'unconfirmed' ) { ?>
+                              <?php if ($alert['status'] == 'unconfirmed') { ?>
                                 <input type="submit" class="button small" name="action" value="Confirm">
-                              <?php } elseif ( $alert['status'] == 'suspended' ) { ?>
+                              <?php } elseif ($alert['status'] == 'suspended') { ?>
                                 <input type="submit" class="button small" name="action" value="Resume">
                               <?php } else { ?>
                                 <input type="submit" class="button button--secondary small" name="action" value="Suspend">
@@ -372,7 +372,7 @@ 
                     </ul>
                   <?php } ?>
 
-                  <?php if ( $current_mp ) { ?>
+                  <?php if ($current_mp) { ?>
                     <h3>Your MP alert</h3>
                     <ul class="alerts-manage__list">
                         <li>

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

Spacing +10 added lines, -10 removed lines

@@ -44,7 +44,7 @@ 
         $last_result = $info['total_results'];
     }
 
-    print "\t\t\t\t<h3 style='font-weight:normal'>Results <strong>" . number_format($info['first_result']) . '-' . number_format($last_result) . '</strong> of ' . number_format($info['total_results']) . " for <strong>" . _htmlentities($searchdescription) . "</strong></h3>\n";
+    print "\t\t\t\t<h3 style='font-weight:normal'>Results <strong>".number_format($info['first_result']).'-'.number_format($last_result).'</strong> of '.number_format($info['total_results'])." for <strong>"._htmlentities($searchdescription)."</strong></h3>\n";
 
 } elseif ($info['total_results'] == 0) {
     echo '<h3 style="font-weight:normal">Your search for <strong>', _htmlentities($searchdescription), '</strong> did not match anything.</h3>';
@@ -54,7 +54,7 @@ 
     $u = new URL('search');
     $u->reset();
     $u->insert(array('s' => $info['spelling_correction']));
-    echo '<p><big>Did you mean: <a href="' . $u->generate(), '">', $info['spelling_correction'] . '</a>?</big></p>';
+    echo '<p><big>Did you mean: <a href="'.$u->generate(), '">', $info['spelling_correction'].'</a>?</big></p>';
 }
 
 if ($match = get_http_var('match')) {
@@ -66,35 +66,35 @@ 
 if (isset ($data['rows']) && count($data['rows']) > 0) {
 
     echo '<dl id="searchresults">';
-    for ($i=0; $i<count($data['rows']); $i++) {
+    for ($i = 0; $i < count($data['rows']); $i++) {
 
         $row = $data['rows'][$i];
         echo '<dt><a href="', $row['listurl'], '">';
         if (isset($row['parent']) && count($row['parent']) > 0) {
-            echo ('<strong>' . $row['parent']['body'] . '</strong>');
+            echo ('<strong>'.$row['parent']['body'].'</strong>');
         }
-        echo '</a> <small>(' . format_date($row['hdate'], LONGDATEFORMAT) . ')';
+        echo '</a> <small>('.format_date($row['hdate'], LONGDATEFORMAT).')';
         if (isset($row['video_status']) && ($row['video_status'] == 5 || $row['video_status'] == 7)) {
             echo ' <em>has video</em> ';
         }
         if (isset($row['collapsed']) && $row['collapsed'] && $row['subsection_id']) {
             $URL = new URL('search');
-            $URL->insert(array('s' => $info['s'] . " segment:$row[subsection_id]" ));
+            $URL->insert(array('s' => $info['s']." segment:$row[subsection_id]"));
             echo ' <a href="', $URL->generate(), '">See ', $row['collapsed'],
-            ' other result', $row['collapsed']>1?'s':'', ' from this ',
+            ' other result', $row['collapsed'] > 1 ? 's' : '', ' from this ',
             $hansardmajors[$row['major']]['singular'], '</a>';
         }
         echo '</small>';
         if ($match = get_http_var('match')) {
-            echo ' &ndash; <a href="/search/record.php?result=', $row['gid'] , '&amp;match=', _htmlspecialchars($match), '">This is the correct match</a>';
+            echo ' &ndash; <a href="/search/record.php?result=', $row['gid'], '&amp;match=', _htmlspecialchars($match), '">This is the correct match</a>';
         }
         echo '</dt> <dd><p>';
         if (isset($row['speaker']) && count($row['speaker'])) {
-            echo "<em>" . ucfirst($row['speaker']['name']) . "</em>";
+            echo "<em>".ucfirst($row['speaker']['name'])."</em>";
             if ($row['extract']) echo ": ";
         }
 
-        echo $row['extract'] . "</p></dd>\n";
+        echo $row['extract']."</p></dd>\n";
 
     }
 

Braces +3 added lines, -1 removed lines

@@ -91,7 +91,9 @@
         echo '</dt> <dd><p>';
         if (isset($row['speaker']) && count($row['speaker'])) {
             echo "<em>" . ucfirst($row['speaker']['name']) . "</em>";
-            if ($row['extract']) echo ": ";
+            if ($row['extract']) {
+                echo ": ";
+            }
         }
 
         echo $row['extract'] . "</p></dd>\n";