mysociety / theyworkforyou

www/includes/easyparliament/sidebars/minisurvey.php

Spacing +5 added lines, -5 removed lines

@@ -33,10 +33,10 @@ 
 if ($hide_question) {
     $always_ask = 0;
     $show_survey_qn = $current_question;
-    setcookie('survey', $current_question, time()+60*60*24*365, '/');
+    setcookie('survey', $current_question, time() + 60 * 60 * 24 * 365, '/');
 } elseif ($has_answered_question == $current_question && !$always_ask) {
     $show_survey_qn = $current_question;
-    setcookie('survey', $current_question, time()+60*60*24*365, '/');
+    setcookie('survey', $current_question, time() + 60 * 60 * 24 * 365, '/');
 } elseif (isset($_COOKIE['survey'])) {
     $show_survey_qn = $_COOKIE['survey'];
 }
@@ -49,16 +49,16 @@ 
 if ($show_survey_qn < $current_question && !$has_answered_question) {
     $page_url = '';
     $hide_url = '';
-    if ( in_array( $this_page, array('mp', 'peer', 'msp', 'mla', 'royal') ) ) {
+    if (in_array($this_page, array('mp', 'peer', 'msp', 'mla', 'royal'))) {
         global $MEMBER;
         $page_url = $MEMBER->url(true) . "?answered_survey=$current_question";
         $hide_url = $MEMBER->url() . "?hide_survey=$current_question";
     } else {
         $URL = new \MySociety\TheyWorkForYou\Url($this_page);
-        $URL->insert(array('answered_survey' => $current_question ));
+        $URL->insert(array('answered_survey' => $current_question));
         $page_url = 'https://' . DOMAIN . $URL->generate();
         $URL = new \MySociety\TheyWorkForYou\Url($this_page);
-        $URL->insert(array('hide_survey' => $current_question ));
+        $URL->insert(array('hide_survey' => $current_question));
         $hide_url = $URL->generate();
     }
 

www/docs/admin/badusers.php

Spacing +11 added lines, -11 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 include_once '../../includes/easyparliament/init.php';
-include_once (INCLUDESPATH."easyparliament/commentreportlist.php");
+include_once (INCLUDESPATH . "easyparliament/commentreportlist.php");
 
 $this_page = "admin_badusers";
 
@@ -32,7 +32,7 @@ 
 $rows = array();
 $USERURL = new \MySociety\TheyWorkForYou\Url('userview');
 
-for ($row=0; $row<$q->rows(); $row++) {
+for ($row = 0; $row < $q->rows(); $row++) {
 
     $user_id = $q->field($row, 'user_id');
 
@@ -43,7 +43,7 @@ 
 
     $totalcomments = $r->field(0, 'totalcount');
 
-    $percentagedeleted = ( $q->field($row, 'deletedcount') / $totalcomments ) * 100;
+    $percentagedeleted = ($q->field($row, 'deletedcount') / $totalcomments) * 100;
 
 
     // Get complaints made about this user's comments, but not upheld.
@@ -59,17 +59,17 @@ 
 
     $USERURL->insert(array('u'=>$user_id));
 
-    $rows[] = array (
+    $rows[] = array(
         '<a href="' . $USERURL->generate() . '">' . $q->field($row, 'firstname') . ' ' . $q->field($row, 'lastname') . '</a>',
         $totalcomments,
         $q->field($row, 'deletedcount'),
-        $percentagedeleted.'%',
+        $percentagedeleted . '%',
         $notupheldcount
     );
 }
 
-$tabledata = array (
-    'header' => array (
+$tabledata = array(
+    'header' => array(
         'Name',
         'Total comments',
         'Number deleted',
@@ -105,7 +105,7 @@ 
 $rows = array();
 $USERURL = new \MySociety\TheyWorkForYou\Url('userview');
 
-for ($row=0; $row<$q->rows(); $row++) {
+for ($row = 0; $row < $q->rows(); $row++) {
 
     $user_id = $q->field($row, 'user_id');
 
@@ -117,15 +117,15 @@ 
                     WHERE	user_id = '$user_id'
                     AND		upheld = '1'");
 
-    $rows[] = array (
+    $rows[] = array(
         '<a href="' . $USERURL->generate() . '">' . $q->field($row, 'firstname') . ' ' . $q->field($row, 'lastname') . '</a>',
         $q->field($row, 'rejectedcount'),
         $r->field(0, 'upheldcount')
     );
 
 }
-$tabledata = array (
-    'header' => array (
+$tabledata = array(
+    'header' => array(
         'Name',
         'Reports not upheld',
         'Reports upheld'

www/docs/admin/index.php

Spacing +7 added lines, -7 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 include_once '../../includes/easyparliament/init.php';
-include_once (INCLUDESPATH."easyparliament/commentreportlist.php");
+include_once (INCLUDESPATH . "easyparliament/commentreportlist.php");
 
 $this_page = "admin_home";
 
@@ -22,11 +22,11 @@ 
 $q = $db->query("SELECT COUNT(*) AS count FROM users WHERE confirmed = '0'");
 $unconfirmedusers = $q->field(0, 'count');
 
-$olddate = gmdate("Y-m-d H:i:s", time()-86400);
+$olddate = gmdate("Y-m-d H:i:s", time() - 86400);
 $q = $db->query("SELECT COUNT(*) AS count FROM users WHERE lastvisit > '$olddate'");
 $dayusers = $q->field(0, 'count');
 
-$olddate = gmdate("Y-m-d H:i:s", time()-86400*7);
+$olddate = gmdate("Y-m-d H:i:s", time() - 86400 * 7);
 $q = $db->query("SELECT COUNT(*) AS count FROM users WHERE lastvisit > '$olddate'");
 $weekusers = $q->field(0, 'count');
 ?>
@@ -61,7 +61,7 @@ 
 $rows = array();
 $USERURL = new \MySociety\TheyWorkForYou\Url('userview');
 
-for ($row=0; $row<$q->rows(); $row++) {
+for ($row = 0; $row < $q->rows(); $row++) {
 
     $user_id = $q->field($row, 'user_id');
 
@@ -76,7 +76,7 @@ 
         $name = _htmlspecialchars($q->field($row, 'firstname') . ' ' . $q->field($row, 'lastname'));
     }
 
-    $rows[] = array (
+    $rows[] = array(
         $name,
         '<a href="mailto:' . $q->field($row, 'email') . '">' . $q->field($row, 'email') . '</a>',
         $confirmed,
@@ -84,8 +84,8 @@ 
     );
 }
 
-$tabledata = array (
-    'header' => array (
+$tabledata = array(
+    'header' => array(
         'Name',
         'Email',
         'Confirmed?',

www/docs/user/prompt/index.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 $anchor = '#addcomment';
 
 $URL = new \MySociety\TheyWorkForYou\Url('userjoin');
-$URL->insert(array('ret'=>$returl.$anchor));
+$URL->insert(array('ret'=>$returl . $anchor));
 $joinurl = $URL->generate();
 
 

www/docs/index-election.php

Spacing +4 added lines, -4 removed lines

@@ -72,7 +72,7 @@ 
 $HANSARDURL = new \MySociety\TheyWorkForYou\Url('hansard');
 $MPURL = new \MySociety\TheyWorkForYou\Url('yourmp');
 
-$PAGE->block_start(array ('id'=>'intro', 'title'=>'Election special! Find out how they performed for YOU:'));
+$PAGE->block_start(array('id'=>'intro', 'title'=>'Election special! Find out how they performed for YOU:'));
 ?>
                         <ol>
 
@@ -89,7 +89,7 @@ 
     } else {
         $CHANGEURL = new \MySociety\TheyWorkForYou\Url('userchangepc');
     }
-    $MEMBER = new MEMBER(array ('postcode'=>$THEUSER->postcode(), 'house'=>1));
+    $MEMBER = new MEMBER(array('postcode'=>$THEUSER->postcode(), 'house'=>1));
     $mpname = $MEMBER->full_name();
     ?>
       <p><a href="<?php echo $MPURL->generate(); ?>"><strong>Find out more about how <?php echo $mpname; ?>, your ex-MP, represented you over the last parliament</strong></a><br>
@@ -185,11 +185,11 @@ 
 //$PAGE->block_end();
 
 $PAGE->stripe_end(array(
-    array (
+    array(
         'type' => 'include',
         'content' => 'whatisthissite'
     ),
-    array (
+    array(
         'type' => 'include',
         'content' => 'sitenews_recent'
     )

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 +17 added lines, -17 removed lines

@@ -83,7 +83,7 @@ 
         $source = explode('|||', $source);
         $q = $db->query("SELECT titles.title FROM titles LEFT JOIN titles_ignored ON titles.title=titles_ignored.title WHERE titles.title IN (" . join(',', array_keys($params)) . ") AND titles_ignored.title IS NULL", $params);
         $phrases = array();
-        for ($i=0; $i<$q->rows(); $i++) {
+        for ($i = 0; $i < $q->rows(); $i++) {
             $phrases[] = $q->field($i, 'title');
         }
 
@@ -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') {