mysociety / theyworkforyou

www/docs/api/api_getAlerts.php

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 
 function api_getAlerts_start_date($start_date) {
-  $args = array ('start_date' => $start_date, 'end_date' => get_http_var('end_date'));
-  $alert = new ALERT();
-  $data = $alert->fetch_between($confirmed=1, $deleted=0, $args['start_date'], $args['end_date']);
-  api_output($data);
+    $args = array ('start_date' => $start_date, 'end_date' => get_http_var('end_date'));
+    $alert = new ALERT();
+    $data = $alert->fetch_between($confirmed=1, $deleted=0, $args['start_date'], $args['end_date']);
+    api_output($data);
 }
 
 ?>

Spacing +2 added lines, -2 removed lines

@@ -1,9 +1,9 @@
 <?php
 
 function api_getAlerts_start_date($start_date) {
-  $args = array ('start_date' => $start_date, 'end_date' => get_http_var('end_date'));
+  $args = array('start_date' => $start_date, 'end_date' => get_http_var('end_date'));
   $alert = new ALERT();
-  $data = $alert->fetch_between($confirmed=1, $deleted=0, $args['start_date'], $args['end_date']);
+  $data = $alert->fetch_between($confirmed = 1, $deleted = 0, $args['start_date'], $args['end_date']);
   api_output($data);
 }
 

www/docs/api/api_getComments.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
 }
 
 function api_getComments_start_date($start_date) {
-        $args = array (
+        $args = array(
             'start_date' => $start_date,
             'end_date' => get_http_var('end_date')
         );
@@ -33,7 +33,7 @@ 
 }
 
 function api_getComments_search($s) {
-        $args = array (
+        $args = array(
             's' => $s,
             'p' => get_http_var('page'),
             'num' => get_http_var('num'),

www/docs/api/index.php

Indentation +8 added lines, -8 removed lines

@@ -26,17 +26,17 @@ 
     $match = 0;
     foreach ($methods as $method => $data) {
         if (strtolower($q_method) == strtolower($method)) {
-      if (isset($data['superuser']) && $data['superuser']) {
+        if (isset($data['superuser']) && $data['superuser']) {
         $super_check = api_is_superuser_key($key);
         if (!$super_check) {
                 if (get_http_var('docs')) {
-                  api_front_page();
+                    api_front_page();
                 } else {
-                  api_error('Invalid API key.');
-                  exit;
-              }
+                    api_error('Invalid API key.');
+                    exit;
+                }
             }
-      }
+        }
 
             api_log_call($key);
             $match++;
@@ -73,9 +73,9 @@ 
             '". Possible functions are: ' .
             join(', ', array_keys($methods));
         if (get_http_var('output')) {
-          api_error($msg);
+            api_error($msg);
         } else {
-          api_front_page($msg);
+            api_front_page($msg);
         }
     } else {
         if (get_http_var('docs')) {

Spacing +10 added lines, -10 removed lines

@@ -47,7 +47,7 @@ 
             foreach ($data['parameters'] as $parameter) {
                 if ($q_param = trim(get_http_var($parameter))) {
                     $match++;
-                    include_once 'api_'. $method . '.php';
+                    include_once 'api_' . $method . '.php';
                     api_call_user_func_or_error('api_' . $method . '_' . $parameter, array($q_param), 'API call not yet functional', 'api');
                     break;
                 }
@@ -57,9 +57,9 @@ 
                     api_error('No parameter provided to function "' .
                     _htmlspecialchars($q_method) .
                         '". Possible choices are: ' .
-                        join(', ', $data['parameters']) );
+                        join(', ', $data['parameters']));
                 } else {
-                    include_once 'api_'. $method . '.php';
+                    include_once 'api_' . $method . '.php';
                     api_call_user_func_or_error('api_' . $method, array(), 'API call not yet functional', 'api');
                     break;
                 }
@@ -93,7 +93,7 @@ 
     $DATA->set_page_metadata($this_page, 'title', "$method function");
     $PAGE->page_start();
     $PAGE->stripe_start();
-    include_once 'api_'. $method . '.php';
+    include_once 'api_' . $method . '.php';
     print '<p align="center"><strong>https://www.theyworkforyou.com/api/' . $method . '</strong></p>';
     api_call_user_func_or_error('api_' . $method . '_front', array(), 'No documentation yet', 'html');
 ?>
@@ -102,20 +102,20 @@ 
 <form method="get" action="?#output">
 <p>
 <?php foreach ($methods[$method]['parameters'] as $parameter) {
-    print $parameter . ': <input type="text" name="'.$parameter.'" value="';
+    print $parameter . ': <input type="text" name="' . $parameter . '" value="';
     if ($val = get_http_var($parameter))
         print _htmlspecialchars($val);
     print '" size="30"><br>';
 }
 ?>
 Output:
-<input id="output_js" type="radio" name="output" value="js"<?php if (get_http_var('output')=='js' || !get_http_var('output')) print ' checked'?>>
+<input id="output_js" type="radio" name="output" value="js"<?php if (get_http_var('output') == 'js' || !get_http_var('output')) print ' checked'?>>
 <label for="output_js">JS</label>
-<input id="output_xml" type="radio" name="output" value="xml"<?php if (get_http_var('output')=='xml') print ' checked'?>>
+<input id="output_xml" type="radio" name="output" value="xml"<?php if (get_http_var('output') == 'xml') print ' checked'?>>
 <label for="output_xml">XML</label>
-<input id="output_php" type="radio" name="output" value="php"<?php if (get_http_var('output')=='php') print ' checked'?>>
+<input id="output_php" type="radio" name="output" value="php"<?php if (get_http_var('output') == 'php') print ' checked'?>>
 <label for="output_php">Serialised PHP</label>
-<input id="output_rabx" type="radio" name="output" value="rabx"<?php if (get_http_var('output')=='rabx') print ' checked'?>>
+<input id="output_rabx" type="radio" name="output" value="rabx"<?php if (get_http_var('output') == 'rabx') print ' checked'?>>
 <label for="output_rabx">RABX</label>
 
 <input type="submit" value="Go">
@@ -130,7 +130,7 @@ 
         }
         print '<h4><a name="output"></a>Output</h4>';
         print '<p>URL for this: <strong>https://www.theyworkforyou.com/api/';
-        print $method . '?' . join('&amp;', $qs) . '&amp;output='._htmlspecialchars(get_http_var('output')).'</strong></p>';
+        print $method . '?' . join('&amp;', $qs) . '&amp;output=' . _htmlspecialchars(get_http_var('output')) . '</strong></p>';
         print '<pre>' . _htmlspecialchars($explorer) . '</pre>';
     }
     $sidebar = api_sidebar();

Braces +23 added lines, -12 removed lines

@@ -8,7 +8,8 @@ 
 if ($q_method = get_http_var('method')) {
     if (get_http_var('docs')) {
         $key = 'DOCS';
-    } else {
+    }
+    else {
         $key = get_http_var('key');
         if (!$key) {
             api_error('No API key provided. Please see https://www.theyworkforyou.com/api/key for more information.');
@@ -18,7 +19,8 @@ 
         if (!$check) {
             api_error('Invalid API key.');
             exit;
-        } elseif ($check === 'disabled') {
+        }
+        elseif ($check === 'disabled') {
             api_error('Your API key has been disabled.');
             exit;
         }
@@ -31,7 +33,8 @@ 
         if (!$super_check) {
                 if (get_http_var('docs')) {
                   api_front_page();
-                } else {
+                }
+                else {
                   api_error('Invalid API key.');
                   exit;
               }
@@ -58,7 +61,8 @@ 
                     _htmlspecialchars($q_method) .
                         '". Possible choices are: ' .
                         join(', ', $data['parameters']) );
-                } else {
+                }
+                else {
                     include_once 'api_'. $method . '.php';
                     api_call_user_func_or_error('api_' . $method, array(), 'API call not yet functional', 'api');
                     break;
@@ -74,16 +78,19 @@ 
             join(', ', array_keys($methods));
         if (get_http_var('output')) {
           api_error($msg);
-        } else {
+        }
+        else {
           api_front_page($msg);
         }
-    } else {
+    }
+    else {
         if (get_http_var('docs')) {
             $explorer = ob_get_clean();
             api_documentation_front($method, $explorer);
         }
     }
-} else {
+}
+else {
     api_front_page();
 }
 
@@ -103,13 +110,15 @@ 
 <p>
 <?php foreach ($methods[$method]['parameters'] as $parameter) {
     print $parameter . ': <input type="text" name="'.$parameter.'" value="';
-    if ($val = get_http_var($parameter))
-        print _htmlspecialchars($val);
+    if ($val = get_http_var($parameter)) {
+            print _htmlspecialchars($val);
+    }
     print '" size="30"><br>';
 }
 ?>
 Output:
-<input id="output_js" type="radio" name="output" value="js"<?php if (get_http_var('output')=='js' || !get_http_var('output')) print ' checked'?>>
+<input id="output_js" type="radio" name="output" value="js"<?php if (get_http_var('output')=='js' || !get_http_var('output')) {
+    print ' checked'?>>
 <label for="output_js">JS</label>
 <input id="output_xml" type="radio" name="output" value="xml"<?php if (get_http_var('output')=='xml') print ' checked'?>>
 <label for="output_xml">XML</label>
@@ -124,9 +133,11 @@ 
 <?php
     if ($explorer) {
         $qs = array();
+}
         foreach ($methods[$method]['parameters'] as $parameter) {
-            if (get_http_var($parameter))
-                $qs[] = _htmlspecialchars(rawurlencode($parameter) . '=' . urlencode(get_http_var($parameter)));
+            if (get_http_var($parameter)) {
+                            $qs[] = _htmlspecialchars(rawurlencode($parameter) . '=' . urlencode(get_http_var($parameter)));
+            }
         }
         print '<h4><a name="output"></a>Output</h4>';
         print '<p>URL for this: <strong>https://www.theyworkforyou.com/api/';

www/docs/bills/2005-06/identity-cards/index.php

Spacing +5 added lines, -5 removed lines

@@ -2,12 +2,12 @@ 
 
 $this_page = 'bill_index';
 include_once '../../../../includes/easyparliament/init.php';
-$DATA->set_page_metadata($this_page, 'heading','Identity Cards Act 2006');
+$DATA->set_page_metadata($this_page, 'heading', 'Identity Cards Act 2006');
 
 $PAGE->page_start();
 $PAGE->stripe_start();
 
-$PAGE->block_start(array ('title'=>'House of Commons - Normal Run'));
+$PAGE->block_start(array('title'=>'House of Commons - Normal Run'));
 ?>
 <ul> <li>Back on 25th May 2005, a bill was introduced: the <a
 href="http://www.publications.parliament.uk/pa/cm200506/cmbills/009/2006009.htm">Identity
@@ -32,7 +32,7 @@ 
 
 <?php
 $PAGE->block_end();
-$PAGE->block_start(array ('title'=>'House of Lords - Normal Run'));
+$PAGE->block_start(array('title'=>'House of Lords - Normal Run'));
 ?>
 
 <ul>
@@ -49,7 +49,7 @@ 
 
 <?php
 $PAGE->block_end();
-$PAGE->block_start(array ('title'=>'Ping Pong'));
+$PAGE->block_start(array('title'=>'Ping Pong'));
 ?>
 
 <ul>
@@ -94,7 +94,7 @@ 
 $PAGE->block_end();
 
     $includes = array(
-        array (
+        array(
             'type' => 'include',
             'content' => 'bills_intro'
         ),

www/docs/divisions/division.php

Indentation +5 added lines, -5 removed lines

@@ -43,11 +43,11 @@
             $data['mp_vote']['with_majority'] = true;
         }
     } else {
-      if ($data['division']['date'] < $MEMBER->entered_house(1)['date']) {
-          $data['before_mp'] = true;
-      } else if ($data['division']['date'] > $MEMBER->left_house(1)['date']) {
-          $data['after_mp'] = true;
-      }
+        if ($data['division']['date'] < $MEMBER->entered_house(1)['date']) {
+            $data['before_mp'] = true;
+        } else if ($data['division']['date'] > $MEMBER->left_house(1)['date']) {
+            $data['after_mp'] = true;
+        }
     }
 }
 

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

@@ -51,7 +51,7 @@
     }
 }
 
-$data['debate_time_human'] = False;
+$data['debate_time_human'] = false;
 $data['debate_day_human'] = format_date($data['division']['date'], LONGDATEFORMAT);
 $data['col_country'] = 'UK';
 $data['location'] = 'in the House of Commons';

Braces +6 added lines, -3 removed lines

@@ -16,7 +16,8 @@ 
 if ($mp = get_http_var('p')) {
     $MEMBER = new MySociety\TheyWorkForYou\Member(array('person_id' => $mp, 'house' => HOUSE_TYPE_COMMONS));
     $main_vote_mp = true;
-} else if ($THEUSER->postcode_is_set()) {
+}
+else if ($THEUSER->postcode_is_set()) {
     $MEMBER = new MySociety\TheyWorkForYou\Member(array('postcode' => $THEUSER->postcode(), 'house' => HOUSE_TYPE_COMMONS));
 }
 
@@ -42,10 +43,12 @@ 
         if ($data['mp_vote']['vote'] == $data['division']['vote']) {
             $data['mp_vote']['with_majority'] = true;
         }
-    } else {
+    }
+    else {
       if ($data['division']['date'] < $MEMBER->entered_house(1)['date']) {
           $data['before_mp'] = true;
-      } else if ($data['division']['date'] > $MEMBER->left_house(1)['date']) {
+      }
+      else if ($data['division']['date'] > $MEMBER->left_house(1)['date']) {
           $data['after_mp'] = true;
       }
     }

www/docs/divisions/index.php

Indentation +5 added lines, -5 removed lines

@@ -10,12 +10,12 @@
 }
 
 if (isset($MEMBER)) {
-  $divisions = new MySociety\TheyWorkForYou\Divisions($MEMBER);
-  $data = array('divisions' => $divisions->getRecentMemberDivisions(30, 'Parliament'));
-  $data['mp_name'] = ucfirst($MEMBER->full_name());
+    $divisions = new MySociety\TheyWorkForYou\Divisions($MEMBER);
+    $data = array('divisions' => $divisions->getRecentMemberDivisions(30, 'Parliament'));
+    $data['mp_name'] = ucfirst($MEMBER->full_name());
 } else {
-  $divisions = new MySociety\TheyWorkForYou\Divisions();
-  $data = $divisions->getRecentDivisions(30);
+    $divisions = new MySociety\TheyWorkForYou\Divisions();
+    $data = $divisions->getRecentDivisions(30);
 }
 
 $data['last_updated'] = MySociety\TheyWorkForYou\Divisions::getMostRecentDivisionDate()['latest'];

Braces +2 added lines, -1 removed lines

@@ -13,7 +13,8 @@
   $divisions = new MySociety\TheyWorkForYou\Divisions($MEMBER);
   $data = array('divisions' => $divisions->getRecentMemberDivisions(30, 'Parliament'));
   $data['mp_name'] = ucfirst($MEMBER->full_name());
-} else {
+}
+else {
   $divisions = new MySociety\TheyWorkForYou\Divisions();
   $data = $divisions->getRecentDivisions(30);
 }

scripts/wikipedia-cron.php

Indentation +33 added lines, -33 removed lines

@@ -16,39 +16,39 @@ 
 contributions('212.35.252.2'); # LibDem
 
 function contributions($ip) {
-	global $dir;
+    global $dir;
 
-	$file = fetch("/w/index.php?title=Special:Contributions&limit=100&target=$ip");
-	if (!$file) return;
-	$fp = fopen($dir . $ip, 'w');
-	fwrite($fp, $file['body']);
-	fclose($fp);
-	preg_match_all('#<li>(.*?) \(<a[^>]*>hist</a>\) \(<a href="(.*?title=(.*?)&.*?oldid=(.*?))"[^>]*>diff</a>\)  <a[^>]*>(.*?)</a> .*?</li>#', $file['body'], $m, PREG_SET_ORDER);
-	foreach ($m as $row) {
-		# print "$row[3] / $row[4]";
-		$filename = html_entity_decode("$row[3].$row[4]");
-		$path = $dir;
-		if (strstr($filename, '/')) {
-			$bits = explode('/', $filename);
-			array_pop($bits);
-			foreach ($bits as $bit) {
-				@mkdir($path . $bit);
-				$path .= "$bit/";
-			}
-		}
-		$cache = $dir . $filename;
-		if (!is_file($cache)) {
-			# print " - fetching";
-			$file = fetch(html_entity_decode($row[2]));
-			if (!$file) continue;
-			$fp = fopen($cache, 'w');
-			if ($fp) {
-				fwrite($fp, $file['body']);
-				fclose($fp);
-			}
-		}
-		# print "\n";
-	}
+    $file = fetch("/w/index.php?title=Special:Contributions&limit=100&target=$ip");
+    if (!$file) return;
+    $fp = fopen($dir . $ip, 'w');
+    fwrite($fp, $file['body']);
+    fclose($fp);
+    preg_match_all('#<li>(.*?) \(<a[^>]*>hist</a>\) \(<a href="(.*?title=(.*?)&.*?oldid=(.*?))"[^>]*>diff</a>\)  <a[^>]*>(.*?)</a> .*?</li>#', $file['body'], $m, PREG_SET_ORDER);
+    foreach ($m as $row) {
+        # print "$row[3] / $row[4]";
+        $filename = html_entity_decode("$row[3].$row[4]");
+        $path = $dir;
+        if (strstr($filename, '/')) {
+            $bits = explode('/', $filename);
+            array_pop($bits);
+            foreach ($bits as $bit) {
+                @mkdir($path . $bit);
+                $path .= "$bit/";
+            }
+        }
+        $cache = $dir . $filename;
+        if (!is_file($cache)) {
+            # print " - fetching";
+            $file = fetch(html_entity_decode($row[2]));
+            if (!$file) continue;
+            $fp = fopen($cache, 'w');
+            if ($fp) {
+                fwrite($fp, $file['body']);
+                fclose($fp);
+            }
+        }
+        # print "\n";
+    }
 }
 
 function fetch($url) {
@@ -56,7 +56,7 @@ 
     $host = 'en.wikipedia.org';
     $fp = @fsockopen($host, 80, $errno, $errstr, 10);
     if (!$fp) {
-	    #print "$errstr ($errno)\n";
+        #print "$errstr ($errno)\n";
             return '';
         }
     $out = "GET $url HTTP/1.1\r\n";

Braces +6 added lines, -2 removed lines

@@ -19,7 +19,9 @@ 
 	global $dir;
 
 	$file = fetch("/w/index.php?title=Special:Contributions&limit=100&target=$ip");
-	if (!$file) return;
+	if (!$file) {
+	    return;
+	}
 	$fp = fopen($dir . $ip, 'w');
 	fwrite($fp, $file['body']);
 	fclose($fp);
@@ -40,7 +42,9 @@ 
 		if (!is_file($cache)) {
 			# print " - fetching";
 			$file = fetch(html_entity_decode($row[2]));
-			if (!$file) continue;
+			if (!$file) {
+			    continue;
+			}
 			$fp = fopen($cache, 'w');
 			if ($fp) {
 				fwrite($fp, $file['body']);

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

@@ -59,7 +59,7 @@
 	    #print "$errstr ($errno)\n";
             return '';
         }
-    $out = "GET $url HTTP/1.1\r\n";
+    $out = "get $url HTTP/1.1\r\n";
     $out .= "Host: $host\r\n";
     $out .= "User-Agent: $ua\r\n";
     $out .= "Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9;text/plain;q=0.8,image/png,*/*;q=0.5\r\n";

scripts/alertmpchanged.php

Indentation +15 added lines, -15 removed lines

@@ -22,26 +22,26 @@ 
 $toemail = '';
 $template = 'alert_new_mp';
 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 (DEVSITE)
-  $nomail = true;
+    $nomail = true;
 
 # Change this to the end date
 $END_DATE = '2017-05-03';
 
 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;
@@ -66,8 +66,8 @@ 
 $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;
@@ -143,9 +143,9 @@ 
 
 $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);

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

@@ -155,7 +155,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 +13 added lines, -13 removed lines

@@ -21,7 +21,7 @@ 
 $fromflag = false;
 $toemail = '';
 $template = 'alert_new_mp';
-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))
@@ -91,9 +91,9 @@ 
     // skip if they didn't lose their westminster seat in the most recent election
     if ($member->left_house(1)['date'] != $END_DATE) continue;
 
-    if ( !isset($cons[$member->constituency]) ) {
+    if (!isset($cons[$member->constituency])) {
         $cons_member = new MEMBER(array('constituency' => $member->constituency, 'house' => 1));
-        if ( !$cons_member ) {
+        if (!$cons_member) {
             continue;
         }
         $cons[$member->constituency] = $cons_member;
@@ -102,7 +102,7 @@ 
     }
 
     // these should never happen but let's just be sure
-    if ( $cons_member->person_id == $member->person_id ) continue;
+    if ($cons_member->person_id == $member->person_id) continue;
     if (!$cons_member->current_member_anywhere()) continue;
 
     if ($email != $current['email']) {
@@ -122,7 +122,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();
@@ -147,7 +147,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");
 
@@ -160,18 +160,18 @@ 
     $m = array(
         'DATA' => join("\n", $data),
         'CHANGE' => join("\n", $change),
-        'ALERT_IS' => count($data)==1 ? 'alert is' : 'alerts are',
-        'MPS' => count($data)==1 ? 'This MP' : 'These MPs',
-        'MPS2' => count($data)==1 ? 'MP' : 'MPs',
-        'ALERTS' => count($data)==1 ? 'an alert' : 'some alerts',
-        'ALERTS2' => count($data)==1 ? 'alert' : 'alerts',
-        'LINKS' => count($data)==1 ? 'link' : 'links',
+        'ALERT_IS' => count($data) == 1 ? 'alert is' : 'alerts are',
+        'MPS' => count($data) == 1 ? 'This MP' : 'These MPs',
+        'MPS2' => count($data) == 1 ? 'MP' : 'MPs',
+        'ALERTS' => count($data) == 1 ? 'an alert' : 'some alerts',
+        'ALERTS2' => count($data) == 1 ? 'alert' : 'alerts',
+        'LINKS' => count($data) == 1 ? 'link' : 'links',
     );
     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 +56 added lines, -26 removed lines

@@ -22,23 +22,30 @@ 
 $toemail = '';
 $template = 'alert_new_mp';
 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 (DEVSITE)
+	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 (DEVSITE) {
   $nomail = true;
+}
 
 # Change this to the end date
 $END_DATE = '2017-05-03';
 
-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;
@@ -68,14 +75,24 @@ 
 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'];
 
     // we only care about alerts for people speaking
-    if (!strstr($criteria_raw, 'speaker:')) continue;
+    if (!strstr($criteria_raw, 'speaker:')) {
+        continue;
+    }
 
     preg_match('#speaker:(\d+)#', $criteria_raw, $m);
     $person_id = $m[1];
@@ -86,10 +103,14 @@ 
     $member = $members[$person_id];
 
     // if they're still elected then don't send the email
-    if ($member->current_member_anywhere()) continue;
+    if ($member->current_member_anywhere()) {
+        continue;
+    }
 
     // skip if they didn't lose their westminster seat in the most recent election
-    if ($member->left_house(1)['date'] != $END_DATE) continue;
+    if ($member->left_house(1)['date'] != $END_DATE) {
+        continue;
+    }
 
     if ( !isset($cons[$member->constituency]) ) {
         $cons_member = new MEMBER(array('constituency' => $member->constituency, 'house' => 1));
@@ -97,13 +118,18 @@ 
             continue;
         }
         $cons[$member->constituency] = $cons_member;
-    } else {
+    }
+    else {
         $cons_member = $cons[$member->constituency];
     }
 
     // these should never happen but let's just be sure
-    if ( $cons_member->person_id == $member->person_id ) continue;
-    if (!$cons_member->current_member_anywhere()) continue;
+    if ( $cons_member->person_id == $member->person_id ) {
+        continue;
+    }
+    if (!$cons_member->current_member_anywhere()) {
+        continue;
+    }
 
     if ($email != $current['email']) {
         if ($email_text && $change_text) {
@@ -118,7 +144,8 @@ 
         if ($q->rows() > 0) {
             $user_id = $q->field(0, 'user_id');
             $registered++;
-        } else {
+        }
+        else {
             $user_id = 0;
             $unregistered++;
         }
@@ -144,7 +171,8 @@ 
 $sss = "Active alerts: $active\nEmail lookups: $registered registered, $unregistered unregistered\nQuery lookups: $queries\nSent emails: $sentemails\n";
 if ($globalsuccess) {
       $sss .= 'Everything went swimmingly, in ';
-} else {
+}
+else {
       $sss .= 'Something went wrong! Total time: ';
 }
 $sss .= (getmicrotime()-$global_start)."\n\n";
@@ -171,11 +199,13 @@ 
         $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);
         }
-    } else {
+    }
+    else {
         mlog(join('', $data));
         $success = 1;
     }

scripts/video-mark-missing.php

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 . '"');
 $hpos_from = $q->field(0, '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);

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";