mysociety / theyworkforyou

classes/Utility/Gaze.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     public static function getCountryByIp($ip)
     {
 
-        include_once INCLUDESPATH . '../../commonlib/phplib/gaze.php';
+        include_once INCLUDESPATH.'../../commonlib/phplib/gaze.php';
 
         if (defined('OPTION_GAZE_URL') && OPTION_GAZE_URL) {
             return gaze_get_country_from_ip($ip);

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

@@ -25,7 +25,7 @@
         if (defined('OPTION_GAZE_URL') && OPTION_GAZE_URL) {
             return gaze_get_country_from_ip($ip);
         } else {
-            return NULL;
+            return null;
         }
 
     }

classes/Utility/Postcode.php

Spacing +22 added lines, -22 removed lines

@@ -39,7 +39,7 @@ 
 
         if ($last_postcode == $postcode) {
             $return_value = $mp_only ? $last_postcode_value['WMC'] : $last_postcode_value;
-            twfy_debug ("TIME", "Postcode $postcode looked up last time, is " . ( is_array($return_value) ? implode(', ', $return_value) : $return_value ));
+            twfy_debug("TIME", "Postcode $postcode looked up last time, is ".(is_array($return_value) ? implode(', ', $return_value) : $return_value));
             return $return_value;
         }
 
@@ -75,11 +75,11 @@ 
             $name = $q->field(0, 'name');
             if (self::postcodeIsScottish($postcode)) {
                 $name = explode('|', $name);
-                if (count($name)==3)
+                if (count($name) == 3)
                     return array('WMC' => $name[0], 'SPC' => $name[1], 'SPE' => $name[2]);
             } elseif (self::postcodeIsNi($postcode)) {
                 $name = explode('|', $name);
-                if (count($name)==2)
+                if (count($name) == 2)
                     return array('WMC' => $name[0], 'NIE' => $name[1]);
             } else {
                 return array('WMC' => $name);
@@ -97,8 +97,8 @@ 
         if (!defined('OPTION_MAPIT_URL') || !OPTION_MAPIT_URL) {
             return '';
         }
-        $filename = 'postcode/' . rawurlencode($postcode);
-        $ch = curl_init(OPTION_MAPIT_URL . $filename);
+        $filename = 'postcode/'.rawurlencode($postcode);
+        $ch = curl_init(OPTION_MAPIT_URL.$filename);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 20);
         curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
@@ -106,14 +106,14 @@ 
         $file = curl_exec($ch);
         if (curl_errno($ch)) {
             $errno = curl_errno($ch);
-            trigger_error("Postcode database: " . $errno . ' ' . curl_error($ch), E_USER_WARNING);
+            trigger_error("Postcode database: ".$errno.' '.curl_error($ch), E_USER_WARNING);
             return 'CONNECTION_TIMED_OUT';
         }
         curl_close($ch);
 
         $r = json_decode($file, true);
         if (!$r) {
-            trigger_error("Postcode database is not working. Content:\n".$file.", request: ". $filename, E_USER_WARNING);
+            trigger_error("Postcode database is not working. Content:\n".$file.", request: ".$filename, E_USER_WARNING);
             return '';
         }
         if (isset($r['error']) || !isset($r['areas'])) {
@@ -179,29 +179,29 @@ 
         if (in_array($m[1], array('AB', 'DD', 'EH', 'FK', 'G', 'HS', 'IV', 'KA', 'KW', 'KY', 'ML', 'PA', 'PH', 'ZE')))
             return true;
 
-        if ($m[1]=='DG') {
-            if ($m[2]==16 && $m[3]==5 && in_array($m[4], array('HT','HU','HZ','JA','JB'))) return false; # A few postcodes in England
+        if ($m[1] == 'DG') {
+            if ($m[2] == 16 && $m[3] == 5 && in_array($m[4], array('HT', 'HU', 'HZ', 'JA', 'JB'))) return false; # A few postcodes in England
             return true;
         }
 
         # Damn postcodes crossing country boundaries
-        if ($m[1]=='TD') {
-            if ($m[2]!=15 && $m[2]!=12 && $m[2]!=9) return true; # TD1-8, 10-11, 13-14 all in Scotland
-            if ($m[2]==9) {
-                if ($m[3]!=0) return true; # TD9 1-9 all in Scotland
-                if (!in_array($m[4], array('TJ','TP','TR','TS','TT','TU','TW'))) return true; # Nearly all of TD9 0 in Scotland
+        if ($m[1] == 'TD') {
+            if ($m[2] != 15 && $m[2] != 12 && $m[2] != 9) return true; # TD1-8, 10-11, 13-14 all in Scotland
+            if ($m[2] == 9) {
+                if ($m[3] != 0) return true; # TD9 1-9 all in Scotland
+                if (!in_array($m[4], array('TJ', 'TP', 'TR', 'TS', 'TT', 'TU', 'TW'))) return true; # Nearly all of TD9 0 in Scotland
             }
             $m[5] = substr($m[4], 0, 1);
-            if ($m[2]==12) { # $m[3] will be 4 currently.
-                if ($m[4]=='XE') return true;
-                if (in_array($m[5], array('A','B','D','E','H','J','L','N','W','Y'))) return true; # These bits of TD12 4 are in Scotland, others (Q, R, S, T, U, X) in England
+            if ($m[2] == 12) { # $m[3] will be 4 currently.
+                if ($m[4] == 'XE') return true;
+                if (in_array($m[5], array('A', 'B', 'D', 'E', 'H', 'J', 'L', 'N', 'W', 'Y'))) return true; # These bits of TD12 4 are in Scotland, others (Q, R, S, T, U, X) in England
             }
             # TD15 is mostly England
-            if ($m[2]==15) {
-                if ($m[3]!=1) return false; # TD15 2 and 9 are in England
-                if (in_array($m[4], array('BT','SU','SZ','UF','UG','UH','UJ','UL','US','UZ','WY','WZ'))) return true;
-                if ($m[5]=='T' && $m[4]!='TA' && $m[4]!='TB') return true; # Most of TD15 1T* in Scotland
-                if ($m[5]=='X' && $m[4]!='XX') return true; # TD15 1XX in England, rest of TD15 1X* in Scotland
+            if ($m[2] == 15) {
+                if ($m[3] != 1) return false; # TD15 2 and 9 are in England
+                if (in_array($m[4], array('BT', 'SU', 'SZ', 'UF', 'UG', 'UH', 'UJ', 'UL', 'US', 'UZ', 'WY', 'WZ'))) return true;
+                if ($m[5] == 'T' && $m[4] != 'TA' && $m[4] != 'TB') return true; # Most of TD15 1T* in Scotland
+                if ($m[5] == 'X' && $m[4] != 'XX') return true; # TD15 1XX in England, rest of TD15 1X* in Scotland
             }
         }
 

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

@@ -39,7 +39,7 @@
 
         if ($last_postcode == $postcode) {
             $return_value = $mp_only ? $last_postcode_value['WMC'] : $last_postcode_value;
-            twfy_debug ("TIME", "Postcode $postcode looked up last time, is " . ( is_array($return_value) ? implode(', ', $return_value) : $return_value ));
+            twfy_debug ("TIME", "postcode $postcode looked up last time, is " . ( is_array($return_value) ? implode(', ', $return_value) : $return_value ));
             return $return_value;
         }
 

Braces +59 added lines, -23 removed lines

@@ -52,7 +52,9 @@ 
             $ret = self::postcodeFetchFromMapit($postcode);
         }
 
-        if (is_string($ret)) return $ret;
+        if (is_string($ret)) {
+            return $ret;
+        }
 
         $last_postcode = $postcode;
         $last_postcode_value = $ret;
@@ -75,12 +77,14 @@ 
             $name = $q->field(0, 'name');
             if (self::postcodeIsScottish($postcode)) {
                 $name = explode('|', $name);
-                if (count($name)==3)
-                    return array('WMC' => $name[0], 'SPC' => $name[1], 'SPE' => $name[2]);
+                if (count($name)==3) {
+                                    return array('WMC' => $name[0], 'SPC' => $name[1], 'SPE' => $name[2]);
+                }
             } elseif (self::postcodeIsNi($postcode)) {
                 $name = explode('|', $name);
-                if (count($name)==2)
-                    return array('WMC' => $name[0], 'NIE' => $name[1]);
+                if (count($name)==2) {
+                                    return array('WMC' => $name[0], 'NIE' => $name[1]);
+                }
             } else {
                 return array('WMC' => $name);
             }
@@ -121,8 +125,9 @@ 
         }
         $areas = array();
         foreach ($r['areas'] as $row) {
-            if (in_array($row['type'], array('WMC', 'SPC', 'SPE', 'NIE')))
-                $areas[$row['type']] = $row['name'];
+            if (in_array($row['type'], array('WMC', 'SPC', 'SPE', 'NIE'))) {
+                            $areas[$row['type']] = $row['name'];
+            }
         }
 
         if (!isset($areas['WMC'])) {
@@ -172,36 +177,66 @@ 
      */
 
     public static function postcodeIsScottish($pc) {
-        if (!preg_match('#^([A-Z]{1,2})(\d+) (\d)([A-Z]{2})#', self::canonicalisePostcode($pc), $m))
-            return false;
+        if (!preg_match('#^([A-Z]{1,2})(\d+) (\d)([A-Z]{2})#', self::canonicalisePostcode($pc), $m)) {
+                    return false;
+        }
 
         # Check for Scottish postal areas
-        if (in_array($m[1], array('AB', 'DD', 'EH', 'FK', 'G', 'HS', 'IV', 'KA', 'KW', 'KY', 'ML', 'PA', 'PH', 'ZE')))
-            return true;
+        if (in_array($m[1], array('AB', 'DD', 'EH', 'FK', 'G', 'HS', 'IV', 'KA', 'KW', 'KY', 'ML', 'PA', 'PH', 'ZE'))) {
+                    return true;
+        }
 
         if ($m[1]=='DG') {
-            if ($m[2]==16 && $m[3]==5 && in_array($m[4], array('HT','HU','HZ','JA','JB'))) return false; # A few postcodes in England
+            if ($m[2]==16 && $m[3]==5 && in_array($m[4], array('HT','HU','HZ','JA','JB'))) {
+                return false;
+            }
+            # A few postcodes in England
             return true;
         }
 
         # Damn postcodes crossing country boundaries
         if ($m[1]=='TD') {
-            if ($m[2]!=15 && $m[2]!=12 && $m[2]!=9) return true; # TD1-8, 10-11, 13-14 all in Scotland
+            if ($m[2]!=15 && $m[2]!=12 && $m[2]!=9) {
+                return true;
+            }
+            # TD1-8, 10-11, 13-14 all in Scotland
             if ($m[2]==9) {
-                if ($m[3]!=0) return true; # TD9 1-9 all in Scotland
-                if (!in_array($m[4], array('TJ','TP','TR','TS','TT','TU','TW'))) return true; # Nearly all of TD9 0 in Scotland
+                if ($m[3]!=0) {
+                    return true;
+                }
+                # TD9 1-9 all in Scotland
+                if (!in_array($m[4], array('TJ','TP','TR','TS','TT','TU','TW'))) {
+                    return true;
+                }
+                # Nearly all of TD9 0 in Scotland
             }
             $m[5] = substr($m[4], 0, 1);
             if ($m[2]==12) { # $m[3] will be 4 currently.
-                if ($m[4]=='XE') return true;
-                if (in_array($m[5], array('A','B','D','E','H','J','L','N','W','Y'))) return true; # These bits of TD12 4 are in Scotland, others (Q, R, S, T, U, X) in England
+                if ($m[4]=='XE') {
+                    return true;
+                }
+                if (in_array($m[5], array('A','B','D','E','H','J','L','N','W','Y'))) {
+                    return true;
+                }
+                # These bits of TD12 4 are in Scotland, others (Q, R, S, T, U, X) in England
             }
             # TD15 is mostly England
             if ($m[2]==15) {
-                if ($m[3]!=1) return false; # TD15 2 and 9 are in England
-                if (in_array($m[4], array('BT','SU','SZ','UF','UG','UH','UJ','UL','US','UZ','WY','WZ'))) return true;
-                if ($m[5]=='T' && $m[4]!='TA' && $m[4]!='TB') return true; # Most of TD15 1T* in Scotland
-                if ($m[5]=='X' && $m[4]!='XX') return true; # TD15 1XX in England, rest of TD15 1X* in Scotland
+                if ($m[3]!=1) {
+                    return false;
+                }
+                # TD15 2 and 9 are in England
+                if (in_array($m[4], array('BT','SU','SZ','UF','UG','UH','UJ','UL','US','UZ','WY','WZ'))) {
+                    return true;
+                }
+                if ($m[5]=='T' && $m[4]!='TA' && $m[4]!='TB') {
+                    return true;
+                }
+                # Most of TD15 1T* in Scotland
+                if ($m[5]=='X' && $m[4]!='XX') {
+                    return true;
+                }
+                # TD15 1XX in England, rest of TD15 1X* in Scotland
             }
         }
 
@@ -215,8 +250,9 @@ 
 
     public static function postcodeIsNi($pc) {
         $prefix = substr(self::canonicalisePostcode($pc), 0, 2);
-        if ($prefix == 'BT')
-            return true;
+        if ($prefix == 'BT') {
+                    return true;
+        }
         return false;
     }
 

classes/Utility/Video.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     public static function object($video_id, $start, $gid, $stamping = '', $pid = 0) {
         $flashvars = "gid=$gid&file=$video_id&start=$start";
         if ($stamping) $flashvars .= '&stamping=1';
-        if ($pid) $flashvars .= '&pid=' . $pid;
+        if ($pid) $flashvars .= '&pid='.$pid;
 /*
 <object width='360' height='300'
     classid='clsid:D27CDB6E-AE6D-11cf-96B8-444553540000'

Braces +10 added lines, -4 removed lines

@@ -19,7 +19,9 @@ 
     }
 
     public static function fromTimestamp($videodb, $date, $time) {
-        if (!$videodb) return null;
+        if (!$videodb) {
+            return null;
+        }
         date_default_timezone_set('Europe/London');
         $epoch = strtotime("$date $time");
         $timestamp = gmdate('c', $epoch);
@@ -38,9 +40,13 @@ 
 
     public static function object($video_id, $start, $gid, $stamping = '', $pid = 0) {
         $flashvars = "gid=$gid&file=$video_id&start=$start";
-        if ($stamping) $flashvars .= '&stamping=1';
-        if ($pid) $flashvars .= '&pid=' . $pid;
-/*
+        if ($stamping) {
+            $flashvars .= '&stamping=1';
+        }
+        if ($pid) {
+            $flashvars .= '&pid=' . $pid;
+        }
+        /*
 <object width='360' height='300'
     classid='clsid:D27CDB6E-AE6D-11cf-96B8-444553540000'
     codebase='http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,0,0'>

classes/Utility/Hansard.php

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
         $parts = parse_url($url);
         parse_str($parts['query'], $query);
 
-        if ( $query['id'] ) {
+        if ($query['id']) {
             if (strpos($parts['path'], 'lords') !== false) {
                 $gid = 'uk.org.publicwhip/lords/';
             } elseif (strpos($parts['path'], 'whall') !== false) {
@@ -30,13 +30,13 @@ 
 
 
     public static function gid_to_url($gid) {
-        if ( !$gid ) {
+        if (!$gid) {
             return '';
         }
         global $hansardmajors;
         $db = new \ParlDB();
 
-        $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", array( ':gid' => $gid ));
+        $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", array(':gid' => $gid));
         $url_gid = fix_gid_from_db($gid);
         $url = new \URL($hansardmajors[$q->field(0, 'major')]['page']);
         $url->insert(array('id' => $url_gid));

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

@@ -11,7 +11,7 @@
 class Hansard
 {
     public static function get_gid_from_url($url) {
-        $gid = NULL;
+        $gid = null;
         $parts = parse_url($url);
         parse_str($parts['query'], $query);
 

classes/Utility/Wikipedia.php

Indentation +37 added lines, -37 removed lines

@@ -136,63 +136,63 @@
 
     public static function antiTagInTag($content = '', $format = 'htmlhead')
     {
-      $contentwalker = 0;
-      $length = strlen( $content );
-      $tagend = -1;
-      for( $tagstart = strpos( $content, '<', $tagend + 1 ) ; $tagstart !== false && $tagstart < strlen( $content ); $tagstart = strpos( $content, '<', $tagend ) )
+        $contentwalker = 0;
+        $length = strlen( $content );
+        $tagend = -1;
+        for( $tagstart = strpos( $content, '<', $tagend + 1 ) ; $tagstart !== false && $tagstart < strlen( $content ); $tagstart = strpos( $content, '<', $tagend ) )
         {
-          // got the start of a tag.  Now find the proper end!
-          $walker = $tagstart + 1;
-          $open = 1;
-          while( $open != 0 && $walker < strlen( $content ) )
+            // got the start of a tag.  Now find the proper end!
+            $walker = $tagstart + 1;
+            $open = 1;
+            while( $open != 0 && $walker < strlen( $content ) )
         {
-          $nextopen = strpos( $content, '<', $walker );
-          $nextclose = strpos( $content, '>', $walker );
-          if( $nextclose === false )
+            $nextopen = strpos( $content, '<', $walker );
+            $nextclose = strpos( $content, '>', $walker );
+            if( $nextclose === false )
             {    // ERROR! Open waka without close waka!
-              // echo '<code>Error in antiTagInTag - malformed tag!</code> ';
-              return $content;
+                // echo '<code>Error in antiTagInTag - malformed tag!</code> ';
+                return $content;
             }
-          if( $nextopen === false || $nextopen > $nextclose )
+            if( $nextopen === false || $nextopen > $nextclose )
             { // No more opens, but there was a close; or, a close happens before the next open.
-              // walker goes to the close+1, and open decrements
-              $open --;
-              $walker = $nextclose + 1;
+                // walker goes to the close+1, and open decrements
+                $open --;
+                $walker = $nextclose + 1;
             }
-          elseif( $nextopen < $nextclose )
+            elseif( $nextopen < $nextclose )
             { // an open before the next close
-              $open ++;
-              $walker = $nextopen + 1;
+                $open ++;
+                $walker = $nextopen + 1;
             }
         }
-          $tagend = $walker;
-          if( $tagend > strlen( $content ) )
+            $tagend = $walker;
+            if( $tagend > strlen( $content ) )
         $tagend = strlen( $content );
-          else
+            else
         {
-          $tagend --;
-          $tagstart ++;
+            $tagend --;
+            $tagstart ++;
         }
-          $tag = substr( $content, $tagstart, $tagend - $tagstart );
-          $tags[] = '<' . $tag . '>';
+            $tag = substr( $content, $tagstart, $tagend - $tagstart );
+            $tags[] = '<' . $tag . '>';
 
-          if (function_exists('format_to_output')) {
+            if (function_exists('format_to_output')) {
             $newtag = format_to_output($tag, $format);
-          } else {
+            } else {
             $newtag = strip_tags($tag);
-          }
+            }
 
-          $newtags[] = '<' . $newtag . '>';
+            $newtags[] = '<' . $newtag . '>';
 
-          if (function_exists('format_to_output')) {
+            if (function_exists('format_to_output')) {
             $newtag = format_to_output($tag, $format);
-          } else {
+            } else {
             $newtag = strip_tags($tag);
-          }
+            }
+        }
+        if (isset($tags)&&isset($newtags)) {
+        $content = str_replace($tags, $newtags, $content);
         }
-      if (isset($tags)&&isset($newtags)) {
-      $content = str_replace($tags, $newtags, $content);
-      }
 
     return $content;
 

Spacing +23 added lines, -23 removed lines

@@ -73,7 +73,7 @@ 
         // Assemble the resulting phrases into a parameter array
         $params = array();
         foreach ($phrases as $i => $phrase) {
-            $params[':phrase' . $i] = $phrase;
+            $params[':phrase'.$i] = $phrase;
         }
 
         # Open up a db connection, and whittle our list down even further, against
@@ -81,9 +81,9 @@ 
         $matched = array();
         $db = new \ParlDB;
         $source = explode('|||', $source);
-        $q = $db->query("SELECT titles.title FROM titles LEFT JOIN titles_ignored ON titles.title=titles_ignored.title WHERE titles.title IN (" . join(',', array_keys($params)) . ") AND titles_ignored.title IS NULL", $params);
+        $q = $db->query("SELECT titles.title FROM titles LEFT JOIN titles_ignored ON titles.title=titles_ignored.title WHERE titles.title IN (".join(',', array_keys($params)).") AND titles_ignored.title IS NULL", $params);
         $phrases = array();
-        for ($i=0; $i<$q->rows(); $i++) {
+        for ($i = 0; $i < $q->rows(); $i++) {
             $phrases[] = $q->field($i, 'title');
         }
 
@@ -105,8 +105,8 @@ 
 
             twfy_debug("WIKIPEDIA", "Matched '$phrase'");
             # 1 means only replace one match for phrase per paragraph
-            $source = preg_replace ('{
-            \b(' . $phrase_re . ')\b # Match the phrase itself
+            $source = preg_replace('{
+            \b(' . $phrase_re.')\b # Match the phrase itself
             (?!                      # Match as long as the following does *not* apply:
                 (?:                  #   Match, possessively, as many strings of:
                  [^<]+               #     non-"<" characters,
@@ -137,44 +137,44 @@ 
     public static function antiTagInTag($content = '', $format = 'htmlhead')
     {
       $contentwalker = 0;
-      $length = strlen( $content );
+      $length = strlen($content);
       $tagend = -1;
-      for( $tagstart = strpos( $content, '<', $tagend + 1 ) ; $tagstart !== false && $tagstart < strlen( $content ); $tagstart = strpos( $content, '<', $tagend ) )
+      for ($tagstart = strpos($content, '<', $tagend + 1); $tagstart !== false && $tagstart < strlen($content); $tagstart = strpos($content, '<', $tagend))
         {
           // got the start of a tag.  Now find the proper end!
           $walker = $tagstart + 1;
           $open = 1;
-          while( $open != 0 && $walker < strlen( $content ) )
+          while ($open != 0 && $walker < strlen($content))
         {
-          $nextopen = strpos( $content, '<', $walker );
-          $nextclose = strpos( $content, '>', $walker );
-          if( $nextclose === false )
+          $nextopen = strpos($content, '<', $walker);
+          $nextclose = strpos($content, '>', $walker);
+          if ($nextclose === false)
             {    // ERROR! Open waka without close waka!
               // echo '<code>Error in antiTagInTag - malformed tag!</code> ';
               return $content;
             }
-          if( $nextopen === false || $nextopen > $nextclose )
+          if ($nextopen === false || $nextopen > $nextclose)
             { // No more opens, but there was a close; or, a close happens before the next open.
               // walker goes to the close+1, and open decrements
-              $open --;
+              $open--;
               $walker = $nextclose + 1;
             }
-          elseif( $nextopen < $nextclose )
+          elseif ($nextopen < $nextclose)
             { // an open before the next close
-              $open ++;
+              $open++;
               $walker = $nextopen + 1;
             }
         }
           $tagend = $walker;
-          if( $tagend > strlen( $content ) )
-        $tagend = strlen( $content );
+          if ($tagend > strlen($content))
+        $tagend = strlen($content);
           else
         {
-          $tagend --;
-          $tagstart ++;
+          $tagend--;
+          $tagstart++;
         }
-          $tag = substr( $content, $tagstart, $tagend - $tagstart );
-          $tags[] = '<' . $tag . '>';
+          $tag = substr($content, $tagstart, $tagend - $tagstart);
+          $tags[] = '<'.$tag.'>';
 
           if (function_exists('format_to_output')) {
             $newtag = format_to_output($tag, $format);
@@ -182,7 +182,7 @@ 
             $newtag = strip_tags($tag);
           }
 
-          $newtags[] = '<' . $newtag . '>';
+          $newtags[] = '<'.$newtag.'>';
 
           if (function_exists('format_to_output')) {
             $newtag = format_to_output($tag, $format);
@@ -190,7 +190,7 @@ 
             $newtag = strip_tags($tag);
           }
         }
-      if (isset($tags)&&isset($newtags)) {
+      if (isset($tags) && isset($newtags)) {
       $content = str_replace($tags, $newtags, $content);
       }
 

Braces +10 added lines, -9 removed lines

@@ -99,8 +99,9 @@ 
 
             # See if already matched a string this one is contained within
             foreach ($matched as $got) {
-                if (strstr($got, $phrase))
-                    continue 2;
+                if (strstr($got, $phrase)) {
+                                    continue 2;
+                }
             }
 
             twfy_debug("WIKIPEDIA", "Matched '$phrase'");
@@ -119,8 +120,9 @@ 
             array_push($matched, $phrase);
         }
 
-        if (!$was_array)
-            $source = join('|||', $source);
+        if (!$was_array) {
+                    $source = join('|||', $source);
+        }
 
         return $source;
 
@@ -158,17 +160,16 @@ 
               // walker goes to the close+1, and open decrements
               $open --;
               $walker = $nextclose + 1;
-            }
-          elseif( $nextopen < $nextclose )
+            } elseif( $nextopen < $nextclose )
             { // an open before the next close
               $open ++;
               $walker = $nextopen + 1;
             }
         }
           $tagend = $walker;
-          if( $tagend > strlen( $content ) )
-        $tagend = strlen( $content );
-          else
+          if( $tagend > strlen( $content ) ) {
+                  $tagend = strlen( $content );
+          } else
         {
           $tagend --;
           $tagstart ++;

classes/Utility/Calendar.php

Spacing +7 added lines, -7 removed lines

@@ -52,15 +52,15 @@ 
         list($title, $meta) = self::meta($e);
 
         if (strstr($e['chamber'], 'Select Committee')) {
-            print '<dt class="sc" id="cal' . $e['id'] . '">';
+            print '<dt class="sc" id="cal'.$e['id'].'">';
         } else {
-            print '<li id="cal' . $e['id'] . '">';
+            print '<li id="cal'.$e['id'].'">';
         }
 
         print "$title ";
 
         if ($meta) {
-            print '<span>' . join('; ', $meta) . '</span>';
+            print '<span>'.join('; ', $meta).'</span>';
         }
 
         if (strstr($e['chamber'], 'Select Committee')) {
@@ -73,7 +73,7 @@ 
             print "<dd>";
             print '<a href=" $e[link_calendar] "></a>';
             print '<a href=" $e[link_external] "></a>';
-            print 'Witnesses: ' . $e['witnesses'];
+            print 'Witnesses: '.$e['witnesses'];
             print "</dd>\n";
         }
     }
@@ -84,14 +84,14 @@ 
             $title = $e['committee_name'];
             if ($e['title'] == 'to consider the Bill') {
             } elseif ($e['title'] && $e['title'] != 'This is a private meeting.') {
-                $title .= ': ' . $e['title'];
+                $title .= ': '.$e['title'];
             } else {
                 $private = true;
             }
         } else {
             $title = $e['title'];
             if ($pid = $e['person_id']) {
-                $MEMBER = new \MEMBER(array( 'person_id' => $pid ));
+                $MEMBER = new \MEMBER(array('person_id' => $pid));
                 $name = $MEMBER->full_name();
                 $title .= " &#8211; <a href='/mp/?p=$pid'>$name</a>";
             }
@@ -115,7 +115,7 @@ 
                 $time = format_time($e['time_start'], TIMEFORMAT);
 
                 if ($e['time_end']) {
-                    $time .= ' &#8211; ' . format_time($e['time_end'], TIMEFORMAT);
+                    $time .= ' &#8211; '.format_time($e['time_end'], TIMEFORMAT);
                 }
 
                 $meta[] = $time;

classes/Utility/Constituencies.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
         if ($q1->rows <= 0)
             return false;
 
-        $query = "select name from constituency where main_name and cons_id = '".$q1->field(0,'cons_id')."'";
+        $query = "select name from constituency where main_name and cons_id = '".$q1->field(0, 'cons_id')."'";
         $q2 = $db->query($query);
         if ($q2->rows <= 0)
             return false;

Braces +6 added lines, -4 removed lines

@@ -31,13 +31,15 @@
         $q1 = $db->query($query, array(
             ':name' => $name
             ));
-        if ($q1->rows <= 0)
-            return false;
+        if ($q1->rows <= 0) {
+                    return false;
+        }
 
         $query = "select name from constituency where main_name and cons_id = '".$q1->field(0,'cons_id')."'";
         $q2 = $db->query($query);
-        if ($q2->rows <= 0)
-            return false;
+        if ($q2->rows <= 0) {
+                    return false;
+        }
 
         return $q2->field(0, "name");
     }

classes/Utility/Member.php

Spacing +16 added lines, -16 removed lines

@@ -25,23 +25,23 @@ 
 
     public static function findMemberImage($pid, $smallonly = false, $substitute_missing = false) {
         $image = null; $sz = null;
-        if (!$smallonly && is_file(BASEDIR . '/images/mpsL/' . $pid . '.jpeg')) {
-            $image = IMAGEPATH . 'mpsL/' . $pid . '.jpeg';
+        if (!$smallonly && is_file(BASEDIR.'/images/mpsL/'.$pid.'.jpeg')) {
+            $image = IMAGEPATH.'mpsL/'.$pid.'.jpeg';
             $sz = 'L';
-        } elseif (!$smallonly && is_file(BASEDIR . '/images/mpsL/' . $pid . '.jpg')) {
-            $image = IMAGEPATH . 'mpsL/' . $pid . '.jpg';
+        } elseif (!$smallonly && is_file(BASEDIR.'/images/mpsL/'.$pid.'.jpg')) {
+            $image = IMAGEPATH.'mpsL/'.$pid.'.jpg';
             $sz = 'L';
-        } elseif (!$smallonly && is_file(BASEDIR . '/images/mpsL/' . $pid . '.png')) {
-            $image = IMAGEPATH . 'mpsL/' . $pid . '.png';
+        } elseif (!$smallonly && is_file(BASEDIR.'/images/mpsL/'.$pid.'.png')) {
+            $image = IMAGEPATH.'mpsL/'.$pid.'.png';
             $sz = 'L';
-        } elseif (is_file(BASEDIR . '/images/mps/' . $pid . '.jpeg')) {
-            $image = IMAGEPATH . 'mps/' . $pid . '.jpeg';
+        } elseif (is_file(BASEDIR.'/images/mps/'.$pid.'.jpeg')) {
+            $image = IMAGEPATH.'mps/'.$pid.'.jpeg';
             $sz = 'S';
-        } elseif (is_file(BASEDIR . '/images/mps/' . $pid . '.jpg')) {
-            $image = IMAGEPATH . 'mps/' . $pid . '.jpg';
+        } elseif (is_file(BASEDIR.'/images/mps/'.$pid.'.jpg')) {
+            $image = IMAGEPATH.'mps/'.$pid.'.jpg';
             $sz = 'S';
-        } elseif (is_file(BASEDIR . '/images/mps/' . $pid . '.png')) {
-            $image = IMAGEPATH . 'mps/' . $pid . '.png';
+        } elseif (is_file(BASEDIR.'/images/mps/'.$pid.'.png')) {
+            $image = IMAGEPATH.'mps/'.$pid.'.png';
             $sz = 'S';
         }
 
@@ -49,16 +49,16 @@ 
         if (!$image && $substitute_missing) {
             if ($smallonly) {
                 if ($substitute_missing === "lord") {
-                    $image = IMAGEPATH . "unknownlord.png";
+                    $image = IMAGEPATH."unknownlord.png";
                 } else {
-                    $image = IMAGEPATH . "unknownperson.png";
+                    $image = IMAGEPATH."unknownperson.png";
                 }
                 $sz = 'S';
             } else {
                 if ($substitute_missing === "lord") {
-                    $image = IMAGEPATH . "unknownlord_large.png";
+                    $image = IMAGEPATH."unknownlord_large.png";
                 } else {
-                    $image = IMAGEPATH . "unknownperson_large.png";
+                    $image = IMAGEPATH."unknownperson_large.png";
                 }
                 $sz = 'L';
             }

classes/Utility/Search.php

Spacing +30 added lines, -30 removed lines

@@ -14,7 +14,7 @@ 
         $data = array();
         $SEARCHENGINE = new \SEARCHENGINE($search);
         $data['pagetitle'] = $SEARCHENGINE->query_description_short();
-        $SEARCHENGINE = new \SEARCHENGINE($search . ' groupby:speech');
+        $SEARCHENGINE = new \SEARCHENGINE($search.' groupby:speech');
         $count = $SEARCHENGINE->run_count(0, 5000, 'date');
         if ($count <= 0) {
             $data['error'] = 'No results';
@@ -35,8 +35,8 @@ 
         $speaker_count = array();
         $gids = join('","', $gids);
         $db = new \ParlDB;
-        $q = $db->query('SELECT gid,person_id,hdate FROM hansard WHERE gid IN ("' . $gids . '")');
-        for ($n=0; $n<$q->rows(); $n++) {
+        $q = $db->query('SELECT gid,person_id,hdate FROM hansard WHERE gid IN ("'.$gids.'")');
+        for ($n = 0; $n < $q->rows(); $n++) {
             $gid = $q->field($n, 'gid');
             $person_id = $q->field($n, 'person_id');
             $hdate = $q->field($n, 'hdate');
@@ -60,10 +60,10 @@ 
                                 moffice_id, dept, position, from_date, to_date, left_house
                             FROM member LEFT JOIN moffice ON member.person_id = moffice.person
                                 JOIN person_names pn ON member.person_id = pn.person_id AND pn.type="name" AND pn.start_date <= left_house AND left_house <= pn.end_date
-                            WHERE member.person_id IN (' . $person_ids . ')
-                            ' . ($house ? " AND house=$house" : '') . '
+                            WHERE member.person_id IN (' . $person_ids.')
+                            ' . ($house ? " AND house=$house" : '').'
                             ORDER BY left_house DESC');
-            for ($n=0; $n<$q->rows(); $n++) {
+            for ($n = 0; $n < $q->rows(); $n++) {
                 $mid = $q->field($n, 'member_id');
                 if (!isset($pids[$mid])) {
                     $title = $q->field($n, 'title');
@@ -84,9 +84,9 @@ 
                 if ($dept && $q->field($n, 'to_date') == '9999-12-31')
                     $speakers[$pid]['office'][$moffice_id] = prettify_office($posn, $dept);
                 if (!isset($speakers[$pid]['name'])) {
-                    $speakers[$pid]['name'] = $full_name . ($house==1?' MP':'');
+                    $speakers[$pid]['name'] = $full_name.($house == 1 ? ' MP' : '');
                 }
-                if ( !isset($speakers[$pid]['party']) && $party ) {
+                if (!isset($speakers[$pid]['party']) && $party) {
                     $speakers[$pid]['party'] = $party;
                 }
             }
@@ -139,20 +139,20 @@ 
      * Return query result from looking for MPs
      */
 
-    public static function searchMemberDbLookup($searchstring, $current_only=false) {
+    public static function searchMemberDbLookup($searchstring, $current_only = false) {
         if (!$searchstring) return false;
         $searchwords = explode(' ', $searchstring, 3);
         $params = array();
         if (count($searchwords) == 1) {
-            $params[':like_0'] = '%' . $searchwords[0] . '%';
+            $params[':like_0'] = '%'.$searchwords[0].'%';
             $where = "given_name LIKE :like_0 OR family_name LIKE :like_0 OR lordofname LIKE :like_0";
         } elseif (count($searchwords) == 2) {
             // We don't do anything special if there are more than two search words.
             // And here we're assuming the user's put the names in the right order.
-            $params[':like_0'] = '%' . $searchwords[0] . '%';
-            $params[':like_1'] = '%' . $searchwords[1] . '%';
-            $params[':like_0_and_1'] = '%' . $searchwords[0] . ' '. $searchwords[1] . '%';
-            $params[':like_0_and_1_hyphen'] = '%' . $searchwords[0] . '-'. $searchwords[1] . '%';
+            $params[':like_0'] = '%'.$searchwords[0].'%';
+            $params[':like_1'] = '%'.$searchwords[1].'%';
+            $params[':like_0_and_1'] = '%'.$searchwords[0].' '.$searchwords[1].'%';
+            $params[':like_0_and_1_hyphen'] = '%'.$searchwords[0].'-'.$searchwords[1].'%';
             $where = "(given_name LIKE :like_0 AND family_name LIKE :like_1)";
             $where .= " OR (given_name LIKE :like_1 AND family_name LIKE :like_0)";
             $where .= " OR (title LIKE :like_0 AND family_name LIKE :like_1)";
@@ -164,12 +164,12 @@ 
             }
         } else {
             $searchwords[2] = str_replace('of ', '', $searchwords[2]);
-            $params[':like_0'] = '%' . $searchwords[0] . '%';
-            $params[':like_1'] = '%' . $searchwords[1] . '%';
-            $params[':like_2'] = '%' . $searchwords[2] . '%';
-            $params[':like_0_and_1'] = '%' . $searchwords[0] . ' '. $searchwords[1] . '%';
-            $params[':like_1_and_2'] = '%' . $searchwords[1] . ' '. $searchwords[2] . '%';
-            $params[':like_1_and_2_hyphen'] = '%' . $searchwords[1] . '-'. $searchwords[2] . '%';
+            $params[':like_0'] = '%'.$searchwords[0].'%';
+            $params[':like_1'] = '%'.$searchwords[1].'%';
+            $params[':like_2'] = '%'.$searchwords[2].'%';
+            $params[':like_0_and_1'] = '%'.$searchwords[0].' '.$searchwords[1].'%';
+            $params[':like_1_and_2'] = '%'.$searchwords[1].' '.$searchwords[2].'%';
+            $params[':like_1_and_2_hyphen'] = '%'.$searchwords[1].'-'.$searchwords[2].'%';
             $where = "(given_name LIKE :like_0_and_1 AND family_name LIKE :like_2)";
             $where .= " OR (given_name LIKE :like_0 AND family_name LIKE :like_1_and_2)";
             $where .= " OR (given_name LIKE :like_0 AND family_name LIKE :like_1_and_2_hyphen)";
@@ -184,15 +184,15 @@ 
         return $q;
     }
 
-    public static function searchMemberDbLookupWithNames($searchstring, $current_only=false) {
+    public static function searchMemberDbLookupWithNames($searchstring, $current_only = false) {
         $q = self::searchMemberDbLookup($searchstring, $current_only);
 
-        if ( !$q->rows ) {
+        if (!$q->rows) {
             return $q;
         }
 
         $person_ids = array();
-        for ($i=0; $i<$q->rows(); ++$i) {
+        for ($i = 0; $i < $q->rows(); ++$i) {
             $pid = $q->field($i, 'person_id');
             $person_ids[$pid] = 1;
         }
@@ -239,7 +239,7 @@ 
             // Looks like a postcode - can we find the constituency?
             $constituency = Postcode::postcodeToConstituency($searchterm);
             if ($constituency) {
-                return array( array($constituency), true );
+                return array(array($constituency), true);
             }
         }
 
@@ -250,14 +250,14 @@ 
             from constituency AS o where name like :try
             and from_date <= date(now()) and date(now()) <= to_date";
         $db = new \ParlDB;
-        $q = $db->query($query, array(':try' => '%' . $try . '%'));
+        $q = $db->query($query, array(':try' => '%'.$try.'%'));
 
         $constituencies = array();
-        for ($n=0; $n<$q->rows(); $n++) {
+        for ($n = 0; $n < $q->rows(); $n++) {
             $constituencies[] = $q->field($n, 'name');
         }
 
-        return array( $constituencies, false );
+        return array($constituencies, false);
     }
 
     /**
@@ -273,7 +273,7 @@ 
         $speakers = [];
 
         foreach ($criteria as $c) {
-            if (preg_match('#^speaker:(\d+)#',$c,$m)) {
+            if (preg_match('#^speaker:(\d+)#', $c, $m)) {
                 $MEMBER = new \MEMBER(array('person_id'=>$m[1]));
                 $speakers[$m[1]] = $MEMBER->full_name();
             }
@@ -292,8 +292,8 @@ 
     public static function speakerIDsToNames($searchstring) {
         $speakers = self::speakerNamesForIDs($searchstring);
 
-        foreach ( $speakers as $id => $name ) {
-            $searchstring = str_replace('speaker:' . $id, "speaker:$name", $searchstring);
+        foreach ($speakers as $id => $name) {
+            $searchstring = str_replace('speaker:'.$id, "speaker:$name", $searchstring);
         }
 
         return $searchstring;

Braces +15 added lines, -7 removed lines

@@ -28,8 +28,9 @@ 
 
             return $data;
         }
-        if (count($gids) == 5000)
-            $data['limit_reached'] = true;
+        if (count($gids) == 5000) {
+                    $data['limit_reached'] = true;
+        }
 
         # Fetch all the speakers of the results, count them up and get min/max date usage
         $speaker_count = array();
@@ -46,8 +47,12 @@ 
                 $mindate[$person_id] = '9999-12-31';
             }
             $speaker_count[$person_id]++;
-            if ($hdate < $mindate[$person_id]) $mindate[$person_id] = $hdate;
-            if ($hdate > $maxdate[$person_id]) $maxdate[$person_id] = $hdate;
+            if ($hdate < $mindate[$person_id]) {
+                $mindate[$person_id] = $hdate;
+            }
+            if ($hdate > $maxdate[$person_id]) {
+                $maxdate[$person_id] = $hdate;
+            }
         }
 
         # Fetch details of all the speakers
@@ -81,8 +86,9 @@ 
                 $dept = $q->field($n, 'dept');
                 $posn = $q->field($n, 'position');
                 $moffice_id = $q->field($n, 'moffice_id');
-                if ($dept && $q->field($n, 'to_date') == '9999-12-31')
-                    $speakers[$pid]['office'][$moffice_id] = prettify_office($posn, $dept);
+                if ($dept && $q->field($n, 'to_date') == '9999-12-31') {
+                                    $speakers[$pid]['office'][$moffice_id] = prettify_office($posn, $dept);
+                }
                 if (!isset($speakers[$pid]['name'])) {
                     $speakers[$pid]['name'] = $full_name . ($house==1?' MP':'');
                 }
@@ -140,7 +146,9 @@ 
      */
 
     public static function searchMemberDbLookup($searchstring, $current_only=false) {
-        if (!$searchstring) return false;
+        if (!$searchstring) {
+            return false;
+        }
         $searchwords = explode(' ', $searchstring, 3);
         $params = array();
         if (count($searchwords) == 1) {