mysociety / theyworkforyou

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

Spacing +3 added lines, -3 removed lines

@@ -157,7 +157,7 @@ 
         }(document, 'script', 'facebook-jssdk'));
     </script>
 
-  <?php if ( $banner_text ) { ?>
+  <?php if ($banner_text) { ?>
     <div class="banner">
         <div class="full-page__row">
             <div class="banner__content">
@@ -234,7 +234,7 @@ 
 
                 <div class="site-nav__user">
                     <ul>
-                      <?php foreach ($user_nav_links as $nav_link){ ?>
+                      <?php foreach ($user_nav_links as $nav_link) { ?>
                         <li><a href="<?= $nav_link['href']; ?>" title="<?= $nav_link['title']; ?>" class="<?= $nav_link['classes']; ?>">
                             <?= $nav_link['text'] ?>
                         </a></li>
@@ -268,7 +268,7 @@ 
     <div class="full-page legacy-page static-page">
         <div class="full-page__row">
             <div class="panel">
-            <?php foreach ( $page_errors as $error ) { ?>
+            <?php foreach ($page_errors as $error) { ?>
                 <p><?= $error['text'] ?></p>
             <?php } ?>
             </div>

classes/Renderer/User.php

Spacing +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
         $menudata   = $this->pagedata->page_metadata('userviewself', 'menu');
         $edittitle  = $menudata['title'];
         $EDITURL    = new \MySociety\TheyWorkForYou\Url('userviewself');
-        if ($this->page == 'userviewself' || $this->page == 'useredit' ) {
+        if ($this->page == 'userviewself' || $this->page == 'useredit') {
             $editclass = 'on';
         } else {
             $editclass = '';
@@ -56,7 +56,7 @@ 
         // The 'Log out' link.
         $menudata   = $this->pagedata->page_metadata('userlogout', 'menu');
         $logouttext = $menudata['text'];
-        $logouttitle= $menudata['title'];
+        $logouttitle = $menudata['title'];
 
         $LOGOUTURL  = new \MySociety\TheyWorkForYou\Url('userlogout');
         if ($this->page != 'userlogout') {

tests/UserPageTest.php

Spacing +7 added lines, -7 removed lines

@@ -8,7 +8,7 @@ 
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/user.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/user.xml');
     }
 
     private function fetch_page($vars)
@@ -16,14 +16,14 @@ 
         return $this->base_fetch_page($vars, 'user');
     }
 
-    private function fetch_user_page( $vars = array(), $page = 'user' )
+    private function fetch_user_page($vars = array(), $page = 'user')
     {
-        return $this->base_fetch_page_user( $vars, '1.fbb689a0c092f5534b929d302db2c8a9', $page );
+        return $this->base_fetch_page_user($vars, '1.fbb689a0c092f5534b929d302db2c8a9', $page);
     }
 
     public function testLoginPageLoads()
     {
-        $page = $this->base_fetch_page( array(), 'user/login' );
+        $page = $this->base_fetch_page(array(), 'user/login');
         $this->assertContains('Sign in', $page);
     }
 
@@ -34,7 +34,7 @@ 
             'password' => 'password',
             'submitted' => 'true',
         );
-        $page = $this->base_fetch_page( $vars, 'user/login' );
+        $page = $this->base_fetch_page($vars, 'user/login');
         # it's a redirect which means we should get nothing
         # as we're using the cli version of php :(
         $this->assertEquals('', $page);
@@ -49,7 +49,7 @@ 
 
     public function testEditUserInfo()
     {
-        $page = $this->fetch_user_page( array('pg' => 'edit' ) );
+        $page = $this->fetch_user_page(array('pg' => 'edit'));
         $this->assertContains('Edit your details', $page);
         $this->assertContains('name="pg" value="edit"', $page);
         $this->assertContains('value="Test"', $page);
@@ -62,7 +62,7 @@ 
             'email' => 'user@example.org',
             'submitted' => 'true',
         );
-        $page = $this->fetch_user_page( $vars );
+        $page = $this->fetch_user_page($vars);
         $this->assertContains('Example User', $page);
     }
 }

www/docs/admin/profile-message.php

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

@@ -91,6 +91,6 @@
     <span class="formw"><input type="submit" name="submit" value="Update"></span>
 </div>
 </form>
-EOF;
+eof;
     return $out;
 }

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
         if ($row['constituency']) {
             $desc .= ', ' . $row['constituency'];
         }
-        $out .= '<option value="'.$p_id.'">'.$desc.'</option>' . "\n";
+        $out .= '<option value="' . $p_id . '">' . $desc . '</option>' . "\n";
     }
 
     $out .= ' </select></span> </div> ';

Braces +3 added lines, -1 removed lines

@@ -43,7 +43,9 @@
         $house = $row['house'];
         $desc = member_full_name($house, $row['title'], $row['given_name'], $row['family_name'], $row['lordofname']) .
                 " " . $houses[$house];
-        if ($row['party']) $desc .= ' (' . $row['party'] . ')';
+        if ($row['party']) {
+            $desc .= ' (' . $row['party'] . ')';
+        }
         if ($row['constituency']) {
             $desc .= ', ' . $row['constituency'];
         }

tests/AlertsTest.php

Spacing +4 added lines, -4 removed lines

@@ -11,7 +11,7 @@ 
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/alerts.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/alerts.xml');
     }
 
     /**
@@ -31,7 +31,7 @@ 
     {
         $ALERT = new ALERT();
 
-        $response = $ALERT->fetch(0,0);
+        $response = $ALERT->fetch(0, 0);
 
         // Make sure we only get one response
         $this->assertEquals(1, count($response['data']));
@@ -48,7 +48,7 @@ 
     {
         $ALERT = new ALERT();
 
-        $response = $ALERT->fetch(1,0);
+        $response = $ALERT->fetch(1, 0);
 
         // Make sure we only get two responses
         $this->assertEquals(2, count($response['data']));
@@ -65,7 +65,7 @@ 
     {
         $ALERT = new ALERT();
 
-        $response = $ALERT->fetch_between(1,0, '2014-02-03', '2014-02-04');
+        $response = $ALERT->fetch_between(1, 0, '2014-02-03', '2014-02-04');
 
         // Make sure we only get one response
         $this->assertEquals(1, count($response['alerts']));

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

Braces +2 added lines, -1 removed lines

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

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 != HOUSE_TYPE_ROYAL ) { ?>
+              <?php if (isset($error)) { ?>
+                <?php if ($error == 'No results' && isset($house) && $house != HOUSE_TYPE_ROYAL) { ?>
                   <ul class="search-result-display-options">
                       <li>
-                        <?php if ( $house ==  HOUSE_TYPE_COMMONS) { ?>
+                        <?php if ($house == HOUSE_TYPE_COMMONS) { ?>
                           No results for MPs only
-                        <?php } else if ( $house ==  HOUSE_TYPE_LORDS) { ?>
+                        <?php } else if ($house == HOUSE_TYPE_LORDS) { ?>
                           No results for Peers only
-                        <?php } else if ( $house == HOUSE_TYPE_SCOTLAND) { ?>
+                        <?php } else if ($house == HOUSE_TYPE_SCOTLAND) { ?>
                           No results for MSPs only
-                        <?php } else if ( $house ==  HOUSE_TYPE_NI) { ?>
+                        <?php } else if ($house == HOUSE_TYPE_NI) { ?>
                           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,
                 follow the "I want to write to (name of lord)" link 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 ==  HOUSE_TYPE_ROYAL) { ?>
+                          <?php if ($house == HOUSE_TYPE_ROYAL) { ?>
                             Show All
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html') ?>">Show All</a>
                           <?php } ?>
                             |
-                          <?php if ( $house ==  HOUSE_TYPE_COMMONS) { ?>
+                          <?php if ($house == HOUSE_TYPE_COMMONS) { ?>
                             MPs only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', array('house'=>1)) ?>">MPs only</a>
                           <?php } ?>
                             |
-                          <?php if ( $house ==  HOUSE_TYPE_LORDS) { ?>
+                          <?php if ($house == HOUSE_TYPE_LORDS) { ?>
                             Peers only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', array('house'=>2)) ?>">Lords only</a>
                           <?php } ?>
                             |
-                          <?php if ( $house ==  HOUSE_TYPE_SCOTLAND) { ?>
+                          <?php if ($house == HOUSE_TYPE_SCOTLAND) { ?>
                             MSPs only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', array('house'=>4)) ?>">MSPs only</a>
                           <?php } ?>
                             |
-                          <?php if ( $house ==  HOUSE_TYPE_NI) { ?>
+                          <?php if ($house == HOUSE_TYPE_NI) { ?>
                             MLAs only
                           <?php } else { ?>
                             <a href="<?= $this_url->generate('html', array('house'=>HOUSE_TYPE_NI)) ?>">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 !=  HOUSE_TYPE_LORDS) { ?>
+                                <?php if ($house != HOUSE_TYPE_LORDS) { ?>
                                   <?= 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') ?>

www/includes/dbtypes.php

Spacing +9 added lines, -9 removed lines

@@ -3,8 +3,8 @@ 
 // $Id: dbtypes.php,v 1.8 2009-04-28 13:13:04 matthew Exp $
 
 // The type field in the epobject database table
-define ('EPTYPE_HANSARD', 1);
-define ('EPTYPE_GLOSSARY', 2);
+define('EPTYPE_HANSARD', 1);
+define('EPTYPE_GLOSSARY', 2);
 
 // The major field in the hansard database table
 $hansardmajors = array(
@@ -121,7 +121,7 @@ 
 );
 $hansardmajors[104] = $hansardmajors[4];
 
-$parties = array (
+$parties = array(
     'Bp'    => 'Bishop',
     'Con'   => 'Conservative',
     'CWM'   => 'Deputy Speaker',
@@ -162,9 +162,9 @@ 
 */
 
 // Constants for various house types
-define ('HOUSE_TYPE_ROYAL', 0);
-define ('HOUSE_TYPE_COMMONS', 1);
-define ('HOUSE_TYPE_LORDS', 2);
-define ('HOUSE_TYPE_NI', 3);
-define ('HOUSE_TYPE_SCOTLAND', 4);
-define ('HOUSE_TYPE_WALES', 5);
+define('HOUSE_TYPE_ROYAL', 0);
+define('HOUSE_TYPE_COMMONS', 1);
+define('HOUSE_TYPE_LORDS', 2);
+define('HOUSE_TYPE_NI', 3);
+define('HOUSE_TYPE_SCOTLAND', 4);
+define('HOUSE_TYPE_WALES', 5);

classes/EditQueue.php

Indentation +3 added lines, -3 removed lines

@@ -160,9 +160,9 @@
                                     VALUES
                                     (:id, :type, :enabled);',
                                     array(
-                                      ':id' => $q->insert_id(),
-                                      ':type' => EPTYPE_GLOSSARY,
-                                      ':enabled' => 1,
+                                        ':id' => $q->insert_id(),
+                                        ':type' => EPTYPE_GLOSSARY,
+                                        ':enabled' => 1,
                                     ));
                     // Again, no point carrying on if this fails,
                     // so remove the previous entry

Braces +3 added lines, -6 removed lines

@@ -194,8 +194,7 @@ 
                             ));
             if (!$q->success()) {
                 break;
-            }
-            else {
+            } else {
                 // Now send them an email telling them they've been approved
 
 
@@ -236,8 +235,7 @@ 
                             WHERE edit_id=" . $decline_id . ";");
             if (!$q->success()) {
                 break;
-            }
-            else {
+            } else {
                 // Scrub that one from the list of pending items
                 unset ($this->pending[$decline_id]);
             }
@@ -275,8 +273,7 @@ 
             $this->update_pending_count();
 
             return true;
-        }
-        else {
+        } else {
             return false;
         }
     }

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

Indentation +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
                 } else if ($the_users_mp) {
                     $wtt_url = $wtt_url . "?a=WMC&pc=" . _htmlentities(urlencode($user_postcode));
                 }
-              ?>
+                ?>
                 <a href="<?= $wtt_url ?>" class="button" onclick="trackLinkClick(this, 'Links', 'WriteToThem', 'Person'); return false;">Send a message</a>
               <?php } ?>
               <?php if ($has_email_alerts) { ?>

Spacing +6 added lines, -6 removed lines

@@ -1,9 +1,9 @@ 
 <div class="person-header <?= $current_member_anywhere ? '' : 'person-header--historical'; ?>">
     <div class="full-page__row">
         <div class="full-page__unit">
-          <?php if ( $image ) { ?>
+          <?php if ($image) { ?>
             <div class="person-header__image <?= $image['size'] == 'S' ? 'person-header__image--small' : '' ?>">
-              <?php if ( $image['size'] == 'S' ) { ?>
+              <?php if ($image['size'] == 'S') { ?>
                 <span style="background-image: url('<?= $image['url'] ?>');"></span>
               <?php } ?>
                 <img src="<?= $image['url'] ?>">
@@ -11,19 +11,19 @@ 
           <?php } ?>
             <div class="person-header__about">
                 <h1 class="person-header__about__name"><?= ucfirst($full_name) ?></h1>
-              <?php if ( $known_for ) { ?>
+              <?php if ($known_for) { ?>
                 <p class="person-header__about__known-for">
                     <?= $known_for ?>
                 </p>
               <?php } ?>
-              <?php if ( $latest_membership && $latest_membership['house'] != HOUSE_TYPE_ROYAL ) { ?>
+              <?php if ($latest_membership && $latest_membership['house'] != HOUSE_TYPE_ROYAL) { ?>
                 <p class="person-header__about__position">
                     <span class="person-header__about__position__role">
                         <?= $latest_membership['current'] ? '' : 'Former' ?>
                         <?= $latest_membership['party'] == 'Bishop' ? '' : $latest_membership['party'] ?>
                         <?= $latest_membership['rep_name'] ?>
                     </span>
-                  <?php if ( $latest_membership['constituency'] ) { ?>
+                  <?php if ($latest_membership['constituency']) { ?>
                     for
                     <span class="person-header__about__position__constituency">
                         <?= $latest_membership['constituency'] ?>
@@ -33,7 +33,7 @@ 
               <?php } ?>
               <?php if (count($social_links) > 0) { ?>
                 <p class="person-header__about__media">
-                  <?php foreach ($social_links as $link){ ?>
+                  <?php foreach ($social_links as $link) { ?>
                       <a href="<?= $link['href'] ?>" onclick="trackLinkClick(this, 'Social-Link', '<?= $link['type'] ?>', '<?= $link['text'] ?>'); return false;"><?= $link['text'] ?></a>
                   <?php } ?>
                 </p>