mysociety / theyworkforyou

www/docs/api/api_getConstituency.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
     $q = $db->query("select constituency, data_key, data_value from consinfo
                      where constituency = :constituency", array(':constituency' => $constituency));
     if ($q->rows()) {
-        for ($i=0; $i<$q->rows(); $i++) {
+        for ($i = 0; $i < $q->rows(); $i++) {
             $data_key = $q->field($i, 'data_key');
             $output[$data_key] = $q->field($i, 'data_value');
         }

www/docs/api/api_getDebates.php

Braces +18 added lines, -9 removed lines

@@ -106,25 +106,31 @@ 
     if ($t == 'commons') {
         $list = 'DEBATE';
         $type = 'debates';
-    } elseif ($t == 'lords') {
+    }
+    elseif ($t == 'lords') {
         $list = 'LORDSDEBATE';
         $type = 'lords';
-    } elseif ($t == 'westminsterhall') {
+    }
+    elseif ($t == 'westminsterhall') {
         $list = 'WHALL';
         $type = 'whall';
-    } elseif ($t == 'scotland') {
+    }
+    elseif ($t == 'scotland') {
         $list = 'SP';
         $type = 'sp';
-    } elseif ($t == 'northernireland') {
+    }
+    elseif ($t == 'northernireland') {
         $list = 'NI';
         $type = 'ni';
-    } else {
+    }
+    else {
         api_error('Unknown type');
         return;
     }
     if ($d = get_http_var('date')) {
         _api_getHansard_date($list, $d);
-    } elseif (get_http_var('search') || get_http_var('person')) {
+    }
+    elseif (get_http_var('search') || get_http_var('person')) {
         $s = get_http_var('search');
         $pid = get_http_var('person');
         _api_getHansard_search(array(
@@ -132,11 +138,14 @@ 
             'pid' => $pid,
             'type' => $type,
         ));
-    } elseif ($gid = get_http_var('gid')) {
+    }
+    elseif ($gid = get_http_var('gid')) {
         _api_getHansard_gid($list, $gid);
-    } elseif ($y = get_http_var('year')) {
+    }
+    elseif ($y = get_http_var('year')) {
         _api_getHansard_year($list, $y);
-    } else {
+    }
+    else {
         api_error('That is not a valid search.');
     }
 }

www/docs/api/api_getMPsInfo.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
         where person_id in (" . $ids . ")");
     if ($q->rows()) {
         $output = array();
-        for ($i=0; $i<$q->rows(); $i++) {
+        for ($i = 0; $i < $q->rows(); $i++) {
             $data_key = $q->field($i, 'data_key');
             if (count($fields) && !in_array($data_key, $fields))
                 continue;
@@ -44,7 +44,7 @@ 
             where memberinfo.member_id=member.member_id and person_id in (" . $ids . ")
             order by person_id,member_id");
         if ($q->rows()) {
-            for ($i=0; $i<$q->rows(); $i++) {
+            for ($i = 0; $i < $q->rows(); $i++) {
                 $data_key = $q->field($i, 'data_key');
                 if (count($fields) && !in_array($data_key, $fields))
                     continue;

Braces +27 added lines, -14 removed lines

@@ -20,7 +20,9 @@ 
     $ids = preg_split('#\s*,\s*#', $ids, -1, PREG_SPLIT_NO_EMPTY);
     $safe_ids = array(0);
     foreach ($ids as $id) {
-        if (ctype_digit($id)) $safe_ids[] = $id;
+        if (ctype_digit($id)) {
+            $safe_ids[] = $id;
+        }
     }
     $ids = join(',', $safe_ids);
 
@@ -32,13 +34,15 @@ 
         $output = array();
         for ($i=0; $i<$q->rows(); $i++) {
             $data_key = $q->field($i, 'data_key');
-            if (count($fields) && !in_array($data_key, $fields))
-                continue;
+            if (count($fields) && !in_array($data_key, $fields)) {
+                            continue;
+            }
             $pid = $q->field($i, 'person_id');
             $output[$pid][$data_key] = $q->field($i, 'data_value');
             $time = strtotime($q->field($i, 'lastupdate'));
-            if ($time > $last_mod)
-                $last_mod = $time;
+            if ($time > $last_mod) {
+                            $last_mod = $time;
+            }
         }
         $q = $db->query("select memberinfo.*, person_id from memberinfo, member
             where memberinfo.member_id=member.member_id and person_id in (" . $ids . ")
@@ -46,21 +50,28 @@ 
         if ($q->rows()) {
             for ($i=0; $i<$q->rows(); $i++) {
                 $data_key = $q->field($i, 'data_key');
-                if (count($fields) && !in_array($data_key, $fields))
-                    continue;
+                if (count($fields) && !in_array($data_key, $fields)) {
+                                    continue;
+                }
                 $mid = $q->field($i, 'member_id');
                 $pid = $q->field($i, 'person_id');
-                if (!isset($output[$pid]['by_member_id'])) $output[$pid]['by_member_id'] = array();
-                if (!isset($output[$pid]['by_member_id'][$mid])) $output[$pid]['by_member_id'][$mid] = array();
+                if (!isset($output[$pid]['by_member_id'])) {
+                    $output[$pid]['by_member_id'] = array();
+                }
+                if (!isset($output[$pid]['by_member_id'][$mid])) {
+                    $output[$pid]['by_member_id'][$mid] = array();
+                }
                 $output[$pid]['by_member_id'][$mid][$data_key] = $q->field($i, 'data_value');
                 $time = strtotime($q->field($i, 'lastupdate'));
-                if ($time > $last_mod)
-                    $last_mod = $time;
+                if ($time > $last_mod) {
+                                    $last_mod = $time;
+                }
             }
         }
         ksort($output);
         return array($output, $last_mod);
-    } else {
+    }
+    else {
         return null;
     }
 }
@@ -70,10 +81,12 @@ 
     if ($output) {
         if ($output[0]) {
             api_output($output[0], $output[1]);
-        } else {
+        }
+        else {
             api_error('Unknown field');
         }
-    } else {
+    }
+    else {
         api_error('Unknown person ID');
     }
 }

www/docs/api/api_getCommittee.php

Spacing +3 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
             ));
     if ($q->rows() > 1) {
         # More than one committee matches
-        for ($i=0; $i<$q->rows(); $i++) {
+        for ($i = 0; $i < $q->rows(); $i++) {
             $output['committees'][] = array(
                 'name' => $q->field($i, 'dept')
             );
@@ -85,7 +85,7 @@ 
         if ($q->rows()) {
             $output = array();
             $output['committee'] = $q->field(0, 'dept');
-            for ($i=0; $i<$q->rows(); $i++) {
+            for ($i = 0; $i < $q->rows(); $i++) {
                 $member = array(
                     'person_id' => $q->field($i, 'person'),
                     'name' => $q->field($i, 'given_name') . ' ' . $q->field($i, 'family_name'),
@@ -114,7 +114,7 @@ 
         where source = 'chgpages/selctee'
         and from_date <= $date and $date <= to_date");
     if ($q->rows()) {
-        for ($i=0; $i<$q->rows(); $i++) {
+        for ($i = 0; $i < $q->rows(); $i++) {
             $output['committees'][] = array(
                 'name' => $q->field($i, 'dept')
             );

Braces +20 added lines, -8 removed lines

@@ -57,8 +57,12 @@ 
     $name = preg_replace('#\s+Committee#', '', $name);
 
     $date = parse_date(get_http_var('date'));
-    if ($date) $date = '"' . $date['iso'] . '"';
-    else $date = 'date(now())';
+    if ($date) {
+        $date = '"' . $date['iso'] . '"';
+    }
+    else {
+        $date = 'date(now())';
+    }
     $q = $db->query("select distinct(dept) from moffice
         where dept like :department
         and from_date <= $date and $date <= to_date", array(
@@ -72,7 +76,8 @@ 
             );
         }
         api_output($output);
-    } elseif ($q->rows()) {
+    }
+    elseif ($q->rows()) {
         # One committee
         $q = $db->query("select * from moffice, member, person_names pn
             where moffice.person = member.person_id
@@ -96,10 +101,12 @@ 
                 $output['members'][] = $member;
             }
             api_output($output);
-        } else {
+        }
+        else {
             api_error('That committee has no members...?');
         }
-    } else {
+    }
+    else {
         api_error('That name was not recognised');
     }
 }
@@ -108,8 +115,12 @@ 
     $db = new ParlDB;
 
     $date = parse_date($date);
-    if ($date) $date = '"' . $date['iso'] . '"';
-    else $date = 'date(now())';
+    if ($date) {
+        $date = '"' . $date['iso'] . '"';
+    }
+    else {
+        $date = 'date(now())';
+    }
     $q = $db->query("select distinct(dept) from moffice
         where source = 'chgpages/selctee'
         and from_date <= $date and $date <= to_date");
@@ -120,7 +131,8 @@ 
             );
         }
         api_output($output);
-    } else {
+    }
+    else {
         api_error('No committees found');
     }
 }

www/docs/mps/index.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 include_once '../../includes/easyparliament/init.php';
-include_once INCLUDESPATH."easyparliament/people.php";
+include_once INCLUDESPATH . "easyparliament/people.php";
 
 if (get_http_var('msp')) {
     $type = 'MSPs';
@@ -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);

Braces +8 added lines, -4 removed lines

@@ -5,11 +5,14 @@ 
 
 if (get_http_var('msp')) {
     $type = 'MSPs';
-} elseif (get_http_var('mla')) {
+}
+elseif (get_http_var('mla')) {
     $type = 'MLAs';
-} elseif (get_http_var('peer')) {
+}
+elseif (get_http_var('peer')) {
     $type = 'Peers';
-} else {
+}
+else {
     $type = 'MPs';
 }
 
@@ -20,6 +23,7 @@ 
 $data = $people->getData($args);
 if ( isset($args['f']) && $args['f'] == 'csv' ) {
     $people->sendAsCSV($data);
-} else {
+}
+else {
     MySociety\TheyWorkForYou\Renderer::output("people/index", $data);
 }

www/docs/mps/speaker09.php

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

Braces +13 added lines, -7 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;
     }
@@ -77,14 +79,18 @@ 
             $value = rtrim($value);
             $value = rtrim($value, ".");
             echo "<td>$value ";
-        } else {
+        }
+        else {
             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>";
+    }
+    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>";
+        }
     }
 }
 

www/docs/images/mps/photo-status.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
     WHERE house=1 AND left_house = (SELECT MAX(left_house) FROM member) ';
 $q = $db->query($query . "ORDER BY person_id");
 $out = array('both'=>'', 'small'=>'', 'none'=>array());
-for ($i=0; $i<$q->rows(); $i++) {
+for ($i = 0; $i < $q->rows(); $i++) {
     $p_id = $q->field($i, 'person_id');
     list($dummy, $sz) = MySociety\TheyWorkForYou\Utility\Member::findMemberImage($p_id);
     if ($sz == 'L') {
@@ -22,7 +22,7 @@ 
         array_push($out['none'], '<li>' . $q->field($i, 'person_id') . ' (' . $q->field($i, 'party') . ')' . ', ' . $q->field($i, 'constituency'));
     }
 }
-print '<h3>Missing completely ('.count($out['none']).')</h3> <ul>';
+print '<h3>Missing completely (' . count($out['none']) . ')</h3> <ul>';
 print join($out['none'], "\n");
 print '</ul>';
 print '<h3>Large and small</h3> <p>';

Braces +4 added lines, -2 removed lines

@@ -16,9 +16,11 @@
     list($dummy, $sz) = MySociety\TheyWorkForYou\Utility\Member::findMemberImage($p_id);
     if ($sz == 'L') {
         $out['both'] .= $q->field($i, 'person_id') . ', ';
-    } elseif ($sz == 'S') {
+    }
+    elseif ($sz == 'S') {
         $out['small'] .= $q->field($i, 'person_id') . ', ';
-    } else {
+    }
+    else {
         array_push($out['none'], '<li>' . $q->field($i, 'person_id') . ' (' . $q->field($i, 'party') . ')' . ', ' . $q->field($i, 'constituency'));
     }
 }

www/includes/easyparliament/trackback.php

Spacing +19 added lines, -19 removed lines

@@ -51,7 +51,7 @@ 
     public function moderate_trackbacks() { return $this->moderate_trackbacks; }
 
 
-    public function display ($view, $args=array(), $format='html') {
+    public function display($view, $args = array(), $format = 'html') {
         // $view is one of:
         //	'epobject_id' - display the pings for one epobject.
         // 	'recent' - to get the most recent pings to anywhere.
@@ -64,18 +64,18 @@ 
         if ($view == 'epobject_id' || $view == 'recent') {
 
             // What function do we call for this view?
-            $function = '_get_trackbacks_by_'.$view;
+            $function = '_get_trackbacks_by_' . $view;
             // Get all the data that's to be rendered.
             $trackbackdata = $this->$function($args);
 
         } else {
-            $PAGE->error_message ("You haven't specified a valid view type.");
+            $PAGE->error_message("You haven't specified a valid view type.");
             return false;
         }
 
-        $data = array (
+        $data = array(
             'data' 	=> $trackbackdata,
-            'info'	=> array (
+            'info'	=> array(
                 'view' => $view
             )
         );
@@ -86,7 +86,7 @@ 
         $this->render($view, $data, $format);
     }
 
-    public function render($view, $data, $format='html') {
+    public function render($view, $data, $format = 'html') {
 
         if ($format != 'html') {
             $format = 'html';
@@ -95,7 +95,7 @@ 
         // We currently only have one kind of trackback template, so
         // we're ignoring $view here I'm afraid...
 
-        include (INCLUDESPATH."easyparliament/templates/$format/trackbacks" . ".php");
+        include (INCLUDESPATH . "easyparliament/templates/$format/trackbacks" . ".php");
 
     }
 
@@ -131,14 +131,14 @@ 
 
 
         // Still here? Then we're trackbacking to a valid hansard item.
-        $url 		= $trackbackdata['url'];
-        $source_ip	= $trackbackdata['source_ip'];
+        $url = $trackbackdata['url'];
+        $source_ip = $trackbackdata['source_ip'];
         // These all strip_tags too.
-        $title 		= trim_characters(html_entity_decode($trackbackdata['title']), 0, 255);
-        $excerpt 	= trim_characters(html_entity_decode($trackbackdata['excerpt']), 0, 255);
-        $blog_name 	= trim_characters(html_entity_decode($trackbackdata['blog_name']), 0, 255);
+        $title = trim_characters(html_entity_decode($trackbackdata['title']), 0, 255);
+        $excerpt = trim_characters(html_entity_decode($trackbackdata['excerpt']), 0, 255);
+        $blog_name = trim_characters(html_entity_decode($trackbackdata['blog_name']), 0, 255);
 
-        $visible 		= $this->moderate_trackbacks ? 0 : 1;
+        $visible = $this->moderate_trackbacks ? 0 : 1;
 
         $q = $this->db->query("INSERT INTO trackbacks
                         (epobject_id, blog_name, title, excerpt, url, source_ip, posted, visible)
@@ -198,8 +198,8 @@ 
                         ");
 
         if ($q->rows() > 0) {
-            for ($row=0; $row<$q->rows(); $row++) {
-                $trackbackdata[] = array (
+            for ($row = 0; $row < $q->rows(); $row++) {
+                $trackbackdata[] = array(
                     'trackback_id' 	=> $q->field($row, 'trackback_id'),
                     'epobject_id'	=> $q->field($row, 'epobject_id'),
                     'blog_name' 	=> $q->field($row, 'blog_name'),
@@ -247,8 +247,8 @@ 
                         ");
 
         if ($q->rows() > 0) {
-            for ($row=0; $row<$q->rows(); $row++) {
-                $trackbackdata[] = array (
+            for ($row = 0; $row < $q->rows(); $row++) {
+                $trackbackdata[] = array(
                     'trackback_id' 	=> $q->field($row, 'trackback_id'),
                     'epobject_id'	=> $q->field($row, 'epobject_id'),
                     'blog_name' 	=> $q->field($row, 'blog_name'),
@@ -277,13 +277,13 @@ 
             // This page just does XML.
 
             if ($error) {
-                echo '<?xml version="1.0" encoding="utf-8"?'.">\n";
+                echo '<?xml version="1.0" encoding="utf-8"?' . ">\n";
                 echo "<response>\n";
                 echo "<error>1</error>\n";
                 echo "<message>$error_message</message>\n";
                 echo "</response>";
             } else {
-                echo '<?xml version="1.0" encoding="utf-8"?'.">\n";
+                echo '<?xml version="1.0" encoding="utf-8"?' . ">\n";
                 echo "<response>\n";
                 echo "<error>0</error>\n";
                 echo "</response>";

Braces +12 added lines, -6 removed lines

@@ -42,7 +42,8 @@ 
         // Set in init.php
         if (ALLOWTRACKBACKS == true) {
             $this->trackbacks_enabled = true;
-        } else {
+        }
+        else {
             $this->trackbacks_enabled = false;
         }
     }
@@ -68,7 +69,8 @@ 
             // Get all the data that's to be rendered.
             $trackbackdata = $this->$function($args);
 
-        } else {
+        }
+        else {
             $PAGE->error_message ("You haven't specified a valid view type.");
             return false;
         }
@@ -157,7 +159,8 @@ 
             // Return a success message.
             $this->_trackback_response(0);
 
-        } else {
+        }
+        else {
             die ("Sorry, we could not save the trackback to the database. Please <a href=\"mailto:" . CONTACTEMAIL . "\">email us</a> to let us know. Thanks.");
         }
     }
@@ -282,7 +285,8 @@ 
                 echo "<error>1</error>\n";
                 echo "<message>$error_message</message>\n";
                 echo "</response>";
-            } else {
+            }
+            else {
                 echo '<?xml version="1.0" encoding="utf-8"?'.">\n";
                 echo "<response>\n";
                 echo "<error>0</error>\n";
@@ -290,12 +294,14 @@ 
             }
             die();
 
-        } else {
+        }
+        else {
             // We're adding a trackback from a page that's probably expecting HTML.
 
             if ($error) {
                 $PAGE->error_message($error_message);
-            } else {
+            }
+            else {
                 print "<p>Trackback added successfully.</p>\n";
             }
         }

www/includes/easyparliament/glossarylist.php

Spacing +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@ 
 
 class GLOSSARYLIST {
 
-    public function render($data, $format='html', $template='glossary') {
+    public function render($data, $format = 'html', $template = 'glossary') {
         // Once we have the data that's to be rendered,
         // include the template.
 
@@ -10,7 +10,7 @@ 
             $format = 'html';
         }
 
-        include (INCLUDESPATH."easyparliament/templates/$format/$template.php");
+        include (INCLUDESPATH . "easyparliament/templates/$format/$template.php");
 
     }