mysociety / theyworkforyou

www/docs/boundaries/index.php

Spacing +10 added lines, -10 removed lines

@@ -2,7 +2,7 @@ 
 
 $this_page = 'boundaries';
 include_once '../../includes/easyparliament/init.php';
-include_once INCLUDESPATH . '../../commonlib/phplib/mapit.php';
+include_once INCLUDESPATH.'../../commonlib/phplib/mapit.php';
 
 $PAGE->page_start();
 ?>
@@ -66,16 +66,16 @@ 
     $db = new ParlDB;
     # Just left politicians
     $q = $db->query("SELECT person_id, first_name, last_name, constituency, house FROM member
-        WHERE constituency IN ('" . join("','", $a) . "')
+        WHERE constituency IN ('" . join("','", $a)."')
         AND ( ( house = 3 and left_house = '2011-03-24' ) or ( house = 4 and left_house = '2011-03-23') )");
     $mreg = array();
-    for ($i=0; $i<$q->rows(); $i++) {
+    for ($i = 0; $i < $q->rows(); $i++) {
         $cons = $q->field($i, 'constituency');
         $house = $q->field($i, 'house');
         if (($house == 4 && $cons == $current['SPC']) || ($house == 3 && $cons == $current['NIE'])) {
-            $name = $q->field($i, 'first_name') . ' ' . $q->field($i, 'last_name');
+            $name = $q->field($i, 'first_name').' '.$q->field($i, 'last_name');
         } elseif ($house == 4 && $cons == $current['SPE']) {
-            $mreg[] = $q->field($i, 'first_name') . ' ' . $q->field($i, 'last_name');
+            $mreg[] = $q->field($i, 'first_name').' '.$q->field($i, 'last_name');
         }
     }
 
@@ -129,17 +129,17 @@ 
     }
 
     if ($country == 'S') {
-        $mp_url = '/msp/' . make_member_url($name, '', 4);
+        $mp_url = '/msp/'.make_member_url($name, '', 4);
 ?>
 <li>You were in the <strong><?=$current['SPC']?></strong> constituency, in the <strong><?=$current['SPE']?></strong> region; your constituency MSP was <a href='<?=$mp_url?>'><?=$name?></a>, and your regional MSPs were <?php
         foreach ($mreg as $k => $n) {
-            print "<a href='/msp/" . make_member_url($n, '', 4) . "'>$n</a>";
-            if ($k < count($mreg)-2) print ', ';
-            elseif ($k == count($mreg)-2) print ' and ';
+            print "<a href='/msp/".make_member_url($n, '', 4)."'>$n</a>";
+            if ($k < count($mreg) - 2) print ', ';
+            elseif ($k == count($mreg) - 2) print ' and ';
         }
         echo '.</li>';
     } elseif ($country == 'N') {
-        $mp_url = '/mla/' . make_member_url($name, '', 3);
+        $mp_url = '/mla/'.make_member_url($name, '', 3);
 ?>
 <li>You were in the <strong><?=$current['NIE']?></strong> constituency; your constituency MLA was <a href='<?=$mp_url?>'><?=$name?></a>.</li>
 <?php

Braces +5 added lines, -2 removed lines

@@ -134,8 +134,11 @@
 <li>You were in the <strong><?=$current['SPC']?></strong> constituency, in the <strong><?=$current['SPE']?></strong> region; your constituency MSP was <a href='<?=$mp_url?>'><?=$name?></a>, and your regional MSPs were <?php
         foreach ($mreg as $k => $n) {
             print "<a href='/msp/" . make_member_url($n, '', 4) . "'>$n</a>";
-            if ($k < count($mreg)-2) print ', ';
-            elseif ($k == count($mreg)-2) print ' and ';
+            if ($k < count($mreg)-2) {
+                print ', ';
+            } elseif ($k == count($mreg)-2) {
+                print ' and ';
+            }
         }
         echo '.</li>';
     } elseif ($country == 'N') {

www/docs/divisions/division.php

Indentation +5 added lines, -5 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 include_once '../../includes/easyparliament/init.php';
-include_once INCLUDESPATH . 'easyparliament/member.php';
+include_once INCLUDESPATH.'easyparliament/member.php';
 
 $this_page = 'divisions_vote';
 

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

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

www/docs/divisions/index.php

Indentation +5 added lines, -5 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 include_once '../../includes/easyparliament/init.php';
-include_once INCLUDESPATH . 'easyparliament/member.php';
+include_once INCLUDESPATH.'easyparliament/member.php';
 
 $this_page = 'divisions_recent';
 

www/docs/wikipedia/index.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
     $ip = '194.60.38.10';
 
 $this_page = 'wikipedia';
-$DATA->set_page_metadata($this_page, 'title', 'Latest 100 changes to Wikipedia by non-logged-in computers in ' . $site[$ip]);
+$DATA->set_page_metadata($this_page, 'title', 'Latest 100 changes to Wikipedia by non-logged-in computers in '.$site[$ip]);
 $PAGE->page_start();
 $PAGE->stripe_start();
 ?>
@@ -51,7 +51,7 @@ 
 preg_match_all('#<li>.*? \(<a[^>]*>hist</a>\) \(<a href=".*?title=(.*?)&.*?oldid=(.*?)"[^>]*>diff</a>\)  <a[^>]*>(.*?)</a> .*?</li>#', $file, $m, PREG_SET_ORDER);
 foreach ($m as $row) {
     $file = file_get_contents("cache/$row[1].$row[2]");
-    $file = str_replace(array("\xe2\x86\x90","\xe2\x86\x92"), array('&larr;', '&rarr;'), $file);
+    $file = str_replace(array("\xe2\x86\x90", "\xe2\x86\x92"), array('&larr;', '&rarr;'), $file);
     print "<h3>$row[3]</h3>";
     if (preg_match('#<table.*?</table>#s', $file, $m))
         print preg_replace('#href=(\'|")(.*?)\1#', 'href=\1http://en.wikipedia.org\2\1', $m[0]);

Braces +13 added lines, -10 removed lines

@@ -9,8 +9,9 @@ 
     '212.35.252.2' => 'Liberal Democrats',
 );
 $ip = get_http_var('ip');
-if (!array_key_exists($ip, $site))
+if (!array_key_exists($ip, $site)) {
     $ip = '194.60.38.10';
+}
 
 $this_page = 'wikipedia';
 $DATA->set_page_metadata($this_page, 'title', 'Latest 100 changes to Wikipedia by non-logged-in computers in ' . $site[$ip]);
@@ -28,10 +29,11 @@ 
 <p align="center"><?php
 $out = array();
 foreach ($site as $k => $v) {
-    if ($k == $ip)
-        $o = "<strong>$v</strong>";
-    else
-        $o = "<a href=\"./?ip=$k\">$v</a>";
+    if ($k == $ip) {
+            $o = "<strong>$v</strong>";
+    } else {
+            $o = "<a href=\"./?ip=$k\">$v</a>";
+    }
     $out[] = $o;
 }
 print join(' | ', $out);
@@ -53,11 +55,12 @@ 
     $file = file_get_contents("cache/$row[1].$row[2]");
     $file = str_replace(array("\xe2\x86\x90","\xe2\x86\x92"), array('&larr;', '&rarr;'), $file);
     print "<h3>$row[3]</h3>";
-    if (preg_match('#<table.*?</table>#s', $file, $m))
-        print preg_replace('#href=(\'|")(.*?)\1#', 'href=\1http://en.wikipedia.org\2\1', $m[0]);
-    elseif (preg_match('#<div class="firstrevisionheader.*?</div>#s', $file, $m))
-        print preg_replace('#href=(\'|")(.*?)\1#', 'href=\1http://en.wikipedia.org\2\1', $m[0]);
-}
+    if (preg_match('#<table.*?</table>#s', $file, $m)) {
+            print preg_replace('#href=(\'|")(.*?)\1#', 'href=\1http://en.wikipedia.org\2\1', $m[0]);
+    } elseif (preg_match('#<div class="firstrevisionheader.*?</div>#s', $file, $m)) {
+            print preg_replace('#href=(\'|")(.*?)\1#', 'href=\1http://en.wikipedia.org\2\1', $m[0]);
+    }
+    }
 
 $PAGE->stripe_end();
 $PAGE->page_end();

www/docs/images/mps/photo-status.php

Spacing +6 added lines, -6 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 include_once '../../../includes/easyparliament/init.php';
-include_once INCLUDESPATH . "easyparliament/member.php";
+include_once INCLUDESPATH."easyparliament/member.php";
 $DATA->set_page_metadata($this_page, 'heading', 'MPs photo status on TheyWorkForYou');
 $PAGE->page_start();
 $PAGE->stripe_start();
@@ -9,17 +9,17 @@ 
 $query = 'SELECT person_id, constituency, party
     FROM member
     WHERE house=1 AND left_house = (SELECT MAX(left_house) FROM member) ';
-$q = $db->query($query . "ORDER BY person_id");
+$q = $db->query($query."ORDER BY person_id");
 $out = array('both'=>'', 'small'=>'', 'none'=>array());
-for ($i=0; $i<$q->rows(); $i++) {
+for ($i = 0; $i < $q->rows(); $i++) {
     $p_id = $q->field($i, 'person_id');
     list($dummy, $sz) = MySociety\TheyWorkForYou\Utility\Member::findMemberImage($p_id);
     if ($sz == 'L') {
-        $out['both'] .= $q->field($i, 'person_id') . ', ';
+        $out['both'] .= $q->field($i, 'person_id').', ';
     } elseif ($sz == 'S') {
-        $out['small'] .= $q->field($i, 'person_id') . ', ';
+        $out['small'] .= $q->field($i, 'person_id').', ';
     } else {
-        array_push($out['none'], '<li>' . $q->field($i, 'person_id') . ' (' . $q->field($i, 'party') . ')' . ', ' . $q->field($i, 'constituency'));
+        array_push($out['none'], '<li>'.$q->field($i, 'person_id').' ('.$q->field($i, 'party').')'.', '.$q->field($i, 'constituency'));
     }
 }
 print '<h3>Missing completely ('.count($out['none']).')</h3> <ul>';

scripts/populate-policy-images.php

Spacing +6 added lines, -6 removed lines

@@ -21,7 +21,7 @@ 
  */
 
 include '../www/includes/easyparliament/init.php';
-include_once INCLUDESPATH . 'easyparliament/member.php';
+include_once INCLUDESPATH.'easyparliament/member.php';
 
 $ARGV = $_SERVER['argv'];
 $db = new ParlDB();
@@ -33,7 +33,7 @@ 
     exit(1);
 }
 
-if ( !file_exists($csvfile) ) {
+if (!file_exists($csvfile)) {
     print "$csvfile cannot be found\n";
     exit(1);
 }
@@ -46,8 +46,8 @@ 
 }
 
 $count = 0;
-while ( ( $policy = fgetcsv($file) ) !== FALSE ) {
-    if ( intval($policy[0]) ) {
+while (($policy = fgetcsv($file)) !== FALSE) {
+    if (intval($policy[0])) {
         $policy_id = $policy[0];
         $img_id = $policy[1] ? $policy[1] : $policy_id;
         $title = $policy[2];
@@ -64,12 +64,12 @@ 
                 ':policy_id' => $policy_id,
                 ':title' => $title,
                 ':description' => $description,
-                ':image' => "/images/policies/" . $img_id . ".jpg",
+                ':image' => "/images/policies/".$img_id.".jpg",
                 ':image_source' => $source,
                 ':image_attribution' => $attribution,
                 ':license_url' => $licence_url)
         );
-        if ( $q->success() ) {
+        if ($q->success()) {
             $count += $q->affected_rows();
         } else {
             print "failed to update data for $policy_id\n";

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

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

scripts/wikipedia-cron.php

Indentation +33 added lines, -33 removed lines

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

Spacing +5 added lines, -5 removed lines

@@ -5,9 +5,9 @@ 
 # from Parliament, political party IP addresses etc.
 # (the stuff for Wikipedia title links is elsewhere)
 
-require_once dirname(__FILE__) . '/../conf/general';
+require_once dirname(__FILE__).'/../conf/general';
 
-$dir = BASEDIR . '/wikipedia/cache/';
+$dir = BASEDIR.'/wikipedia/cache/';
 
 contributions('194.60.38.10'); # Parliament
 contributions('194.203.158.97'); # Conservative
@@ -20,7 +20,7 @@ 
 
 	$file = fetch("/w/index.php?title=Special:Contributions&limit=100&target=$ip");
 	if (!$file) return;
-	$fp = fopen($dir . $ip, 'w');
+	$fp = fopen($dir.$ip, 'w');
 	fwrite($fp, $file['body']);
 	fclose($fp);
 	preg_match_all('#<li>(.*?) \(<a[^>]*>hist</a>\) \(<a href="(.*?title=(.*?)&.*?oldid=(.*?))"[^>]*>diff</a>\)  <a[^>]*>(.*?)</a> .*?</li>#', $file['body'], $m, PREG_SET_ORDER);
@@ -32,11 +32,11 @@ 
 			$bits = explode('/', $filename);
 			array_pop($bits);
 			foreach ($bits as $bit) {
-				@mkdir($path . $bit);
+				@mkdir($path.$bit);
 				$path .= "$bit/";
 			}
 		}
-		$cache = $dir . $filename;
+		$cache = $dir.$filename;
 		if (!is_file($cache)) {
 			# print " - fetching";
 			$file = fetch(html_entity_decode($row[2]));

Braces +6 added lines, -2 removed lines

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

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

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

scripts/alertmpchanged.php

Indentation +15 added lines, -15 removed lines

@@ -22,26 +22,26 @@ 
 $toemail = '';
 $template = 'alert_new_mp';
 for ($k=1; $k<$argc; $k++) {
-	if ($argv[$k] == '--nomail')
-		$nomail = true;
-	if (preg_match('#^--only=(.*)$#', $argv[$k], $m))
-		$onlyemail = $m[1];
-	if (preg_match('#^--from=(.*)$#', $argv[$k], $m))
-		$fromemail = $m[1];
-	if (preg_match('#^--to=(.*)$#', $argv[$k], $m))
-		$toemail = $m[1];
+    if ($argv[$k] == '--nomail')
+        $nomail = true;
+    if (preg_match('#^--only=(.*)$#', $argv[$k], $m))
+        $onlyemail = $m[1];
+    if (preg_match('#^--from=(.*)$#', $argv[$k], $m))
+        $fromemail = $m[1];
+    if (preg_match('#^--to=(.*)$#', $argv[$k], $m))
+        $toemail = $m[1];
 }
 
 if (DEVSITE)
-  $nomail = true;
+    $nomail = true;
 
 # Change this to the end date
 $END_DATE = '2017-05-03';
 
 if ($nomail) mlog("NOT SENDING EMAIL\n");
 if (($fromemail && $onlyemail) || ($toemail && $onlyemail)) {
-	mlog("Can't have both from/to and only!\n");
-	exit;
+    mlog("Can't have both from/to and only!\n");
+    exit;
 }
 
 $active = 0;
@@ -66,8 +66,8 @@ 
 $members = array();
 $start_time = time();
 foreach ($alertdata as $alertitem) {
-	$active++;
-	$email = $alertitem['email'];
+    $active++;
+    $email = $alertitem['email'];
     if ($onlyemail && $email != $onlyemail) continue;
     if ($fromemail && strtolower($email) == $fromemail) $fromflag = true;
     if ($fromemail && !$fromflag) continue;
@@ -143,9 +143,9 @@ 
 
 $sss = "Active alerts: $active\nEmail lookups: $registered registered, $unregistered unregistered\nQuery lookups: $queries\nSent emails: $sentemails\n";
 if ($globalsuccess) {
-      $sss .= 'Everything went swimmingly, in ';
+        $sss .= 'Everything went swimmingly, in ';
 } else {
-      $sss .= 'Something went wrong! Total time: ';
+        $sss .= 'Something went wrong! Total time: ';
 }
 $sss .= (getmicrotime()-$global_start)."\n\n";
 mlog($sss);

Spacing +18 added lines, -18 removed lines

@@ -8,9 +8,9 @@ 
     print $message;
 }
 
-include_once dirname(__FILE__) . '/../www/includes/easyparliament/init.php';
+include_once dirname(__FILE__).'/../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;
@@ -21,7 +21,7 @@ 
 $fromflag = false;
 $toemail = '';
 $template = 'alert_new_mp';
-for ($k=1; $k<$argc; $k++) {
+for ($k = 1; $k < $argc; $k++) {
 	if ($argv[$k] == '--nomail')
 		$nomail = true;
 	if (preg_match('#^--only=(.*)$#', $argv[$k], $m))
@@ -91,9 +91,9 @@ 
     // skip if they didn't lose their westminster seat in the most recent election
     if ($member->left_house(1)['date'] != $END_DATE) continue;
 
-    if ( !isset($cons[$member->constituency]) ) {
+    if (!isset($cons[$member->constituency])) {
         $cons_member = new MEMBER(array('constituency' => $member->constituency, 'house' => 1));
-        if ( !$cons_member ) {
+        if (!$cons_member) {
             continue;
         }
         $cons[$member->constituency] = $cons_member;
@@ -102,7 +102,7 @@ 
     }
 
     // these should never happen but let's just be sure
-    if ( $cons_member->person_id == $member->person_id ) continue;
+    if ($cons_member->person_id == $member->person_id) continue;
     if (!$cons_member->current_member_anywhere()) continue;
 
     if ($email != $current['email']) {
@@ -110,7 +110,7 @@ 
             write_and_send_email($current, $email_text, $change_text, $template);
         }
         $current['email'] = $email;
-        $current['token'] = $alertitem['alert_id'] . '-' . $alertitem['registrationtoken'];
+        $current['token'] = $alertitem['alert_id'].'-'.$alertitem['registrationtoken'];
         $email_text = array();
         $change_text = array();
         $q = $db->query('SELECT user_id FROM users WHERE email = :email', array(
@@ -127,11 +127,11 @@ 
 
     $lh = $member->left_house();
     $lh = array_shift($lh);
-    $text = '* ' . $member->full_name();
+    $text = '* '.$member->full_name();
     if (!in_array($text, $email_text)) {
         $email_text[] = $text;
 
-        $change = '* ' . $member->full_name() . ': https://' . DOMAIN . '/C/' . $alertitem['registrationtoken'];
+        $change = '* '.$member->full_name().': https://'.DOMAIN.'/C/'.$alertitem['registrationtoken'];
         $change_text[] = $change;
     }
 }
@@ -147,9 +147,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, $change, $template) {
     global $globalsuccess, $sentemails, $nomail, $start_time;
@@ -160,18 +160,18 @@ 
     $m = array(
         'DATA' => join("\n", $data),
         'CHANGE' => join("\n", $change),
-        'ALERT_IS' => count($data)==1 ? 'alert is' : 'alerts are',
-        'MPS' => count($data)==1 ? 'This MP' : 'These MPs',
-        'MPS2' => count($data)==1 ? 'MP' : 'MPs',
-        'ALERTS' => count($data)==1 ? 'an alert' : 'some alerts',
-        'ALERTS2' => count($data)==1 ? 'alert' : 'alerts',
-        'LINKS' => count($data)==1 ? 'link' : 'links',
+        'ALERT_IS' => count($data) == 1 ? 'alert is' : 'alerts are',
+        'MPS' => count($data) == 1 ? 'This MP' : 'These MPs',
+        'MPS2' => count($data) == 1 ? 'MP' : 'MPs',
+        'ALERTS' => count($data) == 1 ? 'an alert' : 'some alerts',
+        'ALERTS2' => count($data) == 1 ? 'alert' : 'alerts',
+        'LINKS' => count($data) == 1 ? 'link' : 'links',
     );
     if (!$nomail) {
         $success = send_template_email($d, $m, true);
         mlog("sent ... ");
         # sleep if time between sending mails is less than a certain number of seconds on average
-        if (((time() - $start_time) / $sentemails) < 0.5 ) { # number of seconds per mail not to be quicker than
+        if (((time() - $start_time) / $sentemails) < 0.5) { # number of seconds per mail not to be quicker than
             mlog("pausing ... ");
             sleep(1);
         }

Braces +46 added lines, -21 removed lines

@@ -22,23 +22,30 @@ 
 $toemail = '';
 $template = 'alert_new_mp';
 for ($k=1; $k<$argc; $k++) {
-	if ($argv[$k] == '--nomail')
-		$nomail = true;
-	if (preg_match('#^--only=(.*)$#', $argv[$k], $m))
-		$onlyemail = $m[1];
-	if (preg_match('#^--from=(.*)$#', $argv[$k], $m))
-		$fromemail = $m[1];
-	if (preg_match('#^--to=(.*)$#', $argv[$k], $m))
-		$toemail = $m[1];
-}
-
-if (DEVSITE)
+	if ($argv[$k] == '--nomail') {
+			$nomail = true;
+	}
+	if (preg_match('#^--only=(.*)$#', $argv[$k], $m)) {
+			$onlyemail = $m[1];
+	}
+	if (preg_match('#^--from=(.*)$#', $argv[$k], $m)) {
+			$fromemail = $m[1];
+	}
+	if (preg_match('#^--to=(.*)$#', $argv[$k], $m)) {
+			$toemail = $m[1];
+	}
+	}
+
+if (DEVSITE) {
   $nomail = true;
+}
 
 # Change this to the end date
 $END_DATE = '2017-05-03';
 
-if ($nomail) mlog("NOT SENDING EMAIL\n");
+if ($nomail) {
+    mlog("NOT SENDING EMAIL\n");
+}
 if (($fromemail && $onlyemail) || ($toemail && $onlyemail)) {
 	mlog("Can't have both from/to and only!\n");
 	exit;
@@ -68,14 +75,24 @@ 
 foreach ($alertdata as $alertitem) {
 	$active++;
 	$email = $alertitem['email'];
-    if ($onlyemail && $email != $onlyemail) continue;
-    if ($fromemail && strtolower($email) == $fromemail) $fromflag = true;
-    if ($fromemail && !$fromflag) continue;
-    if ($toemail && strtolower($email) >= $toemail) continue;
+    if ($onlyemail && $email != $onlyemail) {
+        continue;
+    }
+    if ($fromemail && strtolower($email) == $fromemail) {
+        $fromflag = true;
+    }
+    if ($fromemail && !$fromflag) {
+        continue;
+    }
+    if ($toemail && strtolower($email) >= $toemail) {
+        continue;
+    }
     $criteria_raw = $alertitem['criteria'];
 
     // we only care about alerts for people speaking
-    if (!strstr($criteria_raw, 'speaker:')) continue;
+    if (!strstr($criteria_raw, 'speaker:')) {
+        continue;
+    }
 
     preg_match('#speaker:(\d+)#', $criteria_raw, $m);
     $person_id = $m[1];
@@ -86,10 +103,14 @@ 
     $member = $members[$person_id];
 
     // if they're still elected then don't send the email
-    if ($member->current_member_anywhere()) continue;
+    if ($member->current_member_anywhere()) {
+        continue;
+    }
 
     // skip if they didn't lose their westminster seat in the most recent election
-    if ($member->left_house(1)['date'] != $END_DATE) continue;
+    if ($member->left_house(1)['date'] != $END_DATE) {
+        continue;
+    }
 
     if ( !isset($cons[$member->constituency]) ) {
         $cons_member = new MEMBER(array('constituency' => $member->constituency, 'house' => 1));
@@ -102,8 +123,12 @@ 
     }
 
     // these should never happen but let's just be sure
-    if ( $cons_member->person_id == $member->person_id ) continue;
-    if (!$cons_member->current_member_anywhere()) continue;
+    if ( $cons_member->person_id == $member->person_id ) {
+        continue;
+    }
+    if (!$cons_member->current_member_anywhere()) {
+        continue;
+    }
 
     if ($email != $current['email']) {
         if ($email_text && $change_text) {

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

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

scripts/video-mark-missing.php

Spacing +5 added lines, -5 removed lines

@@ -15,17 +15,17 @@ 
 }
 
 $date = substr($from, 0, 10);
-$from = 'uk.org.publicwhip/debate/' . $from;
-if ($to) $to = 'uk.org.publicwhip/debate/' . $to;
+$from = 'uk.org.publicwhip/debate/'.$from;
+if ($to) $to = 'uk.org.publicwhip/debate/'.$to;
 
-$q = $db->query('select hpos from hansard where gid="' . $from . '"');
+$q = $db->query('select hpos from hansard where gid="'.$from.'"');
 $hpos_from = $q->field(0, 'hpos');
 if (!$hpos_from) {
     print "No hpos for from gid!\n"; exit;
 }
 
 if ($to) {
-    $q = $db->query('select hpos from hansard where gid="' . $to . '"');
+    $q = $db->query('select hpos from hansard where gid="'.$to.'"');
     $hpos_to = $q->field(0, 'hpos');
     if (!$hpos_to) {
         print "No hpos for to gid!\n"; exit;
@@ -39,4 +39,4 @@ 
 
 print "Executing $query...\n";
 $q = $db->query($query);
-print '  ' . $q->affected_rows() . " rows have been marked as missing\n";
+print '  '.$q->affected_rows()." rows have been marked as missing\n";

Braces +5 added lines, -2 removed lines

@@ -16,7 +16,9 @@ 
 
 $date = substr($from, 0, 10);
 $from = 'uk.org.publicwhip/debate/' . $from;
-if ($to) $to = 'uk.org.publicwhip/debate/' . $to;
+if ($to) {
+    $to = 'uk.org.publicwhip/debate/' . $to;
+}
 
 $q = $db->query('select hpos from hansard where gid="' . $from . '"');
 $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";