mysociety / theyworkforyou

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

www/docs/email/index.php

Spacing +7 added lines, -7 removed lines

@@ -3,7 +3,7 @@ 
 $this_page = "emailfriend";
 
 include_once '../../includes/easyparliament/init.php';
-include_once INCLUDESPATH . 'easyparliament/member.php';
+include_once INCLUDESPATH.'easyparliament/member.php';
 
 $PAGE->page_start();
 
@@ -31,7 +31,7 @@ 
 
 if (sizeof($errors)) {
     print '<p>Please correct the following errors:</p>';
-    print '<ul><li>' . join('</li> <li>', $errors) . '</li></ul><br>';
+    print '<ul><li>'.join('</li> <li>', $errors).'</li></ul><br>';
 ?>
 <form action="./" method="post">
 <p>
@@ -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
+        '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,

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,

www/docs/calendar/index.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
         }
     }
 
-    include_once INCLUDESPATH . 'easyparliament/templates/html/calendar_date.php';
+    include_once INCLUDESPATH.'easyparliament/templates/html/calendar_date.php';
 }
 
 # ---

www/docs/topic/topic.php

Spacing +6 added lines, -6 removed lines

@@ -42,7 +42,7 @@ 
         $divisions = new Divisions();
         $data['recent_divisions'] = $divisions->getRecentDivisionsForPolicies($topic_policies, 10);
 
-        include_once INCLUDESPATH . 'easyparliament/member.php';
+        include_once INCLUDESPATH.'easyparliament/member.php';
 
         // Check to see if there's a submitted postcode to try determine policy positions.
         if (get_http_var('pc') != '')
@@ -54,13 +54,13 @@ 
                 $pc = get_http_var('pc');
                 $pc = preg_replace('#[^a-z0-9]#i', '', $pc);
                 if (validate_postcode($pc)) {
-                    twfy_debug ('MP', "MP lookup by postcode");
+                    twfy_debug('MP', "MP lookup by postcode");
                     $constituency = strtolower(Utility\Postcode::postcodeToConstituency($pc));
                     if ($constituency == "connection_timed_out") {
                         throw new Exception('Sorry, we couldn’t check your postcode right now, as our postcode lookup server is under quite a lot of load.');
                     } elseif ($constituency == "") {
-                        twfy_debug ('MP', "Can't display an MP, as submitted postcode didn't match a constituency");
-                        throw new Exception('Sorry, ' . _htmlentities($pc) . ' isn’t a known postcode');
+                        twfy_debug('MP', "Can't display an MP, as submitted postcode didn't match a constituency");
+                        throw new Exception('Sorry, '._htmlentities($pc).' isn’t a known postcode');
                     } else {
                         // Generate the Member object
                         $member = new Member(array('constituency' => $constituency, 'house' => HOUSE_TYPE_COMMONS));
@@ -70,8 +70,8 @@ 
                         }
                     }
                 } else {
-                    twfy_debug ('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
-                    throw new Exception('Sorry, ' . _htmlentities($pc) . ' isn’t a valid postcode');
+                    twfy_debug('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
+                    throw new Exception('Sorry, '._htmlentities($pc).' isn’t a valid postcode');
                 }
             } catch (Exception $e) {
                 Renderer::output('topic/error', array('error' => $e->getMessage()));

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

@@ -11,7 +11,7 @@
 namespace MySociety\TheyWorkForYou;
 
 // Disable the old PAGE class.
-$new_style_template = TRUE;
+$new_style_template = true;
 
 // Include all the things this page needs.
 include_once '../../includes/easyparliament/init.php';

www/docs/mps/multiple.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 include_once '../../includes/easyparliament/init.php';
-include_once INCLUDESPATH . "easyparliament/member.php";
+include_once INCLUDESPATH."easyparliament/member.php";
 
 $db = new ParlDB();
 
@@ -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');
@@ -31,7 +31,7 @@ 
     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";
+        print '<li><a href="'.$m->url().'">'.$m->full_name()."</a></li>\n";
     }
     print '</ul>';
 }

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

www/docs/mps/speaker09.php

Spacing +4 added lines, -4 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 include_once '../../includes/easyparliament/init.php';
-include_once INCLUDESPATH . "easyparliament/member.php";
+include_once INCLUDESPATH."easyparliament/member.php";
 
 $db = new ParlDB();
 
@@ -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,13 +63,13 @@ 
     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');
     if ($pid != $oldpid) {
         if ($oldpid) print "</tr>\n";
-        print '<tr><th align="left"><a href="' . $member[$pid]->url() . '">' . $member[$pid]->full_name() . '</a></th>';
+        print '<tr><th align="left"><a href="'.$member[$pid]->url().'">'.$member[$pid]->full_name().'</a></th>';
         $oldpid = $pid;
     }
     if ($key == 'speaker_candidate_response_summary') {

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

www/docs/mps/index.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 $args = $people->getArgs();
 $people->setMetaData($args);
 $data = $people->getData($args);
-if ( isset($args['f']) && $args['f'] == 'csv' ) {
+if (isset($args['f']) && $args['f'] == 'csv') {
     $people->sendAsCSV($data);
 } else {
     MySociety\TheyWorkForYou\Renderer::output("people/index", $data);

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;