mysociety / theyworkforyou

www/docs/random/index.php

Spacing +1 added lines, -1 removed lines

@@ -11,5 +11,5 @@
 $gid = fix_gid_from_db($gid);
 
 $URL = new \MySociety\TheyWorkForYou\Url('debates');
-$URL->insert( array( 'id' => $gid ) );
+$URL->insert(array('id' => $gid));
 header('Location: ' . $URL->generate());

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

Spacing +2 added lines, -2 removed lines

@@ -24,9 +24,9 @@
 });
 $sections_with_votes = array_values($sections_with_votes);
 
-for ($i=0; $i<count($sections_with_votes); $i+=2) {
+for ($i = 0; $i < count($sections_with_votes); $i += 2) {
     $l = $sections_with_votes[$i];
-    $r = $i+1 < count($sections_with_votes) ? $sections_with_votes[$i+1] : null;
+    $r = $i + 1 < count($sections_with_votes) ? $sections_with_votes[$i + 1] : null;
 
     $vote_title = $vote_sets[$l]['title'];
     $anchor = $vote_sets[$l]['anchor'];

scripts/mprss.php

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
 $rsspath = BASEDIR . '/rss/mp/';
 
 // Make things group writable.
-umask (002);
+umask(002);
 
 $HANSARDLIST = new HANSARDLIST();
 $db = $HANSARDLIST->db;
@@ -22,7 +22,7 @@ 
 foreach ($q as $person) {
     $person_id = $person['person_id'];
 
-	$args = array ( 'person_id' => $person_id );
+	$args = array('person_id' => $person_id);
 	$speeches = $HANSARDLIST->display('person', $args, 'none');
 
 	// Some data about this person that we'll need for the feed.
@@ -109,7 +109,7 @@ 
 		continue;
 	}
 	fwrite($fh, $rsstext);
-	fclose ($fh);
+	fclose($fh);
 }
 
 #print "Took " . (time()-$starttime) . " seconds\n";

Braces +2 added lines, -1 removed lines

@@ -106,7 +106,8 @@
 	// Write the text to the file...
 	$filename = $rsspath . $person_id . '.rdf';
 	$fh = @fopen($filename, "w");
-	if (!$fh) { # Problem writing, just carry on
+	if (!$fh) {
+# Problem writing, just carry on
 		echo "Could not write to file ($filename)\n";
 		continue;
 	}

Indentation +44 added lines, -44 removed lines

@@ -24,47 +24,47 @@ 
 foreach ($q as $person) {
     $person_id = $person['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('—', '-', $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('—', '-', $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:%M:%S');
-			} else {
-				$htime = '00:00:00';
-			}
+            $hdate = format_date($row['hdate'], '%Y-%m-%d');
+            if ($row['htime'] != null) {
+                $htime = format_time($row['htime'], '%H:%M:%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>
@@ -73,11 +73,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#"
@@ -103,15 +103,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";

www/includes/easyparliament/commentreportlist.php

Spacing +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
         // available for editing, it's accurate.
         $this->_update_locked();
 
-        $data = $this->_get_data_by_recent ();
+        $data = $this->_get_data_by_recent();
 
         $this->render($data);
 
@@ -97,7 +97,7 @@ 
 
         $data = array();
         foreach ($q as $row) {
-            $data[] = array (
+            $data[] = array(
                 'report_id'		=> $row['report_id'],
                 'comment_id' 	=> $row['comment_id'],
                 'firstname'		=> $row['firstname'],
@@ -108,7 +108,7 @@ 
             );
         }
         foreach ($r as $row) {
-            $data[] = array (
+            $data[] = array(
                 'report_id'		=> $row['report_id'],
                 'comment_id' 	=> $row['comment_id'],
                 'firstname'		=> $row['firstname'],

www/includes/easyparliament/searchengine.php

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

@@ -25,7 +25,7 @@ 
 
 */
 
-if (defined('XAPIANDB') AND XAPIANDB != '') {
+if (defined('XAPIANDB') and XAPIANDB != '') {
     if (file_exists('/usr/share/php/xapian.php')) {
         include_once '/usr/share/php/xapian.php';
     } else {
@@ -275,15 +275,15 @@ 
         foreach ($merged as $row) {
             $from_id = str_replace('uk.org.publicwhip/person/', '', $row['gid_from']);
             $to_id = str_replace('uk.org.publicwhip/person/', '', $row['gid_to']);
-            $qd = str_replace("(S$from_id OR S$to_id)", "S$to_id", $qd);
-            $qd = str_replace("S$from_id OR S$to_id", "S$to_id", $qd);
+            $qd = str_replace("(S$from_id OR S$to_id)", "s$to_id", $qd);
+            $qd = str_replace("s$from_id OR S$to_id", "s$to_id", $qd);
         }
 
         preg_match_all('#S(\d+)#', $qd, $m);
         foreach ($m[1] as $mm) {
             $member = new MEMBER(array('person_id' => $mm));
             $name = $member->full_name();
-            $qd = str_replace("S$mm", "speaker:$name", $qd);
+            $qd = str_replace("s$mm", "speaker:$name", $qd);
         }
 
         # Simplify display of excluded words

Spacing +30 added lines, -30 removed lines

@@ -37,7 +37,7 @@ 
     public $valid = false;
     public $error;
 
-    public function __construct($query, $lang='') {
+    public function __construct($query, $lang = '') {
         if (!defined('XAPIANDB') || !XAPIANDB)
             return null;
 
@@ -96,10 +96,10 @@ 
         // Split words up into individual words, and quoted phrases
         preg_match_all('/(' .
             '"|' . # match either a quote, or...
-            '(?:(?<![' .$this->wordchars. '])-)?' . # optionally a - (exclude)
+            '(?:(?<![' . $this->wordchars . '])-)?' . # optionally a - (exclude)
             # if at start of word (i.e. not preceded by a word character, in
             # which case it is probably a hyphenated-word)
-            '['.$this->wordchars.']+' . # followed by a string of word-characters
+            '[' . $this->wordchars . ']+' . # followed by a string of word-characters
             ')/', $this->query, $all_words);
         if ($all_words) {
             $all_words = $all_words[0];
@@ -124,8 +124,8 @@ 
             if (strpos($word, ':') !== false) {
                 $items = explode(":", strtolower($word));
                 $type = $items[0];
-                if (substr($type, 0, 1)=='-') $type = substr($type, 1);
-                $value = strtolower(join(":", array_slice($items,1)));
+                if (substr($type, 0, 1) == '-') $type = substr($type, 1);
+                $value = strtolower(join(":", array_slice($items, 1)));
                 if ($type == 'section') {
                     $newv = $value;
                     if ($value == 'debates' || $value == 'debate') $newv = 1;
@@ -138,8 +138,8 @@ 
                     elseif ($value == 'sp') $newv = 7;
                     elseif ($value == 'spwrans' || $value == 'spwran') $newv = 8;
                     elseif ($value == 'lmqs') $newv = 9;
-                    elseif ($value == 'uk') $newv = array(1,2,3,4,6,101);
-                    elseif ($value == 'scotland') $newv = array(7,8);
+                    elseif ($value == 'uk') $newv = array(1, 2, 3, 4, 6, 101);
+                    elseif ($value == 'scotland') $newv = array(7, 8);
                     elseif ($value == 'wales') $newv = ($lang == 'cy' || LANGUAGE == 'cy') ? 11 : 10;
                     elseif ($value == 'future') $newv = 'F';
                     if (is_array($newv)) {
@@ -174,7 +174,7 @@ 
             $this->query .= " $from..$to";
         } elseif ($from) {
             $this->query = str_ireplace("from:$from", '', $this->query);
-            $this->query .= " $from..".date('Ymd');
+            $this->query .= " $from.." . date('Ymd');
         } elseif ($to) {
             $this->query = str_ireplace("to:$to", '', $this->query);
             $this->query .= " 19990101..$to";
@@ -191,7 +191,7 @@ 
 
         twfy_debug("SEARCH", "prefixed: " . var_export($this->prefixed, true));
 
-        twfy_debug("SEARCH", "query -- ". $this->query);
+        twfy_debug("SEARCH", "query -- " . $this->query);
         $flags = XapianQueryParser::FLAG_BOOLEAN | XapianQueryParser::FLAG_LOVEHATE |
             XapianQueryParser::FLAG_WILDCARD | XapianQueryParser::FLAG_SPELLING_CORRECTION;
         $flags = $flags | XapianQueryParser::FLAG_PHRASE;
@@ -244,7 +244,7 @@ 
         foreach ($m[1] as $phrase) {
             $phrase_new = preg_replace('# PHRASE \d+#', '', $phrase);
             #$this->phrases[] = preg_split('#\s+#', $phrase_new);
-            $qd = str_replace("($phrase)", '"'.$phrase_new.'"', $qd);
+            $qd = str_replace("($phrase)", '"' . $phrase_new . '"', $qd);
         }
         preg_match_all('#\(([^(]*? NEAR [^(]*?)\)#', $qd, $m);
         foreach ($m[1] as $mm) {
@@ -374,7 +374,7 @@ 
     }
 
     // Perform partial query to get a count of number of matches
-    public function run_count($first_result, $results_per_page, $sort_order='relevance') {
+    public function run_count($first_result, $results_per_page, $sort_order = 'relevance') {
         if (!defined('XAPIANDB') || !XAPIANDB)
             return null;
 
@@ -447,13 +447,13 @@ 
         #}
 
         $duration = getmicrotime() - $start;
-        twfy_debug ("SEARCH", "Search count took $duration seconds.");
+        twfy_debug("SEARCH", "Search count took $duration seconds.");
 
         return $count;
     }
 
     // Perform the full search...
-    public function run_search($first_result, $results_per_page, $sort_order='relevance') {
+    public function run_search($first_result, $results_per_page, $sort_order = 'relevance') {
         $start = getmicrotime();
 
         #$matches = $this->enquire->get_mset($first_result, $results_per_page);
@@ -474,13 +474,13 @@ 
                 array_push($this->created, join('', unpack('N', $doc->get_value(2)))); # XXX Needs fixing
             }
             twfy_debug("SEARCH", "gid: $gid relevancy: $relevancy% weight: $weight");
-            array_push($this->gids, "uk.org.publicwhip/".$gid);
+            array_push($this->gids, "uk.org.publicwhip/" . $gid);
             array_push($this->collapsed, $collapsed);
             array_push($this->relevances, $relevancy);
             $iter->next();
         }
         $duration = getmicrotime() - $start;
-        twfy_debug ("SEARCH", "Run search took $duration seconds.");
+        twfy_debug("SEARCH", "Run search took $duration seconds.");
     }
     // ... use these to get the results
     public function get_gids() {
@@ -521,7 +521,7 @@ 
         $body = str_replace($this->specialchars, $this->specialchars_upper, $body);
         $body = mb_convert_encoding($body, "UTF-8", "HTML-ENTITIES");
         $body = str_replace($this->specialchars_upper, $this->specialchars, $body);
-        $splitextract = preg_split('/(<[^>]*>|[0-9,.]+|['.$this->wordcharsnodigit.']+)/', $body, -1, PREG_SPLIT_DELIM_CAPTURE);
+        $splitextract = preg_split('/(<[^>]*>|[0-9,.]+|[' . $this->wordcharsnodigit . ']+)/', $body, -1, PREG_SPLIT_DELIM_CAPTURE);
         $hlextract = "";
         foreach ($splitextract as $extractword) {
             if (preg_match('/^<[^>]*>$/', $extractword)) {
@@ -569,7 +569,7 @@ 
         */
 
         foreach ($this->phrases as $phrase) {
-            $phrasematch = join($phrase, '[^'.$this->wordchars.']+');
+            $phrasematch = join($phrase, '[^' . $this->wordchars . ']+');
             array_push($findwords, "/\b($phrasematch)\b(?!(?>[^<>]*>))/i");
             $replacewords[] = "<span class=\"hi\">\\1</span>";
         }
@@ -587,12 +587,12 @@ 
 
         // look for phrases
         foreach ($this->phrases as $phrase) {
-            $phrasematch = join($phrase, '[^'.$this->wordchars.']+');
-            if (preg_match('/([^'.$this->wordchars.']' . $phrasematch . '[^A-Za-z0-9])/', $lcbody, $matches))
+            $phrasematch = join($phrase, '[^' . $this->wordchars . ']+');
+            if (preg_match('/([^' . $this->wordchars . ']' . $phrasematch . '[^A-Za-z0-9])/', $lcbody, $matches))
             {
-                $wordpos = strpos( $lcbody, $matches[0] );
+                $wordpos = strpos($lcbody, $matches[0]);
                 if ($wordpos) {
-                    if ( ($wordpos < $pos) || ($pos==-1) ) {
+                    if (($wordpos < $pos) || ($pos == -1)) {
                         $pos = $wordpos;
                     }
                 }
@@ -600,7 +600,7 @@ 
         }
         if ($pos != -1) return $pos;
 
-        $splitextract = preg_split('/([0-9,.]+|['.$this->wordcharsnodigit.']+)/', $lcbody, -1, PREG_SPLIT_DELIM_CAPTURE);
+        $splitextract = preg_split('/([0-9,.]+|[' . $this->wordcharsnodigit . ']+)/', $lcbody, -1, PREG_SPLIT_DELIM_CAPTURE);
         $stemmed_words = array_map(array($this, 'stem'), $this->words);
         foreach ($splitextract as $extractword) {
             $extractword = preg_replace('/&$/', '', $extractword);
@@ -610,7 +610,7 @@ 
             foreach ($stemmed_words as $word) {
                 if ($word == '') continue;
                 $matchword = $this->stem($extractword);
-                if ($matchword == $word && ($wordpos < $pos || $pos==-1)) {
+                if ($matchword == $word && ($wordpos < $pos || $pos == -1)) {
                     $pos = $wordpos;
                 }
             }
@@ -619,11 +619,11 @@ 
         if ($pos != -1) return $pos;
 
         foreach ($this->words as $word) {
-            if (ctype_digit($word)) $word = '(?:'.$word.'|'.number_format($word).')';
-            if (preg_match('/([^'.$this->wordchars.']' . $word . '[^'.$this->wordchars. '])/', $lcbody, $matches)) {
-                $wordpos = strpos( $lcbody, $matches[0] );
+            if (ctype_digit($word)) $word = '(?:' . $word . '|' . number_format($word) . ')';
+            if (preg_match('/([^' . $this->wordchars . ']' . $word . '[^' . $this->wordchars . '])/', $lcbody, $matches)) {
+                $wordpos = strpos($lcbody, $matches[0]);
                 if ($wordpos) {
-                    if ( ($wordpos < $pos) || ($pos==-1) ) {
+                    if (($wordpos < $pos) || ($pos == -1)) {
                         $pos = $wordpos;
                     }
                 }
@@ -633,11 +633,11 @@ 
         if ($pos != -1) return $pos;
 
         foreach ($this->words as $word) {
-            if (ctype_digit($word)) $word = '(?:'.$word.'|'.number_format($word).')';
+            if (ctype_digit($word)) $word = '(?:' . $word . '|' . number_format($word) . ')';
             if (preg_match('/(' . $word . ')/', $lcbody, $matches)) {
-                $wordpos = strpos( $lcbody, $matches[0] );
+                $wordpos = strpos($lcbody, $matches[0]);
                 if ($wordpos) {
-                    if ( ($wordpos < $pos) || ($pos==-1) ) {
+                    if (($wordpos < $pos) || ($pos == -1)) {
                         $pos = $wordpos;
                     }
                 }

Braces +101 added lines, -48 removed lines

@@ -38,8 +38,9 @@ 
     public $error;
 
     public function __construct($query, $lang='') {
-        if (!defined('XAPIANDB') || !XAPIANDB)
-            return null;
+        if (!defined('XAPIANDB') || !XAPIANDB) {
+                    return null;
+        }
 
         global $xapiandb, $PAGE;
         if (!$xapiandb) {
@@ -54,8 +55,12 @@ 
             }
         }
         $this->query = $query;
-        if (!isset($this->stemmer)) $this->stemmer = new XapianStem('english');
-        if (!isset($this->enquire)) $this->enquire = new XapianEnquire($xapiandb);
+        if (!isset($this->stemmer)) {
+            $this->stemmer = new XapianStem('english');
+        }
+        if (!isset($this->enquire)) {
+            $this->enquire = new XapianEnquire($xapiandb);
+        }
         if (!isset($this->queryparser)) {
             $this->queryparser = new XapianQueryParser();
             $this->datevaluerange = new XapianDateValueRangeProcessor(1);
@@ -111,7 +116,9 @@ 
         foreach ($all_words as $word) {
             if ($word == '"') {
                 $in_quote = !$in_quote;
-                if ($in_quote) array_push($this->phrases, array());
+                if ($in_quote) {
+                    array_push($this->phrases, array());
+                }
                 if (!$in_quote && !count($this->phrases[count($this->phrases) - 1])) {
                     array_pop($this->phrases);
                 }
@@ -124,24 +131,41 @@ 
             if (strpos($word, ':') !== false) {
                 $items = explode(":", strtolower($word));
                 $type = $items[0];
-                if (substr($type, 0, 1)=='-') $type = substr($type, 1);
+                if (substr($type, 0, 1)=='-') {
+                    $type = substr($type, 1);
+                }
                 $value = strtolower(join(":", array_slice($items,1)));
                 if ($type == 'section') {
                     $newv = $value;
-                    if ($value == 'debates' || $value == 'debate') $newv = 1;
-                    elseif ($value == 'whall' || $value == 'westminster' || $value == 'westminhall') $newv = 2;
-                    elseif ($value == 'wrans' || $value == 'wran') $newv = 3;
-                    elseif ($value == 'wms' || $value == 'statements' || $value == 'statement') $newv = 4;
-                    elseif ($value == 'lordsdebates' || $value == 'lords') $newv = 101;
-                    elseif ($value == 'ni' || $value == 'nidebates') $newv = 5;
-                    elseif ($value == 'pbc' || $value == 'standing') $newv = 6;
-                    elseif ($value == 'sp') $newv = 7;
-                    elseif ($value == 'spwrans' || $value == 'spwran') $newv = 8;
-                    elseif ($value == 'lmqs') $newv = 9;
-                    elseif ($value == 'uk') $newv = array(1,2,3,4,6,101);
-                    elseif ($value == 'scotland') $newv = array(7,8);
-                    elseif ($value == 'wales') $newv = ($lang == 'cy' || LANGUAGE == 'cy') ? 11 : 10;
-                    elseif ($value == 'future') $newv = 'F';
+                    if ($value == 'debates' || $value == 'debate') {
+                        $newv = 1;
+                    } elseif ($value == 'whall' || $value == 'westminster' || $value == 'westminhall') {
+                        $newv = 2;
+                    } elseif ($value == 'wrans' || $value == 'wran') {
+                        $newv = 3;
+                    } elseif ($value == 'wms' || $value == 'statements' || $value == 'statement') {
+                        $newv = 4;
+                    } elseif ($value == 'lordsdebates' || $value == 'lords') {
+                        $newv = 101;
+                    } elseif ($value == 'ni' || $value == 'nidebates') {
+                        $newv = 5;
+                    } elseif ($value == 'pbc' || $value == 'standing') {
+                        $newv = 6;
+                    } elseif ($value == 'sp') {
+                        $newv = 7;
+                    } elseif ($value == 'spwrans' || $value == 'spwran') {
+                        $newv = 8;
+                    } elseif ($value == 'lmqs') {
+                        $newv = 9;
+                    } elseif ($value == 'uk') {
+                        $newv = array(1,2,3,4,6,101);
+                    } elseif ($value == 'scotland') {
+                        $newv = array(7,8);
+                    } elseif ($value == 'wales') {
+                        $newv = ($lang == 'cy' || LANGUAGE == 'cy') ? 11 : 10;
+                    } elseif ($value == 'future') {
+                        $newv = 'F';
+                    }
                     if (is_array($newv)) {
                         $newv = 'major:' . join(' major:', $newv);
                     } else {
@@ -150,8 +174,12 @@ 
                     $this->query = str_ireplace("$type:$value", $newv, $this->query);
                 } elseif ($type == 'groupby') {
                     $newv = $value;
-                    if ($value == 'debates' || $value == 'debate') $newv = 'debate';
-                    if ($value == 'speech' || $value == 'speeches') $newv = 'speech';
+                    if ($value == 'debates' || $value == 'debate') {
+                        $newv = 'debate';
+                    }
+                    if ($value == 'speech' || $value == 'speeches') {
+                        $newv = 'speech';
+                    }
                     $this->query = str_ireplace("$type:$value", '', $this->query);
                     array_push($this->prefixed, array($type, $newv));
                 } elseif ($type == 'from') {
@@ -288,7 +316,9 @@ 
             $end = $this->queryparser->unstem_end($mm);
             while (!$iter->equals($end)) {
                 $tt = $iter->get_term();
-                if (!in_array($tt, $used)) break;
+                if (!in_array($tt, $used)) {
+                    break;
+                }
                 $iter->next();
             }
             $used[] = $tt;
@@ -375,8 +405,9 @@ 
 
     // Perform partial query to get a count of number of matches
     public function run_count($first_result, $results_per_page, $sort_order='relevance') {
-        if (!defined('XAPIANDB') || !XAPIANDB)
-            return null;
+        if (!defined('XAPIANDB') || !XAPIANDB) {
+                    return null;
+        }
 
         $start = getmicrotime();
 
@@ -406,16 +437,18 @@ 
                 $collapsed = true;
                 if ($items[1] == 'speech')
                     ; // no collapse key
-                elseif ($items[1] == 'debate')
-                    $this->enquire->set_collapse_key(3);
-                else
-                    $PAGE->error_message("Unknown group by '$items[1]' ignored");
+                elseif ($items[1] == 'debate') {
+                                    $this->enquire->set_collapse_key(3);
+                } else {
+                                    $PAGE->error_message("Unknown group by '$items[1]' ignored");
+                }
             }
         }
 
         // default to grouping by subdebate, i.e. by page
-        if (!$collapsed)
-            $this->enquire->set_collapse_key(3);
+        if (!$collapsed) {
+                    $this->enquire->set_collapse_key(3);
+        }
 
         /*
         XXX Helping to debug possible Xapian bug
@@ -495,8 +528,9 @@ 
 
     // Puts HTML highlighting round all the matching words in the text
     public function highlight($body) {
-        if (!defined('XAPIANDB') || !XAPIANDB)
-            return $body;
+        if (!defined('XAPIANDB') || !XAPIANDB) {
+                    return $body;
+        }
 
         $stemmed_words = array_map(array($this, 'stem'), $this->words);
         if (is_array($body)) {
@@ -514,8 +548,9 @@ 
     private $specialchars_upper = array('<', '>', '"', '&');
 
     public function highlight_internal($body, $stemmed_words) {
-        if (!defined('XAPIANDB') || !XAPIANDB)
-            return $body;
+        if (!defined('XAPIANDB') || !XAPIANDB) {
+                    return $body;
+        }
 
         # Does html_entity_decode without the htmlspecialchars
         $body = str_replace($this->specialchars, $this->specialchars_upper, $body);
@@ -536,7 +571,9 @@ 
             $hl = false;
             $matchword = $this->stem($extractword);
             foreach ($stemmed_words as $word) {
-                if ($word == '') continue;
+                if ($word == '') {
+                    continue;
+                }
                 if ($matchword == $word) {
                     $hl = true;
                     break;
@@ -588,8 +625,7 @@ 
         // look for phrases
         foreach ($this->phrases as $phrase) {
             $phrasematch = join($phrase, '[^'.$this->wordchars.']+');
-            if (preg_match('/([^'.$this->wordchars.']' . $phrasematch . '[^A-Za-z0-9])/', $lcbody, $matches))
-            {
+            if (preg_match('/([^'.$this->wordchars.']' . $phrasematch . '[^A-Za-z0-9])/', $lcbody, $matches)) {
                 $wordpos = strpos( $lcbody, $matches[0] );
                 if ($wordpos) {
                     if ( ($wordpos < $pos) || ($pos==-1) ) {
@@ -598,17 +634,25 @@ 
                 }
             }
         }
-        if ($pos != -1) return $pos;
+        if ($pos != -1) {
+            return $pos;
+        }
 
         $splitextract = preg_split('/([0-9,.]+|['.$this->wordcharsnodigit.']+)/', $lcbody, -1, PREG_SPLIT_DELIM_CAPTURE);
         $stemmed_words = array_map(array($this, 'stem'), $this->words);
         foreach ($splitextract as $extractword) {
             $extractword = preg_replace('/&$/', '', $extractword);
-            if (!$extractword) continue;
+            if (!$extractword) {
+                continue;
+            }
             $wordpos = strpos($lcbody, $extractword);
-            if (!$wordpos) continue;
+            if (!$wordpos) {
+                continue;
+            }
             foreach ($stemmed_words as $word) {
-                if ($word == '') continue;
+                if ($word == '') {
+                    continue;
+                }
                 $matchword = $this->stem($extractword);
                 if ($matchword == $word && ($wordpos < $pos || $pos==-1)) {
                     $pos = $wordpos;
@@ -616,10 +660,14 @@ 
             }
         }
         // only look for earlier words if phrases weren't found
-        if ($pos != -1) return $pos;
+        if ($pos != -1) {
+            return $pos;
+        }
 
         foreach ($this->words as $word) {
-            if (ctype_digit($word)) $word = '(?:'.$word.'|'.number_format($word).')';
+            if (ctype_digit($word)) {
+                $word = '(?:'.$word.'|'.number_format($word).')';
+            }
             if (preg_match('/([^'.$this->wordchars.']' . $word . '[^'.$this->wordchars. '])/', $lcbody, $matches)) {
                 $wordpos = strpos( $lcbody, $matches[0] );
                 if ($wordpos) {
@@ -630,10 +678,14 @@ 
             }
         }
         // only look for something containing the word (ie. something stemmed, but doesn't work all the time) if no whole word was found
-        if ($pos != -1) return $pos;
+        if ($pos != -1) {
+            return $pos;
+        }
 
         foreach ($this->words as $word) {
-            if (ctype_digit($word)) $word = '(?:'.$word.'|'.number_format($word).')';
+            if (ctype_digit($word)) {
+                $word = '(?:'.$word.'|'.number_format($word).')';
+            }
             if (preg_match('/(' . $word . ')/', $lcbody, $matches)) {
                 $wordpos = strpos( $lcbody, $matches[0] );
                 if ($wordpos) {
@@ -644,8 +696,9 @@ 
             }
         }
 
-        if ($pos == -1)
-            $pos = 0;
+        if ($pos == -1) {
+                    $pos = 0;
+        }
 
         return $pos;
     }

www/docs/admin/wikipedia.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 remove_form();
 list_ignored();
 $PAGE->stripe_end([
-    [ 'type' => 'html', 'content' => $PAGE->admin_menu() ],
+    ['type' => 'html', 'content' => $PAGE->admin_menu()],
 ]);
 $PAGE->page_end();
 

www/includes/dbtypes.php

Spacing +3 added lines, -3 removed lines

@@ -3,8 +3,8 @@ 
 // $Id: dbtypes.php,v 1.8 2009-04-28 13:13:04 matthew Exp $
 
 // The type field in the epobject database table
-define ('EPTYPE_HANSARD', 1);
-define ('EPTYPE_GLOSSARY', 2);
+define('EPTYPE_HANSARD', 1);
+define('EPTYPE_GLOSSARY', 2);
 
 // The major field in the hansard database table
 $hansardmajors = array(
@@ -121,7 +121,7 @@ 
 );
 $hansardmajors[104] = $hansardmajors[4];
 
-$parties = array (
+$parties = array(
     'Bp'    => 'Bishop',
     'Con'   => 'Conservative',
     'CWM'   => 'Deputy Speaker',

www/includes/easyparliament/member.php

Indentation +1 added lines, -1 removed lines

@@ -364,7 +364,7 @@
         $this->extra_info = array();
 
         $q = $this->db->query('SELECT * FROM moffice WHERE person=:person_id ORDER BY from_date DESC, moffice_id',
-                              array(':person_id' => $this->person_id));
+                                array(':person_id' => $this->person_id));
         $this->extra_info['office'] = $q->fetchAll();
 
         // Info specific to member id (e.g. attendance during that period of office)

Spacing +21 added lines, -21 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once INCLUDESPATH."easyparliament/glossary.php";
+include_once INCLUDESPATH . "easyparliament/glossary.php";
 
 use MySociety\TheyWorkForYou\Policies as Policies;
 
@@ -89,7 +89,7 @@ 
 
         # All the following only happen if the house to display isn't yet set.
         # TODO: This relies on interpreting the default value of 0 as a false, which may be error-prone.
-        if (! (bool) $this->house_disp) {
+        if (!(bool) $this->house_disp) {
             if ($house == HOUSE_TYPE_LONDON_ASSEMBLY # London Assembly
                 || $house == HOUSE_TYPE_SCOTLAND     # MSPs and
                 || $house == HOUSE_TYPE_WALES        # MSs and
@@ -233,7 +233,7 @@ 
         $this->set_users_mp();
     }
 
-    public function date_in_memberships($house, $date){
+    public function date_in_memberships($house, $date) {
         // Given a date, see if they had any memberships during that time
         foreach ($this->memberships as $membership) {
             if ($membership['entered_house'] <= $date && $membership['left_house'] >= $date) {
@@ -278,13 +278,13 @@ 
         }
     }
 
-    public function postcode_to_person_id($postcode, $house=null) {
-        twfy_debug ('MP', "postcode_to_person_id converting postcode to person");
+    public function postcode_to_person_id($postcode, $house = null) {
+        twfy_debug('MP', "postcode_to_person_id converting postcode to person");
         $constituency = strtolower(MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituency($postcode));
         return $this->constituency_to_person_id($constituency, $house);
     }
 
-    public function constituency_to_person_id($constituency, $house=null) {
+    public function constituency_to_person_id($constituency, $house = null) {
         if ($constituency == '') {
             throw new MySociety\TheyWorkForYou\MemberException('Sorry, no constituency was found.');
         }
@@ -325,7 +325,7 @@ 
         }
     }
 
-    public function name_to_person_id($name, $const='') {
+    public function name_to_person_id($name, $const = '') {
         global $this_page;
         if ($name == '') {
             throw new MySociety\TheyWorkForYou\MemberException('Sorry, no name was found.');
@@ -368,7 +368,7 @@ 
                 OR (title=:given_name AND given_name=:middle_name AND family_name=:family_name)
             )";
         } elseif ($this_page == 'royal') {
-            twfy_debug ('MP', $name);
+            twfy_debug('MP', $name);
             if (stripos($name, 'elizabeth') !== false) {
                 $q .= "AND person_id=13935";
             } elseif (stripos($name, 'charles') !== false) {
@@ -438,7 +438,7 @@ 
         global $THEUSER;
         if (is_object($THEUSER) && $THEUSER->postcode_is_set() && $this->current_member(1)) {
             $pc = $THEUSER->postcode();
-            twfy_debug ('MP', "set_users_mp converting postcode to person");
+            twfy_debug('MP', "set_users_mp converting postcode to person");
             $constituency = strtolower(MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituency($pc));
             if ($constituency == strtolower($this->constituency())) {
                 $this->the_users_mp = true;
@@ -517,7 +517,7 @@ 
         }
 
         if ($display && array_key_exists('register_member_interests_html', $this->extra_info) && ($this->extra_info['register_member_interests_html'] != '')) {
-            $args = array (
+            $args = array(
                 "sort" => "regexp_replace"
             );
             $GLOSSARY = new GLOSSARY($args);
@@ -525,7 +525,7 @@ 
         $GLOSSARY->glossarise($this->extra_info['register_member_interests_html']);
         }
 
-        $q = $this->db->query('select count(*) as c from alerts where criteria like "%speaker:'.$this->person_id.'%" and confirmed and not deleted')->first();
+        $q = $this->db->query('select count(*) as c from alerts where criteria like "%speaker:' . $this->person_id . '%" and confirmed and not deleted')->first();
         $this->extra_info['number_of_alerts'] = $q['c'];
 
         # Public Bill Committees
@@ -547,7 +547,7 @@ 
             $chairman = $row['c'];
             $this->extra_info['pbc'][$bill_id] = array(
                 'title' => $title, 'session' => $row['session'],
-                'attending'=>$attending, 'chairman'=>($chairman>0), 'outof' => $c
+                'attending'=>$attending, 'chairman'=>($chairman > 0), 'outof' => $c
             );
         }
 
@@ -562,7 +562,7 @@ 
     public function family_name() { return $this->family_name; }
     public function full_name($no_mp_title = false) {
         $title = $this->title;
-        if ($no_mp_title && ($this->house_disp==HOUSE_TYPE_COMMONS || $this->house_disp==HOUSE_TYPE_NI || $this->house_disp==HOUSE_TYPE_SCOTLAND || $this->house_disp==HOUSE_TYPE_WALES)) {
+        if ($no_mp_title && ($this->house_disp == HOUSE_TYPE_COMMONS || $this->house_disp == HOUSE_TYPE_NI || $this->house_disp == HOUSE_TYPE_SCOTLAND || $this->house_disp == HOUSE_TYPE_WALES)) {
             $title = '';
         }
         return member_full_name($this->house_disp, $title, $this->given_name, $this->family_name, $this->lordofname);
@@ -591,8 +591,8 @@ 
     }
 
     public function entered_house($house = null) {
-        if ( isset($house) ) {
-            if ( array_key_exists($house, $this->entered_house) ) {
+        if (isset($house)) {
+            if (array_key_exists($house, $this->entered_house)) {
                 return $this->entered_house[$house];
             } else {
                 return null;
@@ -606,9 +606,9 @@ 
             return '';
         }
         list($year, $month, $day) = explode('-', $entered_house);
-        if ($month==1 && $day==1 && $this->house(HOUSE_TYPE_LORDS)) {
+        if ($month == 1 && $day == 1 && $this->house(HOUSE_TYPE_LORDS)) {
             return $year;
-        } elseif ($month==0 && $day==0) {
+        } elseif ($month == 0 && $day == 0) {
             return $year;
         } elseif (checkdate($month, $day, $year) && $year != '9999') {
             return format_date($entered_house, LONGDATEFORMAT);
@@ -618,8 +618,8 @@ 
     }
 
     public function left_house($house = null) {
-        if ( isset($house) ) {
-            if ( array_key_exists($house, $this->left_house) ) {
+        if (isset($house)) {
+            if (array_key_exists($house, $this->left_house)) {
                 return $this->left_house[$house];
             } else {
                 return null;
@@ -635,7 +635,7 @@ 
         list($year, $month, $day) = explode('-', $left_house);
         if (checkdate($month, $day, $year) && $year != '9999') {
             return format_date($left_house, LONGDATEFORMAT);
-        } elseif ($month==0 && $day==0) {
+        } elseif ($month == 0 && $day == 0) {
             # Left house date is stored as 1942-00-00 to mean "at some point in 1941"
             return $year - 1;
         } else {
@@ -761,7 +761,7 @@ 
             $name = $row['given_name'] . ' ' . $row['family_name'];
             if ($last_pid != $pid) {
                 $mships[] = array(
-                    'href' => WEBPATH . 'mp/?pid='.$pid,
+                    'href' => WEBPATH . 'mp/?pid=' . $pid,
                     'text' => $name
                 );
                 $last_pid = $pid;

www/docs/topic/topic.php

Spacing +3 added lines, -3 removed lines

@@ -54,12 +54,12 @@ 
                 $pc = get_http_var('pc');
                 $pc = preg_replace('#[^a-z0-9]#i', '', $pc);
                 if (validate_postcode($pc)) {
-                    twfy_debug ('MP', "MP lookup by postcode");
+                    twfy_debug('MP', "MP lookup by postcode");
                     $constituency = strtolower(Utility\Postcode::postcodeToConstituency($pc));
                     if ($constituency == "connection_timed_out") {
                         throw new \Exception('Sorry, we couldn’t check your postcode right now, as our postcode lookup server is under quite a lot of load.');
                     } elseif ($constituency == "") {
-                        twfy_debug ('MP', "Can't display an MP, as submitted postcode didn't match a constituency");
+                        twfy_debug('MP', "Can't display an MP, as submitted postcode didn't match a constituency");
                         throw new \Exception('Sorry, ' . _htmlentities($pc) . ' isn’t a known postcode');
                     } else {
                         // Generate the Member object
@@ -70,7 +70,7 @@ 
                         }
                     }
                 } else {
-                    twfy_debug ('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
+                    twfy_debug('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
                     throw new \Exception('Sorry, ' . _htmlentities($pc) . ' isn’t a valid postcode');
                 }
             } catch (\Exception $e) {