mysociety / theyworkforyou

classes/Renderer.php

Spacing +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
         $user = new Renderer\User();
         $data = array_merge($user->data, $data);
 
-        if ( isset($page_errors) ) {
+        if (isset($page_errors)) {
             $data['page_errors'] = $page_errors;
         }
 
@@ -95,14 +95,14 @@ 
 
     private static function addCommonURLs($data) {
         $urls = array();
-        if ( isset($data['urls']) ) {
+        if (isset($data['urls'])) {
             $urls = $data['urls'];
         }
 
         $common_urls = array('search', 'alert');
 
-        foreach ( $common_urls as $path ) {
-            if (!isset($urls[$path]) ) {
+        foreach ($common_urls as $path) {
+            if (!isset($urls[$path])) {
                 $url = new Url($path);
                 $urls[$path] = $url->generate();
             }

Indentation +6 added lines, -6 removed lines

@@ -84,13 +84,13 @@
         // Require the templates and output
 
         if ($template_only) {
-          require_once INCLUDESPATH . 'easyparliament/templates/html/' . $template . '.php';
+            require_once INCLUDESPATH . 'easyparliament/templates/html/' . $template . '.php';
         } else {
-          header('Content-Type: text/html; charset=utf-8');
-          require_once INCLUDESPATH . 'easyparliament/templates/html/header.php';
-          require_once INCLUDESPATH . 'easyparliament/templates/html/' . $template . '.php';
-          require_once INCLUDESPATH . 'easyparliament/templates/html/footer.php';
-          exit;
+            header('Content-Type: text/html; charset=utf-8');
+            require_once INCLUDESPATH . 'easyparliament/templates/html/header.php';
+            require_once INCLUDESPATH . 'easyparliament/templates/html/' . $template . '.php';
+            require_once INCLUDESPATH . 'easyparliament/templates/html/footer.php';
+            exit;
         }
     }
 

www/docs/boundaries/index.php

Braces +7 added lines, -3 removed lines

@@ -21,7 +21,8 @@ 
 if ($pc) {
     # current will have WMC key. If Scottish, has SPC and SPE too. If NI, has NIE.
     $mapit = mapit_call('postcode', $pc);
-    if (is_object($mapit)) { # RABX error returns an object
+    if (is_object($mapit)) {
+# RABX error returns an object
         print '<p class="error">Afraid we couldn&rsquo;t find that postcode.</p>';
         $pc = '';
     }
@@ -134,8 +135,11 @@ 
 <li>You were in the <strong><?=$current['SPC']?></strong> constituency, in the <strong><?=$current['SPE']?></strong> region; your constituency MSP was <a href='<?=$mp_url?>'><?=$name?></a>, and your regional MSPs were <?php
         foreach ($mreg as $k => $n) {
             print "<a href='/msp/" . make_member_url($n, '', 4) . "'>$n</a>";
-            if ($k < count($mreg)-2) print ', ';
-            elseif ($k == count($mreg)-2) print ' and ';
+            if ($k < count($mreg)-2) {
+                print ', ';
+            } elseif ($k == count($mreg)-2) {
+                print ' and ';
+            }
         }
         echo '.</li>';
     } elseif ($country == 'N') {

Spacing +2 added lines, -2 removed lines

@@ -134,8 +134,8 @@
 <li>You were in the <strong><?=$current['SPC']?></strong> constituency, in the <strong><?=$current['SPE']?></strong> region; your constituency MSP was <a href='<?=$mp_url?>'><?=$name?></a>, and your regional MSPs were <?php
         foreach ($mreg as $k => $n) {
             print "<a href='/msp/" . make_member_url($n, '', 4) . "'>$n</a>";
-            if ($k < count($mreg)-2) print ', ';
-            elseif ($k == count($mreg)-2) print ' and ';
+            if ($k < count($mreg) - 2) print ', ';
+            elseif ($k == count($mreg) - 2) print ' and ';
         }
         echo '.</li>';
     } elseif ($country == 'N') {

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

Braces +2 added lines, -2 removed lines

@@ -148,10 +148,10 @@
                                             <p class="meta"><?php
                                                 $meta_items = array();
                                                 $meta_items[] = $events[$i]['debate_type'];
-                                                if( isset($events[$i]['time_start']) && $events[$i]['time_start'] != '00:00:00' ){
+                                                if( isset($events[$i]['time_start']) && $events[$i]['time_start'] != '00:00:00' ) {
                                                     $times = format_time($events[$i]['time_start'], 'g:i a');
 
-                                                    if( isset($events[$i]['time_end']) && $events[$i]['time_end'] != '00:00:00' ){
+                                                    if( isset($events[$i]['time_end']) && $events[$i]['time_end'] != '00:00:00' ) {
                                                         $times = $times . ' - ' . format_time($events[$i]['time_end'], 'g:i a');
                                                     }
                                                     $meta_items[] = $times;

Spacing +10 added lines, -10 removed lines

@@ -45,7 +45,7 @@ 
             <div class="panel panel--flushtop clearfix">
                 <div class="row nested-row">
                     <div class="homepage-in-the-news homepage-content-section">
-                        <?php if ( count($featured) > 0 ) {
+                        <?php if (count($featured) > 0) {
                             include 'homepage/featured.php';
                         } else { ?>
                             No debates found.
@@ -110,14 +110,14 @@ 
 
                         <h2>Recently in Parliament</h2>
                         <ul class="recently__list"><?php
-                            foreach ( $debates['recent'] as $recent ) {
+                            foreach ($debates['recent'] as $recent) {
                                 include 'homepage/recent-debates.php';
                             }
                         ?></ul>
                     </div>
                     <div class="homepage-upcoming homepage-content-section">
                         <h2>Upcoming</h2>
-                        <?php if ( count($calendar) ) { ?>
+                        <?php if (count($calendar)) { ?>
                         <div class="upcoming__controls">
                             <!--
                                 These controls should make the upcoming section slide to the next day.
@@ -136,24 +136,24 @@ 
                             </div>
                         </div>
                         <?php $first = true; $count = 0;
-                            foreach ( $calendar as $date => $places ) {
+                            foreach ($calendar as $date => $places) {
                                 $count++; ?>
                                 <div class="cal-wrapper <?= $first ? 'visible' : 'hidden' ?>" id="day-<?= $count ?>" data-count="<?= $count ?>" data-date="<?= format_date($date, SHORTDATEFORMAT); ?>">
                                 <?php foreach ($places as $place => $events) { ?>
                                     <?php $first = false; ?>
                                     <h3><?= $place ?></h3>
                                     <ul class="upcoming__list">
-                                        <?php for ( $i = 0; $i < 3; $i++ ) {
-                                            if ( isset( $events[$i] ) ) { ?>
+                                        <?php for ($i = 0; $i < 3; $i++) {
+                                            if (isset($events[$i])) { ?>
                                         <li>
                                             <h4 class="upcoming__title"><a href="<?= $events[$i]['link_external'] ?>"><?= $events[$i]['title'] ?></a></h4>
                                             <p class="meta"><?php
                                                 $meta_items = array();
                                                 $meta_items[] = $events[$i]['debate_type'];
-                                                if( isset($events[$i]['time_start']) && $events[$i]['time_start'] != '00:00:00' ){
+                                                if (isset($events[$i]['time_start']) && $events[$i]['time_start'] != '00:00:00') {
                                                     $times = format_time($events[$i]['time_start'], 'g:i a');
 
-                                                    if( isset($events[$i]['time_end']) && $events[$i]['time_end'] != '00:00:00' ){
+                                                    if (isset($events[$i]['time_end']) && $events[$i]['time_end'] != '00:00:00') {
                                                         $times = $times . ' - ' . format_time($events[$i]['time_end'], 'g:i a');
                                                     }
                                                     $meta_items[] = $times;
@@ -165,7 +165,7 @@ 
                                         <?php } ?>
                                         <?php } ?>
                                     </ul>
-                                    <?php if ( count($events) - 3 > 0 ) { ?>
+                                    <?php if (count($events) - 3 > 0) { ?>
                                     <a href="/calendar/?d=<?= format_date($date, 'Y-m-d') ?>" class="upcoming__more">And <?= count($events) - 3 ?> more</a><!-- (just links to relevant upcoming page) -->
                                     <?php } ?>
                             <?php } ?>
@@ -173,7 +173,7 @@ 
                         <?php } ?>
                         <?php } else {
                             list($recess, $from, $to) = recess_prettify(date('j'), date('n'), date('Y'), 1);
-                            if ( $recess ) { ?>
+                            if ($recess) { ?>
                                 <p>
                                 Parliament is on holiday until <?= format_date($to, LONGERDATEFORMAT) ?>.
                                 Follow us on <a href="https://twitter.com/theyworkforyou">Twitter</a> and you'll

classes/Utility/Wikipedia.php

Braces +15 added lines, -15 removed lines

@@ -99,8 +99,9 @@ 
 
             # See if already matched a string this one is contained within
             foreach ($matched as $got) {
-                if (strstr($got, $phrase))
-                    continue 2;
+                if (strstr($got, $phrase)) {
+                                    continue 2;
+                }
             }
 
             twfy_debug("WIKIPEDIA", "Matched '$phrase'");
@@ -119,8 +120,9 @@ 
             array_push($matched, $phrase);
         }
 
-        if (!$was_array)
-            $source = join('|||', $source);
+        if (!$was_array) {
+                    $source = join('|||', $source);
+        }
 
         return $source;
 
@@ -148,28 +150,26 @@ 
         {
           $nextopen = strpos( $content, '<', $walker );
           $nextclose = strpos( $content, '>', $walker );
-          if( $nextclose === false )
-            {    // ERROR! Open waka without close waka!
+          if( $nextclose === false ) {
+// ERROR! Open waka without close waka!
               // echo '<code>Error in antiTagInTag - malformed tag!</code> ';
               return $content;
             }
-          if( $nextopen === false || $nextopen > $nextclose )
-            { // No more opens, but there was a close; or, a close happens before the next open.
+          if( $nextopen === false || $nextopen > $nextclose ) {
+// No more opens, but there was a close; or, a close happens before the next open.
               // walker goes to the close+1, and open decrements
               $open --;
               $walker = $nextclose + 1;
-            }
-          elseif( $nextopen < $nextclose )
-            { // an open before the next close
+            } elseif( $nextopen < $nextclose ) {
+// an open before the next close
               $open ++;
               $walker = $nextopen + 1;
             }
         }
           $tagend = $walker;
-          if( $tagend > strlen( $content ) )
-        $tagend = strlen( $content );
-          else
-        {
+          if( $tagend > strlen( $content ) ) {
+                  $tagend = strlen( $content );
+          } else {
           $tagend --;
           $tagstart ++;
         }

Indentation +35 added lines, -35 removed lines

@@ -136,61 +136,61 @@
 
     public static function antiTagInTag($content = '', $format = 'htmlhead')
     {
-      $tagend = -1;
-      for( $tagstart = strpos( $content, '<', $tagend + 1 ) ; $tagstart !== false && $tagstart < strlen( $content ); $tagstart = strpos( $content, '<', $tagend ) )
+        $tagend = -1;
+        for( $tagstart = strpos( $content, '<', $tagend + 1 ) ; $tagstart !== false && $tagstart < strlen( $content ); $tagstart = strpos( $content, '<', $tagend ) )
         {
-          // got the start of a tag.  Now find the proper end!
-          $walker = $tagstart + 1;
-          $open = 1;
-          while( $open != 0 && $walker < strlen( $content ) )
+            // got the start of a tag.  Now find the proper end!
+            $walker = $tagstart + 1;
+            $open = 1;
+            while( $open != 0 && $walker < strlen( $content ) )
         {
-          $nextopen = strpos( $content, '<', $walker );
-          $nextclose = strpos( $content, '>', $walker );
-          if( $nextclose === false )
+            $nextopen = strpos( $content, '<', $walker );
+            $nextclose = strpos( $content, '>', $walker );
+            if( $nextclose === false )
             {    // ERROR! Open waka without close waka!
-              // echo '<code>Error in antiTagInTag - malformed tag!</code> ';
-              return $content;
+                // echo '<code>Error in antiTagInTag - malformed tag!</code> ';
+                return $content;
             }
-          if( $nextopen === false || $nextopen > $nextclose )
+            if( $nextopen === false || $nextopen > $nextclose )
             { // No more opens, but there was a close; or, a close happens before the next open.
-              // walker goes to the close+1, and open decrements
-              $open --;
-              $walker = $nextclose + 1;
+                // walker goes to the close+1, and open decrements
+                $open --;
+                $walker = $nextclose + 1;
             }
-          elseif( $nextopen < $nextclose )
+            elseif( $nextopen < $nextclose )
             { // an open before the next close
-              $open ++;
-              $walker = $nextopen + 1;
+                $open ++;
+                $walker = $nextopen + 1;
             }
         }
-          $tagend = $walker;
-          if( $tagend > strlen( $content ) )
+            $tagend = $walker;
+            if( $tagend > strlen( $content ) )
         $tagend = strlen( $content );
-          else
+            else
         {
-          $tagend --;
-          $tagstart ++;
+            $tagend --;
+            $tagstart ++;
         }
-          $tag = substr( $content, $tagstart, $tagend - $tagstart );
-          $tags[] = '<' . $tag . '>';
+            $tag = substr( $content, $tagstart, $tagend - $tagstart );
+            $tags[] = '<' . $tag . '>';
 
-          if (function_exists('format_to_output')) {
+            if (function_exists('format_to_output')) {
             $newtag = format_to_output($tag, $format);
-          } else {
+            } else {
             $newtag = strip_tags($tag);
-          }
+            }
 
-          $newtags[] = '<' . $newtag . '>';
+            $newtags[] = '<' . $newtag . '>';
 
-          if (function_exists('format_to_output')) {
+            if (function_exists('format_to_output')) {
             $newtag = format_to_output($tag, $format);
-          } else {
+            } else {
             $newtag = strip_tags($tag);
-          }
+            }
+        }
+        if (isset($tags)&&isset($newtags)) {
+        $content = str_replace($tags, $newtags, $content);
         }
-      if (isset($tags)&&isset($newtags)) {
-      $content = str_replace($tags, $newtags, $content);
-      }
 
     return $content;
 

Spacing +16 added lines, -16 removed lines

@@ -105,7 +105,7 @@ 
 
             twfy_debug("WIKIPEDIA", "Matched '$phrase'");
             # 1 means only replace one match for phrase per paragraph
-            $source = preg_replace ('{
+            $source = preg_replace('{
             \b(' . $phrase_re . ')\b # Match the phrase itself
             (?!                      # Match as long as the following does *not* apply:
                 (?:                  #   Match, possessively, as many strings of:
@@ -137,41 +137,41 @@ 
     public static function antiTagInTag($content = '', $format = 'htmlhead')
     {
       $tagend = -1;
-      for( $tagstart = strpos( $content, '<', $tagend + 1 ) ; $tagstart !== false && $tagstart < strlen( $content ); $tagstart = strpos( $content, '<', $tagend ) )
+      for ($tagstart = strpos($content, '<', $tagend + 1); $tagstart !== false && $tagstart < strlen($content); $tagstart = strpos($content, '<', $tagend))
         {
           // got the start of a tag.  Now find the proper end!
           $walker = $tagstart + 1;
           $open = 1;
-          while( $open != 0 && $walker < strlen( $content ) )
+          while ($open != 0 && $walker < strlen($content))
         {
-          $nextopen = strpos( $content, '<', $walker );
-          $nextclose = strpos( $content, '>', $walker );
-          if( $nextclose === false )
+          $nextopen = strpos($content, '<', $walker);
+          $nextclose = strpos($content, '>', $walker);
+          if ($nextclose === false)
             {    // ERROR! Open waka without close waka!
               // echo '<code>Error in antiTagInTag - malformed tag!</code> ';
               return $content;
             }
-          if( $nextopen === false || $nextopen > $nextclose )
+          if ($nextopen === false || $nextopen > $nextclose)
             { // No more opens, but there was a close; or, a close happens before the next open.
               // walker goes to the close+1, and open decrements
-              $open --;
+              $open--;
               $walker = $nextclose + 1;
             }
-          elseif( $nextopen < $nextclose )
+          elseif ($nextopen < $nextclose)
             { // an open before the next close
-              $open ++;
+              $open++;
               $walker = $nextopen + 1;
             }
         }
           $tagend = $walker;
-          if( $tagend > strlen( $content ) )
-        $tagend = strlen( $content );
+          if ($tagend > strlen($content))
+        $tagend = strlen($content);
           else
         {
-          $tagend --;
-          $tagstart ++;
+          $tagend--;
+          $tagstart++;
         }
-          $tag = substr( $content, $tagstart, $tagend - $tagstart );
+          $tag = substr($content, $tagstart, $tagend - $tagstart);
           $tags[] = '<' . $tag . '>';
 
           if (function_exists('format_to_output')) {
@@ -188,7 +188,7 @@ 
             $newtag = strip_tags($tag);
           }
         }
-      if (isset($tags)&&isset($newtags)) {
+      if (isset($tags) && isset($newtags)) {
       $content = str_replace($tags, $newtags, $content);
       }
 

classes/Db/Query.php

Braces +9 added lines, -5 removed lines

@@ -130,7 +130,9 @@ 
             $this->error($this->conn->errorCode() . ': ' . $this->conn->errorInfo()[2]);
         }
 
-        if (!$this->success) return;
+        if (!$this->success) {
+            return;
+        }
 
         if ((!$pdoStatement) or (empty($pdoStatement))) {
             // A failed query.
@@ -180,8 +182,9 @@ 
      * @param string $column_name
      */
     public function field($row_index, $column_name) {
-        if ($this->rows > 0)
-            return $this->data[$row_index][$column_name];
+        if ($this->rows > 0) {
+                    return $this->data[$row_index][$column_name];
+        }
         return "";
     }
 
@@ -196,8 +199,9 @@ 
      * @param integer $row_index
      */
     public function row($row_index) {
-        if ($this->success && $this->rows > 0)
-            return $this->data[$row_index];
+        if ($this->success && $this->rows > 0) {
+                    return $this->data[$row_index];
+        }
         return array();
     }
 

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'];
         }