mysociety / theyworkforyou

scripts/alertmailer.php

Indentation +165 added lines, -165 removed lines

@@ -6,7 +6,7 @@ 
  */
 
 function mlog($message) {
-	print $message;
+    print $message;
 }
 
 include_once '../www/includes/easyparliament/init.php';
@@ -24,9 +24,9 @@ 
 # Last sent is timestamp of last alerts gone out.
 # Last batch is the search index batch number last alert went out to.
 if (is_file('alerts-lastsent'))
-	$lastsent = file('alerts-lastsent');
+    $lastsent = file('alerts-lastsent');
 else
-	$lastsent = array('', 0);
+    $lastsent = array('', 0);
 
 $lastupdated = trim($lastsent[0]);
 if (!$lastupdated) $lastupdated = strtotime('00:00 today');
@@ -38,13 +38,13 @@ 
 # have been made since last time we ran
 $batch_query_fragment = "";
 for ($i=$lastbatch + 1; $i <= $max_batch_id; $i++) {
-	$batch_query_fragment .= "batch:$i ";
+    $batch_query_fragment .= "batch:$i ";
 }
 $batch_query_fragment = trim($batch_query_fragment);
 mlog("batch_query_fragment: " . $batch_query_fragment . "\n");
 
 if (!$batch_query_fragment) {
-	mlog("No new batches since last run - nothing to run over!");
+    mlog("No new batches since last run - nothing to run over!");
     exit;
 }
 
@@ -56,28 +56,28 @@ 
 $toemail = '';
 $template = 'alert_mailout';
 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)
-	$nomail = true;
+    $nomail = true;
 
 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;
@@ -140,142 +140,142 @@ 
 $outof = count($alertdata);
 $start_time = time();
 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;
-	$criteria_raw = $alertitem['criteria'];
-	if (preg_match('#\bOR\b#', $criteria_raw)) {
-		$criteria_raw = "($criteria_raw)";
-	}
-	$criteria_batch = $criteria_raw . " " . $batch_query_fragment;
-
-	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 = '';
-		$q = $db->query('SELECT user_id FROM users WHERE email = :email', array(
+    $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 (preg_match('#\bOR\b#', $criteria_raw)) {
+        $criteria_raw = "($criteria_raw)";
+    }
+    $criteria_batch = $criteria_raw . " " . $batch_query_fragment;
+
+    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 = '';
+        $q = $db->query('SELECT user_id FROM users WHERE email = :email', array(
             ':email' => $email
             ));
-		if ($q->rows() > 0) {
-			$user_id = $q->field(0, 'user_id');
-			$registered++;
-		} else {
-			$user_id = 0;
-			$unregistered++;
-		}
-		mlog("\nEMAIL: $email, uid $user_id; memory usage : ".memory_get_usage()."\n");
-	}
-
-	$data = null;
-	if (!isset($results[$criteria_batch])) {
-		mlog("  ALERT $active/$outof QUERY $queries : Xapian query '$criteria_batch'");
-		$start = getmicrotime();
-		$SEARCHENGINE = new SEARCHENGINE($criteria_batch);
-		#mlog("query_remade: " . $SEARCHENGINE->query_remade() . "\n");
-		$args = array(
-			's' => $criteria_raw, # Note: use raw here for URLs, whereas search engine has batch
-			'threshold' => $lastupdated, # Return everything added since last time this script was run
-			'o' => 'c',
-			'num' => 1000, // this is limited to 1000 in hansardlist.php anyway
-			'pop' => 1,
-			'e' => 1 # Don't escape ampersands
-		);
-		$data = $DEBATELIST->_get_data_by_search($args);
-		# add to cache (but only for speaker queries, which are commonly repeated)
-		# Don't cache, it's very quick, and we'd prefer low memory usage
-		#if (preg_match('#^speaker:\d+$#', $criteria_raw, $m)) {
-		#	mlog(", caching");
-		#	$results[$criteria_batch] = $data;
-		#}
-		#		unset($SEARCHENGINE);
-		$total_results = $data['info']['total_results'];
-		$queries++;
-		mlog(", hits ".$total_results.", time ".(getmicrotime()-$start)."\n");
-	} else {
-		mlog("  ACTION $active/$outof CACHE HIT : Using cached result for '$criteria_batch'\n");
-		$data = $results[$criteria_batch];
-	}
-
-	if (isset($data['rows']) && count($data['rows']) > 0) {
-		usort($data['rows'], 'sort_by_stuff'); # Sort results into order, by major, then date, then hpos
-		$o = array(); $major = 0; $count = array(); $total = 0;
-		$any_content = false;
-		foreach ($data['rows'] as $row) {
-			if ($major !== $row['major']) {
-				$count[$major] = $total; $total = 0;
-				$major = $row['major'];
-				$o[$major] = '';
-				$k = 3;
-			}
-			#mlog($row['major'] . " " . $row['gid'] ."\n");
-
-			# Due to database server failure and restoring from day
-			# old backup, 17th January 2012 is being newly
-			# inserted, but has already been alerted upon. So
-			# manually now stop anything from before 18th January
-			# 2012 from sending an email alert again.
-			if ($row['hdate'] < '2012-01-18') continue;
-
-			$q = $db->query('SELECT gid_from FROM gidredirect WHERE gid_to = :gid_to', array(
+        if ($q->rows() > 0) {
+            $user_id = $q->field(0, 'user_id');
+            $registered++;
+        } else {
+            $user_id = 0;
+            $unregistered++;
+        }
+        mlog("\nEMAIL: $email, uid $user_id; memory usage : ".memory_get_usage()."\n");
+    }
+
+    $data = null;
+    if (!isset($results[$criteria_batch])) {
+        mlog("  ALERT $active/$outof QUERY $queries : Xapian query '$criteria_batch'");
+        $start = getmicrotime();
+        $SEARCHENGINE = new SEARCHENGINE($criteria_batch);
+        #mlog("query_remade: " . $SEARCHENGINE->query_remade() . "\n");
+        $args = array(
+            's' => $criteria_raw, # Note: use raw here for URLs, whereas search engine has batch
+            'threshold' => $lastupdated, # Return everything added since last time this script was run
+            'o' => 'c',
+            'num' => 1000, // this is limited to 1000 in hansardlist.php anyway
+            'pop' => 1,
+            'e' => 1 # Don't escape ampersands
+        );
+        $data = $DEBATELIST->_get_data_by_search($args);
+        # add to cache (but only for speaker queries, which are commonly repeated)
+        # Don't cache, it's very quick, and we'd prefer low memory usage
+        #if (preg_match('#^speaker:\d+$#', $criteria_raw, $m)) {
+        #	mlog(", caching");
+        #	$results[$criteria_batch] = $data;
+        #}
+        #		unset($SEARCHENGINE);
+        $total_results = $data['info']['total_results'];
+        $queries++;
+        mlog(", hits ".$total_results.", time ".(getmicrotime()-$start)."\n");
+    } else {
+        mlog("  ACTION $active/$outof CACHE HIT : Using cached result for '$criteria_batch'\n");
+        $data = $results[$criteria_batch];
+    }
+
+    if (isset($data['rows']) && count($data['rows']) > 0) {
+        usort($data['rows'], 'sort_by_stuff'); # Sort results into order, by major, then date, then hpos
+        $o = array(); $major = 0; $count = array(); $total = 0;
+        $any_content = false;
+        foreach ($data['rows'] as $row) {
+            if ($major !== $row['major']) {
+                $count[$major] = $total; $total = 0;
+                $major = $row['major'];
+                $o[$major] = '';
+                $k = 3;
+            }
+            #mlog($row['major'] . " " . $row['gid'] ."\n");
+
+            # Due to database server failure and restoring from day
+            # old backup, 17th January 2012 is being newly
+            # inserted, but has already been alerted upon. So
+            # manually now stop anything from before 18th January
+            # 2012 from sending an email alert again.
+            if ($row['hdate'] < '2012-01-18') continue;
+
+            $q = $db->query('SELECT gid_from FROM gidredirect WHERE gid_to = :gid_to', array(
                 ':gid_to' => 'uk.org.publicwhip/' . $sects_gid[$major] . '/' . $row['gid']
                 ));
-			if ($q->rows() > 0) continue;
-			--$k;
-			if ($k>=0) {
-				$any_content = true;
-				$parentbody = text_html_to_email($row['parent']['body']);
-				$body = text_html_to_email($row['extract']);
-				if (isset($row['speaker']) && count($row['speaker'])) $body = $row['speaker']['name'] . ': ' . $body;
-
-				$body = wordwrap($body, 72);
-				$o[$major] .= $parentbody . ' (' . format_date($row['hdate'], SHORTDATEFORMAT) . ")\nhttps://www.theyworkforyou.com" . $row['listurl'] . "\n";
-				$o[$major] .= $body . "\n\n";
-			}
-			$total++;
-		}
-		$count[$major] = $total;
-
-		if ($any_content) {
-			# Add data to email_text
-			$desc = trim(html_entity_decode($data['searchdescription']));
-			$desc = trim(preg_replace('#\(?B\d+( OR B\d+)*\)?\s*#', '', $desc));
-			foreach ($o as $major => $body) {
-				if ($body) {
-					$heading = $desc . ' : ' . $count[$major] . ' ' . $sects[$major] . ($count[$major]!=1?'s':'');
-					$email_text .= "$heading\n".str_repeat('=',strlen($heading))."\n\n";
-					if ($count[$major] > 3) {
-						$email_text .= "There are more results than we have shown here. See more:\nhttps://www.theyworkforyou.com/search/?s=".urlencode($criteria_raw)."+section:".$sects_search[$major]."&o=d\n\n";
-					}
-					$email_text .= $body;
-				}
-			}
-		}
-	}
+            if ($q->rows() > 0) continue;
+            --$k;
+            if ($k>=0) {
+                $any_content = true;
+                $parentbody = text_html_to_email($row['parent']['body']);
+                $body = text_html_to_email($row['extract']);
+                if (isset($row['speaker']) && count($row['speaker'])) $body = $row['speaker']['name'] . ': ' . $body;
+
+                $body = wordwrap($body, 72);
+                $o[$major] .= $parentbody . ' (' . format_date($row['hdate'], SHORTDATEFORMAT) . ")\nhttps://www.theyworkforyou.com" . $row['listurl'] . "\n";
+                $o[$major] .= $body . "\n\n";
+            }
+            $total++;
+        }
+        $count[$major] = $total;
+
+        if ($any_content) {
+            # Add data to email_text
+            $desc = trim(html_entity_decode($data['searchdescription']));
+            $desc = trim(preg_replace('#\(?B\d+( OR B\d+)*\)?\s*#', '', $desc));
+            foreach ($o as $major => $body) {
+                if ($body) {
+                    $heading = $desc . ' : ' . $count[$major] . ' ' . $sects[$major] . ($count[$major]!=1?'s':'');
+                    $email_text .= "$heading\n".str_repeat('=',strlen($heading))."\n\n";
+                    if ($count[$major] > 3) {
+                        $email_text .= "There are more results than we have shown here. See more:\nhttps://www.theyworkforyou.com/search/?s=".urlencode($criteria_raw)."+section:".$sects_search[$major]."&o=d\n\n";
+                    }
+                    $email_text .= $body;
+                }
+            }
+        }
+    }
 }
 if ($email_text)
-	write_and_send_email($current, $email_text, $template);
+    write_and_send_email($current, $email_text, $template);
 
 mlog("\n");
 
 $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);
 if (!$nomail && !$onlyemail) {
-	$fp = fopen('alerts-lastsent', 'w');
-	fwrite($fp, time() . "\n");
-	fwrite($fp, $max_batch_id);
-	fclose($fp);
-	mail(ALERT_STATS_EMAILS, 'Email alert statistics', $sss, 'From: Email Alerts <fawkes@dracos.co.uk>');
+    $fp = fopen('alerts-lastsent', 'w');
+    fwrite($fp, time() . "\n");
+    fwrite($fp, $max_batch_id);
+    fclose($fp);
+    mail(ALERT_STATS_EMAILS, 'Email alert statistics', $sss, 'From: Email Alerts <fawkes@dracos.co.uk>');
 }
 mlog(date('r') . "\n");
 
@@ -303,30 +303,30 @@ 
 }
 
 function write_and_send_email($current, $data, $template) {
-	global $globalsuccess, $sentemails, $nomail, $start_time;
-
-	$data .= '====================';
-	$sentemails++;
-	mlog("SEND $sentemails : Sending email to $current[email] ... ");
-	$d = array('to' => $current['email'], 'template' => $template);
-	$m = array(
-		'DATA' => $data,
-		'MANAGE' => 'https://www.theyworkforyou.com/D/' . $current['token'],
-	);
-	if (!$nomail) {
-		$success = send_template_email($d, $m, true, true); # true = "Precedence: bulk", want bounces
-		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($data);
-		$success = 1;
-	}
-	mlog("done\n");
-	if (!$success) $globalsuccess = 0;
+    global $globalsuccess, $sentemails, $nomail, $start_time;
+
+    $data .= '====================';
+    $sentemails++;
+    mlog("SEND $sentemails : Sending email to $current[email] ... ");
+    $d = array('to' => $current['email'], 'template' => $template);
+    $m = array(
+        'DATA' => $data,
+        'MANAGE' => 'https://www.theyworkforyou.com/D/' . $current['token'],
+    );
+    if (!$nomail) {
+        $success = send_template_email($d, $m, true, true); # true = "Precedence: bulk", want bounces
+        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($data);
+        $success = 1;
+    }
+    mlog("done\n");
+    if (!$success) $globalsuccess = 0;
 }
 
 function text_html_to_email($s) {

Spacing +21 added lines, -21 removed lines

@@ -11,7 +11,7 @@ 
 
 include_once '../www/includes/easyparliament/init.php';
 ini_set('memory_limit', -1);
-include_once INCLUDESPATH . 'easyparliament/member.php';
+include_once INCLUDESPATH.'easyparliament/member.php';
 
 $global_start = getmicrotime();
 $db = new ParlDB;
@@ -19,7 +19,7 @@ 
 # Get current value of latest batch
 $q = $db->query('SELECT max(indexbatch_id) as max_batch_id FROM indexbatch');
 $max_batch_id = $q->field(0, 'max_batch_id');
-mlog("max_batch_id: " . $max_batch_id . "\n");
+mlog("max_batch_id: ".$max_batch_id."\n");
 
 # Last sent is timestamp of last alerts gone out.
 # Last batch is the search index batch number last alert went out to.
@@ -37,11 +37,11 @@ 
 # Construct query fragment to select search index batches which
 # have been made since last time we ran
 $batch_query_fragment = "";
-for ($i=$lastbatch + 1; $i <= $max_batch_id; $i++) {
+for ($i = $lastbatch + 1; $i <= $max_batch_id; $i++) {
 	$batch_query_fragment .= "batch:$i ";
 }
 $batch_query_fragment = trim($batch_query_fragment);
-mlog("batch_query_fragment: " . $batch_query_fragment . "\n");
+mlog("batch_query_fragment: ".$batch_query_fragment."\n");
 
 if (!$batch_query_fragment) {
 	mlog("No new batches since last run - nothing to run over!");
@@ -55,7 +55,7 @@ 
 $fromflag = false;
 $toemail = '';
 $template = 'alert_mailout';
-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))
@@ -150,13 +150,13 @@ 
 	if (preg_match('#\bOR\b#', $criteria_raw)) {
 		$criteria_raw = "($criteria_raw)";
 	}
-	$criteria_batch = $criteria_raw . " " . $batch_query_fragment;
+	$criteria_batch = $criteria_raw." ".$batch_query_fragment;
 
 	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'];
+		$current['token'] = $alertitem['alert_id'].'-'.$alertitem['registrationtoken'];
 		$email_text = '';
 		$q = $db->query('SELECT user_id FROM users WHERE email = :email', array(
             ':email' => $email
@@ -195,7 +195,7 @@ 
 		#		unset($SEARCHENGINE);
 		$total_results = $data['info']['total_results'];
 		$queries++;
-		mlog(", hits ".$total_results.", time ".(getmicrotime()-$start)."\n");
+		mlog(", hits ".$total_results.", time ".(getmicrotime() - $start)."\n");
 	} else {
 		mlog("  ACTION $active/$outof CACHE HIT : Using cached result for '$criteria_batch'\n");
 		$data = $results[$criteria_batch];
@@ -222,19 +222,19 @@ 
 			if ($row['hdate'] < '2012-01-18') continue;
 
 			$q = $db->query('SELECT gid_from FROM gidredirect WHERE gid_to = :gid_to', array(
-                ':gid_to' => 'uk.org.publicwhip/' . $sects_gid[$major] . '/' . $row['gid']
+                ':gid_to' => 'uk.org.publicwhip/'.$sects_gid[$major].'/'.$row['gid']
                 ));
 			if ($q->rows() > 0) continue;
 			--$k;
-			if ($k>=0) {
+			if ($k >= 0) {
 				$any_content = true;
 				$parentbody = text_html_to_email($row['parent']['body']);
 				$body = text_html_to_email($row['extract']);
-				if (isset($row['speaker']) && count($row['speaker'])) $body = $row['speaker']['name'] . ': ' . $body;
+				if (isset($row['speaker']) && count($row['speaker'])) $body = $row['speaker']['name'].': '.$body;
 
 				$body = wordwrap($body, 72);
-				$o[$major] .= $parentbody . ' (' . format_date($row['hdate'], SHORTDATEFORMAT) . ")\nhttps://www.theyworkforyou.com" . $row['listurl'] . "\n";
-				$o[$major] .= $body . "\n\n";
+				$o[$major] .= $parentbody.' ('.format_date($row['hdate'], SHORTDATEFORMAT).")\nhttps://www.theyworkforyou.com".$row['listurl']."\n";
+				$o[$major] .= $body."\n\n";
 			}
 			$total++;
 		}
@@ -246,8 +246,8 @@ 
 			$desc = trim(preg_replace('#\(?B\d+( OR B\d+)*\)?\s*#', '', $desc));
 			foreach ($o as $major => $body) {
 				if ($body) {
-					$heading = $desc . ' : ' . $count[$major] . ' ' . $sects[$major] . ($count[$major]!=1?'s':'');
-					$email_text .= "$heading\n".str_repeat('=',strlen($heading))."\n\n";
+					$heading = $desc.' : '.$count[$major].' '.$sects[$major].($count[$major] != 1 ? 's' : '');
+					$email_text .= "$heading\n".str_repeat('=', strlen($heading))."\n\n";
 					if ($count[$major] > 3) {
 						$email_text .= "There are more results than we have shown here. See more:\nhttps://www.theyworkforyou.com/search/?s=".urlencode($criteria_raw)."+section:".$sects_search[$major]."&o=d\n\n";
 					}
@@ -268,16 +268,16 @@ 
 } else {
 	$sss .= 'Something went wrong! Total time: ';
 }
-$sss .= (getmicrotime()-$global_start)."\n\n";
+$sss .= (getmicrotime() - $global_start)."\n\n";
 mlog($sss);
 if (!$nomail && !$onlyemail) {
 	$fp = fopen('alerts-lastsent', 'w');
-	fwrite($fp, time() . "\n");
+	fwrite($fp, time()."\n");
 	fwrite($fp, $max_batch_id);
 	fclose($fp);
 	mail(ALERT_STATS_EMAILS, 'Email alert statistics', $sss, 'From: Email Alerts <fawkes@dracos.co.uk>');
 }
-mlog(date('r') . "\n");
+mlog(date('r')."\n");
 
 function sort_by_stuff($a, $b) {
     # Always have future business first.
@@ -311,13 +311,13 @@ 
 	$d = array('to' => $current['email'], 'template' => $template);
 	$m = array(
 		'DATA' => $data,
-		'MANAGE' => 'https://www.theyworkforyou.com/D/' . $current['token'],
+		'MANAGE' => 'https://www.theyworkforyou.com/D/'.$current['token'],
 	);
 	if (!$nomail) {
 		$success = send_template_email($d, $m, true, true); # true = "Precedence: bulk", want bounces
 		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);
 		}
@@ -334,7 +334,7 @@ 
     $s = preg_replace('#</?span[^>]*>#', '*', $s);
     $s = str_replace(
         array('&#163;', '&#8211;', '&#8212;', '&#8217;', '<br>'),
-        array("\xa3",   '-',       '-',       "'",       "\n"  ),
+        array("\xa3", '-', '-', "'", "\n"),
         $s
     );
     return $s;

Braces +83 added lines, -35 removed lines

@@ -23,15 +23,20 @@ 
 
 # Last sent is timestamp of last alerts gone out.
 # Last batch is the search index batch number last alert went out to.
-if (is_file('alerts-lastsent'))
+if (is_file('alerts-lastsent')) {
 	$lastsent = file('alerts-lastsent');
-else
+} else {
 	$lastsent = array('', 0);
+}
 
 $lastupdated = trim($lastsent[0]);
-if (!$lastupdated) $lastupdated = strtotime('00:00 today');
+if (!$lastupdated) {
+    $lastupdated = strtotime('00:00 today');
+}
 $lastbatch = trim($lastsent[1]);
-if (!$lastbatch) $lastbatch = 0;
+if (!$lastbatch) {
+    $lastbatch = 0;
+}
 mlog("lastupdated: $lastupdated lastbatch: $lastbatch\n");
 
 # Construct query fragment to select search index batches which
@@ -56,14 +61,18 @@ 
 $toemail = '';
 $template = 'alert_mailout';
 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
@@ -71,10 +80,13 @@ 
 	}
 }
 
-if (DEVSITE)
+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;
@@ -142,10 +154,18 @@ 
 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 (preg_match('#\bOR\b#', $criteria_raw)) {
 		$criteria_raw = "($criteria_raw)";
@@ -153,8 +173,9 @@ 
 	$criteria_batch = $criteria_raw . " " . $batch_query_fragment;
 
 	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 = '';
@@ -219,18 +240,24 @@ 
 			# inserted, but has already been alerted upon. So
 			# manually now stop anything from before 18th January
 			# 2012 from sending an email alert again.
-			if ($row['hdate'] < '2012-01-18') continue;
+			if ($row['hdate'] < '2012-01-18') {
+			    continue;
+			}
 
 			$q = $db->query('SELECT gid_from FROM gidredirect WHERE gid_to = :gid_to', array(
                 ':gid_to' => 'uk.org.publicwhip/' . $sects_gid[$major] . '/' . $row['gid']
                 ));
-			if ($q->rows() > 0) continue;
+			if ($q->rows() > 0) {
+			    continue;
+			}
 			--$k;
 			if ($k>=0) {
 				$any_content = true;
 				$parentbody = text_html_to_email($row['parent']['body']);
 				$body = text_html_to_email($row['extract']);
-				if (isset($row['speaker']) && count($row['speaker'])) $body = $row['speaker']['name'] . ': ' . $body;
+				if (isset($row['speaker']) && count($row['speaker'])) {
+				    $body = $row['speaker']['name'] . ': ' . $body;
+				}
 
 				$body = wordwrap($body, 72);
 				$o[$major] .= $parentbody . ' (' . format_date($row['hdate'], SHORTDATEFORMAT) . ")\nhttps://www.theyworkforyou.com" . $row['listurl'] . "\n";
@@ -257,8 +284,9 @@ 
 		}
 	}
 }
-if ($email_text)
+if ($email_text) {
 	write_and_send_email($current, $email_text, $template);
+}
 
 mlog("\n");
 
@@ -281,24 +309,42 @@ 
 
 function sort_by_stuff($a, $b) {
     # Always have future business first.
-    if ($a['major'] == 'F' && $b['major'] != 'F') return -1;
-    if ($b['major'] == 'F' && $a['major'] != 'F') return 1;
+    if ($a['major'] == 'F' && $b['major'] != 'F') {
+        return -1;
+    }
+    if ($b['major'] == 'F' && $a['major'] != 'F') {
+        return 1;
+    }
 
     # Otherwise sort firstly by major number (so Commons before NI before SP before Lords)
-    if ($a['major'] > $b['major']) return 1;
-    if ($a['major'] < $b['major']) return -1;
+    if ($a['major'] > $b['major']) {
+        return 1;
+    }
+    if ($a['major'] < $b['major']) {
+        return -1;
+    }
 
     # Then by date (most recent first for everything except future, which is the opposite)
     if ($a['major'] == 'F') {
-        if ($a['hdate'] > $b['hdate']) return 1;
-        if ($a['hdate'] < $b['hdate']) return -1;
+        if ($a['hdate'] > $b['hdate']) {
+            return 1;
+        }
+        if ($a['hdate'] < $b['hdate']) {
+            return -1;
+        }
     } else {
-        if ($a['hdate'] < $b['hdate']) return 1;
-        if ($a['hdate'] > $b['hdate']) return -1;
+        if ($a['hdate'] < $b['hdate']) {
+            return 1;
+        }
+        if ($a['hdate'] > $b['hdate']) {
+            return -1;
+        }
     }
 
     # Lastly by speech position within a debate.
-    if ($a['hpos'] == $b['hpos']) return 0;
+    if ($a['hpos'] == $b['hpos']) {
+        return 0;
+    }
     return ($a['hpos'] > $b['hpos']) ? 1 : -1;
 }
 
@@ -326,8 +372,10 @@ 
 		$success = 1;
 	}
 	mlog("done\n");
-	if (!$success) $globalsuccess = 0;
-}
+	if (!$success) {
+	    $globalsuccess = 0;
+	}
+	}
 
 function text_html_to_email($s) {
     $s = preg_replace('#</?(i|small)>#', '', $s);

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

@@ -307,7 +307,7 @@
 
 	$data .= '====================';
 	$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' => $data,

scripts/create_initial_topics.php

Indentation +10 added lines, -10 removed lines

@@ -133,14 +133,14 @@
 );
 
 foreach ($all_topics as $name => $topic) {
-  $existing = $topics->getTopic($name);
-  if ($existing) {
-      print "$name already exists\n";
-  } else {
-      $topic['slug'] = $name;
-      $topic['description'] = $topic['blurb'];
-      $topic = new MySociety\TheyWorkForYou\Topic($topic);
-      $topic->save();
-      print "created $name\n";
-  }
+    $existing = $topics->getTopic($name);
+    if ($existing) {
+        print "$name already exists\n";
+    } else {
+        $topic['slug'] = $name;
+        $topic['description'] = $topic['blurb'];
+        $topic = new MySociety\TheyWorkForYou\Topic($topic);
+        $topic->save();
+        print "created $name\n";
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 <?php
 
-include_once dirname(__FILE__) .'/../www/includes/easyparliament/init.php';
+include_once dirname(__FILE__).'/../www/includes/easyparliament/init.php';
 
 $topics = new MySociety\TheyWorkForYou\Topics();
 

scripts/mprss.php

Indentation +45 added lines, -45 removed lines

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

Spacing +17 added lines, -17 removed lines

@@ -3,13 +3,13 @@ 
 // Generates the RSS feeds for currently sitting MPs.
 
 include '../www/includes/easyparliament/init.php';
-include_once INCLUDESPATH . 'easyparliament/member.php';
+include_once INCLUDESPATH.'easyparliament/member.php';
 
 // Where all the RSS feeds go.
-$rsspath = BASEDIR . '/rss/mp/';
+$rsspath = BASEDIR.'/rss/mp/';
 
 // Make things group writable.
-umask (002);
+umask(002);
 
 $HANSARDLIST = new HANSARDLIST();
 $db = $HANSARDLIST->db;
@@ -19,10 +19,10 @@ 
 if ($q->rows() <= 0) exit;
 
 $starttime = time();
-for ($personrow=0; $personrow<$q->rows(); $personrow++) {
+for ($personrow = 0; $personrow < $q->rows(); $personrow++) {
 	$person_id = $q->field($personrow, '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.
@@ -33,7 +33,7 @@ 
 		
 	$date = gmdate('Y-m-d');
 	$time = gmdate('H:i:s');
-	$datenow = $date . 'T' . $time . '+00:00';
+	$datenow = $date.'T'.$time.'+00:00';
 		
 	// Prepare the meat of the RSS file.
 	$items = '';
@@ -47,7 +47,7 @@ 
 			$title = _htmlentities(str_replace('&#8212;', '-', $row['parent']['body']));
 
 			$link = isset($row['listurl']) ? $row['listurl'] : '';
-			$link = 'https://' . DOMAIN . $link;
+			$link = 'https://'.DOMAIN.$link;
 				
 			$description = _htmlentities(trim_characters($row['body'], 0, 200));
 			$contentencoded = $row['body'];
@@ -59,9 +59,9 @@ 
 				$htime = '00:00:00';
 			}
 				
-			$date = $hdate . 'T' . $htime . '+00:00';
+			$date = $hdate.'T'.$htime.'+00:00';
 				
-			$items .= '<rdf:li rdf:resource="' . $link . '" />' . "\n";
+			$items .= '<rdf:li rdf:resource="'.$link.'" />'."\n";
 			$entries .= "<item rdf:about=\"$link\">
 	<title>$title</title>
 	<link>$link</link>
@@ -82,34 +82,34 @@ 
   xmlns="http://purl.org/rss/1.0/"
   xmlns:content="http://purl.org/rss/1.0/modules/content/">
 		
-<channel rdf:about="https://' . DOMAIN . $mpurl . '">
-<title>' . entities_to_numbers($MEMBER->full_name()) . '\'s recent appearances (TheyWorkForYou)</title>
-<link>https://' . DOMAIN . $mpurl . '</link>
+<channel rdf:about="https://' . DOMAIN.$mpurl.'">
+<title>' . entities_to_numbers($MEMBER->full_name()).'\'s recent appearances (TheyWorkForYou)</title>
+<link>https://' . DOMAIN.$mpurl.'</link>
 <description></description>
 <dc:language>en-gb</dc:language>
 <dc:creator>TheyWorkForYou.com</dc:creator>
-<dc:date>' . $datenow . '</dc:date>
+<dc:date>' . $datenow.'</dc:date>
 
 <items>
 <rdf:Seq>
-' . $items . '</rdf:Seq>
+' . $items.'</rdf:Seq>
 </items>
 
 </channel>
 
-' . $entries . '
+' . $entries.'
 
 </rdf:RDF>';
 		
 	// Write the text to the file...
-	$filename = $rsspath . $person_id . '.rdf';
+	$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);
+	fclose($fh);
 }
 
 #print "Took " . (time()-$starttime) . " seconds\n";

Braces +3 added lines, -1 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();
 for ($personrow=0; $personrow<$q->rows(); $personrow++) {

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

scripts/alertgonemps.php

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));
         if ($q->rows() > 0) {
             $user_id = $q->field(0, '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;
 }
 

Spacing +10 added lines, -10 removed lines

@@ -11,7 +11,7 @@ 
 
 include_once '../www/includes/easyparliament/init.php';
 ini_set('memory_limit', -1);
-include_once INCLUDESPATH . 'easyparliament/member.php';
+include_once INCLUDESPATH.'easyparliament/member.php';
 
 $global_start = getmicrotime();
 $db = new ParlDB;
@@ -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))
@@ -100,7 +100,7 @@ 
 		if ($email_text)
             write_and_send_email($current, $email_text, $template);
 		$current['email'] = $email;
-		$current['token'] = $alertitem['alert_id'] . '-' . $alertitem['registrationtoken'];
+		$current['token'] = $alertitem['alert_id'].'-'.$alertitem['registrationtoken'];
 		$email_text = array();
 		$q = $db->query('SELECT user_id FROM users WHERE email = :email', array(
             ':email' => $email));
@@ -116,7 +116,7 @@ 
 
     $lh = $member->left_house();
     $lh = array_shift($lh);
-    $text = '* ' . $member->full_name() . ', left ' . $lh['date_pretty'];
+    $text = '* '.$member->full_name().', left '.$lh['date_pretty'];
     if (!in_array($text, $email_text))
 	    $email_text[] = $text;
 }
@@ -131,9 +131,9 @@ 
 } 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");
+mlog(date('r')."\n");
 
 function write_and_send_email($current, $data, $template) {
 	global $globalsuccess, $sentemails, $nomail, $start_time;
@@ -143,15 +143,15 @@ 
 	$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',
+		'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
+		if (((time() - $start_time) / $sentemails) < 0.5) { # number of seconds per mail not to be quicker than
 			mlog("pausing ... ");
 			sleep(1);
 		}

Braces +49 added lines, -24 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");
 
@@ -160,6 +183,8 @@ 
 		$success = 1;
 	}
 	mlog("done\n");
-	if (!$success) $globalsuccess = 0;
-}
+	if (!$success) {
+	    $globalsuccess = 0;
+	}
+	}
 

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),

scripts/video-speed.php

Spacing +9 added lines, -9 removed lines

@@ -5,7 +5,7 @@ 
 $db = new ParlDB;
 
 $q = $db->query('select distinct(person_id) from hansard where video_status in (5,7) and person_id>0 limit 5');
-for ($i=0; $i<$q->rows(); $i++) {
+for ($i = 0; $i < $q->rows(); $i++) {
     $spid = $q->field($i, 'person_id');
     calculate_speed($db, $spid);
 }
@@ -18,20 +18,20 @@ 
     $total_words = 0;
     $total_speed = 0;
     $num = 0;
-    for ($i=0; $i<$q->rows(); $i++) {
+    for ($i = 0; $i < $q->rows(); $i++) {
         $hpos = $q->field($i, 'hpos');
         $hdate = $q->field($i, 'hdate');
         $gid = $q->field($i, 'gid');
         $atime = $q->field($i, 'atime');
         $body = strip_tags($q->field($i, 'body'));
-        $qq = $db->query('select time_to_sec(atime) as atime from hansard,video_timestamps where hansard.gid=video_timestamps.gid and deleted=0 and video_status in (5,7) and hdate="' . $hdate . '" and hpos=' . ($hpos+1) . ' group by video_timestamps.gid');
+        $qq = $db->query('select time_to_sec(atime) as atime from hansard,video_timestamps where hansard.gid=video_timestamps.gid and deleted=0 and video_status in (5,7) and hdate="'.$hdate.'" and hpos='.($hpos + 1).' group by video_timestamps.gid');
         $next_atime = $qq->field(0, 'atime');
         if (!$next_atime) continue;
         $duration = $next_atime - $atime;
-        if ($duration<=0) continue;
+        if ($duration <= 0) continue;
         $words = preg_split('/\W+/', $body, -1, PREG_SPLIT_NO_EMPTY);
         $num_words = count($words);
-        $speed = $num_words / ($duration/60);
+        $speed = $num_words / ($duration / 60);
         $total_speed += $speed;
         print "$gid, $num_words words, from $atime to $next_atime, duration $duration s, speed $speed wpm\n";
         $total += $duration;
@@ -39,12 +39,12 @@ 
         $num++;
     }
 
-    $total_min = $total/60;
+    $total_min = $total / 60;
 
     print "Person ID $spid\n";
-    print "Average length = " . ($total/$num) . "s\n";
-    print "Average speed = " . ($total_words/$total_min) . "wpm\n";
-    print "Average of speeds = " . ($total_speed/$num) . "wpm\n";
+    print "Average length = ".($total / $num)."s\n";
+    print "Average speed = ".($total_words / $total_min)."wpm\n";
+    print "Average of speeds = ".($total_speed / $num)."wpm\n";
     print "\n";
 }
 

Braces +6 added lines, -2 removed lines

@@ -26,9 +26,13 @@
         $body = strip_tags($q->field($i, 'body'));
         $qq = $db->query('select time_to_sec(atime) as atime from hansard,video_timestamps where hansard.gid=video_timestamps.gid and deleted=0 and video_status in (5,7) and hdate="' . $hdate . '" and hpos=' . ($hpos+1) . ' group by video_timestamps.gid');
         $next_atime = $qq->field(0, 'atime');
-        if (!$next_atime) continue;
+        if (!$next_atime) {
+            continue;
+        }
         $duration = $next_atime - $atime;
-        if ($duration<=0) continue;
+        if ($duration<=0) {
+            continue;
+        }
         $words = preg_split('/\W+/', $body, -1, PREG_SPLIT_NO_EMPTY);
         $num_words = count($words);
         $speed = $num_words / ($duration/60);

tests/MemberTest.php

Indentation +8 added lines, -8 removed lines

@@ -325,10 +325,10 @@ 
 
         $msps = array(
             array(
-             'person_id' => "19",
-              'name' => "Mr Regional MSP1",
-              'constituency' => "Mid Scotland and Fife",
-              'house' => "4"
+                'person_id' => "19",
+                'name' => "Mr Regional MSP1",
+                'constituency' => "Mid Scotland and Fife",
+                'house' => "4"
             ),
             array(
                 'person_id' => "20",
@@ -340,10 +340,10 @@ 
         $this->assertEquals($msps, \MySociety\TheyWorkForYou\Member::getRegionalList('KY16 8YG', 4, 'SPE'));
         $mlas = array(
             array(
-              'person_id' => "21",
-              'name' => "Mr Regional MLA1",
-              'constituency' => "Belfast West",
-              'house' => "3"
+                'person_id' => "21",
+                'name' => "Mr Regional MLA1",
+                'constituency' => "Belfast West",
+                'house' => "3"
             ),
             array(
                 'person_id' => "22",

tests/FetchPageTestCase.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
     protected function base_fetch_page($vars, $dir, $page = 'index.php', $req_uri = '')
     {
         foreach ($vars as $k => $v) {
-            $vars[$k] =  $k . '=' . urlencode($v);
+            $vars[$k] = $k.'='.urlencode($v);
         }
 
         if (!$req_uri) {
@@ -17,7 +17,7 @@ 
         }
 
         $vars = join('&', $vars);
-        $command = 'parse_str($argv[1], $_GET); include_once("tests/Bootstrap.php"); chdir("www/docs/' . $dir . '"); include_once("' . $page . '");';
+        $command = 'parse_str($argv[1], $_GET); include_once("tests/Bootstrap.php"); chdir("www/docs/'.$dir.'"); include_once("'.$page.'");';
         $page = `REQUEST_URI=$req_uri REMOTE_ADDR=127.0.0.1 php -e -r '$command' -- '$vars'`;
 
         return $page;

tests/PostcodeTest.php

Indentation +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
     /**
      * Test converting a postcode to a constituency
      */
-	public function testPostcodeToConstituency()
+    public function testPostcodeToConstituency()
     {
         $this->assertEquals(
             'Cities of London and Westminster',

tests/AlertsPageTest.php

Spacing +6 added lines, -6 removed lines

@@ -21,37 +21,37 @@
 
     public function testFetchPage()
     {
-        $page = $this->fetch_page( array() );
+        $page = $this->fetch_page(array());
         $this->assertContains('TheyWorkForYou Email Alerts', $page);
     }
 
     public function testKeywordOnly() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'elephant'));
         $this->assertContains('Receive alerts when [elephant] is mentioned', $page);
     }
 
     public function testPostCodeOnly() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'SE17 3HE') );
+        $page = $this->fetch_page(array('alertsearch' => 'SE17 3HE'));
         $this->assertContains('when Mrs Test Current-MP', $page);
     }
 
     public function testPostCodeWithKeyWord()
     {
-        $page = $this->fetch_page( array( 'alertsearch' => 'SE17 3HE elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'SE17 3HE elephant'));
         $this->assertContains('You have used a postcode and something else', $page);
         $this->assertContains('Mentions of [elephant] by Mrs Test Current-MP', $page);
         $this->assertNotContains('by your MSP', $page);
     }
 
     public function testScottishPostcodeWithKeyword() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'PH6 2DB elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'PH6 2DB elephant'));
         $this->assertContains('You have used a postcode and something else', $page);
         $this->assertContains('Mentions of [elephant] by your MP, Mr Test2 Current-MP', $page);
         $this->assertContains('Mentions of [elephant] by your MSP, Mrs Test Current-MSP', $page);
     }
 
     public function testPostcodeAndKeywordWithNoSittingMP() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'OX1 4LF elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'OX1 4LF elephant'));
         $this->assertContains('You have used a postcode and something else', $page);
         $this->assertNotContains('Did you mean to get alerts for when your MP', $page);
     }