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();
     }
 

Braces +8 added lines, -4 removed lines

@@ -34,10 +34,12 @@ 
     $always_ask = 0;
     $show_survey_qn = $current_question;
     setcookie('survey', $current_question, time()+60*60*24*365, '/');
-} elseif ($has_answered_question == $current_question && !$always_ask) {
+}
+elseif ($has_answered_question == $current_question && !$always_ask) {
     $show_survey_qn = $current_question;
     setcookie('survey', $current_question, time()+60*60*24*365, '/');
-} elseif (isset($_COOKIE['survey'])) {
+}
+elseif (isset($_COOKIE['survey'])) {
     $show_survey_qn = $_COOKIE['survey'];
 }
 
@@ -53,7 +55,8 @@ 
         global $MEMBER;
         $page_url = $MEMBER->url(true) . "?answered_survey=$current_question";
         $hide_url = $MEMBER->url() . "?hide_survey=$current_question";
-    } else {
+    }
+    else {
         $URL = new \MySociety\TheyWorkForYou\Url($this_page);
         $URL->insert(array('answered_survey' => $current_question ));
         $page_url = 'https://' . DOMAIN . $URL->generate();
@@ -105,7 +108,8 @@ 
 
 <?php
     $this->block_end();
-} elseif ($has_answered_question) {
+}
+elseif ($has_answered_question) {
     $this->block_start(array('id'=>'survey', 'title'=>"Mini survey"));
 ?>
     Thanks for answering.

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/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'
     )

Braces +12 added lines, -6 removed lines

@@ -43,17 +43,20 @@ 
         if ($todaystime - $debatesdata['timestamp'] == 86400) {
             $daytext = "yesterday's";
 
-        } elseif ($todaystime - $debatesdata['timestamp'] <= (6 * 86400)) {
+        }
+        elseif ($todaystime - $debatesdata['timestamp'] <= (6 * 86400)) {
             // Less than a week ago, so like "last Tuesday's".
             $daytext = gmdate('l', $debatesdata['timestamp']) . "'s";
 
-        } else {
+        }
+        else {
 
             // Over a week ago.
             $daytext = "the most recent ";
         }
 
-    } else {
+    }
+    else {
         // Debates and Wrans are from different dates. We'll just do this for now:
         $daytext = "the most recent ";
     }
@@ -61,7 +64,8 @@ 
 #	$hansardline = "Comment on $daytext <ul><li>$debatestext</li><li>$wranstext</li><li>$whalltext</li><li>$wmstext</li></ul>";
     $hansardline = "Comment on $daytext $debatestext, $wranstext, $whalltext, and $wmstext";
 
-} else {
+}
+else {
     // We didn't get some or all of the data, so just...
     $hansardline = "Comment on events in parliament";
 }
@@ -86,7 +90,8 @@ 
 
     if ($THEUSER->isloggedin()) {
         $CHANGEURL = new \MySociety\TheyWorkForYou\Url('useredit');
-    } else {
+    }
+    else {
         $CHANGEURL = new \MySociety\TheyWorkForYou\Url('userchangepc');
     }
     $MEMBER = new MEMBER(array ('postcode'=>$THEUSER->postcode(), 'house'=>1));
@@ -96,7 +101,8 @@ 
                         In <?php echo strtoupper(_htmlentities($THEUSER->postcode())); ?> (<a href="<?php echo $CHANGEURL->generate(); ?>">Change your postcode</a>)</p>
 <?php
 
-} else {
+}
+else {
     // User is not logged in and doesn't have a personal postcode set.
     ?>
                         <form action="<?php echo $MPURL->generate(); ?>" method="get">

classes/MiniSurvey.php

Spacing +6 added lines, -6 removed lines

@@ -25,10 +25,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'];
         }
@@ -38,18 +38,18 @@ 
 
             $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;
-                if ( $MEMBER ) {
+                if ($MEMBER) {
                     $page_url = $MEMBER->url(true) . "?answered_survey=$current_question";
                     $hide_url = $MEMBER->url() . "?hide_survey=$current_question";
                 }
             } else {
                 $URL = new 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 Url($this_page);
-                $URL->insert(array('hide_survey' => $current_question ));
+                $URL->insert(array('hide_survey' => $current_question));
                 $hide_url = $URL->generate();
             }
 

Braces +6 added lines, -3 removed lines

@@ -26,10 +26,12 @@ 
             $always_ask = 0;
             $show_survey_qn = $current_question;
             setcookie('survey', $current_question, time()+60*60*24*365, '/');
-        } elseif ($has_answered_question == $current_question && !$always_ask) {
+        }
+        elseif ($has_answered_question == $current_question && !$always_ask) {
             $show_survey_qn = $current_question;
             setcookie('survey', $current_question, time()+60*60*24*365, '/');
-        } elseif (isset($_COOKIE['survey'])) {
+        }
+        elseif (isset($_COOKIE['survey'])) {
             $show_survey_qn = $_COOKIE['survey'];
         }
 
@@ -44,7 +46,8 @@ 
                     $page_url = $MEMBER->url(true) . "?answered_survey=$current_question";
                     $hide_url = $MEMBER->url() . "?hide_survey=$current_question";
                 }
-            } else {
+            }
+            else {
                 $URL = new Url($this_page);
                 $URL->insert(array('answered_survey' => $current_question ));
                 $page_url = 'https://' . DOMAIN . $URL->generate();

classes/Renderer/User.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
         $edittext   = $menudata['text'];
         $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 = '';
@@ -58,7 +58,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') {

Braces +12 added lines, -6 removed lines

@@ -38,7 +38,8 @@ 
         //user logged in
         if ($this->user->isloggedin()) {
             $this->addLoggedInLinks();
-        } else {
+        }
+        else {
             $this->addLoggedOutLinks();
         }
     }
@@ -51,7 +52,8 @@ 
         $EDITURL    = new \MySociety\TheyWorkForYou\Url('userviewself');
         if ($this->page == 'userviewself' || $this->page == 'useredit' ) {
             $editclass = 'on';
-        } else {
+        }
+        else {
             $editclass = '';
         }
 
@@ -64,7 +66,8 @@ 
         if ($this->page != 'userlogout') {
             $LOGOUTURL->insert(array("ret"=>$this->returl));
             $logoutclass = '';
-        } else {
+        }
+        else {
             $logoutclass = 'on';
         }
 
@@ -105,7 +108,8 @@ 
                 $JOINURL->insert(array("ret"=>$this->returl));
             }
             $joinclass = '';
-        } else {
+        }
+        else {
             $joinclass = 'on';
         }
 
@@ -127,7 +131,8 @@ 
                 $LOGINURL->insert(array("ret"=>$this->returl));
             }
             $loginclass = '';
-        } else {
+        }
+        else {
             $loginclass = 'on';
         }
 
@@ -153,7 +158,8 @@ 
             $items = array('yourmp');
             if (\MySociety\TheyWorkForYou\Utility\Postcode::postcodeIsScottish($this->user->postcode())) {
                 $items[] = 'yourmsp';
-            } elseif (\MySociety\TheyWorkForYou\Utility\Postcode::postcodeIsNi($this->user->postcode())) {
+            }
+            elseif (\MySociety\TheyWorkForYou\Utility\Postcode::postcodeIsNi($this->user->postcode())) {
                 $items[] = 'yourmla';
             }