mysociety / theyworkforyou

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

www/docs/news/index.php

Braces +25 added lines, -9 removed lines

@@ -9,10 +9,14 @@ 
 if (preg_match("#/(\d\d\d\d)/(\d\d)/(\d\d)/([a-z0-9_]+)(\.php)?$#", $uri, $matches)) {
     // Individual item
     list($all, $year, $month, $day, $ref) = $matches;
-    if ($ref == "please_build_on_") $ref = "new_full_source_";
+    if ($ref == "please_build_on_") {
+        $ref = "new_full_source_";
+    }
     foreach ($all_news as $id => $news_row) {
         list($title, $content, $date) = $news_row;
-        if (news_format_ref($title) != $ref) continue;
+        if (news_format_ref($title) != $ref) {
+            continue;
+        }
 
         $this_page = 'sitenews_individual';
         $DATA->set_page_metadata($this_page, 'title', $title);
@@ -20,7 +24,9 @@ 
         $PAGE->stripe_start();
         print news_format_body($content);
         print "<p>Posted on " . format_date(substr($date, 0, 10), LONGDATEFORMAT) . " at " . substr($date, 11);
-        if (isset($news_row[3])) print " by $news_row[3]";
+        if (isset($news_row[3])) {
+            print " by $news_row[3]";
+        }
         print " | <a href=\"" . news_individual_link($date, $title) . "\">Link to this</a>";
         break;
     }
@@ -28,7 +34,8 @@ 
         $PAGE->page_start();
         $PAGE->stripe_start();
     }
-} elseif (preg_match("#/(\d\d\d\d)/(\d\d)/?(index.php)?$#", $uri, $matches)) {
+}
+elseif (preg_match("#/(\d\d\d\d)/(\d\d)/?(index.php)?$#", $uri, $matches)) {
     // Month index
     list($all, $year, $month) = $matches;
     $this_page = 'sitenews_date';
@@ -37,28 +44,37 @@ 
     $PAGE->stripe_start();
     foreach (array_reverse($all_news) as $id => $news_row) {
         list($title, $content, $date) = $news_row;
-        if (substr($date, 0, 7) != "$year-$month") continue;
+        if (substr($date, 0, 7) != "$year-$month") {
+            continue;
+        }
         print "<h3>" . format_date(substr($date, 0, 10), LONGDATEFORMAT) . "</h3>";
         print "<h4>" . $title . "</h4>";
         print news_format_body($content);
         print "<p>Posted at " . substr($date, 11);
-        if (isset($news_row[3])) print " by $news_row[3]";
+        if (isset($news_row[3])) {
+            print " by $news_row[3]";
+        }
         print " | <a href=\"" . news_individual_link($date, $title) . "\">Link to this</a>";
     }
-} else {
+}
+else {
     // Front page /news
     $this_page = 'sitenews';
     $PAGE->page_start();
     $PAGE->stripe_start();
     $c = 0;
     foreach ($all_news as $id => $news_row) {
-        if ($c++ == 10) break;
+        if ($c++ == 10) {
+            break;
+        }
         list($title, $content, $date) = $news_row;
         print "<h3>" . format_date(substr($date, 0, 10), LONGDATEFORMAT) . "</h3>";
         print "<h4>" . $title . "</h4>";
         print news_format_body($content);
         print "<p>Posted at " . substr($date, 11);
-        if (isset($news_row[3])) print " by $news_row[3]";
+        if (isset($news_row[3])) {
+            print " by $news_row[3]";
+        }
         print " | <a href=\"" . news_individual_link($date, $title) . "\">Link to this</a>";
     }
 }

www/docs/news/sidebar_archives.php

Spacing +2 added lines, -2 removed lines

@@ -12,8 +12,8 @@
 
     $ym = substr($date, 0, 7);
     if ($ym != $last) {
-        $url = WEBPATH . "news/archives/".str_replace("-", "/", $ym);
-        print "<a href=\"$url\">".format_date($ym."-01", "F Y")."</a>";
+        $url = WEBPATH . "news/archives/" . str_replace("-", "/", $ym);
+        print "<a href=\"$url\">" . format_date($ym . "-01", "F Y") . "</a>";
         print "<br>";
         $last = $ym;
     }

www/docs/video/submit.php

Braces +10 added lines, -4 removed lines

@@ -18,11 +18,16 @@ 
 $htime = $q->field(0, 'htime');
 $atime = $q->field(0, 'atime');
 $adate = $q->field(0, 'adate');
-if ($atime) $htime = $atime;
-if ($adate) $hdate = $adate;
+if ($atime) {
+    $htime = $atime;
+}
+if ($adate) {
+    $hdate = $adate;
+}
 
-if (!$hdate || !$htime || !$time)
+if (!$hdate || !$htime || !$time) {
     exit;
+}
 
 $videodb = \MySociety\TheyWorkForYou\Utility\Video::dbConnect();
 if (!$file) {
@@ -50,7 +55,8 @@ 
 if ($THEUSER->isloggedin()) {
     $user_id = $THEUSER->user_id();
     $q = $db->query("insert into video_timestamps (gid, user_id, adate, atime) values ('$q_gid', $user_id, '$new_date', '$new_time') on duplicate key update adate=VALUES(adate),atime=VALUES(atime),deleted=0");
-} else {
+}
+else {
     $q = $db->query("insert into video_timestamps (gid, adate, atime) values ('$q_gid', '$new_date', '$new_time')");
 }
 $new_id = $q->insert_id();

www/docs/video/next.php

Spacing +3 added lines, -3 removed lines

@@ -7,7 +7,7 @@ 
 $major = intval(get_http_var('major'));
 if (!$major) $major = 1;
 
-if ($action == 'next' || $action=='nextneeded') {
+if ($action == 'next' || $action == 'nextneeded') {
     $gid = get_http_var('gid');
     $file = intval(get_http_var('file'));
     $time = intval(get_http_var('time'));
@@ -27,7 +27,7 @@ 
     $q = $db->query("select gid, hpos from hansard
         where hpos>$hpos and hdate='$hdate' and major=$major
         and (htype=12 or htype=13) "
-        . ($action=='nextneeded'?'and video_status in (1,3)':'') . "
+        . ($action == 'nextneeded' ? 'and video_status in (1,3)' : '') . "
         ORDER BY hpos LIMIT 1");
     if (!$q->rows()) {
         $PAGE->page_start();
@@ -41,7 +41,7 @@ 
     } else {
         $new_gid = $q->field(0, 'gid');
         $new_hpos = $q->field(0, 'hpos');
-        if ($action=='nextneeded') {
+        if ($action == 'nextneeded') {
             $q = $db->query("select adate, atime from hansard, video_timestamps
                 where hansard.gid = video_timestamps.gid and deleted=0
                     and hpos<$new_hpos and hdate='$hdate' and major=$major

Braces +11 added lines, -5 removed lines

@@ -5,7 +5,9 @@ 
 $action = get_http_var('action');
 $pid = intval(get_http_var('pid'));
 $major = intval(get_http_var('major'));
-if (!$major) $major = 1;
+if (!$major) {
+    $major = 1;
+}
 
 if ($action == 'next' || $action=='nextneeded') {
     $gid = get_http_var('gid');
@@ -38,7 +40,8 @@ 
 ;-)</p>';
         $PAGE->stripe_end();
         $PAGE->page_end();
-    } else {
+    }
+    else {
         $new_gid = $q->field(0, 'gid');
         $new_hpos = $q->field(0, 'hpos');
         if ($action=='nextneeded') {
@@ -59,7 +62,8 @@ 
         $new_gid = fix_gid_but_leave_section($new_gid);
         header('Location: /video/?from=next&file=' . $file . '&gid=' . $new_gid . '&start=' . $time);
     }
-} elseif ($action == 'random' && $pid) {
+}
+elseif ($action == 'random' && $pid) {
     $db = new ParlDB;
     $q = $db->query("select gid from hansard
         where video_status in (1,3) and major=:major
@@ -68,7 +72,8 @@ 
         ORDER BY RAND() LIMIT 1", array(':major' => $major, ':pid' => $pid));
     $new_gid = fix_gid_but_leave_section($q->field(0, 'gid'));
     header('Location: /video/?from=random&pid=' . $pid . '&gid=' . $new_gid);
-} elseif ($action == 'random') {
+}
+elseif ($action == 'random') {
     $db = new ParlDB;
     $q = $db->query("select gid, hpos, hdate from hansard
         where video_status in (1,3) and major=:major
@@ -96,7 +101,8 @@ 
     */
     $gid = fix_gid_but_leave_section($gid);
     header('Location: /video/?from=random&gid=' . $gid);
-} else {
+}
+else {
     # Illegal action
 }
 

www/docs/video/distance.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
     $want['hpos'] = $q->field(0, 'hpos');
 
     $LIST = new DEBATELIST;
-        $args = array (
+        $args = array(
             's' => $search,
             'p' => 1,
             'num' => 200,

Braces +2 added lines, -1 removed lines

@@ -19,7 +19,8 @@
 if ($search = get_http_var('s')) {
     search_box($file);
     day_speeches($search, $gid_type, $gid_date);
-} else { ?>
+}
+else { ?>
 <p>If the playing speech appears to be in completely the wrong place,
 enter the speaking MP's name and/or something they're saying in this search box
 to search the day's speeches. Find the correct speech and it will say how

www/docs/written-answers-and-statements/index.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 $view = new MySociety\TheyWorkForYou\SectionView\WransView();
 $data = $view->display();
 if ($data) {
-    if ( $data['template'] ) {
+    if ($data['template']) {
         $template = $data['template'];
     } else {
         $template = 'section/section';

Braces +2 added lines, -1 removed lines

@@ -13,7 +13,8 @@
 if ($data) {
     if ( $data['template'] ) {
         $template = $data['template'];
-    } else {
+    }
+    else {
         $template = 'section/section';
     }
     MySociety\TheyWorkForYou\Renderer::output($template, $data);