mysociety / theyworkforyou

www/docs/api/api_getPerson.php

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']);
@@ -31,7 +31,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 . IMAGEPATH, $image));
         $row['image'] = $image;
@@ -58,7 +58,7 @@ 
     return $row;
 }
 
-function api_getPerson_id($id, $house='') {
+function api_getPerson_id($id, $house = '') {
     $db = new ParlDB;
     $params = array(
         ':person_id' => $id
@@ -80,7 +80,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_getConstituencies.php

Spacing +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
         and c_main.main_name and constituency.name like :constituency_name and constituency.from_date <= date(now())
         and date(now()) <= constituency.to_date
         order by name', array(
-        ':constituency_name' => '%' . $s .'%'
+        ':constituency_name' => '%' . $s . '%'
         ));
     $output = array();
     $done = array();
@@ -70,7 +70,7 @@ 
 function api_getConstituencies($date = 'now()') {
     $db = new ParlDB;
     $q = $db->query('select cons_id, name from constituency
-        where main_name and from_date <= date('.$date.') and date('.$date.') <= to_date
+        where main_name and from_date <= date('.$date . ') and date(' . $date . ') <= to_date
         order by name');
     $output = array();
     foreach ($q as $row) {
@@ -152,7 +152,7 @@ 
  */
 function _api_angle_between($a1, $a2) {
     if (abs($a1 - $a2) > M_PI) {
-        return 2*M_PI - abs($a1 - $a2);
+        return 2 * M_PI - abs($a1 - $a2);
     }
     return abs($a1 - $a2);
 }

www/docs/api/api_getAlerts.php

Spacing +2 added lines, -2 removed lines

@@ -1,9 +1,9 @@
 <?php
 
 function api_getAlerts_start_date($start_date) {
-    $args = array ('start_date' => $start_date, 'end_date' => get_http_var('end_date'));
+    $args = array('start_date' => $start_date, 'end_date' => get_http_var('end_date'));
     $alert = new ALERT();
-    $data = $alert->fetch_between($confirmed=1, $deleted=0, $args['start_date'], $args['end_date']);
+    $data = $alert->fetch_between($confirmed = 1, $deleted = 0, $args['start_date'], $args['end_date']);
     api_output($data);
 }
 

www/docs/bills/2005-06/legislative-and-regulatory-reform/index.php

Spacing +31 added lines, -31 removed lines

@@ -2,10 +2,10 @@ 
 
 $this_page = 'bill_index';
 include_once '../../../../includes/easyparliament/init.php';
-$DATA->set_page_metadata($this_page, 'heading','Legislative and Regulatory Reform Bill');
+$DATA->set_page_metadata($this_page, 'heading', 'Legislative and Regulatory Reform Bill');
 $PAGE->page_start();
 $PAGE->stripe_start();
-$PAGE->block_start(array ('title'=>'House of Commons - Normal Run'));
+$PAGE->block_start(array('title'=>'House of Commons - Normal Run'));
 ?>
 <ul>
 
@@ -45,7 +45,7 @@ 
     parse_bill('2006141.txt');
     $amendments = read_amendments('amendments.txt'); # The amendments, by number
     parse_amendments();
-    $out = $title."\n\n";
+    $out = $title . "\n\n";
     $out .= "Page,Line\n";
     foreach ($bill as $page_num => $page) {
         foreach ($page as $line_num => $line) {
@@ -59,7 +59,7 @@ 
 print '</ul>';
 $PAGE->block_end();
 $includes = array(
-    array (
+    array(
         'type' => 'include',
         'content' => 'bills_intro'
     ),
@@ -77,7 +77,7 @@ 
     $intitle = true;
     $title = '';
     foreach ($f as $r) {
-        if ($line<1) {
+        if ($line < 1) {
             $line++;
             continue;
         }
@@ -96,7 +96,7 @@ 
             }
             continue;
         }
-        if (substr($r, 0, 8)=='Bill 141') {
+        if (substr($r, 0, 8) == 'Bill 141') {
             continue;
         }
         if (preg_match('#\s+([1-4]?[05])$#', $r, $m)) {
@@ -143,7 +143,7 @@ 
         if ($r == "\n") {
             continue;
         }
-        if ($line<1) {
+        if ($line < 1) {
             $line++;
             continue;
         }
@@ -157,8 +157,8 @@ 
             $number = $m[1];
             $amendments[$number] = '';
         } elseif (preg_match('#To move the following Clause#', $r)) {
-            preg_match('#\n(.*?)$#', $amendments[$number-1], $m);
-            $amendments[$number-1] = preg_replace('#\n(.*?)$#', '', $amendments[$number-1]);
+            preg_match('#\n(.*?)$#', $amendments[$number - 1], $m);
+            $amendments[$number - 1] = preg_replace('#\n(.*?)$#', '', $amendments[$number - 1]);
             $amendments[$number] .= '*' . trim($m[1]) . "*\n$r";
         } else {
             $amendments[$number] .= $r;
@@ -182,9 +182,9 @@ 
             $page = $m[1]; $line = $m[2]; $clause = $m[3];
             $from_text = $m[4]; $end_line = $m[5]; $insert = $m[6];
             unset($amendments[$num]);
-            $bill[$page][$line] = str_replace($from_text, "$from_text <del title='$num'>", $bill[$page][$line]) . '</del><ins title="'.$num.'">' . $insert . '</ins>';
-            for ($i=$line+1; $i<=$end_line; $i++) {
-                $bill[$page][$i] = '<del title="'.$num.'">' . $bill[$page][$i] . '</del>';
+            $bill[$page][$line] = str_replace($from_text, "$from_text <del title='$num'>", $bill[$page][$line]) . '</del><ins title="' . $num . '">' . $insert . '</ins>';
+            for ($i = $line + 1; $i <= $end_line; $i++) {
+                $bill[$page][$i] = '<del title="' . $num . '">' . $bill[$page][$i] . '</del>';
             }
         }
         # Page  4, line 9 [Clause 6], leave out from `under' to `creating' and insert `this Part making provision'
@@ -201,10 +201,10 @@ 
             $insert = $m[7];
             unset($amendments[$num]);
             $bill[$page][$from_line] = str_replace($from_text, "$from_text <del title='$num'>", $bill[$page][$from_line]) . '</del>';
-            for ($i=$from_line+1; $i<$to_line; $i++) {
-                $bill[$page][$i] = '<del title="'.$num.'">' . $bill[$page][$i] . '</del>';
+            for ($i = $from_line + 1; $i < $to_line; $i++) {
+                $bill[$page][$i] = '<del title="' . $num . '">' . $bill[$page][$i] . '</del>';
             }
-            $bill[$page][$to_line] = '<del title="'.$num.'">' . str_replace($to_text, "</del><ins title='$num'>$insert</ins> $to_text", $bill[$page][$to_line]);
+            $bill[$page][$to_line] = '<del title="' . $num . '">' . str_replace($to_text, "</del><ins title='$num'>$insert</ins> $to_text", $bill[$page][$to_line]);
         }
         # Page  3, line 13 [Clause 4], leave out from beginning to `confer' and insert `An order under this Part may not make provision to'
         if (preg_match('#Page\s+(\d+), line (\d+) \[Clause (\d+)\], leave out from beginning to `(.*?)\' and insert `(.*?)\'#s', $amendment, $m)) {
@@ -225,9 +225,9 @@ 
             $page = $m[1]; $line = $m[3]; $clause = $m[2];
             $insert = isset($m[4]) ? $m[4] : null;
             unset($amendments[$num]);
-            $bill[$page][$line] = '<del title="'.$num.'">'.$bill[$page][$line].'</del>';
+            $bill[$page][$line] = '<del title="' . $num . '">' . $bill[$page][$line] . '</del>';
             if ($insert) {
-                $bill[$page][$line] .= '<ins title="'.$num.'">'.$insert.'</ins>';
+                $bill[$page][$line] .= '<ins title="' . $num . '">' . $insert . '</ins>';
             }
         }
         # Page 8, line 24 [Clause 14], at end insert-- `...'
@@ -235,7 +235,7 @@ 
             $page = $m[1]; $line = $m[2]; $clause = $m[3];
             $insert = $m[4];
             unset($amendments[$num]);
-            $bill[$page][$line] .= '<ins title="'.$num.'">'.$insert.'</ins>';
+            $bill[$page][$line] .= '<ins title="' . $num . '">' . $insert . '</ins>';
         }
         # Title, line    1, leave out `reforming legislation' and insert `...'
         if (preg_match('#Title, line.*?, leave out `(.*?)\' and insert `(.*?)\'#s', $amendment, $m)) {
@@ -251,14 +251,14 @@ 
             foreach ($clauses[$clause] as $subclause_num => $subclause) {
                 foreach ($subclause as $subsubclause_num => $subsubclause) {
                     $startP = $subsubclause['startP'];
-                    if ($startP==$page && $subsubclause['startL']==$line) {
+                    if ($startP == $page && $subsubclause['startL'] == $line) {
                         if ($startP == $subsubclause['endP']) {
                             unset($amendments[$num]);
-                            for ($i = $subsubclause['startL']; $i<=$subsubclause['endL']; $i++) {
-                                $bill[$page][$i] = '<del title="'.$num.'">' . $bill[$page][$i] . '</del>';
+                            for ($i = $subsubclause['startL']; $i <= $subsubclause['endL']; $i++) {
+                                $bill[$page][$i] = '<del title="' . $num . '">' . $bill[$page][$i] . '</del>';
                             }
                             if ($insert) {
-                                $bill[$page][$i-1] .= "<ins title='$num'>$insert</ins>";
+                                $bill[$page][$i - 1] .= "<ins title='$num'>$insert</ins>";
                             }
                         }
                     }
@@ -274,21 +274,21 @@ 
             foreach ($clauses[$clause] as $subclause_num => $subclause) {
                 foreach ($subclause as $subsubclause_num => $subsubclause) {
                     $startP = $subsubclause['startP'];
-                    if ($startP==$page && $subsubclause['startL']==$line) {
+                    if ($startP == $page && $subsubclause['startL'] == $line) {
                         if ($startP == $subsubclause['endP']) {
                             unset($amendments[$num]);
                             $finished = true;
                         }
                     }
                     if ($finished) {
-                        for ($i = $subsubclause['startL']; $i<=$subsubclause['endL']; $i++) {
-                            $bill[$page][$i] = '<del title="'.$num.'">' . $bill[$page][$i] . '</del>';
+                        for ($i = $subsubclause['startL']; $i <= $subsubclause['endL']; $i++) {
+                            $bill[$page][$i] = '<del title="' . $num . '">' . $bill[$page][$i] . '</del>';
                         }
                     }
                 }
                 if ($finished) {
                     if ($insert) {
-                        $bill[$page][$i-1] .= "<ins title='$num'>$insert</ins>";
+                        $bill[$page][$i - 1] .= "<ins title='$num'>$insert</ins>";
                     }
                     break;
                 }
@@ -300,19 +300,19 @@ 
             $finished = false;
             foreach ($clauses[$clause] as $subclause_num => $subclause) {
                 foreach ($subclause as $subsubclause_num => $subsubclause) {
-                    if ($subsubclause['startP']==$page && $subsubclause['startL']==$line) {
+                    if ($subsubclause['startP'] == $page && $subsubclause['startL'] == $line) {
                         unset($amendments[$num]);
                         $finished = true;
                     }
                     if ($finished) {
-                        for ($p = $subsubclause['startP']; $p<=$subsubclause['endP']; $p++) {
-                            if ($p>$subsubclause['startP']) {
+                        for ($p = $subsubclause['startP']; $p <= $subsubclause['endP']; $p++) {
+                            if ($p > $subsubclause['startP']) {
                                 $starti = 1;
                             } else {
                                 $starti = $subsubclause['startL'];
                             }
-                            for ($i = $starti; $i<=$subsubclause['endL']; $i++) { # XXX Doesn't really work spanning pages
-                                $bill[$p][$i] = '<del title="'.$num.'">' . $bill[$p][$i] . '</del>';
+                            for ($i = $starti; $i <= $subsubclause['endL']; $i++) { # XXX Doesn't really work spanning pages
+                                $bill[$p][$i] = '<del title="' . $num . '">' . $bill[$p][$i] . '</del>';
                             }
                         }
                     }

www/docs/boundaries/index.php

Spacing +2 added lines, -2 removed lines

@@ -135,9 +135,9 @@
 <li>You were in the <strong><?=$current['SPC']?></strong> constituency, in the <strong><?=$current['SPE']?></strong> region; your constituency MSP was <a href='<?=$mp_url?>'><?=$name?></a>, and your regional MSPs were <?php
         foreach ($mreg as $k => $n) {
             print "<a href='/msp/" . make_member_url($n, '', 4) . "'>$n</a>";
-            if ($k < count($mreg)-2) {
+            if ($k < count($mreg) - 2) {
                 print ', ';
-            } elseif ($k == count($mreg)-2) {
+            } elseif ($k == count($mreg) - 2) {
                 print ' and ';
             }
         }

www/docs/admin/featured.php

Spacing +7 added lines, -7 removed lines

@@ -12,7 +12,7 @@ 
 $out = '';
 if (get_http_var('preview')) {
     preview_featured();
-} else if ( get_http_var('confirm') ) {
+} else if (get_http_var('confirm')) {
     $out = update_featured();
 }
 
@@ -23,13 +23,13 @@ 
 print '</div>';
 
 function gid_to_url($gid) {
-    if ( !$gid ) {
+    if (!$gid) {
         return '';
     }
     global $hansardmajors;
     global $db;
 
-    $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", array( ':gid' => $gid ))->first();
+    $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", array(':gid' => $gid))->first();
     $url_gid = fix_gid_from_db($gid);
     $url = new \MySociety\TheyWorkForYou\Url($hansardmajors[$q['major']]['page']);
     $url->insert(array('id' => $url_gid));
@@ -43,7 +43,7 @@ 
     $related = $featured->get_related();
     $context = $featured->get_context();
 
-    if ( get_http_var('url') ) {
+    if (get_http_var('url')) {
         $url = get_http_var('url');
         $title = get_http_var('title');
         $context = get_http_var('context');
@@ -113,9 +113,9 @@ 
     $related_gid3 = $related3 ? get_gid_from_url($related3) : null;
 
     print "<h2>Preview Content</h2>";
-    if ( $gid !== null ) {
+    if ($gid !== null) {
         $h = new MySociety\TheyWorkForYou\Homepage;
-        $featured = $h->getFeaturedDebate($gid, $title, $context, array( $related_gid1, $related_gid2, $related_gid3 ));
+        $featured = $h->getFeaturedDebate($gid, $title, $context, array($related_gid1, $related_gid2, $related_gid3));
 
         include INCLUDESPATH . 'easyparliament/templates/html/homepage/featured.php';
     } else {
@@ -157,7 +157,7 @@ 
     $parts = parse_url($url);
     parse_str($parts['query'], $query);
 
-    if ( $query['id'] ) {
+    if ($query['id']) {
         if (strpos($parts['path'], 'lords') !== false) {
             $gid = 'uk.org.publicwhip/lords/';
         } elseif (strpos($parts['path'], 'whall') !== false) {

www/docs/admin/edittopic.php

Indentation +19 added lines, -19 removed lines

@@ -11,34 +11,34 @@ 
 
 $slug = get_http_var('id');
 if ($slug) {
-  $topic = $topics->getTopic($slug);
+    $topic = $topics->getTopic($slug);
 } else {
-  $topic = new \MySociety\TheyWorkForYou\Topic();
+    $topic = new \MySociety\TheyWorkForYou\Topic();
 }
 
 $action = get_http_var('action');
 switch ($action) {
     case 'add':
       $success = add_topic($topic);
-      break;
+        break;
     case 'update':
       $success = update_topic($topic);
-      break;
+        break;
     case 'setimage':
       $success = add_image($topic);
-      break;
+        break;
     case 'addcontent':
       $success = add_content($topic);
-      break;
+        break;
     case 'deletecontent':
       $success = delete_content($topic);
-      break;
+        break;
     case 'addpolicysets':
       $success = add_policy_sets($topic);
-      break;
+        break;
     case 'addpolicies':
       $success = add_policies($topic);
-      break;
+        break;
     default:
       $success = null;
 }
@@ -125,10 +125,10 @@ 
             <select name="sets[]" multiple>
               <option value="">None</option>
             <?php
-              $policies = new \MySociety\TheyWorkForYou\Policies;
-              $set_descriptions = $policies->getSetDescriptions();
-              $related_sets = $topic->getPolicySets();
-              foreach ($set_descriptions as $set => $description) { ?>
+                $policies = new \MySociety\TheyWorkForYou\Policies;
+                $set_descriptions = $policies->getSetDescriptions();
+                $related_sets = $topic->getPolicySets();
+                foreach ($set_descriptions as $set => $description) { ?>
               <option value="<?= $set ?>" <?= in_array($set, $related_sets) ? 'selected' : '' ?>><?= $description ?></option>
             <?php } ?>
             <input type="submit" value="Update">
@@ -143,10 +143,10 @@ 
             <select name="policies[]" multiple>
               <option value="">None</option>
             <?php
-              $policies = new \MySociety\TheyWorkForYou\Policies;
-              $all_policies = $policies->getPolicies();
-              $related_policies = $topic->getPolicies();
-              foreach ($all_policies as $number => $description) { ?>
+                $policies = new \MySociety\TheyWorkForYou\Policies;
+                $all_policies = $policies->getPolicies();
+                $related_policies = $topic->getPolicies();
+                foreach ($all_policies as $number => $description) { ?>
               <option value="<?= $number ?>" <?= in_array($number, $related_policies) ? 'selected' : '' ?>><?= $description ?></option>
             <?php } ?>
 
@@ -214,9 +214,9 @@ 
             $file_info['tmp_name'],
             $topic->image_path()
         );
-     } catch (ErrorException $e) {
+        } catch (ErrorException $e) {
         return false;
-     }
+        }
 
     if ($image_saved) {
         return $topic->save();

www/docs/email/index.php

Spacing +5 added lines, -5 removed lines

@@ -50,18 +50,18 @@ 
 <?php
 } else {
     $rep_name = $MEMBER->full_name();
-    if ($MEMBER->house_disp==1) {
+    if ($MEMBER->house_disp == 1) {
         $rep_name .= ' MP';
-    } elseif ($MEMBER->house_disp==3) {
+    } elseif ($MEMBER->house_disp == 3) {
         $rep_name .= ' MLA';
     }
-    $data = array (
+    $data = array(
         'template'      => 'email_a_friend',
         'to'            => $recipient_email,
         '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,
@@ -70,7 +70,7 @@ 
 
     $success = send_template_email($data, $merge);
     if ($success) {
-        print "<p>Your email has been sent successfully. Thank you for using TheyWorkForYou.</p> <p><a href=\"$url\">Return to ".$MEMBER->full_name()."'s page</a></p>";
+        print "<p>Your email has been sent successfully. Thank you for using TheyWorkForYou.</p> <p><a href=\"$url\">Return to " . $MEMBER->full_name() . "'s page</a></p>";
     } else {
         print "<p>Sorry, something went wrong trying to send an email. Please wait a few minutes and try again.</p>";
     }

www/docs/glossary/index.php

Spacing +9 added lines, -9 removed lines

@@ -6,7 +6,7 @@ 
 }
 
 include_once '../../includes/easyparliament/init.php';
-include_once INCLUDESPATH."easyparliament/glossary.php";
+include_once INCLUDESPATH . "easyparliament/glossary.php";
 
 $args = array(
     'sort'				=> "regexp_replace",
@@ -47,11 +47,11 @@ 
 }
 
 if ($term) {
-    $DATA->set_page_metadata($this_page, 'title', $term['title'].': Glossary item');
+    $DATA->set_page_metadata($this_page, 'title', $term['title'] . ': Glossary item');
     $DATA->set_page_metadata($this_page, 'heading', $term['title']);
 } else {
-    $DATA->set_page_metadata ($this_page, 'title', $GLOSSARY->current_letter.': Glossary index');
-    $DATA->set_page_metadata ($this_page, 'heading', 'Glossary index');
+    $DATA->set_page_metadata($this_page, 'title', $GLOSSARY->current_letter . ': Glossary index');
+    $DATA->set_page_metadata($this_page, 'heading', 'Glossary index');
 }
 
 $PAGE->page_start();
@@ -70,13 +70,13 @@ 
     $URL->update(array("gl" => $GLOSSARY->next_term['glossary_id']));
     $next_link = $URL->generate('url');
 
-    $nextprev = array (
-        'next'	=> array (
+    $nextprev = array(
+        'next'	=> array(
             'url'	=> $next_link,
             'title'	=> 'Next term',
             'body'	=> $GLOSSARY->next_term['title']
         ),
-        'prev'	=> array (
+        'prev'	=> array(
             'url'	=> $previous_link,
             'title'	=> 'Previous term',
             'body'	=> $GLOSSARY->previous_term['title']
@@ -109,8 +109,8 @@ 
     }
 }
 
-$PAGE->stripe_end(array (
-    array (
+$PAGE->stripe_end(array(
+    array(
         'type'		=> 'nextprev',
         'content'	=> ''
     )