mysociety / theyworkforyou

www/docs/freeourbills/sharethis.php

Spacing +3 added lines, -3 removed lines

@@ -38,7 +38,7 @@ 
 ";
     $subject = "Help make the laws we have to obey better! - TheyWorkForYou.com";
 
-    print '<a href="mailto:?subject=' . rawurlencode($subject) . '&body='. rawurlencode($email) . '">Click here to open a new email and invite your friends, family and colleagues to get involved.</a>';
+    print '<a href="mailto:?subject=' . rawurlencode($subject) . '&body=' . rawurlencode($email) . '">Click here to open a new email and invite your friends, family and colleagues to get involved.</a>';
 }
 
 function freeourbills_share_page() {
@@ -58,7 +58,7 @@ 
     print '<p><a href="/freeourbills/doshare"';
     #print 'onclick="share(this); return false;"';
     print ' title="' .
-        _('E-mail this, post to del.icio.us, etc.'). '" class="share_link" rel="nofollow">'.
-        _('Share this'). '</a></p>';
+        _('E-mail this, post to del.icio.us, etc.') . '" class="share_link" rel="nofollow">' .
+        _('Share this') . '</a></p>';
     #freeourbills_share_form();
 }

www/docs/user/password/index.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 
 
 
-function display_page ($errors=array()) {
+function display_page($errors = array()) {
     global $this_page, $PAGE;
 
     if (isset($errors["sending"])) {

Braces +14 added lines, -7 removed lines

@@ -31,9 +31,11 @@ 
 
     if ($email == "") {
         $errors["email"] = "Please enter your email address";
-    } elseif (!validate_email($email)) {
+    }
+    elseif (!validate_email($email)) {
         $errors["email"] = "Please enter a valid email address";
-    } else {
+    }
+    else {
 
         $USER = new USER;
         $emailexists = $USER->email_exists($email);
@@ -47,7 +49,8 @@ 
         // Validation errors. Print form again.
         display_page($errors);
 
-    } else {
+    }
+    else {
 
         // Change the user's password!
 
@@ -63,7 +66,8 @@ 
 
                 print "<p>A new password has been sent to " . _htmlentities($email) . "</p>\n";
 
-            } else {
+            }
+            else {
 
                 $errors["sending"] = "Sorry, there was a technical problem sending the email.";
 
@@ -71,7 +75,8 @@ 
 
             }
 
-        } else {
+        }
+        else {
             // This email address isn't in the DB.
 
             $errors["passwordchange"] = "Sorry, there was a problem and we couldn't set a new password for " . _htmlentities($email);
@@ -83,7 +88,8 @@ 
 
     }
 
-} else {
+}
+else {
 
     display_page();
 }
@@ -95,7 +101,8 @@ 
 
     if (isset($errors["sending"])) {
         $PAGE->error_message($errors["sending"]);
-    } else {
+    }
+    else {
         print "<p>If you can't remember your password we can send you a new one.</p>\n<p>If you would like a new password, enter your address below.</p>\n";
     }
 ?>

www/docs/user/confirm/index.php

Spacing +5 added lines, -5 removed lines

@@ -68,7 +68,7 @@ 
         }
 
         $PAGE->stripe_end(array(
-            array (
+            array(
                 'type'		=> 'include',
                 'content'	=> 'userconfirmed'
             )
@@ -80,10 +80,10 @@ 
     // The user's first visit to this page, and they have a registration token.
     // So let's confirm them and hope they get logged in...
 
-    if (get_http_var('c') == 'email' ) {
-        $success = $THEUSER->confirm_email( get_http_var('t') );
+    if (get_http_var('c') == 'email') {
+        $success = $THEUSER->confirm_email(get_http_var('t'));
     } else {
-        $success = $THEUSER->confirm( get_http_var('t') );
+        $success = $THEUSER->confirm(get_http_var('t'));
     }
 
     if (!$success) {
@@ -102,7 +102,7 @@ 
 
     $this_page = 'userconfirmfailed';
 
-    if ( !$PAGE->page_started() ) {
+    if (!$PAGE->page_started()) {
         $PAGE->page_start();
 
         $PAGE->stripe_start();

Braces +14 added lines, -7 removed lines

@@ -36,7 +36,8 @@ 
     <p>Do <a href="mailto:<?php echo str_replace('@', '&#64;', CONTACTEMAIL); ?>">let us know</a> if you find a bug, or have a suggestion.</p>
 
 <?php
-        } else {
+        }
+        else {
             // Oops, something must have gone wrong when the user was logged in.
             // It shouldn't do, but...
             $PAGE->error_message("Sorry, we couldn't log you in - TheyWorkForYou requires cookies to keep
@@ -46,7 +47,8 @@ 
         $PAGE->page_end();
 
 
-} elseif (get_http_var('email') == 't') {
+}
+elseif (get_http_var('email') == 't') {
         $this_page = 'emailconfirmed';
 
         $PAGE->page_start();
@@ -60,7 +62,8 @@ 
     <p>Do <a href="mailto:<?php echo str_replace('@', '&#64;', CONTACTEMAIL); ?>">let us know</a> if you find a bug, or have a suggestion.</p>
 
 <?php
-        } else {
+        }
+        else {
             // Oops, something must have gone wrong when the user was logged in.
             // It shouldn't do, but...
             $PAGE->error_message("Sorry, we couldn't log you in - TheyWorkForYou requires cookies to keep
@@ -76,20 +79,23 @@ 
 
         $PAGE->page_end();
 
-} elseif (get_http_var('t') != '') {
+}
+elseif (get_http_var('t') != '') {
     // The user's first visit to this page, and they have a registration token.
     // So let's confirm them and hope they get logged in...
 
     if (get_http_var('c') == 'email' ) {
         $success = $THEUSER->confirm_email( get_http_var('t') );
-    } else {
+    }
+    else {
         $success = $THEUSER->confirm( get_http_var('t') );
     }
 
     if (!$success) {
         confirm_error();
     }
-} else {
+}
+else {
     // We have no registration token, and no notification of welcome...
 
     confirm_error();
@@ -112,7 +118,8 @@ 
     <p>The link you followed to reach this page appears to be incomplete.</p>
 
 <?php
-    } else {
+    }
+    else {
         $PAGE->stripe_start();
     }
 ?>

www/docs/404.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 <?php
 
 $includes = array(
-    array (
+    array(
         'type' => 'include',
         'content' => 'whatisthissite'
     ),

www/docs/random/index.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 $q = $db->query("select gid from hansard where htype in (10,11) and major=1 and hdate='$date' order by rand() limit 1");
 $gid = $q->field(0, 'gid');
 
-$args = array (
+$args = array(
     'gid' => fix_gid_from_db($gid),
     'sort' => 'regexp_replace',
 );

www/docs/email/index.php

Spacing +5 added lines, -5 removed lines

@@ -45,15 +45,15 @@ 
 <?php
 } else {
     $rep_name = $MEMBER->full_name();
-    if ($MEMBER->house_disp==1) $rep_name .= ' MP';
-    elseif ($MEMBER->house_disp==3) $rep_name .= ' MLA';
-    $data = array (
+    if ($MEMBER->house_disp == 1) $rep_name .= ' MP';
+    elseif ($MEMBER->house_disp == 3) $rep_name .= ' MLA';
+    $data = array(
         'template'      => 'email_a_friend',
         'to'            => $recipient_email,
         'subject'       => 'Find out all about ' . $rep_name
     );
     $url = $MEMBER->url(true);
-    $merge = array (
+    $merge = array(
         'NAME' => $sender_name,
         'EMAIL' => $sender_email,
         'REP_NAME' => $rep_name,
@@ -62,7 +62,7 @@ 
 
     $success = send_template_email($data, $merge);
     if ($success) {
-        print "<p>Your email has been sent successfully. Thank you for using TheyWorkForYou.</p> <p><a href=\"$url\">Return to ".$MEMBER->full_name()."'s page</a></p>";
+        print "<p>Your email has been sent successfully. Thank you for using TheyWorkForYou.</p> <p><a href=\"$url\">Return to " . $MEMBER->full_name() . "'s page</a></p>";
     } else {
         print "<p>Sorry, something went wrong trying to send an email. Please wait a few minutes and try again.</p>";
     }

Braces +20 added lines, -9 removed lines

@@ -14,20 +14,25 @@ 
 $sender_email = get_http_var('sender_mail');
 $sender_name = get_http_var('sender_name');
 $pid = intval(get_http_var('pid'));
-if ($pid)
+if ($pid) {
     $MEMBER = new MEMBER(array('person_id' => $pid));
+}
 
 //validate them
 $errors = array();
 
-if (!$pid)
+if (!$pid) {
     $errors[] = 'You did not get to this page from an MP or Peer page. Please go back and try again.';
-if (!preg_match('#^[^@]+@#', $recipient_email))
+}
+if (!preg_match('#^[^@]+@#', $recipient_email)) {
     $errors[] = "'$recipient_email' is not a valid recipient email address. Please have another go.";
-if (!validate_email($sender_email))
+}
+if (!validate_email($sender_email)) {
     $errors[] = "'$sender_email' is not a valid sender email address. Please have another go.";
-if (!$sender_name)
+}
+if (!$sender_name) {
     $errors[] = "If you don't give us your name, we can't tell the recipient who sent them the link. We won't store it or use for any other purpose than sending this email.";
+}
 
 if (sizeof($errors)) {
     print '<p>Please correct the following errors:</p>';
@@ -43,10 +48,15 @@ 
 <input type="submit" class="submit" value="Send"></p>
 </form>
 <?php
-} else {
+}
+else {
     $rep_name = $MEMBER->full_name();
-    if ($MEMBER->house_disp==1) $rep_name .= ' MP';
-    elseif ($MEMBER->house_disp==3) $rep_name .= ' MLA';
+    if ($MEMBER->house_disp==1) {
+        $rep_name .= ' MP';
+    }
+    elseif ($MEMBER->house_disp==3) {
+        $rep_name .= ' MLA';
+    }
     $data = array (
         'template'      => 'email_a_friend',
         'to'            => $recipient_email,
@@ -63,7 +73,8 @@ 
     $success = send_template_email($data, $merge);
     if ($success) {
         print "<p>Your email has been sent successfully. Thank you for using TheyWorkForYou.</p> <p><a href=\"$url\">Return to ".$MEMBER->full_name()."'s page</a></p>";
-    } else {
+    }
+    else {
         print "<p>Sorry, something went wrong trying to send an email. Please wait a few minutes and try again.</p>";
     }
 }

www/docs/vote/index.php

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
         voteerror("Your browser must be able to accept cookies before you can register a vote.");
     } else {
         // Delete the test cookie.
-        setcookie ('testcookie', '');
+        setcookie('testcookie', '');
     }
     // On with the voting...!
 
@@ -40,7 +40,7 @@ 
     // We need to check the user can accept cookies, so...
 
     // Set a cookie
-    setcookie ('testcookie', 'true');
+    setcookie('testcookie', 'true');
 
     $ret = get_http_var('ret');
     $id = get_http_var('id');
@@ -67,7 +67,7 @@ 
 
     $PAGE->page_start();
 
-    $message = array (
+    $message = array(
         'title'	=> 'Sorry',
         'text'	=> $text
     );
@@ -158,7 +158,7 @@ 
         $prev_epvotes[] = $epobject_id;
         $new_cookie = implode('+', $prev_epvotes);
 
-        setcookie ("epvotes", $new_cookie, time()+60*60*24*365, "/", COOKIEDOMAIN);
+        setcookie("epvotes", $new_cookie, time() + 60 * 60 * 24 * 365, "/", COOKIEDOMAIN);
 
 
     } else {
@@ -189,7 +189,7 @@ 
 
 $PAGE->page_start();
 
-$message = array (
+$message = array(
     'title'	=> "Thanks for your vote",
     'text'	=> "<strong>Would you like to ask a question like this yourself?</strong> Use our <a href=\"http://www.whatdotheyknow.com\">Freedom of Information site</a>."
 );

Braces +18 added lines, -9 removed lines

@@ -29,14 +29,16 @@ 
 
     if ($testcookie != true) {
         voteerror("Your browser must be able to accept cookies before you can register a vote.");
-    } else {
+    }
+    else {
         // Delete the test cookie.
         setcookie ('testcookie', '');
     }
     // On with the voting...!
 
 
-} else {
+}
+else {
     // We need to check the user can accept cookies, so...
 
     // Set a cookie
@@ -121,7 +123,8 @@ 
             // We're not checking the validity of the contents of $votecookie,
             // just doing it.
             $prev_epvotes = explode('+', $votecookie);
-        } else {
+        }
+        else {
             $prev_epvotes = array();
         }
 
@@ -135,13 +138,16 @@ 
         if ($q->rows() == 1) {
             if ($vote == 1) {
                 $q = $db->query("UPDATE anonvotes SET yes_votes = yes_votes + 1 WHERE epobject_id=:epobject_id", array(':epobject_id' => $epobject_id));
-            } else {
+            }
+            else {
                 $q = $db->query("UPDATE anonvotes SET no_votes = no_votes + 1 WHERE epobject_id=:epobject_id", array(':epobject_id' => $epobject_id));
             }
-        } else {
+        }
+        else {
             if ($vote == 1) {
                 $q = $db->query("INSERT INTO anonvotes (epobject_id, yes_votes) VALUES (:epobject_id, '1')", array(':epobject_id' => $epobject_id));
-            } else {
+            }
+            else {
                 $q = $db->query("INSERT INTO anonvotes (epobject_id, no_votes) VALUES (:epobject_id, '1')", array(':epobject_id' => $epobject_id));
             }
         }
@@ -161,7 +167,8 @@ 
         setcookie ("epvotes", $new_cookie, time()+60*60*24*365, "/", COOKIEDOMAIN);
 
 
-    } else {
+    }
+    else {
         // User is logged in.
 
         // See if the user's already voted for this.
@@ -172,7 +179,8 @@ 
 
         if ($q->rows() == 1) {
             voteerror("You have already rated this item. You can only rate something once.");
-        } else {
+        }
+        else {
             // Add the vote.
             $q = $db->query("INSERT INTO uservotes (user_id, epobject_id, vote) VALUES (:user_id, :epobject_id, :vote)", array(':user_id' => $THEUSER->user_id(), ':vote' => $vote, ':epobject_id' => $epobject_id));
             if (!$q->success()) {
@@ -181,7 +189,8 @@ 
         }
     }
 
-} else {
+}
+else {
     voteerror("We weren't able to register your vote");
 }
 

www/docs/boundaries/index.php

Spacing +3 added lines, -3 removed lines

@@ -69,7 +69,7 @@ 
         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'])) {
@@ -134,8 +134,8 @@ 
 <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') {

Braces +18 added lines, -8 removed lines

@@ -21,7 +21,8 @@ 
 if ($pc) {
     # current will have WMC key. If Scottish, has SPC and SPE too. If NI, has NIE.
     $mapit = mapit_call('postcode', $pc);
-    if (is_object($mapit)) { # RABX error returns an object
+    if (is_object($mapit)) {
+# RABX error returns an object
         print '<p class="error">Afraid we couldn&rsquo;t find that postcode.</p>';
         $pc = '';
     }
@@ -42,7 +43,8 @@ 
     if (array_key_exists('SPC', $current)) {
         $a = array($current['SPC'], $current['SPE']);
         $country = 'S';
-    } else {
+    }
+    else {
         $a = array($current['NIE']);
         $country = 'N';
     }
@@ -74,7 +76,8 @@ 
         $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');
-        } elseif ($house == 4 && $cons == $current['SPE']) {
+        }
+        elseif ($house == 4 && $cons == $current['SPE']) {
             $mreg[] = $q->field($i, 'first_name') . ' ' . $q->field($i, 'last_name');
         }
     }
@@ -122,9 +125,11 @@ 
 <?php
     if (count($new)) {
         print "<li>For the Parliament election, you are in the <strong>$new[SPC]</strong> constituency, in the <strong>$new[SPE]</strong> region.";
-    } elseif ($country == 'N') {
+    }
+    elseif ($country == 'N') {
         print "<li>For the Assembly election, you are in the <strong>$current[WMC]</strong> constituency.";
-    } else {
+    }
+    else {
         print '<li>We cannot look up the constituency for the election for some reason, sorry.';
     }
 
@@ -134,11 +139,16 @@ 
 <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') {
+    }
+    elseif ($country == 'N') {
         $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>

www/docs/wikipedia/index.php

Spacing +1 added lines, -1 removed lines

@@ -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 +15 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,12 @@ 
 <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 +56,13 @@ 
     $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();