mysociety / theyworkforyou

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

www/docs/admin/glossary_pending.php

Spacing +10 added lines, -10 removed lines

@@ -9,7 +9,7 @@ 
 
 $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'];
@@ -94,7 +94,7 @@ 
 
     // Wiki woo!
     // We need to work out how best to work this...
-    $wiki_link = _htmlspecialchars("http://en.wikipedia.org/wiki/" . strtr($title, " ", "_"));
+    $wiki_link = _htmlspecialchars("http://en.wikipedia.org/wiki/".strtr($title, " ", "_"));
 ?>
         <p>Guessing the wikipedia link - give it a go:<br>
         <a href="<?php echo $wiki_link; ?>" target="_blank"><?php echo $wiki_link; ?></a></p>
@@ -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')
@@ -126,7 +126,7 @@ 
     }
 
     if ($EDITQUEUE->pending_count) {
-        print "<h3>" . $EDITQUEUE->pending_count . " Pending Glossary terms</h3>";
+        print "<h3>".$EDITQUEUE->pending_count." Pending Glossary terms</h3>";
         $EDITQUEUE->display("pending");
     }
     else {

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

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/admin/index.php

Spacing +10 added lines, -10 removed lines

@@ -22,11 +22,11 @@ 
 $q = $db->query("SELECT COUNT(*) AS count FROM users WHERE confirmed = '0'");
 $unconfirmedusers = $q->field(0, 'count');
 
-$olddate = gmdate("Y-m-d H:i:s", time()-86400);
+$olddate = gmdate("Y-m-d H:i:s", time() - 86400);
 $q = $db->query("SELECT COUNT(*) AS count FROM users WHERE lastvisit > '$olddate'");
 $dayusers = $q->field(0, 'count');
 
-$olddate = gmdate("Y-m-d H:i:s", time()-86400*7);
+$olddate = gmdate("Y-m-d H:i:s", time() - 86400 * 7);
 $q = $db->query("SELECT COUNT(*) AS count FROM users WHERE lastvisit > '$olddate'");
 $weekusers = $q->field(0, 'count');
 ?>
@@ -61,7 +61,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');
 
@@ -69,23 +69,23 @@ 
 
     if ($q->field($row, 'confirmed') == 1) {
         $confirmed = 'Yes';
-        $name = '<a href="' . $USERURL->generate() . '">' . _htmlspecialchars($q->field($row, 'firstname'))
-            . ' ' . _htmlspecialchars($q->field($row, 'lastname')) . '</a>';
+        $name = '<a href="'.$USERURL->generate().'">'._htmlspecialchars($q->field($row, 'firstname'))
+            . ' '._htmlspecialchars($q->field($row, 'lastname')).'</a>';
     } else {
         $confirmed = 'No';
-        $name = _htmlspecialchars($q->field($row, 'firstname') . ' ' . $q->field($row, 'lastname'));
+        $name = _htmlspecialchars($q->field($row, 'firstname').' '.$q->field($row, 'lastname'));
     }
 
-    $rows[] = array (
+    $rows[] = array(
         $name,
-        '<a href="mailto:' . $q->field($row, 'email') . '">' . $q->field($row, 'email') . '</a>',
+        '<a href="mailto:'.$q->field($row, 'email').'">'.$q->field($row, 'email').'</a>',
         $confirmed,
         $q->field($row, 'registrationtime')
     );
 }
 
-$tabledata = array (
-    'header' => array (
+$tabledata = array(
+    'header' => array(
         'Name',
         'Email',
         'Confirmed?',

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/report/index.php

Spacing +5 added lines, -5 removed lines

@@ -20,7 +20,7 @@ 
 
     if ($COMMENT->exists() == false || !$COMMENT->visible()) {
         // This comment id didn't exist in the DB.
-        trigger_error("There is no annotation with an ID of '" . _htmlentities($comment_id) . "'.", E_USER_NOTICE);
+        trigger_error("There is no annotation with an ID of '"._htmlentities($comment_id)."'.", E_USER_NOTICE);
     }
 
     // OK, we've got a valid comment ID.
@@ -56,7 +56,7 @@ 
 
             $REPORT = new COMMENTREPORT;
 
-            $reportdata = array (
+            $reportdata = array(
                 'body'		=> get_http_var('body'),
                 'firstname'	=> get_http_var('firstname'),
                 'lastname'	=> get_http_var('lastname'),
@@ -84,7 +84,7 @@ 
 
 
             } else {
-                $PAGE->error_message ("Sorry, we were unable to add the report to the database.");
+                $PAGE->error_message("Sorry, we were unable to add the report to the database.");
             }
         }
 
@@ -99,7 +99,7 @@ 
 
 
 
-function display_form($COMMENT, $errors=array()) {
+function display_form($COMMENT, $errors = array()) {
     global $this_page, $THEUSER, $PAGE;
 
     ?>
@@ -122,7 +122,7 @@ 
 <?php
     if ($THEUSER->isloggedin()) {
         ?>
-                <p><br><strong>From:</strong> <?php echo _htmlentities($THEUSER->firstname() . ' ' . $THEUSER->lastname()); ?></p>
+                <p><br><strong>From:</strong> <?php echo _htmlentities($THEUSER->firstname().' '.$THEUSER->lastname()); ?></p>
 <?php
     } else {
         // Not-logged-in user, so we want their name and email address.

www/docs/vote/index.php

Spacing +6 added lines, -6 removed lines

@@ -31,7 +31,7 @@ 
         voteerror("Your browser must be able to accept cookies before you can register a vote.");
     } else {
         // Delete the test cookie.
-        setcookie ('testcookie', '');
+        setcookie('testcookie', '');
     }
     // On with the voting...!
 
@@ -40,7 +40,7 @@ 
     // We need to check the user can accept cookies, so...
 
     // Set a cookie
-    setcookie ('testcookie', 'true');
+    setcookie('testcookie', 'true');
 
     $ret = get_http_var('ret');
     $id = get_http_var('id');
@@ -56,7 +56,7 @@ 
     ));
 
     // Redirect to this same URL with 'testing=true' on the end.
-    header("Location: " . $URL->generate('none'));
+    header("Location: ".$URL->generate('none'));
     exit;
 }
 
@@ -67,7 +67,7 @@ 
 
     $PAGE->page_start();
 
-    $message = array (
+    $message = array(
         'title'	=> 'Sorry',
         'text'	=> $text
     );
@@ -158,7 +158,7 @@ 
         $prev_epvotes[] = $epobject_id;
         $new_cookie = implode('+', $prev_epvotes);
 
-        setcookie ("epvotes", $new_cookie, time()+60*60*24*365, "/", COOKIEDOMAIN);
+        setcookie("epvotes", $new_cookie, time() + 60 * 60 * 24 * 365, "/", COOKIEDOMAIN);
 
 
     } else {
@@ -189,7 +189,7 @@ 
 
 $PAGE->page_start();
 
-$message = array (
+$message = array(
     'title'	=> "Thanks for your vote",
     'text'	=> "<strong>Would you like to ask a question like this yourself?</strong> Use our <a href=\"http://www.whatdotheyknow.com\">Freedom of Information site</a>."
 );