mysociety / theyworkforyou

www/includes/utility.php

Spacing +112 added lines, -112 removed lines

@@ -5,12 +5,12 @@ 
 
 */
 
-include_once INCLUDESPATH . '../../commonlib/phplib/email.php';
-include_once INCLUDESPATH . '../../commonlib/phplib/datetime.php';
+include_once INCLUDESPATH.'../../commonlib/phplib/email.php';
+include_once INCLUDESPATH.'../../commonlib/phplib/datetime.php';
 
 # Pass it a brief header word and some debug text and it'll be output.
 # If TEXT is an array, call the user function, assuming it's a class.
-function twfy_debug($header, $text="") {
+function twfy_debug($header, $text = "") {
 
     // We set ?DEBUGTAG=n in the URL.
     // (DEBUGTAG is set in config.php).
@@ -27,10 +27,10 @@ 
     if ($debug_level != '') {
 
         // Set which level shows which types of debug info.
-        $levels = array (
-            1 => array ('THEUSER', 'TIME', 'SQLERROR', 'PAGE', 'TEMPLATE', 'SEARCH', 'ALERTS', 'MP'),
-            2 => array ('SQL', 'EMAIL', 'WIKIPEDIA', 'hansardlist', 'debatelist', 'wranslist', 'whalllist'),
-            3 => array ('SQLRESULT')
+        $levels = array(
+            1 => array('THEUSER', 'TIME', 'SQLERROR', 'PAGE', 'TEMPLATE', 'SEARCH', 'ALERTS', 'MP'),
+            2 => array('SQL', 'EMAIL', 'WIKIPEDIA', 'hansardlist', 'debatelist', 'wranslist', 'whalllist'),
+            3 => array('SQLRESULT')
             // Higher than this: 'DATA', etc.
         );
 
@@ -44,11 +44,11 @@ 
         }
 
         for ($n = 1; $n <= $max_level_to_show; $n++) {
-            $allowed_headers = array_merge ($allowed_headers, $levels[$n] );
+            $allowed_headers = array_merge($allowed_headers, $levels[$n]);
         }
 
         // If we can show this header, then, er, show it.
-        if ( in_array($header, $allowed_headers) || $debug_level >= 4) {
+        if (in_array($header, $allowed_headers) || $debug_level >= 4) {
             if (is_array($text)) $text = call_user_func($text);
             print "<p><span style=\"color:#039;\"><strong>$header</strong></span> $text</p>\n";
         }
@@ -65,14 +65,14 @@ 
     global $PAGE;
 
     # Ignore errors we've asked to ignore
-    if (error_reporting()==0) return;
+    if (error_reporting() == 0) return;
 
    // define an assoc array of error string
    // in reality the only entries we should
    // consider are E_WARNING, E_NOTICE, E_USER_ERROR,
    // E_USER_WARNING and E_USER_NOTICE
    # Commented out are ones that a user function cannot handle.
-    $errortype = array (
+    $errortype = array(
         #E_ERROR            => "Error",
         E_WARNING           => "Warning",
         #E_PARSE            => "Parsing Error",
@@ -91,22 +91,22 @@ 
 
     $err = '';
     if (isset($_SERVER['REQUEST_URI'])) {
-        $err .= "URL:\t\thttps://" . DOMAIN . $_SERVER['REQUEST_URI'] . "\n";
+        $err .= "URL:\t\thttps://".DOMAIN.$_SERVER['REQUEST_URI']."\n";
     } else {
         $err .= "URL:\t\tNone - running from command line?\n";
     }
     if (isset($_SERVER['HTTP_REFERER'])) {
-        $err .= "Referer:\t" . $_SERVER['HTTP_REFERER'] . "\n";
+        $err .= "Referer:\t".$_SERVER['HTTP_REFERER']."\n";
     } else {
         $err .= "Referer:\tNone\n";
     }
     if (isset($_SERVER['HTTP_USER_AGENT'])) {
-        $err .= "User-Agent:\t" . $_SERVER['HTTP_USER_AGENT'] . "\n";
+        $err .= "User-Agent:\t".$_SERVER['HTTP_USER_AGENT']."\n";
     } else {
         $err .= "User-Agent:\tNone\n";
     }
     $err .= "Number:\t\t$errno\n";
-    $err .= "Type:\t\t" . $errortype[$errno] . "\n";
+    $err .= "Type:\t\t".$errortype[$errno]."\n";
     $err .= "Message:\t$errmsg\n";
     $err .= "File:\t\t$filename\n";
     $err .= "Line:\t\t$linenum\n";
@@ -131,11 +131,11 @@ 
         $source = file($filename);
         $err .= "\nSource:\n\n";
         // Show the line, plus prev and next, with line numbers.
-        $err .= $linenum-2 . " " . $source[$linenum-3];
-        $err .= $linenum-1 . " " . $source[$linenum-2];
-        $err .= $linenum . " " . $source[$linenum-1];
-        $err .= $linenum+1 . " " . $source[$linenum];
-        $err .= $linenum+2 . " " . $source[$linenum+1];
+        $err .= $linenum - 2." ".$source[$linenum - 3];
+        $err .= $linenum - 1." ".$source[$linenum - 2];
+        $err .= $linenum." ".$source[$linenum - 1];
+        $err .= $linenum + 1." ".$source[$linenum];
+        $err .= $linenum + 2." ".$source[$linenum + 1];
     }
 
 
@@ -151,9 +151,9 @@ 
 
     if (DEVSITE || get_http_var(DEBUGTAG)) {
         // On a devsite we just display the problem.
-        $errtxt = nl2br($err) . "\n";
+        $errtxt = nl2br($err)."\n";
         if (!strstr($errmsg, 'mysql_connect')) {
-            $errtxt .= "<br><br>Backtrace:<br>" . nl2br(adodb_backtrace(false));
+            $errtxt .= "<br><br>Backtrace:<br>".nl2br(adodb_backtrace(false));
         }
         $message = array(
             'title' => "Error",
@@ -179,8 +179,8 @@ 
             header('HTTP/1.0 500 Internal Server Error');
             print "<p>Oops, sorry, an error has occurred!</p>\n";
         }
-        if (!($errno & E_USER_NOTICE) && strpos($errmsg, 'pg_connect')===false && strpos($errmsg, 'mysql_connect')===false) {
-            mail(BUGSLIST, "[TWFYBUG]: $errmsg", $err, "From: Bug <" . CONTACTEMAIL . ">\n".  "X-Mailer: PHP/" . phpversion() );
+        if (!($errno & E_USER_NOTICE) && strpos($errmsg, 'pg_connect') === false && strpos($errmsg, 'mysql_connect') === false) {
+            mail(BUGSLIST, "[TWFYBUG]: $errmsg", $err, "From: Bug <".CONTACTEMAIL.">\n"."X-Mailer: PHP/".phpversion());
         }
     }
 
@@ -198,7 +198,7 @@ 
 }
 
 // pretty prints the backtrace, copied from http://uk.php.net/manual/en/function.debug-backtrace.php
-function adodb_backtrace($print=true)
+function adodb_backtrace($print = true)
 {
   $s = '';
   if (PHPVERSION() >= 4.3) {
@@ -207,9 +207,9 @@ 
 
     $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'].'.';
       $args = array();
@@ -220,13 +220,13 @@ 
     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']);
@@ -264,7 +264,7 @@ 
     $nom = '0123456789';
     $gap = '\s\.';
 
-    if (    preg_match("/^[$fst][$num][$gap]*[$nom][$in][$in]$/i", $postcode) ||
+    if (preg_match("/^[$fst][$num][$gap]*[$nom][$in][$in]$/i", $postcode) ||
             preg_match("/^[$fst][$num][$num][$gap]*[$nom][$in][$in]$/i", $postcode) ||
             preg_match("/^[$fst][$sec][$num][$gap]*[$nom][$in][$in]$/i", $postcode) ||
             preg_match("/^[$fst][$sec][$num][$num][$gap]*[$nom][$in][$in]$/i", $postcode) ||
@@ -280,7 +280,7 @@ 
 // Returns the unixtime in microseconds.
 function getmicrotime() {
     $mtime = microtime();
-    $mtime = explode(" ",$mtime);
+    $mtime = explode(" ", $mtime);
     $mtime = $mtime[1] + $mtime[0];
 
     return $mtime;
@@ -293,7 +293,7 @@ 
     global $timestamp_last, $timestamp_start;
     $t = getmicrotime();
     twfy_debug("TIME", sprintf("%f msecs since start; %f msecs since last; %s",
-            ($t - $timestamp_start)*1000.0, ($t - $timestamp_last)*1000.0, $label));
+            ($t - $timestamp_start) * 1000.0, ($t - $timestamp_last) * 1000.0, $label));
     $timestamp_last = $t;
 }
 
@@ -307,7 +307,7 @@ 
     if (preg_match("/^(\d\d\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/", $timestamp, $matches)) {
         list($string, $year, $month, $day, $hour, $min, $sec) = $matches;
 
-        return gmdate ($format, gmmktime($hour, $min, $sec, $month, $day, $year));
+        return gmdate($format, gmmktime($hour, $min, $sec, $month, $day, $year));
     } else {
         return "";
     }
@@ -328,13 +328,13 @@ 
         list($string, $year, $month, $day) = $matches;
         if ($year < 1902) { # gmdate fns only go back to Dec. 1901
             if ($format == SHORTDATEFORMAT) {
-                return ($day+0) . ' ' . $format_date_months_short[$month+0] . " $year";
+                return ($day + 0).' '.$format_date_months_short[$month + 0]." $year";
             } else {
-                return ($day+0) . ' ' . $format_date_months[$month+0] . " $year";
+                return ($day + 0).' '.$format_date_months[$month + 0]." $year";
             }
         }
 
-        return gmdate ($format, gmmktime(0, 0, 0, $month, $day, $year));
+        return gmdate($format, gmmktime(0, 0, 0, $month, $day, $year));
     } else {
         return "";
     }
@@ -350,7 +350,7 @@ 
     if (preg_match("/^(\d\d):(\d\d):(\d\d)$/", $time, $matches)) {
         list($string, $hour, $min, $sec) = $matches;
 
-        return gmdate ($format, gmmktime($hour, $min, $sec));
+        return gmdate($format, gmmktime($hour, $min, $sec));
     } else {
         return "";
     }
@@ -371,16 +371,16 @@ 
     $in_seconds = strtotime($datetime);
     $now = time();
 
-    $diff   =  $now - $in_seconds;
-    $months =  floor($diff/2419200);
+    $diff   = $now - $in_seconds;
+    $months = floor($diff / 2419200);
     $diff   -= $months * 2419200;
-    $weeks  =  floor($diff/604800);
-    $diff   -= $weeks*604800;
-    $days   =  floor($diff/86400);
+    $weeks  = floor($diff / 604800);
+    $diff   -= $weeks * 604800;
+    $days   = floor($diff / 86400);
     $diff   -= $days * 86400;
-    $hours  =  floor($diff/3600);
+    $hours  = floor($diff / 3600);
     $diff   -= $hours * 3600;
-    $minutes = floor($diff/60);
+    $minutes = floor($diff / 60);
     $diff   -= $minutes * 60;
     $seconds = $diff;
 
@@ -394,22 +394,22 @@ 
         $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' : '');
         }
     }
 
@@ -445,7 +445,7 @@ 
 
     // Split long strings up so they don't go too long.
     // Mainly for URLs which are displayed, but aren't links when trimmed.
-    $text = preg_replace('/(\S{' . $url_length . '})/', "\$1 ", $text);
+    $text = preg_replace('/(\S{'.$url_length.'})/', "\$1 ", $text);
 
     // Otherwise the word boundary matching goes odd...
     $text = preg_replace("/[\n\r]/", " ", $text);
@@ -455,12 +455,12 @@ 
         $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;
+        $text = '...'.$text;
     }
 
     // Trim end.
@@ -470,10 +470,10 @@ 
         $text = substr($text, 0, $length - 3);
 
         // Word boundary.
-        if (preg_match ("/(.*)\s.+/", $text, $matches)) {
+        if (preg_match("/(.*)\s.+/", $text, $matches)) {
             $text = $matches[1];
             // Strip spare space at the end.
-            $text = preg_replace ("/\s$/", '', $text);
+            $text = preg_replace("/\s$/", '', $text);
         }
         // We don't want to use the HTML entity for an ellipsis (&#8230;), because then
         // it screws up when we subsequently use htmlentities() to print the returned
@@ -505,11 +505,11 @@ 
 
     if ($filter_type == 'strict') {
         // No tags allowed at all!
-        $filter->allowed = array ();
+        $filter->allowed = array();
     } else {
         // Comment.
         // Only allowing <a href>, <b>, <strong>, <i> and <em>
-        $filter->allowed = array (
+        $filter->allowed = array(
             'a' => array('href'),
             'strong' => array(),
             'em' => array(),
@@ -540,9 +540,9 @@ 
         "/(?<!\"|\/)((http(s?):\/\/)|(www\.))([a-zA-Z\d_.+,;:?%~\-\/#='*$!()&[\]]+)([a-zA-Z\d_?%~\-\/#='*$!&])/",
         function($matches) use ($link_length) {
             if (strlen($matches[0]) > $link_length) {
-                return '<a href="' . $matches[0] . '" rel="nofollow">' . substr($matches[0], 0, $link_length) . "...</a>";
+                return '<a href="'.$matches[0].'" rel="nofollow">'.substr($matches[0], 0, $link_length)."...</a>";
             } else {
-                return '<a href="' . $matches[0] . '" rel="nofollow">' . $matches[0] . '</a>';
+                return '<a href="'.$matches[0].'" rel="nofollow">'.$matches[0].'</a>';
             }
         },
         $text);
@@ -630,10 +630,10 @@ 
     // This returns 'debate_2003-02-28.475.3'.
 
     if ($keepmajor) {
-        $newgid = substr($gid, strpos($gid, '/')+1 );
+        $newgid = substr($gid, strpos($gid, '/') + 1);
         $newgid = str_replace('/', '_', $newgid);
     } else {
-        $newgid = substr($gid, strrpos($gid, '/')+1 );
+        $newgid = substr($gid, strrpos($gid, '/') + 1);
     }
 
     return $newgid;
@@ -647,7 +647,7 @@ 
     // will be like 2003-11-20.966.0
     // This function returns 966.0
 
-    return substr( $gid, (strpos($gid, '.') + 1) );
+    return substr($gid, (strpos($gid, '.') + 1));
 }
 
 function preg_replacement_quote($s) {
@@ -691,14 +691,14 @@ 
     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;
     }
 
-    $filename = INCLUDESPATH . "easyparliament/templates/emails/" . $data['template'] . ".txt";
+    $filename = INCLUDESPATH."easyparliament/templates/emails/".$data['template'].".txt";
 
     if (!file_exists($filename)) {
-        $PAGE->error_message("Sorry, we could not find the email template '" . _htmlentities($data['template']) . "'.");
+        $PAGE->error_message("Sorry, we could not find the email template '"._htmlentities($data['template'])."'.");
         return false;
     }
 
@@ -715,7 +715,7 @@ 
         if (isset($data['subject'])) {
             $subject = trim($data['subject']);
         } else {
-            $subject = trim( substr($firstline, 8) );
+            $subject = trim(substr($firstline, 8));
         }
 
         // Either way, remove this subject line from the template.
@@ -724,7 +724,7 @@ 
     } elseif (isset($data['subject'])) {
         $subject = $data['subject'];
     } else {
-        $PAGE->error_message ("We don't have a subject line for the email, so it wasn't sent.");
+        $PAGE->error_message("We don't have a subject line for the email, so it wasn't sent.");
         return false;
     }
 
@@ -741,7 +741,7 @@ 
     $emailtext = preg_replace($search, $replace, $emailtext);
 
     // Send it!
-    $success = send_email ($data['to'], $subject, $emailtext, $bulk, 'twfy-DO-NOT-REPLY@' . EMAILDOMAIN, $want_bounces);
+    $success = send_email($data['to'], $subject, $emailtext, $bulk, 'twfy-DO-NOT-REPLY@'.EMAILDOMAIN, $want_bounces);
 
     return $success;
 
@@ -764,19 +764,19 @@ 
     if (!$from) $from = CONTACTEMAIL;
 
     $headers =
-     "From: TheyWorkForYou <$from>\r\n" .
-     "Content-Type: text/plain; charset=utf-8\r\n" .
-     "MIME-Version: 1.0\r\n" .
-     "Content-Transfer-Encoding: 8bit\r\n" .
-     ($bulk ? "Precedence: bulk\r\nAuto-Submitted: auto-generated\r\n" : "" ).
-     "X-Mailer: PHP/" . phpversion();
+     "From: TheyWorkForYou <$from>\r\n".
+     "Content-Type: text/plain; charset=utf-8\r\n".
+     "MIME-Version: 1.0\r\n".
+     "Content-Transfer-Encoding: 8bit\r\n".
+     ($bulk ? "Precedence: bulk\r\nAuto-Submitted: auto-generated\r\n" : "").
+     "X-Mailer: PHP/".phpversion();
     twfy_debug('EMAIL', "Sending email to $to with subject of '$subject'");
 
     if ($want_bounces) {
       $envelope_sender = twfy_verp_envelope_sender($to);
-        $success = mail ($to, $subject, $message, $headers, '-f ' . $envelope_sender);
+        $success = mail($to, $subject, $message, $headers, '-f '.$envelope_sender);
     } else {
-        $success = mail ($to, $subject, $message, $headers);
+        $success = mail($to, $subject, $message, $headers);
     }
 
     return $success;
@@ -788,7 +788,7 @@ 
 // http://www.iamcal.com/publish/article.php?id=13
 
 // Call this with a key name to get a GET or POST variable.
-function get_http_var($name, $default='') {
+function get_http_var($name, $default = '') {
     if (array_key_exists($name, $_GET)) {
         return clean_var($_GET[$name]);
     }
@@ -814,7 +814,7 @@ 
 }
 
 // Call this with a key name to get a COOKIE variable.
-function get_cookie_var($name, $default='') {
+function get_cookie_var($name, $default = '') {
     if (array_key_exists($name, $_COOKIE)) {
         return clean_var($_COOKIE[$name]);
     }
@@ -825,25 +825,25 @@ 
 // 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");
 
     foreach ($session_vars as $n => $key) {
         if (!in_array($key, $omit)) {
-            print "<input type=\"hidden\" name=\"$key\" value=\"" . _htmlentities(get_http_var($key)) . "\">\n";
+            print "<input type=\"hidden\" name=\"$key\" value=\""._htmlentities(get_http_var($key))."\">\n";
         }
     }
 }
 
 // Deprecated. Use hidden_form_vars, above, instead.
-function hidden_vars ($omit = array()) {
+function hidden_vars($omit = array()) {
     global $DATA;
 
     foreach ($args as $key => $val) {
         if (!in_array($key, $omit)) {
-            print "<input type=\"hidden\" name=\"$key\" value=\"" . _htmlspecialchars($val) . "\">\n";
+            print "<input type=\"hidden\" name=\"$key\" value=\""._htmlspecialchars($val)."\">\n";
         }
     }
 }
@@ -854,26 +854,26 @@ 
 
     # 11th, 12th, 13th use "th" not "st", "nd", "rd"
     if (floor(($rank % 100) / 10) == 1)
-        return $rank . "th";
+        return $rank."th";
     # 1st
     if ($rank % 10 == 1)
-        return $rank . "st";
+        return $rank."st";
     # 2nd
     if ($rank % 10 == 2)
-        return $rank . "nd";
+        return $rank."nd";
     # 3rd
     if ($rank % 10 == 3)
-        return $rank . "rd";
+        return $rank."rd";
     # Everything else use th
 
-    return $rank . "th";
+    return $rank."th";
 }
 
 function make_plural($word, $number)
 {
     if ($number == 1)
         return $word;
-    return $word . "s";
+    return $word."s";
 }
 
 # Can't have the entities in XML so replace all theones we currently have with numerical entities
@@ -881,7 +881,7 @@ 
 function entities_to_numbers($string) {
     $string = str_replace(
         array('&Ouml;', '&acirc;', '&uacute;', '&aacute;', '&iacute;', '&ocirc;', '&eacute;'),
-        array('&#214;', '&#226;',  '&#250;',   '&#225;',   '&#237;',   '&#244;',  '&#233;'  ),
+        array('&#214;', '&#226;', '&#250;', '&#225;', '&#237;', '&#244;', '&#233;'),
         $string
     );
     return $string;
@@ -895,9 +895,9 @@ 
         return 'elizabeth_the_second';
     }
 
-    $s   = array(' ', '&amp;', '&ocirc;',  '&Ouml;',  '&ouml;',   '&acirc;',  '&iacute;', '&aacute;', '&uacute;', '&eacute;', '&oacute;', '&Oacute;');
-    $s2  = array(" ", "&",     "\xc3\xb4", "\xc3\96", "\xc3\xb6", "\xc3\xa5", "\xc3\xad", "\xc3\xa1", "\xc3\xba", "\xc3\xa9", "\xc3\xb3", "\xc3\x93");
-    $r   = array('_', 'and',   'o',        'o',       'o',        'a',        'i',        'a',        'u',        'e',        'o',        'o');
+    $s   = array(' ', '&amp;', '&ocirc;', '&Ouml;', '&ouml;', '&acirc;', '&iacute;', '&aacute;', '&uacute;', '&eacute;', '&oacute;', '&Oacute;');
+    $s2  = array(" ", "&", "\xc3\xb4", "\xc3\96", "\xc3\xb6", "\xc3\xa5", "\xc3\xad", "\xc3\xa1", "\xc3\xba", "\xc3\xa9", "\xc3\xb3", "\xc3\x93");
+    $r   = array('_', 'and', 'o', 'o', 'o', 'a', 'i', 'a', 'u', 'e', 'o', 'o');
     $name = preg_replace('#^the #', '', strtolower($name));
 
     $out = '';
@@ -905,7 +905,7 @@ 
     // Insert the Person ID if known.
     if ($pid !== NULL)
     {
-        $out .= $pid . '/';
+        $out .= $pid.'/';
     }
 
     // Always inject the person's name
@@ -914,7 +914,7 @@ 
     // If there is a constituency, inject that too
     if ($const && $house == HOUSE_TYPE_COMMONS)
     {
-        $out .= '/' . urlencode(str_replace($s2, $r, str_replace($s, $r, strtolower($const))));
+        $out .= '/'.urlencode(str_replace($s2, $r, str_replace($s, $r, strtolower($const))));
     }
 
     return $out;
@@ -925,14 +925,14 @@ 
     if ($house == HOUSE_TYPE_COMMONS || $house == HOUSE_TYPE_NI || $house == HOUSE_TYPE_SCOTLAND) {
         $s = "$given_name $family_name";
         if ($title) {
-            $s = $title . ' ' . $s;
+            $s = $title.' '.$s;
         }
     } elseif ($house == HOUSE_TYPE_LORDS) {
         $s = '';
         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;
     } elseif ($house == HOUSE_TYPE_ROYAL) { # Queen
         $s = "$given_name $family_name";
     }
@@ -1002,7 +1002,7 @@ 
         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";
+            elseif ($todaystime - $array['timestamp'] <= (6 * 86400)) $daytext[$major] = gmdate('l', $array['timestamp'])."&rsquo;s";
             else $daytext[$major] = "The most recent ";
         }
     }
@@ -1019,9 +1019,9 @@ 
         $q = $db->query('SELECT section_id, body, gid
                 FROM hansard, epobject
                 WHERE hansard.epobject_id = epobject.epobject_id '
-                . ($p_major == 4 ? 'AND subsection_id=0' : 'AND section_id=0') .
-                ' AND hdate = "' . $date . '"
-                AND major = ' . $p_major . '
+                . ($p_major == 4 ? 'AND subsection_id=0' : 'AND section_id=0').
+                ' AND hdate = "'.$date.'"
+                AND major = ' . $p_major.'
                 ORDER BY hpos');
         $out = '';
         $LISTURL = new \MySociety\TheyWorkForYou\Url($hansardmajors[$p_major]['page_all']);
@@ -1035,11 +1035,11 @@ 
                 if ($current_sid++) {
                     $out .= '</ul>';
                 }
-                $out .= '<li>' . $body . '<ul>';
+                $out .= '<li>'.$body.'<ul>';
             } else {
-                $LISTURL->insert( array( 'id' => $gid ) );
+                $LISTURL->insert(array('id' => $gid));
                 $out .= '<li><a href="'.$LISTURL->generate().'">';
-                $out .= $body . '</a>';
+                $out .= $body.'</a>';
             }
         }
         if ($out) {
@@ -1063,7 +1063,7 @@ 
 
     $return = '<h4>';
     if (isset($daytext[$major])) {
-     $return .= $daytext[$major] . ' ';
+     $return .= $daytext[$major].' ';
     }
 
     $return .= '<a href="';
@@ -1073,7 +1073,7 @@ 
         $LISTURL->reset();
         $return .= $LISTURL->generate();
     }
-    $return .= '">' . $hansardmajors[$major]['title'] . '</a>';
+    $return .= '">'.$hansardmajors[$major]['title'].'</a>';
     if (isset($daytext[$major])) $return;
     $return .= '</h4>';
 
@@ -1118,10 +1118,10 @@ 
 
 function cache_version($file) {
     static $version_hash = array();
-    $path = BASEDIR . "/$file";
+    $path = BASEDIR."/$file";
     if (is_file($path) && (!isset($version_hash[$file]) || DEVSITE)) {
         $version_hash[$file] = stat($path)[9];
-        $file .= '?' . $version_hash[$file];
+        $file .= '?'.$version_hash[$file];
     }
-    return WEBPATH . $file;
+    return WEBPATH.$file;
 }

Doc Comments +23 added lines

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

www/docs/postcode/index.php

Spacing +24 added lines, -24 removed lines

@@ -3,7 +3,7 @@ 
 # For looking up a postcode and redirecting or displaying appropriately
 
 include_once '../../includes/easyparliament/init.php';
-include_once INCLUDESPATH . 'easyparliament/member.php';
+include_once INCLUDESPATH.'easyparliament/member.php';
 
 $errors = array();
 
@@ -14,15 +14,15 @@ 
 
 $pc = preg_replace('#[^a-z0-9]#i', '', $pc);
 if (!validate_postcode($pc)) {
-    twfy_debug ('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
-    postcode_error("Sorry, " . _htmlentities($pc) . " isn't a valid postcode");
+    twfy_debug('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
+    postcode_error("Sorry, "._htmlentities($pc)." isn't a valid postcode");
 }
 
 $constituencies = MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituencies($pc);
 if ($constituencies == 'CONNECTION_TIMED_OUT') {
     postcode_error("Sorry, we couldn't check your postcode right now, as our postcode lookup server is under quite a lot of load.");
 } elseif (!$constituencies) {
-    postcode_error("Sorry, " . _htmlentities($pc) . " isn't a known postcode");
+    postcode_error("Sorry, "._htmlentities($pc)." isn't a known postcode");
 }
 
 $out = ''; $sidebars = array();
@@ -57,7 +57,7 @@ 
     exit;
 }
 
-function fetch_mp($pc, $constituencies, $house=null) {
+function fetch_mp($pc, $constituencies, $house = null) {
     global $THEUSER;
     $args = array('constituency' => $constituencies['WMC']);
     if ($house) {
@@ -65,7 +65,7 @@ 
     }
     try {
         $MEMBER = new MEMBER($args);
-    } catch (MySociety\TheyWorkForYou\MemberException $e){
+    } catch (MySociety\TheyWorkForYou\MemberException $e) {
         postcode_error($e->getMessage());
     }
     if ($MEMBER->person_id()) {
@@ -96,24 +96,24 @@ 
 
     $query_base = "SELECT member.person_id, given_name, family_name, constituency, house
         FROM member, person_names pn
-        WHERE constituency IN ('" . join("','", $a) . "')
+        WHERE constituency IN ('" . join("','", $a)."')
             AND member.person_id = pn.person_id AND pn.type = 'name'
             AND pn.end_date = (SELECT MAX(end_date) from person_names where person_names.person_id = member.person_id)";
-    $q = $db->query($query_base . " AND left_reason = 'still_in_office' AND house in (3,4)");
+    $q = $db->query($query_base." AND left_reason = 'still_in_office' AND house in (3,4)");
     $current = true;
     if (!$q->rows() && ($dissolution = MySociety\TheyWorkForYou\Dissolution::db())) {
         $current = false;
-        $q = $db->query($query_base . " AND $dissolution[query]",
+        $q = $db->query($query_base." AND $dissolution[query]",
             $dissolution['params']);
     }
 
     $mcon = array(); $mreg = array();
-    for ($i=0; $i<$q->rows(); $i++) {
+    for ($i = 0; $i < $q->rows(); $i++) {
         $house = $q->field($i, 'house');
         $cons = $q->field($i, 'constituency');
-        if ($house==3) {
+        if ($house == 3) {
             $mreg[] = $q->row($i);
-        } elseif ($house==4) {
+        } elseif ($house == 4) {
             if ($cons == $areas['SPC']) {
                 $mcon = $q->row($i);
             } elseif ($cons == $areas['SPE']) {
@@ -129,32 +129,32 @@ 
     $out .= '<p>That postcode has multiple results, please pick who you are interested in:</p>';
     $out .= '<ul><li>Your ';
     if (isset($mp['former'])) $out .= 'former ';
-    $out .= '<strong>MP</strong> (Member of Parliament) is <a href="/mp/?p=' . $mp['person_id'] . '">';
-    $out .= $mp['given_name'] . ' ' . $mp['family_name'] . '</a>, ' . $mp['constituency'] . '</li>';
+    $out .= '<strong>MP</strong> (Member of Parliament) is <a href="/mp/?p='.$mp['person_id'].'">';
+    $out .= $mp['given_name'].' '.$mp['family_name'].'</a>, '.$mp['constituency'].'</li>';
     if ($mcon) {
         $out .= '<li>Your <strong>constituency MSP</strong> (Member of the Scottish Parliament) ';
         $out .= $current ? 'is' : 'was';
-        $out .= ' <a href="/msp/?p=' . $mcon['person_id'] . '">';
-        $out .= $mcon['given_name'] . ' ' . $mcon['family_name'] . '</a>, ' . $mcon['constituency'] . '</li>';
+        $out .= ' <a href="/msp/?p='.$mcon['person_id'].'">';
+        $out .= $mcon['given_name'].' '.$mcon['family_name'].'</a>, '.$mcon['constituency'].'</li>';
     }
-    $out .= '<li>Your <strong>' . $areas[$area_type] . ' ' . $rep_type . 's</strong> ';
-    if ($rep_type=='MLA') $out .= '(Members of the Legislative Assembly)';
-    $out .= ' ' . ($current ? 'are' : 'were') . ':';
+    $out .= '<li>Your <strong>'.$areas[$area_type].' '.$rep_type.'s</strong> ';
+    if ($rep_type == 'MLA') $out .= '(Members of the Legislative Assembly)';
+    $out .= ' '.($current ? 'are' : 'were').':';
     $out .= '<ul>';
     foreach ($mreg as $reg) {
-        $out .= '<li><a href="/' . strtolower($rep_type) . '/?p=' . $reg['person_id'] . '">';
-        $out .= $reg['given_name'] . ' ' . $reg['family_name'];
+        $out .= '<li><a href="/'.strtolower($rep_type).'/?p='.$reg['person_id'].'">';
+        $out .= $reg['given_name'].' '.$reg['family_name'];
         $out .= '</a>';
     }
     $out .= '</ul></ul>';
 
     $MPSURL = new \MySociety\TheyWorkForYou\Url('mps');
-    $REGURL = new \MySociety\TheyWorkForYou\Url(strtolower($rep_type) . 's');
+    $REGURL = new \MySociety\TheyWorkForYou\Url(strtolower($rep_type).'s');
     $sidebar = array(array(
         'type' => 'html',
         'content' => '<div class="block"><h4>Browse people</h4>
-            <ul><li><a href="' . $MPSURL->generate() . '">Browse all MPs</a></li>
-            <li><a href="' . $REGURL->generate() . '">Browse all ' . $rep_type . 's</a></li>
+            <ul><li><a href="' . $MPSURL->generate().'">Browse all MPs</a></li>
+            <li><a href="' . $REGURL->generate().'">Browse all '.$rep_type.'s</a></li>
             </ul></div>'
     ));
     return array($out, $sidebar);

www/docs/user/changepc/index.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
 if ($THEUSER->isloggedin()) {
     // They can't change their postcode here, so send them to the editing page.
     $URL = new \MySociety\TheyWorkForYou\Url('useredit');
-    header("Location: " . $URL->generate());
+    header("Location: ".$URL->generate());
 }
 
 if (get_http_var('forget') == 't') {
@@ -18,7 +18,7 @@ 
 
     // The cookie will have already been read for this page, so we need to reload.
     $URL = new \MySociety\TheyWorkForYou\Url($this_page);
-    header("Location: " . $URL->generate());
+    header("Location: ".$URL->generate());
 }
 
 if (!$THEUSER->postcode_is_set()) {

www/docs/index-election.php

Spacing +10 added lines, -10 removed lines

@@ -3,7 +3,7 @@ 
 $this_page = "home";
 
 include_once '../includes/easyparliament/init.php';
-include_once INCLUDESPATH . "easyparliament/member.php";
+include_once INCLUDESPATH."easyparliament/member.php";
 
 $PAGE->page_start();
 
@@ -27,10 +27,10 @@ 
 
 if (count($debatesdata) > 0 && count($wransdata) > 0 && count($whalldata) > 0 && count($wmsdata) > 0) {
     // Links to Debates and Wrans.
-    $debatestext = '<a href="' . $debatesdata['listurl'] . '">Debates</a>';
-    $wranstext = '<a href="' . $wransdata['listurl'] . '">Written Answers</a>';
-    $whalltext = '<a href="' . $whalldata['listurl'] . '">Westminster Hall debates</a>';
-    $wmstext = '<a href="' . $wmsdata['listurl'] . '">Written Ministerial Statements</a>';
+    $debatestext = '<a href="'.$debatesdata['listurl'].'">Debates</a>';
+    $wranstext = '<a href="'.$wransdata['listurl'].'">Written Answers</a>';
+    $whalltext = '<a href="'.$whalldata['listurl'].'">Westminster Hall debates</a>';
+    $wmstext = '<a href="'.$wmsdata['listurl'].'">Written Ministerial Statements</a>';
 
     // Now we work out whether the debates/wrans are from yesterday or another day...
     // And create the appropriate text ($daytext) to display accordingly.
@@ -45,7 +45,7 @@ 
 
         } elseif ($todaystime - $debatesdata['timestamp'] <= (6 * 86400)) {
             // Less than a week ago, so like "last Tuesday's".
-            $daytext = gmdate('l', $debatesdata['timestamp']) . "'s";
+            $daytext = gmdate('l', $debatesdata['timestamp'])."'s";
 
         } else {
 
@@ -72,7 +72,7 @@ 
 $HANSARDURL = new \MySociety\TheyWorkForYou\Url('hansard');
 $MPURL = new \MySociety\TheyWorkForYou\Url('yourmp');
 
-$PAGE->block_start(array ('id'=>'intro', 'title'=>'Election special! Find out how they performed for YOU:'));
+$PAGE->block_start(array('id'=>'intro', 'title'=>'Election special! Find out how they performed for YOU:'));
 ?>
                         <ol>
 
@@ -89,7 +89,7 @@ 
     } else {
         $CHANGEURL = new \MySociety\TheyWorkForYou\Url('userchangepc');
     }
-    $MEMBER = new MEMBER(array ('postcode'=>$THEUSER->postcode(), 'house'=>1));
+    $MEMBER = new MEMBER(array('postcode'=>$THEUSER->postcode(), 'house'=>1));
     $mpname = $MEMBER->full_name();
     ?>
       <p><a href="<?php echo $MPURL->generate(); ?>"><strong>Find out more about how <?php echo $mpname; ?>, your ex-MP, represented you over the last parliament</strong></a><br>
@@ -185,11 +185,11 @@ 
 //$PAGE->block_end();
 
 $PAGE->stripe_end(array(
-    array (
+    array(
         'type' => 'include',
         'content' => 'whatisthissite'
     ),
-    array (
+    array(
         'type' => 'include',
         'content' => 'sitenews_recent'
     )

www/docs/api/api_convertURL.php

Spacing +8 added lines, -8 removed lines

@@ -40,7 +40,7 @@ 
     $LISTURL = new \MySociety\TheyWorkForYou\Url($hansardmajors[$id_data['major']]['page_all']);
     $fragment = '';
     if ($id_data['htype'] == '11' || $id_data['htype'] == '10') {
-        $LISTURL->insert( array( 'id' => $id_data['gid'] ) );
+        $LISTURL->insert(array('id' => $id_data['gid']));
     } else {
         $parent_epobject_id = $id_data['subsection_id'];
         $parent_gid = '';
@@ -50,14 +50,14 @@ 
                     ':epobject_id' => $parent_epobject_id
                     ));
         if ($r->rows() > 0) {
-            $parent_gid = fix_gid_from_db( $r->field(0, 'gid') );
+            $parent_gid = fix_gid_from_db($r->field(0, 'gid'));
         }
         if ($parent_gid != '') {
-            $LISTURL->insert( array( 'id' => $parent_gid ) );
-            $fragment = '#g' . gid_to_anchor($id_data['gid']);
+            $LISTURL->insert(array('id' => $parent_gid));
+            $fragment = '#g'.gid_to_anchor($id_data['gid']);
         }
     }
-    return $LISTURL->generate('none') . $fragment;
+    return $LISTURL->generate('none').$fragment;
 }
 
 function api_converturl_url_output($q) {
@@ -65,7 +65,7 @@ 
     $url = get_listurl($q);
     $output = array(
         'gid' => $gid,
-        'url' => 'https://www.theyworkforyou.com' . $url
+        'url' => 'https://www.theyworkforyou.com'.$url
     );
     api_output($output);
 }
@@ -79,7 +79,7 @@ 
         return api_converturl_url_output($q);
 
     $q = $db->query('select gid,major,htype,subsection_id from hansard where source_url like :url order by gid limit 1', array(
-        ':url' => $url_nohash . '%'
+        ':url' => $url_nohash.'%'
         ));
     if ($q->rows())
         return api_converturl_url_output($q);
@@ -87,7 +87,7 @@ 
     $url_bound = str_replace('cmhansrd/cm', 'cmhansrd/vo', $url_nohash);
     if ($url_bound != $url_nohash) {
         $q = $db->query('select gid,major,htype,subsection_id from hansard where source_url like :url order by gid limit 1', array(
-            ':url' => $url_bound . '%'
+            ':url' => $url_bound.'%'
             ));
         if ($q->rows())
             return api_converturl_url_output($q);

www/docs/admin/index.php

Spacing +10 added lines, -10 removed lines

@@ -22,11 +22,11 @@ 
 $q = $db->query("SELECT COUNT(*) AS count FROM users WHERE confirmed = '0'");
 $unconfirmedusers = $q->field(0, 'count');
 
-$olddate = gmdate("Y-m-d H:i:s", time()-86400);
+$olddate = gmdate("Y-m-d H:i:s", time() - 86400);
 $q = $db->query("SELECT COUNT(*) AS count FROM users WHERE lastvisit > '$olddate'");
 $dayusers = $q->field(0, 'count');
 
-$olddate = gmdate("Y-m-d H:i:s", time()-86400*7);
+$olddate = gmdate("Y-m-d H:i:s", time() - 86400 * 7);
 $q = $db->query("SELECT COUNT(*) AS count FROM users WHERE lastvisit > '$olddate'");
 $weekusers = $q->field(0, 'count');
 ?>
@@ -61,7 +61,7 @@ 
 $rows = array();
 $USERURL = new \MySociety\TheyWorkForYou\Url('userview');
 
-for ($row=0; $row<$q->rows(); $row++) {
+for ($row = 0; $row < $q->rows(); $row++) {
 
     $user_id = $q->field($row, 'user_id');
 
@@ -69,23 +69,23 @@ 
 
     if ($q->field($row, 'confirmed') == 1) {
         $confirmed = 'Yes';
-        $name = '<a href="' . $USERURL->generate() . '">' . _htmlspecialchars($q->field($row, 'firstname'))
-            . ' ' . _htmlspecialchars($q->field($row, 'lastname')) . '</a>';
+        $name = '<a href="'.$USERURL->generate().'">'._htmlspecialchars($q->field($row, 'firstname'))
+            . ' '._htmlspecialchars($q->field($row, 'lastname')).'</a>';
     } else {
         $confirmed = 'No';
-        $name = _htmlspecialchars($q->field($row, 'firstname') . ' ' . $q->field($row, 'lastname'));
+        $name = _htmlspecialchars($q->field($row, 'firstname').' '.$q->field($row, 'lastname'));
     }
 
-    $rows[] = array (
+    $rows[] = array(
         $name,
-        '<a href="mailto:' . $q->field($row, 'email') . '">' . $q->field($row, 'email') . '</a>',
+        '<a href="mailto:'.$q->field($row, 'email').'">'.$q->field($row, 'email').'</a>',
         $confirmed,
         $q->field($row, 'registrationtime')
     );
 }
 
-$tabledata = array (
-    'header' => array (
+$tabledata = array(
+    'header' => array(
         'Name',
         'Email',
         'Confirmed?',

www/docs/admin/badusers.php

Spacing +12 added lines, -12 removed lines

@@ -32,18 +32,18 @@ 
 $rows = array();
 $USERURL = new \MySociety\TheyWorkForYou\Url('userview');
 
-for ($row=0; $row<$q->rows(); $row++) {
+for ($row = 0; $row < $q->rows(); $row++) {
 
     $user_id = $q->field($row, 'user_id');
 
     // Get the total comments posted for this user.
     $r = $db->query("SELECT COUNT(*) AS totalcount
                     FROM	comments
-                    WHERE	user_id = '" . $user_id . "'");
+                    WHERE	user_id = '" . $user_id."'");
 
     $totalcomments = $r->field(0, 'totalcount');
 
-    $percentagedeleted = ( $q->field($row, 'deletedcount') / $totalcomments ) * 100;
+    $percentagedeleted = ($q->field($row, 'deletedcount') / $totalcomments) * 100;
 
 
     // Get complaints made about this user's comments, but not upheld.
@@ -59,8 +59,8 @@ 
 
     $USERURL->insert(array('u'=>$user_id));
 
-    $rows[] = array (
-        '<a href="' . $USERURL->generate() . '">' . $q->field($row, 'firstname') . ' ' . $q->field($row, 'lastname') . '</a>',
+    $rows[] = array(
+        '<a href="'.$USERURL->generate().'">'.$q->field($row, 'firstname').' '.$q->field($row, 'lastname').'</a>',
         $totalcomments,
         $q->field($row, 'deletedcount'),
         $percentagedeleted.'%',
@@ -68,8 +68,8 @@ 
     );
 }
 
-$tabledata = array (
-    'header' => array (
+$tabledata = array(
+    'header' => array(
         'Name',
         'Total comments',
         'Number deleted',
@@ -105,7 +105,7 @@ 
 $rows = array();
 $USERURL = new \MySociety\TheyWorkForYou\Url('userview');
 
-for ($row=0; $row<$q->rows(); $row++) {
+for ($row = 0; $row < $q->rows(); $row++) {
 
     $user_id = $q->field($row, 'user_id');
 
@@ -117,15 +117,15 @@ 
                     WHERE	user_id = '$user_id'
                     AND		upheld = '1'");
 
-    $rows[] = array (
-        '<a href="' . $USERURL->generate() . '">' . $q->field($row, 'firstname') . ' ' . $q->field($row, 'lastname') . '</a>',
+    $rows[] = array(
+        '<a href="'.$USERURL->generate().'">'.$q->field($row, 'firstname').' '.$q->field($row, 'lastname').'</a>',
         $q->field($row, 'rejectedcount'),
         $r->field(0, 'upheldcount')
     );
 
 }
-$tabledata = array (
-    'header' => array (
+$tabledata = array(
+    'header' => array(
         'Name',
         'Reports not upheld',
         'Reports upheld'

www/docs/admin/report.php

Spacing +14 added lines, -14 removed lines

@@ -46,7 +46,7 @@ 
 
 if ($REPORT->locked() && $REPORT->lockedby() != $THEUSER->user_id()) {
 
-    print "<p><strong>Someone else was examining this report at " . $REPORT->locked() . " so you can only look at it, not take any action. You could try again in a few minutes.</strong></p>\n";
+    print "<p><strong>Someone else was examining this report at ".$REPORT->locked()." so you can only look at it, not take any action. You could try again in a few minutes.</strong></p>\n";
 
     $COMMENT->display();
 
@@ -153,7 +153,7 @@ 
     // so may be scope for rationalising...
     global $PAGE;
 
-    $filename = INCLUDESPATH . "easyparliament/templates/emails/" . $template . ".txt";
+    $filename = INCLUDESPATH."easyparliament/templates/emails/".$template.".txt";
 
     if (!file_exists($filename)) {
         $PAGE->error_message("Sorry, we could not find the email template.");
@@ -177,8 +177,8 @@ 
     global $this_page;
 
 #	$commentermail = preg_replace("/\n/", "<br>\n", get_template_contents('comment_deleted') );
-    $commentermail = preg_replace('/^Subject:.*\n/', '', get_template_contents('comment_deleted') );
-    $reportermail = preg_replace("/\n/", "<br>\n", get_template_contents('report_upheld') );
+    $commentermail = preg_replace('/^Subject:.*\n/', '', get_template_contents('comment_deleted'));
+    $reportermail = preg_replace("/\n/", "<br>\n", get_template_contents('report_upheld'));
 
     ?>
         <p><strong>You've chosen to delete this comment.</strong> You can now send an email to both the person who posted the comment, and the person who made the report. Uncheck a box to prevent an email from being sent. The comment will not be deleted until you click the button below.</p>
@@ -211,7 +211,7 @@ 
 
     global $this_page;
 
-    $reportermail = preg_replace("/\n/", "<br>\n", get_template_contents('report_declined') );
+    $reportermail = preg_replace("/\n/", "<br>\n", get_template_contents('report_declined'));
 
     ?>
         <p><strong>You have chosen not to delete this comment.</strong> You can now send an email to the person who made the report (uncheck the box to send no email). The report will not be resolved until you click the button below.</p>
@@ -243,7 +243,7 @@ 
         $upheld = false;
     }
 
-    $success = $REPORT->resolve ($upheld, $COMMENT);
+    $success = $REPORT->resolve($upheld, $COMMENT);
 
     if ($success) {
 
@@ -261,7 +261,7 @@ 
                 // The reporting user was logged in at the time,
                 // so get their email address.
                 $USER = new USER;
-                $USER->init( $REPORT->user_id() );
+                $USER->init($REPORT->user_id());
                 $email = $USER->email();
             } else {
                 // Non-logged-in user; they should have left their address.
@@ -269,10 +269,10 @@ 
             }
 
             // Prepare the data needed for either email.
-            $data = array (
+            $data = array(
                 'to' 			=> $email
             );
-            $merge = array (
+            $merge = array(
                 'FIRSTNAME' 	=> $REPORT->firstname(),
                 'LASTNAME' 		=> $REPORT->lastname(),
                 'REPORTBODY' 	=> strip_tags($REPORT->body())
@@ -284,7 +284,7 @@ 
 
             } else {
                 $data['template'] = 'report_declined';
-                $merge['COMMENTURL'] = 'https://' . DOMAIN . $COMMENT->url();
+                $merge['COMMENTURL'] = 'https://'.DOMAIN.$COMMENT->url();
                 $merge['REASON'] = get_http_var('declinedreason');
             }
 
@@ -306,14 +306,14 @@ 
 
             // Create the URL for if a user wants to return and post another comment.
             // Remove the anchor for their now deleted comment.
-            $addcommentsurl = 'https://' . DOMAIN . preg_replace("/#.*$/", '#addcomment', $COMMENT->url());
+            $addcommentsurl = 'https://'.DOMAIN.preg_replace("/#.*$/", '#addcomment', $COMMENT->url());
 
-            $data = array (
+            $data = array(
                 'to' => $USER->email(),
                 'template' => 'comment_deleted_blank',
                 'subject' => 'One of your comments has been deleted',
             );
-            $merge = array (
+            $merge = array(
                 'REPLYBODY' => get_http_var('commentermail'),
                 'FIRSTNAME' 	=> $USER->firstname(),
                 'LASTNAME' 	=> $USER->lastname(),
@@ -335,7 +335,7 @@ 
 
     $URL = new \MySociety\TheyWorkForYou\Url('admin_home');
 
-    print '<p><a href="' . $URL->generate() . '">Back</a></p>';
+    print '<p><a href="'.$URL->generate().'">Back</a></p>';
 }
 
 ?>

scripts/mprss.php

Indentation +45 added lines, -45 removed lines

@@ -20,49 +20,49 @@ 
 
 $starttime = time();
 for ($personrow=0; $personrow<$q->rows(); $personrow++) {
-	$person_id = $q->field($personrow, 'person_id');
+    $person_id = $q->field($personrow, 'person_id');
 
-	$args = array ( 'person_id' => $person_id );
-	$speeches = $HANSARDLIST->display('person', $args, 'none');
+    $args = array ( 'person_id' => $person_id );
+    $speeches = $HANSARDLIST->display('person', $args, 'none');
 
-	// Some data about this person that we'll need for the feed.
-	$MEMBER = new MEMBER(array('person_id' => $person_id));
-	$MPURL = new \MySociety\TheyWorkForYou\Url('mp');
-	$MPURL->insert(array('pid'=>$person_id));
-	$mpurl = $MPURL->generate();
+    // Some data about this person that we'll need for the feed.
+    $MEMBER = new MEMBER(array('person_id' => $person_id));
+    $MPURL = new \MySociety\TheyWorkForYou\Url('mp');
+    $MPURL->insert(array('pid'=>$person_id));
+    $mpurl = $MPURL->generate();
 
-	$date = gmdate('Y-m-d');
-	$time = gmdate('H:i:s');
-	$datenow = $date . 'T' . $time . '+00:00';
+    $date = gmdate('Y-m-d');
+    $time = gmdate('H:i:s');
+    $datenow = $date . 'T' . $time . '+00:00';
 
-	// Prepare the meat of the RSS file.
-	$items = '';
-	$entries = '';
-	if (isset ($speeches['rows']) && count($speeches['rows']) > 0) {
+    // Prepare the meat of the RSS file.
+    $items = '';
+    $entries = '';
+    if (isset ($speeches['rows']) && count($speeches['rows']) > 0) {
 
-		foreach ($speeches['rows'] as $n => $row) {
+        foreach ($speeches['rows'] as $n => $row) {
 
-			// While we're linking to individual speeches,
-			// the text is the body of the parent, ie (sub)section.
-			$title = _htmlentities(str_replace('&#8212;', '-', $row['parent']['body']));
+            // While we're linking to individual speeches,
+            // the text is the body of the parent, ie (sub)section.
+            $title = _htmlentities(str_replace('&#8212;', '-', $row['parent']['body']));
 
-			$link = isset($row['listurl']) ? $row['listurl'] : '';
-			$link = 'https://' . DOMAIN . $link;
+            $link = isset($row['listurl']) ? $row['listurl'] : '';
+            $link = 'https://' . DOMAIN . $link;
 
-			$description = _htmlentities(trim_characters($row['body'], 0, 200));
-			$contentencoded = $row['body'];
+            $description = _htmlentities(trim_characters($row['body'], 0, 200));
+            $contentencoded = $row['body'];
 
-			$hdate = format_date($row['hdate'], 'Y-m-d');
-			if ($row['htime'] != NULL) {
-				$htime = format_time($row['htime'], 'H:i:s');
-			} else {
-				$htime = '00:00:00';
-			}
+            $hdate = format_date($row['hdate'], 'Y-m-d');
+            if ($row['htime'] != NULL) {
+                $htime = format_time($row['htime'], 'H:i:s');
+            } else {
+                $htime = '00:00:00';
+            }
 
-			$date = $hdate . 'T' . $htime . '+00:00';
+            $date = $hdate . 'T' . $htime . '+00:00';
 
-			$items .= '<rdf:li rdf:resource="' . $link . '" />' . "\n";
-			$entries .= "<item rdf:about=\"$link\">
+            $items .= '<rdf:li rdf:resource="' . $link . '" />' . "\n";
+            $entries .= "<item rdf:about=\"$link\">
 	<title>$title</title>
 	<link>$link</link>
 	<description>$description</description>
@@ -71,11 +71,11 @@ 
 </item>
 ";
 
-		}
-	}
+        }
+    }
 
-	// Prepare the whole text of the RSS file.
-	$rsstext = '<?xml version="1.0" encoding="utf-8"?>
+    // Prepare the whole text of the RSS file.
+    $rsstext = '<?xml version="1.0" encoding="utf-8"?>
 <rdf:RDF
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -101,15 +101,15 @@ 
 
 </rdf:RDF>';
 
-	// Write the text to the file...
-	$filename = $rsspath . $person_id . '.rdf';
-	$fh = @fopen($filename, "w");
-	if (!$fh) { # Problem writing, just carry on
-		echo "Could not write to file ($filename)\n";
-		continue;
-	}
-	fwrite($fh, $rsstext);
-	fclose ($fh);
+    // Write the text to the file...
+    $filename = $rsspath . $person_id . '.rdf';
+    $fh = @fopen($filename, "w");
+    if (!$fh) { # Problem writing, just carry on
+        echo "Could not write to file ($filename)\n";
+        continue;
+    }
+    fwrite($fh, $rsstext);
+    fclose ($fh);
 }
 
 #print "Took " . (time()-$starttime) . " seconds\n";