mysociety / theyworkforyou

www/docs/api/api_getPerson.php

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

@@ -17,7 +17,7 @@
 <?php
 }
 
-function _api_getPerson_row($row, $has_party=FALSE) {
+function _api_getPerson_row($row, $has_party=false) {
     global $parties;
     $row['full_name'] = member_full_name($row['house'], $row['title'], $row['given_name'],
         $row['family_name'], $row['lordofname']);

Braces +18 added lines, -9 removed lines

@@ -28,8 +28,9 @@ 
         $URL = new \MySociety\TheyWorkForYou\Url('mp');
         $row['url'] = $URL->generate('none') . make_member_url($row['full_name'], $row['constituency'], $row['house'], $row['person_id']);
     }
-    if ($has_party && isset($parties[$row['party']]))
-        $row['party'] = $parties[$row['party']];
+    if ($has_party && isset($parties[$row['party']])) {
+            $row['party'] = $parties[$row['party']];
+    }
     list($image,$sz) = MySociety\TheyWorkForYou\Utility\Member::findMemberImage($row['person_id']);
     if ($image) {
         list($width, $height) = getimagesize(str_replace(IMAGEPATH, BASEDIR . '/images/', $image));
@@ -49,7 +50,9 @@ 
     }
 
     foreach ($row as $k => $r) {
-        if (is_string($r)) $row[$k] = html_entity_decode($r);
+        if (is_string($r)) {
+            $row[$k] = html_entity_decode($r);
+        }
     }
 
     return $row;
@@ -85,8 +88,9 @@ 
         $out = _api_getPerson_row($row, $house == HOUSE_TYPE_ROYAL ? false : true);
         $output[] = $out;
         $time = strtotime($row['lastupdate']);
-        if ($time > $last_mod)
-            $last_mod = $time;
+        if ($time > $last_mod) {
+                    $last_mod = $time;
+        }
     }
     # Only one MP, not an array
     if ($flatten && count($output) == 1 && $house == HOUSE_TYPE_COMMONS) {
@@ -134,13 +138,18 @@ 
 
     $cons = array();
     foreach ($constituencies as $constituency) {
-        if ($constituency == '') continue;
-        if ($constituency == 'Orkney ')
-            $constituency = 'Orkney & Shetland';
+        if ($constituency == '') {
+            continue;
+        }
+        if ($constituency == 'Orkney ') {
+                    $constituency = 'Orkney & Shetland';
+        }
 
         if ($house == HOUSE_TYPE_COMMONS) {
             $normalised = MySociety\TheyWorkForYou\Utility\Constituencies::normaliseConstituencyName($constituency);
-            if ($normalised) $constituency = $normalised;
+            if ($normalised) {
+                $constituency = $normalised;
+            }
         }
 
         $cons[] = $constituency;

Spacing +4 added lines, -4 removed lines

@@ -17,7 +17,7 @@ 
 <?php
 }
 
-function _api_getPerson_row($row, $has_party=FALSE) {
+function _api_getPerson_row($row, $has_party = FALSE) {
     global $parties;
     $row['full_name'] = member_full_name($row['house'], $row['title'], $row['given_name'],
         $row['family_name'], $row['lordofname']);
@@ -30,7 +30,7 @@ 
     }
     if ($has_party && isset($parties[$row['party']]))
         $row['party'] = $parties[$row['party']];
-    list($image,$sz) = MySociety\TheyWorkForYou\Utility\Member::findMemberImage($row['person_id']);
+    list($image, $sz) = MySociety\TheyWorkForYou\Utility\Member::findMemberImage($row['person_id']);
     if ($image) {
         list($width, $height) = getimagesize(str_replace(IMAGEPATH, BASEDIR . '/images/', $image));
         $row['image'] = $image;
@@ -55,7 +55,7 @@ 
     return $row;
 }
 
-function api_getPerson_id($id, $house='') {
+function api_getPerson_id($id, $house = '') {
     $db = new ParlDB;
     $params = array(
         ':person_id' => $id
@@ -77,7 +77,7 @@ 
     }
 }
 
-function _api_getPerson_output($q, $flatten=false) {
+function _api_getPerson_output($q, $flatten = false) {
     $output = array();
     $last_mod = 0;
     $house = null;

www/docs/api/api_functions.php

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

@@ -338,7 +338,7 @@
       // and then catch any errors in the conversion and just ignore
       // them and return the unconverted results
       $converted_out = @iconv('utf-8', 'iso-8859-1//TRANSLIT', $out);
-      if ($converted_out !== FALSE) {
+      if ($converted_out !== false) {
         $out = $converted_out;
       }
     }

Spacing +14 added lines, -14 removed lines

@@ -132,7 +132,7 @@ 
 # Key-related functions
 
 function api_log_call($key) {
-    if ($key=='DOCS') return;
+    if ($key == 'DOCS') return;
     $ip = $_SERVER['REMOTE_ADDR'];
     $query = !empty($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
     $query = preg_replace('#key=[A-Za-z0-9]+&?#', '', $query);
@@ -197,14 +197,14 @@ 
 
 # Output functions
 
-function api_output($arr, $last_mod=null) {
+function api_output($arr, $last_mod = null) {
     $output = get_http_var('output');
     if (!get_http_var('docs')) {
         $cond = api_header($output, $last_mod);
         if ($cond) return;
     }
     if ($output == 'xml') {
-        $out = '<?xml version="1.0" encoding="utf-8"?>'."\n";
+        $out = '<?xml version="1.0" encoding="utf-8"?>' . "\n";
         $out .= '<twfy>' . api_output_xml($arr) . '</twfy>';
     } elseif ($output == 'php') {
         $out = api_output_php($arr);
@@ -222,7 +222,7 @@ 
     print $out;
 }
 
-function api_header($o, $last_mod=null) {
+function api_header($o, $last_mod = null) {
     if ($last_mod && array_key_exists('HTTP_IF_MODIFIED_SINCE', $_SERVER)) {
         $t = cond_parse_http_date($_SERVER['HTTP_IF_MODIFIED_SINCE']);
         if (isset($t) && $t >= $last_mod) {
@@ -248,7 +248,7 @@ 
     }
     #$type = 'text/plain';
     header("Content-Type: $type; charset=$charset");
-    if ($last_mod>0)
+    if ($last_mod > 0)
         header('Last-Modified: ' . date('r', $last_mod));
     return false;
 }
@@ -275,7 +275,7 @@ 
     global $api_xml_arr;
     $verbose = get_http_var('verbose') ? "\n" : '';
     if (is_array($v)) {
-        if (count($v) && array_keys($v) === range(0, count($v)-1)) {
+        if (count($v) && array_keys($v) === range(0, count($v) - 1)) {
             $elt = 'match';
             $api_xml_arr++;
             $out = "<$elt>";
@@ -296,36 +296,36 @@ 
     }
 }
 
-function api_output_js($v, $level=0) {
+function api_output_js($v, $level = 0) {
     $verbose = get_http_var('verbose') ? "\n" : '';
     $out = '';
     if (is_array($v)) {
         # PHP arrays are both JS arrays and objects
-        if (count($v) && array_keys($v) === range(0, count($v)-1)) {
-            $out = '[' . join(",$verbose" , array_map('api_output_js', $v)) . ']';
+        if (count($v) && array_keys($v) === range(0, count($v) - 1)) {
+            $out = '[' . join(",$verbose", array_map('api_output_js', $v)) . ']';
         } else {
             $out = '{' . $verbose;
             $b = false;
             foreach ($v as $k => $vv) {
                 if ($b) $out .= ",$verbose";
                 if ($verbose) {
-                    $out .= str_repeat(' ', ($level+1)*2);
+                    $out .= str_repeat(' ', ($level + 1) * 2);
                     $out .= '"' . $k . '" : ';
                 } else {
                     $out .= '"' . $k . '":';
                 }
-                $out .= api_output_js($vv, $level+1);
+                $out .= api_output_js($vv, $level + 1);
                 $b = true;
             }
-            if ($verbose) $out .= "\n" . str_repeat(' ', $level*2);
+            if ($verbose) $out .= "\n" . str_repeat(' ', $level * 2);
             $out .= '}';
         }
     } elseif (is_null($v)) {
         $out = "null";
     } elseif (is_string($v)) {
         $out = '"' . str_replace(
-            array("\\",'"',"\n","\t","\r", "‶", "″", "“", "”"),
-            array("\\\\",'\"','\n','\t','\r', '\"', '\"', '\"', '\"'), $v) . '"';
+            array("\\", '"', "\n", "\t", "\r", "‶", "″", "“", "”"),
+            array("\\\\", '\"', '\n', '\t', '\r', '\"', '\"', '\"', '\"'), $v) . '"';
     } elseif (is_bool($v)) {
         $out = $v ? 'true' : 'false';
     } elseif (is_int($v) || is_float($v)) {

Indentation +12 added lines, -12 removed lines

@@ -146,20 +146,20 @@ 
 }
 
 function api_is_superuser_key($key) {
-  $db = new ParlDB;
-  $q = $db->query('SELECT api_key.user_id, users.status
+    $db = new ParlDB;
+    $q = $db->query('SELECT api_key.user_id, users.status
                FROM   api_key, users
                WHERE  users.user_id = api_key.user_id
                AND    api_key.api_key = :key', array(
                 ':key' => $key
                 ))->first();
-  if (!$q) {
+    if (!$q) {
     return false;
-  }
-  if ($q['status'] == 'Superuser') {
+    }
+    if ($q['status'] == 'Superuser') {
     return true;
-  } 
-  return false;
+    } 
+    return false;
 }
 
 function api_check_key($key) {
@@ -338,12 +338,12 @@ 
     // we only want to convert to iso if it's an actual API call
     // so skip this if it's a documentation page
     if (!get_http_var('docs')) {
-      // and then catch any errors in the conversion and just ignore
-      // them and return the unconverted results
-      $converted_out = @iconv('utf-8', 'iso-8859-1//TRANSLIT', $out);
-      if ($converted_out !== FALSE) {
+        // and then catch any errors in the conversion and just ignore
+        // them and return the unconverted results
+        $converted_out = @iconv('utf-8', 'iso-8859-1//TRANSLIT', $out);
+        if ($converted_out !== FALSE) {
         $out = $converted_out;
-      }
+        }
     }
 
     return $out;

Braces +31 added lines, -16 removed lines

@@ -132,7 +132,9 @@ 
 # Key-related functions
 
 function api_log_call($key) {
-    if ($key=='DOCS') return;
+    if ($key=='DOCS') {
+        return;
+    }
     $ip = $_SERVER['REMOTE_ADDR'];
     $query = !empty($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
     $query = preg_replace('#key=[A-Za-z0-9]+&?#', '', $query);
@@ -204,7 +206,9 @@ 
     $output = get_http_var('output');
     if (!get_http_var('docs')) {
         $cond = api_header($output, $last_mod);
-        if ($cond) return;
+        if ($cond) {
+            return;
+        }
     }
     if ($output == 'xml') {
         $out = '<?xml version="1.0" encoding="utf-8"?>'."\n";
@@ -215,7 +219,8 @@ 
         $out = api_output_rabx($arr);
     } elseif ($output == 'json') {
         $out = json_encode($arr, JSON_PRETTY_PRINT);
-    } else { # JS
+    } else {
+# JS
         $out = api_output_js($arr);
         $callback = get_http_var('callback');
         if (preg_match('#^[A-Za-z0-9._[\]]+$#', $callback)) {
@@ -251,8 +256,9 @@ 
     }
     #$type = 'text/plain';
     header("Content-Type: $type; charset=$charset");
-    if ($last_mod>0)
-        header('Last-Modified: ' . date('r', $last_mod));
+    if ($last_mod>0) {
+            header('Last-Modified: ' . date('r', $last_mod));
+    }
     return false;
 }
 
@@ -262,14 +268,18 @@ 
 
 function api_output_php($arr) {
     $out = serialize($arr);
-    if (get_http_var('verbose')) $out = str_replace(';', ";\n", $out);
+    if (get_http_var('verbose')) {
+        $out = str_replace(';', ";\n", $out);
+    }
     return $out;
 }
 
 function api_output_rabx($arr) {
     $out = '';
     rabx_wire_wr($arr, $out);
-    if (get_http_var('verbose')) $out = str_replace(',', ",\n", $out);
+    if (get_http_var('verbose')) {
+        $out = str_replace(',', ",\n", $out);
+    }
     return $out;
 }
 
@@ -310,7 +320,9 @@ 
             $out = '{' . $verbose;
             $b = false;
             foreach ($v as $k => $vv) {
-                if ($b) $out .= ",$verbose";
+                if ($b) {
+                    $out .= ",$verbose";
+                }
                 if ($verbose) {
                     $out .= str_repeat(' ', ($level+1)*2);
                     $out .= '"' . $k . '" : ';
@@ -320,7 +332,9 @@ 
                 $out .= api_output_js($vv, $level+1);
                 $b = true;
             }
-            if ($verbose) $out .= "\n" . str_repeat(' ', $level*2);
+            if ($verbose) {
+                $out .= "\n" . str_repeat(' ', $level*2);
+            }
             $out .= '}';
         }
     } elseif (is_null($v)) {
@@ -352,13 +366,14 @@ 
 # Call an API function
 
 function api_call_user_func_or_error($function, $params, $error, $type) {
-    if (function_exists($function))
-        call_user_func_array($function, $params);
-    elseif ($type == 'api')
-        api_error($error);
-    else
-        print "<p style='color:#cc0000'>$error</p>";
-}
+    if (function_exists($function)) {
+            call_user_func_array($function, $params);
+    } elseif ($type == 'api') {
+            api_error($error);
+    } else {
+            print "<p style='color:#cc0000'>$error</p>";
+    }
+    }
 
 # Used for testing for conditional responses
 

www/docs/admin/featured.php

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

@@ -107,13 +107,13 @@ 
     $related2 = get_http_var('related2');
     $related3 = get_http_var('related3');
 
-    $gid = $url ? get_gid_from_url($url) : NULL;
-    $related_gid1 = $related1 ? get_gid_from_url($related1) : NULL;
-    $related_gid2 = $related2 ? get_gid_from_url($related2) : NULL;
-    $related_gid3 = $related3 ? get_gid_from_url($related3) : NULL;
+    $gid = $url ? get_gid_from_url($url) : null;
+    $related_gid1 = $related1 ? get_gid_from_url($related1) : null;
+    $related_gid2 = $related2 ? get_gid_from_url($related2) : null;
+    $related_gid3 = $related3 ? get_gid_from_url($related3) : null;
 
     print "<h2>Preview Content</h2>";
-    if ( $gid !== NULL ) {
+    if ( $gid !== null ) {
         $h = new MySociety\TheyWorkForYou\Homepage;
         $featured = $h->getFeaturedDebate($gid, $title, $context, array( $related_gid1, $related_gid2, $related_gid3 ));
 
@@ -153,7 +153,7 @@ 
 }
 
 function get_gid_from_url($url) {
-    $gid = NULL;
+    $gid = null;
     $parts = parse_url($url);
     parse_str($parts['query'], $query);
 

Spacing +7 added lines, -7 removed lines

@@ -12,7 +12,7 @@ 
 $out = '';
 if (get_http_var('preview')) {
     preview_featured();
-} else if ( get_http_var('confirm') ) {
+} else if (get_http_var('confirm')) {
     $out = update_featured();
 }
 
@@ -23,13 +23,13 @@ 
 print '</div>';
 
 function gid_to_url($gid) {
-    if ( !$gid ) {
+    if (!$gid) {
         return '';
     }
     global $hansardmajors;
     global $db;
 
-    $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", array( ':gid' => $gid ))->first();
+    $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", array(':gid' => $gid))->first();
     $url_gid = fix_gid_from_db($gid);
     $url = new \MySociety\TheyWorkForYou\Url($hansardmajors[$q['major']]['page']);
     $url->insert(array('id' => $url_gid));
@@ -43,7 +43,7 @@ 
     $related = $featured->get_related();
     $context = $featured->get_context();
 
-    if ( get_http_var('url') ) {
+    if (get_http_var('url')) {
         $url = get_http_var('url');
         $title = get_http_var('title');
         $context = get_http_var('context');
@@ -113,9 +113,9 @@ 
     $related_gid3 = $related3 ? get_gid_from_url($related3) : NULL;
 
     print "<h2>Preview Content</h2>";
-    if ( $gid !== NULL ) {
+    if ($gid !== NULL) {
         $h = new MySociety\TheyWorkForYou\Homepage;
-        $featured = $h->getFeaturedDebate($gid, $title, $context, array( $related_gid1, $related_gid2, $related_gid3 ));
+        $featured = $h->getFeaturedDebate($gid, $title, $context, array($related_gid1, $related_gid2, $related_gid3));
 
         include INCLUDESPATH . 'easyparliament/templates/html/homepage/featured.php';
     } else {
@@ -157,7 +157,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) {

www/docs/admin/photos.php

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

@@ -139,7 +139,7 @@ 
 </form>
 
 <p style="clear:both; margin-top: 3em"><a href="/images/mps/photo-status.php">List MPs without photos</a></p>
-EOF;
+eof;
 
     return $out;
 }
@@ -193,7 +193,7 @@ 
     <span class="formw"><input type="submit" name="submit" value="Update attribution"></span>
 </div>
 </form>
-EOF;
+eof;
 
     return $out;
 }

Spacing +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
         } else {
             $desc .= ' [no photo]';
         }
-        $out .= '<option value="'.$p_id.'">'.$desc.'</option>' . "\n";
+        $out .= '<option value="' . $p_id . '">' . $desc . '</option>' . "\n";
     }
 
     $out .= ' </select></span> </div> ';

Braces +36 added lines, -26 removed lines

@@ -35,28 +35,33 @@ 
     $pid = intval(get_http_var('pid'));
     $errors = array();
 
-    if (!array_key_exists('photo', $_FILES))
-        array_push($errors, 'Not got the photo.');
-    elseif ($_FILES['photo']['error'] > 0)
-        array_push($errors, 'There was an error uploading the photo.');
-    elseif (!is_uploaded_file($_FILES['photo']['tmp_name']))
-        array_push($errors, 'Did not get an uploaded file.');
-    else {
+    if (!array_key_exists('photo', $_FILES)) {
+            array_push($errors, 'Not got the photo.');
+    } elseif ($_FILES['photo']['error'] > 0) {
+            array_push($errors, 'There was an error uploading the photo.');
+    } elseif (!is_uploaded_file($_FILES['photo']['tmp_name'])) {
+            array_push($errors, 'Did not get an uploaded file.');
+    } else {
         $tmp_name = $_FILES['photo']['tmp_name'];
 
         $image = new Imagick();
         $image->readImage($tmp_name);
-        if (!$image)
-            array_push($errors, 'Failed to read image from uploaded file');
+        if (!$image) {
+                    array_push($errors, 'Failed to read image from uploaded file');
+        }
             $imageS = clone $image;
-        if (!$image->scaleImage(0, 118))
-            array_push($errors, 'Scaling large failed');
-        if (!$imageS->scaleImage(0, 59))
-            array_push($errors, 'Scaling small failed');
-        if (!$image->writeImage("$dir/mpsL/$pid.jpeg"))
-            array_push($errors, "Saving to $dir/mpsL/$pid.jpeg failed");
-        if (!$imageS->writeImage("$dir/mps/$pid.jpeg"))
-            array_push($errors, "Saving to $dir/mps/$pid.jpeg failed");
+        if (!$image->scaleImage(0, 118)) {
+                    array_push($errors, 'Scaling large failed');
+        }
+        if (!$imageS->scaleImage(0, 59)) {
+                    array_push($errors, 'Scaling small failed');
+        }
+        if (!$image->writeImage("$dir/mpsL/$pid.jpeg")) {
+                    array_push($errors, "Saving to $dir/mpsL/$pid.jpeg failed");
+        }
+        if (!$imageS->writeImage("$dir/mps/$pid.jpeg")) {
+                    array_push($errors, "Saving to $dir/mps/$pid.jpeg failed");
+        }
         if (!$errors) {
             print "<pre>";
             chdir($dir);
@@ -69,8 +74,9 @@ 
         }
     }
 
-    if ($errors)
-        return display_photo_form($errors);
+    if ($errors) {
+            return display_photo_form($errors);
+    }
     return "<p><em>Photo uploaded and resized for pid $pid</em> &mdash; check how it looks <a href=\"/mp?p=$pid\">on their page</a></p>" . display_photo_form();
 }
 
@@ -98,7 +104,9 @@ 
         $house = $row['house'];
         $desc = member_full_name($house, $row['title'], $row['given_name'], $row['family_name'], $row['lordofname']) .
                 " " . $houses[$house];
-        if ($row['party']) $desc .= ' (' . $row['party'] . ')';
+        if ($row['party']) {
+            $desc .= ' (' . $row['party'] . ')';
+        }
         if ($row['constituency']) {
             $desc .= ', ' . $row['constituency'];
         }
@@ -149,13 +157,15 @@ 
     $attr_link = get_http_var('attr_link');
     $errors = array();
 
-    if (!$pid || !$attr_text)
-        array_push($errors, 'Missing information');
-    elseif ($attr_link && substr($attr_link, 0, 4) != 'http')
-        array_push($errors, 'Bad link');
+    if (!$pid || !$attr_text) {
+            array_push($errors, 'Missing information');
+    } elseif ($attr_link && substr($attr_link, 0, 4) != 'http') {
+            array_push($errors, 'Bad link');
+    }
 
-    if ($errors)
-        return display_attribution_form($errors);
+    if ($errors) {
+            return display_attribution_form($errors);
+    }
 
     # UPDATE
     global $db;

scripts/video-mark-missing.php

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

@@ -37,6 +37,6 @@
 if ($to)
     $query .= " and hpos<=$hpos_to";
 
-print "Executing $query...\n";
+print "executing $query...\n";
 $q = $db->query($query);
 print '  ' . $q->affected_rows() . " rows have been marked as missing\n";

Braces +5 added lines, -2 removed lines

@@ -16,7 +16,9 @@ 
 
 $date = substr($from, 0, 10);
 $from = 'uk.org.publicwhip/debate/' . $from;
-if ($to) $to = 'uk.org.publicwhip/debate/' . $to;
+if ($to) {
+    $to = 'uk.org.publicwhip/debate/' . $to;
+}
 
 $q = $db->query('select hpos from hansard where gid="' . $from . '"')->first();
 $hpos_from = $q['hpos'];
@@ -34,8 +36,9 @@ 
 
 $query = "update hansard set video_status = video_status | 8
     where major=1 and hdate='$date' and hpos>=$hpos_from";
-if ($to)
+if ($to) {
     $query .= " and hpos<=$hpos_to";
+}
 
 print "Executing $query...\n";
 $q = $db->query($query);

scripts/alertgonemps.php

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

@@ -139,7 +139,7 @@
 	global $globalsuccess, $sentemails, $nomail, $start_time;
 
 	$sentemails++;
-	mlog("SEND $sentemails : Sending email to $current[email] ... ");
+	mlog("send $sentemails : Sending email to $current[email] ... ");
 	$d = array('to' => $current['email'], 'template' => $template);
 	$m = array(
 		'DATA' => join("\n", $data),

Spacing +6 added lines, -6 removed lines

@@ -22,7 +22,7 @@ 
 $fromflag = false;
 $toemail = '';
 $template = 'alert_gone';
-for ($k=1; $k<$argc; $k++) {
+for ($k = 1; $k < $argc; $k++) {
 	if ($argv[$k] == '--nomail')
 		$nomail = true;
 	if (preg_match('#^--only=(.*)$#', $argv[$k], $m))
@@ -111,7 +111,7 @@ 
 			$user_id = 0;
 			$unregistered++;
 		}	
-		mlog("\nEMAIL: $email, uid $user_id; memory usage : ".memory_get_usage()."\n");
+		mlog("\nEMAIL: $email, uid $user_id; memory usage : " . memory_get_usage() . "\n");
 	}
 
     $lh = $member->left_house();
@@ -131,7 +131,7 @@ 
 } else {
       $sss .= 'Something went wrong! Total time: ';
 }
-$sss .= (getmicrotime()-$global_start)."\n\n";
+$sss .= (getmicrotime() - $global_start) . "\n\n";
 mlog($sss);
 mlog(date('r') . "\n");
 
@@ -144,14 +144,14 @@ 
 	$m = array(
 		'DATA' => join("\n", $data),
 		'MANAGE' => 'https://www.theyworkforyou.com/D/' . $current['token'],
-        'ALERT_IS' => count($data)==1 ? 'alert is' : 'alerts are',
-        'ALERTS' => count($data)==1 ? 'an alert' : 'some alerts',
+        'ALERT_IS' => count($data) == 1 ? 'alert is' : 'alerts are',
+        'ALERTS' => count($data) == 1 ? 'an alert' : 'some alerts',
 	);
 	if (!$nomail) {
 		$success = send_template_email($d, $m, true);
 		mlog("sent ... ");
 		# sleep if time between sending mails is less than a certain number of seconds on average
-		if (((time() - $start_time) / $sentemails) < 0.5 ) { # number of seconds per mail not to be quicker than
+		if (((time() - $start_time) / $sentemails) < 0.5) { # number of seconds per mail not to be quicker than
 			mlog("pausing ... ");
 			sleep(1);
 		}

Braces +51 added lines, -25 removed lines

@@ -23,14 +23,18 @@ 
 $toemail = '';
 $template = 'alert_gone';
 for ($k=1; $k<$argc; $k++) {
-	if ($argv[$k] == '--nomail')
-		$nomail = true;
-	if (preg_match('#^--only=(.*)$#', $argv[$k], $m))
-		$onlyemail = $m[1];
-	if (preg_match('#^--from=(.*)$#', $argv[$k], $m))
-		$fromemail = $m[1];
-	if (preg_match('#^--to=(.*)$#', $argv[$k], $m))
-		$toemail = $m[1];
+	if ($argv[$k] == '--nomail') {
+			$nomail = true;
+	}
+	if (preg_match('#^--only=(.*)$#', $argv[$k], $m)) {
+			$onlyemail = $m[1];
+	}
+	if (preg_match('#^--from=(.*)$#', $argv[$k], $m)) {
+			$fromemail = $m[1];
+	}
+	if (preg_match('#^--to=(.*)$#', $argv[$k], $m)) {
+			$toemail = $m[1];
+	}
 	if (preg_match('#^--template=(.*)$#', $argv[$k], $m)) {
 		$template = $m[1];
 		# Tee hee
@@ -41,7 +45,9 @@ 
 #if (DEVSITE)
 #	$nomail = true;
 
-if ($nomail) mlog("NOT SENDING EMAIL\n");
+if ($nomail) {
+    mlog("NOT SENDING EMAIL\n");
+}
 if (($fromemail && $onlyemail) || ($toemail && $onlyemail)) {
 	mlog("Can't have both from/to and only!\n");
 	exit;
@@ -70,13 +76,23 @@ 
 foreach ($alertdata as $alertitem) {
 	$active++;
 	$email = $alertitem['email'];
-    if ($onlyemail && $email != $onlyemail) continue;
-    if ($fromemail && strtolower($email) == $fromemail) $fromflag = true;
-    if ($fromemail && !$fromflag) continue;
-    if ($toemail && strtolower($email) >= $toemail) continue;
+    if ($onlyemail && $email != $onlyemail) {
+        continue;
+    }
+    if ($fromemail && strtolower($email) == $fromemail) {
+        $fromflag = true;
+    }
+    if ($fromemail && !$fromflag) {
+        continue;
+    }
+    if ($toemail && strtolower($email) >= $toemail) {
+        continue;
+    }
     $criteria_raw = $alertitem['criteria'];
 
-	if (!strstr($criteria_raw, 'speaker:')) continue;
+	if (!strstr($criteria_raw, 'speaker:')) {
+	    continue;
+	}
 
 	preg_match('#speaker:(\d+)#', $criteria_raw, $m);
 	$person_id = $m[1];
@@ -85,7 +101,9 @@ 
         $members[$person_id] = new MEMBER(array('person_id' => $person_id));
 	}
     $member = $members[$person_id];
-    if ($member->current_member_anywhere()) continue;
+    if ($member->current_member_anywhere()) {
+        continue;
+    }
 
     if (in_array($member->full_name(), array(
         'Mr Paul Boateng', 'Mrs Helen Liddell', 'Jack McConnell', 'Tim Boswell',
@@ -94,11 +112,14 @@ 
         'Hilary Armstrong', 'Des Browne', 'Quentin Davies', 'Beverley Hughes',
         'John Hutton', 'Jim Knight', 'Thomas McAvoy', 'John McFall', 'John Prescott',
         'John Reid', 'Angela Smith', 'Don Touhig', 'Michael Wills', 'Ian Paisley',
-    ))) continue;
+    ))) {
+        continue;
+    }
 
 	if ($email != $current['email']) {
-		if ($email_text)
-            write_and_send_email($current, $email_text, $template);
+		if ($email_text) {
+		            write_and_send_email($current, $email_text, $template);
+		}
 		$current['email'] = $email;
 		$current['token'] = $alertitem['alert_id'] . '-' . $alertitem['registrationtoken'];
 		$email_text = array();
@@ -117,11 +138,13 @@ 
     $lh = $member->left_house();
     $lh = array_shift($lh);
     $text = '* ' . $member->full_name() . ', left ' . $lh['date_pretty'];
-    if (!in_array($text, $email_text))
-	    $email_text[] = $text;
-}
-if ($email_text)
+    if (!in_array($text, $email_text)) {
+    	    $email_text[] = $text;
+    }
+    }
+if ($email_text) {
     write_and_send_email($current, $email_text, $template);
+}
 
 mlog("\n");
 
@@ -151,7 +174,8 @@ 
 		$success = send_template_email($d, $m, true);
 		mlog("sent ... ");
 		# sleep if time between sending mails is less than a certain number of seconds on average
-		if (((time() - $start_time) / $sentemails) < 0.5 ) { # number of seconds per mail not to be quicker than
+		if (((time() - $start_time) / $sentemails) < 0.5 ) {
+# number of seconds per mail not to be quicker than
 			mlog("pausing ... ");
 			sleep(1);
 		}
@@ -160,6 +184,8 @@ 
 		$success = 1;
 	}
 	mlog("done\n");
-	if (!$success) $globalsuccess = 0;
-}
+	if (!$success) {
+	    $globalsuccess = 0;
+	}
+	}
 

Indentation +60 added lines, -60 removed lines

@@ -23,19 +23,19 @@ 
 $toemail = '';
 $template = 'alert_gone';
 for ($k=1; $k<$argc; $k++) {
-	if ($argv[$k] == '--nomail')
-		$nomail = true;
-	if (preg_match('#^--only=(.*)$#', $argv[$k], $m))
-		$onlyemail = $m[1];
-	if (preg_match('#^--from=(.*)$#', $argv[$k], $m))
-		$fromemail = $m[1];
-	if (preg_match('#^--to=(.*)$#', $argv[$k], $m))
-		$toemail = $m[1];
-	if (preg_match('#^--template=(.*)$#', $argv[$k], $m)) {
-		$template = $m[1];
-		# Tee hee
-		$template = "../../../../../../../../../../home/twfy-live/email-alert-templates/alert_mailout_$template";
-	}
+    if ($argv[$k] == '--nomail')
+        $nomail = true;
+    if (preg_match('#^--only=(.*)$#', $argv[$k], $m))
+        $onlyemail = $m[1];
+    if (preg_match('#^--from=(.*)$#', $argv[$k], $m))
+        $fromemail = $m[1];
+    if (preg_match('#^--to=(.*)$#', $argv[$k], $m))
+        $toemail = $m[1];
+    if (preg_match('#^--template=(.*)$#', $argv[$k], $m)) {
+        $template = $m[1];
+        # Tee hee
+        $template = "../../../../../../../../../../home/twfy-live/email-alert-templates/alert_mailout_$template";
+    }
 }
 
 #if (DEVSITE)
@@ -43,8 +43,8 @@ 
 
 if ($nomail) mlog("NOT SENDING EMAIL\n");
 if (($fromemail && $onlyemail) || ($toemail && $onlyemail)) {
-	mlog("Can't have both from/to and only!\n");
-	exit;
+    mlog("Can't have both from/to and only!\n");
+    exit;
 }
 
 $active = 0;
@@ -68,22 +68,22 @@ 
 $members = array();
 $start_time = time();
 foreach ($alertdata as $alertitem) {
-	$active++;
-	$email = $alertitem['email'];
+    $active++;
+    $email = $alertitem['email'];
     if ($onlyemail && $email != $onlyemail) continue;
     if ($fromemail && strtolower($email) == $fromemail) $fromflag = true;
     if ($fromemail && !$fromflag) continue;
     if ($toemail && strtolower($email) >= $toemail) continue;
     $criteria_raw = $alertitem['criteria'];
 
-	if (!strstr($criteria_raw, 'speaker:')) continue;
+    if (!strstr($criteria_raw, 'speaker:')) continue;
 
-	preg_match('#speaker:(\d+)#', $criteria_raw, $m);
-	$person_id = $m[1];
-	if (!isset($members[$person_id])) {
+    preg_match('#speaker:(\d+)#', $criteria_raw, $m);
+    $person_id = $m[1];
+    if (!isset($members[$person_id])) {
         $queries++;
         $members[$person_id] = new MEMBER(array('person_id' => $person_id));
-	}
+    }
     $member = $members[$person_id];
     if ($member->current_member_anywhere()) continue;
 
@@ -96,29 +96,29 @@ 
         'John Reid', 'Angela Smith', 'Don Touhig', 'Michael Wills', 'Ian Paisley',
     ))) continue;
 
-	if ($email != $current['email']) {
-		if ($email_text)
+    if ($email != $current['email']) {
+        if ($email_text)
             write_and_send_email($current, $email_text, $template);
-		$current['email'] = $email;
-		$current['token'] = $alertitem['alert_id'] . '-' . $alertitem['registrationtoken'];
-		$email_text = array();
-		$q = $db->query('SELECT user_id FROM users WHERE email = :email', array(
+        $current['email'] = $email;
+        $current['token'] = $alertitem['alert_id'] . '-' . $alertitem['registrationtoken'];
+        $email_text = array();
+        $q = $db->query('SELECT user_id FROM users WHERE email = :email', array(
             ':email' => $email))->first();
         if ($q) {
             $user_id = $q['user_id'];
             $registered++;
-		} else {
-			$user_id = 0;
-			$unregistered++;
-		}	
-		mlog("\nEMAIL: $email, uid $user_id; memory usage : ".memory_get_usage()."\n");
-	}
+        } else {
+            $user_id = 0;
+            $unregistered++;
+        }	
+        mlog("\nEMAIL: $email, uid $user_id; memory usage : ".memory_get_usage()."\n");
+    }
 
     $lh = $member->left_house();
     $lh = array_shift($lh);
     $text = '* ' . $member->full_name() . ', left ' . $lh['date_pretty'];
     if (!in_array($text, $email_text))
-	    $email_text[] = $text;
+        $email_text[] = $text;
 }
 if ($email_text)
     write_and_send_email($current, $email_text, $template);
@@ -127,39 +127,39 @@ 
 
 $sss = "Active alerts: $active\nEmail lookups: $registered registered, $unregistered unregistered\nQuery lookups: $queries\nSent emails: $sentemails\n";
 if ($globalsuccess) {
-      $sss .= 'Everything went swimmingly, in ';
+        $sss .= 'Everything went swimmingly, in ';
 } else {
-      $sss .= 'Something went wrong! Total time: ';
+        $sss .= 'Something went wrong! Total time: ';
 }
 $sss .= (getmicrotime()-$global_start)."\n\n";
 mlog($sss);
 mlog(date('r') . "\n");
 
 function write_and_send_email($current, $data, $template) {
-	global $globalsuccess, $sentemails, $nomail, $start_time;
-
-	$sentemails++;
-	mlog("SEND $sentemails : Sending email to $current[email] ... ");
-	$d = array('to' => $current['email'], 'template' => $template);
-	$m = array(
-		'DATA' => join("\n", $data),
-		'MANAGE' => 'https://www.theyworkforyou.com/D/' . $current['token'],
+    global $globalsuccess, $sentemails, $nomail, $start_time;
+
+    $sentemails++;
+    mlog("SEND $sentemails : Sending email to $current[email] ... ");
+    $d = array('to' => $current['email'], 'template' => $template);
+    $m = array(
+        'DATA' => join("\n", $data),
+        'MANAGE' => 'https://www.theyworkforyou.com/D/' . $current['token'],
         'ALERT_IS' => count($data)==1 ? 'alert is' : 'alerts are',
         'ALERTS' => count($data)==1 ? 'an alert' : 'some alerts',
-	);
-	if (!$nomail) {
-		$success = send_template_email($d, $m, true);
-		mlog("sent ... ");
-		# sleep if time between sending mails is less than a certain number of seconds on average
-		if (((time() - $start_time) / $sentemails) < 0.5 ) { # number of seconds per mail not to be quicker than
-			mlog("pausing ... ");
-			sleep(1);
-		}
-	} else {
-		mlog(join('', $data));
-		$success = 1;
-	}
-	mlog("done\n");
-	if (!$success) $globalsuccess = 0;
+    );
+    if (!$nomail) {
+        $success = send_template_email($d, $m, true);
+        mlog("sent ... ");
+        # sleep if time between sending mails is less than a certain number of seconds on average
+        if (((time() - $start_time) / $sentemails) < 0.5 ) { # number of seconds per mail not to be quicker than
+            mlog("pausing ... ");
+            sleep(1);
+        }
+    } else {
+        mlog(join('', $data));
+        $success = 1;
+    }
+    mlog("done\n");
+    if (!$success) $globalsuccess = 0;
 }
 

scripts/mprss.php

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

@@ -53,7 +53,7 @@
 			$contentencoded = $row['body'];
 				
 			$hdate = format_date($row['hdate'], 'Y-m-d');
-			if ($row['htime'] != NULL) {
+			if ($row['htime'] != null) {
 				$htime = format_time($row['htime'], 'H:i:s');
 			} else {
 				$htime = '00:00:00';

Indentation +44 added lines, -44 removed lines

@@ -22,47 +22,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: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";

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 +5 added lines, -2 removed lines

@@ -16,7 +16,9 @@ 
 
 // Get all the person ids we need feeds for...
 $q = $db->query("SELECT person_id FROM member WHERE left_house='9999-12-31'");
-if ($q->rows() <= 0) exit;
+if ($q->rows() <= 0) {
+    exit;
+}
 
 $starttime = time();
 foreach ($q as $person) {
@@ -104,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;
 	}

scripts/populate-policy-images.php

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

@@ -46,7 +46,7 @@
 }
 
 $count = 0;
-while ( ( $policy = fgetcsv($file) ) !== FALSE ) {
+while ( ( $policy = fgetcsv($file) ) !== false ) {
     if ( intval($policy[0]) ) {
         $policy_id = $policy[0];
         $img_id = $policy[1] ? $policy[1] : $policy_id;

Spacing +4 added lines, -4 removed lines

@@ -33,7 +33,7 @@ 
     exit(1);
 }
 
-if ( !file_exists($csvfile) ) {
+if (!file_exists($csvfile)) {
     print "$csvfile cannot be found\n";
     exit(1);
 }
@@ -46,8 +46,8 @@ 
 }
 
 $count = 0;
-while ( ( $policy = fgetcsv($file) ) !== FALSE ) {
-    if ( intval($policy[0]) ) {
+while (($policy = fgetcsv($file)) !== FALSE) {
+    if (intval($policy[0])) {
         $policy_id = $policy[0];
         $img_id = $policy[1] ? $policy[1] : $policy_id;
         $title = $policy[2];
@@ -69,7 +69,7 @@ 
                 ':image_attribution' => $attribution,
                 ':license_url' => $licence_url)
         );
-        if ( $q->success() ) {
+        if ($q->success()) {
             $count += $q->affected_rows();
         } else {
             print "failed to update data for $policy_id\n";

tests/Bootstrap.php

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

@@ -8,9 +8,9 @@ 
 // Test to make sure we have the test DB environment variables. If not, this isn't testing, so abort.
 // Define the DB connection constants before we do anything else.
 if (
-    isset($_SERVER['TWFY_TEST_DB_HOST']) AND
-    isset($_SERVER['TWFY_TEST_DB_USER']) AND
-    isset($_SERVER['TWFY_TEST_DB_PASS']) AND
+    isset($_SERVER['TWFY_TEST_DB_HOST']) and
+    isset($_SERVER['TWFY_TEST_DB_USER']) and
+    isset($_SERVER['TWFY_TEST_DB_PASS']) and
     isset($_SERVER['TWFY_TEST_DB_NAME'])
 ) {
 
@@ -37,7 +37,7 @@ 
 }
 
 // Explicitly declare we're in testing (avoids trying deploy-only things)
-define('TESTING', TRUE);
+define('TESTING', true);
 
 // Load up the init script (handles the rest of the config, DB connection etc)
 include_once('www/includes/easyparliament/init.php');

Spacing +2 added lines, -2 removed lines

@@ -21,13 +21,13 @@
     define('OPTION_TWFY_DB_NAME', $_SERVER['TWFY_TEST_DB_NAME']);
     
     // Define the base directory
-    define ("BASEDIR", dirname(__FILE__) . '/../www/docs'); 
+    define("BASEDIR", dirname(__FILE__) . '/../www/docs'); 
 
     # point to the default mapit
     define('OPTION_MAPIT_URL', 'https://mapit.mysociety.org/');
 
     // If there isn't a config file (most likely this is running an automated test) copy one in.
-    if ( ! file_exists(dirname(__FILE__) . '/../conf/general')) {
+    if (!file_exists(dirname(__FILE__) . '/../conf/general')) {
         copy(dirname(__FILE__) . '/../conf/general-example', dirname(__FILE__) . '/../conf/general');
     }