mysociety / theyworkforyou

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

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 +10 added lines, -10 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_pending";
 
 $EDITQUEUE = new GLOSSEDITQUEUE();
 
-$args = array (
+$args = array(
     'sort' => "regexp_replace"
 );
 $GLOSSARY = new GLOSSARY($args);
@@ -24,19 +24,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
     );
@@ -55,8 +55,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'];
@@ -116,7 +116,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')

www/docs/admin/statistics.php

Spacing +3 added lines, -3 removed lines

@@ -38,10 +38,10 @@
 <p>There are <b><?=number_format($debate_speeches)?></b> debate speeches (<?=number_format($debate_items)?> items including headers).
 <br>There are <b><?=number_format($wrans_questions)?></b> written questions (<?=number_format($wrans_items)?> items including headers and answers).
 
-<!-- Debate items / in-session day: <?=round($debate_items/$uniquedates,0)?>
-Wrans items / in-session day: <?=round($wrans_items/$uniquedates,0)?> -->
+<!-- Debate items / in-session day: <?=round($debate_items / $uniquedates, 0)?>
+Wrans items / in-session day: <?=round($wrans_items / $uniquedates, 0)?> -->
 
-<p>Per sitting day, MPs are producing <b><?=round($debate_speeches/$uniquedates,0)?></b> speeches, and <b><?=round($wrans_questions/$uniquedates,0)?></b> written answers.
+<p>Per sitting day, MPs are producing <b><?=round($debate_speeches / $uniquedates, 0)?></b> speeches, and <b><?=round($wrans_questions / $uniquedates, 0)?></b> written answers.
 </p>
 
 <?php

www/docs/search-hansard/index.php

Indentation +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 
 $DATA->set_page_metadata($this_page, 'title', 'Hansard');
 $DATA->set_page_metadata($this_page, 'meta_description',
-             'Find the complete Hansard on TheyWorkForYou.com - transcripts from all UK parliamentary debates in easily-searchable form.');
+                'Find the complete Hansard on TheyWorkForYou.com - transcripts from all UK parliamentary debates in easily-searchable form.');
 $DATA->set_page_metadata($this_page, 'meta_keywords', "hansard, search hansard, hansard transcriptions, hansard record, parliamentary transcripts, parliament transcripts, parliament records, uk hansard, hansard uk, house of commons transcript, house of commons debates, house of commons records");
 
 $PAGE->supress_heading = true;

www/docs/email/index.php

Braces +15 added lines, -7 removed lines

@@ -14,20 +14,25 @@ 
 $sender_email = get_http_var('sender_mail');
 $sender_name = get_http_var('sender_name');
 $pid = intval(get_http_var('pid'));
-if ($pid)
+if ($pid) {
     $MEMBER = new MEMBER(array('person_id' => $pid));
+}
 
 //validate them
 $errors = array();
 
-if (!$pid)
+if (!$pid) {
     $errors[] = 'You did not get to this page from an MP or Peer page. Please go back and try again.';
-if (!preg_match('#^[^@]+@#', $recipient_email))
+}
+if (!preg_match('#^[^@]+@#', $recipient_email)) {
     $errors[] = "'$recipient_email' is not a valid recipient email address. Please have another go.";
-if (!validate_email($sender_email))
+}
+if (!validate_email($sender_email)) {
     $errors[] = "'$sender_email' is not a valid sender email address. Please have another go.";
-if (!$sender_name)
+}
+if (!$sender_name) {
     $errors[] = "If you don't give us your name, we can't tell the recipient who sent them the link. We won't store it or use for any other purpose than sending this email.";
+}
 
 if (sizeof($errors)) {
     print '<p>Please correct the following errors:</p>';
@@ -45,8 +50,11 @@ 
 <?php
 } else {
     $rep_name = $MEMBER->full_name();
-    if ($MEMBER->house_disp==1) $rep_name .= ' MP';
-    elseif ($MEMBER->house_disp==3) $rep_name .= ' MLA';
+    if ($MEMBER->house_disp==1) {
+        $rep_name .= ' MP';
+    } elseif ($MEMBER->house_disp==3) {
+        $rep_name .= ' MLA';
+    }
     $data = array (
         'template'      => 'email_a_friend',
         'to'            => $recipient_email,

Spacing +5 added lines, -5 removed lines

@@ -45,15 +45,15 @@ 
 <?php
 } else {
     $rep_name = $MEMBER->full_name();
-    if ($MEMBER->house_disp==1) $rep_name .= ' MP';
-    elseif ($MEMBER->house_disp==3) $rep_name .= ' MLA';
-    $data = array (
+    if ($MEMBER->house_disp == 1) $rep_name .= ' MP';
+    elseif ($MEMBER->house_disp == 3) $rep_name .= ' MLA';
+    $data = array(
         'template'      => 'email_a_friend',
         'to'            => $recipient_email,
         'subject'       => 'Find out all about ' . $rep_name
     );
     $url = $MEMBER->url(true);
-    $merge = array (
+    $merge = array(
         'NAME' => $sender_name,
         'EMAIL' => $sender_email,
         'REP_NAME' => $rep_name,
@@ -62,7 +62,7 @@ 
 
     $success = send_template_email($data, $merge);
     if ($success) {
-        print "<p>Your email has been sent successfully. Thank you for using TheyWorkForYou.</p> <p><a href=\"$url\">Return to ".$MEMBER->full_name()."'s page</a></p>";
+        print "<p>Your email has been sent successfully. Thank you for using TheyWorkForYou.</p> <p><a href=\"$url\">Return to " . $MEMBER->full_name() . "'s page</a></p>";
     } else {
         print "<p>Sorry, something went wrong trying to send an email. Please wait a few minutes and try again.</p>";
     }

www/docs/mps/multiple.php

Braces +3 added lines, -1 removed lines

@@ -28,7 +28,9 @@
 
 function out($h1, $h2, $title) {
     global $out;
-    if (!isset($out[$h1][$h2])) return;
+    if (!isset($out[$h1][$h2])) {
+        return;
+    }
     print "<h3>$title</h3>\n<ul>\n";
     foreach ($out[$h1][$h2] as $m) {
         print '<li><a href="' . $m->url() . '">' . $m->full_name() . "</a></li>\n";

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
     from member as m1, member as m2
     where m1.person_id = m2.person_id and m1.house != m2.house and m1.house < m2.house
         and m1.left_house='9999-12-31' and m2.left_house='9999-12-31'");
-for ($i=0; $i<$q->rows(); $i++) {
+for ($i = 0; $i < $q->rows(); $i++) {
     $pid = $q->field($i, 'person_id');
     $member = new MEMBER(array('person_id' => $pid));
     $h1 = $q->field($i, 'house1');

www/docs/mps/speaker09.php

Braces +8 added lines, -5 removed lines

@@ -68,7 +68,9 @@ 
     $value = $q->field($i, 'data_value');
     $key = $q->field($i, 'data_key');
     if ($pid != $oldpid) {
-        if ($oldpid) print "</tr>\n";
+        if ($oldpid) {
+            print "</tr>\n";
+        }
         print '<tr><th align="left"><a href="' . $member[$pid]->url() . '">' . $member[$pid]->full_name() . '</a></th>';
         $oldpid = $pid;
     }
@@ -81,10 +83,11 @@ 
             echo "<td>No response ";
         }
     } else {
-        if ($value)
-            echo "(and <strong>was</strong> a candidate for speaker).</td>";
-        else
-            echo "(but <strong>was not</strong> a candidate for speaker).</td>";
+        if ($value) {
+                    echo "(and <strong>was</strong> a candidate for speaker).</td>";
+        } else {
+                    echo "(but <strong>was not</strong> a candidate for speaker).</td>";
+        }
     }
 }
 

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
     where personinfo.person_id=member.person_id and left_house='$left_house'
     and data_key='speaker_candidate_contacted_on'");
 $pids = array();
-for ($i=0; $i<$q->rows(); $i++) {
+for ($i = 0; $i < $q->rows(); $i++) {
     $pid = $q->field($i, 'person_id');
     $pids[] = $pid;
     $member[$pid] = new MEMBER(array('person_id' => $pid));
@@ -63,7 +63,7 @@ 
     order by data_key desc");
 echo '<table>';
 $oldpid = null;
-for ($i=0; $i<$q->rows(); $i++) {
+for ($i = 0; $i < $q->rows(); $i++) {
     $pid = $q->field($i, 'person_id');
     $value = $q->field($i, 'data_value');
     $key = $q->field($i, 'data_key');

www/docs/parliament/index.php

Indentation +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 
 $DATA->set_page_metadata($this_page, 'title', 'Parliament');
 $DATA->set_page_metadata($this_page, 'meta_description',
-             'What goes on in Parliament? Up-to-the-minute records on all MPs, debates, speeches and statements from the House of Commons, House of Lords, Scottish Parliament, and Northern Ireland Assembly.');
+                'What goes on in Parliament? Up-to-the-minute records on all MPs, debates, speeches and statements from the House of Commons, House of Lords, Scottish Parliament, and Northern Ireland Assembly.');
 $DATA->set_page_metadata($this_page, 'meta_keywords', 'parliament, uk parliament, parliamentary, house of commons, house commons, house of lords, house lords, house of parliament, parliment, houses parliament, parliament uk, member of parliament, welsh assembly, scottish parliament, the parliament, house of parliment, houses of parliment, parliment uk, uk parliment, houses of parliament, parliament houses, parliament of uk, parliament in uk, the house of parliament, scottish parliment, members of parliament, parliament members, scotish parliament, parliament scottish, the house of commons, british parliament, what is parliament, the house of lords, the scottish parliament, london parliament, parliament london, the houses of parliament, english parliament, northern ireland parliament, the british parliament, northern ireland assembly, history of parliament, parliament history, parliament of england, england parliament');
 
 $PAGE->supress_heading = true;

www/docs/news/home_page_include.php

Braces +3 added lines, -1 removed lines

@@ -7,7 +7,9 @@
 
 $c = 0;
 foreach ($all_news as $id => $news_row) {
-    if ($c++ == 2) break;
+    if ($c++ == 2) {
+        break;
+    }
     list($title, $content, $date) = $news_row;
     $url = news_individual_link($date, $title);
     print "<h5><a href=\"$url\">" . $title . "</a></h5>";