mysociety / theyworkforyou

www/includes/easyparliament/comment.php

Indentation +2 added lines, -2 removed lines

@@ -210,8 +210,8 @@
                             array(':epobject_id' => $this->epobject_id));
 
             if ($q->rows() > 0) {
-                 // If you change stuff here, you might have to change it in
-                 // $COMMENTLIST->_get_comment_data() too...
+                    // If you change stuff here, you might have to change it in
+                    // $COMMENTLIST->_get_comment_data() too...
 
                 $gid = fix_gid_from_db($q->field(0, 'gid')); // In includes/utility.php
 

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

@@ -31,7 +31,7 @@ 
     public $body = '';
     public $posted = '';
     public $visible = false;
-    public $modflagged = NULL;	// Is a datetime when set.
+    public $modflagged = null;	// Is a datetime when set.
     public $firstname = '';	// Of the person who posted it.
     public $lastname = '';
     public $url = '';
@@ -138,7 +138,7 @@ 
             $flag = "'$date'";
 
         } elseif ($switch == 'off') {
-            $date = NULL;
+            $date = null;
             $flag = 'NULL';
 
         } else {

Spacing +14 added lines, -14 removed lines

@@ -31,8 +31,8 @@ 
     public $body = '';
     public $posted = '';
     public $visible = false;
-    public $modflagged = NULL;	// Is a datetime when set.
-    public $firstname = '';	// Of the person who posted it.
+    public $modflagged = NULL; // Is a datetime when set.
+    public $firstname = ''; // Of the person who posted it.
     public $lastname = '';
     public $url = '';
 
@@ -41,7 +41,7 @@ 
     public $exists = false;
 
 
-    public function __construct($comment_id='') {
+    public function __construct($comment_id = '') {
 
         $this->db = new ParlDB;
 
@@ -69,12 +69,12 @@ 
             if ($q->rows() > 0) {
 
                 $this->comment_id 	= $comment_id;
-                $this->user_id		= $q->field(0, 'user_id');
+                $this->user_id = $q->field(0, 'user_id');
                 $this->epobject_id	= $q->field(0, 'epobject_id');
-                $this->body			= $q->field(0, 'body');
-                $this->posted		= $q->field(0, 'posted');
-                $this->visible		= $q->field(0, 'visible');
-                $this->modflagged	= $q->field(0, 'modflagged');
+                $this->body = $q->field(0, 'body');
+                $this->posted = $q->field(0, 'posted');
+                $this->visible = $q->field(0, 'visible');
+                $this->modflagged = $q->field(0, 'modflagged');
 
                 // Sets the URL and username for this comment. Duh.
                 $this->_set_url();
@@ -104,9 +104,9 @@ 
     public function comments_enabled() { return $this->comments_enabled; }
 
 
-    public function display($format='html', $template='comments') {
+    public function display($format = 'html', $template = 'comments') {
 
-        $data['comments'][0] = array (
+        $data['comments'][0] = array(
             'comment_id'	=> $this->comment_id,
             'user_id'		=> $this->user_id,
             'epobject_id'	=> $this->epobject_id,
@@ -142,7 +142,7 @@ 
             $flag = 'NULL';
 
         } else {
-            $PAGE->error_message ("Why are you trying to switch this comment's modflag to '" . _htmlentities($switch) . "'!");
+            $PAGE->error_message("Why are you trying to switch this comment's modflag to '" . _htmlentities($switch) . "'!");
         }
 
         $q = $this->db->query("UPDATE comments
@@ -154,7 +154,7 @@ 
             $this->modflagged = $date;
             return true;
         } else {
-            $message = array (
+            $message = array(
                 'title' => 'Sorry',
                 'text' => "We couldn't update the annotation's modflag."
             );
@@ -176,7 +176,7 @@ 
             if ($q->success()) {
                 return true;
             } else {
-                $message = array (
+                $message = array(
                     'title' => 'Sorry',
                     'text' => "We were unable to delete the annotation."
                 );
@@ -185,7 +185,7 @@ 
             }
 
         } else {
-            $message = array (
+            $message = array(
                 'title' => 'Sorry',
                 'text' => "You are not authorised to delete annotations."
             );

www/includes/easyparliament/recess.php

Braces +30 added lines, -19 removed lines

@@ -362,12 +362,13 @@ 
         } else {
             $from = "$year-7-" . $dates[$year][7]['more'];
         }
-        if (!isset($dates[$year][9]))
-            $to = "$year-08-31";
-        elseif (isset($dates[$year][9]['all']))
-            $to = "$year-10-" . $dates[$year][10]['less'];
-        else
-            $to = "$year-9-" . $dates[$year][9]['less'];
+        if (!isset($dates[$year][9])) {
+                    $to = "$year-08-31";
+        } elseif (isset($dates[$year][9]['all'])) {
+                    $to = "$year-10-" . $dates[$year][10]['less'];
+        } else {
+                    $to = "$year-9-" . $dates[$year][9]['less'];
+        }
     }
     if ( (isset($dates[$year][$month]['less']) && $day < $dates[$year][$month]['less'])
     || (isset($dates[$year][$month]['more']) && $day > $dates[$year][$month]['more'])
@@ -375,11 +376,17 @@ 
     || (isset($dates[$year][$month]['between'][2]) && $day > $dates[$year][$month]['between'][2] && $day < $dates[$year][$month]['between'][3]) ) {
         switch ($month) {
             case 1: case 12: $recess = 'Christmas Recess'; break;
-            case 2: if ($body==1 || $body==101) $recess = 'Half Term Week';
-                elseif ($body==4) $recess = 'February Recess';
+            case 2: if ($body==1 || $body==101) {
+                $recess = 'Half Term Week';
+            } elseif ($body==4) {
+                    $recess = 'February Recess';
+                }
                 break;
-            case 3: if ($body==1 || $body==101) $recess = 'Easter Recess';
-                elseif ($body==4) $recess = 'Spring Recess';
+            case 3: if ($body==1 || $body==101) {
+                $recess = 'Easter Recess';
+            } elseif ($body==4) {
+                    $recess = 'Spring Recess';
+                }
                 break;
             case 4: if (isset($dates[$year][$month]['more']) && $day > $dates[$year][$month]['more']) {
                     $recess = 'Election Recess';
@@ -417,9 +424,13 @@ 
                     trigger_error("Argh9");
                 }
                 break;
-            case 10: if ($body==1 || $body==101) $recess = 'Conference Recess';
-                elseif ($body==4) $recess = 'Autumn Recess';
-                elseif ($body==5) $recess = 'Halloween Recess';
+            case 10: if ($body==1 || $body==101) {
+                $recess = 'Conference Recess';
+            } elseif ($body==4) {
+                    $recess = 'Autumn Recess';
+                } elseif ($body==5) {
+                    $recess = 'Halloween Recess';
+                }
                 break;
             case 11: $recess = 'Autumn Recess';
                 break;
@@ -427,9 +438,9 @@ 
         }
         if (isset($dates[$year][$month]['less']) && $day < $dates[$year][$month]['less']) {
             $to = "$year-$month-" . $dates[$year][$month]['less'];
-            if ($month==1)
-                $from = ($year-1)."-12-" . $dates[$year-1][12]['more'];
-            else {
+            if ($month==1) {
+                            $from = ($year-1)."-12-" . $dates[$year-1][12]['more'];
+            } else {
                 for ($newmonth = $month-1; $newmonth>=1; $newmonth--) {
                     if (isset($dates[$year][$newmonth]['more'])) {
                         $from = "$year-".($newmonth)."-" . $dates[$year][$newmonth]['more'];
@@ -440,9 +451,9 @@ 
         }
         if (isset($dates[$year][$month]['more']) && $day > $dates[$year][$month]['more']) {
             $from = "$year-$month-" . $dates[$year][$month]['more'];
-            if ($month==12)
-                $to = ($year+1)."-01-" . $dates[$year+1][1]['less'];
-            else {
+            if ($month==12) {
+                            $to = ($year+1)."-01-" . $dates[$year+1][1]['less'];
+            } else {
                 for ($newmonth = $month+1; $newmonth<=12; $newmonth++) {
                     if (isset($dates[$year][$newmonth]['less'])) {
                         $to = "$year-".($newmonth)."-" . $dates[$year][$newmonth]['less'];

Spacing +79 added lines, -79 removed lines

@@ -12,20 +12,20 @@ 
     ),
     2001 => array(
         1=>array('less'=>8),
-        2=>array('between'=>array(15,26)),
-        4=>array('between'=>array(10,23)),
+        2=>array('between'=>array(15, 26)),
+        4=>array('between'=>array(10, 23)),
         5=>array('more'=>13),
         6=>array('less'=>13),
         7=>array('more'=>20),
         8=>array('all'=>1),
         9=>array('less'=>14, 'more'=>14),
-        10=>array('less'=>4, 'between'=>array(4,8, 8,15)),
+        10=>array('less'=>4, 'between'=>array(4, 8, 8, 15)),
         12=>array('more'=>19) ),
     2002 => array(
         1=>array('less'=>8),
-        2=>array('between'=>array(14,25)),
+        2=>array('between'=>array(14, 25)),
         3=>array('more'=>26),
-        4=>array('less'=>3, 'between'=>array(3,10)),
+        4=>array('less'=>3, 'between'=>array(3, 10)),
         5=>array('more'=>24),
         6=>array('less'=>10),
         7=>array('more'=>24),
@@ -35,8 +35,8 @@ 
         12=>array('more'=>19) ),
     2003 => array(
         1=>array('less'=>7),
-        2=>array('between'=>array(13,24)),
-        4=>array('between'=>array(14,28)),
+        2=>array('between'=>array(13, 24)),
+        4=>array('between'=>array(14, 28)),
         5=>array('more'=>22),
         6=>array('less'=>3),
         7=>array('more'=>17),
@@ -46,8 +46,8 @@ 
         12=>array('more'=>18)),
     2004 => array(
         1=>array('less'=>5),
-        2=>array('between'=>array(12,23)),
-        4=>array('between'=>array(1,19)),
+        2=>array('between'=>array(12, 23)),
+        4=>array('between'=>array(1, 19)),
         5=>array('more'=>27),
         6=>array('less'=>7),
         7=>array('more'=>22),
@@ -57,7 +57,7 @@ 
         12=>array('more'=>21) ),
     2005 => array(
         1=>array('less'=>10),
-        2=>array('between'=>array(10,21)),
+        2=>array('between'=>array(10, 21)),
         3=>array('more'=>24),
         4=>array('less'=>4, 'more'=>10),
         5=>array('less'=>11, 'more'=>26),
@@ -69,7 +69,7 @@ 
         12=>array('more'=>20) ),
     2006 => array(
         1=>array('less'=>9),
-        2=>array('between'=>array(16,27)),
+        2=>array('between'=>array(16, 27)),
         3=>array('more'=>30),
         4=>array('less'=>18),
         5=>array('more'=>25),
@@ -82,7 +82,7 @@ 
     ),
     2007 => array(
         1=>array('less'=>8),
-        2=>array('between'=>array(8,19)),
+        2=>array('between'=>array(8, 19)),
         3=>array('more'=>29),
         4=>array('less'=>16),
         5=>array('more'=>24),
@@ -95,8 +95,8 @@ 
     ),
     2008 => array(
         1=>array('less'=>7),
-        2=>array('between'=>array(7,18)),
-        4=>array('between'=>array(3,21)),
+        2=>array('between'=>array(7, 18)),
+        4=>array('between'=>array(3, 21)),
         5=>array('more'=>22),
         6=>array('less'=>2),
         7=>array('more'=>22),
@@ -107,8 +107,8 @@ 
     ),
     2009 => array(
         1=>array('less'=>12),
-        2=>array('between'=>array(12,23)),
-        4=>array('between'=>array(2,20)),
+        2=>array('between'=>array(12, 23)),
+        4=>array('between'=>array(2, 20)),
         5=>array('more'=>21),
         6=>array('less'=>1),
         7=>array('more'=>21),
@@ -119,7 +119,7 @@ 
     ),
     2010 => array(
         1=>array('less'=>5),
-        2=>array('between'=>array(10,22)),
+        2=>array('between'=>array(10, 22)),
         3=>array('more'=>30),
         4=>array('less'=>6, 'more'=>8),
         5=>array('less'=>18, 'more'=>27),
@@ -132,62 +132,62 @@ 
     ),
     2011 => array(
         1=>array('less'=>10),
-        2=>array('between'=>array(17,28)),
-        4=>array('between'=>array(5,26)),
+        2=>array('between'=>array(17, 28)),
+        4=>array('between'=>array(5, 26)),
         5=>array('more'=>24),
         6=>array('less'=>7),
         7=>array('more'=>19),
         8=>array('all'=>1),
         9=>array('less'=>5, 'more'=>15),
         10=>array('less'=>10),
-        11=>array('between'=>array(15,21)),
+        11=>array('between'=>array(15, 21)),
         12=>array('more'=>20),
     ),
     2012 => array(
         1=>array('less'=>10),
-        2=>array('between'=>array(9,20)),
+        2=>array('between'=>array(9, 20)),
         3=>array('more'=>27),
         4=>array('less'=>16),
         5=>array('more'=>24),
         6=>array('less'=>11),
         7=>array('more'=>17),
         8=>array('all'=>1),
-        9=>array('less'=>3,'more'=>18),
+        9=>array('less'=>3, 'more'=>18),
         10=>array('less'=>15),
-        11=>array('between'=>array(13,19)),
+        11=>array('between'=>array(13, 19)),
         12=>array('more'=>20)
     ),
     2013 => array(
         1=>array('less'=>7),
-        2=>array('between'=>array(14,25)),
+        2=>array('between'=>array(14, 25)),
         3=>array('more'=>26),
         4=>array('less'=>15),
         5=>array('more'=>21),
         6=>array('less'=>3),
         7=>array('more'=>18),
         8=>array('all'=>1),
-        9=>array('less'=>2,'more'=>13),
+        9=>array('less'=>2, 'more'=>13),
         10=>array('less'=>8),
-        11=>array('between'=>array(12,18)),
+        11=>array('between'=>array(12, 18)),
         12=>array('more'=>19)
     ),
     2014 => array(
         1=>array('less'=>6),
-        2=>array('between'=>array(13,24)),
-        4=>array('between'=>array(10,28)),
-        5=>array('between'=>array(1,6))
+        2=>array('between'=>array(13, 24)),
+        4=>array('between'=>array(10, 28)),
+        5=>array('between'=>array(1, 6))
     ),
     2015 => array(
         7=>array('more'=>21),
         8=>array('all'=>1),
         9=>array('less'=>7, 'more'=>17),
         10=>array('less'=>12),
-        11=>array('between'=>array(10,16)),
+        11=>array('between'=>array(10, 16)),
         12=>array('more'=>17)
     ),
     2016 => array(
         1=>array('less'=>5),
-        2=>array('between'=>array(11,22))
+        2=>array('between'=>array(11, 22))
     )
 );
 # Lords differences
@@ -199,15 +199,15 @@ 
 $GLOBALS['recessdates'][101][2010][12]['more'] = 22;
 $GLOBALS['recessdates'][101][2011] = array(
     1 => array('less'=>10),
-    2 => array('between'=>array(16,28)),
-    4 => array('between'=>array(6,26)),
+    2 => array('between'=>array(16, 28)),
+    4 => array('between'=>array(6, 26)),
     5 => array('more'=>25),
     6 => array('less'=>6),
     7 => array('more'=>20),
     8 => array('all'=>1),
     9 => array('less'=>5, 'more'=>15),
     10 => array('less'=>3),
-    11=>array('between'=>array(16,21)),
+    11=>array('between'=>array(16, 21)),
     12 => array('more'=>21),
 );
 
@@ -216,74 +216,74 @@ 
     1999 => array(
         7 => array('more' => 2),
         8 => array('less' => 31),
-        10 => array('between' => array(8,25)),
+        10 => array('between' => array(8, 25)),
         12 => array('more' => 17)
     ),
     2000 => array(
         1 => array('less' => 10),
-        4 => array('between' => array(7,25)),
+        4 => array('between' => array(7, 25)),
         7 => array('more' => 7),
         8 => array('all' => 1),
         9 => array('less' => 4),
-        10 => array('between' => array(6,23)),
+        10 => array('between' => array(6, 23)),
         12 => array('more' => 20)
     ),
     2001 => array(
         1=>array('less'=>8),
-        2=>array('between'=>array(16,26)),
-        4=>array('between'=>array(6,23)),
+        2=>array('between'=>array(16, 26)),
+        4=>array('between'=>array(6, 23)),
         6=>array('more'=>29),
         7=>array('all'=>1),
         8=>array('all'=>1),
         9=>array('less'=>3),
-        10=>array('between'=>array(5,22)),
+        10=>array('between'=>array(5, 22)),
         12=>array('more'=>21) ),
     2002 => array(
         1=>array('less'=>7),
-        2=>array('between'=>array(15,25)),
+        2=>array('between'=>array(15, 25)),
         3=>array('more'=>28),
         4=>array('less'=>15),
         7=>array('more'=>10),
         8=>array('all'=>1),
         9=>array('less'=>2),
-        10=>array('between'=>array(11,28)),
+        10=>array('between'=>array(11, 28)),
         12=>array('more'=>20) ),
     2003 => array(
         1=>array('less'=>6),
-        4=>array('between'=>array(0,31)),
+        4=>array('between'=>array(0, 31)),
         5=>array('less'=>2),
         6=>array('more'=>27),
         7=>array('all'=>1),
         8=>array('all'=>1),
-        10=>array('between'=>array(10,27)),
+        10=>array('between'=>array(10, 27)),
         12=>array('more'=>19)),
     2004 => array(
         1=>array('less'=>5),
-        2=>array('between'=>array(13,23)),
-        4=>array('between'=>array(2,19)),
+        2=>array('between'=>array(13, 23)),
+        4=>array('between'=>array(2, 19)),
         6=>array('more'=>25),
         7=>array('all'=>1),
         8=>array('less'=>30),
-        10=>array('between'=>array(10,23)),
+        10=>array('between'=>array(10, 23)),
         12=>array('more'=>26) ),
     2005 => array(
         1=>array('less'=>8),
-        2=>array('between'=>array(11,21)),
+        2=>array('between'=>array(11, 21)),
         3=>array('more'=>24),
         4=>array('less'=>11),
         7=>array('more'=>1),
         8=>array('all'=>1),
         9=>array('less'=>5),
-        10=>array('between'=>array(7,24)),
+        10=>array('between'=>array(7, 24)),
         12=>array('more'=>23) ),
     2006 => array(
         1=>array('less'=>9),
-        2=>array('between'=>array(10,20)),
+        2=>array('between'=>array(10, 20)),
         4=>array('less'=>18),
         7=>array('more'=>0),
         8=>array('all'=>1),
         9=>array('less'=>4),
-        10=>array('between'=>array(6,23)),
+        10=>array('between'=>array(6, 23)),
         12=>array('more'=>22),
     ),
     2007 => array(
@@ -293,18 +293,18 @@ 
         7=>array('all'=>1),
         8=>array('all'=>1),
         9=>array('less'=>3),
-        10=>array('between'=>array(5,22)),
+        10=>array('between'=>array(5, 22)),
         12=>array('more'=>21),
     ),
     2008 => array(
         1=>array('less'=>5),
-        2=>array('between'=>array(8,18)),
+        2=>array('between'=>array(8, 18)),
         3=>array('more'=>28),
         4=>array('less'=>14),
         6=>array('more'=>27),
         7=>array('all'=>1),
         8=>array('all'=>1),
-        10=>array('between'=>array(10,27)),
+        10=>array('between'=>array(10, 27)),
     ),
 );
 
@@ -369,39 +369,39 @@ 
         else
             $to = "$year-9-" . $dates[$year][9]['less'];
     }
-    if ( (isset($dates[$year][$month]['less']) && $day < $dates[$year][$month]['less'])
+    if ((isset($dates[$year][$month]['less']) && $day < $dates[$year][$month]['less'])
     || (isset($dates[$year][$month]['more']) && $day > $dates[$year][$month]['more'])
     || (isset($dates[$year][$month]['between']) && $day > $dates[$year][$month]['between'][0] && $day < $dates[$year][$month]['between'][1])
-    || (isset($dates[$year][$month]['between'][2]) && $day > $dates[$year][$month]['between'][2] && $day < $dates[$year][$month]['between'][3]) ) {
+    || (isset($dates[$year][$month]['between'][2]) && $day > $dates[$year][$month]['between'][2] && $day < $dates[$year][$month]['between'][3])) {
         switch ($month) {
             case 1: case 12: $recess = 'Christmas Recess'; break;
-            case 2: if ($body==1 || $body==101) $recess = 'Half Term Week';
-                elseif ($body==4) $recess = 'February Recess';
+            case 2: if ($body == 1 || $body == 101) $recess = 'Half Term Week';
+                elseif ($body == 4) $recess = 'February Recess';
                 break;
-            case 3: if ($body==1 || $body==101) $recess = 'Easter Recess';
-                elseif ($body==4) $recess = 'Spring Recess';
+            case 3: if ($body == 1 || $body == 101) $recess = 'Easter Recess';
+                elseif ($body == 4) $recess = 'Spring Recess';
                 break;
             case 4: if (isset($dates[$year][$month]['more']) && $day > $dates[$year][$month]['more']) {
                     $recess = 'Election Recess';
-                } elseif ($body==4 && $year==2003) {
+                } elseif ($body == 4 && $year == 2003) {
                     $recess = 'Election Recess';
-                } elseif ($body==1 || $body==101) {
+                } elseif ($body == 1 || $body == 101) {
                     $recess = 'Easter Recess';
-                } elseif ($body==4) {
+                } elseif ($body == 4) {
                     $recess = 'Spring Recess';
                 }
                 break;
-            case 5: if ($year==2001 || (isset($dates[$year][$month]['less']) && $day < $dates[$year][$month]['less'])) {
+            case 5: if ($year == 2001 || (isset($dates[$year][$month]['less']) && $day < $dates[$year][$month]['less'])) {
                     $recess = 'Election Recess';
                 } else {
                     $recess = 'Whit Recess';
                 }
                 break;
-            case 6: if ($year==2001) {
+            case 6: if ($year == 2001) {
                     $recess = 'Election Recess';
-                } elseif ($body==1 || $body==101) {
+                } elseif ($body == 1 || $body == 101) {
                     $recess = 'Whit Recess';
-                } elseif ($body==4) {
+                } elseif ($body == 4) {
                     $recess = 'Summer Recess';
                 } else {
                     trigger_error("Argh6");
@@ -411,15 +411,15 @@ 
                 break;
             case 9: if (isset($dates[$year][$month]['less']) && $day < $dates[$year][$month]['less']) {
                     $recess = 'Summer Recess';
-                } elseif ($body==1 || $body==101) {
+                } elseif ($body == 1 || $body == 101) {
                     $recess = 'Conference Recess';
                 } else {
                     trigger_error("Argh9");
                 }
                 break;
-            case 10: if ($body==1 || $body==101) $recess = 'Conference Recess';
-                elseif ($body==4) $recess = 'Autumn Recess';
-                elseif ($body==5) $recess = 'Halloween Recess';
+            case 10: if ($body == 1 || $body == 101) $recess = 'Conference Recess';
+                elseif ($body == 4) $recess = 'Autumn Recess';
+                elseif ($body == 5) $recess = 'Halloween Recess';
                 break;
             case 11: $recess = 'Autumn Recess';
                 break;
@@ -427,12 +427,12 @@ 
         }
         if (isset($dates[$year][$month]['less']) && $day < $dates[$year][$month]['less']) {
             $to = "$year-$month-" . $dates[$year][$month]['less'];
-            if ($month==1)
-                $from = ($year-1)."-12-" . $dates[$year-1][12]['more'];
+            if ($month == 1)
+                $from = ($year - 1) . "-12-" . $dates[$year - 1][12]['more'];
             else {
-                for ($newmonth = $month-1; $newmonth>=1; $newmonth--) {
+                for ($newmonth = $month - 1; $newmonth >= 1; $newmonth--) {
                     if (isset($dates[$year][$newmonth]['more'])) {
-                        $from = "$year-".($newmonth)."-" . $dates[$year][$newmonth]['more'];
+                        $from = "$year-" . ($newmonth) . "-" . $dates[$year][$newmonth]['more'];
                         break;
                     }
                 }
@@ -440,12 +440,12 @@ 
         }
         if (isset($dates[$year][$month]['more']) && $day > $dates[$year][$month]['more']) {
             $from = "$year-$month-" . $dates[$year][$month]['more'];
-            if ($month==12)
-                $to = ($year+1)."-01-" . $dates[$year+1][1]['less'];
+            if ($month == 12)
+                $to = ($year + 1) . "-01-" . $dates[$year + 1][1]['less'];
             else {
-                for ($newmonth = $month+1; $newmonth<=12; $newmonth++) {
+                for ($newmonth = $month + 1; $newmonth <= 12; $newmonth++) {
                     if (isset($dates[$year][$newmonth]['less'])) {
-                        $to = "$year-".($newmonth)."-" . $dates[$year][$newmonth]['less'];
+                        $to = "$year-" . ($newmonth) . "-" . $dates[$year][$newmonth]['less'];
                         break;
                     }
                 }

www/includes/utility.php

Indentation +40 added lines, -40 removed lines

@@ -67,11 +67,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",
@@ -200,8 +200,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;
 
@@ -209,33 +209,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;
 }
 
 // Far from foolproof, but better than nothing.
@@ -567,14 +567,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["<"]);
@@ -764,16 +764,16 @@ 
     if (!$from) $from = CONTACTEMAIL;
 
     $headers =
-     "From: TheyWorkForYou <$from>\r\n" .
-     "Content-Type: text/plain; charset=utf-8\r\n" .
-     "MIME-Version: 1.0\r\n" .
-     "Content-Transfer-Encoding: 8bit\r\n" .
-     ($bulk ? "Precedence: bulk\r\nAuto-Submitted: auto-generated\r\n" : "" ).
-     "X-Mailer: PHP/" . phpversion();
+        "From: TheyWorkForYou <$from>\r\n" .
+        "Content-Type: text/plain; charset=utf-8\r\n" .
+        "MIME-Version: 1.0\r\n" .
+        "Content-Transfer-Encoding: 8bit\r\n" .
+        ($bulk ? "Precedence: bulk\r\nAuto-Submitted: auto-generated\r\n" : "" ).
+        "X-Mailer: PHP/" . phpversion();
     twfy_debug('EMAIL', "Sending email to $to with subject of '$subject'");
 
     if ($want_bounces) {
-      $envelope_sender = twfy_verp_envelope_sender($to);
+        $envelope_sender = twfy_verp_envelope_sender($to);
         $success = mail ($to, $subject, $message, $headers, '-f ' . $envelope_sender);
     } else {
         $success = mail ($to, $subject, $message, $headers);
@@ -1063,7 +1063,7 @@ 
 
     $return = '<h4>';
     if (isset($daytext[$major])) {
-     $return .= $daytext[$major] . ' ';
+        $return .= $daytext[$major] . ' ';
     }
 
     $return .= '<a href="';

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

@@ -887,7 +887,7 @@ 
     return $string;
 }
 
-function make_member_url($name, $const = '', $house = HOUSE_TYPE_COMMONS, $pid = NULL) {
+function make_member_url($name, $const = '', $house = HOUSE_TYPE_COMMONS, $pid = null) {
 
     // Case for Elizabeth II
     if ($house == HOUSE_TYPE_ROYAL)
@@ -903,7 +903,7 @@ 
     $out = '';
 
     // Insert the Person ID if known.
-    if ($pid !== NULL)
+    if ($pid !== null)
     {
         $out .= $pid . '/';
     }

Doc Comments +23 added lines

@@ -318,6 +318,9 @@ 
 $format_date_months = array('', 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December');
 $format_date_months_short = array('', 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
 
+/**
+ * @param string $format
+ */
 function format_date($date, $format) {
     global $format_date_months, $format_date_months_short;
     // Pass it a date (YYYY-MM-DD) and a
@@ -342,6 +345,9 @@ 
 }
 
 
+/**
+ * @param string $format
+ */
 function format_time($time, $format) {
     // Pass it a time (HH:MM:SS) and a
     // PHP date format string (eg, "H:i")
@@ -486,6 +492,7 @@ 
 
 /**
  * Filters user input to remove unwanted HTML tags etc
+ * @param string $filter_type
  */
 function filter_user_input($text, $filter_type) {
     // We use this to filter any major user input, especially comments.
@@ -750,12 +757,18 @@ 
 /* verp_envelope_sender RECIPIENT
  * Construct a VERP envelope sender for an email to RECIPIENT
  */
+/**
+ * @return string|null
+ */
 function twfy_verp_envelope_sender($recipient) {
     $envelope_sender = verp_envelope_sender($recipient, 'twfy', EMAILDOMAIN);
 
     return $envelope_sender;
 }
 
+/**
+ * @param string $message
+ */
 function send_email($to, $subject, $message, $bulk = false, $from = '', $want_bounces = false) {
     // Use this rather than PHP's mail() direct, so we can make alterations
     // easily to all the emails we send out from the site.
@@ -814,6 +827,9 @@ 
 }
 
 // Call this with a key name to get a COOKIE variable.
+/**
+ * @param string $name
+ */
 function get_cookie_var($name, $default='') {
     if (array_key_exists($name, $_COOKIE)) {
         return clean_var($_COOKIE[$name]);
@@ -1058,6 +1074,10 @@ 
     }
 }
 
+/**
+ * @param integer $major
+ * @param MySociety\TheyWorkForYou\Url $LISTURL
+ */
 function _major_summary_title($major, $data, $LISTURL, $daytext) {
     global $hansardmajors;
 
@@ -1107,6 +1127,9 @@ 
     return $return;
 }
 
+/**
+ * @param string|null $url
+ */
 function redirect($url) {
     if (defined('TESTING')) {
         print "Location: $url";

Spacing +78 added lines, -78 removed lines

@@ -10,7 +10,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).
@@ -27,10 +27,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.
         );
 
@@ -44,11 +44,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";
         }
@@ -65,14 +65,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",
@@ -131,11 +131,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];
     }
 
 
@@ -179,8 +179,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());
         }
     }
 
@@ -198,7 +198,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) {
@@ -207,26 +207,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']);
@@ -240,9 +240,9 @@ 
 
 // Far from foolproof, but better than nothing.
 function validate_email($string) {
-    if (!preg_match('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_`a-z{|}~]+'.
-        '@'.
-        '[-!#$%&\'*.\\+\/0-9=?A-Z^_`a-z{|}~]+\.'.
+    if (!preg_match('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_`a-z{|}~]+' .
+        '@' .
+        '[-!#$%&\'*.\\+\/0-9=?A-Z^_`a-z{|}~]+\.' .
         '[-!#$%&\'*+\\.\/0-9=?A-Z^_`a-z{|}~]+$/', $string)) {
         return false;
     } else {
@@ -264,7 +264,7 @@ 
     $nom = '0123456789';
     $gap = '\s\.';
 
-    if (    preg_match("/^[$fst][$num][$gap]*[$nom][$in][$in]$/i", $postcode) ||
+    if (preg_match("/^[$fst][$num][$gap]*[$nom][$in][$in]$/i", $postcode) ||
             preg_match("/^[$fst][$num][$num][$gap]*[$nom][$in][$in]$/i", $postcode) ||
             preg_match("/^[$fst][$sec][$num][$gap]*[$nom][$in][$in]$/i", $postcode) ||
             preg_match("/^[$fst][$sec][$num][$num][$gap]*[$nom][$in][$in]$/i", $postcode) ||
@@ -280,7 +280,7 @@ 
 // Returns the unixtime in microseconds.
 function getmicrotime() {
     $mtime = microtime();
-    $mtime = explode(" ",$mtime);
+    $mtime = explode(" ", $mtime);
     $mtime = $mtime[1] + $mtime[0];
 
     return $mtime;
@@ -293,7 +293,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;
 }
 
@@ -307,7 +307,7 @@ 
     if (preg_match("/^(\d\d\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/", $timestamp, $matches)) {
         list($string, $year, $month, $day, $hour, $min, $sec) = $matches;
 
-        return gmdate ($format, gmmktime($hour, $min, $sec, $month, $day, $year));
+        return gmdate($format, gmmktime($hour, $min, $sec, $month, $day, $year));
     } else {
         return "";
     }
@@ -328,13 +328,13 @@ 
         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";
             }
         }
 
-        return gmdate ($format, gmmktime(0, 0, 0, $month, $day, $year));
+        return gmdate($format, gmmktime(0, 0, 0, $month, $day, $year));
     } else {
         return "";
     }
@@ -350,7 +350,7 @@ 
     if (preg_match("/^(\d\d):(\d\d):(\d\d)$/", $time, $matches)) {
         list($string, $hour, $min, $sec) = $matches;
 
-        return gmdate ($format, gmmktime($hour, $min, $sec));
+        return gmdate($format, gmmktime($hour, $min, $sec));
     } else {
         return "";
     }
@@ -371,16 +371,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;
 
@@ -394,27 +394,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';
 
 }
 
@@ -455,10 +455,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;
     }
@@ -470,10 +470,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
@@ -505,11 +505,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(),
@@ -630,10 +630,10 @@ 
     // This returns 'debate_2003-02-28.475.3'.
 
     if ($keepmajor) {
-        $newgid = substr($gid, strpos($gid, '/')+1 );
+        $newgid = substr($gid, strpos($gid, '/') + 1);
         $newgid = str_replace('/', '_', $newgid);
     } else {
-        $newgid = substr($gid, strrpos($gid, '/')+1 );
+        $newgid = substr($gid, strrpos($gid, '/') + 1);
     }
 
     return $newgid;
@@ -647,7 +647,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) {
@@ -691,7 +691,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;
     }
 
@@ -715,7 +715,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.
@@ -724,7 +724,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;
     }
 
@@ -734,14 +734,14 @@ 
     $replace = array();
 
     foreach ($merge as $key => $val) {
-        $search[] = '/{'.$key.'}/';
+        $search[] = '/{' . $key . '}/';
         $replace[] = preg_replacement_quote($val);
     }
 
     $emailtext = preg_replace($search, $replace, $emailtext);
 
     // Send it!
-    $success = send_email ($data['to'], $subject, $emailtext, $bulk, 'twfy-DO-NOT-REPLY@' . EMAILDOMAIN, $want_bounces);
+    $success = send_email($data['to'], $subject, $emailtext, $bulk, 'twfy-DO-NOT-REPLY@' . EMAILDOMAIN, $want_bounces);
 
     return $success;
 
@@ -768,15 +768,15 @@ 
      "Content-Type: text/plain; charset=utf-8\r\n" .
      "MIME-Version: 1.0\r\n" .
      "Content-Transfer-Encoding: 8bit\r\n" .
-     ($bulk ? "Precedence: bulk\r\nAuto-Submitted: auto-generated\r\n" : "" ).
+     ($bulk ? "Precedence: bulk\r\nAuto-Submitted: auto-generated\r\n" : "") .
      "X-Mailer: PHP/" . phpversion();
     twfy_debug('EMAIL', "Sending email to $to with subject of '$subject'");
 
     if ($want_bounces) {
       $envelope_sender = twfy_verp_envelope_sender($to);
-        $success = mail ($to, $subject, $message, $headers, '-f ' . $envelope_sender);
+        $success = mail($to, $subject, $message, $headers, '-f ' . $envelope_sender);
     } else {
-        $success = mail ($to, $subject, $message, $headers);
+        $success = mail($to, $subject, $message, $headers);
     }
 
     return $success;
@@ -788,7 +788,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='') {
+function get_http_var($name, $default = '') {
     if (array_key_exists($name, $_GET)) {
         return clean_var($_GET[$name]);
     }
@@ -814,7 +814,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 clean_var($_COOKIE[$name]);
     }
@@ -825,7 +825,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");
@@ -838,7 +838,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) {
@@ -881,7 +881,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;
@@ -895,9 +895,9 @@ 
         return 'elizabeth_the_second';
     }
 
-    $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 = '';
@@ -1037,8 +1037,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>';
             }
         }

Braces +115 added lines, -69 removed lines

@@ -49,7 +49,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";
         }
     }
@@ -65,7 +67,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
@@ -209,19 +213,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;
     }
       }
@@ -232,7 +246,9 @@ 
       //        $arr['line'],$arr['file'],$arr['file']);
       $s .= "\n";
     }
-    if ($print) print $s;
+    if ($print) {
+        print $s;
+    }
   }
 
   return $s;
@@ -326,7 +342,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 {
@@ -761,7 +778,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;
+    }
 
     $headers =
      "From: TheyWorkForYou <$from>\r\n" .
@@ -853,17 +872,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";
@@ -871,8 +894,9 @@ 
 
 function make_plural($word, $number)
 {
-    if ($number == 1)
-        return $word;
+    if ($number == 1) {
+            return $word;
+    }
     return $word . "s";
 }
 
@@ -890,8 +914,7 @@ 
 function make_member_url($name, $const = '', $house = HOUSE_TYPE_COMMONS, $pid = NULL) {
 
     // Case for Elizabeth II
-    if ($house == HOUSE_TYPE_ROYAL)
-    {
+    if ($house == HOUSE_TYPE_ROYAL) {
         return 'elizabeth_the_second';
     }
 
@@ -903,8 +926,7 @@ 
     $out = '';
 
     // Insert the Person ID if known.
-    if ($pid !== NULL)
-    {
+    if ($pid !== NULL) {
         $out .= $pid . '/';
     }
 
@@ -912,8 +934,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))));
     }
 
@@ -929,11 +950,18 @@ 
         }
     } elseif ($house == 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;
-    } elseif ($house == HOUSE_TYPE_ROYAL) { # Queen
+        if ($family_name) {
+            $s .= ' ' . $family_name;
+        }
+        if ($lordofname) {
+            $s .= ' of ' . $lordofname;
+        }
+    } elseif ($house == HOUSE_TYPE_ROYAL) {
+# Queen
         $s = "$given_name $family_name";
     }
     return $s;
@@ -962,12 +990,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;
@@ -985,13 +1018,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]);
+            }
         }
     }
 
@@ -1000,22 +1036,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 '
@@ -1067,14 +1110,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;
@@ -1082,20 +1127,21 @@ 
 
 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";
+    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";
+    }
     return $dmpdesc;
 }
 

www/includes/dbtypes.php

Spacing +7 added lines, -7 removed lines

@@ -124,7 +124,7 @@ 
 );
 $hansardmajors[104] = $hansardmajors[4];
 
-$parties = array (
+$parties = array(
     'Bp'    => 'Bishop',
     'Con'   => 'Conservative',
     'CWM'   => 'Deputy Speaker',
@@ -166,9 +166,9 @@ 
 */
 
 // Constants for various house types
-define ('HOUSE_TYPE_ROYAL', 0);
-define ('HOUSE_TYPE_COMMONS', 1);
-define ('HOUSE_TYPE_LORDS', 2);
-define ('HOUSE_TYPE_NI', 3);
-define ('HOUSE_TYPE_SCOTLAND', 4);
-define ('HOUSE_TYPE_WALES', 5);
+define('HOUSE_TYPE_ROYAL', 0);
+define('HOUSE_TYPE_COMMONS', 1);
+define('HOUSE_TYPE_LORDS', 2);
+define('HOUSE_TYPE_NI', 3);
+define('HOUSE_TYPE_SCOTLAND', 4);
+define('HOUSE_TYPE_WALES', 5);

www/docs/foiorder2009/share.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
         <p></p>
     <?php
 
-$PAGE->block_start(array ('title'=>'Share this with your friends'));
+$PAGE->block_start(array('title'=>'Share this with your friends'));
 
 #foi2009_sharethis_link();
 #foi2009_share_page();
@@ -25,4 +25,4 @@ 
 
 $PAGE->block_end();
 $PAGE->stripe_end();
-$PAGE->page_end ();
+$PAGE->page_end();

www/docs/foiorder2009/index.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 
 $PAGE->page_start();
 $PAGE->stripe_start();
-$PAGE->block_start(array ('id'=>'intro', 'title'=>'We need your help:'));
+$PAGE->block_start(array('id'=>'intro', 'title'=>'We need your help:'));
 
 echo '<div id="foi2009">';
 echo $foi2009_message;

www/docs/rss/index.php

Indentation +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     } 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");
-       } else {
+        } else {
             $MEMBER = new MEMBER(array('constituency' => $constituency));
             if ($MEMBER->person_id()) {
                 // This will cookie the postcode.

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
 
 $pc = get_http_var('pc');
 $pc = preg_replace('#[^a-z0-9 ]#i', '', $pc);
-if (!$pc) exit;
+if (!$pc) {
+    exit;
+}
 
 if (validate_postcode($pc)) {
     $constituency = strtolower(MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituency($pc));

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);
@@ -13,7 +13,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()) {
@@ -27,5 +27,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/docs/freeourbills/doshare.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
     <?php
 }
 
-$PAGE->block_start(array ('title'=>'Share the \'Free our Bills!\' campaign'));
+$PAGE->block_start(array('title'=>'Share the \'Free our Bills!\' campaign'));
 freeourbills_styles();
 
 freeourbills_share_page();
@@ -25,4 +25,4 @@ 
 
 $PAGE->block_end();
 $PAGE->stripe_end();
-$PAGE->page_end ();
+$PAGE->page_end();

www/docs/freeourbills/techy.php

Spacing +1 added lines, -1 removed lines

@@ -144,4 +144,4 @@
 <?php
 #$PAGE->block_end();
 $PAGE->stripe_end();
-$PAGE->page_end ();
+$PAGE->page_end();