mysociety / theyworkforyou

www/includes/utility.php

Braces +6 added lines, -3 removed lines

@@ -319,7 +319,8 @@ 
 
     if (preg_match("/^(\d\d\d\d)-(\d\d?)-(\d\d?)$/", $date, $matches)) {
         [$string, $year, $month, $day] = $matches;
-        if ($year < 1902) { # gmdate fns only go back to Dec. 1901
+        if ($year < 1902) {
+# gmdate fns only go back to Dec. 1901
             if ($format == SHORTDATEFORMAT) {
                 return ($day + 0) . ' ' . $format_date_months_short[$month + 0] . " $year";
             } else {
@@ -1046,7 +1047,8 @@ 
         'Lords in Waiting (HM Household)' => 'Government Whip',
         'Baronesses in Waiting, HM Household' => 'Government Whip',
     ];
-    if ($pos) { # Government post, or Chairman of Select Committee
+    if ($pos) {
+# Government post, or Chairman of Select Committee
         $pretty = $pos;
         if ($dept && $dept != 'No Department') {
             $pretty .= ", $dept";
@@ -1054,7 +1056,8 @@ 
         if (array_key_exists($pretty, $lookup)) {
             $pretty = $lookup[$pretty];
         }
-    } else { # Member of Select Committee
+    } else {
+# Member of Select Committee
         $pretty = "Member, $dept";
     }
     return $pretty;

Spacing +15 added lines, -15 removed lines

@@ -29,7 +29,7 @@ 
     if ($debug_level != '') {
 
         // Set which level shows which types of debug info.
-        $levels =  [
+        $levels = [
             1 =>  ['THEUSER', 'TIME', 'SQLERROR', 'PAGE', 'TEMPLATE', 'SEARCH', 'ALERTS', 'MP'],
             2 =>  ['SQL', 'EMAIL', 'WIKIPEDIA', 'hansardlist', 'debatelist', 'wranslist', 'whalllist'],
             3 =>  ['SQLRESULT'],
@@ -78,7 +78,7 @@ 
     // consider are E_WARNING, E_NOTICE, E_USER_ERROR,
     // E_USER_WARNING and E_USER_NOTICE
     # Commented out are ones that a user function cannot handle.
-    $errortype =  [
+    $errortype = [
         #E_ERROR            => "Error",
         E_WARNING           => "Warning",
         #E_PARSE            => "Parsing Error",
@@ -355,14 +355,14 @@ 
     $in_seconds = strtotime($datetime);
     $now = time();
 
-    $diff   =  $now - $in_seconds;
-    $months =  floor($diff / 2419200);
+    $diff   = $now - $in_seconds;
+    $months = floor($diff / 2419200);
     $diff   -= $months * 2419200;
-    $weeks  =  floor($diff / 604800);
+    $weeks  = floor($diff / 604800);
     $diff   -= $weeks * 604800;
-    $days   =  floor($diff / 86400);
+    $days   = floor($diff / 86400);
     $diff   -= $days * 86400;
-    $hours  =  floor($diff / 3600);
+    $hours  = floor($diff / 3600);
     $diff   -= $hours * 3600;
     $minutes = floor($diff / 60);
     $diff   -= $minutes * 60;
@@ -497,11 +497,11 @@ 
 
     if ($filter_type == 'strict') {
         // No tags allowed at all!
-        $filter->allowed =  [];
+        $filter->allowed = [];
     } else {
         // Comment.
         // Only allowing <a href>, <b>, <strong>, <i> and <em>
-        $filter->allowed =  [
+        $filter->allowed = [
             'a' => ['href'],
             'strong' => [],
             'em' => [],
@@ -530,7 +530,7 @@ 
     $link_length = 60;
     $text = preg_replace_callback(
         "/(?<!\"|\/)((http(s?):\/\/)|(www\.))([a-zA-Z\d_.+,;:?%~\-\/#='*$!()&[\]]+)([a-zA-Z\d_?%~\-\/#='*$!&])/",
-        function ($matches) use ($link_length) {
+        function($matches) use ($link_length) {
             if (strlen($matches[0]) > $link_length) {
                 return '<a href="' . $matches[0] . '" rel="nofollow">' . substr($matches[0], 0, $link_length) . "...</a>";
             } else {
@@ -898,7 +898,7 @@ 
 function entities_to_numbers($string) {
     $string = str_replace(
         ['&Ouml;', '&acirc;', '&uacute;', '&aacute;', '&iacute;', '&ocirc;', '&eacute;'],
-        ['&#214;', '&#226;',  '&#250;',   '&#225;',   '&#237;',   '&#244;',  '&#233;'  ],
+        ['&#214;', '&#226;', '&#250;', '&#225;', '&#237;', '&#244;', '&#233;'],
         $string
     );
     return $string;
@@ -915,9 +915,9 @@ 
         }
     }
 
-    $s   = [' ', '&amp;', '&ocirc;',  '&Ouml;',  '&ouml;',   '&acirc;',  '&iacute;', '&aacute;', '&uacute;', '&eacute;', '&oacute;', '&Oacute;'];
-    $s2  = [" ", "&",     "\xc3\xb4", "\xc3\96", "\xc3\xb6", "\xc3\xa5", "\xc3\xad", "\xc3\xa1", "\xc3\xba", "\xc3\xa9", "\xc3\xb3", "\xc3\x93"];
-    $r   = ['_', 'and',   'o',        'o',       'o',        'a',        'i',        'a',        'u',        'e',        'o',        'o'];
+    $s   = [' ', '&amp;', '&ocirc;', '&Ouml;', '&ouml;', '&acirc;', '&iacute;', '&aacute;', '&uacute;', '&eacute;', '&oacute;', '&Oacute;'];
+    $s2  = [" ", "&", "\xc3\xb4", "\xc3\96", "\xc3\xb6", "\xc3\xa5", "\xc3\xad", "\xc3\xa1", "\xc3\xba", "\xc3\xa9", "\xc3\xb3", "\xc3\x93"];
+    $r   = ['_', 'and', 'o', 'o', 'o', 'a', 'i', 'a', 'u', 'e', 'o', 'o'];
     $name = preg_replace('#^the #', '', strtolower($name));
 
     $out = '';
@@ -1096,7 +1096,7 @@ 
                 }
                 $out .= '<li>' . $body . '<ul>';
             } else {
-                $LISTURL->insert([ 'id' => $gid ]);
+                $LISTURL->insert(['id' => $gid]);
                 $out .= '<li><a href="' . $LISTURL->generate() . '">';
                 $out .= $body . '</a>';
             }

www/docs/admin/featured.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
     global $hansardmajors;
     global $db;
 
-    $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", [ ':gid' => $gid ])->first();
+    $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", [':gid' => $gid])->first();
     $url_gid = fix_gid_from_db($gid);
     $url = new \MySociety\TheyWorkForYou\Url($hansardmajors[$q['major']]['page']);
     $url->insert(['id' => $url_gid]);
@@ -118,7 +118,7 @@ 
     print "<h2>Preview Content</h2>";
     if ($gid !== null) {
         $h = new MySociety\TheyWorkForYou\Homepage();
-        $featured = $h->getFeaturedDebate($gid, $title, $context, [ $related_gid1, $related_gid2, $related_gid3 ]);
+        $featured = $h->getFeaturedDebate($gid, $title, $context, [$related_gid1, $related_gid2, $related_gid3]);
 
         include INCLUDESPATH . 'easyparliament/templates/html/homepage/featured.php';
     } else {

www/docs/admin/policies.php

Spacing +2 added lines, -2 removed lines

@@ -128,9 +128,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/alert_stats.php

Spacing +12 added lines, -12 removed lines

@@ -18,13 +18,13 @@ 
 
 print '<h3>Headline stats</h3> <table>';
 $data = [
-    'header' => [ 'Alert Type', 'Count' ],
+    'header' => ['Alert Type', 'Count'],
     'rows' => [
-        [ 'Confirmed', $q_confirmed ],
-        [ 'Not Confirmed', $q_not_confirmed ],
-        [ 'Deleted', $q_deleted ],
-        [ 'For a Speaker<sup>*</sup>', $q_speaker ],
-        [ 'For a Keyword', $q_keyword ],
+        ['Confirmed', $q_confirmed],
+        ['Not Confirmed', $q_not_confirmed],
+        ['Deleted', $q_deleted],
+        ['For a Speaker<sup>*</sup>', $q_speaker],
+        ['For a Keyword', $q_keyword],
     ],
 ];
 
@@ -40,7 +40,7 @@ 
     $criteria = $row['criteria'];
     $rows[] = [$id, $critera];
 }
-$data = [ 'rows' => $rows ];
+$data = ['rows' => $rows];
 $PAGE->display_table($data);
 
 $q = $db->query('select count(*) as c, criteria from alerts where criteria like "speaker:%" and confirmed and not deleted group by criteria order by c desc');
@@ -79,15 +79,15 @@ 
     }
 }
 
-$people_header = [ 'Name', 'Confirmed', 'Unconfirmed'];
+$people_header = ['Name', 'Confirmed', 'Unconfirmed'];
 print '<h3>Alert signups by MP/Peer</h3>';
 $rows = [];
 foreach ($tots as $person_id => $c) {
     $u = $unconfirmed[$person_id] ?? 0;
-    $rows[] = [ $name[$person_id], $c, $u ];
+    $rows[] = [$name[$person_id], $c, $u];
 }
 $data = [
-    'header' => [ 'Name', 'Confirmed', 'Unconfirmed'],
+    'header' => ['Name', 'Confirmed', 'Unconfirmed'],
     'rows' => $rows,
 ];
 $PAGE->display_table($data);
@@ -114,10 +114,10 @@ 
 foreach ($total as $criteria => $tot) {
     $c = $confirmed[$criteria] ?? 0;
     $u = $unconfirmed[$criteria] ?? 0;
-    $rows[] = [ $criteria, $c, $u ];
+    $rows[] = [$criteria, $c, $u];
 }
 $data = [
-    'header' => [ 'Criteria', 'Confirmed', 'Unconfirmed'],
+    'header' => ['Criteria', 'Confirmed', 'Unconfirmed'],
     'rows' => $rows,
 ];
 $PAGE->display_table($data);

www/docs/admin/edittopic.php

Indentation +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
             <select name="sets[]" multiple>
               <option value="">None</option>
             <?php
-              $policies = new \MySociety\TheyWorkForYou\Policies();
+                $policies = new \MySociety\TheyWorkForYou\Policies();
 $set_descriptions = $policies->getSetDescriptions();
 $related_sets = $topic->getPolicySets();
 foreach ($set_descriptions as $set => $description) { ?>

www/docs/admin/websites.php

Spacing +3 added lines, -3 removed lines

@@ -106,7 +106,7 @@ 
     $sysretval = 0;
     $personid = get_http_var('editperson');
 
-    $q  = $db->query("DELETE FROM personinfo WHERE data_key = 'mp_website' AND personinfo.person_id = :person_id", [
+    $q = $db->query("DELETE FROM personinfo WHERE data_key = 'mp_website' AND personinfo.person_id = :person_id", [
         ':person_id' => $personid,
     ]);
 
@@ -142,9 +142,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/random/index.php

Spacing +1 added lines, -1 removed lines

@@ -11,5 +11,5 @@
 $gid = fix_gid_from_db($gid);
 
 $URL = new \MySociety\TheyWorkForYou\Url('debates');
-$URL->insert([ 'id' => $gid ]);
+$URL->insert(['id' => $gid]);
 header('Location: ' . $URL->generate());

www/docs/postcode/index.php

Spacing +3 added lines, -3 removed lines

@@ -89,13 +89,13 @@
     $member_names = \MySociety\TheyWorkForYou\Utility\House::house_to_members($house);
     if ($house == HOUSE_TYPE_SCOTLAND) {
         $urlp = 'msp';
-        $a = [ $areas['SPC'], $areas['SPE'] ];
+        $a = [$areas['SPC'], $areas['SPE']];
     } elseif ($house == HOUSE_TYPE_WALES) {
         $urlp = 'ms';
-        $a = [ $areas['WAC'], $areas['WAE'] ];
+        $a = [$areas['WAC'], $areas['WAE']];
     } elseif ($house == HOUSE_TYPE_NI) {
         $urlp = 'mla';
-        $a = [ $areas['NIE'] ];
+        $a = [$areas['NIE']];
     }
     $urlpl = $urlp . 's';
     $urlp = "/$urlp/?p=";

www/docs/mp/index.php

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

@@ -221,7 +221,7 @@
 // Basic name, title and description
 $member_name = ucfirst($MEMBER->full_name());
 $title = $member_name;
-$desc = "Read $member_name's contributions to Parliament, including speeches and questions";
+$desc = "read $member_name's contributions to Parliament, including speeches and questions";
 
 // Enhance description if this is a current member
 if ($MEMBER->current_member_anywhere()) {

Spacing +9 added lines, -9 removed lines

@@ -393,7 +393,7 @@ 
         $divisions = new MySociety\TheyWorkForYou\Divisions($MEMBER);
         $policySummaries = $divisions->getMemberDivisionDetails(true);
 
-        $policyOptions = [ 'summaries' => $policySummaries];
+        $policyOptions = ['summaries' => $policySummaries];
 
         // Generate voting segments
         $set_descriptions = $policiesList->getSetDescriptions();
@@ -410,7 +410,7 @@ 
                 'health', 'education', 'reform', 'home', 'environment',
                 'transport', 'housing', 'misc',
             ];
-            $sets = array_filter($sets, function ($v) use ($set_descriptions) {
+            $sets = array_filter($sets, function($v) use ($set_descriptions) {
                 return array_key_exists($v, $set_descriptions);
             });
             shuffle($sets);
@@ -433,7 +433,7 @@ 
 
         $data['sorted_diffs_only'] = array_filter(
             $data['sorted_diffs'],
-            function ($k) { return $k['score_difference'] >= 2; }
+            function($k) { return $k['score_difference'] >= 2; }
         );
 
         // Send the output for rendering
@@ -665,7 +665,7 @@ 
 function person_error_page($message) {
     global $this_page;
     $SEARCHURL = '';
-    switch($this_page) {
+    switch ($this_page) {
         case 'peer':
             $people = new MySociety\TheyWorkForYou\People\Peers();
             $MPSURL = new \MySociety\TheyWorkForYou\Url('peers');
@@ -850,7 +850,7 @@ 
         $SEARCHENGINE = new \SEARCHENGINE($searchstring);
 
         $hansard = new MySociety\TheyWorkForYou\Hansard();
-        $args =  [
+        $args = [
             's' => $searchstring,
             'p' => 1,
             'num' => 3,
@@ -1066,7 +1066,7 @@ 
 
     $lang = LANGUAGE;
 
-    $reg = ['chamber_registers' => [] ];
+    $reg = ['chamber_registers' => []];
 
     foreach ($valid_chambers as $chamber) {
         $key = 'person_regmem_' . $chamber . '_' . $lang;
@@ -1081,7 +1081,7 @@ 
     }
 
     // sort chamber registers by published_date
-    uasort($reg['chamber_registers'], function ($a, $b) {
+    uasort($reg['chamber_registers'], function($a, $b) {
         return $a->published_date <=> $b->published_date;
     });
 
@@ -1175,8 +1175,8 @@ 
         }
     }
 
-    foreach($mreg as $reg) {
-        $data['members'][] =  [
+    foreach ($mreg as $reg) {
+        $data['members'][] = [
             'url' => '/' . $rep_type . '/?p=' . $reg['person_id'],
             'name' => $reg['given_name'] . ' ' . $reg['family_name'],
         ];