mysociety / theyworkforyou

www/docs/admin/reports.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 include_once '../../includes/easyparliament/init.php';
-include_once (INCLUDESPATH."easyparliament/commentreportlist.php");
+include_once (INCLUDESPATH . "easyparliament/commentreportlist.php");
 
 $this_page = "admin_commentreports";
 

www/docs/admin/comments.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 include_once '../../includes/easyparliament/init.php';
-include_once (INCLUDESPATH."easyparliament/commentreportlist.php");
+include_once (INCLUDESPATH . "easyparliament/commentreportlist.php");
 
 $this_page = "admin_comments";
 

www/docs/admin/report.php

Spacing +10 added lines, -10 removed lines

@@ -6,7 +6,7 @@ 
 // where rid is a report_id and cid is a comment_id.
 
 include_once '../../includes/easyparliament/init.php';
-include_once (INCLUDESPATH."easyparliament/commentreport.php");
+include_once (INCLUDESPATH . "easyparliament/commentreport.php");
 
 $this_page = "admin_commentreport";
 
@@ -177,8 +177,8 @@ 
     global $this_page;
 
 #	$commentermail = preg_replace("/\n/", "<br>\n", get_template_contents('comment_deleted') );
-    $commentermail = preg_replace('/^Subject:.*\n/', '', get_template_contents('comment_deleted') );
-    $reportermail = preg_replace("/\n/", "<br>\n", get_template_contents('report_upheld') );
+    $commentermail = preg_replace('/^Subject:.*\n/', '', get_template_contents('comment_deleted'));
+    $reportermail = preg_replace("/\n/", "<br>\n", get_template_contents('report_upheld'));
 
     ?>
         <p><strong>You've chosen to delete this comment.</strong> You can now send an email to both the person who posted the comment, and the person who made the report. Uncheck a box to prevent an email from being sent. The comment will not be deleted until you click the button below.</p>
@@ -211,7 +211,7 @@ 
 
     global $this_page;
 
-    $reportermail = preg_replace("/\n/", "<br>\n", get_template_contents('report_declined') );
+    $reportermail = preg_replace("/\n/", "<br>\n", get_template_contents('report_declined'));
 
     ?>
         <p><strong>You have chosen not to delete this comment.</strong> You can now send an email to the person who made the report (uncheck the box to send no email). The report will not be resolved until you click the button below.</p>
@@ -243,7 +243,7 @@ 
         $upheld = false;
     }
 
-    $success = $REPORT->resolve ($upheld, $COMMENT);
+    $success = $REPORT->resolve($upheld, $COMMENT);
 
     if ($success) {
 
@@ -261,7 +261,7 @@ 
                 // The reporting user was logged in at the time,
                 // so get their email address.
                 $USER = new USER;
-                $USER->init( $REPORT->user_id() );
+                $USER->init($REPORT->user_id());
                 $email = $USER->email();
             } else {
                 // Non-logged-in user; they should have left their address.
@@ -269,10 +269,10 @@ 
             }
 
             // Prepare the data needed for either email.
-            $data = array (
+            $data = array(
                 'to' 			=> $email
             );
-            $merge = array (
+            $merge = array(
                 'FIRSTNAME' 	=> $REPORT->firstname(),
                 'LASTNAME' 		=> $REPORT->lastname(),
                 'REPORTBODY' 	=> strip_tags($REPORT->body())
@@ -308,12 +308,12 @@ 
             // Remove the anchor for their now deleted comment.
             $addcommentsurl = 'https://' . DOMAIN . preg_replace("/#.*$/", '#addcomment', $COMMENT->url());
 
-            $data = array (
+            $data = array(
                 'to' => $USER->email(),
                 'template' => 'comment_deleted_blank',
                 'subject' => 'One of your comments has been deleted',
             );
-            $merge = array (
+            $merge = array(
                 'REPLYBODY' => get_http_var('commentermail'),
                 'FIRSTNAME' 	=> $USER->firstname(),
                 'LASTNAME' 	=> $USER->lastname(),

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 {

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

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/api_getConstituencies.php

Spacing +5 added lines, -5 removed lines

@@ -41,11 +41,11 @@ 
         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();
-    for ($i=0; $i<$q->rows(); $i++) {
+    for ($i = 0; $i < $q->rows(); $i++) {
         $name = $q->field($i, 'name');
         if (!in_array($name, $done)) {
             $output[] = array(
@@ -70,10 +70,10 @@ 
 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();
-    for ($i=0; $i<$q->rows(); $i++) {
+    for ($i = 0; $i < $q->rows(); $i++) {
         $output[] = array(
             # 'id' => $q->field($i, 'cons_id'),
             'name' => $q->field($i, 'name')
@@ -144,7 +144,7 @@ 
  * smallest angle between them.
  */
 function _api_angle_between($a1, $a2) {
-    if (abs($a1 - $a2) > M_PI) return 2*M_PI - abs($a1 - $a2);
+    if (abs($a1 - $a2) > M_PI) return 2 * M_PI - abs($a1 - $a2);
     return abs($a1 - $a2);
 }
 

Braces +12 added lines, -4 removed lines

@@ -108,7 +108,9 @@ 
     $geometry = _api_getGeometry();
     $out = array();
     foreach ($geometry['data'] as $name => $data) {
-        if (!isset($data['centre_lat']) || !isset($data['centre_lon'])) continue;
+        if (!isset($data['centre_lat']) || !isset($data['centre_lon'])) {
+            continue;
+        }
         $distance = R_e * acos(
             sin(deg2rad($lat)) * sin(deg2rad($data['centre_lat']))
             + cos(deg2rad($lat)) * cos(deg2rad($data['centre_lat']))
@@ -125,8 +127,12 @@ 
         }
     }
     usort($out, function($a, $b) {
-        if ($a['distance'] > $b['distance']) return 1;
-        if ($a['distance'] < $b['distance']) return -1;
+        if ($a['distance'] > $b['distance']) {
+            return 1;
+        }
+        if ($a['distance'] < $b['distance']) {
+            return -1;
+        }
         return 0;
     });
     return $out;
@@ -145,7 +151,9 @@ 
  * smallest angle between them.
  */
 function _api_angle_between($a1, $a2) {
-    if (abs($a1 - $a2) > M_PI) return 2*M_PI - abs($a1 - $a2);
+    if (abs($a1 - $a2) > M_PI) {
+        return 2*M_PI - abs($a1 - $a2);
+    }
     return abs($a1 - $a2);
 }
 

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