mysociety / theyworkforyou

classes/Member.php

Indentation +36 added lines, -36 removed lines

@@ -137,7 +137,7 @@ 
         and party != ''
         order by entered_house
         " . $direction, array(":house" => $house,
-                 ":person_id" => $person_id))->first();
+                    ":person_id" => $person_id))->first();
         if ($row) {
             $party = $row["party"];
             if ( $party == 'Labour/Co-operative' ) {
@@ -226,12 +226,12 @@ 
     }
 
     /**
-    * Image
-    *
-    * Return a URL for the member's image.
-    *
-    * @return string The URL of the member's image.
-    */
+     * Image
+     *
+     * Return a URL for the member's image.
+     *
+     * @return string The URL of the member's image.
+     */
 
     public function image() {
 
@@ -284,15 +284,15 @@ 
     }
 
     /**
-    * Offices
-    *
-    * Return an array of Office objects held (or previously held) by the member.
-    *
-    * @param string $include_only  Restrict the list to include only "previous" or "current" offices.
-    * @param bool   $ignore_committees Ignore offices that appear to be committee memberships.
-    *
-    * @return array An array of Office objects.
-    */
+     * Offices
+     *
+     * Return an array of Office objects held (or previously held) by the member.
+     *
+     * @param string $include_only  Restrict the list to include only "previous" or "current" offices.
+     * @param bool   $ignore_committees Ignore offices that appear to be committee memberships.
+     *
+     * @return array An array of Office objects.
+     */
 
     public function offices($include_only = null, $ignore_committees = false) {
 
@@ -346,12 +346,12 @@ 
     }
 
     /**
-    * Get Other Parties String
-    *
-    * Return a readable list of party changes for this member.
-    *
-    * @return string|null A readable list of the party changes for this member.
-    */
+     * Get Other Parties String
+     *
+     * Return a readable list of party changes for this member.
+     *
+     * @return string|null A readable list of the party changes for this member.
+     */
 
     public function getOtherPartiesString() {
 
@@ -370,12 +370,12 @@ 
     }
 
     /**
-    * Get Other Constituencies String
-    *
-    * Return a readable list of other constituencies for this member.
-    *
-    * @return string|null A readable list of the other constituencies for this member.
-    */
+     * Get Other Constituencies String
+     *
+     * Return a readable list of other constituencies for this member.
+     *
+     * @return string|null A readable list of the other constituencies for this member.
+     */
 
     public function getOtherConstituenciesString() {
 
@@ -388,14 +388,14 @@ 
     }
 
     /**
-    * Get Entered/Left Strings
-    *
-    * Return an array of readable strings covering when people entered or left
-    * various houses. Returns an array since it's possible for a member to have
-    * done several of these things.
-    *
-    * @return array An array of strings of when this member entered or left houses.
-    */
+     * Get Entered/Left Strings
+     *
+     * Return an array of readable strings covering when people entered or left
+     * various houses. Returns an array since it's possible for a member to have
+     * done several of these things.
+     *
+     * @return array An array of strings of when this member entered or left houses.
+     */
     public function getEnterLeaveStrings() {
         $output = array();
 

Spacing +26 added lines, -26 removed lines

@@ -91,17 +91,17 @@ 
         return $direction;
     }
 
-    public function currentPartyComparison(){
+    public function currentPartyComparison() {
         # Simplify the current party when being compared to the original
         # Stops co-op and labour being seen as different
         $party = $this->party;
-        if ( $party == 'Labour/Co-operative' ) {
+        if ($party == 'Labour/Co-operative') {
             $party = 'Labour';
         }
         return $party;
     }
 
-    public function cohortParty($house = HOUSE_TYPE_COMMONS){
+    public function cohortParty($house = HOUSE_TYPE_COMMONS) {
         // The party being compared against for party comparison purposes
         // Unless specified by the condition in cohortPartyComparisonDirection
         // This is the first, not last, party a person has.
@@ -126,7 +126,7 @@ 
                  ":person_id" => $person_id))->first();
         if ($row) {
             $party = $row["party"];
-            if ( $party == 'Labour/Co-operative' ) {
+            if ($party == 'Labour/Co-operative') {
                 $party = 'Labour';
             } elseif ($party == 'Sinn Féin') {
                 $party = 'Sinn Fein';
@@ -156,7 +156,7 @@ 
             $now = new \DateTime();
 
             $diff = $date_entered->diff($now);
-            if ( $diff->y == 0 && $diff->m <= 6 ) {
+            if ($diff->y == 0 && $diff->m <= 6) {
                 return true;
             }
         }
@@ -177,7 +177,7 @@ 
 
         $entered_house = $this->entered_house($house);
 
-        if ( $entered_house ) {
+        if ($entered_house) {
             $date_entered = $entered_house['date'];
         }
 
@@ -197,7 +197,7 @@ 
 
         $left_house = $this->left_house($house);
 
-        if ( $left_house ) {
+        if ($left_house) {
             $date_left = $left_house['date'];
         }
 
@@ -225,9 +225,9 @@ 
 
         $is_lord = $this->house(HOUSE_TYPE_LORDS);
         if ($is_lord) {
-            list($image,$size) = Utility\Member::findMemberImage($this->person_id(), false, 'lord');
+            list($image, $size) = Utility\Member::findMemberImage($this->person_id(), false, 'lord');
         } else {
-            list($image,$size) = Utility\Member::findMemberImage($this->person_id(), false, true);
+            list($image, $size) = Utility\Member::findMemberImage($this->person_id(), false, true);
         }
 
         // We can determine if the image exists or not by testing if size is set
@@ -250,10 +250,10 @@ 
 
         usort(
             $departures,
-            function ($a, $b) {
-                if ( $a['date'] == $b['date'] ) {
+            function($a, $b) {
+                if ($a['date'] == $b['date']) {
                     return 0;
-                } else if ( $a['date'] < $b['date'] ) {
+                } else if ($a['date'] < $b['date']) {
                     return -1;
                 } else {
                     return 1;
@@ -291,7 +291,7 @@ 
             $office = $office['office'];
 
             foreach ($office as $row) {
-                if ( $officeObject = $this->getOfficeObject($include_only, $ignore_committees, $row) ) {
+                if ($officeObject = $this->getOfficeObject($include_only, $ignore_committees, $row)) {
                     $out[] = $officeObject;
                 }
             }
@@ -430,7 +430,7 @@ 
     private function entered_house_line($house, $house_name) {
         if (isset($this->entered_house[$house]['date'])) {
             $string = "<strong>";
-            if (strlen($this->entered_house[$house]['date_pretty'])==4) {
+            if (strlen($this->entered_house[$house]['date_pretty']) == 4) {
                 $string .= sprintf(gettext("Entered the %s in %s"), $house_name, $this->entered_house[$house]['date_pretty']);
             } else {
                 $string .= sprintf(gettext("Entered the %s on %s"), $house_name, $this->entered_house[$house]['date_pretty']);
@@ -446,7 +446,7 @@ 
     private function left_house_line($house, $house_name) {
         if ($this->house($house) && !$this->current_member($house)) {
             $string = "<strong>";
-            if (strlen($this->left_house[$house]['date_pretty'])==4) {
+            if (strlen($this->left_house[$house]['date_pretty']) == 4) {
                 $string .= sprintf(gettext("Left the %s in %s"), $house_name, $this->left_house[$house]['date_pretty']);
             } else {
                 $string .= sprintf(gettext("Left the %s on %s"), $house_name, $this->left_house[$house]['date_pretty']);
@@ -463,12 +463,12 @@ 
         $policy_diffs = array();
         $party_positions = $partyCohort->getAllPolicyPositions($policiesList);
 
-        if ( !$party_positions ) {
+        if (!$party_positions) {
             return $policy_diffs;
         }
 
-        foreach ( $positions->positionsById as $policy_id => $details ) {
-            if ( $details['has_strong'] && $details['score'] != -1 && isset($party_positions[$policy_id])) {
+        foreach ($positions->positionsById as $policy_id => $details) {
+            if ($details['has_strong'] && $details['score'] != -1 && isset($party_positions[$policy_id])) {
                 $mp_score = $details['score'];
                 $party_position = $party_positions[$policy_id];
                 $party_score = $party_position['score'];
@@ -500,18 +500,18 @@ 
         return $policy_diffs;
     }
 
-    private function calculatePolicyDiffScore( $mp_score, $party_score ) {
+    private function calculatePolicyDiffScore($mp_score, $party_score) {
         $score_diff = abs($mp_score - $party_score);
         // if they are on opposite sides of mixture of for and against
         if (
-            ( $mp_score < 0.4 && $party_score > 0.6 ) ||
-            ( $mp_score > 0.6 && $party_score < 0.4 )
+            ($mp_score < 0.4 && $party_score > 0.6) ||
+            ($mp_score > 0.6 && $party_score < 0.4)
         ) {
             $score_diff += 2;
         // if on is mixture of for and against and one is for/against
         } else if (
-            ( $mp_score > 0.4 && $mp_score < 0.6 && ( $party_score > 0.6 || $party_score < 0.4 ) ) ||
-            ( $party_score > 0.4 && $party_score < 0.6 && ( $mp_score > 0.6 || $mp_score < 0.4 ) )
+            ($mp_score > 0.4 && $mp_score < 0.6 && ($party_score > 0.6 || $party_score < 0.4)) ||
+            ($party_score > 0.4 && $party_score < 0.6 && ($mp_score > 0.6 || $mp_score < 0.4))
         ) {
             $score_diff += 1;
         }
@@ -524,7 +524,7 @@ 
 
         $mreg = array();
         $constituencies = \MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituencies($postcode);
-        if ( isset($constituencies[$type]) ) {
+        if (isset($constituencies[$type])) {
             $cons_name = $constituencies[$type];
             $query_base = "SELECT member.person_id, title, lordofname, given_name, family_name, constituency, house
                 FROM member, person_names
@@ -541,7 +541,7 @@ 
                     ':cons_name' => $cons_name
                 )
             );
-            if ( !$q->rows() && ($dissolution = Dissolution::db()) ) {
+            if (!$q->rows() && ($dissolution = Dissolution::db())) {
                 $q = $db->query("$query_base AND $dissolution[query]",
                     array(
                         ':house' => $house,
@@ -565,7 +565,7 @@ 
     }
 
     public static function getRepNameForHouse($house) {
-        switch ( $house ) {
+        switch ($house) {
             case HOUSE_TYPE_COMMONS:
                 $name = 'MP';
                 break;

www/docs/regmem/index.php

Spacing +21 added lines, -21 removed lines

@@ -67,7 +67,7 @@ 
         $file = _load_file($_);
         $date = preg_replace("#$dir/regmem(.*?)\.xml#", '$1', $_);
         $data[$_] = array();
-        if (preg_match('#<regmem personid="uk.org.publicwhip/person/'.$p.'" (?:memberid="(.*?)" )?membername="(.*?)" date="(.*?)">(.*?)</regmem>#s', $file, $m)) {
+        if (preg_match('#<regmem personid="uk.org.publicwhip/person/' . $p . '" (?:memberid="(.*?)" )?membername="(.*?)" date="(.*?)">(.*?)</regmem>#s', $file, $m)) {
             $earliest = $_;
             if (!$name) {
                 $name = $m[2];
@@ -103,21 +103,21 @@ 
             break;
         }
         $date_pre = preg_replace("#$dir/regmem(.*?)\.xml#", '$1', $_);
-        $date_post = preg_replace("#$dir/regmem(.*?)\.xml#", '$1', $files[$i+1]);
+        $date_post = preg_replace("#$dir/regmem(.*?)\.xml#", '$1', $files[$i + 1]);
         $pretty = format_date($date_pre, LONGDATEFORMAT);
         $oout = '';
         foreach ($data[$_] as $cat_type => $cat_data) {
-            $old = array_key_exists($cat_type, $data[$files[$i+1]]) ? $data[$files[$i+1]][$cat_type] : '';
+            $old = array_key_exists($cat_type, $data[$files[$i + 1]]) ? $data[$files[$i + 1]][$cat_type] : '';
             $new = $data[$_][$cat_type];
             if ($diff = clean_diff($old, $new)) {
                 $oout .= cat_heading($cat_type, $date_pre, $date_post) . $diff;
             }
         }
-        foreach ($data[$files[$i+1]] as $cat_type => $cat_data) {
+        foreach ($data[$files[$i + 1]] as $cat_type => $cat_data) {
             if (array_key_exists($cat_type, $data[$_])) {
                 continue;
             }
-            if ($diff = clean_diff($data[$files[$i+1]][$cat_type], '')) {
+            if ($diff = clean_diff($data[$files[$i + 1]][$cat_type], '')) {
                 $oout .= cat_heading($cat_type, $date_pre, $date_post) . $diff;
             }
         }
@@ -149,14 +149,14 @@ 
     if ($f) {
         $f = "$dir/regmem$f.xml";
         $count = count($files);
-        for ($i=0; $i<$count; ++$i) {
+        for ($i = 0; $i < $count; ++$i) {
             if ($files[$i] == $f) {
                 $new = $i;
                 break;
             }
         }
     }
-    $old = $new+1;
+    $old = $new + 1;
     $old = $files[$old];
     $old_iso = preg_replace("#$dir/regmem(.*?)\.xml#", '$1', $old);
     $old_pretty = format_date($old_iso, LONGDATEFORMAT);
@@ -166,7 +166,7 @@ 
     $old = _load_file($old);
     $new = _load_file($new);
 
-    $DATA->set_page_metadata($this_page, 'heading', 'Changes from '.$old_pretty.' to '.$new_pretty);
+    $DATA->set_page_metadata($this_page, 'heading', 'Changes from ' . $old_pretty . ' to ' . $new_pretty);
     $PAGE->stripe_start();
     print $link;
     $data = array();
@@ -188,7 +188,7 @@ 
             $out .= clean_diff($old, $new);
         }
         if ($out) {
-            print span_row('<h2>'.$names[$person_id].' - <a href="?p='.$person_id.'">Register history</a> | <a href="/mp/?pid='.$person_id.'">MP&rsquo;s page</a></h2>', true) . $out;
+            print span_row('<h2>' . $names[$person_id] . ' - <a href="?p=' . $person_id . '">Register history</a> | <a href="/mp/?pid=' . $person_id . '">MP&rsquo;s page</a></h2>', true) . $out;
         }
     }
     print '</table>';
@@ -245,28 +245,28 @@ 
     $c = 0; $year = 0;
     $view = ''; $compare = '';
     $count = count($files);
-    for ($i=0; $i<$count; ++$i) {
+    for ($i = 0; $i < $count; ++$i) {
         preg_match('/(\d\d\d\d)-(\d\d-\d\d)/', $files[$i], $m);
         $y = $m[1]; $md = $m[2];
         if ($c++) {
             $view .= ' | ';
-            if ($i < $count-1) {
+            if ($i < $count - 1) {
                 $compare .= ' | ';
             }
         }
         if ($year != $y) {
             $year = $y;
             $view .= "<em>$year</em> ";
-            if ($i < $count-1) {
+            if ($i < $count - 1) {
                 $compare .= "<em>$year</em> ";
             }
         }
         $months = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
         preg_match('/(\d\d)-(\d\d)/', $md, $m);
-        $date = ($m[2]+0) . ' '. $months[$m[1]-1];
-        $view .= '<a href="./?d='.$y.'-'.$md.'">'.$date.'</a>';
-        if ($i < $count-1) {
-            $compare .= '<a href="?f='.$y.'-'.$md.'">'.$date.'</a>';
+        $date = ($m[2] + 0) . ' ' . $months[$m[1] - 1];
+        $view .= '<a href="./?d=' . $y . '-' . $md . '">' . $date . '</a>';
+        if ($i < $count - 1) {
+            $compare .= '<a href="?f=' . $y . '-' . $md . '">' . $date . '</a>';
         }
     }
 ?>
@@ -282,7 +282,7 @@ 
 <?php
     uasort($names, 'by_name');
     foreach ($names as $_ => $value) {
-        print '<li><a href="?p='.$_.'">'.$value.'</a>';
+        print '<li><a href="?p=' . $_ . '">' . $value . '</a>';
     }
     print '</ul>';
 
@@ -300,7 +300,7 @@ 
     $data = array();
     parse_file($d, $d_iso, 'only', $data);
     $this_page = 'regmem_date';
-    $DATA->set_page_metadata($this_page, 'heading', "The Register of Members' Interests, $d_pretty");;
+    $DATA->set_page_metadata($this_page, 'heading', "The Register of Members' Interests, $d_pretty"); ;
     $PAGE->stripe_start();
     print $link;
 ?>
@@ -314,7 +314,7 @@ 
         foreach ($v as $cat_type => $vv) {
             $out .= cat_heading($cat_type, $d_iso, $d_iso, false);
             $d = (array_key_exists('only', $data[$person_id][$cat_type]) ? $data[$person_id][$cat_type]['only'] : '');
-            $out .= prettify($d)."\n";
+            $out .= prettify($d) . "\n";
         }
         if ($out) {
             print '<div class="block">';
@@ -364,8 +364,8 @@ 
     if (!count($r) && !count($a)) {
         return '';
     }
-    $r = join("\n", $r); $r = $r ? '<td class="r"><ul>'.$r.'</ul></td>' : '<td>&nbsp;</td>';
-    $a = join("\n", $a); $a = $a ? '<td class="a"><ul>'.$a.'</ul></td>' : '<td>&nbsp;</td>';
+    $r = join("\n", $r); $r = $r ? '<td class="r"><ul>' . $r . '</ul></td>' : '<td>&nbsp;</td>';
+    $a = join("\n", $a); $a = $a ? '<td class="a"><ul>' . $a . '</ul></td>' : '<td>&nbsp;</td>';
     $diff = '<tr>' . $r . $a . '</tr>';
     $diff = preg_replace('#<item.*?>(.*?)</item>#', '<li>$1</li>', $diff);
     return $diff;

www/docs/admin/report.php

Spacing +10 added lines, -10 removed lines

@@ -6,7 +6,7 @@ 
 // where rid is a report_id and cid is a comment_id.
 
 include_once '../../includes/easyparliament/init.php';
-include_once (INCLUDESPATH."easyparliament/commentreport.php");
+include_once (INCLUDESPATH . "easyparliament/commentreport.php");
 
 $this_page = "admin_commentreport";
 
@@ -177,8 +177,8 @@ 
     global $this_page;
 
 #	$commentermail = preg_replace("/\n/", "<br>\n", get_template_contents('comment_deleted') );
-    $commentermail = preg_replace('/^Subject:.*\n/', '', get_template_contents('comment_deleted') );
-    $reportermail = preg_replace("/\n/", "<br>\n", get_template_contents('report_upheld') );
+    $commentermail = preg_replace('/^Subject:.*\n/', '', get_template_contents('comment_deleted'));
+    $reportermail = preg_replace("/\n/", "<br>\n", get_template_contents('report_upheld'));
 
     ?>
         <p><strong>You've chosen to delete this comment.</strong> You can now send an email to both the person who posted the comment, and the person who made the report. Uncheck a box to prevent an email from being sent. The comment will not be deleted until you click the button below.</p>
@@ -211,7 +211,7 @@ 
 
     global $this_page;
 
-    $reportermail = preg_replace("/\n/", "<br>\n", get_template_contents('report_declined') );
+    $reportermail = preg_replace("/\n/", "<br>\n", get_template_contents('report_declined'));
 
     ?>
         <p><strong>You have chosen not to delete this comment.</strong> You can now send an email to the person who made the report (uncheck the box to send no email). The report will not be resolved until you click the button below.</p>
@@ -243,7 +243,7 @@ 
         $upheld = false;
     }
 
-    $success = $REPORT->resolve ($upheld, $COMMENT);
+    $success = $REPORT->resolve($upheld, $COMMENT);
 
     if ($success) {
 
@@ -261,7 +261,7 @@ 
                 // The reporting user was logged in at the time,
                 // so get their email address.
                 $USER = new USER;
-                $USER->init( $REPORT->user_id() );
+                $USER->init($REPORT->user_id());
                 $email = $USER->email();
             } else {
                 // Non-logged-in user; they should have left their address.
@@ -269,10 +269,10 @@ 
             }
 
             // Prepare the data needed for either email.
-            $data = array (
+            $data = array(
                 'to' 			=> $email
             );
-            $merge = array (
+            $merge = array(
                 'REPORTBODY' 	=> strip_tags($REPORT->body())
             );
 
@@ -306,12 +306,12 @@ 
             // Remove the anchor for their now deleted comment.
             $addcommentsurl = 'https://' . DOMAIN . preg_replace("/#.*$/", '#addcomment', $COMMENT->url());
 
-            $data = array (
+            $data = array(
                 'to' => $USER->email(),
                 'template' => 'comment_deleted_blank',
                 'subject' => 'One of your comments has been deleted',
             );
-            $merge = array (
+            $merge = array(
                 'REPLYBODY' => get_http_var('commentermail'),
 #				'DELETEDREASON'	=> get_http_var('deletedreason'),
                 'ADDCOMMENTURL'	=> $addcommentsurl,

www/includes/easyparliament/commentreport.php

Spacing +26 added lines, -26 removed lines

@@ -27,12 +27,12 @@ 
     public $firstname = '';
     public $lastname = '';
     public $body = '';
-    public $reported = null;	// datetime
-    public $resolved = null; 	// datetime
-    public $resolvedby = ''; 	// user_id
-    public $locked = null; 	// datetime
-    public $lockedby = '';		// user_id
-    public $upheld = ''; 		// boolean
+    public $reported = null; // datetime
+    public $resolved = null; // datetime
+    public $resolvedby = ''; // user_id
+    public $locked = null; // datetime
+    public $lockedby = ''; // user_id
+    public $upheld = ''; // boolean
 
     // If the user was logged in, this will be set:
     public $user_id = '';
@@ -40,7 +40,7 @@ 
     public $email = '';
 
 
-    public function __construct($report_id='') {
+    public function __construct($report_id = '') {
         // Pass it a report id and it gets and sets this report's data.
 
         $this->db = new ParlDB;
@@ -161,7 +161,7 @@ 
         global $THEUSER, $PAGE;
 
         if (!$THEUSER->is_able_to('reportcomment')) {
-            $PAGE->error_message ("Sorry, you are not allowed to post reports.");
+            $PAGE->error_message("Sorry, you are not allowed to post reports.");
             return false;
         }
 
@@ -229,19 +229,19 @@ 
 
         if ($q->success()) {
             // Inserted OK, so set up this object's variables.
-            $this->report_id 	= $q->insert_id();
-            $this->comment_id 	= $COMMENT->comment_id();
-            $this->body			= $body;
-            $this->reported		= $time;
+            $this->report_id = $q->insert_id();
+            $this->comment_id = $COMMENT->comment_id();
+            $this->body = $body;
+            $this->reported = $time;
 
             if ($THEUSER->isloggedin()) {
-                $this->user_id		= $THEUSER->user_id();
+                $this->user_id = $THEUSER->user_id();
                 $this->firstname	= $THEUSER->firstname();
                 $this->lastname		= $THEUSER->lastname();
             } else {
-                $this->email		= $reportdata['email'];
-                $this->firstname 	= $reportdata['firstname'];
-                $this->lastname		= $reportdata['lastname'];
+                $this->email = $reportdata['email'];
+                $this->firstname = $reportdata['firstname'];
+                $this->lastname = $reportdata['lastname'];
             }
 
 
@@ -273,11 +273,11 @@ 
                 $email = $this->email();
             }
 
-            $data = array (
+            $data = array(
                 'to' 			=> $email,
                 'template' 		=> 'report_acknowledge'
             );
-            $merge = array (
+            $merge = array(
                 'COMMENTURL' 	=> "https://" . DOMAIN . $COMMENT->url(),
                 'REPORTBODY' 	=> strip_tags($this->body())
             );
@@ -299,7 +299,7 @@ 
         $data = array();
 
         if (is_numeric($this->report_id)) {
-            $data = array (
+            $data = array(
                 'report_id' 	=> $this->report_id(),
                 'comment_id' 	=> $this->comment_id(),
                 'user_id' 		=> $this->user_id(),
@@ -336,7 +336,7 @@ 
         if ($THEUSER->is_able_to('deletecomment')) {
             $time = gmdate("Y-m-d H:i:s");
 
-            $q = $this->db->query ("UPDATE commentreports
+            $q = $this->db->query("UPDATE commentreports
                             SET		locked = '$time',
                                     lockedby = '" . $THEUSER->user_id() . "'
                             WHERE	report_id = '" . $this->report_id . "'
@@ -347,11 +347,11 @@ 
                 $this->lockedby = $THEUSER->user_id();
                 return true;
             } else {
-                $PAGE->error_message ("Sorry, we were unable to lock this report.");
+                $PAGE->error_message("Sorry, we were unable to lock this report.");
                 return false;
             }
         } else {
-            $PAGE->error_message ("You are not authorised to delete annotations.");
+            $PAGE->error_message("You are not authorised to delete annotations.");
             return false;
         }
     }
@@ -360,7 +360,7 @@ 
     public function unlock() {
         // Unlock a comment so it can be examined by someone else.
 
-        $q = $this->db->query ("UPDATE commentreports
+        $q = $this->db->query("UPDATE commentreports
                         SET		locked = NULL,
                                 lockedby = NULL
                         WHERE	report_id = '" . $this->report_id . "'
@@ -434,16 +434,16 @@ 
 
                     return true;
                 } else {
-                    $PAGE->error_message ("Sorry, we couldn't resolve this report.");
+                    $PAGE->error_message("Sorry, we couldn't resolve this report.");
                     return false;
                 }
             } else {
-                $PAGE->error_message ("This report has already been resolved (on " . $this->resolved . ")");
+                $PAGE->error_message("This report has already been resolved (on " . $this->resolved . ")");
                 return false;
             }
 
         } else {
-            $PAGE->error_message ("You are not authorised to resolve reports.");
+            $PAGE->error_message("You are not authorised to resolve reports.");
             return false;
         }
     }

www/docs/section.php

Spacing +2 added lines, -2 removed lines

@@ -26,14 +26,14 @@
 if (isset($THEUSER) && $THEUSER->postcode_is_set()) {
     try {
         $MEMBER = new MySociety\TheyWorkForYou\Member(array('postcode' => $THEUSER->postcode(), 'house' => \MySociety\TheyWorkForYou\Utility\House::majorToHouse($view->major)[0]));
-    } catch ( MySociety\TheyWorkForYou\MemberException $e ) {
+    } catch (MySociety\TheyWorkForYou\MemberException $e) {
         $MEMBER = null;
     }
 }
 
 $data = $view->display();
 if ($data) {
-    if ( !empty($data['template']) ) {
+    if (!empty($data['template'])) {
         $template = $data['template'];
     } else {
         $template = 'section/section';

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

@@ -13,7 +13,7 @@
 }
 
 $type = ucfirst(get_http_var('type'));
-$class_name = "MySociety\TheyWorkForYou\SectionView\\${type}View";
+$class_name = "MySociety\TheyWorkForYou\SectionView\\${type}view";
 if (!$type || !class_exists($class_name)) {
     $PAGE->error_message("No type specified", true);
     exit;

www/docs/rss/index.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 include_once '../../includes/easyparliament/init.php';
-include_once INCLUDESPATH."easyparliament/member.php";
+include_once INCLUDESPATH . "easyparliament/member.php";
 
 $pc = get_http_var('pc');
 $pc = preg_replace('#[^a-z0-9]#i', '', $pc);
@@ -15,7 +15,7 @@ 
             $errors['pc'] = "Sorry, we couldn't check your postcode right now. Please use the 'All Mps' link above to browse MPs";
     } elseif ($constituency == "") {
         $errors['pc'] = "Sorry, " . _htmlentities($pc) . " isn't a known postcode";
-        twfy_debug ('MP', "Can't display an MP, as submitted postcode didn't match a constituency");
+        twfy_debug('MP', "Can't display an MP, as submitted postcode didn't match a constituency");
     } else {
         $MEMBER = new MEMBER(array('constituency' => $constituency));
         if ($MEMBER->person_id()) {
@@ -29,5 +29,5 @@ 
     }
 } else {
     $errors['pc'] = "Sorry, " . _htmlentities($pc) . " isn't a valid postcode";
-    twfy_debug ('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
+    twfy_debug('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
 }

www/includes/utility.php

Indentation +33 added lines, -33 removed lines

@@ -69,11 +69,11 @@ 
     # Ignore errors we've asked to ignore
     if (error_reporting()==0) return;
 
-   // define an assoc array of error string
-   // in reality the only entries we should
-   // consider are E_WARNING, E_NOTICE, E_USER_ERROR,
-   // E_USER_WARNING and E_USER_NOTICE
-   # Commented out are ones that a user function cannot handle.
+    // define an assoc array of error string
+    // in reality the only entries we should
+    // consider are E_WARNING, E_NOTICE, E_USER_ERROR,
+    // E_USER_WARNING and E_USER_NOTICE
+    # Commented out are ones that a user function cannot handle.
     $errortype = array (
         #E_ERROR            => "Error",
         E_WARNING           => "Warning",
@@ -202,8 +202,8 @@ 
 // pretty prints the backtrace, copied from http://uk.php.net/manual/en/function.debug-backtrace.php
 function adodb_backtrace($print=true)
 {
-  $s = '';
-  if (PHPVERSION() >= 4.3) {
+    $s = '';
+    if (PHPVERSION() >= 4.3) {
 
     $MAXSTRLEN = 64;
 
@@ -211,33 +211,33 @@ 
     array_shift($traceArr);
     $tabs = sizeof($traceArr)-1;
     foreach ($traceArr as $arr) {
-      for ($i=0; $i < $tabs; $i++) $s .= ' &nbsp; ';
-      $tabs -= 1;
-      if (isset($arr['class'])) $s .= $arr['class'].'.';
-      $args = array();
-      if (isset($arr['args'])) foreach ($arr['args'] as $v) {
+        for ($i=0; $i < $tabs; $i++) $s .= ' &nbsp; ';
+        $tabs -= 1;
+        if (isset($arr['class'])) $s .= $arr['class'].'.';
+        $args = array();
+        if (isset($arr['args'])) foreach ($arr['args'] as $v) {
     if (is_null($v)) $args[] = 'null';
     elseif (is_array($v)) $args[] = 'Array['.sizeof($v).']';
     elseif (is_object($v)) $args[] = 'Object:'.get_class($v);
     elseif (is_bool($v)) $args[] = $v ? 'true' : 'false';
     else {
-      $v = (string) @$v;
-      $str = _htmlspecialchars(substr($v,0,$MAXSTRLEN));
-      if (strlen($v) > $MAXSTRLEN) $str .= '...';
-      $args[] = $str;
+        $v = (string) @$v;
+        $str = _htmlspecialchars(substr($v,0,$MAXSTRLEN));
+        if (strlen($v) > $MAXSTRLEN) $str .= '...';
+        $args[] = $str;
     }
-      }
+        }
 
-      $s .= $arr['function'].'('.implode(', ',$args).')';
-      //      $s .= sprintf("</font><font color=#808080 size=-1> # line %4d,".
-      //            " file: <a href=\"file:/%s\">%s</a></font>",
-      //        $arr['line'],$arr['file'],$arr['file']);
-      $s .= "\n";
+        $s .= $arr['function'].'('.implode(', ',$args).')';
+        //      $s .= sprintf("</font><font color=#808080 size=-1> # line %4d,".
+        //            " file: <a href=\"file:/%s\">%s</a></font>",
+        //        $arr['line'],$arr['file'],$arr['file']);
+        $s .= "\n";
     }
     if ($print) print $s;
-  }
+    }
 
-  return $s;
+    return $s;
 }
 
 // Returns the unixtime in microseconds.
@@ -538,14 +538,14 @@ 
     //$tbl["»"] = "&raquo;";
     //$tbl["«"] = "&laquo;";
 
-  // lib_filter will replace unmatched < and > with entities so
-  // we abuse strtr's only replace once behaviour to not double
-  // encode them. May not be robust.
-  // This does mean if anyone actually wants to put &gt; or &lt;
-  // in a comment they can't but that's a lot less likely than
-  // < or > for less than and greater than.
-  $tbl['&lt;'] = "&lt;";
-  $tbl['&gt;'] = "&gt;";
+    // lib_filter will replace unmatched < and > with entities so
+    // we abuse strtr's only replace once behaviour to not double
+    // encode them. May not be robust.
+    // This does mean if anyone actually wants to put &gt; or &lt;
+    // in a comment they can't but that's a lot less likely than
+    // < or > for less than and greater than.
+    $tbl['&lt;'] = "&lt;";
+    $tbl['&gt;'] = "&gt;";
 
     // Don't want to encode these things
     unset ($tbl["<"]);
@@ -1063,7 +1063,7 @@ 
 
     $return = '<h4>';
     if (isset($daytext[$major])) {
-     $return .= $daytext[$major] . ' ';
+        $return .= $daytext[$major] . ' ';
     }
 
     $return .= '<a href="';

Spacing +69 added lines, -69 removed lines

@@ -12,7 +12,7 @@ 
 
 # Pass it a brief header word and some debug text and it'll be output.
 # If TEXT is an array, call the user function, assuming it's a class.
-function twfy_debug($header, $text="") {
+function twfy_debug($header, $text = "") {
 
     // We set ?DEBUGTAG=n in the URL.
     // (DEBUGTAG is set in config.php).
@@ -29,10 +29,10 @@ 
     if ($debug_level != '') {
 
         // Set which level shows which types of debug info.
-        $levels = array (
-            1 => array ('THEUSER', 'TIME', 'SQLERROR', 'PAGE', 'TEMPLATE', 'SEARCH', 'ALERTS', 'MP'),
-            2 => array ('SQL', 'EMAIL', 'WIKIPEDIA', 'hansardlist', 'debatelist', 'wranslist', 'whalllist'),
-            3 => array ('SQLRESULT')
+        $levels = array(
+            1 => array('THEUSER', 'TIME', 'SQLERROR', 'PAGE', 'TEMPLATE', 'SEARCH', 'ALERTS', 'MP'),
+            2 => array('SQL', 'EMAIL', 'WIKIPEDIA', 'hansardlist', 'debatelist', 'wranslist', 'whalllist'),
+            3 => array('SQLRESULT')
             // Higher than this: 'DATA', etc.
         );
 
@@ -46,11 +46,11 @@ 
         }
 
         for ($n = 1; $n <= $max_level_to_show; $n++) {
-            $allowed_headers = array_merge ($allowed_headers, $levels[$n] );
+            $allowed_headers = array_merge($allowed_headers, $levels[$n]);
         }
 
         // If we can show this header, then, er, show it.
-        if ( in_array($header, $allowed_headers) || $debug_level >= 4) {
+        if (in_array($header, $allowed_headers) || $debug_level >= 4) {
             if (is_array($text)) $text = call_user_func($text);
             print "<p><span style=\"color:#039;\"><strong>$header</strong></span> $text</p>\n";
         }
@@ -67,14 +67,14 @@ 
     global $PAGE;
 
     # Ignore errors we've asked to ignore
-    if (error_reporting()==0) return;
+    if (error_reporting() == 0) return;
 
    // define an assoc array of error string
    // in reality the only entries we should
    // consider are E_WARNING, E_NOTICE, E_USER_ERROR,
    // E_USER_WARNING and E_USER_NOTICE
    # Commented out are ones that a user function cannot handle.
-    $errortype = array (
+    $errortype = array(
         #E_ERROR            => "Error",
         E_WARNING           => "Warning",
         #E_PARSE            => "Parsing Error",
@@ -133,11 +133,11 @@ 
         $source = file($filename);
         $err .= "\nSource:\n\n";
         // Show the line, plus prev and next, with line numbers.
-        $err .= $linenum-2 . " " . $source[$linenum-3];
-        $err .= $linenum-1 . " " . $source[$linenum-2];
-        $err .= $linenum . " " . $source[$linenum-1];
-        $err .= $linenum+1 . " " . $source[$linenum];
-        $err .= $linenum+2 . " " . $source[$linenum+1];
+        $err .= $linenum - 2 . " " . $source[$linenum - 3];
+        $err .= $linenum - 1 . " " . $source[$linenum - 2];
+        $err .= $linenum . " " . $source[$linenum - 1];
+        $err .= $linenum + 1 . " " . $source[$linenum];
+        $err .= $linenum + 2 . " " . $source[$linenum + 1];
     }
 
 
@@ -181,8 +181,8 @@ 
             header('HTTP/1.0 500 Internal Server Error');
             print "<p>Oops, sorry, an error has occurred!</p>\n";
         }
-        if (!($errno & E_USER_NOTICE) && strpos($errmsg, 'pg_connect')===false && strpos($errmsg, 'mysql_connect')===false) {
-            mail(BUGSLIST, "[TWFYBUG]: $errmsg", $err, "From: Bug <" . CONTACTEMAIL . ">\n".  "X-Mailer: PHP/" . phpversion() );
+        if (!($errno & E_USER_NOTICE) && strpos($errmsg, 'pg_connect') === false && strpos($errmsg, 'mysql_connect') === false) {
+            mail(BUGSLIST, "[TWFYBUG]: $errmsg", $err, "From: Bug <" . CONTACTEMAIL . ">\n" . "X-Mailer: PHP/" . phpversion());
         }
     }
 
@@ -200,7 +200,7 @@ 
 }
 
 // pretty prints the backtrace, copied from http://uk.php.net/manual/en/function.debug-backtrace.php
-function adodb_backtrace($print=true)
+function adodb_backtrace($print = true)
 {
   $s = '';
   if (PHPVERSION() >= 4.3) {
@@ -209,26 +209,26 @@ 
 
     $traceArr = debug_backtrace();
     array_shift($traceArr);
-    $tabs = sizeof($traceArr)-1;
+    $tabs = sizeof($traceArr) - 1;
     foreach ($traceArr as $arr) {
-      for ($i=0; $i < $tabs; $i++) $s .= ' &nbsp; ';
+      for ($i = 0; $i < $tabs; $i++) $s .= ' &nbsp; ';
       $tabs -= 1;
-      if (isset($arr['class'])) $s .= $arr['class'].'.';
+      if (isset($arr['class'])) $s .= $arr['class'] . '.';
       $args = array();
       if (isset($arr['args'])) foreach ($arr['args'] as $v) {
     if (is_null($v)) $args[] = 'null';
-    elseif (is_array($v)) $args[] = 'Array['.sizeof($v).']';
-    elseif (is_object($v)) $args[] = 'Object:'.get_class($v);
+    elseif (is_array($v)) $args[] = 'Array[' . sizeof($v) . ']';
+    elseif (is_object($v)) $args[] = 'Object:' . get_class($v);
     elseif (is_bool($v)) $args[] = $v ? 'true' : 'false';
     else {
       $v = (string) @$v;
-      $str = _htmlspecialchars(substr($v,0,$MAXSTRLEN));
+      $str = _htmlspecialchars(substr($v, 0, $MAXSTRLEN));
       if (strlen($v) > $MAXSTRLEN) $str .= '...';
       $args[] = $str;
     }
       }
 
-      $s .= $arr['function'].'('.implode(', ',$args).')';
+      $s .= $arr['function'] . '(' . implode(', ', $args) . ')';
       //      $s .= sprintf("</font><font color=#808080 size=-1> # line %4d,".
       //            " file: <a href=\"file:/%s\">%s</a></font>",
       //        $arr['line'],$arr['file'],$arr['file']);
@@ -243,7 +243,7 @@ 
 // Returns the unixtime in microseconds.
 function getmicrotime() {
     $mtime = microtime();
-    $mtime = explode(" ",$mtime);
+    $mtime = explode(" ", $mtime);
     $mtime = $mtime[1] + $mtime[0];
 
     return $mtime;
@@ -256,7 +256,7 @@ 
     global $timestamp_last, $timestamp_start;
     $t = getmicrotime();
     twfy_debug("TIME", sprintf("%f msecs since start; %f msecs since last; %s",
-            ($t - $timestamp_start)*1000.0, ($t - $timestamp_last)*1000.0, $label));
+            ($t - $timestamp_start) * 1000.0, ($t - $timestamp_last) * 1000.0, $label));
     $timestamp_last = $t;
 }
 
@@ -291,9 +291,9 @@ 
         list($string, $year, $month, $day) = $matches;
         if ($year < 1902) { # gmdate fns only go back to Dec. 1901
             if ($format == SHORTDATEFORMAT) {
-                return ($day+0) . ' ' . $format_date_months_short[$month+0] . " $year";
+                return ($day + 0) . ' ' . $format_date_months_short[$month + 0] . " $year";
             } else {
-                return ($day+0) . ' ' . $format_date_months[$month+0] . " $year";
+                return ($day + 0) . ' ' . $format_date_months[$month + 0] . " $year";
             }
         }
 
@@ -334,16 +334,16 @@ 
     $in_seconds = strtotime($datetime);
     $now = time();
 
-    $diff   =  $now - $in_seconds;
-    $months =  floor($diff/2419200);
+    $diff   = $now - $in_seconds;
+    $months = floor($diff / 2419200);
     $diff   -= $months * 2419200;
-    $weeks  =  floor($diff/604800);
-    $diff   -= $weeks*604800;
-    $days   =  floor($diff/86400);
+    $weeks  = floor($diff / 604800);
+    $diff   -= $weeks * 604800;
+    $days   = floor($diff / 86400);
     $diff   -= $days * 86400;
-    $hours  =  floor($diff/3600);
+    $hours  = floor($diff / 3600);
     $diff   -= $hours * 3600;
-    $minutes = floor($diff/60);
+    $minutes = floor($diff / 60);
     $diff   -= $minutes * 60;
     $seconds = $diff;
 
@@ -357,27 +357,27 @@ 
         $relative_date = '';
         if ($weeks > 0) {
             // Weeks and days
-            $relative_date .= ($relative_date?', ':'').$weeks.' week'.($weeks>1?'s':'');
-            $relative_date .= $days>0?($relative_date?', ':'').$days.' day'.($days>1?'s':''):'';
+            $relative_date .= ($relative_date ? ', ' : '') . $weeks . ' week' . ($weeks > 1 ? 's' : '');
+            $relative_date .= $days > 0 ? ($relative_date ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '') : '';
         } elseif ($days > 0) {
             // days and hours
-            $relative_date .= ($relative_date?', ':'').$days.' day'.($days>1?'s':'');
-            $relative_date .= $hours>0?($relative_date?', ':'').$hours.' hour'.($hours>1?'s':''):'';
+            $relative_date .= ($relative_date ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '');
+            $relative_date .= $hours > 0 ? ($relative_date ? ', ' : '') . $hours . ' hour' . ($hours > 1 ? 's' : '') : '';
         } elseif ($hours > 0) {
             // hours and minutes
-            $relative_date .= ($relative_date?', ':'').$hours.' hour'.($hours>1?'s':'');
-            $relative_date .= $minutes>0?($relative_date?', ':'').$minutes.' minute'.($minutes>1?'s':''):'';
+            $relative_date .= ($relative_date ? ', ' : '') . $hours . ' hour' . ($hours > 1 ? 's' : '');
+            $relative_date .= $minutes > 0 ? ($relative_date ? ', ' : '') . $minutes . ' minute' . ($minutes > 1 ? 's' : '') : '';
         } elseif ($minutes > 0) {
             // minutes only
-            $relative_date .= ($relative_date?', ':'').$minutes.' minute'.($minutes>1?'s':'');
+            $relative_date .= ($relative_date ? ', ' : '') . $minutes . ' minute' . ($minutes > 1 ? 's' : '');
         } else {
             // seconds only
-            $relative_date .= ($relative_date?', ':'').$seconds.' second'.($seconds>1?'s':'');
+            $relative_date .= ($relative_date ? ', ' : '') . $seconds . ' second' . ($seconds > 1 ? 's' : '');
         }
     }
 
     // Return relative date and add proper verbiage
-    return $relative_date.' ago';
+    return $relative_date . ' ago';
 
 }
 
@@ -426,10 +426,10 @@ 
         $text = substr($text, $start);
 
         // Word boundary.
-        if (preg_match ("/.+?\b(.*)/", $text, $matches)) {
+        if (preg_match("/.+?\b(.*)/", $text, $matches)) {
             $text = $matches[1];
             // Strip spare space at the start.
-            $text = preg_replace ("/^\s/", '', $text);
+            $text = preg_replace("/^\s/", '', $text);
         }
         $text = '...' . $text;
     }
@@ -441,10 +441,10 @@ 
         $text = substr($text, 0, $length - 3);
 
         // Word boundary.
-        if (preg_match ("/(.*)\s.+/", $text, $matches)) {
+        if (preg_match("/(.*)\s.+/", $text, $matches)) {
             $text = $matches[1];
             // Strip spare space at the end.
-            $text = preg_replace ("/\s$/", '', $text);
+            $text = preg_replace("/\s$/", '', $text);
         }
         // We don't want to use the HTML entity for an ellipsis (&#8230;), because then
         // it screws up when we subsequently use htmlentities() to print the returned
@@ -476,11 +476,11 @@ 
 
     if ($filter_type == 'strict') {
         // No tags allowed at all!
-        $filter->allowed = array ();
+        $filter->allowed = array();
     } else {
         // Comment.
         // Only allowing <a href>, <b>, <strong>, <i> and <em>
-        $filter->allowed = array (
+        $filter->allowed = array(
             'a' => array('href'),
             'strong' => array(),
             'em' => array(),
@@ -593,7 +593,7 @@ 
 
     // $gid will be like 'uk.org.publicwhip/debate/2003-02-28.475.3'.
 
-    $newgid = substr($gid, strrpos($gid, '/')+1 );
+    $newgid = substr($gid, strrpos($gid, '/') + 1);
     return $newgid;
 }
 
@@ -604,7 +604,7 @@ 
     // will be like 2003-11-20.966.0
     // This function returns 966.0
 
-    return substr( $gid, (strpos($gid, '.') + 1) );
+    return substr($gid, (strpos($gid, '.') + 1));
 }
 
 function preg_replacement_quote($s) {
@@ -648,7 +648,7 @@ 
     global $PAGE;
 
     if (!isset($data['to']) || $data['to'] == '') {
-        $PAGE->error_message ("We need an email address to send to.");
+        $PAGE->error_message("We need an email address to send to.");
         return false;
     }
 
@@ -691,7 +691,7 @@ 
         if (isset($data['subject'])) {
             $subject = trim($data['subject']);
         } else {
-            $subject = trim( substr($firstline, 8) );
+            $subject = trim(substr($firstline, 8));
         }
 
         // Either way, remove this subject line from the template.
@@ -700,7 +700,7 @@ 
     } elseif (isset($data['subject'])) {
         $subject = $data['subject'];
     } else {
-        $PAGE->error_message ("We don't have a subject line for the email, so it wasn't sent.");
+        $PAGE->error_message("We don't have a subject line for the email, so it wasn't sent.");
         return false;
     }
 
@@ -710,7 +710,7 @@ 
     $replace = array();
 
     foreach ($merge as $key => $val) {
-        $search[] = '/{'.$key.'}/';
+        $search[] = '/{' . $key . '}/';
         $replace[] = preg_replacement_quote($val);
     }
 
@@ -728,7 +728,7 @@ 
     }
 
     // Send it!
-    $success = send_email ($data['to'], $subject, $emailtext, $bulk, 'twfy-DO-NOT-REPLY@' . EMAILDOMAIN, $want_bounces, $htmltext);
+    $success = send_email($data['to'], $subject, $emailtext, $bulk, 'twfy-DO-NOT-REPLY@' . EMAILDOMAIN, $want_bounces, $htmltext);
 
     return $success;
 
@@ -743,7 +743,7 @@ 
     return $envelope_sender;
 }
 
-function send_email($to, $subject, $message, $bulk = false, $from = '', $want_bounces = false, $html='') {
+function send_email($to, $subject, $message, $bulk = false, $from = '', $want_bounces = false, $html = '') {
     // Use this rather than PHP's mail() direct, so we can make alterations
     // easily to all the emails we send out from the site.
     // eg, we might want to add a .sig to everything here...
@@ -789,7 +789,7 @@ 
 // http://www.iamcal.com/publish/article.php?id=13
 
 // Call this with a key name to get a GET or POST variable.
-function get_http_var($name, $default='', $allow_array=false) {
+function get_http_var($name, $default = '', $allow_array = false) {
     $val = $default;
     if (array_key_exists($name, $_POST)) {
         $val = $_POST[$name];
@@ -804,7 +804,7 @@ 
 }
 
 // Call this with a key name to get a COOKIE variable.
-function get_cookie_var($name, $default='') {
+function get_cookie_var($name, $default = '') {
     if (array_key_exists($name, $_COOKIE)) {
         return $_COOKIE[$name];
     }
@@ -815,7 +815,7 @@ 
 // Pass it an array of key names that should not be generated as
 // hidden form variables. It then outputs hidden form variables
 // based on the session_vars for this page.
-function hidden_form_vars ($omit = array()) {
+function hidden_form_vars($omit = array()) {
     global $DATA, $this_page;
 
     $session_vars = $DATA->page_metadata($this_page, "session_vars");
@@ -828,7 +828,7 @@ 
 }
 
 // Deprecated. Use hidden_form_vars, above, instead.
-function hidden_vars ($omit = array()) {
+function hidden_vars($omit = array()) {
     global $DATA;
 
     foreach ($args as $key => $val) {
@@ -871,7 +871,7 @@ 
 function entities_to_numbers($string) {
     $string = str_replace(
         array('&Ouml;', '&acirc;', '&uacute;', '&aacute;', '&iacute;', '&ocirc;', '&eacute;'),
-        array('&#214;', '&#226;',  '&#250;',   '&#225;',   '&#237;',   '&#244;',  '&#233;'  ),
+        array('&#214;', '&#226;', '&#250;', '&#225;', '&#237;', '&#244;', '&#233;'),
         $string
     );
     return $string;
@@ -888,9 +888,9 @@ 
         }
     }
 
-    $s   = array(' ', '&amp;', '&ocirc;',  '&Ouml;',  '&ouml;',   '&acirc;',  '&iacute;', '&aacute;', '&uacute;', '&eacute;', '&oacute;', '&Oacute;');
-    $s2  = array(" ", "&",     "\xc3\xb4", "\xc3\96", "\xc3\xb6", "\xc3\xa5", "\xc3\xad", "\xc3\xa1", "\xc3\xba", "\xc3\xa9", "\xc3\xb3", "\xc3\x93");
-    $r   = array('_', 'and',   'o',        'o',       'o',        'a',        'i',        'a',        'u',        'e',        'o',        'o');
+    $s   = array(' ', '&amp;', '&ocirc;', '&Ouml;', '&ouml;', '&acirc;', '&iacute;', '&aacute;', '&uacute;', '&eacute;', '&oacute;', '&Oacute;');
+    $s2  = array(" ", "&", "\xc3\xb4", "\xc3\96", "\xc3\xb6", "\xc3\xa5", "\xc3\xad", "\xc3\xa1", "\xc3\xba", "\xc3\xa9", "\xc3\xb3", "\xc3\x93");
+    $r   = array('_', 'and', 'o', 'o', 'o', 'a', 'i', 'a', 'u', 'e', 'o', 'o');
     $name = preg_replace('#^the #', '', strtolower($name));
 
     $out = '';
@@ -1048,8 +1048,8 @@ 
                 }
                 $out .= '<li>' . $body . '<ul>';
             } else {
-                $LISTURL->insert( array( 'id' => $gid ) );
-                $out .= '<li><a href="'.$LISTURL->generate().'">';
+                $LISTURL->insert(array('id' => $gid));
+                $out .= '<li><a href="' . $LISTURL->generate() . '">';
                 $out .= $body . '</a>';
             }
         }
@@ -1118,7 +1118,7 @@ 
     return $return;
 }
 
-function redirect($url, $code=302) {
+function redirect($url, $code = 302) {
     if (defined('TESTING')) {
         print "Location: $url";
     } else {

Braces +126 added lines, -76 removed lines

@@ -51,7 +51,9 @@ 
 
         // If we can show this header, then, er, show it.
         if ( in_array($header, $allowed_headers) || $debug_level >= 4) {
-            if (is_array($text)) $text = call_user_func($text);
+            if (is_array($text)) {
+                $text = call_user_func($text);
+            }
             print "<p><span style=\"color:#039;\"><strong>$header</strong></span> $text</p>\n";
         }
     }
@@ -67,7 +69,9 @@ 
     global $PAGE;
 
     # Ignore errors we've asked to ignore
-    if (error_reporting()==0) return;
+    if (error_reporting()==0) {
+        return;
+    }
 
    // define an assoc array of error string
    // in reality the only entries we should
@@ -211,19 +215,29 @@ 
     array_shift($traceArr);
     $tabs = sizeof($traceArr)-1;
     foreach ($traceArr as $arr) {
-      for ($i=0; $i < $tabs; $i++) $s .= ' &nbsp; ';
+      for ($i=0; $i < $tabs; $i++) {
+          $s .= ' &nbsp; ';
+      }
       $tabs -= 1;
-      if (isset($arr['class'])) $s .= $arr['class'].'.';
+      if (isset($arr['class'])) {
+          $s .= $arr['class'].'.';
+      }
       $args = array();
-      if (isset($arr['args'])) foreach ($arr['args'] as $v) {
+      if (isset($arr['args'])) {
+          foreach ($arr['args'] as $v) {
     if (is_null($v)) $args[] = 'null';
-    elseif (is_array($v)) $args[] = 'Array['.sizeof($v).']';
-    elseif (is_object($v)) $args[] = 'Object:'.get_class($v);
-    elseif (is_bool($v)) $args[] = $v ? 'true' : 'false';
-    else {
+      } elseif (is_array($v)) {
+        $args[] = 'Array['.sizeof($v).']';
+    } elseif (is_object($v)) {
+        $args[] = 'Object:'.get_class($v);
+    } elseif (is_bool($v)) {
+        $args[] = $v ? 'true' : 'false';
+    } else {
       $v = (string) @$v;
       $str = _htmlspecialchars(substr($v,0,$MAXSTRLEN));
-      if (strlen($v) > $MAXSTRLEN) $str .= '...';
+      if (strlen($v) > $MAXSTRLEN) {
+          $str .= '...';
+      }
       $args[] = $str;
     }
       }
@@ -234,7 +248,9 @@ 
       //        $arr['line'],$arr['file'],$arr['file']);
       $s .= "\n";
     }
-    if ($print) print $s;
+    if ($print) {
+        print $s;
+    }
   }
 
   return $s;
@@ -289,7 +305,8 @@ 
 
     if (preg_match("/^(\d\d\d\d)-(\d\d?)-(\d\d?)$/", $date, $matches)) {
         list($string, $year, $month, $day) = $matches;
-        if ($year < 1902) { # gmdate fns only go back to Dec. 1901
+        if ($year < 1902) {
+# gmdate fns only go back to Dec. 1901
             if ($format == SHORTDATEFORMAT) {
                 return ($day+0) . ' ' . $format_date_months_short[$month+0] . " $year";
             } else {
@@ -748,7 +765,9 @@ 
     // easily to all the emails we send out from the site.
     // eg, we might want to add a .sig to everything here...
 
-    if (!$from) $from = CONTACTEMAIL;
+    if (!$from) {
+        $from = CONTACTEMAIL;
+    }
 
     $mail = new PHPMailer(true);
     $mail->isSMTP();
@@ -843,17 +862,21 @@ 
     $rank = $rank + 0;
 
     # 11th, 12th, 13th use "th" not "st", "nd", "rd"
-    if (floor(($rank % 100) / 10) == 1)
-        return $rank . "th";
+    if (floor(($rank % 100) / 10) == 1) {
+            return $rank . "th";
+    }
     # 1st
-    if ($rank % 10 == 1)
-        return $rank . "st";
+    if ($rank % 10 == 1) {
+            return $rank . "st";
+    }
     # 2nd
-    if ($rank % 10 == 2)
-        return $rank . "nd";
+    if ($rank % 10 == 2) {
+            return $rank . "nd";
+    }
     # 3rd
-    if ($rank % 10 == 3)
-        return $rank . "rd";
+    if ($rank % 10 == 3) {
+            return $rank . "rd";
+    }
     # Everything else use th
 
     return $rank . "th";
@@ -861,8 +884,9 @@ 
 
 function make_plural($word, $number)
 {
-    if ($number == 1)
-        return $word;
+    if ($number == 1) {
+            return $word;
+    }
     return $word . "s";
 }
 
@@ -896,8 +920,7 @@ 
     $out = '';
 
     // Insert the Person ID if known.
-    if ($pid !== null)
-    {
+    if ($pid !== null) {
         $out .= $pid . '/';
     }
 
@@ -905,8 +928,7 @@ 
     $out .= urlencode(str_replace($s2, $r, str_replace($s, $r, $name)));
 
     // If there is a constituency, inject that too
-    if ($const && $house == HOUSE_TYPE_COMMONS)
-    {
+    if ($const && $house == HOUSE_TYPE_COMMONS) {
         $out .= '/' . urlencode(str_replace($s2, $r, str_replace($s, $r, strtolower($const))));
     }
 
@@ -918,10 +940,16 @@ 
     switch ($house) {
         case HOUSE_TYPE_LORDS:
             $s = '';
-            if (!$family_name) $s = 'the ';
+            if (!$family_name) {
+                $s = 'the ';
+            }
             $s .= $title;
-            if ($family_name) $s .= ' ' . $family_name;
-            if ($lordofname) $s .= ' of ' . $lordofname;
+            if ($family_name) {
+                $s .= ' ' . $family_name;
+            }
+            if ($lordofname) {
+                $s .= ' of ' . $lordofname;
+            }
             return $s;
 
         case HOUSE_TYPE_ROYAL:
@@ -939,14 +967,18 @@ 
 }
 
 function by_peer_name($a, $b) {
-    if (!$a['family_name'] && !$b['family_name'])
-        return strcmp($a['lordofname'], $b['lordofname']);
-    if (!$a['family_name'])
-        return strcmp($a['lordofname'], $b['family_name']);
-    if (!$b['family_name'])
-        return strcmp($a['family_name'], $b['lordofname']);
-    if (strcmp($a['family_name'], $b['family_name']))
-        return strcmp($a['family_name'], $b['family_name']);
+    if (!$a['family_name'] && !$b['family_name']) {
+            return strcmp($a['lordofname'], $b['lordofname']);
+    }
+    if (!$a['family_name']) {
+            return strcmp($a['lordofname'], $b['family_name']);
+    }
+    if (!$b['family_name']) {
+            return strcmp($a['family_name'], $b['lordofname']);
+    }
+    if (strcmp($a['family_name'], $b['family_name'])) {
+            return strcmp($a['family_name'], $b['family_name']);
+    }
     return strcmp($a['lordofname'], $b['lordofname']);
 }
 
@@ -973,12 +1005,17 @@ 
         'Lords in Waiting (HM Household)' => 'Government Whip',
         'Baronesses in Waiting, HM Household' => 'Government Whip',
     );
-    if ($pos) { # Government post, or Chairman of Select Committee
+    if ($pos) {
+# Government post, or Chairman of Select Committee
         $pretty = $pos;
-        if ($dept && $dept != 'No Department') $pretty .= ", $dept";
-        if (array_key_exists($pretty, $lookup))
-            $pretty = $lookup[$pretty];
-    } else { # Member of Select Committee
+        if ($dept && $dept != 'No Department') {
+            $pretty .= ", $dept";
+        }
+        if (array_key_exists($pretty, $lookup)) {
+                    $pretty = $lookup[$pretty];
+        }
+    } else {
+# Member of Select Committee
         $pretty = "Member, $dept";
     }
     return $pretty;
@@ -996,13 +1033,16 @@ 
     }
 
     // single date?
-    if (isset($data['date'])) $one_date = true;
+    if (isset($data['date'])) {
+        $one_date = true;
+    }
 
     // remove empty entries, so they don't produce errors
     foreach (array_keys($hansardmajors) as $major) {
         if (array_key_exists($major, $data)) {
-            if (count($data[$major]) == 0)
-                unset($data[$major]);
+            if (count($data[$major]) == 0) {
+                            unset($data[$major]);
+            }
         }
     }
 
@@ -1011,22 +1051,29 @@ 
     if (!$one_date) {
         $todaystime = gmmktime(0, 0, 0, date('m'), date('d'), date('Y'));
         foreach ($data as $major => $array) {
-            if (!in_array('timestamp', $array)) $daytext[$major] = "The most recent ";
-            elseif ($todaystime - $array['timestamp'] == 86400) $daytext[$major] = "Yesterday&rsquo;s";
-            elseif ($todaystime - $array['timestamp'] <= (6 * 86400)) $daytext[$major] = gmdate('l', $array['timestamp']) . "&rsquo;s";
-            else $daytext[$major] = "The most recent ";
+            if (!in_array('timestamp', $array)) {
+                $daytext[$major] = "The most recent ";
+            } elseif ($todaystime - $array['timestamp'] == 86400) {
+                $daytext[$major] = "Yesterday&rsquo;s";
+            } elseif ($todaystime - $array['timestamp'] <= (6 * 86400)) {
+                $daytext[$major] = gmdate('l', $array['timestamp']) . "&rsquo;s";
+            } else {
+                $daytext[$major] = "The most recent ";
+            }
         }
     }
 
     //build html
     foreach ($printed_majors as $p_major) {
-        if (!array_key_exists($p_major, $data))
-            continue;
+        if (!array_key_exists($p_major, $data)) {
+                    continue;
+        }
 
-        if ($one_date)
-            $date = $data['date'];
-        else
-            $date = $data[$p_major]['hdate'];
+        if ($one_date) {
+                    $date = $data['date'];
+        } else {
+                    $date = $data[$p_major]['hdate'];
+        }
         $q = $db->query('SELECT section_id, body, gid
                 FROM hansard, epobject
                 WHERE hansard.epobject_id = epobject.epobject_id '
@@ -1078,14 +1125,16 @@ 
     }
 
     $return .= '<a href="';
-    if (isset($data[$major]['listurl']))
-        $return .= $data[$major]['listurl'];
-    else {
+    if (isset($data[$major]['listurl'])) {
+            $return .= $data[$major]['listurl'];
+    } else {
         $LISTURL->reset();
         $return .= $LISTURL->generate();
     }
     $return .= '">' . $hansardmajors[$major]['title'] . '</a>';
-    if (isset($daytext[$major])) $return;
+    if (isset($daytext[$major])) {
+        $return;
+    }
     $return .= '</h4>';
 
     return $return;
@@ -1093,22 +1142,23 @@ 
 
 function score_to_strongly($dmpscore) {
     $dmpdesc = "unknown about";
-    if ($dmpscore > 0.95 && $dmpscore <= 1.0)
-        $dmpdesc = "consistently voted against";
-    elseif ($dmpscore > 0.85)
-        $dmpdesc = "almost always voted against";
-    elseif ($dmpscore > 0.6)
-        $dmpdesc = "generally voted against";
-    elseif ($dmpscore > 0.4)
-        $dmpdesc = "voted a mixture of for and against";
-    elseif ($dmpscore > 0.15)
-        $dmpdesc = "generally voted for";
-    elseif ($dmpscore > 0.05)
-        $dmpdesc = "almost always voted for";
-    elseif ($dmpscore >= 0.0)
-        $dmpdesc = "consistently voted for";
-    elseif ($dmpscore == -1)
-        $dmpdesc = "has never voted in a major vote about";
+    if ($dmpscore > 0.95 && $dmpscore <= 1.0) {
+            $dmpdesc = "consistently voted against";
+    } elseif ($dmpscore > 0.85) {
+            $dmpdesc = "almost always voted against";
+    } elseif ($dmpscore > 0.6) {
+            $dmpdesc = "generally voted against";
+    } elseif ($dmpscore > 0.4) {
+            $dmpdesc = "voted a mixture of for and against";
+    } elseif ($dmpscore > 0.15) {
+            $dmpdesc = "generally voted for";
+    } elseif ($dmpscore > 0.05) {
+            $dmpdesc = "almost always voted for";
+    } elseif ($dmpscore >= 0.0) {
+            $dmpdesc = "consistently voted for";
+    } elseif ($dmpscore == -1) {
+            $dmpdesc = "has never voted in a major vote about";
+    }
     return $dmpdesc;
 }
 

classes/AlertView/Simple.php

Spacing +18 added lines, -18 removed lines

@@ -7,7 +7,7 @@ 
     public function display() {
         $data = array();
         $data['recent_election'] = false;
-        if ( $this->user->loggedin() ) {
+        if ($this->user->loggedin()) {
             $data['user_signed_in'] = true;
         }
 
@@ -17,21 +17,21 @@ 
             $data['postcode'] = trim(get_http_var('postcode'));
 
             $result = $this->createAlertForPostCode($data['email'], $data['postcode']);
-            $data = array_merge( $data, $result );
+            $data = array_merge($data, $result);
         } elseif (get_http_var('update')) {
             $result = $this->getNewMP(get_http_var('update'));
-            $data = array_merge( $data, $result );
+            $data = array_merge($data, $result);
         } elseif (get_http_var('update-alert')) {
-            $success = $this->replaceAlert( get_http_var('confirmation') );
+            $success = $this->replaceAlert(get_http_var('confirmation'));
             $data['confirmation_received'] = $success;
         } elseif (get_http_var('confirmed')) {
-            $success = $this->confirmAlert( get_http_var('confirmed') );
+            $success = $this->confirmAlert(get_http_var('confirmed'));
             $data['confirmation_received'] = $success;
         } else {
             $data['email'] = $this->user->email() ? $this->user->email() : '';
             $data['postcode'] = $this->user->postcode_is_set() ? $this->user->postcode() : '';
 
-            if ( $this->isEmailSignedUpForPostCode( $data['email'], $data['postcode'] ) ) {
+            if ($this->isEmailSignedUpForPostCode($data['email'], $data['postcode'])) {
                 $data['already_signed_up'] = true;
                 $mp = $this->getPersonFromPostcode($data['postcode']);
                 $data['mp_name'] = $mp->full_name();
@@ -66,13 +66,13 @@ 
     }
 
     private function createAlertForPostCode($email, $postcode) {
-        if ( !$this->validateDetails($email, $postcode) ) {
+        if (!$this->validateDetails($email, $postcode)) {
             return array('invalid-postcode-or-email' => true);
         }
 
         try {
             $person = $this->getPersonFromPostcode($postcode);
-        } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
+        } catch (\MySociety\TheyWorkForYou\MemberException $e) {
             return array('bad-constituency' => true);
         }
 
@@ -89,7 +89,7 @@ 
 
         switch ($result) {
             case self::ALERT_EXISTS:
-                if ( $not_logged_in ) {
+                if ($not_logged_in) {
                     // no logged in user so send them an email to let them
                     // know someone tried to create an alert
                     $this->alert->send_already_signedup_email($details);
@@ -102,7 +102,7 @@ 
                 $data['error'] = true;
                 break;
             default: // alert created
-                if ( $not_logged_in ) {
+                if ($not_logged_in) {
                     $data['confirmation_sent'] = true;
                 } else {
                     $data['signedup_no_confirm'] = true;
@@ -116,8 +116,8 @@ 
         $existing = $this->alert->fetch_by_token($confirmation);
         preg_match('/speaker:(\d+)/', $existing['criteria'], $matches);
         $old_mp_id = $matches[1];
-        $old_mp = new \MySociety\TheyWorkForYou\Member(array( 'person_id' => $old_mp_id ) );
-        $new_mp = new \MySociety\TheyWorkForYou\Member(array( 'constituency' => $old_mp->constituency, 'house' => 1 ));
+        $old_mp = new \MySociety\TheyWorkForYou\Member(array('person_id' => $old_mp_id));
+        $new_mp = new \MySociety\TheyWorkForYou\Member(array('constituency' => $old_mp->constituency, 'house' => 1));
 
         $q = $this->db->query(
             "SELECT alert_id, criteria, registrationtoken FROM alerts
@@ -141,7 +141,7 @@ 
                 'pid' => $new_mp->person_id,
                 'pc' => '',
             );
-            if ( $other_criteria ) {
+            if ($other_criteria) {
                 $details['keyword'] = $other_criteria;
             }
 
@@ -158,11 +158,11 @@ 
     private function isEmailSignedUpForPostCode($email, $postcode) {
         $is_signed_up = false;
 
-        if ( $email && $postcode ) {
+        if ($email && $postcode) {
             try {
                 $person = $this->getPersonFromPostcode($postcode);
                 $is_signed_up = $this->alert->fetch_by_mp($email, $person->person_id);
-            } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
+            } catch (\MySociety\TheyWorkForYou\MemberException $e) {
                 $is_signed_up = false;
             }
         }
@@ -178,10 +178,10 @@ 
         preg_match('/speaker:(\d+)/', $existing['criteria'], $matches);
         $criteria = $matches[1];
 
-        $old_mp = new \MySociety\TheyWorkForYou\Member(array( 'person_id' => $criteria ) );
-        $new_mp = new \MySociety\TheyWorkForYou\Member(array( 'constituency' => $old_mp->constituency, 'house' => 1 ));
+        $old_mp = new \MySociety\TheyWorkForYou\Member(array('person_id' => $criteria));
+        $new_mp = new \MySociety\TheyWorkForYou\Member(array('constituency' => $old_mp->constituency, 'house' => 1));
 
-        if ( $this->alert->fetch_by_mp( $existing['email'], $new_mp->person_id) ) {
+        if ($this->alert->fetch_by_mp($existing['email'], $new_mp->person_id)) {
             $data = array(
                 'already_signed_up' => true,
                 'old_mp' => $old_mp->full_name(),

classes/SectionView/DebatesView.php

Spacing +6 added lines, -6 removed lines

@@ -16,7 +16,7 @@ 
         $DEBATELIST = new \DEBATELIST;
         $debates = array();
         $debates['data'] = $DEBATELIST->display('biggest_debates', array('days'=>7, 'num'=>10), 'none');
-        $args = array( 'months' => 1 );
+        $args = array('months' => 1);
         $debates['calendar'] = $DEBATELIST->display('calendar', $args, 'none');
         $debates['rssurl'] = $DATA->page_metadata($this_page, 'rss');
 
@@ -26,7 +26,7 @@ 
 
         $WHALLLIST = new \WHALLLIST;
         $whall['data'] = $WHALLLIST->display('biggest_debates', array('days'=>7, 'num'=>10), 'none');
-        $args = array( 'months' => 1 );
+        $args = array('months' => 1);
         $whall['calendar'] = $WHALLLIST->display('calendar', $args, 'none');
         $whall['rssurl'] = $DATA->page_metadata($this_page, 'rss');
 
@@ -36,7 +36,7 @@ 
 
         $LORDSDEBATELIST = new \LORDSDEBATELIST;
         $lords['data'] = $LORDSDEBATELIST->display('biggest_debates', array('days'=>7, 'num'=>10), 'none');
-        $args = array( 'months' => 1 );
+        $args = array('months' => 1);
         $lords['calendar'] = $LORDSDEBATELIST->display('calendar', $args, 'none');
 
         $lords['rssurl'] = $DATA->page_metadata($this_page, 'rss');
@@ -55,9 +55,9 @@ 
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'debates', 'title' => 'House of Commons' ),
-            array( 'section' => 'lords', 'title' => 'House of Lords' ),
-            array( 'section' => 'whall', 'title' => 'Westminster Hall' )
+            array('section' => 'debates', 'title' => 'House of Commons'),
+            array('section' => 'lords', 'title' => 'House of Lords'),
+            array('section' => 'whall', 'title' => 'Westminster Hall')
         );
     }
 }