mysociety / theyworkforyou

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/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"])) {

www/docs/user/logout/index.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     // So we can send the user back to where they came from.
     $URL->insert(array("ret"=>get_http_var("ret")));
 }
-$THEUSER->logout( $URL->generate() );
+$THEUSER->logout($URL->generate());
 
 $message['title'] = 'You are now logged out';
 

www/docs/admin/edittopic.php

Indentation +19 added lines, -19 removed lines

@@ -11,34 +11,34 @@ 
 
 $slug = get_http_var('id');
 if ($slug) {
-  $topic = $topics->getTopic($slug);
+    $topic = $topics->getTopic($slug);
 } else {
-  $topic = new \MySociety\TheyWorkForYou\Topic();
+    $topic = new \MySociety\TheyWorkForYou\Topic();
 }
 
 $action = get_http_var('action');
 switch ($action) {
     case 'add':
       $success = add_topic($topic);
-      break;
+        break;
     case 'update':
       $success = update_topic($topic);
-      break;
+        break;
     case 'setimage':
       $success = add_image($topic);
-      break;
+        break;
     case 'addcontent':
       $success = add_content($topic);
-      break;
+        break;
     case 'deletecontent':
       $success = delete_content($topic);
-      break;
+        break;
     case 'addpolicysets':
       $success = add_policy_sets($topic);
-      break;
+        break;
     case 'addpolicies':
       $success = add_policies($topic);
-      break;
+        break;
     default:
       $success = NULL;
 }
@@ -125,10 +125,10 @@ 
             <select name="sets[]" multiple>
               <option value="">None</option>
             <?php
-              $policies = new \MySociety\TheyWorkForYou\Policies;
-              $set_descriptions = $policies->getSetDescriptions();
-              $related_sets = $topic->getPolicySets();
-              foreach ($set_descriptions as $set => $description) { ?>
+                $policies = new \MySociety\TheyWorkForYou\Policies;
+                $set_descriptions = $policies->getSetDescriptions();
+                $related_sets = $topic->getPolicySets();
+                foreach ($set_descriptions as $set => $description) { ?>
               <option value="<?= $set ?>" <?= in_array($set, $related_sets) ? 'selected' : '' ?>><?= $description ?></option>
             <?php } ?>
             <input type="submit" value="Update">
@@ -143,10 +143,10 @@ 
             <select name="policies[]" multiple>
               <option value="">None</option>
             <?php
-              $policies = new \MySociety\TheyWorkForYou\Policies;
-              $all_policies = $policies->getPolicies();
-              $related_policies = $topic->getPolicies();
-              foreach ($all_policies as $number => $description) { ?>
+                $policies = new \MySociety\TheyWorkForYou\Policies;
+                $all_policies = $policies->getPolicies();
+                $related_policies = $topic->getPolicies();
+                foreach ($all_policies as $number => $description) { ?>
               <option value="<?= $number ?>" <?= in_array($number, $related_policies) ? 'selected' : '' ?>><?= $description ?></option>
             <?php } ?>
 
@@ -214,9 +214,9 @@ 
             $file_info['tmp_name'],
             $topic->image_path()
         );
-     } catch (ErrorException $e) {
+        } catch (ErrorException $e) {
         return false;
-     }
+        }
 
     if ($image_saved) {
         return $topic->save();

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

@@ -40,7 +40,7 @@
       $success = add_policies($topic);
       break;
     default:
-      $success = NULL;
+      $success = null;
 }
 
 if (!is_null($success)) {

www/docs/admin/failedsearches.php

Spacing +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
     $max_time = relative_time($row['max_time']);
     $min_time = str_replace(" ago", "", $min_time);
     $max_time = str_replace(" ago", "", $max_time);
-    $rows[] = array (
+    $rows[] = array(
         $row['count_ips'],
         $row['group_count'],
         '<a href="'.$row['url'].'">'._htmlentities($row['query']).'</a>',
@@ -29,8 +29,8 @@ 
     );
 }
 
-$tabledata = array (
-    'header' => array (
+$tabledata = array(
+    'header' => array(
         'Distinct IPs',
         'Number of times',
         'Query',

www/docs/admin/popularsearches.php

Spacing +4 added lines, -4 removed lines

@@ -14,14 +14,14 @@
 
 $rows = array();
 foreach ($search_popular as $row) {
-    $rows[] = array (
-        '<a href="'.$row['url'].'">' . _htmlentities($row['query']) . '</a>',
+    $rows[] = array(
+        '<a href="'.$row['url'].'">'._htmlentities($row['query']).'</a>',
         $row['c'],
     );
 }
 
-$tabledata = array (
-    'header' => array (
+$tabledata = array(
+    'header' => array(
         'Query',
         'Count'
     ),