mysociety / theyworkforyou

www/docs/admin/banner.php

Spacing +1 added lines, -1 removed lines

@@ -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 {

Braces +2 added lines, -1 removed lines

@@ -64,7 +64,8 @@
     if ( $banner->set_text($banner_text) ) {
         $out = "<h4>update successful</h4>";
         $out .= "<p>Banner text is now:</p><p>$banner_text</p>";
-    } else {
+    }
+    else {
         $out = "<h4>Failed to update banner text</h4>";
     }
 

www/docs/admin/policies.php

Spacing +3 added lines, -3 removed lines

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

Braces +2 added lines, -1 removed lines

@@ -22,7 +22,8 @@
 
 if (get_http_var('editpolicy')) {
     $out .= edit_policy_form();
-} else {
+}
+else {
     $out .= list_policies();
 }
 

www/docs/admin/glossary.php

Spacing +7 added lines, -7 removed lines

@@ -2,14 +2,14 @@ 
 // Some sketchy crap for displaying pending glossary additions
 
 include_once '../../includes/easyparliament/init.php';
-include_once (INCLUDESPATH."easyparliament/editqueue.php");
-include_once (INCLUDESPATH."easyparliament/glossary.php");
+include_once (INCLUDESPATH . "easyparliament/editqueue.php");
+include_once (INCLUDESPATH . "easyparliament/glossary.php");
 
 $this_page = "admin_glossary";
 
 $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
     );

www/docs/api/api_getWMS.php

Spacing +2 added lines, -2 removed lines

@@ -100,11 +100,11 @@
     _api_getHansard_year('WMS', $y);
 }
 function api_getWMS_search($s) {
-    _api_getHansard_search( array(
+    _api_getHansard_search(array(
         's' => $s,
         'pid' => get_http_var('person'),
         'type' => 'wms',
-    ) );
+    ));
 }
 function api_getWMS_person($pid) {
     _api_getHansard_search(array(

www/docs/api/api_getWrans.php

Spacing +2 added lines, -2 removed lines

@@ -57,11 +57,11 @@
     _api_getHansard_year('WRANS', $y);
 }
 function api_getWrans_search($s) {
-    _api_getHansard_search( array(
+    _api_getHansard_search(array(
         's' => $s,
         'pid' => get_http_var('person'),
         'type' => 'wrans',
-    ) );
+    ));
 }
 function api_getWrans_person($pid) {
     _api_getHansard_search(array(

www/docs/api/key.php

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
     if (get_http_var('create_key') && get_http_var('reason')) {
         $estimated_usage = (int) get_http_var('estimated_usage');
         $commercial = get_http_var('commercial');
-        create_key($commercial, get_http_var('reason'),  $estimated_usage);
+        create_key($commercial, get_http_var('reason'), $estimated_usage);
         if ($commercial == '1' || $estimated_usage > 50000) {
             echo '<p><strong>It looks like your usage may fall outside of our free-of-charge bracket: if that\'s the case, this key might get blocked, so we\'d advise you to email us at <a href="enquiries@mysociety.org">enquiries@mysociety.org</a> to discuss licensing options.</strong></p>';
         }
@@ -29,7 +29,7 @@ 
     $db = new ParlDB;
     $q = $db->query('SELECT api_key, commercial, created, reason, estimated_usage FROM api_key WHERE user_id=' . $THEUSER->user_id());
     $keys = array();
-    for ($i=0; $i<$q->rows(); $i++) {
+    for ($i = 0; $i < $q->rows(); $i++) {
         $keys[] = array($q->field($i, 'api_key'), $q->field($i, 'commercial'), $q->field($i, 'created'), $q->field($i, 'reason'), $q->field($i, 'estimated_usage'));
     }
     if ($keys) {
@@ -38,8 +38,8 @@ 
     foreach ($keys as $keyarr) {
         list($key, $commercial, $created, $reason, $estimated_usage) = $keyarr;
         echo '<li><span style="font-size:200%">' . $key . '</span><br><span style="color: #666666;">';
-        if ($commercial==1) echo 'Commercial key,';
-        elseif ($commercial==-1) echo 'Key';
+        if ($commercial == 1) echo 'Commercial key,';
+        elseif ($commercial == -1) echo 'Key';
         else echo 'Non-commercial key,';
         echo ' created ', $created, '; ', $reason, '; estimated usage ', $estimated_usage;
         echo '</span><br><em>Usage statistics</em>: ';
@@ -75,7 +75,7 @@ 
     global $THEUSER;
     $key = auth_ab64_encode(urandom_bytes(16));
     $db = new ParlDB;
-    if ($commercial=='') $commercial = 0;
+    if ($commercial == '') $commercial = 0;
     $db->query('INSERT INTO api_key (user_id, api_key, commercial, created, reason, estimated_usage) VALUES
         (:user_id, :key, :commercial, NOW(), :reason, :estimated_usage)', array(
         ':user_id' => $THEUSER->user_id(),

Braces +14 added lines, -5 removed lines

@@ -38,9 +38,15 @@ 
     foreach ($keys as $keyarr) {
         list($key, $commercial, $created, $reason, $estimated_usage) = $keyarr;
         echo '<li><span style="font-size:200%">' . $key . '</span><br><span style="color: #666666;">';
-        if ($commercial==1) echo 'Commercial key,';
-        elseif ($commercial==-1) echo 'Key';
-        else echo 'Non-commercial key,';
+        if ($commercial==1) {
+            echo 'Commercial key,';
+        }
+        elseif ($commercial==-1) {
+            echo 'Key';
+        }
+        else {
+            echo 'Non-commercial key,';
+        }
         echo ' created ', $created, '; ', $reason, '; estimated usage ', $estimated_usage;
         echo '</span><br><em>Usage statistics</em>: ';
         $q = $db->query('SELECT count(*) as count FROM api_stats WHERE api_key="' . $key . '" AND query_time > NOW() - interval 1 day');
@@ -58,7 +64,8 @@ 
         echo '</ul>';
     }
     api_key_form();
-} else {
+}
+else {
     echo ' The key is tied to your TheyWorkForYou account,
 so if you don\'t yet have one, please <a href="/user/?pg=join">sign up</a>, then
 return here to get a key.</p>';
@@ -75,7 +82,9 @@ 
     global $THEUSER;
     $key = auth_ab64_encode(urandom_bytes(16));
     $db = new ParlDB;
-    if ($commercial=='') $commercial = 0;
+    if ($commercial=='') {
+        $commercial = 0;
+    }
     $db->query('INSERT INTO api_key (user_id, api_key, commercial, created, reason, estimated_usage) VALUES
         (:user_id, :key, :commercial, NOW(), :reason, :estimated_usage)', array(
         ':user_id' => $THEUSER->user_id(),

www/docs/api/api_convertURL.php

Braces +11 added lines, -7 removed lines

@@ -41,7 +41,8 @@ 
     $fragment = '';
     if ($id_data['htype'] == '11' || $id_data['htype'] == '10') {
         $LISTURL->insert( array( 'id' => $id_data['gid'] ) );
-    } else {
+    }
+    else {
         $parent_epobject_id = $id_data['subsection_id'];
         $parent_gid = '';
         $r = $db->query("SELECT gid
@@ -75,22 +76,25 @@ 
     $q = $db->query('select gid,major,htype,subsection_id from hansard where source_url = :url order by gid limit 1', array(
         ':url' => $url
         ));
-    if ($q->rows())
-        return api_converturl_url_output($q);
+    if ($q->rows()) {
+            return api_converturl_url_output($q);
+    }
 
     $q = $db->query('select gid,major,htype,subsection_id from hansard where source_url like :url order by gid limit 1', array(
         ':url' => $url_nohash . '%'
         ));
-    if ($q->rows())
-        return api_converturl_url_output($q);
+    if ($q->rows()) {
+            return api_converturl_url_output($q);
+    }
 
     $url_bound = str_replace('cmhansrd/cm', 'cmhansrd/vo', $url_nohash);
     if ($url_bound != $url_nohash) {
         $q = $db->query('select gid,major,htype,subsection_id from hansard where source_url like :url order by gid limit 1', array(
             ':url' => $url_bound . '%'
             ));
-        if ($q->rows())
-            return api_converturl_url_output($q);
+        if ($q->rows()) {
+                    return api_converturl_url_output($q);
+        }
     }
     api_error('Sorry, URL could not be converted');
 }

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
     $LISTURL = new \MySociety\TheyWorkForYou\Url($hansardmajors[$id_data['major']]['page_all']);
     $fragment = '';
     if ($id_data['htype'] == '11' || $id_data['htype'] == '10') {
-        $LISTURL->insert( array( 'id' => $id_data['gid'] ) );
+        $LISTURL->insert(array('id' => $id_data['gid']));
     } else {
         $parent_epobject_id = $id_data['subsection_id'];
         $parent_gid = '';
@@ -50,10 +50,10 @@ 
                     ':epobject_id' => $parent_epobject_id
                     ));
         if ($r->rows() > 0) {
-            $parent_gid = fix_gid_from_db( $r->field(0, 'gid') );
+            $parent_gid = fix_gid_from_db($r->field(0, 'gid'));
         }
         if ($parent_gid != '') {
-            $LISTURL->insert( array( 'id' => $parent_gid ) );
+            $LISTURL->insert(array('id' => $parent_gid));
             $fragment = '#g' . gid_to_anchor($id_data['gid']);
         }
     }

www/docs/api/api_getMembers.php

Spacing +3 added lines, -3 removed lines

@@ -8,14 +8,14 @@ 
     $q = $db->query($sql, $params);
     $output = array();
     $last_mod = 0;
-    for ($i=0; $i<$q->rows(); $i++) {
+    for ($i = 0; $i < $q->rows(); $i++) {
         $pid = $q->field($i, 'person_id');
         $row = array(
             'member_id' => $q->field($i, 'member_id'),
             'person_id' => $pid,
             'name' => html_entity_decode(member_full_name($q->field($i, 'house'), $q->field($i, 'title'),
                 $q->field($i, 'given_name'), $q->field($i, 'family_name'),
-                $q->field($i, 'lordofname') )),
+                $q->field($i, 'lordofname'))),
             'party' => isset($parties[$q->field($i, 'party')]) ? $parties[$q->field($i, 'party')] : $q->field($i, 'party'),
         );
         if ($q->field($i, 'house') != 2) {
@@ -32,7 +32,7 @@ 
     if (count($pids)) {
         $q = $db->query('SELECT person, dept, position, from_date, to_date FROM moffice
             WHERE to_date="9999-12-31" AND person IN (' . join(',', $pids) . ')');
-        for ($i=0; $i<$q->rows(); $i++) {
+        for ($i = 0; $i < $q->rows(); $i++) {
             $row = $q->row($i);
             $pid = $row['person'];
             unset($row['person']);

Braces +2 added lines, -1 removed lines

@@ -81,7 +81,8 @@
 function api_getMembers_date($house, $date) {
     if ($date = parse_date($date)) {
         api_getMembers($house, '"' . $date['iso'] . '"');
-    } else {
+    }
+    else {
         api_error('Invalid date format');
     }
 }

www/docs/api/api_getMPInfo.php

Braces +4 added lines, -2 removed lines

@@ -27,10 +27,12 @@
     if ($output) {
         if ($output[0]) {
             api_output($output[0][$id], $output[1]);
-        } else {
+        }
+        else {
             api_error('Unknown field');
         }
-    } else {
+    }
+    else {
         api_error('Unknown person ID');
     }
 }