mysociety / theyworkforyou

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

Spacing +5 added lines, -5 removed lines

@@ -84,13 +84,13 @@
         $db->display_total_duration();
 
         $duration = getmicrotime() - STARTTIME;
-        twfy_debug ("TIME", "Total time for page: $duration seconds.");
+        twfy_debug("TIME", "Total time for page: $duration seconds.");
         if (!isset($_SERVER['WINDIR'])) {
             $rusage = getrusage();
-            $duration = $rusage['ru_utime.tv_sec']*1000000 + $rusage['ru_utime.tv_usec'] - STARTTIMEU;
-            twfy_debug ('TIME', "Total user time: $duration microseconds.");
-            $duration = $rusage['ru_stime.tv_sec']*1000000 + $rusage['ru_stime.tv_usec'] - STARTTIMES;
-            twfy_debug ('TIME', "Total system time: $duration microseconds.");
+            $duration = $rusage['ru_utime.tv_sec'] * 1000000 + $rusage['ru_utime.tv_usec'] - STARTTIMEU;
+            twfy_debug('TIME', "Total user time: $duration microseconds.");
+            $duration = $rusage['ru_stime.tv_sec'] * 1000000 + $rusage['ru_stime.tv_usec'] - STARTTIMES;
+            twfy_debug('TIME', "Total system time: $duration microseconds.");
         }
 
 ?>

www/includes/easyparliament/templates/html/static/search_help.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 </li>
 
 <?php
-$user_agent = ( isset( $_SERVER['HTTP_USER_AGENT'] ) ) ? strtolower( $_SERVER['HTTP_USER_AGENT'] ) : '';
+$user_agent = (isset($_SERVER['HTTP_USER_AGENT'])) ? strtolower($_SERVER['HTTP_USER_AGENT']) : '';
 if (stristr($user_agent, 'Firefox/')) {
 ?>
      <li>You can also add TheyWorkForYou to <a href="http://mycroft.mozdev.org/download.html?name=theyworkforyou">Firefox's search box</a>.</li>

www/includes/easyparliament/templates/api/hansard_gid.php

Indentation +1 added lines, -1 removed lines

@@ -67,4 +67,4 @@
     api_output($out);
 } else {
     api_error('Nothing');
-   }
+    }

Braces +9 added lines, -4 removed lines

@@ -14,7 +14,9 @@ 
 if (isset ($data['rows'])) {
     for ($i=0; $i<count($data['rows']); $i++) {
         $row = $data['rows'][$i];
-        if (count($row) == 0) continue;
+        if (count($row) == 0) {
+            continue;
+        }
         if ($row['htype'] == '12') {
             if (isset($row['speaker']) && count($row['speaker']) > 0) {
                 $speaker = $row['speaker'];
@@ -36,7 +38,9 @@ 
                     $desc .= $speaker['constituency'] . ', ';
                 }
                 $desc .= _htmlentities($speaker['party']);
-                if ($desc) $row['speaker']['desc'] = $desc;
+                if ($desc) {
+                    $row['speaker']['desc'] = $desc;
+                }
             }
         }
         $out[] = $row;
@@ -52,8 +56,9 @@ 
                 $has_content = false;
             }
             $entry = $row;
-            if (isset($row['excerpt']))
-                $entry['excerpt'] = trim_characters($entry['excerpt'], 0, 200);
+            if (isset($row['excerpt'])) {
+                            $entry['excerpt'] = trim_characters($entry['excerpt'], 0, 200);
+            }
             if ($has_content) {
             } else {
                 unset($entry['listurl']);

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 $out = array();
 if (isset ($data['rows'])) {
-    for ($i=0; $i<count($data['rows']); $i++) {
+    for ($i = 0; $i < count($data['rows']); $i++) {
         $row = $data['rows'][$i];
         if (count($row) == 0) continue;
         if ($row['htype'] == '12') {

www/includes/easyparliament/templates/api/hansard_date.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 
 if (isset ($data['rows'])) {
     $out = array();
-    for ($i=0; $i<count($data['rows']); $i++) {
+    for ($i = 0; $i < count($data['rows']); $i++) {
         $row = $data['rows'][$i];
 
         if ($row['htype'] == '10' && isset($row['excerpt']) && strstr($row['excerpt'], "was asked&#8212;")) {
@@ -40,7 +40,7 @@ 
         if ($row['htype'] == '10') {
             $out[] = array('entry' => $entry, 'subs' => array());
         } else {
-            $out[sizeof($out)-1]['subs'][] = $entry;
+            $out[sizeof($out) - 1]['subs'][] = $entry;
         }
 
     }

Braces +3 added lines, -2 removed lines

@@ -27,8 +27,9 @@
         }
 
         $entry = $row;
-        if (isset($row['excerpt']))
-            $entry['excerpt'] = trim_characters($entry['excerpt'], 0, 200);
+        if (isset($row['excerpt'])) {
+                    $entry['excerpt'] = trim_characters($entry['excerpt'], 0, 200);
+        }
         if ($has_content) {
         } else {
             unset($entry['listurl']);

www/includes/easyparliament/sidebars/search_filters.php

Indentation +3 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
  <select id="section" name="section">
  <option value="">Any
 <?php
- optgroups(array(
+    optgroups(array(
     'UK Parliament' => array(
         'uk' => 'All UK',
         'debates' => 'House of Commons debates',
@@ -85,8 +85,8 @@ 
         'sp' => 'Debates',
         'spwrans' => 'Written answers',
     ),
- ), $section);
- ?>
+    ), $section);
+    ?>
  </select>
  <div class="help">
  Restrict results to a particular parliament or assembly that we cover (e.g. the

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 if (preg_match('#\s*([0-9/.-]*)\.\.([0-9/.-]*)#', $filter_ss, $m)) {
     $from = $m[1];
     $to = $m[2];
-    $filter_ss =  preg_replace('#\s*([0-9/.-]*)\.\.([0-9/.-]*)#', '', $filter_ss);
+    $filter_ss = preg_replace('#\s*([0-9/.-]*)\.\.([0-9/.-]*)#', '', $filter_ss);
 }
 $section = get_http_var('section');
 if (preg_match('#\s*section:([a-z]*)#', $filter_ss, $m)) {
@@ -36,7 +36,7 @@ 
     $filter_ss = preg_replace('#\s*speaker:[0-9]*#', '', $filter_ss);
 }
 
-$this->block_start(array( 'title' => "Filtering your results"));
+$this->block_start(array('title' => "Filtering your results"));
 
 ?>
 <form method="get" action="/search/">

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
         echo '<optgroup label="', $key, '">';
         foreach ($values as $k => $v) {
             echo '<option';
-            if ($current == $k) echo ' selected';
+            if ($current == $k) {
+                echo ' selected';
+            }
             echo ' value="', $k, '">', $v;
         }
         echo "</optgroup>\n";

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/easyparliament/page.php

Braces +15 added lines, -13 removed lines

@@ -114,7 +114,10 @@ 
         //  'foot' - For the bottom stripe on hansard debates/wrans listings.
         // $id is the value of an id for this div (if blank, not used).
         ?>
-        <div class="stripe-<?php echo $type; ?><?php if ($extra_class != '') echo ' ' . $extra_class; ?>"<?php
+        <div class="stripe-<?php echo $type; ?><?php if ($extra_class != '') {
+    echo ' ' . $extra_class;
+}
+?>"<?php
         if ($id != '') {
             print ' id="' . $id . '"';
         }
@@ -479,7 +482,9 @@ 
 
         global $DATA, $this_page;
 
-        if ($this->page_started()) return;
+        if ($this->page_started()) {
+            return;
+        }
         // The page's HTML hasn't been started yet, so we'd better do it.
 
         // Set the page title (in the <title></title>).
@@ -629,7 +634,9 @@ 
             $URL->insert(array('adv' => 1));
                 echo '&nbsp;&nbsp; <a href="' . $URL->generate() . '">More&nbsp;options</a>';
                 echo '<br>';
-                if ($wtt) print '<input type="hidden" name="wtt" value="1">';
+                if ($wtt) {
+                    print '<input type="hidden" name="wtt" value="1">';
+                }
         } else { ?>
     <form action="http://www.writetothem.com/lords" method="get">
     <input type="hidden" name="pid" value="<?=_htmlentities(get_http_var('pid')) ?>">
@@ -753,8 +760,7 @@ 
             // The return url for after the user has logged in.
             if (get_http_var("ret") != "") {
                 $returl = get_http_var("ret");
-            }
-            else {
+            } else {
                 $returl = $glossary_returl;
             }
             ?>
@@ -803,15 +809,13 @@ 
                 else {
                     $letters[] = "<li class=\"on\">" . $letter . "</li>";
                 }
-            }
-            elseif (!empty($GLOSSARY->alphabet[$letter])) {
+            } elseif (!empty($GLOSSARY->alphabet[$letter])) {
                 $URL = new URL('glossary');
                 $URL->insert(array('az' => $letter));
                 $letter_link = $URL->generate('url');
 
                 $letters[] = "<li><a href=\"" . $letter_link . "\">" . $letter . "</a></li>";
-            }
-            else {
+            } else {
                 $letters[] = '<li>' . $letter . '</li>';
             }
         }
@@ -851,8 +855,7 @@ 
             $URL->insert(array("delete_confirm" => $term['glossary_id']));
             $delete_url = $URL->generate();
             $admin_links = "<br><small><a href=\"".$delete_url."\">delete</a></small>";
-        }
-        else {
+        } else {
             $admin_links = "";
         }
 
@@ -862,8 +865,7 @@ 
             $user_link = $URL->generate('url');
 
             $user_details = "\t\t\t\t<p><small>contributed by user <a href=\"" . $user_link . "\">" . $term['firstname'] . " " . $term['lastname'] . "</a></small>" . $admin_links . "</p>\n";
-        }
-        else {
+        } else {
             $user_details = "";
         }
 

Spacing +39 added lines, -39 removed lines

@@ -19,7 +19,7 @@ 
     public $within_stripe_sidebar = false;
 
     public function page_start() {
-        if ( !$this->page_started() ) {
+        if (!$this->page_started()) {
             $this->checkForAdmin();
             $this->displayHeader();
         }
@@ -32,7 +32,7 @@ 
 
         $data = $h->data;
         $data = array_merge($u->data, $data);
-        if ( isset($page_errors) ) {
+        if (isset($page_errors)) {
             $data['page_errors'] = $page_errors;
         }
         $data['banner_text'] = '';
@@ -52,7 +52,7 @@ 
                 $THISPAGE = new URL($this_page);
 
                 $LOGINURL = new URL('userlogin');
-                $LOGINURL->insert(array('ret' => $THISPAGE->generate('none') ));
+                $LOGINURL->insert(array('ret' => $THISPAGE->generate('none')));
 
                 $text = "<a href=\"" . $LOGINURL->generate() . "\">You'd better sign in!</a>";
             } else {
@@ -67,7 +67,7 @@ 
     }
 
     public function page_end() {
-        if ( !$this->page_started() ) {
+        if (!$this->page_started()) {
             $this->page_start();
         }
 
@@ -101,7 +101,7 @@ 
         }
     }
 
-    public function stripe_start($type='side', $id='', $extra_class = '') {
+    public function stripe_start($type = 'side', $id = '', $extra_class = '') {
         // $type is one of:
         //  'full' - a full width div
         //  'side' - a white stripe with a coloured sidebar.
@@ -131,7 +131,7 @@ 
     }
 
 
-    public function stripe_end ($contents = array(), $extra = '') {
+    public function stripe_end($contents = array(), $extra = '') {
         // $contents is an array containing 0 or more hashes.
         // Each hash has two values, 'type' and 'content'.
         // 'Type' could be one of these:
@@ -234,7 +234,7 @@ 
     public function include_sidebar_template($sidebarname) {
         global $this_page, $DATA;
 
-            $sidebarpath = INCLUDESPATH.'easyparliament/sidebars/'.$sidebarname.'.php';
+            $sidebarpath = INCLUDESPATH . 'easyparliament/sidebars/' . $sidebarname . '.php';
 
             if (file_exists($sidebarpath)) {
                 include $sidebarpath;
@@ -242,7 +242,7 @@ 
     }
 
 
-    public function block_start($data=array()) {
+    public function block_start($data = array()) {
         // Starts a 'block' div, used mostly on the home page,
         // on the MP page, and in the sidebars.
         // $data is a hash like this:
@@ -389,7 +389,7 @@ 
         if (is_string($message)) {
             // Sometimes we're just sending a single line to this function
             // rather like the bigger array...
-            $message = array (
+            $message = array(
                 'text' => $message
             );
         }
@@ -397,13 +397,13 @@ 
         // if the page has started then we're most likely in an old school page
         // so we should just print out the error, otherwise stick it in the error
         // global which will then be displayed by the header template
-        if ( $this->page_started() ) {
+        if ($this->page_started()) {
             $this->message($message, 'error');
         } else {
-            if ( !isset($page_errors) ) {
+            if (!isset($page_errors)) {
                 $page_errors = array();
             }
-            $page_errors[]  = $message;
+            $page_errors[] = $message;
         }
 
         if ($fatal) {
@@ -420,7 +420,7 @@ 
     }
 
 
-    public function message($message, $class='') {
+    public function message($message, $class = '') {
         // Generates a very simple but common page content.
         // Used for when a user logs out, or votes, or any simple thing
         // where there's a little message and probably a link elsewhere.
@@ -498,7 +498,7 @@ 
             if ($page_title != '') {
                 $page_title .= ': ';
             }
-            $page_title .= format_date ($info['date'], SHORTDATEFORMAT);
+            $page_title .= format_date($info['date'], SHORTDATEFORMAT);
         }
 
         if ($page_title != '') {
@@ -553,7 +553,7 @@ 
 
         if (isset($nextprev['up'])) {
 
-            $uplink = '<span class="up"><a href="' .  $nextprev['up']['url'] . '" title="' . $nextprev['up']['title'] . '">' . $nextprev['up']['body'] . '</a>';
+            $uplink = '<span class="up"><a href="' . $nextprev['up']['url'] . '" title="' . $nextprev['up']['title'] . '">' . $nextprev['up']['body'] . '</a>';
             if (get_http_var('s')) {
                 $URL = new URL($this_page);
                 $uplink .= '<br><a href="' . $URL->generate() . '">Remove highlighting</a>';
@@ -568,7 +568,7 @@ 
             $next = $nextprev['next'];
 
             if (isset($next['url'])) {
-                $nextlink = '<a href="' .  $next['url'] . '" title="' . $next['title'] . '" class="linkbutton">' . $next['body'] . ' &raquo;</a>';
+                $nextlink = '<a href="' . $next['url'] . '" title="' . $next['title'] . '" class="linkbutton">' . $next['body'] . ' &raquo;</a>';
             } else {
                 $nextlink = $next['body'] . ' &raquo;';
             }
@@ -585,7 +585,7 @@ 
     }
 
 
-    public function search_form($value='') {
+    public function search_form($value = '') {
         global $SEARCHENGINE;
         // Search box on the search page.
         // If $value is set then it will be displayed in the form.
@@ -615,7 +615,7 @@ 
             }
 
         echo '<div class="mainsearchbox">';
-        if ($wtt<2) {
+        if ($wtt < 2) {
                 echo '<form action="', $URL->generate(), '" method="get">';
                 if (get_http_var('o')) {
                     echo '<input type="hidden" name="o" value="', _htmlentities(get_http_var('o')), '">';
@@ -624,7 +624,7 @@ 
                     echo '<input type="hidden" name="house" value="', _htmlentities(get_http_var('house')), '">';
                 }
                 echo '<input type="text" name="q" value="', _htmlentities($value), '" size="50"> ';
-                echo '<input type="submit" value=" ', ($wtt?'Modify search':'Search'), ' ">';
+                echo '<input type="submit" value=" ', ($wtt ? 'Modify search' : 'Search'), ' ">';
                 $URL = new URL('search');
             $URL->insert(array('adv' => 1));
                 echo '&nbsp;&nbsp; <a href="' . $URL->generate() . '">More&nbsp;options</a>';
@@ -646,16 +646,16 @@ 
                     $ordering = 'd';
                 }
 
-                if ($ordering=='r') {
+                if ($ordering == 'r') {
                 print '<strong>Sorted by relevance</strong>';
                 } else {
                 printf("<a href='%s'>Sort by relevance</a>", $orderUrl->generate('html', array('o'=>'r')));
                 }
 
                 print "&nbsp;|&nbsp;";
-                if ($ordering=='d') {
+                if ($ordering == 'd') {
                 print '<strong>Sorted by date: newest</strong> / <a href="' . $orderUrl->generate('html', array('o'=>'o')) . '">oldest</a>';
-                } elseif ($ordering=='o') {
+                } elseif ($ordering == 'o') {
                 print '<strong>Sorted by date:</strong> <a href="' . $orderUrl->generate('html', array('o'=>'d')) . '">newest</a> / <strong>oldest</strong>';
                 } else {
                 printf("Sort by date: <a href='%s'>newest</a> / <a href='%s'>oldest</a>",
@@ -663,7 +663,7 @@ 
                 }
 
             print "&nbsp;|&nbsp;";
-            if ($ordering=='p') {
+            if ($ordering == 'p') {
                 print '<strong>Use by person</strong>';
             } else {
                 printf('<a href="%s">Show use by person</a>', $orderUrl->generate('html', array('o'=>'p')));
@@ -687,7 +687,7 @@ 
         include_once INCLUDESPATH . 'easyparliament/templates/html/search_advanced.php';
     }
 
-    public function login_form ($errors = array()) {
+    public function login_form($errors = array()) {
         // Used for /user/login/ and /user/prompt/
         // $errors is a hash of potential errors from a previous log in attempt.
         ?>
@@ -791,7 +791,7 @@ 
     public function glossary_atoz(&$GLOSSARY) {
     // Print out a nice list of lettered links to glossary pages
 
-        $letters = array ();
+        $letters = array();
 
         foreach ($GLOSSARY->alphabet as $letter => $eps) {
             // if we're writing out the current letter (list or item)
@@ -824,14 +824,14 @@ 
                     <div class="letters">
                         <ul>
     <?php
-        for ($n=0; $n<13; $n++) {
+        for ($n = 0; $n < 13; $n++) {
             print $letters[$n];
         }
         ?>
                         </ul>
                         <ul>
     <?php
-        for ($n=13; $n<26; $n++) {
+        for ($n = 13; $n < 26; $n++) {
             print $letters[$n];
         }
         ?>
@@ -850,12 +850,12 @@ 
 
         // add some extra controls for the administrators
         if ($this_page == "admin_glossary") {
-            print "<a id=\"gl".$term['glossary_id']."\"></a>";
+            print "<a id=\"gl" . $term['glossary_id'] . "\"></a>";
             print "<h3>" . $term['title'] . "</h3>";
             $URL = new URL('admin_glossary');
             $URL->insert(array("delete_confirm" => $term['glossary_id']));
             $delete_url = $URL->generate();
-            $admin_links = "<br><small><a href=\"".$delete_url."\">delete</a></small>";
+            $admin_links = "<br><small><a href=\"" . $delete_url . "\">delete</a></small>";
         }
         else {
             $admin_links = "";
@@ -878,9 +878,9 @@ 
             // Add a direct search link for current glossary item
             $URL = new URL('search');
             // remember to quote the term for phrase matching in search
-            $URL->insert(array('s' => '"'.$term['title'].'"'));
+            $URL->insert(array('s' => '"' . $term['title'] . '"'));
             $search_url = $URL->generate();
-            printf ("\t\t\t\t<p>Search hansard for \"<a href=\"%s\" title=\"View search results for this glossary item\">%s</a>\"</p>", $search_url, $term['title']);
+            printf("\t\t\t\t<p>Search hansard for \"<a href=\"%s\" title=\"View search results for this glossary item\">%s</a>\"</p>", $search_url, $term['title']);
         }
     }
 
@@ -955,7 +955,7 @@ 
 
             // Generate all the page links.
             $URL = new URL($this_page);
-            $URL->insert( array('wtt' => get_http_var('wtt')) );
+            $URL->insert(array('wtt' => get_http_var('wtt')));
             if (isset($pagedata['s'])) {
                 # XXX: Should be taken out in *one* place, not here + search_form etc.
                 $value = $pagedata['s'];
@@ -1093,7 +1093,7 @@ 
 
                 $body = trim_characters($report['body'], 0, 40);
 
-                $tabledata['rows'][] = array (
+                $tabledata['rows'][] = array(
                     _htmlentities($report['firstname'] . ' ' . $report['lastname']),
                     _htmlentities($body),
                     $report['reported'],
@@ -1124,13 +1124,13 @@ 
         // $page is the name of the page the dates should link to.
 
         // Create array containing abbreviations of days of week.
-        $daysOfWeek = array('Mon','Tue','Wed','Thu','Fri','Sat','Sun');
+        $daysOfWeek = array('Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun');
 
         // What is the first day of the month in question?
-        $firstDayOfMonth = mktime(0,0,0,$month,1,$year);
+        $firstDayOfMonth = mktime(0, 0, 0, $month, 1, $year);
 
         // How many days does this month contain?
-        $numberDays = date('t',$firstDayOfMonth);
+        $numberDays = date('t', $firstDayOfMonth);
 
         // Retrieve some information about the first day of the
         // month in question.
@@ -1211,7 +1211,7 @@ 
 
             // Is the $currentDay a member of $dateArray? If so,
             // the day should be linked.
-            if (in_array($currentDay,$dateArray)) {
+            if (in_array($currentDay, $dateArray)) {
 
                 $date = sprintf("%04d-%02d-%02d", $year, $month, $currentDay);
 
@@ -1312,8 +1312,8 @@ 
         // Returns HTML suitable for putting in the sidebar on Admin pages.
         global $this_page, $DATA;
 
-        $pages = array ('admin_home',
-                'admin_comments','admin_trackbacks', 'admin_searchlogs', 'admin_popularsearches', 'admin_failedsearches',
+        $pages = array('admin_home',
+                'admin_comments', 'admin_trackbacks', 'admin_searchlogs', 'admin_popularsearches', 'admin_failedsearches',
                 'alert_stats', 'admin_statistics', 'admin_reportstats',
                 'admin_commentreports', 'admin_glossary', 'admin_glossary_pending', 'admin_badusers',
                 'admin_photos', 'admin_mpurls', 'admin_policies', 'admin_banner', 'admin_featured', 'admin_topics'

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