mysociety / theyworkforyou

www/docs/admin/featured.php

Spacing +9 added lines, -9 removed lines

@@ -12,7 +12,7 @@ 
 $out = '';
 if (get_http_var('preview')) {
     preview_featured();
-} else if ( get_http_var('confirm') ) {
+} else if (get_http_var('confirm')) {
     $out = update_featured();
 }
 
@@ -23,13 +23,13 @@ 
 print '</div>';
 
 function gid_to_url($gid) {
-    if ( !$gid ) {
+    if (!$gid) {
         return '';
     }
     global $hansardmajors;
     global $db;
 
-    $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", array( ':gid' => $gid ));
+    $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", array(':gid' => $gid));
     $url_gid = fix_gid_from_db($gid);
     $url = new \URL($hansardmajors[$q->field(0, 'major')]['page']);
     $url->insert(array('id' => $url_gid));
@@ -43,7 +43,7 @@ 
     $related = $featured->get_related();
     $context = $featured->get_context();
 
-    if ( get_http_var('url') ) {
+    if (get_http_var('url')) {
         $url = get_http_var('url');
         $title = get_http_var('title');
         $context = get_http_var('context');
@@ -113,11 +113,11 @@ 
     $related_gid3 = $related3 ? get_gid_from_url($related3) : NULL;
 
     print "<h2>Preview Content</h2>";
-    if ( $gid !== NULL ) {
+    if ($gid !== NULL) {
         $h = new MySociety\TheyWorkForYou\Homepage;
-        $featured = $h->getFeaturedDebate($gid, $title, $context, array( $related_gid1, $related_gid2, $related_gid3 ));
+        $featured = $h->getFeaturedDebate($gid, $title, $context, array($related_gid1, $related_gid2, $related_gid3));
 
-        include INCLUDESPATH . 'easyparliament/templates/html/homepage/featured.php';
+        include INCLUDESPATH.'easyparliament/templates/html/homepage/featured.php';
     } else {
         print "<p>A random debate from the last 7 days will be displayed</p>";
     }
@@ -157,7 +157,7 @@ 
     $parts = parse_url($url);
     parse_str($parts['query'], $query);
 
-    if ( $query['id'] ) {
+    if ($query['id']) {
         if (strpos($parts['path'], 'lords') !== false) {
             $gid = 'uk.org.publicwhip/lords/';
         } elseif (strpos($parts['path'], 'whall') !== false) {
@@ -186,7 +186,7 @@ 
     $featured->set_related(array($related1, $related2, $related3));
 
     $out = "<h4>update successful</h4>";
-    $out .= "<p>Title set to " . _htmlspecialchars($title) . " and gid to " . _htmlspecialchars($gid) . "</p>";
+    $out .= "<p>Title set to "._htmlspecialchars($title)." and gid to "._htmlspecialchars($gid)."</p>";
 
     return $out;
 }

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

@@ -107,13 +107,13 @@ 
     $related2 = get_http_var('related2');
     $related3 = get_http_var('related3');
 
-    $gid = $url ? get_gid_from_url($url) : NULL;
-    $related_gid1 = $related1 ? get_gid_from_url($related1) : NULL;
-    $related_gid2 = $related2 ? get_gid_from_url($related2) : NULL;
-    $related_gid3 = $related3 ? get_gid_from_url($related3) : NULL;
+    $gid = $url ? get_gid_from_url($url) : null;
+    $related_gid1 = $related1 ? get_gid_from_url($related1) : null;
+    $related_gid2 = $related2 ? get_gid_from_url($related2) : null;
+    $related_gid3 = $related3 ? get_gid_from_url($related3) : null;
 
     print "<h2>Preview Content</h2>";
-    if ( $gid !== NULL ) {
+    if ( $gid !== null ) {
         $h = new MySociety\TheyWorkForYou\Homepage;
         $featured = $h->getFeaturedDebate($gid, $title, $context, array( $related_gid1, $related_gid2, $related_gid3 ));
 
@@ -153,7 +153,7 @@ 
 }
 
 function get_gid_from_url($url) {
-    $gid = NULL;
+    $gid = null;
     $parts = parse_url($url);
     parse_str($parts['query'], $query);
 

www/docs/admin/banner.php

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
     $out = '<form action="banner.php" method="post">';
     $out .= '<input name="action" type="hidden" value="Save">';
     $out .= '<p><label for="banner">Contents (HTML permitted)</label><br>';
-    $out .= '<textarea id="banner_text" name="banner" rows="5" cols="80">' . htmlentities($text) . "</textarea></p>\n";
+    $out .= '<textarea id="banner_text" name="banner" rows="5" cols="80">'.htmlentities($text)."</textarea></p>\n";
     $out .= '<span class="formw"><input type="button" id="preview" value="Preview"> <input name="btnaction" type="submit" value="Save"></span>';
     $out .= '</form>';
 
@@ -61,7 +61,7 @@ 
     global $banner;
     $banner_text = get_http_var('banner');
 
-    if ( $banner->set_text($banner_text) ) {
+    if ($banner->set_text($banner_text)) {
         $out = "<h4>update successful</h4>";
         $out .= "<p>Banner text is now:</p><p>$banner_text</p>";
     } else {

www/docs/admin/badusers.php

Spacing +12 added lines, -12 removed lines

@@ -32,18 +32,18 @@ 
 $rows = array();
 $USERURL = new URL('userview');
 
-for ($row=0; $row<$q->rows(); $row++) {
+for ($row = 0; $row < $q->rows(); $row++) {
 
     $user_id = $q->field($row, 'user_id');
 
     // Get the total comments posted for this user.
     $r = $db->query("SELECT COUNT(*) AS totalcount
                     FROM	comments
-                    WHERE	user_id = '" . $user_id . "'");
+                    WHERE	user_id = '" . $user_id."'");
 
     $totalcomments = $r->field(0, 'totalcount');
 
-    $percentagedeleted = ( $q->field($row, 'deletedcount') / $totalcomments ) * 100;
+    $percentagedeleted = ($q->field($row, 'deletedcount') / $totalcomments) * 100;
 
 
     // Get complaints made about this user's comments, but not upheld.
@@ -59,8 +59,8 @@ 
 
     $USERURL->insert(array('u'=>$user_id));
 
-    $rows[] = array (
-        '<a href="' . $USERURL->generate() . '">' . $q->field($row, 'firstname') . ' ' . $q->field($row, 'lastname') . '</a>',
+    $rows[] = array(
+        '<a href="'.$USERURL->generate().'">'.$q->field($row, 'firstname').' '.$q->field($row, 'lastname').'</a>',
         $totalcomments,
         $q->field($row, 'deletedcount'),
         $percentagedeleted.'%',
@@ -68,8 +68,8 @@ 
     );
 }
 
-$tabledata = array (
-    'header' => array (
+$tabledata = array(
+    'header' => array(
         'Name',
         'Total comments',
         'Number deleted',
@@ -105,7 +105,7 @@ 
 $rows = array();
 $USERURL = new URL('userview');
 
-for ($row=0; $row<$q->rows(); $row++) {
+for ($row = 0; $row < $q->rows(); $row++) {
 
     $user_id = $q->field($row, 'user_id');
 
@@ -117,15 +117,15 @@ 
                     WHERE	user_id = '$user_id'
                     AND		upheld = '1'");
 
-    $rows[] = array (
-        '<a href="' . $USERURL->generate() . '">' . $q->field($row, 'firstname') . ' ' . $q->field($row, 'lastname') . '</a>',
+    $rows[] = array(
+        '<a href="'.$USERURL->generate().'">'.$q->field($row, 'firstname').' '.$q->field($row, 'lastname').'</a>',
         $q->field($row, 'rejectedcount'),
         $r->field(0, 'upheldcount')
     );
 
 }
-$tabledata = array (
-    'header' => array (
+$tabledata = array(
+    'header' => array(
         'Name',
         'Reports not upheld',
         'Reports upheld'

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

Spacing +12 added lines, -12 removed lines

@@ -3,7 +3,7 @@ 
 include_once '../../includes/easyparliament/init.php';
 #include_once INCLUDESPATH . 'easyparliament/commentreportlist.php';
 #include_once INCLUDESPATH . 'easyparliament/searchengine.php';
-include_once INCLUDESPATH . 'easyparliament/member.php';
+include_once INCLUDESPATH.'easyparliament/member.php';
 #include_once INCLUDESPATH . 'easyparliament/people.php';
 
 $this_page = 'admin_mpurls';
@@ -54,10 +54,10 @@ 
 
         $out = "<h3>Edit person: $name</h3>\n";
 
-        $out .= '<form action="websites.php?editperson=' . $q->field($row, 'person_id') . '" method="post">';
+        $out .= '<form action="websites.php?editperson='.$q->field($row, 'person_id').'" method="post">';
         $out .= '<input name="action" type="hidden" value="SaveURL">';
         $out .= '<label for="url">URL:</label>';
-        $out .= '<span class="formw"><input id="url" name="url" type="text"  size="60" value="' . $q->field($row, 'mp_website') . '"></span>' . "\n";
+        $out .= '<span class="formw"><input id="url" name="url" type="text"  size="60" value="'.$q->field($row, 'mp_website').'"></span>'."\n";
         $out .= '<span class="formw"><input name="btnaction" type="submit" value="Save URL"></span>';
         $out .= '</form>';
     }
@@ -83,15 +83,15 @@ 
         $out .= '<li>';
         $name = member_full_name($q->field($row, 'house'), $q->field($row, 'title'), $q->field($row, 'given_name'), $q->field($row, 'family_name'), $q->field($row, 'lordofname'));
         $mp_website = $q->field($row, 'data_value');
-        $out .= ' <small>[<a href="websites.php?editperson=' . $q->field($row, 'person_id') . '"';
+        $out .= ' <small>[<a href="websites.php?editperson='.$q->field($row, 'person_id').'"';
         if ($mp_website) {
-            $out .= ' title="Change URL ' . $mp_website . '">Edit URL</a>]</small>';
+            $out .= ' title="Change URL '.$mp_website.'">Edit URL</a>]</small>';
         } else {
             $out .= '>Add URL</a>]</small>';
         }
-        $out .= ' ' . $name;
+        $out .= ' '.$name;
         if ($q->field($row, 'constituency')) {
-            $out .= ' (' . $q->field($row, 'constituency') . ')';
+            $out .= ' ('.$q->field($row, 'constituency').')';
         }
         $out .= "</li>\n";
     }
@@ -107,7 +107,7 @@ 
     $sysretval = 0;
     $personid = get_http_var('editperson');
 
-    $q  = $db->query("DELETE FROM personinfo WHERE data_key = 'mp_website' AND personinfo.person_id = :person_id", array(
+    $q = $db->query("DELETE FROM personinfo WHERE data_key = 'mp_website' AND personinfo.person_id = :person_id", array(
         ':person_id' => $personid
         ));
 
@@ -119,9 +119,9 @@ 
     }
 
     if ($q->success()) {
-        exec($scriptpath . "/db2xml.pl --update_person --personid=" . escapeshellarg($personid) . " --debug", $exec_output);
+        exec($scriptpath."/db2xml.pl --update_person --personid=".escapeshellarg($personid)." --debug", $exec_output);
         $out = '<p id="warning">';
-        foreach ($exec_output as $message) {$out .= $message . "<br>";}
+        foreach ($exec_output as $message) {$out .= $message."<br>"; }
         $out .= '</p>';
         # ../../../scripts/db2xml.pl  --update_person --personid=10001
     }
@@ -140,9 +140,9 @@ 
 
     $rettext .= '<div id="subnav_websites">';
     foreach ($subnav as $label => $path) {
-        $rettext .=  '<a href="'. $path . '">'. $label .'</a>';
+        $rettext .= '<a href="'.$path.'">'.$label.'</a>';
     }
-    $rettext .=  '</div>';
+    $rettext .= '</div>';
 
     return $rettext;
 }

www/docs/admin/glossary.php

Spacing +5 added lines, -5 removed lines

@@ -9,7 +9,7 @@ 
 
 $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
     );

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

www/docs/admin/policies.php

Spacing +14 added lines, -14 removed lines

@@ -3,7 +3,7 @@ 
 include_once '../../includes/easyparliament/init.php';
 #include_once INCLUDESPATH . 'easyparliament/commentreportlist.php';
 #include_once INCLUDESPATH . 'easyparliament/searchengine.php';
-include_once INCLUDESPATH . 'easyparliament/member.php';
+include_once INCLUDESPATH.'easyparliament/member.php';
 #include_once INCLUDESPATH . 'easyparliament/people.php';
 
 $this_page = 'admin_policies';
@@ -47,24 +47,24 @@ 
 
     for ($row = 0; $row < $q->rows(); $row++) {
 
-        $out = "<h3>Edit policy: " . $q->field($row, 'title') . "</h3>\n";
+        $out = "<h3>Edit policy: ".$q->field($row, 'title')."</h3>\n";
 
-        $out .= '<form action="policies.php?editpolicy=' . $q->field($row, 'policy_id') . '" method="post">';
+        $out .= '<form action="policies.php?editpolicy='.$q->field($row, 'policy_id').'" method="post">';
         $out .= '<input name="action" type="hidden" value="Save">';
         $out .= '<p><label for="title">Title: </label>';
-        $out .= '<span class="formw"><input id="title-textbox" name="title" type="text"  size="60" value="' . htmlentities($q->field($row, 'title')) . '"></span>' . "</p>\n";
+        $out .= '<span class="formw"><input id="title-textbox" name="title" type="text"  size="60" value="'.htmlentities($q->field($row, 'title')).'"></span>'."</p>\n";
         $out .= '<p><label for="description">Description</label><br>';
-        $out .= '<span class="formw"><textarea id="description" name="description" rows="10" cols="100">' . htmlentities($q->field($row, 'description')) . '</textarea></span>' . "</p>\n";
+        $out .= '<span class="formw"><textarea id="description" name="description" rows="10" cols="100">'.htmlentities($q->field($row, 'description')).'</textarea></span>'."</p>\n";
         $out .= '<p><label for="image">Image URL: </label>';
-        $out .= '<span class="formw"><input id="image" name="image" type="text"  size="60" value="' . htmlentities($q->field($row, 'image')) . '"></span>' . "</p>\n";
+        $out .= '<span class="formw"><input id="image" name="image" type="text"  size="60" value="'.htmlentities($q->field($row, 'image')).'"></span>'."</p>\n";
         $out .= '<p><label for="image_attrib">Image attribution: </label>';
-        $out .= '<span class="formw"><input id="image_attrib" name="image_attrib" type="text"  size="60" value="' . htmlentities($q->field($row, 'image_attrib')) . '"></span>' . "</p>\n";
+        $out .= '<span class="formw"><input id="image_attrib" name="image_attrib" type="text"  size="60" value="'.htmlentities($q->field($row, 'image_attrib')).'"></span>'."</p>\n";
         $out .= '<p><label for="image_license">Image license: </label>';
-        $out .= '<span class="formw"><input id="image_license" name="image_license" type="text"  size="60" value="' . htmlentities($q->field($row, 'image_license')) . '"></span>' . "</p>\n";
+        $out .= '<span class="formw"><input id="image_license" name="image_license" type="text"  size="60" value="'.htmlentities($q->field($row, 'image_license')).'"></span>'."</p>\n";
         $out .= '<p><label for="image_license_url">Image license URL: </label>';
-        $out .= '<span class="formw"><input id="image_license_url" name="image_license_url" type="text"  size="60" value="' . htmlentities($q->field($row, 'image_license_url')) . '"></span>' . "</p>\n";
+        $out .= '<span class="formw"><input id="image_license_url" name="image_license_url" type="text"  size="60" value="'.htmlentities($q->field($row, 'image_license_url')).'"></span>'."</p>\n";
         $out .= '<p><label for="image_source">Image source: </label>';
-        $out .= '<span class="formw"><input id="image_source" name="image_source" type="text"  size="60" value="' . htmlentities($q->field($row, 'image_source')) . '"></span>' . "</p>\n";
+        $out .= '<span class="formw"><input id="image_source" name="image_source" type="text"  size="60" value="'.htmlentities($q->field($row, 'image_source')).'"></span>'."</p>\n";
         $out .= '<p><span class="formw"><input name="btnaction" type="submit" value="Save"></span>';
         $out .= '</form>';
     }
@@ -81,7 +81,7 @@ 
     for ($row = 0; $row < $q->rows(); $row++) {
         $out .= '<li style="margin-bottom: 1em;">';
         $out .= sprintf('<strong>%d</strong>: %s - %s', $q->field($row, 'policy_id'), htmlentities($q->field($row, 'title')), htmlentities($q->field($row, 'description')));
-        $out .= ' <small>[<a href="policies.php?editpolicy=' . $q->field($row, 'policy_id') . '">Edit Policy</a>]</small>';
+        $out .= ' <small>[<a href="policies.php?editpolicy='.$q->field($row, 'policy_id').'">Edit Policy</a>]</small>';
         $out .= "</li>\n";
     }
     $out .= '</ul>';
@@ -110,7 +110,7 @@ 
         )
     );
 
-    if ( $q->success() ) {
+    if ($q->success()) {
         $out = "<h4>update successful</h4>";
     }
 
@@ -125,9 +125,9 @@ 
 
     $rettext .= '<div id="subnav_websites">';
     foreach ($subnav as $label => $path) {
-        $rettext .=  '<a href="'. $path . '">'. $label .'</a>';
+        $rettext .= '<a href="'.$path.'">'.$label.'</a>';
     }
-    $rettext .=  '</div>';
+    $rettext .= '</div>';
 
     return $rettext;
 }

www/docs/admin/photos.php

Spacing +14 added lines, -14 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
 include_once '../../includes/easyparliament/init.php';
-include_once INCLUDESPATH . 'easyparliament/commentreportlist.php';
-include_once INCLUDESPATH . 'easyparliament/searchengine.php';
-include_once INCLUDESPATH . 'easyparliament/member.php';
-include_once INCLUDESPATH . 'easyparliament/people.php';
+include_once INCLUDESPATH.'easyparliament/commentreportlist.php';
+include_once INCLUDESPATH.'easyparliament/searchengine.php';
+include_once INCLUDESPATH.'easyparliament/member.php';
+include_once INCLUDESPATH.'easyparliament/people.php';
 
 $this_page = 'admin_photos';
 
@@ -72,7 +72,7 @@ 
 
     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();
+    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();
 }
 
 function person_drop_down() {
@@ -94,14 +94,14 @@ 
 
     $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')) .
-                " " . $houses[$house];
-        if ($q->field($i, 'party')) $desc .= ' (' . $q->field($i, 'party') . ')';
+        $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, 'constituency')) {
-            $desc .= ', ' . $q->field($i, 'constituency');
+            $desc .= ', '.$q->field($i, 'constituency');
         }
 
         list($dummy, $sz) = MySociety\TheyWorkForYou\Utility\Member::findMemberImage($p_id);
@@ -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> ';
@@ -123,7 +123,7 @@ 
 function display_photo_form($errors = array()) {
     $out = '';
     if ($errors) {
-        $out .= '<ul class="error"><li>' . join('</li><li>', $errors) . '</li></ul>';
+        $out .= '<ul class="error"><li>'.join('</li><li>', $errors).'</li></ul>';
     }
     $out .= '<form method="post" action="photos.php" enctype="multipart/form-data">';
     $out .= person_drop_down();
@@ -169,13 +169,13 @@ 
         ':attr_link' => $attr_link
         ));
 
-    return "<p><em>Attribution text/link set for pid $pid</em> &mdash; check how it looks <a href=\"/mp?p=$pid\">on their page</a></p>" . display_attribution_form();
+    return "<p><em>Attribution text/link set for pid $pid</em> &mdash; check how it looks <a href=\"/mp?p=$pid\">on their page</a></p>".display_attribution_form();
 }
 
 function display_attribution_form($errors = array()) {
     $out = '';
     if ($errors) {
-        $out .= '<ul class="error"><li>' . join('</li><li>', $errors) . '</li></ul>';
+        $out .= '<ul class="error"><li>'.join('</li><li>', $errors).'</li></ul>';
     }
     $out .= '<form method="post" action="photos.php">';
     $out .= person_drop_down();

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

www/docs/admin/searchlogs.php

Spacing +4 added lines, -4 removed lines

@@ -18,8 +18,8 @@ 
     $host = trim_characters($host, strlen($host) - 25, 100);
     $time = relative_time($row['query_time']);
     $time = str_replace(" ago", "", $time);
-    $rows[] = array (
-        '<a href="'.$row['url'].'">' . _htmlentities($row['query']) . '</a>',
+    $rows[] = array(
+        '<a href="'.$row['url'].'">'._htmlentities($row['query']).'</a>',
         $row['page_number'],
         $row['count_hits'],
         $host,
@@ -27,8 +27,8 @@ 
     );
 }
 
-$tabledata = array (
-    'header' => array (
+$tabledata = array(
+    'header' => array(
         'Query',
         'Page',
         'Hits',