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

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=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

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

Spacing +18 added lines, -18 removed lines

@@ -7,7 +7,7 @@ 
 
 $PAGE->page_start();
 $PAGE->stripe_start();
-$PAGE->block_start(array ('id'=>'alerts', 'title'=>'Alert Statistics'));
+$PAGE->block_start(array('id'=>'alerts', 'title'=>'Alert Statistics'));
 $db = new ParlDB;
 
 $q_confirmed = $db->query('select count(*) as c from alerts where confirmed and not deleted');
@@ -18,13 +18,13 @@ 
 
 print '<h3>Headline stats</h3> <table>';
 $data = array(
-    'header' => array( 'Alert Type', 'Count' ),
+    'header' => array('Alert Type', 'Count'),
     'rows' => array(
-        array( 'Confirmed', $q_confirmed->field('0', 'c') ),
-        array( 'Not Confirmed', $q_not_confirmed->field('0', 'c') ),
-        array( 'Deleted', $q_deleted->field('0', 'c') ),
-        array( 'For a Speaker<sup>*</sup>', $q_speaker->field('0', 'c') ),
-        array( 'For a Keyword', $q_keyword->field('0', 'c') ),
+        array('Confirmed', $q_confirmed->field('0', 'c')),
+        array('Not Confirmed', $q_not_confirmed->field('0', 'c')),
+        array('Deleted', $q_deleted->field('0', 'c')),
+        array('For a Speaker<sup>*</sup>', $q_speaker->field('0', 'c')),
+        array('For a Keyword', $q_keyword->field('0', 'c')),
     )
 );
 
@@ -35,17 +35,17 @@ 
 $q = $db->query('select alert_id, criteria from alerts where criteria not like "%speaker:%" and criteria like "%,%" and confirmed and not deleted');
 print '<h3>People who probably wanted separate signups</h3>';
 $rows = array();
-for ($i=0; $i<$q->rows(); $i++) {
+for ($i = 0; $i < $q->rows(); $i++) {
     $id = $q->field($i, 'alert_id');
     $criteria = $q->field($i, 'criteria');
     $rows[] = array($id, $critera);
 }
-$data = array( 'rows' => $rows );
+$data = array('rows' => $rows);
 $PAGE->display_table($data);
 
 $q = $db->query('select count(*) as c, criteria from alerts where criteria like "speaker:%" and confirmed and not deleted group by criteria order by c desc');
 $tots = array(); $name = array();
-for ($i=0; $i<$q->rows(); $i++) {
+for ($i = 0; $i < $q->rows(); $i++) {
     $c = $q->field($i, 'c');
     $criteria = $q->field($i, 'criteria');
     if (!preg_match('#^speaker:(\d+)#', $criteria, $m)) continue;
@@ -59,7 +59,7 @@ 
 }
 $q = $db->query('select count(*) as c, criteria from alerts where criteria like "speaker:%" and not confirmed group by criteria order by c desc');
 $unconfirmed = array();
-for ($i=0; $i<$q->rows(); $i++) {
+for ($i = 0; $i < $q->rows(); $i++) {
     $c = $q->field($i, 'c');
     $criteria = $q->field($i, 'criteria');
     if (!preg_match('#^speaker:(\d+)#', $criteria, $m)) continue;
@@ -70,15 +70,15 @@ 
     }
 }
 
-$people_header = array( 'Name', 'Confirmed', 'Unconfirmed');
+$people_header = array('Name', 'Confirmed', 'Unconfirmed');
 print '<h3>Alert signups by MP/Peer</h3>';
 $rows = array();
 foreach ($tots as $person_id => $c) {
     $u = isset($unconfirmed[$person_id]) ? $unconfirmed[$person_id] : 0;
-    $rows[] = array( $name[$person_id], $c, $u );
+    $rows[] = array($name[$person_id], $c, $u);
 }
 $data = array(
-    'header' => array( 'Name', 'Confirmed', 'Unconfirmed'),
+    'header' => array('Name', 'Confirmed', 'Unconfirmed'),
     'rows' => $rows
 );
 $PAGE->display_table($data);
@@ -87,14 +87,14 @@ 
 $confirmed = array();
 $total = array();
 $q = $db->query("select count(*) as c, criteria from alerts where criteria not like '%speaker:%' and confirmed and not deleted group by criteria having c>1 order by c desc");
-for ($i=0; $i<$q->rows(); $i++) {
+for ($i = 0; $i < $q->rows(); $i++) {
     $c = $q->field($i, 'c');
     $criteria = $q->field($i, 'criteria');
     $confirmed[$criteria] = $c;
     $total[$criteria] = 1;
 }
 $q = $db->query("select count(*) as c, criteria from alerts where criteria not like '%speaker:%' and not confirmed group by criteria having c>1 order by c desc");
-for ($i=0; $i<$q->rows(); $i++) {
+for ($i = 0; $i < $q->rows(); $i++) {
     $c = $q->field($i, 'c');
     $criteria = $q->field($i, 'criteria');
     $unconfirmed[$criteria] = $c;
@@ -105,10 +105,10 @@ 
 foreach ($total as $criteria => $tot) {
     $c = isset($confirmed[$criteria]) ? $confirmed[$criteria] : 0;
     $u = isset($unconfirmed[$criteria]) ? $unconfirmed[$criteria] : 0;
-    $rows[] = array( $criteria, $c, $u );
+    $rows[] = array($criteria, $c, $u);
 }
 $data = array(
-    'header' => array( 'Criteria', 'Confirmed', 'Unconfirmed'),
+    'header' => array('Criteria', 'Confirmed', 'Unconfirmed'),
     'rows' => $rows
 );
 $PAGE->display_table($data);

Braces +12 added lines, -4 removed lines

@@ -48,11 +48,15 @@ 
 for ($i=0; $i<$q->rows(); $i++) {
     $c = $q->field($i, 'c');
     $criteria = $q->field($i, 'criteria');
-    if (!preg_match('#^speaker:(\d+)#', $criteria, $m)) continue;
+    if (!preg_match('#^speaker:(\d+)#', $criteria, $m)) {
+        continue;
+    }
     $person_id = $m[1];
     $MEMBER = new MEMBER(array('person_id'=>$person_id));
     if ($MEMBER->valid) {
-        if (!array_key_exists($person_id, $tots)) $tots[$person_id] = 0;
+        if (!array_key_exists($person_id, $tots)) {
+            $tots[$person_id] = 0;
+        }
         $tots[$person_id] += $c;
         $name[$person_id] = $MEMBER->full_name();
     }
@@ -62,10 +66,14 @@ 
 for ($i=0; $i<$q->rows(); $i++) {
     $c = $q->field($i, 'c');
     $criteria = $q->field($i, 'criteria');
-    if (!preg_match('#^speaker:(\d+)#', $criteria, $m)) continue;
+    if (!preg_match('#^speaker:(\d+)#', $criteria, $m)) {
+        continue;
+    }
     $person_id = $m[1];
     if (isset($name[$person_id])) {
-        if (!array_key_exists($person_id, $unconfirmed)) $unconfirmed[$person_id] = 0;
+        if (!array_key_exists($person_id, $unconfirmed)) {
+            $unconfirmed[$person_id] = 0;
+        }
         $unconfirmed[$person_id] += $c;
     }
 }

www/docs/admin/reporting_stats.php

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
 
 $PAGE->page_start();
 $PAGE->stripe_start();
-$PAGE->block_start(array ('id'=>'alerts', 'title'=>'Reporting Statistics'));
+$PAGE->block_start(array('id'=>'alerts', 'title'=>'Reporting Statistics'));
 $db = new ParlDB;
 $q = $db->query('select year(created) as the_year, month(created) as the_month, count(*) as c from alerts where confirmed and not deleted group by year(created) desc, month(created) desc');
 print '<h3>Alert signups per month</h3> <table>';
@@ -16,7 +16,7 @@ 
 print '<thead><tr><th>Year</th><th style="padding-right: 15px;">Month</th><th>Sign Ups</th><tr></thead>';
 
 $row_count = $q->rows();
-for ($i=0; $i<$row_count; $i++) {
+for ($i = 0; $i < $row_count; $i++) {
     $year = $q->field($i, 'the_year');
     $month = $q->field($i, 'the_month');
     $count = $q->field($i, 'c');

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 +7 added lines, -7 removed lines

@@ -2,14 +2,14 @@ 
 // Some sketchy crap for displaying pending glossary additions
 
 include_once '../../includes/easyparliament/init.php';
-include_once (INCLUDESPATH."easyparliament/editqueue.php");
-include_once (INCLUDESPATH."easyparliament/glossary.php");
+include_once (INCLUDESPATH . "easyparliament/editqueue.php");
+include_once (INCLUDESPATH . "easyparliament/glossary.php");
 
 $this_page = "admin_glossary";
 
 $EDITQUEUE = new GLOSSEDITQUEUE();
 
-$args = array (
+$args = array(
     'sort' => "regexp_replace"
 );
 
@@ -22,19 +22,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/photos.php

Braces +36 added lines, -26 removed lines

@@ -36,28 +36,33 @@ 
     $pid = intval(get_http_var('pid'));
     $errors = array();
 
-    if (!array_key_exists('photo', $_FILES))
-        array_push($errors, 'Not got the photo.');
-    elseif ($_FILES['photo']['error'] > 0)
-        array_push($errors, 'There was an error uploading the photo.');
-    elseif (!is_uploaded_file($_FILES['photo']['tmp_name']))
-        array_push($errors, 'Did not get an uploaded file.');
-    else {
+    if (!array_key_exists('photo', $_FILES)) {
+            array_push($errors, 'Not got the photo.');
+    } elseif ($_FILES['photo']['error'] > 0) {
+            array_push($errors, 'There was an error uploading the photo.');
+    } elseif (!is_uploaded_file($_FILES['photo']['tmp_name'])) {
+            array_push($errors, 'Did not get an uploaded file.');
+    } else {
         $tmp_name = $_FILES['photo']['tmp_name'];
 
         $image = new Imagick();
         $image->readImage($tmp_name);
-        if (!$image)
-            array_push($errors, 'Failed to read image from uploaded file');
+        if (!$image) {
+                    array_push($errors, 'Failed to read image from uploaded file');
+        }
             $imageS = clone $image;
-        if (!$image->scaleImage(0, 118))
-            array_push($errors, 'Scaling large failed');
-        if (!$imageS->scaleImage(0, 59))
-            array_push($errors, 'Scaling small failed');
-        if (!$image->writeImage("$dir/mpsL/$pid.jpeg"))
-            array_push($errors, "Saving to $dir/mpsL/$pid.jpeg failed");
-        if (!$imageS->writeImage("$dir/mps/$pid.jpeg"))
-            array_push($errors, "Saving to $dir/mps/$pid.jpeg failed");
+        if (!$image->scaleImage(0, 118)) {
+                    array_push($errors, 'Scaling large failed');
+        }
+        if (!$imageS->scaleImage(0, 59)) {
+                    array_push($errors, 'Scaling small failed');
+        }
+        if (!$image->writeImage("$dir/mpsL/$pid.jpeg")) {
+                    array_push($errors, "Saving to $dir/mpsL/$pid.jpeg failed");
+        }
+        if (!$imageS->writeImage("$dir/mps/$pid.jpeg")) {
+                    array_push($errors, "Saving to $dir/mps/$pid.jpeg failed");
+        }
         if (!$errors) {
             print "<pre>";
             chdir($dir);
@@ -70,8 +75,9 @@ 
         }
     }
 
-    if ($errors)
-        return display_photo_form($errors);
+    if ($errors) {
+            return display_photo_form($errors);
+    }
     return "<p><em>Photo uploaded and resized for pid $pid</em> &mdash; check how it looks <a href=\"/mp?p=$pid\">on their page</a></p>" . display_photo_form();
 }
 
@@ -99,7 +105,9 @@ 
         $house = $q->field($i, 'house');
         $desc = member_full_name($house, $q->field($i, 'title'), $q->field($i, 'given_name'), $q->field($i, 'family_name'), $q->field($i, 'lordofname')) .
                 " " . $houses[$house];
-        if ($q->field($i, 'party')) $desc .= ' (' . $q->field($i, 'party') . ')';
+        if ($q->field($i, 'party')) {
+            $desc .= ' (' . $q->field($i, 'party') . ')';
+        }
         if ($q->field($i, 'constituency')) {
             $desc .= ', ' . $q->field($i, 'constituency');
         }
@@ -150,13 +158,15 @@ 
     $attr_link = get_http_var('attr_link');
     $errors = array();
 
-    if (!$pid || !$attr_text)
-        array_push($errors, 'Missing information');
-    elseif ($attr_link && substr($attr_link, 0, 4) != 'http')
-        array_push($errors, 'Bad link');
+    if (!$pid || !$attr_text) {
+            array_push($errors, 'Missing information');
+    } elseif ($attr_link && substr($attr_link, 0, 4) != 'http') {
+            array_push($errors, 'Bad link');
+    }
 
-    if ($errors)
-        return display_attribution_form($errors);
+    if ($errors) {
+            return display_attribution_form($errors);
+    }
 
     # UPDATE
     global $db;

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

@@ -139,7 +139,7 @@ 
 </form>
 
 <p style="clear:both; margin-top: 3em"><a href="/images/mps/photo-status.php">List MPs without photos</a></p>
-EOF;
+eof;
 
     return $out;
 }
@@ -193,7 +193,7 @@ 
     <span class="formw"><input type="submit" name="submit" value="Update attribution"></span>
 </div>
 </form>
-EOF;
+eof;
 
     return $out;
 }

Spacing +2 added lines, -2 removed lines

@@ -94,7 +94,7 @@ 
 
     $houses = array(1 => 'MP', 'Lord', 'MLA', 'MSP');
 
-    for ($i=0; $i<$q->rows(); $i++) {
+    for ($i = 0; $i < $q->rows(); $i++) {
         $p_id = $q->field($i, 'person_id');
         $house = $q->field($i, 'house');
         $desc = member_full_name($house, $q->field($i, 'title'), $q->field($i, 'given_name'), $q->field($i, 'family_name'), $q->field($i, 'lordofname')) .
@@ -112,7 +112,7 @@ 
         } else {
             $desc .= ' [no photo]';
         }
-        $out .= '<option value="'.$p_id.'">'.$desc.'</option>' . "\n";
+        $out .= '<option value="' . $p_id . '">' . $desc . '</option>' . "\n";
     }
 
     $out .= ' </select></span> </div> ';