mysociety / theyworkforyou

www/docs/images/mps/photo-status.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
     WHERE house=1 AND left_house = (SELECT MAX(left_house) FROM member) ';
 $q = $db->query($query . "ORDER BY person_id");
 $out = array('both'=>'', 'small'=>'', 'none'=>array());
-for ($i=0; $i<$q->rows(); $i++) {
+for ($i = 0; $i < $q->rows(); $i++) {
     $p_id = $q->field($i, 'person_id');
     list($dummy, $sz) = MySociety\TheyWorkForYou\Utility\Member::findMemberImage($p_id);
     if ($sz == 'L') {
@@ -22,7 +22,7 @@ 
         array_push($out['none'], '<li>' . $q->field($i, 'person_id') . ' (' . $q->field($i, 'party') . ')' . ', ' . $q->field($i, 'constituency'));
     }
 }
-print '<h3>Missing completely ('.count($out['none']).')</h3> <ul>';
+print '<h3>Missing completely (' . count($out['none']) . ')</h3> <ul>';
 print join($out['none'], "\n");
 print '</ul>';
 print '<h3>Large and small</h3> <p>';

www/includes/easyparliament/trackback.php

Spacing +19 added lines, -19 removed lines

@@ -51,7 +51,7 @@ 
     public function moderate_trackbacks() { return $this->moderate_trackbacks; }
 
 
-    public function display ($view, $args=array(), $format='html') {
+    public function display($view, $args = array(), $format = 'html') {
         // $view is one of:
         //	'epobject_id' - display the pings for one epobject.
         // 	'recent' - to get the most recent pings to anywhere.
@@ -64,18 +64,18 @@ 
         if ($view == 'epobject_id' || $view == 'recent') {
 
             // What function do we call for this view?
-            $function = '_get_trackbacks_by_'.$view;
+            $function = '_get_trackbacks_by_' . $view;
             // Get all the data that's to be rendered.
             $trackbackdata = $this->$function($args);
 
         } else {
-            $PAGE->error_message ("You haven't specified a valid view type.");
+            $PAGE->error_message("You haven't specified a valid view type.");
             return false;
         }
 
-        $data = array (
+        $data = array(
             'data' 	=> $trackbackdata,
-            'info'	=> array (
+            'info'	=> array(
                 'view' => $view
             )
         );
@@ -86,7 +86,7 @@ 
         $this->render($view, $data, $format);
     }
 
-    public function render($view, $data, $format='html') {
+    public function render($view, $data, $format = 'html') {
 
         if ($format != 'html') {
             $format = 'html';
@@ -95,7 +95,7 @@ 
         // We currently only have one kind of trackback template, so
         // we're ignoring $view here I'm afraid...
 
-        include (INCLUDESPATH."easyparliament/templates/$format/trackbacks" . ".php");
+        include (INCLUDESPATH . "easyparliament/templates/$format/trackbacks" . ".php");
 
     }
 
@@ -131,14 +131,14 @@ 
 
 
         // Still here? Then we're trackbacking to a valid hansard item.
-        $url 		= $trackbackdata['url'];
-        $source_ip	= $trackbackdata['source_ip'];
+        $url = $trackbackdata['url'];
+        $source_ip = $trackbackdata['source_ip'];
         // These all strip_tags too.
-        $title 		= trim_characters(html_entity_decode($trackbackdata['title']), 0, 255);
-        $excerpt 	= trim_characters(html_entity_decode($trackbackdata['excerpt']), 0, 255);
-        $blog_name 	= trim_characters(html_entity_decode($trackbackdata['blog_name']), 0, 255);
+        $title = trim_characters(html_entity_decode($trackbackdata['title']), 0, 255);
+        $excerpt = trim_characters(html_entity_decode($trackbackdata['excerpt']), 0, 255);
+        $blog_name = trim_characters(html_entity_decode($trackbackdata['blog_name']), 0, 255);
 
-        $visible 		= $this->moderate_trackbacks ? 0 : 1;
+        $visible = $this->moderate_trackbacks ? 0 : 1;
 
         $q = $this->db->query("INSERT INTO trackbacks
                         (epobject_id, blog_name, title, excerpt, url, source_ip, posted, visible)
@@ -198,8 +198,8 @@ 
                         ");
 
         if ($q->rows() > 0) {
-            for ($row=0; $row<$q->rows(); $row++) {
-                $trackbackdata[] = array (
+            for ($row = 0; $row < $q->rows(); $row++) {
+                $trackbackdata[] = array(
                     'trackback_id' 	=> $q->field($row, 'trackback_id'),
                     'epobject_id'	=> $q->field($row, 'epobject_id'),
                     'blog_name' 	=> $q->field($row, 'blog_name'),
@@ -247,8 +247,8 @@ 
                         ");
 
         if ($q->rows() > 0) {
-            for ($row=0; $row<$q->rows(); $row++) {
-                $trackbackdata[] = array (
+            for ($row = 0; $row < $q->rows(); $row++) {
+                $trackbackdata[] = array(
                     'trackback_id' 	=> $q->field($row, 'trackback_id'),
                     'epobject_id'	=> $q->field($row, 'epobject_id'),
                     'blog_name' 	=> $q->field($row, 'blog_name'),
@@ -277,13 +277,13 @@ 
             // This page just does XML.
 
             if ($error) {
-                echo '<?xml version="1.0" encoding="utf-8"?'.">\n";
+                echo '<?xml version="1.0" encoding="utf-8"?' . ">\n";
                 echo "<response>\n";
                 echo "<error>1</error>\n";
                 echo "<message>$error_message</message>\n";
                 echo "</response>";
             } else {
-                echo '<?xml version="1.0" encoding="utf-8"?'.">\n";
+                echo '<?xml version="1.0" encoding="utf-8"?' . ">\n";
                 echo "<response>\n";
                 echo "<error>0</error>\n";
                 echo "</response>";

www/includes/easyparliament/glossarylist.php

Spacing +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@ 
 
 class GLOSSARYLIST {
 
-    public function render($data, $format='html', $template='glossary') {
+    public function render($data, $format = 'html', $template = 'glossary') {
         // Once we have the data that's to be rendered,
         // include the template.
 
@@ -10,7 +10,7 @@ 
             $format = 'html';
         }
 
-        include (INCLUDESPATH."easyparliament/templates/$format/$template.php");
+        include (INCLUDESPATH . "easyparliament/templates/$format/$template.php");
 
     }
 

www/includes/easyparliament/templates/html/search/form_main.php

Spacing +2 added lines, -2 removed lines

@@ -4,7 +4,7 @@ 
             <input type="text" name="q" value="<?= _htmlentities($search_keyword) ?>" class="form-control">
             <input type="submit" class="button" value="Search">
         </p>
-      <?php if (isset($warnings) ) { ?>
+      <?php if (isset($warnings)) { ?>
         <p class="error">
             <?= $warnings ?>
         </p>
@@ -18,7 +18,7 @@ 
         <p>
             <ul class="search-result-display-options">
                 <li><a href="#options" class="search-options-toggle js-toggle-search-options">Advanced search</a></li>
-              <?php if ( $is_adv ) { ?>
+              <?php if ($is_adv) { ?>
                 <?= $search_phrase ? '<li>Exactly: ' . _htmlentities($search_phrase) . '</li>' : '' ?>
                 <?= $search_exclude ? '<li>Excluding: ' . _htmlentities($search_exclude) . '</li>' : '' ?>
                 <?= $search_from ? '<li>From: ' . _htmlentities($search_from) . '</li>' : '' ?>

www/includes/easyparliament/templates/html/search/person.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
     <p class="search-result__description">
     <?php $details = $member->getMostRecentMembership(); ?>
     <?= $details['left_house'] != '9999-12-31' ? 'Former ' : '' ?><?= $details['party'] ? $details['party'] . ' ' : '' ?><?= $details['rep_name'] ?><?= $details['cons'] ? ', ' . $details['cons'] : ''?>
-    <?php if ( $details['entered_house'] || ( $details['left_house'] && $details['left_house'] != '9999-12-31' )  ) { ?>
+    <?php if ($details['entered_house'] || ($details['left_house'] && $details['left_house'] != '9999-12-31')) { ?>
 , <?= format_date($details['entered_house'], SHORTDATEFORMAT) ?> &ndash; <?= $details['left_house'] != '9999-12-31' ? format_date($details['left_house'], SHORTDATEFORMAT) : '' ?>
     <?php } ?>
     </p>

www/includes/easyparliament/templates/html/search/by-person.php

Spacing +22 added lines, -22 removed lines

@@ -9,17 +9,17 @@ 
             <div class="search-page__section__primary">
                 <h2>Who says <em class="current-search-term"><?= _htmlentities($searchstring) ?></em> the most?</h2>
 
-              <?php if ( isset($error) ) { ?>
-                <?php if ( $error == 'No results' && isset( $house ) && $house != 0 ) { ?>
+              <?php if (isset($error)) { ?>
+                <?php if ($error == 'No results' && isset($house) && $house != 0) { ?>
                   <ul class="search-result-display-options">
                       <li>
-                        <?php if ( $house == 1 ) { ?>
+                        <?php if ($house == 1) { ?>
                           No results for MPs only
-                        <?php } else if ( $house == 2 ) { ?>
+                        <?php } else if ($house == 2) { ?>
                           No results for Peers only
-                        <?php } else if ( $house == 4 ) { ?>
+                        <?php } else if ($house == 4) { ?>
                           No results for MSPs only
-                        <?php } else if ( $house == 3 ) { ?>
+                        <?php } else if ($house == 3) { ?>
                           No results for MLAs only
                         <?php } ?>
                           |
@@ -31,7 +31,7 @@ 
                 <?php } ?>
               <?php } ?>
 
-              <?php if ( $wtt ) { ?>
+              <?php if ($wtt) { ?>
                 <p><strong>Now, try reading what a couple of these Lords are saying,
                 to help you find someone appropriate. When you've found someone,
                 hit the "I want to write to this Lord" button on their results page
@@ -39,37 +39,37 @@ 
                 </strong></p>
               <?php } ?>
 
-              <?php if ( isset($speakers) && count($speakers) ) { ?>
+              <?php if (isset($speakers) && count($speakers)) { ?>
 
-                  <?php if ( !$wtt ) { ?>
+                  <?php if (!$wtt) { ?>
                     <ul class="search-result-display-options">
                         <li>Results grouped by person</li>
                         <li>
-                          <?php if ( $house == 0 ) { ?>
+                          <?php if ($house == 0) { ?>
                             Show All
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html') ?>">Show All</a>
                           <?php } ?>
                             |
-                          <?php if ( $house == 1 ) { ?>
+                          <?php if ($house == 1) { ?>
                             MPs only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', array('house'=>1)) ?>">MPs only</a>
                           <?php } ?>
                             |
-                          <?php if ( $house == 2 ) { ?>
+                          <?php if ($house == 2) { ?>
                             Peers only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', array('house'=>2)) ?>">Lords only</a>
                           <?php } ?>
                             |
-                          <?php if ( $house == 4 ) { ?>
+                          <?php if ($house == 4) { ?>
                             MSPs only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', array('house'=>4)) ?>">MSPs only</a>
                           <?php } ?>
                             |
-                          <?php if ( $house == 3 ) { ?>
+                          <?php if ($house == 3) { ?>
                             MLAs only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', array('house'=>3)) ?>">MLAs only</a>
@@ -90,25 +90,25 @@ 
                         </tr>
                     </thead>
                     <tbody>
-                      <?php foreach ( $speakers as $pid => $speaker ) { ?>
+                      <?php foreach ($speakers as $pid => $speaker) { ?>
 
-                        <?php if ( $wtt && $pid == 0 ) { continue; } // skip heading count for WTT lords list ?>
+                        <?php if ($wtt && $pid == 0) { continue; } // skip heading count for WTT lords list ?>
 
                         <tr>
                             <td><?= $speaker['count'] ?></td>
                             <td>
-                              <?php if ( $pid ) { ?>
-                                <?php if ( !$wtt || $speaker['left'] == '9999-12-31' ) { ?>
+                              <?php if ($pid) { ?>
+                                <?php if (!$wtt || $speaker['left'] == '9999-12-31') { ?>
                                   <a href="/search/?q=<?= _htmlentities($searchstring) ?>&amp;pid=<?= $pid ?><?= isset($wtt) && $speaker['left'] == '9999-12-31' ? '&amp;wtt=2' : '' ?>">
                                 <?php } ?>
                                 <?= isset($speaker['name']) ? $speaker['name'] : 'N/A' ?>
-                                <?php if ( !$wtt || $speaker['left'] == '9999-12-31' ) { ?>
+                                <?php if (!$wtt || $speaker['left'] == '9999-12-31') { ?>
                                   </a>
                                 <?php } ?>
-                                <?php if ( isset($speaker['party']) ) { ?>
+                                <?php if (isset($speaker['party'])) { ?>
                                   <span class="search-results-grouped__speaker-party">(<?= $speaker['party'] ?>)</span>
                                 <?php } ?>
-                                <?php if ( $house != 2 ) { ?>
+                                <?php if ($house != 2) { ?>
                                   <?= isset($speaker['office']) ? ' - ' . join('; ', $speaker['office']) : '' ?>
                                 <?php } ?>
                               <?php } else { // no $pid ?>
@@ -116,7 +116,7 @@ 
                               <?php } ?>
                             </td>
                             <td>
-                              <?php if ( format_date($speaker['pmindate'], 'M Y') == format_date($speaker['pmaxdate'], 'M Y') ) { ?>
+                              <?php if (format_date($speaker['pmindate'], 'M Y') == format_date($speaker['pmaxdate'], 'M Y')) { ?>
                                 <?= format_date($speaker['pmindate'], 'M Y') ?>
                               <?php } else { ?>
                                 <?= format_date($speaker['pmindate'], 'M Y') ?>&nbsp;&ndash;&nbsp;<?= format_date($speaker['pmaxdate'], 'M Y') ?>

Braces +2 added lines, -1 removed lines

@@ -111,7 +111,8 @@
                                 <?php if ( $house != 2 ) { ?>
                                   <?= isset($speaker['office']) ? ' - ' . join('; ', $speaker['office']) : '' ?>
                                 <?php } ?>
-                              <?php } else { // no $pid ?>
+                              <?php } else {
+// no $pid ?>
                                 <?= $speaker['name'] ?>
                               <?php } ?>
                             </td>

www/includes/easyparliament/templates/html/search/sidebar.php

Spacing +3 added lines, -3 removed lines

@@ -1,10 +1,10 @@ 
             <div class="search-page__section__secondary search-page-sidebar">
-                <?php if ( isset( $search_sidebar['email'] ) ) { ?>
+                <?php if (isset($search_sidebar['email'])) { ?>
                 <h2>Create an alert</h2>
                 <p class="sidebar-item-with-icon">
                     <a href="<?= $search_sidebar['email'] ?>">Subscribe to an email alert</a>
                     for <em class="current-search-term"><?= $search_sidebar['email_desc'] ?></em>
-                    <?php if (isset( $search_sidebar['email_section'] ) ) { ?>
+                    <?php if (isset($search_sidebar['email_section'])) { ?>
                     <br><small>(or just <a href="<?= $search_sidebar['email_section'] ?>"><?= $search_sidebar['email_desc_section'] ?></a>)</small>
                     <?php } ?>
                 </p>
@@ -16,5 +16,5 @@ 
                 <?php } ?>
 
 
-                <?php include( dirname(__FILE__) . '/../sidebar/looking_for.php' ) ?>
+                <?php include(dirname(__FILE__) . '/../sidebar/looking_for.php') ?>
             </div>

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

Spacing +19 added lines, -19 removed lines

@@ -26,7 +26,7 @@ 
                           Based on postcode <strong><?= $mp_data['postcode'] ?></strong>
                           <a href="<?= $mp_data['change_url'] ?>">(Change postcode)</a>
                       </p>
-                    <?php if ( isset( $mp_data ) && $type != 'mlas' ) { ?>
+                    <?php if (isset($mp_data) && $type != 'mlas') { ?>
                       <h3>Your <?= $mp_data['former'] ? $mp_data['former'] . ' ' : '' ?><?= $rep_name ?> is</h3>
                     </div>
                     <a href="<?= $mp_data['mp_url'] ?>" class="people-list__person">
@@ -34,23 +34,23 @@ 
                         <h2 class="people-list__person__name"><?= $mp_data['name'] ?></h2>
                         <p class="people-list__person__memberships">
                         <span class="people-list__person__constituency"><?= $mp_data['constituency'] ?></span>
-                        <span class="people-list__person__party <?= strtolower( $mp_data['party'] ) ?>"><?= $mp_data['party'] ?></span>
+                        <span class="people-list__person__party <?= strtolower($mp_data['party']) ?>"><?= $mp_data['party'] ?></span>
                         </p>
                     </a>
                     <?php }
-                    if ( isset($reps) ) {
-                        if ( isset($mp_data) && $type != 'mlas' ) { ?>
+                    if (isset($reps)) {
+                        if (isset($mp_data) && $type != 'mlas') { ?>
                     <div class="people-list__your-mp__replist-header">
                         <?php } ?>
                       <h3>Your <?=$former ?> <?= $rep_plural == 'MSPs' ? 'regional ' : '' ?><?= $rep_plural ?> are</h3>
                     </div>
-                        <?php foreach ( $reps as $rep ) { ?>
+                        <?php foreach ($reps as $rep) { ?>
                     <a href="<?= $rep['mp_url'] ?>" class="people-list__person">
                     <img class="people-list__person__image" src="<?= $rep['image'] ?>">
                         <h2 class="people-list__person__name"><?= $rep['name'] ?></h2>
                         <p class="people-list__person__memberships">
                         <span class="people-list__person__constituency"><?= $rep['constituency'] ?></span>
-                        <span class="people-list__person__party <?= strtolower( $rep['party'] ) ?>"><?= $rep['party'] ?></span>
+                        <span class="people-list__person__party <?= strtolower($rep['party']) ?>"><?= $rep['party'] ?></span>
                         </p>
                     </a>
                         <?php } ?>
@@ -65,9 +65,9 @@ 
             <div class="search-page__section search-page__section--search">
                 <div class="search-page__section__primary">
                     <p class="search-page-main-inputs">
-                    <?php if ( $type == 'peers' ) { ?>
+                    <?php if ($type == 'peers') { ?>
                         <label for="find-mp-by-name-or-postcode">Find <?= $rep_plural ?> by name:</label>
-                    <?php } elseif ( $type == 'mlas' || $type == 'msps' ) { ?>
+                    <?php } elseif ($type == 'mlas' || $type == 'msps') { ?>
                         <label for="find-mp-by-name-or-postcode">Find your <?= $rep_name ?> by postcode:</label>
                     <?php } else { ?>
                         <label for="find-mp-by-name-or-postcode">Find your <?= $rep_name ?> by name or postcode:</label>
@@ -108,12 +108,12 @@ 
             <div class="search-page__section__primary">
             <h2>All <?= $rep_plural ?></h2>
 
-                <?php if ( $type != 'peers' ) { ?>
+                <?php if ($type != 'peers') { ?>
                 <ul class="search-result-display-options">
-                    <?php if ( $order == 'given_name' ) { ?>
+                    <?php if ($order == 'given_name') { ?>
                     <li><strong>Sorted by</strong> First name</li>
                     <li>Sort by <a href="<?= $urls['by_last'] ?>">Last name</a> / <a href="<?= $urls['by_party'] ?>">Party</a></li>
-                    <?php } else if ( $order == 'party' ) { ?>
+                    <?php } else if ($order == 'party') { ?>
                     <li><strong>Sorted by</strong> Party</li>
                     <li>Sort by <a href="<?= $urls['by_first'] ?>">First name</a> / <a href="<?= $urls['by_last'] ?>">Last name</a></li>
                     <?php } else { ?>
@@ -123,7 +123,7 @@ 
                 </ul>
                 <?php } else { ?>
                 <ul class="search-result-display-options">
-                    <?php if ( $order == 'party' ) { ?>
+                    <?php if ($order == 'party') { ?>
                     <li><strong>Sorted by</strong> Party</li>
                     <li>Sort by <a href="<?= $urls['by_name'] ?>">Name</a></li>
                     <?php } else { ?>
@@ -173,10 +173,10 @@ 
                     }
                 }
                 $initial_link = '';
-                foreach ( $data as $person ) {
+                foreach ($data as $person) {
                     if ($order != 'party') {
-                        $initial = substr( strtoupper($person[$a_to_z_key]), 0, 1);
-                        if ( $initial != $current_initial ) {
+                        $initial = substr(strtoupper($person[$a_to_z_key]), 0, 1);
+                        if ($initial != $current_initial) {
                             $current_initial = $initial;
                             $initial_link = "name=\"$initial\" ";
                         } else {
@@ -188,7 +188,7 @@ 
                 <img class="people-list__person__image" src="<?= $person['image'] ?>">
                         <h2 class="people-list__person__name"><?= ucfirst($person['name']) ?></h2>
                         <p class="people-list__person__memberships">
-                        <?php if ( $person['constituency'] ) { ?>
+                        <?php if ($person['constituency']) { ?>
                         <span class="people-list__person__constituency"><?= $person['constituency'] ?></span>
                         <?php } ?>
                         <span class="people-list__person__party <?= strtolower($person['party']) ?>"><?= $person['party'] ?></span>
@@ -206,7 +206,7 @@ 
                 <a href="<?= $urls['by_csv'] ?>">Download this list as a CSV</a>
                     suitable for Excel
                 </p>
-                <?php if ( $type == 'mps' ) { ?>
+                <?php if ($type == 'mps') { ?>
                 <form method="get" action="<?= $urls['plain'] ?>" class="sidebar-item-with-icon sidebar-item-with-icon--date">
                     <p>
                         Or view a past list
@@ -250,7 +250,7 @@ 
                   })
                 });
                 </script>
-                <?php } else if ( $type == 'msps' ) { ?>
+                <?php } else if ($type == 'msps') { ?>
                     <p class="past-list-dates" id="past-list-dates">
                         <a href="<?= $urls['plain'] ?>?date=2011-05-05">MSPs at 2011 election</a>
                         <a href="<?= $urls['plain'] ?>?date=2007-05-03">MSPs at 2007 election</a>
@@ -264,7 +264,7 @@ 
                     </p>
                 <?php } ?>
 
-                <?php include( dirname(__FILE__) . '/../sidebar/looking_for.php' ) ?>
+                <?php include(dirname(__FILE__) . '/../sidebar/looking_for.php') ?>
             </div>
         </div>
 

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

Spacing +3 added lines, -3 removed lines

@@ -44,11 +44,11 @@
         ?></dt>
         <dd>
         <div class="appearance-date">
-            <div class="day"><?php echo format_date($row['hdate'], 'j' ) ?></div><!--
+            <div class="day"><?php echo format_date($row['hdate'], 'j') ?></div><!--
             <?php if ($year < $cur_year) { ?>
-            --><div class="month"><?php echo format_date($row['hdate'], 'M y' ) ?></div>
+            --><div class="month"><?php echo format_date($row['hdate'], 'M y') ?></div>
             <?php } else { ?>
-            --><div class="month"><?php echo format_date($row['hdate'], 'M' ) ?></div>
+            --><div class="month"><?php echo format_date($row['hdate'], 'M') ?></div>
             <?php } ?>
         </div>