mysociety / theyworkforyou

tests/PartyTest.php

Spacing +1 added lines, -1 removed lines

@@ -194,7 +194,7 @@
         $this->assertEquals($specific_policy["date_max"], "2002-01-01");
     }
 
-    public function testPartyChangeHistoryRobustness(){
+    public function testPartyChangeHistoryRobustness() {
         //The cohort comparison for a set of MPs does not change if one of those MPs changes party *after* the division.
         //Person 10 and 11 are in party D. 
         //Person 12 is in Party E the whole time.

classes/PartyCohort.php

Spacing +6 added lines, -6 removed lines

@@ -379,7 +379,7 @@ 
         return $cohorts;
     }
 
-    public static function getCohortQuery(){
+    public static function getCohortQuery() {
         $membership_query = '
         select member_periods.person_id as person_id,
         md5(concat(start_party, "|", membership_key, "|", IFNULL(absence_key,""))) as cohort_hash
@@ -408,7 +408,7 @@ 
     }
 
 
-    public static function getHashforPerson($person_id){
+    public static function getHashforPerson($person_id) {
         // given a person id, return the hash for that cohort
         $db = new \ParlDB;
         $row = $db->query("SELECT cohort_hash
@@ -423,7 +423,7 @@ 
         }
     }
 
-    public static function calculatePositions($quiet=true){
+    public static function calculatePositions($quiet = true) {
         // get current hashes available
         $cohorts = PartyCohort::getCohorts();
         $policies = new Policies;
@@ -431,7 +431,7 @@ 
 
         // iterate through all hashes and create policy positions
         $cohort_count = 0;
-        foreach ( $cohorts as $cohort ) {
+        foreach ($cohorts as $cohort) {
 
             $cohort = new PartyCohort($cohort, true);
 
@@ -439,8 +439,8 @@ 
 
             $cohort_count++;
 
-            foreach ( $positions as $position ) {
-                $cohort->cache_position( $position );
+            foreach ($positions as $position) {
+                $cohort->cache_position($position);
             }
             if (!$quiet) {
                 print("$cohort_count/$n_cohorts\n");

www/includes/utility.php

Indentation +33 added lines, -33 removed lines

@@ -68,11 +68,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",
@@ -201,8 +201,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;
 
@@ -210,33 +210,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.
@@ -576,14 +576,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["<"]);
@@ -1096,7 +1096,7 @@ 
 
     $return = '<h4>';
     if (isset($daytext[$major])) {
-     $return .= $daytext[$major] . ' ';
+        $return .= $daytext[$major] . ' ';
     }
 
     $return .= '<a href="';

Spacing +76 added lines, -76 removed lines

@@ -11,7 +11,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).
@@ -28,10 +28,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.
         );
 
@@ -45,11 +45,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";
         }
@@ -66,14 +66,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",
@@ -132,11 +132,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];
     }
 
 
@@ -180,8 +180,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());
         }
     }
 
@@ -199,7 +199,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) {
@@ -208,26 +208,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']);
@@ -241,9 +241,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 {
@@ -265,7 +265,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) ||
@@ -281,7 +281,7 @@ 
 // Returns the unixtime in microseconds.
 function getmicrotime() {
     $mtime = microtime();
-    $mtime = explode(" ",$mtime);
+    $mtime = explode(" ", $mtime);
     $mtime = $mtime[1] + $mtime[0];
 
     return $mtime;
@@ -294,7 +294,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;
 }
 
@@ -308,7 +308,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 "";
     }
@@ -329,13 +329,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 "";
     }
@@ -351,7 +351,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 "";
     }
@@ -372,16 +372,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;
 
@@ -395,27 +395,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';
 
 }
 
@@ -464,10 +464,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;
     }
@@ -479,10 +479,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
@@ -514,11 +514,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(),
@@ -631,7 +631,7 @@ 
 
     // $gid will be like 'uk.org.publicwhip/debate/2003-02-28.475.3'.
 
-    $newgid = substr($gid, strrpos($gid, '/')+1 );
+    $newgid = substr($gid, strrpos($gid, '/') + 1);
     return $newgid;
 }
 
@@ -642,7 +642,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) {
@@ -686,7 +686,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;
     }
 
@@ -717,7 +717,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.
@@ -726,7 +726,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;
     }
 
@@ -736,7 +736,7 @@ 
     $replace = array();
 
     foreach ($merge as $key => $val) {
-        $search[] = '/{'.$key.'}/';
+        $search[] = '/{' . $key . '}/';
         $replace[] = preg_replacement_quote($val);
     }
 
@@ -744,7 +744,7 @@ 
     $htmltext = preg_replace($search, $replace, $htmltext);
 
     // Send it!
-    $success = send_email ($data['to'], $subject, $emailtext, $bulk, 'twfy-DO-NOT-REPLY@' . EMAILDOMAIN, $want_bounces, $htmltext);
+    $success = send_email($data['to'], $subject, $emailtext, $bulk, 'twfy-DO-NOT-REPLY@' . EMAILDOMAIN, $want_bounces, $htmltext);
 
     return $success;
 
@@ -759,7 +759,7 @@ 
     return $envelope_sender;
 }
 
-function send_email($to, $subject, $message, $bulk = false, $from = '', $want_bounces = false, $html='') {
+function send_email($to, $subject, $message, $bulk = false, $from = '', $want_bounces = false, $html = '') {
     // Use this rather than PHP's mail() direct, so we can make alterations
     // easily to all the emails we send out from the site.
     // eg, we might want to add a .sig to everything here...
@@ -805,7 +805,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]);
     }
@@ -831,7 +831,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]);
     }
@@ -842,7 +842,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");
@@ -855,7 +855,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) {
@@ -898,7 +898,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;
@@ -915,9 +915,9 @@ 
         }
     }
 
-    $s   = array(' ', '&amp;', '&ocirc;',  '&Ouml;',  '&ouml;',   '&acirc;',  '&iacute;', '&aacute;', '&uacute;', '&eacute;', '&oacute;', '&Oacute;');
-    $s2  = array(" ", "&",     "\xc3\xb4", "\xc3\96", "\xc3\xb6", "\xc3\xa5", "\xc3\xad", "\xc3\xa1", "\xc3\xba", "\xc3\xa9", "\xc3\xb3", "\xc3\x93");
-    $r   = array('_', 'and',   'o',        'o',       'o',        'a',        'i',        'a',        'u',        'e',        'o',        'o');
+    $s   = array(' ', '&amp;', '&ocirc;', '&Ouml;', '&ouml;', '&acirc;', '&iacute;', '&aacute;', '&uacute;', '&eacute;', '&oacute;', '&Oacute;');
+    $s2  = array(" ", "&", "\xc3\xb4", "\xc3\96", "\xc3\xb6", "\xc3\xa5", "\xc3\xad", "\xc3\xa1", "\xc3\xba", "\xc3\xa9", "\xc3\xb3", "\xc3\x93");
+    $r   = array('_', 'and', 'o', 'o', 'o', 'a', 'i', 'a', 'u', 'e', 'o', 'o');
     $name = preg_replace('#^the #', '', strtolower($name));
 
     $out = '';
@@ -1075,8 +1075,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>';
             }
         }
@@ -1145,7 +1145,7 @@ 
     return $return;
 }
 
-function redirect($url, $code=302) {
+function redirect($url, $code = 302) {
     if (defined('TESTING')) {
         print "Location: $url";
     } else {

Braces +124 added lines, -74 removed lines

@@ -50,7 +50,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";
         }
     }
@@ -66,7 +68,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
@@ -210,19 +214,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;
     }
       }
@@ -233,7 +247,9 @@ 
       //        $arr['line'],$arr['file'],$arr['file']);
       $s .= "\n";
     }
-    if ($print) print $s;
+    if ($print) {
+        print $s;
+    }
   }
 
   return $s;
@@ -327,7 +343,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 {
@@ -764,7 +781,9 @@ 
     // easily to all the emails we send out from the site.
     // eg, we might want to add a .sig to everything here...
 
-    if (!$from) $from = CONTACTEMAIL;
+    if (!$from) {
+        $from = CONTACTEMAIL;
+    }
 
     $mail = new PHPMailer(true);
     $mail->isSMTP();
@@ -870,17 +889,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";
@@ -888,8 +911,9 @@ 
 
 function make_plural($word, $number)
 {
-    if ($number == 1)
-        return $word;
+    if ($number == 1) {
+            return $word;
+    }
     return $word . "s";
 }
 
@@ -923,8 +947,7 @@ 
     $out = '';
 
     // Insert the Person ID if known.
-    if ($pid !== null)
-    {
+    if ($pid !== null) {
         $out .= $pid . '/';
     }
 
@@ -932,8 +955,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))));
     }
 
@@ -945,10 +967,16 @@ 
     switch ($house) {
         case HOUSE_TYPE_LORDS:
             $s = '';
-            if (!$family_name) $s = 'the ';
+            if (!$family_name) {
+                $s = 'the ';
+            }
             $s .= $title;
-            if ($family_name) $s .= ' ' . $family_name;
-            if ($lordofname) $s .= ' of ' . $lordofname;
+            if ($family_name) {
+                $s .= ' ' . $family_name;
+            }
+            if ($lordofname) {
+                $s .= ' of ' . $lordofname;
+            }
             return $s;
 
         case HOUSE_TYPE_ROYAL:
@@ -966,14 +994,18 @@ 
 }
 
 function by_peer_name($a, $b) {
-    if (!$a['family_name'] && !$b['family_name'])
-        return strcmp($a['lordofname'], $b['lordofname']);
-    if (!$a['family_name'])
-        return strcmp($a['lordofname'], $b['family_name']);
-    if (!$b['family_name'])
-        return strcmp($a['family_name'], $b['lordofname']);
-    if (strcmp($a['family_name'], $b['family_name']))
-        return strcmp($a['family_name'], $b['family_name']);
+    if (!$a['family_name'] && !$b['family_name']) {
+            return strcmp($a['lordofname'], $b['lordofname']);
+    }
+    if (!$a['family_name']) {
+            return strcmp($a['lordofname'], $b['family_name']);
+    }
+    if (!$b['family_name']) {
+            return strcmp($a['family_name'], $b['lordofname']);
+    }
+    if (strcmp($a['family_name'], $b['family_name'])) {
+            return strcmp($a['family_name'], $b['family_name']);
+    }
     return strcmp($a['lordofname'], $b['lordofname']);
 }
 
@@ -1000,12 +1032,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;
@@ -1023,13 +1060,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]);
+            }
         }
     }
 
@@ -1038,22 +1078,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 '
@@ -1105,14 +1152,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;
@@ -1120,20 +1169,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/easyparliament/templates/html/search/sidebar.php

Spacing +2 added lines, -2 removed lines

@@ -1,10 +1,10 @@
             <div class="search-page__section__secondary search-page-sidebar">
-                <?php if ( isset( $search_sidebar['email'] ) ) { ?>
+                <?php if (isset($search_sidebar['email'])) { ?>
                 <h2>Create an alert</h2>
                 <p class="sidebar-item-with-icon">
                     <a href="<?= $search_sidebar['email'] ?>">Subscribe to an email alert</a>
                     for <em class="current-search-term"><?= $search_sidebar['email_desc'] ?></em>
-                    <?php if (isset( $search_sidebar['email_section'] ) ) { ?>
+                    <?php if (isset($search_sidebar['email_section'])) { ?>
                     <br><small>(or just <a href="<?= $search_sidebar['email_section'] ?>"><?= $search_sidebar['email_desc_section'] ?></a>)</small>
                     <?php } ?>
                 </p>

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

Spacing +16 added lines, -16 removed lines

@@ -26,7 +26,7 @@ 
                           Based on postcode <strong><?= $mp_data['postcode'] ?></strong>
                           <a href="<?= $mp_data['change_url'] ?>">(Change postcode)</a>
                       </p>
-                    <?php if ( isset( $mp_data ) && $type != 'mlas' ) { ?>
+                    <?php if (isset($mp_data) && $type != 'mlas') { ?>
                       <h3>Your <?= $mp_data['former'] ? $mp_data['former'] . ' ' : '' ?><?= $rep_name ?> is</h3>
                     </div>
                     <a href="<?= $mp_data['mp_url'] ?>" class="people-list__person">
@@ -38,13 +38,13 @@ 
                         </p>
                     </a>
                     <?php }
-                    if ( isset($reps) ) {
-                        if ( isset($mp_data) && $type != 'mlas' ) { ?>
+                    if (isset($reps)) {
+                        if (isset($mp_data) && $type != 'mlas') { ?>
                     <div class="people-list__your-mp__replist-header">
                         <?php } ?>
                       <h3>Your <?=$former ?> <?= $rep_plural == 'MSPs' ? 'regional ' : '' ?><?= $rep_plural ?> are</h3>
                     </div>
-                        <?php foreach ( $reps as $rep ) { ?>
+                        <?php foreach ($reps as $rep) { ?>
                     <a href="<?= $rep['mp_url'] ?>" class="people-list__person">
                     <img class="people-list__person__image" src="<?= $rep['image'] ?>">
                         <h2 class="people-list__person__name"><?= $rep['name'] ?></h2>
@@ -65,9 +65,9 @@ 
             <div class="search-page__section search-page__section--search">
                 <div class="search-page__section__primary">
                     <p class="search-page-main-inputs">
-                    <?php if ( $type == 'peers' ) { ?>
+                    <?php if ($type == 'peers') { ?>
                         <label for="find-mp-by-name-or-postcode">Find <?= $rep_plural ?> by name:</label>
-                    <?php } elseif ( $type == 'mlas' || $type == 'msps' ) { ?>
+                    <?php } elseif ($type == 'mlas' || $type == 'msps') { ?>
                         <label for="find-mp-by-name-or-postcode">Find your <?= $rep_name ?> by postcode:</label>
                     <?php } else { ?>
                         <label for="find-mp-by-name-or-postcode">Find your <?= $rep_name ?> by name or postcode:</label>
@@ -108,12 +108,12 @@ 
             <div class="search-page__section__primary">
             <h2>All <?= $rep_plural ?></h2>
 
-                <?php if ( $type != 'peers' ) { ?>
+                <?php if ($type != 'peers') { ?>
                 <ul class="search-result-display-options">
-                    <?php if ( $order == 'given_name' ) { ?>
+                    <?php if ($order == 'given_name') { ?>
                     <li><strong>Sorted by</strong> First name</li>
                     <li>Sort by <a href="<?= $urls['by_last'] ?>">Last name</a> / <a href="<?= $urls['by_party'] ?>">Party</a></li>
-                    <?php } else if ( $order == 'party' ) { ?>
+                    <?php } else if ($order == 'party') { ?>
                     <li><strong>Sorted by</strong> Party</li>
                     <li>Sort by <a href="<?= $urls['by_first'] ?>">First name</a> / <a href="<?= $urls['by_last'] ?>">Last name</a></li>
                     <?php } else { ?>
@@ -123,7 +123,7 @@ 
                 </ul>
                 <?php } else { ?>
                 <ul class="search-result-display-options">
-                    <?php if ( $order == 'party' ) { ?>
+                    <?php if ($order == 'party') { ?>
                     <li><strong>Sorted by</strong> Party</li>
                     <li>Sort by <a href="<?= $urls['by_name'] ?>">Name</a></li>
                     <?php } else { ?>
@@ -173,10 +173,10 @@ 
                     }
                 }
                 $initial_link = '';
-                foreach ( $data as $person ) {
+                foreach ($data as $person) {
                     if ($order != 'party') {
-                        $initial = substr( strtoupper($person[$a_to_z_key]), 0, 1);
-                        if ( $initial != $current_initial ) {
+                        $initial = substr(strtoupper($person[$a_to_z_key]), 0, 1);
+                        if ($initial != $current_initial) {
                             $current_initial = $initial;
                             $initial_link = "name=\"$initial\" ";
                         } else {
@@ -190,7 +190,7 @@ 
                 </noscript>
                         <h2 class="people-list__person__name"><?= ucfirst($person['name']) ?></h2>
                         <p class="people-list__person__memberships">
-                        <?php if ( $person['constituency'] ) { ?>
+                        <?php if ($person['constituency']) { ?>
                         <span class="people-list__person__constituency"><?= $person['constituency'] ?></span>
                         <?php } ?>
                         <span class="people-list__person__party <?= slugify($person['party']) ?>"><?= $person['party'] ?></span>
@@ -208,7 +208,7 @@ 
                 <a href="<?= $urls['by_csv'] ?>">Download this list as a CSV</a>
                     suitable for Excel
                 </p>
-                <?php if ( $type == 'mps' ) { ?>
+                <?php if ($type == 'mps') { ?>
                 <style>
                 .js #past-list-dates { display: none; }
                 </style>
@@ -253,7 +253,7 @@ 
                     </p>
                 </form>
 
-                <?php } else if ( $type == 'msps' ) { ?>
+                <?php } else if ($type == 'msps') { ?>
                     <p class="past-list-dates" id="past-list-dates">
                         <a href="<?= $urls['plain'] ?>?date=2011-05-05">MSPs at 2011 election</a>
                         <a href="<?= $urls['plain'] ?>?date=2007-05-03">MSPs at 2007 election</a>

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

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
         </div>
 
         <?php
-            if ( isset($content['data']['data']) ) {
+            if (isset($content['data']['data'])) {
                 $data = $content['data']['data'];
                 include '_business_list.php'; ?>
                 <div class="business-section__secondary">
@@ -20,7 +20,7 @@ 
                         include '_calendar_section.php';
                         ?>
                     </div>
-                  <?php if ( isset($content['rssurl']) ) { ?>
+                  <?php if (isset($content['rssurl'])) { ?>
                     <div class="business-section__secondary__item">
                         <p class="rss-feed">
                             <a href="<?= WEBPATH . $content['rssurl'] ?>">RSS feed of <?= $title ?></a>

classes/Divisions.php

Indentation +57 added lines, -57 removed lines

@@ -192,7 +192,7 @@ 
 
         $divisions = array();
         foreach ($q as $row) {
-          $divisions[] = $this->getParliamentDivisionDetails($row);
+            $divisions[] = $this->getParliamentDivisionDetails($row);
         }
 
         return $divisions;
@@ -247,44 +247,44 @@ 
         );
 
         foreach ($q as $row) {
-          $policy_id = $row['policy_id'];
+            $policy_id = $row['policy_id'];
 
-          if (!array_key_exists($policy_id, $policy_divisions)) {
+            if (!array_key_exists($policy_id, $policy_divisions)) {
             $summary = array(
-              'max' => $row['latest'],
-              'min' => $row['earliest'],
-              'total' => $row['total'],
-              'for' => 0, 'against' => 0, 'absent' => 0, 'both' => 0, 'tell' => 0
+                'max' => $row['latest'],
+                'min' => $row['earliest'],
+                'total' => $row['total'],
+                'for' => 0, 'against' => 0, 'absent' => 0, 'both' => 0, 'tell' => 0
             );
 
             $policy_divisions[$policy_id] = $summary;
-          }
-
-          $summary = $policy_divisions[$policy_id];
-
-          $summary['total'] += $row['total'];
-          if ($summary['max'] < $row['latest']) {
-              $summary['max'] = $row['latest'];
-          }
-          if ($summary['min'] > $row['latest']) {
-              $summary['min'] = $row['latest'];
-          }
-
-          $vote = $row['vote'];
-          $policy_vote = str_replace('3', '', $row['policy_vote']);
-          if ( $vote == 'absent' ) {
-              $summary['absent'] += $row['total'];
-          } else if ( $vote == 'both' ) {
-              $summary['both'] += $row['total'];
-          } else if ( strpos($vote, 'tell') !== false ) {
-              $summary['tell'] += $row['total'];
-          } else if ( $policy_vote == $vote ) {
-              $summary['for'] += $row['total'];
-          } else if ( $policy_vote != $vote ) {
-              $summary['against'] += $row['total'];
-          }
-
-          $policy_divisions[$policy_id] = $summary;
+            }
+
+            $summary = $policy_divisions[$policy_id];
+
+            $summary['total'] += $row['total'];
+            if ($summary['max'] < $row['latest']) {
+                $summary['max'] = $row['latest'];
+            }
+            if ($summary['min'] > $row['latest']) {
+                $summary['min'] = $row['latest'];
+            }
+
+            $vote = $row['vote'];
+            $policy_vote = str_replace('3', '', $row['policy_vote']);
+            if ( $vote == 'absent' ) {
+                $summary['absent'] += $row['total'];
+            } else if ( $vote == 'both' ) {
+                $summary['both'] += $row['total'];
+            } else if ( strpos($vote, 'tell') !== false ) {
+                $summary['tell'] += $row['total'];
+            } else if ( $policy_vote == $vote ) {
+                $summary['for'] += $row['total'];
+            } else if ( $policy_vote != $vote ) {
+                $summary['against'] += $row['total'];
+            }
+
+            $policy_divisions[$policy_id] = $summary;
         }
 
         return $policy_divisions;
@@ -338,17 +338,17 @@ 
         );
 
         $votes = array(
-          'yes_votes' => array(),
-          'no_votes' => array(),
-          'absent_votes' => array(),
-          'both_votes' => array()
+            'yes_votes' => array(),
+            'no_votes' => array(),
+            'absent_votes' => array(),
+            'both_votes' => array()
         );
 
         $party_breakdown = array(
-          'yes_votes' => array(),
-          'no_votes' => array(),
-          'absent_votes' => array(),
-          'both_votes' => array()
+            'yes_votes' => array(),
+            'no_votes' => array(),
+            'absent_votes' => array(),
+            'both_votes' => array()
         );
 
         # Sort Lords specially
@@ -359,12 +359,12 @@ 
 
         foreach ($data as $vote) {
             $detail = array(
-              'person_id' => $vote['person_id'],
-              'name' => ucfirst(member_full_name($args['house'], $vote['title'], $vote['given_name'],
+                'person_id' => $vote['person_id'],
+                'name' => ucfirst(member_full_name($args['house'], $vote['title'], $vote['given_name'],
                     $vote['family_name'], $vote['lordofname'])),
-              'party' => $vote['party'],
-              'proxy' => false,
-              'teller' => false
+                'party' => $vote['party'],
+                'proxy' => false,
+                'teller' => false
             );
 
             if (strpos($vote['vote'], 'tell') !== false) {
@@ -385,23 +385,23 @@ 
             }
 
             if ($vote['vote'] == 'aye' or $vote['vote'] == 'tellaye') {
-              $votes['yes_votes'][] = $detail;
-              @$party_breakdown['yes_votes'][$detail['party']]++;
+                $votes['yes_votes'][] = $detail;
+                @$party_breakdown['yes_votes'][$detail['party']]++;
             } else if ($vote['vote'] == 'no' or $vote['vote'] == 'tellno') {
-              $votes['no_votes'][] = $detail;
-              @$party_breakdown['no_votes'][$detail['party']]++;
+                $votes['no_votes'][] = $detail;
+                @$party_breakdown['no_votes'][$detail['party']]++;
             } else if ($vote['vote'] == 'absent') {
-              $votes['absent_votes'][] = $detail;
-              @$party_breakdown['absent_votes'][$detail['party']]++;
+                $votes['absent_votes'][] = $detail;
+                @$party_breakdown['absent_votes'][$detail['party']]++;
             } else if ($vote['vote'] == 'both') {
-              $votes['both_votes'][] = $detail;
-              @$party_breakdown['both_votes'][$detail['party']]++;
+                $votes['both_votes'][] = $detail;
+                @$party_breakdown['both_votes'][$detail['party']]++;
             }
         }
 
         foreach ($votes as $vote => $count) { // array('yes_votes', 'no_votes', 'absent_votes', 'both_votes') as $vote) {
-          $votes[$vote . '_by_party'] = $votes[$vote];
-          usort($votes[$vote . '_by_party'], function ($a, $b) {
+            $votes[$vote . '_by_party'] = $votes[$vote];
+            usort($votes[$vote . '_by_party'], function ($a, $b) {
                 return $a['party']>$b['party'];
             });
         }

Spacing +23 added lines, -23 removed lines

@@ -68,15 +68,15 @@ 
             ':count' => $number
         );
 
-        if ( is_string($houses) ) {
-            $houses = array( $houses );
+        if (is_string($houses)) {
+            $houses = array($houses);
         }
 
-        if ( is_array($houses) && count($houses) > 0 ) {
+        if (is_array($houses) && count($houses) > 0) {
             $where = 'WHERE house IN ("' . implode('", "', $houses) . '")';
         }
 
-        if ( $this->member ) {
+        if ($this->member) {
             $select = "SELECT divisions.*, vote FROM divisions
                 LEFT JOIN persondivisionvotes ON divisions.division_id=persondivisionvotes.division_id AND person_id=:person_id";
             $params[':person_id'] = $this->member->person_id;
@@ -215,7 +215,7 @@ 
     public function getMemberDivisionsForPolicy($policyID = null) {
         $where_extra = '';
         $args = array(':person_id' => $this->member->person_id);
-        if ( $policyID ) {
+        if ($policyID) {
             $where_extra = 'AND policy_id = :policy_id';
             $args[':policy_id'] = $policyID;
         }
@@ -272,15 +272,15 @@ 
 
           $vote = $row['vote'];
           $policy_vote = str_replace('3', '', $row['policy_vote']);
-          if ( $vote == 'absent' ) {
+          if ($vote == 'absent') {
               $summary['absent'] += $row['total'];
-          } else if ( $vote == 'both' ) {
+          } else if ($vote == 'both') {
               $summary['both'] += $row['total'];
-          } else if ( strpos($vote, 'tell') !== false ) {
+          } else if (strpos($vote, 'tell') !== false) {
               $summary['tell'] += $row['total'];
-          } else if ( $policy_vote == $vote ) {
+          } else if ($policy_vote == $vote) {
               $summary['for'] += $row['total'];
-          } else if ( $policy_vote != $vote ) {
+          } else if ($policy_vote != $vote) {
               $summary['against'] += $row['total'];
           }
 
@@ -377,7 +377,7 @@ 
                     FROM person_names AS pn
                     WHERE person_id = :person_id
                     AND start_date <= :division_date AND end_date >= :division_date",
-                    [ ':person_id' => $vote['proxy'], ':division_date' => $row['division_date'] ]
+                    [':person_id' => $vote['proxy'], ':division_date' => $row['division_date']]
                 )->first();
                 $detail['proxy'] = ucfirst(member_full_name(
                     HOUSE_TYPE_COMMONS, $q['title'], $q['given_name'],
@@ -401,8 +401,8 @@ 
 
         foreach ($votes as $vote => $count) { // array('yes_votes', 'no_votes', 'absent_votes', 'both_votes') as $vote) {
           $votes[$vote . '_by_party'] = $votes[$vote];
-          usort($votes[$vote . '_by_party'], function ($a, $b) {
-                return $a['party']>$b['party'];
+          usort($votes[$vote . '_by_party'], function($a, $b) {
+                return $a['party'] > $b['party'];
             });
         }
 
@@ -456,10 +456,10 @@ 
             $votes['against'] . ' ' . make_plural('vote', $votes['against']) . ' against'
         );
 
-        if ( $votes['both'] ) {
+        if ($votes['both']) {
             $actions[] = $votes['both'] . ' ' . make_plural('abstention', $votes['both']);
         }
-        if ( $votes['absent'] ) {
+        if ($votes['absent']) {
             $actions[] = $votes['absent'] . ' ' . make_plural('absence', $votes['absent']);
         }
         if ($max == $min) {
@@ -518,7 +518,7 @@ 
 
     private function constructYesNoVoteDescription($direction, $title, $short_text) {
         $text = ' voted ';
-        if ( $short_text ) {
+        if ($short_text) {
             $text .= $short_text;
         } else {
             $text .= "$direction on <em>$title</em>";
@@ -536,7 +536,7 @@ 
          * votes so we need to generate some text using the title of the division
          */
 
-        switch ( strtolower($vote) ) {
+        switch (strtolower($vote)) {
             case 'yes':
             case 'aye':
                 $description = $this->constructYesNoVoteDescription('yes', $division_title, $yes_text);
@@ -584,7 +584,7 @@ 
 
         if (array_key_exists('direction', $row)) {
             $division['direction'] = $row['direction'];
-            if ( strpos( $row['direction'], 'strong') !== false ) {
+            if (strpos($row['direction'], 'strong') !== false) {
                 $division['strong'] = true;
             } else {
                 $division['strong'] = false;
@@ -616,24 +616,24 @@ 
         foreach ($q as $row) {
             $policy_id = $row['policy_id'];
 
-            if ( !array_key_exists($policy_id, $policies) ) {
+            if (!array_key_exists($policy_id, $policies)) {
                 $policies[$policy_id] = array(
                     'policy_id' => $policy_id,
                     'weak_count' => 0,
                     'divisions' => array()
                 );
-                if ( $this->policies ) {
+                if ($this->policies) {
                     $policies[$policy_id]['desc'] = $this->policies->getPolicies()[$policy_id];
                     $policies[$policy_id]['header'] = $this->policies->getPolicyDetails($policy_id);
                 }
-                if ( $this->positions ) {
+                if ($this->positions) {
                     $policies[$policy_id]['position'] = $this->positions->positionsById[$policy_id];
                 }
             }
 
             $division = $this->getDivisionDetails($row);
 
-            if ( !$division['strong'] ) {
+            if (!$division['strong']) {
                 $policies[$policy_id]['weak_count']++;
             }
 
@@ -648,7 +648,7 @@ 
 
         $gid = get_canonical_gid($gid);
 
-        $q = $this->db->query("SELECT gid, major FROM hansard WHERE epobject_id = ( SELECT subsection_id FROM hansard WHERE gid = :gid )", array( ':gid' => $gid ))->first();
+        $q = $this->db->query("SELECT gid, major FROM hansard WHERE epobject_id = ( SELECT subsection_id FROM hansard WHERE gid = :gid )", array(':gid' => $gid))->first();
         if (!$q) {
             return '';
         }

classes/Model/Featured.php

Spacing +4 added lines, -4 removed lines

@@ -64,7 +64,7 @@ 
 
         if ($q) {
             $text = $q['value'];
-            if ( trim($text) == '' ) {
+            if (trim($text) == '') {
                 $text = null;
             }
         }
@@ -73,7 +73,7 @@ 
     }
 
     private function _set($key, $value) {
-        if ( trim($value) == '' ) {
+        if (trim($value) == '') {
             $value = null;
         }
         $check_q = $this->db->query(
@@ -82,7 +82,7 @@ 
                 ':key' => $key
             )
         );
-        if ( $check_q->rows() ) {
+        if ($check_q->rows()) {
             $set_q = $this->db->query("UPDATE editorial set value = :value WHERE item = :key",
                 array(
                     ':key' => $key,
@@ -98,7 +98,7 @@ 
             );
         }
 
-        if ( $set_q->success() ) {
+        if ($set_q->success()) {
             return true;
         }
         return false;

classes/SectionView/SpwransView.php

Spacing +20 added lines, -20 removed lines

@@ -21,7 +21,7 @@ 
         $this_page = 'spwransfront';
         $data = array();
 
-        $args = array( 'months' => 1 );
+        $args = array('months' => 1);
         $WRANSLIST = new \SPWRANSLIST;
 
         $wrans = array();
@@ -43,7 +43,7 @@ 
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'spwrans' )
+            array('section' => 'spwrans')
         );
     }
 
@@ -54,29 +54,29 @@ 
         $SPWRANSLIST = new \SPWRANSLIST;
         $gid = $SPWRANSLIST->get_gid_from_spid($spid);
         if ($gid) {
-            if (preg_match('/uk\.org\.publicwhip\/spwa\/(\d{4}-\d\d-\d\d\.(.*))/',$gid,$m)) {
+            if (preg_match('/uk\.org\.publicwhip\/spwa\/(\d{4}-\d\d-\d\d\.(.*))/', $gid, $m)) {
                 $URL = new \MySociety\TheyWorkForYou\Url('spwrans');
                 $URL->reset();
-                $URL->insert( array('id' => $m[1]) );
+                $URL->insert(array('id' => $m[1]));
                 $fragment_identifier = '#g' . $m[2];
                 header('Location: ' . $URL->generate('none') . $fragment_identifier, true, 303);
                 exit;
-            } elseif (preg_match('/uk\.org\.publicwhip\/spor\/(\d{4}-\d\d-\d\d\.(.*))/',$gid,$m)) {
+            } elseif (preg_match('/uk\.org\.publicwhip\/spor\/(\d{4}-\d\d-\d\d\.(.*))/', $gid, $m)) {
                 $URL = new \MySociety\TheyWorkForYou\Url('spdebates');
                 $URL->reset();
-                $URL->insert( array('id' => $m[1]) );
+                $URL->insert(array('id' => $m[1]));
                 $fragment_identifier = '#g' . $m[2];
                 header('Location: ' . $URL->generate('none') . $fragment_identifier, true, 303);
                 exit;
             } else {
-                $PAGE->error_message ("Strange GID ($gid) for that Scottish Parliament ID.");
+                $PAGE->error_message("Strange GID ($gid) for that Scottish Parliament ID.");
             }
         }
-        $PAGE->error_message ("Couldn't match that Scottish Parliament ID to a GID.");
+        $PAGE->error_message("Couldn't match that Scottish Parliament ID to a GID.");
     }
 
     protected function get_question_mentions_html($row_data) {
-        if( count($row_data) == 0 ) {
+        if (count($row_data) == 0) {
             return '';
         }
         $result = '';
@@ -85,17 +85,17 @@ 
         // Keep the references until after the history that's in a timeline:
         $references = array();
         foreach ($row_data as $row) {
-            if( ! $row["date"] ) {
+            if (!$row["date"]) {
                 // If this mention isn't associated with a date, the difference won't be interesting.
                 $last_date = null;
             }
             $description = '';
             if ($last_date && ($last_date != $row["date"])) {
                 // Calculate how long the gap was in days:
-                $daysdiff = (integer)((strtotime($row["date"]) - strtotime($last_date)) / 86400);
+                $daysdiff = (integer) ((strtotime($row["date"]) - strtotime($last_date)) / 86400);
                 $daysstring = ($daysdiff == 1) ? "day" : "days";
                 $further = "";
-                if( $first_difference_output ) {
+                if ($first_difference_output) {
                     $first_difference_output = false;
                 } else {
                     $further = " a further";
@@ -106,7 +106,7 @@ 
             $inner = "BUG: Unknown mention type $row[type]";
             $date = format_date($row['date'], SHORTDATEFORMAT);
             $url = $row['url'];
-            if ( strpos($url, 'business/businessBulletin') !== false ) {
+            if (strpos($url, 'business/businessBulletin') !== false) {
                 $url = str_replace('www.scottish', 'archive.scottish', $url);
             }
             switch ($row["type"]) {
@@ -120,9 +120,9 @@ 
                     $inner = "Mentioned in <a class=\"debate-speech__meta__link\" href=\"$url\">tabled written questions on $date</a>";
                     break;
                 case 4:
-                    if( preg_match('/^uk.org.publicwhip\/spq\/(.*)$/',$row['gid'],$m) ) {
+                    if (preg_match('/^uk.org.publicwhip\/spq\/(.*)$/', $row['gid'], $m)) {
                         $URL = new \MySociety\TheyWorkForYou\Url("spwrans");
-                        $URL->insert( array('spid' => $m[1]) );
+                        $URL->insert(array('spid' => $m[1]));
                         $relative_url = $URL->generate("none");
                         $inner = "Given a <a class=\"debate-speech__meta__link\" href=\"$relative_url\">written answer on $date</a>";
                     }
@@ -131,25 +131,25 @@ 
                     $inner = "Given a holding answer on $date";
                     break;
                 case 6:
-                    if( preg_match('/^uk.org.publicwhip\/spor\/(.*)$/',$row['mentioned_gid'],$m) ) {
+                    if (preg_match('/^uk.org.publicwhip\/spor\/(.*)$/', $row['mentioned_gid'], $m)) {
                         $URL = new \MySociety\TheyWorkForYou\Url("spdebates");
-                        $URL->insert( array('id' => $m[1]) );
+                        $URL->insert(array('id' => $m[1]));
                         $relative_url = $URL->generate("none");
                         $inner = "<a href=\"$relative_url\">Asked in parliament on $date</a>";
                     }
                     break;
                 case 7:
-                    if( preg_match('/^uk.org.publicwhip\/spq\/(.*)$/',$row['mentioned_gid'],$m) ) {
+                    if (preg_match('/^uk.org.publicwhip\/spq\/(.*)$/', $row['mentioned_gid'], $m)) {
                         $referencing_spid = $m[1];
                         $URL = new \MySociety\TheyWorkForYou\Url("spwrans");
-                        $URL->insert( array('spid' => $referencing_spid) );
+                        $URL->insert(array('spid' => $referencing_spid));
                         $relative_url = $URL->generate("none");
                         $inner = "Referenced in <a href=\"$relative_url\">question $referencing_spid</a>";
                         $reference = true;
                     }
                     break;
             }
-            if( $reference ) {
+            if ($reference) {
                 $references[] = "\n<li>$inner.";
             } else {
                 $result .= "\n<li class=\"link-to-hansard\">$description$inner</span>";