mysociety / theyworkforyou

www/docs/search/rss/index.php

Braces +3 added lines, -2 removed lines

@@ -44,8 +44,9 @@
         $pagetitle .= " page $pagenum";
     }
     $num = get_http_var('n');
-    if (!is_numeric($num) || $num <= 0)
-        $num = 20;
+    if (!is_numeric($num) || $num <= 0) {
+            $num = 20;
+    }
 
     $DATA->set_page_metadata($this_page, 'title', $pagetitle);
 

Spacing +3 added lines, -3 removed lines

@@ -2,8 +2,8 @@ 
 # vim:sw=4:ts=4:et:nowrap
 
 include_once '../../../includes/easyparliament/init.php';
-include_once INCLUDESPATH."easyparliament/member.php";
-include_once INCLUDESPATH."easyparliament/glossary.php";
+include_once INCLUDESPATH . "easyparliament/member.php";
+include_once INCLUDESPATH . "easyparliament/glossary.php";
 
 if (!DEVSITE) {
     header('Cache-Control: max-age=86400'); # Once a day
@@ -49,7 +49,7 @@ 
 
     $DATA->set_page_metadata($this_page, 'title', $pagetitle);
 
-    $args = array (
+    $args = array(
         's' => $searchstring,
         'p' => $pagenum,
         'pop' => 1,

www/docs/hansardbugs/index.php

Spacing +3 added lines, -3 removed lines

@@ -2,12 +2,12 @@ 
 
 $this_page = 'hansard_bugs';
 include_once '../../includes/easyparliament/init.php';
-$DATA->set_page_metadata($this_page, 'heading','Official Hansard problems');
+$DATA->set_page_metadata($this_page, 'heading', 'Official Hansard problems');
 
 $PAGE->page_start();
 $PAGE->stripe_start();
 
-$PAGE->block_start(array ('title'=>'Things currently noticeable to the user'));
+$PAGE->block_start(array('title'=>'Things currently noticeable to the user'));
 ?>
 
 <style type="text/css">
@@ -110,7 +110,7 @@ 
 
 <?php
 $PAGE->block_end();
-$PAGE->block_start(array ('title'=>'Things not noticeable to the user'));
+$PAGE->block_start(array('title'=>'Things not noticeable to the user'));
 ?>
 
 <ul>

www/docs/departments/index.php

Braces +3 added lines, -2 removed lines

@@ -33,8 +33,9 @@
     if (isset($arr[3])) {
         print '<a href="'.$link.'/questions">Written Questions</a>';
     }
-    if (count($arr)==2)
-        print ' | ';
+    if (count($arr)==2) {
+            print ' | ';
+    }
     if (isset($arr[4])) {
         print '<a href="'.$link.'/statements">Written Ministerial Statements</a>';
     }

Spacing +4 added lines, -4 removed lines

@@ -26,17 +26,17 @@
 
 print '<ul>';
 foreach ($data as $body => $arr) {
-    $link = strtolower(str_replace(' ','_',$body));
+    $link = strtolower(str_replace(' ', '_', $body));
     print '<li>';
     print $body;
     print ' &mdash; ';
     if (isset($arr[3])) {
-        print '<a href="'.$link.'/questions">Written Questions</a>';
+        print '<a href="' . $link . '/questions">Written Questions</a>';
     }
-    if (count($arr)==2)
+    if (count($arr) == 2)
         print ' | ';
     if (isset($arr[4])) {
-        print '<a href="'.$link.'/statements">Written Ministerial Statements</a>';
+        print '<a href="' . $link . '/statements">Written Ministerial Statements</a>';
     }
     print '</li>';
 }

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/next.php

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

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 IN (12,13,14) "
-        . ($action=='nextneeded'?'and video_status in (1,3)':'') . "
+        . ($action == 'nextneeded' ? 'and video_status in (1,3)' : '') . "
         ORDER BY hpos LIMIT 1")->first();
     if (!$q) {
         $PAGE->page_start();
@@ -41,7 +41,7 @@ 
     } else {
         $new_gid = $q['gid'];
         $new_hpos = $q['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

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/glossary.php

Braces +2 added lines, -4 removed lines

@@ -30,8 +30,7 @@ 
         'epobject_type' => 2
     );
     $EDITQUEUE->approve($data);
-}
-elseif (get_http_var('decline')) {
+} elseif (get_http_var('decline')) {
     $decline = array (get_http_var('decline'));
     // Dump all declined items
     $data = array (
@@ -39,8 +38,7 @@ 
         'epobject_type' => 2
     );
     $EDITQUEUE->decline($data);
-}
-elseif (get_http_var('delete_confirm')) {
+} elseif (get_http_var('delete_confirm')) {
     $delete_id = get_http_var('delete_confirm');
     // Delete the existing glossary entry
     $GLOSSARY->delete($delete_id);

Spacing +6 added lines, -6 removed lines

@@ -2,13 +2,13 @@ 
 // Some sketchy crap for displaying pending glossary additions
 
 include_once '../../includes/easyparliament/init.php';
-include_once (INCLUDESPATH."easyparliament/glossary.php");
+include_once (INCLUDESPATH . "easyparliament/glossary.php");
 
 $this_page = "admin_glossary";
 
 $EDITQUEUE = new \MySociety\TheyWorkForYou\GlossaryEditQueue;
 
-$args = array (
+$args = array(
     'sort' => "regexp_replace"
 );
 
@@ -21,19 +21,19 @@ 
 if (get_http_var('approve')) {
     $approve = get_http_var('approve');
     if (!is_array($approve)) {
-        $approve = array ( $approve );
+        $approve = array($approve);
     }
     // Add all approved items
-    $data = array (
+    $data = array(
         'approvals' => $approve,
         'epobject_type' => 2
     );
     $EDITQUEUE->approve($data);
 }
 elseif (get_http_var('decline')) {
-    $decline = array (get_http_var('decline'));
+    $decline = array(get_http_var('decline'));
     // Dump all declined items
-    $data = array (
+    $data = array(
         'declines' => $decline,
         'epobject_type' => 2
     );

www/docs/admin/glossary_pending.php

Braces +5 added lines, -10 removed lines

@@ -32,8 +32,7 @@ 
         'epobject_type' => 2
     );
     $EDITQUEUE->approve($data);
-}
-elseif (get_http_var('decline')) {
+} elseif (get_http_var('decline')) {
     $decline = array (get_http_var('decline'));
     // Dump all declined items
     $data = array (
@@ -57,15 +56,13 @@ 
     if (get_http_var('previewterm')) {
         $body	= get_http_var('definition');
         $title	= get_http_var('g');
-    }
-    else {
+    } else {
         $body = $EDITQUEUE->pending[$glossary_id]['body'];
         $title = $EDITQUEUE->pending[$glossary_id]['title'];
     }
     if (get_http_var('wikiguess')) {
         $checked = " checked";
-    }
-    else {
+    } else {
         $checked = "";
     }
 
@@ -111,8 +108,7 @@ 
 
     $PAGE->glossary_display_term($GLOSSARY);
 
-}
-else {
+} else {
 
     // add a modification to the database
     if (get_http_var('submitterm') && get_http_var('modify')) {
@@ -128,8 +124,7 @@ 
     if ($EDITQUEUE->pending_count) {
         print "<h3>" . $EDITQUEUE->pending_count . " Pending Glossary terms</h3>";
         $EDITQUEUE->display("pending");
-    }
-    else {
+    } else {
         print "<h3>Nothing pending, tap your fingers awhile.</h3>";
     }
 }

Spacing +9 added lines, -9 removed lines

@@ -2,13 +2,13 @@ 
 // Some sketchy crap for displaying pending glossary additions
 
 include_once '../../includes/easyparliament/init.php';
-include_once (INCLUDESPATH."easyparliament/glossary.php");
+include_once (INCLUDESPATH . "easyparliament/glossary.php");
 
 $this_page = "admin_glossary_pending";
 
 $EDITQUEUE = new \MySociety\TheyWorkForYou\GlossaryEditQueue;
 
-$args = array (
+$args = array(
     'sort' => "regexp_replace"
 );
 $GLOSSARY = new GLOSSARY($args);
@@ -23,19 +23,19 @@ 
 if (get_http_var('approve')) {
     $approve = get_http_var('approve');
     if (!is_array($approve)) {
-        $approve = array ( $approve );
+        $approve = array($approve);
     }
     // Add all approved items
-    $data = array (
+    $data = array(
         'approvals' => $approve,
         'epobject_type' => 2
     );
     $EDITQUEUE->approve($data);
 }
 elseif (get_http_var('decline')) {
-    $decline = array (get_http_var('decline'));
+    $decline = array(get_http_var('decline'));
     // Dump all declined items
-    $data = array (
+    $data = array(
         'declines' => $decline,
         'epobject_type' => 2
     );
@@ -54,8 +54,8 @@ 
 
     // Mock up a "current term" to send to the display function
     if (get_http_var('previewterm')) {
-        $body	= get_http_var('definition');
-        $title	= get_http_var('g');
+        $body = get_http_var('definition');
+        $title = get_http_var('g');
     }
     else {
         $body = $EDITQUEUE->pending[$glossary_id]['body'];
@@ -115,7 +115,7 @@ 
 
     // add a modification to the database
     if (get_http_var('submitterm') && get_http_var('modify')) {
-        $data = array (
+        $data = array(
             'user_id'	=> get_http_var('userid'),
             'title'		=> get_http_var('g'),
             'body'		=> get_http_var('definition')