mysociety / theyworkforyou

www/docs/news/editme.php

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

@@ -20,7 +20,7 @@ 
 
 Read <a href="http://www.mysociety.org/2009/01/21/blimey-it-looks-like-the-internets-won/">our victory mySociety blog post</a>,
 and do join our mailing list. :-)
-EOT
+eot
 , '2009-01-21 15:30:00', 'Matthew'),
 
 48 => array('API keys, and improved internal links', <<<EOT
@@ -45,7 +45,7 @@ 
 crowd-sourcing game to match the reference to the exact speech, much like our
 <a href="https://www.theyworkforyou.com/video/">video matching</a> (nearly 80%
 of our archive done!). :)
-EOT
+eot
 , '2008-07-18 14:01:00', 'Matthew'),
 
 47 => array('Video on TheyWorkForYou', <<<EOT
@@ -57,7 +57,7 @@ 
 
 <a href="http://www.mysociety.org/2008/06/01/video-recordings-of-the-house-of-commons-on-theyworkforyoucom/">Etienne's post on the mySociety blog</a>
 has some background information on the project.
-EOT
+eot
 , '2008-06-02 18:56:00', 'Matthew'),
 
 46 => array('The Scottish Parliament', <<<EOT
@@ -89,7 +89,7 @@ 
 launching this now to mark the success in getting endorsements for our <a
 href="/freeourbills/">Free Our Bills campaign</a>, and we'll be rolling out
 more goodies as the campaign goes along.
-EOT
+eot
 , '2008-05-06 13:35:28', 'Matthew'),
 
 45 => array('Shadow ministers and spokespersons', <<<EOT
@@ -98,7 +98,7 @@ 
 This information is given both on a person's page and within any debates they
 speak in, which could help explain why your local MP is speaking on transport
 or foreign affairs a lot. :)
-EOT
+eot
 , '2008-04-30 08:25:00', 'Matthew'),
 
 44 => array('Please donate to help us expand TheyWorkForYou', <<<EOT
@@ -107,7 +107,7 @@ 
 Unfortunately, the server that TheyWorkForYou sits on is almost full, so we can&#8217;t launch their hard work. Boo!
 
 TheyWorkForYou isn&#8217;t an externally funded project, and we need funding from other sources to keep it growing and improving. So if the season has filled you with generosity of spirit, why not <a href="https://secure.mysociety.org/donate/">drop us a few pennies</a> to pay for some upgrades? Any extra beyond what we need will go into the general pot to keep <a href="http://www.mysociety.org/">mySociety</a> running and the developers from starving.
-EOT
+eot
 , '2007-12-21 10:07:35', 'Tom'),
 
 43 => array('The Queen in Parliament', <<<EOT
@@ -121,7 +121,7 @@ 
 or just look at past
 <a href="https://www.theyworkforyou.com/search/?pid=13935&pop=1">prorogation and Queen's speeches</a>
 more easily than anywhere else I've found.
-EOT
+eot
 , '2007-09-11 15:34:47', 'Matthew'),
 
 42 => array('Missing confirmation emails', <<<EOT
@@ -132,7 +132,7 @@ 
 few days have now been sent out, and I've got in touch
 with anyone who signed up in the days prior to
 that to let them know what happened.
-EOT
+eot
 , "2007-09-03 17:12:47", 'Matthew'),
 
 41 => array('The Northern Ireland Assembly', <<<EOT
@@ -172,7 +172,7 @@ 
 
 ATB,<br>
 <a href="http://www.dracos.co.uk/">Matthew Somerville</a>
-EOT
+eot
 , "2006-12-11 00:00:00", 'Matthew'),
 
 40 => array('TheyWorkForYou API', <<<EOT
@@ -191,7 +191,7 @@ 
 Here's my <a href="http://www.mysociety.org/2006/barcamp-london/">BarCamp
 Presentation</a> launching the API, and a <a href="http://www.dracos.co.uk/work/theyworkforyou/api/fabfarts/">couple</a>
 of <a href="http://www.mysociety.org/2006/09/02/battle-your-way-to-sedgefield/">applications</a> using it.
-EOT
+eot
 , "2006-09-02 17:10:00"),
 
 39 => array('New features over the last couple of months', <<<EOT
@@ -219,7 +219,7 @@ 
 and when searching a particular person's speeches, we no longer group the results by debate, which
 was confusing, as you obviously expected to see all the speeches for that person that matched your
 search terms.
-EOT
+eot
 , "2006-08-18 09:46:36"),
 
 38 => array("Got an idea for a useful website?", <<<EOT
@@ -227,7 +227,7 @@ 
 come up with an idea for a useful site like this one, and it beats all
 the other ideas, we'll build it for free. <a href="http://www.mysociety.org/proposals2006/submit">Submit an idea</a>
 or <a href="http://www.mysociety.org/proposals2006/view">read and comment on what other people have submitted</a>.
-EOT
+eot
 , "2006-06-06 06:06:06"),
 
 37 => array("We've added the Lords, and more", <<<EOT
@@ -237,14 +237,14 @@ 
 also added a feature to the search to help you identify which MPs or
 Lords are interested in a certain word or phrases. Just search as
 usual and then click 'Show use by person'.
-EOT
+eot
 , "2006-06-01 12:34:56"),
 
 36 => array("Changes to the Register of Members' Interests", <<<EOT
 One of the many things our site does, probably without you realising, is to track the Register of Members' Interests, in which MPs are "to provide information of any pecuniary interest or other material benefit which a Member receives which might reasonably be thought by others to influence his or her actions, speeches or votes in Parliament, or actions taken in the capacity of a Member of Parliament". The latest entry published on the official site has always been shown on MP pages (<a href="https://www.theyworkforyou.com/mp/tony_blair/sedgefield#register">here's Tony Blair's</a>), however we kept all previous editions of the Register safe and sound. And now, after a bit of coding, you can view a history of the Register, either <a href="https://www.theyworkforyou.com/regmem/?f=2005-12-14">comparing particular editions</a>, or for particular MPs (<a href="https://www.theyworkforyou.com/regmem/?p=10001">Diane Abbott</a>, for example). Entries only have to stay on the Register for a year, so this can make for some interesting reading.
 
 Happy New Year! :) <a href="https://www.theyworkforyou.com/regmem/">Changes to the Register of Members' Interests</a>
-EOT
+eot
 , "2006-01-01 12:36:00"),
 
 35 => array("TheyWorkForYou.com Wins Award", <<<EOT
@@ -253,14 +253,14 @@ 
 Thanks to the kind souls who nominated us. We enjoyed ourselves.
 
 
-EOT
+eot
 , "2005-07-05 23:54:13"),
 
 34 => array("NEW! Email this page to a friend", <<<EOT
 At the top right hand side of every (ex)MP's page, we've added a simple new feature: email the page to a friend.
 
 <a href="/mp/">Have a go</a>, and let all your friends know how easy it is to keep tabs on what your former MP did and said in your name during the last Parliament.
-EOT
+eot
 , "2005-04-14 23:43:50"),
 
 33 => array("Play with Pledgebank, Pound the Streets", <<<EOT
@@ -273,7 +273,7 @@ 
 </blockquote>
 
 If you're up for it, why not <a href="http://www.pledgebank.com/theywork">sign up now?</a>
-EOT
+eot
 , "2005-04-13 22:41:23"),
 
 32 => array("NEW! How MPs voted on Key Issues", <<<EOT
@@ -286,7 +286,7 @@ 
 This information is the result sophisticated mining of PublicWhip's detailed vote data covering hundreds of Parliamentary divisions.
 
 We hope it'll make it easier for you to keep track of where your MP really stands on key issues - after all, They Work For You.
-EOT
+eot
 , "2005-04-05 22:59:57"),
 
 31 => array("Channel 4 linking to TheyWorkForYou.com", <<<EOT
@@ -295,7 +295,7 @@ 
 We've done a special paint job for users coming from the Channel 4 site, just to make them feel welcome. You can see an example <a href="https://www.theyworkforyou.com/mp/c4/paul_keetch/hereford">here</a>.
 
 We'd love to know what you think of this paint job, as we're planning a redesign. As ever, <a href="/contact/">get in touch</a>.
-EOT
+eot
 , "2005-04-05 22:53:32"),
 
 30 => array("NEW! Email Alerts & Other Features", <<<EOT
@@ -357,7 +357,7 @@ 
     - Tom, on behalf of the TheyWorkForYou.com volunteers
 
      <a href="https://www.theyworkforyou.com/about/">https://www.theyworkforyou.com/about/</a>  - New volunteers welcome!
-EOT
+eot
 , "2005-02-24 22:02:44"),
 
 26 => array("New Release of TheyWorkForYou.com Source Code", <<<EOT
@@ -374,7 +374,7 @@ 
 Feel free to download it and have a play.
 
 Whilst you're at it, don't forget we also publish a full <a href="https://www.theyworkforyou.com/raw/">XML version of the Hansard data</a>.
-EOT
+eot
 , "2005-01-25 00:15:19"),
 
 25 => array("Search by Date", <<<EOT
@@ -386,7 +386,7 @@ 
 Next step on search is probably an RSS version of keyword searches. We're still very keen to improve overall relevancy of results - anyone out there fancy lending us a Google Appliance to play with?
 
 As ever, <a href="/contact/">contact us</a> if you've got any suggestions how we might improve the site, or if you fancy volunteering.
-EOT
+eot
 , "2005-01-25 00:16:09"),
 
 20 => array("New! Ministerial Statements now included", <<<EOT
@@ -404,7 +404,7 @@ 
 Next up: Select Committees, which promise to be an order of magnitude more challenging. We'll keep you posted.
 
 PS We're always on the lookout for new volunteers - <a href="/contact/">contact us</a> if you are keen to help in almost any capacity.
-EOT
+eot
 , "2005-01-17 17:44:47"),
 
 19 => array("NEW! Westminster Hall debates now available.", <<<EOT
@@ -422,7 +422,7 @@ 
 
 
 
-EOT
+eot
 , "2004-12-22 23:47:19"),
 
 18 => array("RSS feed of your MP's recent appearances", <<<EOT
@@ -436,7 +436,7 @@ 
 RSS is a simple way to publish & distribute content which is frequently updated  (<a href="http://news.bbc.co.uk/1/hi/help/3223484.stm">learn more here</a>.)
 
 Some enlightened MPs are now incorporating this useful feed of their Parliamentary activity into their websites. See <a href="http://www.richardallan.org.uk/">Richard Allen's</a> website for a good example.
-EOT
+eot
 , "2004-11-27 16:38:41"),
 
 16 => array("NEW! MPs' Expenses", <<<EOT
@@ -445,7 +445,7 @@ 
 For example, it is good to note that <a href="https://www.theyworkforyou.com/mp/?pid=10508#expenses">Barbara Roche</a>, a North London MP, does not claim excessive travel expenses.
 
 Bear in mind that proper democracy does cost money, so please think twice before using these data as a stick with which to beat your MP. An "expensive" MP might be providing excellent value for money. And vice versa.
-EOT
+eot
 , "2004-11-08 10:11:14"),
 
 11 => array("TheyWorkForYou.com Development Wiki now public", <<<EOT
@@ -461,7 +461,7 @@ 
 (dissemination is fine, but please don't post the link with the login details embedded in the url)
 
 In case you're wondering what we're up to, well, we're just rousing ourselves for another tilt at completing our vision before the next election is called, so if anyone python or php skills and fancies lending a hand, do <a href="/contact/">contact us</a>.
-EOT
+eot
 , "2004-10-01 23:14:13"),
 
 8 => array("New! Full Source Code Published", <<<EOT
@@ -481,7 +481,7 @@ 
 
 <a href="https://www.theyworkforyou.com/rss/mp/10508.rdf">https://www.theyworkforyou.com/rss/mp/10508.rdf</a>
     - Typical MP 'recent appearances' RSS feed, uses person id.
-EOT
+eot
 , "2004-07-18 22:58:23"),
 
 7 => array("Public Beta Now Live", <<<EOT
@@ -502,7 +502,7 @@ 
 More than the usuals,
 
 - <i><a href="https://www.theyworkforyou.com/about/" title="link to About Us page">The TheyWorkForYou.com Volunteers</a></i>
-EOT
+eot
 , "2004-06-06 03:02:53"),
 
 6 => array("Want to help make us complete?", <<<EOT
@@ -514,14 +514,14 @@ 
 
 Just <a href="/contact/">contact us</a>.
 
-EOT
+eot
 , "2004-05-21 22:15:22"),
 
 5 => array("Know someone who'd like this website?", <<<EOT
 If you know someone who would appreciate being a beta tester, please <a href="/contact/">contact us</a> with their details.
 
 Many thanks.
-EOT
+eot
 , "2004-05-21 22:55:24"),
 
 4 => array("Welcome to our private beta test", <<<EOT
@@ -538,7 +538,7 @@ 
 In the meantime, please enjoy being the first people to scribble in the margins of Hansard. May you be first of many.
 
 - <em>The TheyWorkForYou.com volunteers</em>
-EOT
+eot
 , "2004-05-21 22:55:24")
 );
 

www/docs/search/index.php

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

@@ -1,6 +1,6 @@
 <?php
 
-$new_style_template = TRUE;
+$new_style_template = true;
 
 include_once '../../includes/easyparliament/init.php';
 include_once INCLUDESPATH . "easyparliament/glossary.php";

www/docs/alert/index.php

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

@@ -1,6 +1,6 @@
 <?php
 
-$new_style_template = TRUE;
+$new_style_template = true;
 
 include_once '../../includes/easyparliament/init.php';
 include_once INCLUDESPATH . 'easyparliament/member.php';

www/docs/alert/by-postcode/index.php

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

@@ -1,6 +1,6 @@
 <?php
 
-$new_style_template = TRUE;
+$new_style_template = true;
 
 include_once '../../../includes/easyparliament/init.php';
 include_once INCLUDESPATH . 'easyparliament/member.php';

www/docs/topic/topic.php

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

Braces +3 added lines, -6 removed lines

@@ -27,8 +27,7 @@ 
 $this_page = 'topic';
 
 // Make sure the requested topic actually exists, otherwise throw a 404.
-if ($topic = $topics->getTopic($topicname))
-{
+if ($topic = $topics->getTopic($topicname)) {
 
     $data = array();
     $data['topic'] = $topic;
@@ -45,8 +44,7 @@ 
         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') != '')
-        {
+        if (get_http_var('pc') != '') {
 
             // Try all this, as it might go wrong.
             try {
@@ -81,8 +79,7 @@ 
 
         /////////////////////////////////////////////////////////
         // DOES THE USER HAVE A POSTCODE ALREADY SET?
-        elseif ($THEUSER->postcode_is_set())
-        {
+        elseif ($THEUSER->postcode_is_set()) {
             $member = new Member(array('postcode' => $THEUSER->postcode(), 'house' => HOUSE_TYPE_COMMONS));
         }
 

Spacing +3 added lines, -3 removed lines

@@ -54,12 +54,12 @@ 
                 $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");
+                        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
@@ -70,7 +70,7 @@ 
                         }
                     }
                 } else {
-                    twfy_debug ('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
+                    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) {

www/docs/topic/index.php

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

@@ -7,7 +7,7 @@
 namespace MySociety\TheyWorkForYou;
 
 // Disable the old PAGE class.
-$new_style_template = TRUE;
+$new_style_template = true;
 global $this_page;
 $this_page = 'topics';
 

www/docs/topic/image.php

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

@@ -8,7 +8,7 @@
     $topic = $topics->getTopic($slug);
 }
 
-if (!$slug || !isset($topic) || $topic === NULL) {
+if (!$slug || !isset($topic) || $topic === null) {
     header('HTTP/1.0 404 Not Found');
     exit();
 }

www/docs/api/api_getPerson.php

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

@@ -17,7 +17,7 @@
 <?php
 }
 
-function _api_getPerson_row($row, $has_party=FALSE) {
+function _api_getPerson_row($row, $has_party=false) {
     global $parties;
     $row['full_name'] = member_full_name($row['house'], $row['title'], $row['given_name'],
         $row['family_name'], $row['lordofname']);

Braces +18 added lines, -9 removed lines

@@ -28,8 +28,9 @@ 
         $URL = new \MySociety\TheyWorkForYou\Url('mp');
         $row['url'] = $URL->generate('none') . make_member_url($row['full_name'], $row['constituency'], $row['house'], $row['person_id']);
     }
-    if ($has_party && isset($parties[$row['party']]))
-        $row['party'] = $parties[$row['party']];
+    if ($has_party && isset($parties[$row['party']])) {
+            $row['party'] = $parties[$row['party']];
+    }
     list($image,$sz) = MySociety\TheyWorkForYou\Utility\Member::findMemberImage($row['person_id']);
     if ($image) {
         list($width, $height) = getimagesize(str_replace(IMAGEPATH, BASEDIR . '/images/', $image));
@@ -49,7 +50,9 @@ 
     }
 
     foreach ($row as $k => $r) {
-        if (is_string($r)) $row[$k] = html_entity_decode($r);
+        if (is_string($r)) {
+            $row[$k] = html_entity_decode($r);
+        }
     }
 
     return $row;
@@ -85,8 +88,9 @@ 
         $out = _api_getPerson_row($row, $house == HOUSE_TYPE_ROYAL ? false : true);
         $output[] = $out;
         $time = strtotime($row['lastupdate']);
-        if ($time > $last_mod)
-            $last_mod = $time;
+        if ($time > $last_mod) {
+                    $last_mod = $time;
+        }
     }
     # Only one MP, not an array
     if ($flatten && count($output) == 1 && $house == HOUSE_TYPE_COMMONS) {
@@ -134,13 +138,18 @@ 
 
     $cons = array();
     foreach ($constituencies as $constituency) {
-        if ($constituency == '') continue;
-        if ($constituency == 'Orkney ')
-            $constituency = 'Orkney & Shetland';
+        if ($constituency == '') {
+            continue;
+        }
+        if ($constituency == 'Orkney ') {
+                    $constituency = 'Orkney & Shetland';
+        }
 
         if ($house == HOUSE_TYPE_COMMONS) {
             $normalised = MySociety\TheyWorkForYou\Utility\Constituencies::normaliseConstituencyName($constituency);
-            if ($normalised) $constituency = $normalised;
+            if ($normalised) {
+                $constituency = $normalised;
+            }
         }
 
         $cons[] = $constituency;

Spacing +4 added lines, -4 removed lines

@@ -17,7 +17,7 @@ 
 <?php
 }
 
-function _api_getPerson_row($row, $has_party=FALSE) {
+function _api_getPerson_row($row, $has_party = FALSE) {
     global $parties;
     $row['full_name'] = member_full_name($row['house'], $row['title'], $row['given_name'],
         $row['family_name'], $row['lordofname']);
@@ -30,7 +30,7 @@ 
     }
     if ($has_party && isset($parties[$row['party']]))
         $row['party'] = $parties[$row['party']];
-    list($image,$sz) = MySociety\TheyWorkForYou\Utility\Member::findMemberImage($row['person_id']);
+    list($image, $sz) = MySociety\TheyWorkForYou\Utility\Member::findMemberImage($row['person_id']);
     if ($image) {
         list($width, $height) = getimagesize(str_replace(IMAGEPATH, BASEDIR . '/images/', $image));
         $row['image'] = $image;
@@ -55,7 +55,7 @@ 
     return $row;
 }
 
-function api_getPerson_id($id, $house='') {
+function api_getPerson_id($id, $house = '') {
     $db = new ParlDB;
     $params = array(
         ':person_id' => $id
@@ -77,7 +77,7 @@ 
     }
 }
 
-function _api_getPerson_output($q, $flatten=false) {
+function _api_getPerson_output($q, $flatten = false) {
     $output = array();
     $last_mod = 0;
     $house = null;

www/docs/api/api_functions.php

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

@@ -338,7 +338,7 @@
       // and then catch any errors in the conversion and just ignore
       // them and return the unconverted results
       $converted_out = @iconv('utf-8', 'iso-8859-1//TRANSLIT', $out);
-      if ($converted_out !== FALSE) {
+      if ($converted_out !== false) {
         $out = $converted_out;
       }
     }

Spacing +14 added lines, -14 removed lines

@@ -132,7 +132,7 @@ 
 # Key-related functions
 
 function api_log_call($key) {
-    if ($key=='DOCS') return;
+    if ($key == 'DOCS') return;
     $ip = $_SERVER['REMOTE_ADDR'];
     $query = !empty($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
     $query = preg_replace('#key=[A-Za-z0-9]+&?#', '', $query);
@@ -197,14 +197,14 @@ 
 
 # Output functions
 
-function api_output($arr, $last_mod=null) {
+function api_output($arr, $last_mod = null) {
     $output = get_http_var('output');
     if (!get_http_var('docs')) {
         $cond = api_header($output, $last_mod);
         if ($cond) return;
     }
     if ($output == 'xml') {
-        $out = '<?xml version="1.0" encoding="utf-8"?>'."\n";
+        $out = '<?xml version="1.0" encoding="utf-8"?>' . "\n";
         $out .= '<twfy>' . api_output_xml($arr) . '</twfy>';
     } elseif ($output == 'php') {
         $out = api_output_php($arr);
@@ -222,7 +222,7 @@ 
     print $out;
 }
 
-function api_header($o, $last_mod=null) {
+function api_header($o, $last_mod = null) {
     if ($last_mod && array_key_exists('HTTP_IF_MODIFIED_SINCE', $_SERVER)) {
         $t = cond_parse_http_date($_SERVER['HTTP_IF_MODIFIED_SINCE']);
         if (isset($t) && $t >= $last_mod) {
@@ -248,7 +248,7 @@ 
     }
     #$type = 'text/plain';
     header("Content-Type: $type; charset=$charset");
-    if ($last_mod>0)
+    if ($last_mod > 0)
         header('Last-Modified: ' . date('r', $last_mod));
     return false;
 }
@@ -275,7 +275,7 @@ 
     global $api_xml_arr;
     $verbose = get_http_var('verbose') ? "\n" : '';
     if (is_array($v)) {
-        if (count($v) && array_keys($v) === range(0, count($v)-1)) {
+        if (count($v) && array_keys($v) === range(0, count($v) - 1)) {
             $elt = 'match';
             $api_xml_arr++;
             $out = "<$elt>";
@@ -296,36 +296,36 @@ 
     }
 }
 
-function api_output_js($v, $level=0) {
+function api_output_js($v, $level = 0) {
     $verbose = get_http_var('verbose') ? "\n" : '';
     $out = '';
     if (is_array($v)) {
         # PHP arrays are both JS arrays and objects
-        if (count($v) && array_keys($v) === range(0, count($v)-1)) {
-            $out = '[' . join(",$verbose" , array_map('api_output_js', $v)) . ']';
+        if (count($v) && array_keys($v) === range(0, count($v) - 1)) {
+            $out = '[' . join(",$verbose", array_map('api_output_js', $v)) . ']';
         } else {
             $out = '{' . $verbose;
             $b = false;
             foreach ($v as $k => $vv) {
                 if ($b) $out .= ",$verbose";
                 if ($verbose) {
-                    $out .= str_repeat(' ', ($level+1)*2);
+                    $out .= str_repeat(' ', ($level + 1) * 2);
                     $out .= '"' . $k . '" : ';
                 } else {
                     $out .= '"' . $k . '":';
                 }
-                $out .= api_output_js($vv, $level+1);
+                $out .= api_output_js($vv, $level + 1);
                 $b = true;
             }
-            if ($verbose) $out .= "\n" . str_repeat(' ', $level*2);
+            if ($verbose) $out .= "\n" . str_repeat(' ', $level * 2);
             $out .= '}';
         }
     } elseif (is_null($v)) {
         $out = "null";
     } elseif (is_string($v)) {
         $out = '"' . str_replace(
-            array("\\",'"',"\n","\t","\r", "‶", "″", "“", "”"),
-            array("\\\\",'\"','\n','\t','\r', '\"', '\"', '\"', '\"'), $v) . '"';
+            array("\\", '"', "\n", "\t", "\r", "‶", "″", "“", "”"),
+            array("\\\\", '\"', '\n', '\t', '\r', '\"', '\"', '\"', '\"'), $v) . '"';
     } elseif (is_bool($v)) {
         $out = $v ? 'true' : 'false';
     } elseif (is_int($v) || is_float($v)) {

Indentation +12 added lines, -12 removed lines

@@ -146,20 +146,20 @@ 
 }
 
 function api_is_superuser_key($key) {
-  $db = new ParlDB;
-  $q = $db->query('SELECT api_key.user_id, users.status
+    $db = new ParlDB;
+    $q = $db->query('SELECT api_key.user_id, users.status
                FROM   api_key, users
                WHERE  users.user_id = api_key.user_id
                AND    api_key.api_key = :key', array(
                 ':key' => $key
                 ))->first();
-  if (!$q) {
+    if (!$q) {
     return false;
-  }
-  if ($q['status'] == 'Superuser') {
+    }
+    if ($q['status'] == 'Superuser') {
     return true;
-  } 
-  return false;
+    } 
+    return false;
 }
 
 function api_check_key($key) {
@@ -338,12 +338,12 @@ 
     // we only want to convert to iso if it's an actual API call
     // so skip this if it's a documentation page
     if (!get_http_var('docs')) {
-      // and then catch any errors in the conversion and just ignore
-      // them and return the unconverted results
-      $converted_out = @iconv('utf-8', 'iso-8859-1//TRANSLIT', $out);
-      if ($converted_out !== FALSE) {
+        // and then catch any errors in the conversion and just ignore
+        // them and return the unconverted results
+        $converted_out = @iconv('utf-8', 'iso-8859-1//TRANSLIT', $out);
+        if ($converted_out !== FALSE) {
         $out = $converted_out;
-      }
+        }
     }
 
     return $out;

Braces +31 added lines, -16 removed lines

@@ -132,7 +132,9 @@ 
 # Key-related functions
 
 function api_log_call($key) {
-    if ($key=='DOCS') return;
+    if ($key=='DOCS') {
+        return;
+    }
     $ip = $_SERVER['REMOTE_ADDR'];
     $query = !empty($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
     $query = preg_replace('#key=[A-Za-z0-9]+&?#', '', $query);
@@ -204,7 +206,9 @@ 
     $output = get_http_var('output');
     if (!get_http_var('docs')) {
         $cond = api_header($output, $last_mod);
-        if ($cond) return;
+        if ($cond) {
+            return;
+        }
     }
     if ($output == 'xml') {
         $out = '<?xml version="1.0" encoding="utf-8"?>'."\n";
@@ -215,7 +219,8 @@ 
         $out = api_output_rabx($arr);
     } elseif ($output == 'json') {
         $out = json_encode($arr, JSON_PRETTY_PRINT);
-    } else { # JS
+    } else {
+# JS
         $out = api_output_js($arr);
         $callback = get_http_var('callback');
         if (preg_match('#^[A-Za-z0-9._[\]]+$#', $callback)) {
@@ -251,8 +256,9 @@ 
     }
     #$type = 'text/plain';
     header("Content-Type: $type; charset=$charset");
-    if ($last_mod>0)
-        header('Last-Modified: ' . date('r', $last_mod));
+    if ($last_mod>0) {
+            header('Last-Modified: ' . date('r', $last_mod));
+    }
     return false;
 }
 
@@ -262,14 +268,18 @@ 
 
 function api_output_php($arr) {
     $out = serialize($arr);
-    if (get_http_var('verbose')) $out = str_replace(';', ";\n", $out);
+    if (get_http_var('verbose')) {
+        $out = str_replace(';', ";\n", $out);
+    }
     return $out;
 }
 
 function api_output_rabx($arr) {
     $out = '';
     rabx_wire_wr($arr, $out);
-    if (get_http_var('verbose')) $out = str_replace(',', ",\n", $out);
+    if (get_http_var('verbose')) {
+        $out = str_replace(',', ",\n", $out);
+    }
     return $out;
 }
 
@@ -310,7 +320,9 @@ 
             $out = '{' . $verbose;
             $b = false;
             foreach ($v as $k => $vv) {
-                if ($b) $out .= ",$verbose";
+                if ($b) {
+                    $out .= ",$verbose";
+                }
                 if ($verbose) {
                     $out .= str_repeat(' ', ($level+1)*2);
                     $out .= '"' . $k . '" : ';
@@ -320,7 +332,9 @@ 
                 $out .= api_output_js($vv, $level+1);
                 $b = true;
             }
-            if ($verbose) $out .= "\n" . str_repeat(' ', $level*2);
+            if ($verbose) {
+                $out .= "\n" . str_repeat(' ', $level*2);
+            }
             $out .= '}';
         }
     } elseif (is_null($v)) {
@@ -352,13 +366,14 @@ 
 # Call an API function
 
 function api_call_user_func_or_error($function, $params, $error, $type) {
-    if (function_exists($function))
-        call_user_func_array($function, $params);
-    elseif ($type == 'api')
-        api_error($error);
-    else
-        print "<p style='color:#cc0000'>$error</p>";
-}
+    if (function_exists($function)) {
+            call_user_func_array($function, $params);
+    } elseif ($type == 'api') {
+            api_error($error);
+    } else {
+            print "<p style='color:#cc0000'>$error</p>";
+    }
+    }
 
 # Used for testing for conditional responses