mysociety / theyworkforyou

www/docs/email/index.php

Spacing +5 added lines, -5 removed lines

@@ -50,18 +50,18 @@ 
 <?php
 } else {
     $rep_name = $MEMBER->full_name();
-    if ($MEMBER->house_disp==1) {
+    if ($MEMBER->house_disp == 1) {
         $rep_name .= ' MP';
-    } elseif ($MEMBER->house_disp==3) {
+    } elseif ($MEMBER->house_disp == 3) {
         $rep_name .= ' MLA';
     }
-    $data = array (
+    $data = array(
         'template'      => 'email_a_friend',
         'to'            => $recipient_email,
         'subject'       => 'Find out all about ' . $rep_name
     );
     $url = $MEMBER->url(true);
-    $merge = array (
+    $merge = array(
         'NAME' => $sender_name,
         'EMAIL' => $sender_email,
         'REP_NAME' => $rep_name,
@@ -70,7 +70,7 @@ 
 
     $success = send_template_email($data, $merge);
     if ($success) {
-        print "<p>Your email has been sent successfully. Thank you for using TheyWorkForYou.</p> <p><a href=\"$url\">Return to ".$MEMBER->full_name()."'s page</a></p>";
+        print "<p>Your email has been sent successfully. Thank you for using TheyWorkForYou.</p> <p><a href=\"$url\">Return to " . $MEMBER->full_name() . "'s page</a></p>";
     } else {
         print "<p>Sorry, something went wrong trying to send an email. Please wait a few minutes and try again.</p>";
     }

www/docs/glossary/index.php

Spacing +9 added lines, -9 removed lines

@@ -6,7 +6,7 @@ 
 }
 
 include_once '../../includes/easyparliament/init.php';
-include_once INCLUDESPATH."easyparliament/glossary.php";
+include_once INCLUDESPATH . "easyparliament/glossary.php";
 
 $args = array(
     'sort'				=> "regexp_replace",
@@ -47,11 +47,11 @@ 
 }
 
 if ($term) {
-    $DATA->set_page_metadata($this_page, 'title', $term['title'].': Glossary item');
+    $DATA->set_page_metadata($this_page, 'title', $term['title'] . ': Glossary item');
     $DATA->set_page_metadata($this_page, 'heading', $term['title']);
 } else {
-    $DATA->set_page_metadata ($this_page, 'title', $GLOSSARY->current_letter.': Glossary index');
-    $DATA->set_page_metadata ($this_page, 'heading', 'Glossary index');
+    $DATA->set_page_metadata($this_page, 'title', $GLOSSARY->current_letter . ': Glossary index');
+    $DATA->set_page_metadata($this_page, 'heading', 'Glossary index');
 }
 
 $PAGE->page_start();
@@ -70,13 +70,13 @@ 
     $URL->update(array("gl" => $GLOSSARY->next_term['glossary_id']));
     $next_link = $URL->generate('url');
 
-    $nextprev = array (
-        'next'	=> array (
+    $nextprev = array(
+        'next'	=> array(
             'url'	=> $next_link,
             'title'	=> 'Next term',
             'body'	=> $GLOSSARY->next_term['title']
         ),
-        'prev'	=> array (
+        'prev'	=> array(
             'url'	=> $previous_link,
             'title'	=> 'Previous term',
             'body'	=> $GLOSSARY->previous_term['title']
@@ -109,8 +109,8 @@ 
     }
 }
 
-$PAGE->stripe_end(array (
-    array (
+$PAGE->stripe_end(array(
+    array(
         'type'		=> 'nextprev',
         'content'	=> ''
     )

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

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
         $date = format_date($date, SHORTDATEFORMAT);
         $time = format_time($time, TIMEFORMAT);
 
-        $count = $n+1;
+        $count = $n + 1;
 
         $USERURL->insert(array('u'=>$comment['user_id']));
 
@@ -49,7 +49,7 @@ 
     if ($this_page == 'home') {
         $MOREURL = new \MySociety\TheyWorkForYou\Url('comments_recent');
         ?>
-                        <p><a href="<?php echo $MOREURL->generate(); ?>#c<?php echo count($data['comments'])+1; ?>">See more annotations posted recently</a></p>
+                        <p><a href="<?php echo $MOREURL->generate(); ?>#c<?php echo count($data['comments']) + 1; ?>">See more annotations posted recently</a></p>
 <?php
     }
     if ($this_page != 'home') {

www/includes/easyparliament/templates/html/divisions/index.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
           </div>
           <div class="business-section__primary">
                <?php
-                if ( isset($divisions) && $divisions ) {
+                if (isset($divisions) && $divisions) {
                     $current_date = '';
                 ?>
                <ul class="business-list">

www/includes/easyparliament/templates/html/section/_calendar_section.php

Indentation +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
             <?php
             foreach ($calendar as $year => $months) {
                 foreach ($months as $month => $dates) {
-                     include '_calendar.php';
+                        include '_calendar.php';
                 }
             } ?>

www/includes/easyparliament/templates/html/section/_calendar.php

Indentation +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
     if ($dayOfWeek < 0) {
         $dayOfWeek = 6;
     }
-  ?>
+    ?>
   <?php }
     if (!isset($years)) { ?>
     <div class="calendar__controls">

Spacing +13 added lines, -13 removed lines

@@ -1,10 +1,10 @@ 
 <div class="calendar">
-  <?php if(isset($month)) {
+  <?php if (isset($month)) {
     // 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);
 
     // What is the name of the month in question?
     $monthName = strftime('%B', $firstDayOfMonth);
@@ -12,7 +12,7 @@ 
     if (isset($info['onday'])) {
         // 'onday' is like 'yyyy-mm-dd'.
         $datebits = explode('-', $info['onday']);
-        if (count($datebits)>2 && $datebits[0] == $year && $datebits[1] == $month) {
+        if (count($datebits) > 2 && $datebits[0] == $year && $datebits[1] == $month) {
             $toDay = $datebits[2];
         } else {
             $toDay = '';
@@ -39,7 +39,7 @@ 
   <?php }
     if (!isset($years)) { ?>
     <div class="calendar__controls">
-        <?php if ( isset($prev) ) { ?>
+        <?php if (isset($prev)) { ?>
         <a href="<?= $prev['url'] ?>" class="calendar__controls__previous">&larr;</a>
         <?php } else { ?>
         <span class="calendar__controls__previous">&nbsp;</span>
@@ -47,7 +47,7 @@ 
         <span class="calendar__controls__current">
             <?= $monthName ?> <?= $year ?>
         </span>
-        <?php if ( isset($next) ) { ?>
+        <?php if (isset($next)) { ?>
         <a href="<?= $next['url'] ?>" class="calendar__controls__next">&rarr;</a>
         <?php } else { ?>
         <span class="calendar__controls__next">&nbsp;</span>
@@ -100,14 +100,14 @@ 
                 // sittings - e.g. WH is only Tuesday-Thursday
                 if ($currentDay == $toDay) {
                     print '<td class="on"';
-                    if ($recess[0] && $recess[0]!=1) {
-                        print ' title="'.$recess[0].'"';
+                    if ($recess[0] && $recess[0] != 1) {
+                        print ' title="' . $recess[0] . '"';
                     }
                     print '>';
                 } elseif ($recess[0]) {
                     print '<td class="no"';
-                    if ($recess[0]!=1) {
-                        print ' title="'.$recess[0].'"';
+                    if ($recess[0] != 1) {
+                        print ' title="' . $recess[0] . '"';
                     }
                     print '>';
                 } else {
@@ -116,7 +116,7 @@ 
 
                 // Is the $currentDay a member of $dates? If so,
                 // the day should be linked.
-                if (in_array($currentDay,$dates)) {
+                if (in_array($currentDay, $dates)) {
 
                     $date = sprintf("%04d-%02d-%02d", $year, $month, $currentDay);
 
@@ -154,12 +154,12 @@ 
             </tr>
         </tbody>
     </table>
-  <?php if(!isset($years)){ ?>
+  <?php if (!isset($years)) { ?>
     <div class="calendar__footer">
     <?php
         $y = $urls['day'];
         $y->reset();
-        $y->insert(array( 'y' => $year ));
+        $y->insert(array('y' => $year));
         $url = $y->generate();
     ?>
     <a href="<?= $url ?>"><?= sprintf(gettext('See all of %s'), $year) ?></a>

www/includes/easyparliament/recess.php

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)),
     ),
 );
 
@@ -370,45 +370,45 @@ 
             $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) {
+            case 2: if ($body == 1 || $body == 101) {
                     $recess = 'Half Term Week';
-                } elseif ($body==4) {
+                } elseif ($body == 4) {
                     $recess = 'February Recess';
                 }
                 break;
-            case 3: if ($body==1 || $body==101) {
+            case 3: if ($body == 1 || $body == 101) {
                     $recess = 'Easter Recess';
-                } elseif ($body==4) {
+                } 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");
@@ -418,17 +418,17 @@ 
                 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) {
+            case 10: if ($body == 1 || $body == 101) {
                     $recess = 'Conference Recess';
-                } elseif ($body==4) {
+                } elseif ($body == 4) {
                     $recess = 'Autumn Recess';
-                } elseif ($body==5) {
+                } elseif ($body == 5) {
                     $recess = 'Halloween Recess';
                 }
                 break;
@@ -438,12 +438,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;
                     }
                 }
@@ -451,12 +451,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/glossary.php

Spacing +15 added lines, -15 removed lines

@@ -21,20 +21,20 @@ 
 */
 
 // This handles basic insertion and approval functions for all epobjects
-include_once INCLUDESPATH."easyparliament/searchengine.php";
+include_once INCLUDESPATH . "easyparliament/searchengine.php";
 
 class GLOSSARY {
 
-    public $num_terms;			// how many glossary entries do we have
+    public $num_terms; // how many glossary entries do we have
                             // (changes depending on how GLOSSARY is called
-    public $hansard_count;		// how many times does the phrase appear in hansard?
-    public $query;				// search term
-    public $glossary_id;		// if this is set then we only have 1 glossary term
-    public $current_term;		// will only be set if we have a valid epobject_id
+    public $hansard_count; // how many times does the phrase appear in hansard?
+    public $query; // search term
+    public $glossary_id; // if this is set then we only have 1 glossary term
+    public $current_term; // will only be set if we have a valid epobject_id
     public $current_letter;
 
     // constructor...
-    public function __construct($args=array()) {
+    public function __construct($args = array()) {
     // We can optionally start the glossary with one of several arguments
     //		1. glossary_id - treat the glossary as a single term
     //		2. glossary_term - search within glossary for a term
@@ -73,16 +73,16 @@ 
 
             // These stop stupid submissions.
             // everything should be lowercase.
-            $this->stopwords = array( "the", "of", "to", "and", "for", "in", "a", "on", "is", "that", "will", "secretary", "are", "ask", "state", "have", "be", "has", "by", "with", "i", "not", "what", "as", "it", "hon", "he", "which", "from", "if", "been", "this", "s", "we", "at", "government", "was", "my", "an", "department", "there", "make", "or", "made", "their", "all", "but", "they", "how", "debate" );
+            $this->stopwords = array("the", "of", "to", "and", "for", "in", "a", "on", "is", "that", "will", "secretary", "are", "ask", "state", "have", "be", "has", "by", "with", "i", "not", "what", "as", "it", "hon", "he", "which", "from", "if", "been", "this", "s", "we", "at", "government", "was", "my", "an", "department", "there", "make", "or", "made", "their", "all", "but", "they", "how", "debate");
 
     }
 
-    public function get_glossary_item($args=array()) {
+    public function get_glossary_item($args = array()) {
         // Search for and fetch glossary item with title or glossary_id
         // We could also search glossary text that contains the title text, for cross references
 
         $this->alphabet = array();
-        foreach (range ("A", "Z") as $letter) {
+        foreach (range("A", "Z") as $letter) {
             $this->alphabet[$letter] = array();
         }
 
@@ -137,7 +137,7 @@ 
         }
     }
 
-    public function search_glossary($args=array()) {
+    public function search_glossary($args = array()) {
         // Search for and fetch glossary item with a title
         // Useful for the search page, and nowhere else (so far)
 
@@ -189,12 +189,12 @@ 
         global $THEUSER;
 
         if ($data['title'] == '') {
-            error ("Sorry, you can't define a term without a title");
+            error("Sorry, you can't define a term without a title");
             return false;
         }
 
         if ($data['body'] == '') {
-            error ("You haven't entered a definition!");
+            error("You haven't entered a definition!");
             return false;
         }
 
@@ -247,7 +247,7 @@ 
         }
     }
 
-    public function glossarise($body, $tokenize=0, $urlize=0) {
+    public function glossarise($body, $tokenize = 0, $urlize = 0) {
     // Turn a body of text into a link-up wonderland of glossary joy
 
         global $this_page;
@@ -290,7 +290,7 @@ 
                 $replacewords[] = "<strong>\\1</strong>";
             } else {
                 if ($this_page == "admin_glossary") {
-                    $link_url = "#gl".$glossary_id;
+                    $link_url = "#gl" . $glossary_id;
                 } else {
                     $link_url = $URL->generate('url');
                 }

scripts/wranstats.php

Spacing +2 added lines, -2 removed lines

@@ -29,11 +29,11 @@
     if ($p_id) {
         $qq = $db->query('(select hansard.epobject_id from hansard, uservotes
 			where hansard.epobject_id=uservotes.epobject_id
-            and hansard.person_id = '.$p_id.' and major=3 and minor=2 and left_house>curdate())
+            and hansard.person_id = '.$p_id . ' and major=3 and minor=2 and left_house>curdate())
 		union
 			(select hansard.epobject_id from hansard,member,anonvotes
 			 where hansard.epobject_id=anonvotes.epobject_id
-             and hansard.person_id = '.$p_id.' and major=3 and minor=2 and left_house>curdate())');
+             and hansard.person_id = '.$p_id . ' and major=3 and minor=2 and left_house>curdate())');
         $wrans_with_votes = $qq->rows();
     } else {
         $wrans_with_votes = '';