mysociety / theyworkforyou

www/docs/random/index.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 include_once '../../includes/easyparliament/init.php';
-include_once INCLUDESPATH . "easyparliament/glossary.php";
+include_once INCLUDESPATH."easyparliament/glossary.php";
 
 $this_page = "debate";
 $this_page = "debates";
@@ -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/video/stamps.php

Spacing +9 added lines, -9 removed lines

@@ -19,8 +19,8 @@ 
 $video = \MySociety\TheyWorkForYou\Utility\Video::fromTimestamp($videodb, $adate, $atime);
 if (!$video) exit;
 
-$start = date('H:i:s', strtotime($video['broadcast_start']. ' GMT'));
-$end = date('H:i:s', strtotime($video['broadcast_end'] . ' GMT'));
+$start = date('H:i:s', strtotime($video['broadcast_start'].' GMT'));
+$end = date('H:i:s', strtotime($video['broadcast_end'].' GMT'));
 
 $q = $db->query("select video_timestamps.gid, adate, atime, time_to_sec(timediff(atime, '$start')) as timediff,
         time_to_sec(timediff(atime, '$end')) as timetoend
@@ -33,26 +33,26 @@ 
 $gids = array();
 $file_offset = 0;
 print '<stamps>';
-for ($i=0; $i<$q->rows(); $i++) {
+for ($i = 0; $i < $q->rows(); $i++) {
     $gid = str_replace('uk.org.publicwhip/', '', $q->field($i, 'gid'));
     if (isset($gids[$gid])) continue;
     $timetoend = $q->field($i, 'timetoend') - $file_offset;
-    if ($timetoend>0) {
+    if ($timetoend > 0) {
         $video = \MySociety\TheyWorkForYou\Utility\Video::fromTimestamp($videodb, $q->field($i, 'adate'), $q->field($i, 'atime'));
-        $new_start = date('H:i:s', strtotime($video['broadcast_start']. ' GMT'));
+        $new_start = date('H:i:s', strtotime($video['broadcast_start'].' GMT'));
         $file_offset += timediff($new_start, $start);
         $start = $new_start;
-        $end = date('H:i:s', strtotime($video['broadcast_end'] . ' GMT'));
+        $end = date('H:i:s', strtotime($video['broadcast_end'].' GMT'));
     }
     $timediff = $q->field($i, 'timediff') - $file_offset;
-    if ($timediff>=0)
+    if ($timediff >= 0)
         print "<stamp><gid>$gid</gid><file>$video[id]</file><time>$timediff</time></stamp>\n";
     $gids[$gid] = true;
 }
 print '</stamps>';
 
 function timediff($a, $b) {
-    return substr($a, 0, 2)*3600 + substr($a, 3, 2)*60 + substr($a, 6, 2)
-        - substr($b, 0, 2)*3600 - substr($b, 3, 2)*60 - substr($b, 6, 2);
+    return substr($a, 0, 2) * 3600 + substr($a, 3, 2) * 60 + substr($a, 6, 2)
+        - substr($b, 0, 2) * 3600 - substr($b, 3, 2) * 60 - substr($b, 6, 2);
 
 }

Braces +9 added lines, -4 removed lines

@@ -17,7 +17,9 @@ 
 $adate = $q->field(0, 'adate');
 $atime = $q->field(0, 'atime');
 $video = \MySociety\TheyWorkForYou\Utility\Video::fromTimestamp($videodb, $adate, $atime);
-if (!$video) exit;
+if (!$video) {
+    exit;
+}
 
 $start = date('H:i:s', strtotime($video['broadcast_start']. ' GMT'));
 $end = date('H:i:s', strtotime($video['broadcast_end'] . ' GMT'));
@@ -35,7 +37,9 @@ 
 print '<stamps>';
 for ($i=0; $i<$q->rows(); $i++) {
     $gid = str_replace('uk.org.publicwhip/', '', $q->field($i, 'gid'));
-    if (isset($gids[$gid])) continue;
+    if (isset($gids[$gid])) {
+        continue;
+    }
     $timetoend = $q->field($i, 'timetoend') - $file_offset;
     if ($timetoend>0) {
         $video = \MySociety\TheyWorkForYou\Utility\Video::fromTimestamp($videodb, $q->field($i, 'adate'), $q->field($i, 'atime'));
@@ -45,8 +49,9 @@ 
         $end = date('H:i:s', strtotime($video['broadcast_end'] . ' GMT'));
     }
     $timediff = $q->field($i, 'timediff') - $file_offset;
-    if ($timediff>=0)
-        print "<stamp><gid>$gid</gid><file>$video[id]</file><time>$timediff</time></stamp>\n";
+    if ($timediff>=0) {
+            print "<stamp><gid>$gid</gid><file>$video[id]</file><time>$timediff</time></stamp>\n";
+    }
     $gids[$gid] = true;
 }
 print '</stamps>';

www/docs/video/distance.php

Spacing +2 added lines, -2 removed lines

@@ -50,12 +50,12 @@
 
     $db = new ParlDB;
     $q = $db->query("select hpos from hansard where gid = :gid", array(
-        ':gid' => 'uk.org.publicwhip/' . $want['gid']
+        ':gid' => 'uk.org.publicwhip/'.$want['gid']
         ));
     $want['hpos'] = $q->field(0, 'hpos');
 
     $LIST = new DEBATELIST;
-        $args = array (
+        $args = array(
             's' => $search,
             'p' => 1,
             'num' => 200,

www/docs/video/delete.php

Braces +5 added lines, -2 removed lines

@@ -5,7 +5,9 @@ 
 $gid = get_http_var('gid');
 $oops = get_http_var('oops');
 
-if (!$oops || !$gid) exit;
+if (!$oops || !$gid) {
+    exit;
+}
 
 $gid = "uk.org.publicwhip/$gid";
 
@@ -16,7 +18,8 @@ 
 
 $db = new ParlDB;
 $q = $db->query("update video_timestamps set deleted=1 where id = :oops and gid = :gid and current_timestamp<whenstamped+interval 30 second", $params);
-if ($q->affected_rows())
+if ($q->affected_rows()) {
     $db->query("update hansard set video_status = video_status & 11 where gid = :gid", $params);
+}
 
 print "<status>OK</status>";

www/docs/video/submit.php

Braces +8 added lines, -3 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) {

www/docs/video/next.php

Spacing +6 added lines, -6 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
@@ -57,7 +57,7 @@ 
             }
         }
         $new_gid = fix_gid_but_leave_section($new_gid);
-        header('Location: /video/?from=next&file=' . $file . '&gid=' . $new_gid . '&start=' . $time);
+        header('Location: /video/?from=next&file='.$file.'&gid='.$new_gid.'&start='.$time);
     }
 } elseif ($action == 'random' && $pid) {
     $db = new ParlDB;
@@ -67,7 +67,7 @@ 
         and hansard.person_id=:pid
         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);
+    header('Location: /video/?from=random&pid='.$pid.'&gid='.$new_gid);
 } elseif ($action == 'random') {
     $db = new ParlDB;
     $q = $db->query("select gid, hpos, hdate from hansard
@@ -95,7 +95,7 @@ 
     }
     */
     $gid = fix_gid_but_leave_section($gid);
-    header('Location: /video/?from=random&gid=' . $gid);
+    header('Location: /video/?from=random&gid='.$gid);
 } else {
     # Illegal action
 }

Braces +3 added lines, -1 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');

www/docs/user/changepc/index.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
 if ($THEUSER->isloggedin()) {
     // They can't change their postcode here, so send them to the editing page.
     $URL = new URL('useredit');
-    header("Location: " . $URL->generate());
+    header("Location: ".$URL->generate());
 }
 
 if (get_http_var('forget') == 't') {
@@ -18,7 +18,7 @@ 
 
     // The cookie will have already been read for this page, so we need to reload.
     $URL = new URL($this_page);
-    header("Location: " . $URL->generate());
+    header("Location: ".$URL->generate());
 }
 
 if (!$THEUSER->postcode_is_set()) {

www/docs/user/confirm/index.php

Spacing +6 added lines, -6 removed lines

@@ -11,7 +11,7 @@ 
 // We then print a nice welcome message.
 
 include_once '../../../includes/easyparliament/init.php';
-include_once INCLUDESPATH . "easyparliament/member.php";
+include_once INCLUDESPATH."easyparliament/member.php";
 
 if (get_http_var('welcome') == 't') {
     // The user has successfully clicked the link, been logged in, and
@@ -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();

www/docs/user/password/index.php

Spacing +3 added lines, -3 removed lines

@@ -61,7 +61,7 @@ 
 
             if ($success) {
 
-                print "<p>A new password has been sent to " . _htmlentities($email) . "</p>\n";
+                print "<p>A new password has been sent to "._htmlentities($email)."</p>\n";
 
             } else {
 
@@ -74,7 +74,7 @@ 
         } 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);
+            $errors["passwordchange"] = "Sorry, there was a problem and we couldn't set a new password for "._htmlentities($email);
 
 
             display_page($errors);
@@ -90,7 +90,7 @@ 
 
 
 
-function display_page ($errors=array()) {
+function display_page($errors = array()) {
     global $this_page, $PAGE;
 
     if (isset($errors["sending"])) {