mysociety / theyworkforyou

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

scripts/wranstats.php

Indentation +14 added lines, -14 removed lines

@@ -6,7 +6,7 @@ 
 $db = new ParlDB;
 
 $q = $db->query(
-	'select person_id,
+    'select person_id,
 		count(hansard.epobject_id) as wrans,
 		sum(yes_votes) + IFNULL((select sum(vote) from uservotes, hansard as hansard2
 				  where uservotes.epobject_id=hansard2.epobject_id
@@ -20,23 +20,23 @@ 
 	group by person_id');
 
 for ($i=0; $i<$q->rows(); $i++) {
-	$p_id = $q->field($i, 'person_id');
-	$name = $q->field($i, 'first_name') . ' ' . $q->field($i, 'last_name');
-	$con = $q->field($i, 'constituency');
-	$wrans = $q->field($i, 'wrans');
-	$yes = $q->field($i, 'yes');
-	$no = $q->field($i, 'no');
-	if ($p_id) {
-	$qq = $db->query('(select hansard.epobject_id from hansard, uservotes
+    $p_id = $q->field($i, 'person_id');
+    $name = $q->field($i, 'first_name') . ' ' . $q->field($i, 'last_name');
+    $con = $q->field($i, 'constituency');
+    $wrans = $q->field($i, 'wrans');
+    $yes = $q->field($i, 'yes');
+    $no = $q->field($i, 'no');
+    if ($p_id) {
+    $qq = $db->query('(select hansard.epobject_id from hansard, uservotes
 			where hansard.epobject_id=uservotes.epobject_id
             and hansard.person_id = '.$p_id.' and major=3 and minor=2 and left_house>curdate())
 		union
 			(select hansard.epobject_id from hansard,member,anonvotes
 			 where hansard.epobject_id=anonvotes.epobject_id
              and hansard.person_id = '.$p_id.' and major=3 and minor=2 and left_house>curdate())');
-	$wrans_with_votes = $qq->rows();
-	} else {
-		$wrans_with_votes = '';
-	}
-	print "$name\t$con\t$wrans\t$wrans_with_votes\t$yes\t$no\n";
+    $wrans_with_votes = $qq->rows();
+    } else {
+        $wrans_with_votes = '';
+    }
+    print "$name\t$con\t$wrans\t$wrans_with_votes\t$yes\t$no\n";
 }

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
 		where major = 3 and minor = 2 and left_house > curdate()
 	group by person_id');
 
-for ($i=0; $i<$q->rows(); $i++) {
+for ($i = 0; $i < $q->rows(); $i++) {
 	$p_id = $q->field($i, 'person_id');
 	$name = $q->field($i, 'first_name') . ' ' . $q->field($i, 'last_name');
 	$con = $q->field($i, 'constituency');
@@ -29,11 +29,11 @@ 
 	if ($p_id) {
 	$qq = $db->query('(select hansard.epobject_id from hansard, uservotes
 			where hansard.epobject_id=uservotes.epobject_id
-            and hansard.person_id = '.$p_id.' and major=3 and minor=2 and left_house>curdate())
+            and hansard.person_id = '.$p_id . ' and major=3 and minor=2 and left_house>curdate())
 		union
 			(select hansard.epobject_id from hansard,member,anonvotes
 			 where hansard.epobject_id=anonvotes.epobject_id
-             and hansard.person_id = '.$p_id.' and major=3 and minor=2 and left_house>curdate())');
+             and hansard.person_id = '.$p_id . ' and major=3 and minor=2 and left_house>curdate())');
 	$wrans_with_votes = $qq->rows();
 	} else {
 		$wrans_with_votes = '';

Braces +2 added lines, -1 removed lines

@@ -35,7 +35,8 @@
 			 where hansard.epobject_id=anonvotes.epobject_id
              and hansard.person_id = '.$p_id.' and major=3 and minor=2 and left_house>curdate())');
 	$wrans_with_votes = $qq->rows();
-	} else {
+	}
+	else {
 		$wrans_with_votes = '';
 	}
 	print "$name\t$con\t$wrans\t$wrans_with_votes\t$yes\t$no\n";

scripts/video-check.php

Indentation +13 added lines, -13 removed lines

@@ -10,18 +10,18 @@
 	order by hdate, hpos');
 $last = array('hdate'=>'');
 for ($i=0; $i<$q->rows(); $i++) {
-	$row = array(
-		'atime' => $q->field($i, 'atime'),
-		'hdate' => $q->field($i, 'hdate'),
-		'gid' => $q->field($i, 'gid'),
-		'hpos' => $q->field($i, 'hpos')
-	);
-	if ($row['hdate'] != $last['hdate'])
-		$last = array();
-	if ($last && $row['atime'] < $last['atime']-5) {
-		print "PROBLEM; current row is $row[gid] $row[hdate] $row[atime]\n";
-		print "  Last was $last[gid] $last[hdate] $last[atime]\n";
-	}
-	$last = $row;
+    $row = array(
+        'atime' => $q->field($i, 'atime'),
+        'hdate' => $q->field($i, 'hdate'),
+        'gid' => $q->field($i, 'gid'),
+        'hpos' => $q->field($i, 'hpos')
+    );
+    if ($row['hdate'] != $last['hdate'])
+        $last = array();
+    if ($last && $row['atime'] < $last['atime']-5) {
+        print "PROBLEM; current row is $row[gid] $row[hdate] $row[atime]\n";
+        print "  Last was $last[gid] $last[hdate] $last[atime]\n";
+    }
+    $last = $row;
 }
 

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
 		and (user_id is null or user_id != -1) and deleted=0
 	order by hdate, hpos');
 $last = array('hdate'=>'');
-for ($i=0; $i<$q->rows(); $i++) {
+for ($i = 0; $i < $q->rows(); $i++) {
 	$row = array(
 		'atime' => $q->field($i, 'atime'),
 		'hdate' => $q->field($i, 'hdate'),
@@ -18,7 +18,7 @@ 
 	);
 	if ($row['hdate'] != $last['hdate'])
 		$last = array();
-	if ($last && $row['atime'] < $last['atime']-5) {
+	if ($last && $row['atime'] < $last['atime'] - 5) {
 		print "PROBLEM; current row is $row[gid] $row[hdate] $row[atime]\n";
 		print "  Last was $last[gid] $last[hdate] $last[atime]\n";
 	}

Braces +3 added lines, -2 removed lines

@@ -16,8 +16,9 @@
 		'gid' => $q->field($i, 'gid'),
 		'hpos' => $q->field($i, 'hpos')
 	);
-	if ($row['hdate'] != $last['hdate'])
-		$last = array();
+	if ($row['hdate'] != $last['hdate']) {
+			$last = array();
+	}
 	if ($last && $row['atime'] < $last['atime']-5) {
 		print "PROBLEM; current row is $row[gid] $row[hdate] $row[atime]\n";
 		print "  Last was $last[gid] $last[hdate] $last[atime]\n";

scripts/daily-api-usage.php

Braces +3 added lines, -1 removed lines

@@ -52,7 +52,9 @@
 <br><small style='color:#666'>$reason</small>
 ";
 }
-if (!$out) exit;
+if (!$out) {
+    exit;
+}
 
 $headers =
     "From: TheyWorkForYou <" . CONTACTEMAIL . ">\r\n" .

Spacing +7 added lines, -7 removed lines

@@ -22,7 +22,7 @@ 
 ');
 
 $keys = array();
-for ($i=0; $i<$q->rows(); $i++) {
+for ($i = 0; $i < $q->rows(); $i++) {
     $keys[] = $q->field($i, 'api_key');
 }
 $keys = join("','", $keys);
@@ -34,18 +34,18 @@ 
     GROUP BY api_key
 ");
 $summary = array();
-for ($i=0; $i<$q2->rows(); $i++) {
+for ($i = 0; $i < $q2->rows(); $i++) {
     $row = $q2->row($i);
     $summary[$row['api_key']] = array($row['first_use'], $row['count']);
 }
 
 $out = '';
-for ($i=0; $i<$q->rows(); $i++) {
+for ($i = 0; $i < $q->rows(); $i++) {
     $row = $q->row($i);
     $reason = preg_replace("/\r?\n/", ' ', $row['reason']);
-    $comm = $row['commercial']==1 ? ', commercial' : '';
-    $ipa = $row['ip_addresses']!=1 ? 'es' : '';
-    $hp = $row['count']!=1 ? 's' : '';
+    $comm = $row['commercial'] == 1 ? ', commercial' : '';
+    $ipa = $row['ip_addresses'] != 1 ? 'es' : '';
+    $hp = $row['count'] != 1 ? 's' : '';
     list($first, $total) = $summary[$row['api_key']];
     $out .= "<p><b>$row[count] hit$hp, from $row[ip_addresses] IP address$ipa.</b> $row[firstname] $row[lastname] &lt;$row[email]&gt;
 <br>$row[api_key], created $row[created], first use $first$comm, total calls $total
@@ -61,5 +61,5 @@ 
     "Content-Transfer-Encoding: 8bit\r\n";
 $subject = 'Daily TheyWorkForYou API usage';
 $to = join(chr(64), array('commercial', 'mysociety.org'));
-mail ($to, $subject, $out, $headers);
+mail($to, $subject, $out, $headers);
 

scripts/wrans-votes-by-dept.php

Indentation +27 added lines, -27 removed lines

@@ -10,7 +10,7 @@ 
 
 # Done directly as storing everything in an array as $db->query() does runs out of memory, unsurprisingly
 $q = mysql_query(
-	'select section.body, gid, yes_votes, no_votes
+    'select section.body, gid, yes_votes, no_votes
 	from hansard
 		inner join epobject as section on hansard.section_id = section.epobject_id
 		left join anonvotes on hansard.epobject_id = anonvotes.epobject_id
@@ -24,34 +24,34 @@ 
 
 $votes = array();
 while ($row = mysql_fetch_assoc($q)) {
-	$dept = $row['body'];
-	if (!isset($votes[$dept])) $votes[$dept] = array(
-		'verymoreyes'=>0, 'moreyes'=>0, 'verymoreno'=>0, 'moreno'=>0, 'same'=>0, 'none'=>0
-	);
-	$yes = $row['yes_votes'];
-	$no = $row['no_votes'];
-	$gid = $row['gid'];
-	if (is_null($yes)) {
-		$votes[$dept]['none']++;
-	} else {
-		if ($no > $yes+10) {
-			$votes[$dept]['verymoreno']++;
-		} elseif ($no > $yes) {
-			$votes[$dept]['moreno']++;
-		} elseif ($no + 10 < $yes) {
-			$votes[$dept]['verymoreyes']++;
-		} elseif ($no < $yes) {
-			$votes[$dept]['moreyes']++;
-		} else {
-			$votes[$dept]['same']++;
-		}
-	}
+    $dept = $row['body'];
+    if (!isset($votes[$dept])) $votes[$dept] = array(
+        'verymoreyes'=>0, 'moreyes'=>0, 'verymoreno'=>0, 'moreno'=>0, 'same'=>0, 'none'=>0
+    );
+    $yes = $row['yes_votes'];
+    $no = $row['no_votes'];
+    $gid = $row['gid'];
+    if (is_null($yes)) {
+        $votes[$dept]['none']++;
+    } else {
+        if ($no > $yes+10) {
+            $votes[$dept]['verymoreno']++;
+        } elseif ($no > $yes) {
+            $votes[$dept]['moreno']++;
+        } elseif ($no + 10 < $yes) {
+            $votes[$dept]['verymoreyes']++;
+        } elseif ($no < $yes) {
+            $votes[$dept]['moreyes']++;
+        } else {
+            $votes[$dept]['same']++;
+        }
+    }
 }
 
 print "Department,11+ more yes votes than no,1-10 more yes votes than no,11+ more no votes than yes,1-10 more no votes than yes,Same votes yes/no,No votes\n";
 foreach ($votes as $dept => $v) {
-	#if (!$v['moreyes'] && !$v['moreno'] && !$v['same']) continue;
-	if (strstr($dept, ','))
-		$dept = "\"$dept\"";
-	print "$dept,$v[verymoreyes],$v[moreyes],$v[verymoreno],$v[moreno],$v[same],$v[none]\n";
+    #if (!$v['moreyes'] && !$v['moreno'] && !$v['same']) continue;
+    if (strstr($dept, ','))
+        $dept = "\"$dept\"";
+    print "$dept,$v[verymoreyes],$v[moreyes],$v[verymoreno],$v[moreno],$v[same],$v[none]\n";
 }

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 	if (is_null($yes)) {
 		$votes[$dept]['none']++;
 	} else {
-		if ($no > $yes+10) {
+		if ($no > $yes + 10) {
 			$votes[$dept]['verymoreno']++;
 		} elseif ($no > $yes) {
 			$votes[$dept]['moreno']++;

Braces +16 added lines, -8 removed lines

@@ -25,24 +25,31 @@ 
 $votes = array();
 while ($row = mysql_fetch_assoc($q)) {
 	$dept = $row['body'];
-	if (!isset($votes[$dept])) $votes[$dept] = array(
+	if (!isset($votes[$dept])) {
+	    $votes[$dept] = array(
 		'verymoreyes'=>0, 'moreyes'=>0, 'verymoreno'=>0, 'moreno'=>0, 'same'=>0, 'none'=>0
 	);
+	}
 	$yes = $row['yes_votes'];
 	$no = $row['no_votes'];
 	$gid = $row['gid'];
 	if (is_null($yes)) {
 		$votes[$dept]['none']++;
-	} else {
+	}
+	else {
 		if ($no > $yes+10) {
 			$votes[$dept]['verymoreno']++;
-		} elseif ($no > $yes) {
+		}
+		elseif ($no > $yes) {
 			$votes[$dept]['moreno']++;
-		} elseif ($no + 10 < $yes) {
+		}
+		elseif ($no + 10 < $yes) {
 			$votes[$dept]['verymoreyes']++;
-		} elseif ($no < $yes) {
+		}
+		elseif ($no < $yes) {
 			$votes[$dept]['moreyes']++;
-		} else {
+		}
+		else {
 			$votes[$dept]['same']++;
 		}
 	}
@@ -51,7 +58,8 @@ 
 print "Department,11+ more yes votes than no,1-10 more yes votes than no,11+ more no votes than yes,1-10 more no votes than yes,Same votes yes/no,No votes\n";
 foreach ($votes as $dept => $v) {
 	#if (!$v['moreyes'] && !$v['moreno'] && !$v['same']) continue;
-	if (strstr($dept, ','))
-		$dept = "\"$dept\"";
+	if (strstr($dept, ',')) {
+			$dept = "\"$dept\"";
+	}
 	print "$dept,$v[verymoreyes],$v[moreyes],$v[verymoreno],$v[moreno],$v[same],$v[none]\n";
 }

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

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,

Spacing +11 added lines, -11 removed lines

@@ -37,7 +37,7 @@ 
 # 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);
@@ -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))
@@ -168,7 +168,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");
 	}
 
 	$data = null;
@@ -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];
@@ -226,7 +226,7 @@ 
                 ));
 			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']);
@@ -246,10 +246,10 @@ 
 			$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";
+						$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;
 				}
@@ -268,7 +268,7 @@ 
 } 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');
@@ -317,7 +317,7 @@ 
 		$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 +96 added lines, -41 removed lines

@@ -23,15 +23,21 @@ 
 
 # 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 +62,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 +81,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 +155,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 +174,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 = '';
@@ -164,7 +186,8 @@ 
 		if ($q->rows() > 0) {
 			$user_id = $q->field(0, 'user_id');
 			$registered++;
-		} else {
+		}
+		else {
 			$user_id = 0;
 			$unregistered++;
 		}
@@ -196,7 +219,8 @@ 
 		$total_results = $data['info']['total_results'];
 		$queries++;
 		mlog(", hits ".$total_results.", time ".(getmicrotime()-$start)."\n");
-	} else {
+	}
+	else {
 		mlog("  ACTION $active/$outof CACHE HIT : Using cached result for '$criteria_batch'\n");
 		$data = $results[$criteria_batch];
 	}
@@ -219,18 +243,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,15 +287,17 @@ 
 		}
 	}
 }
-if ($email_text)
+if ($email_text) {
 	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 ';
-} else {
+}
+else {
 	$sss .= 'Something went wrong! Total time: ';
 }
 $sss .= (getmicrotime()-$global_start)."\n\n";
@@ -281,24 +313,43 @@ 
 
 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;
-    } 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;
+        }
+    }
+    else {
+        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;
 }
 
@@ -317,17 +368,21 @@ 
 		$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);
 		}
-	} else {
+	}
+	else {
 		mlog($data);
 		$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);

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();
 

Braces +2 added lines, -1 removed lines

@@ -136,7 +136,8 @@
   $existing = $topics->getTopic($name);
   if ($existing) {
       print "$name already exists\n";
-  } else {
+  }
+  else {
       $topic['slug'] = $name;
       $topic['description'] = $topic['blurb'];
       $topic = new MySociety\TheyWorkForYou\Topic($topic);

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

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

Spacing +4 added lines, -4 removed lines

@@ -9,7 +9,7 @@ 
 $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.
@@ -109,7 +109,7 @@ 
 		continue;
 	}
 	fwrite($fh, $rsstext);
-	fclose ($fh);
+	fclose($fh);
 }
 
 #print "Took " . (time()-$starttime) . " seconds\n";

Braces +7 added lines, -3 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++) {
@@ -55,7 +57,8 @@ 
 			$hdate = format_date($row['hdate'], 'Y-m-d');
 			if ($row['htime'] != NULL) {
 				$htime = format_time($row['htime'], 'H:i:s');
-			} else {
+			}
+			else {
 				$htime = '00:00:00';
 			}
 				
@@ -104,7 +107,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/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;
 }
 

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 +57 added lines, -28 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();
@@ -107,7 +128,8 @@ 
         if ($q->rows() > 0) {
             $user_id = $q->field(0, 'user_id');
             $registered++;
-		} else {
+		}
+		else {
 			$user_id = 0;
 			$unregistered++;
 		}	
@@ -117,18 +139,21 @@ 
     $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");
 
 $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";
@@ -151,15 +176,19 @@ 
 		$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;
 	}
 	mlog("done\n");
-	if (!$success) $globalsuccess = 0;
-}
+	if (!$success) {
+	    $globalsuccess = 0;
+	}
+	}