mysociety / theyworkforyou

www/includes/easyparliament/comment.php

Indentation +2 added lines, -2 removed lines

@@ -210,8 +210,8 @@
                             array(':epobject_id' => $this->epobject_id));
 
             if ($q->rows() > 0) {
-                 // If you change stuff here, you might have to change it in
-                 // $COMMENTLIST->_get_comment_data() too...
+                    // If you change stuff here, you might have to change it in
+                    // $COMMENTLIST->_get_comment_data() too...
 
                 $gid = fix_gid_from_db($q->field(0, 'gid')); // In includes/utility.php
 

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

@@ -31,7 +31,7 @@ 
     public $body = '';
     public $posted = '';
     public $visible = false;
-    public $modflagged = NULL;	// Is a datetime when set.
+    public $modflagged = null;	// Is a datetime when set.
     public $firstname = '';	// Of the person who posted it.
     public $lastname = '';
     public $url = '';
@@ -138,7 +138,7 @@ 
             $flag = "'$date'";
 
         } elseif ($switch == 'off') {
-            $date = NULL;
+            $date = null;
             $flag = 'NULL';
 
         } else {

Spacing +14 added lines, -14 removed lines

@@ -31,8 +31,8 @@ 
     public $body = '';
     public $posted = '';
     public $visible = false;
-    public $modflagged = NULL;	// Is a datetime when set.
-    public $firstname = '';	// Of the person who posted it.
+    public $modflagged = NULL; // Is a datetime when set.
+    public $firstname = ''; // Of the person who posted it.
     public $lastname = '';
     public $url = '';
 
@@ -41,7 +41,7 @@ 
     public $exists = false;
 
 
-    public function __construct($comment_id='') {
+    public function __construct($comment_id = '') {
 
         $this->db = new ParlDB;
 
@@ -69,12 +69,12 @@ 
             if ($q->rows() > 0) {
 
                 $this->comment_id 	= $comment_id;
-                $this->user_id		= $q->field(0, 'user_id');
+                $this->user_id = $q->field(0, 'user_id');
                 $this->epobject_id	= $q->field(0, 'epobject_id');
-                $this->body			= $q->field(0, 'body');
-                $this->posted		= $q->field(0, 'posted');
-                $this->visible		= $q->field(0, 'visible');
-                $this->modflagged	= $q->field(0, 'modflagged');
+                $this->body = $q->field(0, 'body');
+                $this->posted = $q->field(0, 'posted');
+                $this->visible = $q->field(0, 'visible');
+                $this->modflagged = $q->field(0, 'modflagged');
 
                 // Sets the URL and username for this comment. Duh.
                 $this->_set_url();
@@ -104,9 +104,9 @@ 
     public function comments_enabled() { return $this->comments_enabled; }
 
 
-    public function display($format='html', $template='comments') {
+    public function display($format = 'html', $template = 'comments') {
 
-        $data['comments'][0] = array (
+        $data['comments'][0] = array(
             'comment_id'	=> $this->comment_id,
             'user_id'		=> $this->user_id,
             'epobject_id'	=> $this->epobject_id,
@@ -142,7 +142,7 @@ 
             $flag = 'NULL';
 
         } else {
-            $PAGE->error_message ("Why are you trying to switch this comment's modflag to '" . _htmlentities($switch) . "'!");
+            $PAGE->error_message("Why are you trying to switch this comment's modflag to '" . _htmlentities($switch) . "'!");
         }
 
         $q = $this->db->query("UPDATE comments
@@ -154,7 +154,7 @@ 
             $this->modflagged = $date;
             return true;
         } else {
-            $message = array (
+            $message = array(
                 'title' => 'Sorry',
                 'text' => "We couldn't update the annotation's modflag."
             );
@@ -176,7 +176,7 @@ 
             if ($q->success()) {
                 return true;
             } else {
-                $message = array (
+                $message = array(
                     'title' => 'Sorry',
                     'text' => "We were unable to delete the annotation."
                 );
@@ -185,7 +185,7 @@ 
             }
 
         } else {
-            $message = array (
+            $message = array(
                 'title' => 'Sorry',
                 'text' => "You are not authorised to delete annotations."
             );

Braces +14 added lines, -7 removed lines

@@ -48,7 +48,8 @@ 
         // Set in init.php
         if (ALLOWCOMMENTS == true) {
             $this->comments_enabled = true;
-        } else {
+        }
+        else {
             $this->comments_enabled = false;
         }
 
@@ -81,7 +82,8 @@ 
                 $this->_set_username();
 
                 $this->exists = true;
-            } else {
+            }
+            else {
                 $this->exists = false;
             }
         }
@@ -137,11 +139,13 @@ 
             $date = gmdate("Y-m-d H:i:s");
             $flag = "'$date'";
 
-        } elseif ($switch == 'off') {
+        }
+        elseif ($switch == 'off') {
             $date = NULL;
             $flag = 'NULL';
 
-        } else {
+        }
+        else {
             $PAGE->error_message ("Why are you trying to switch this comment's modflag to '" . _htmlentities($switch) . "'!");
         }
 
@@ -153,7 +157,8 @@ 
         if ($q->success()) {
             $this->modflagged = $date;
             return true;
-        } else {
+        }
+        else {
             $message = array (
                 'title' => 'Sorry',
                 'text' => "We couldn't update the annotation's modflag."
@@ -175,7 +180,8 @@ 
 
             if ($q->success()) {
                 return true;
-            } else {
+            }
+            else {
                 $message = array (
                     'title' => 'Sorry',
                     'text' => "We were unable to delete the annotation."
@@ -184,7 +190,8 @@ 
                 return false;
             }
 
-        } else {
+        }
+        else {
             $message = array (
                 'title' => 'Sorry',
                 'text' => "You are not authorised to delete annotations."

www/includes/dbtypes.php

Spacing +7 added lines, -7 removed lines

@@ -124,7 +124,7 @@ 
 );
 $hansardmajors[104] = $hansardmajors[4];
 
-$parties = array (
+$parties = array(
     'Bp'    => 'Bishop',
     'Con'   => 'Conservative',
     'CWM'   => 'Deputy Speaker',
@@ -166,9 +166,9 @@ 
 */
 
 // Constants for various house types
-define ('HOUSE_TYPE_ROYAL', 0);
-define ('HOUSE_TYPE_COMMONS', 1);
-define ('HOUSE_TYPE_LORDS', 2);
-define ('HOUSE_TYPE_NI', 3);
-define ('HOUSE_TYPE_SCOTLAND', 4);
-define ('HOUSE_TYPE_WALES', 5);
+define('HOUSE_TYPE_ROYAL', 0);
+define('HOUSE_TYPE_COMMONS', 1);
+define('HOUSE_TYPE_LORDS', 2);
+define('HOUSE_TYPE_NI', 3);
+define('HOUSE_TYPE_SCOTLAND', 4);
+define('HOUSE_TYPE_WALES', 5);

www/docs/foiorder2009/share.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
         <p></p>
     <?php
 
-$PAGE->block_start(array ('title'=>'Share this with your friends'));
+$PAGE->block_start(array('title'=>'Share this with your friends'));
 
 #foi2009_sharethis_link();
 #foi2009_share_page();
@@ -25,4 +25,4 @@ 
 
 $PAGE->block_end();
 $PAGE->stripe_end();
-$PAGE->page_end ();
+$PAGE->page_end();

www/docs/foiorder2009/index.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 
 $PAGE->page_start();
 $PAGE->stripe_start();
-$PAGE->block_start(array ('id'=>'intro', 'title'=>'We need your help:'));
+$PAGE->block_start(array('id'=>'intro', 'title'=>'We need your help:'));
 
 echo '<div id="foi2009">';
 echo $foi2009_message;

www/docs/rss/index.php

Indentation +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     } elseif ($constituency == "") {
             $errors['pc'] = "Sorry, " . _htmlentities($pc) . " isn't a known postcode";
             twfy_debug ('MP', "Can't display an MP, as submitted postcode didn't match a constituency");
-       } else {
+        } else {
             $MEMBER = new MEMBER(array('constituency' => $constituency));
             if ($MEMBER->person_id()) {
                 // This will cookie the postcode.

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 include_once '../../includes/easyparliament/init.php';
-include_once INCLUDESPATH."easyparliament/member.php";
+include_once INCLUDESPATH . "easyparliament/member.php";
 
 $pc = get_http_var('pc');
 $pc = preg_replace('#[^a-z0-9 ]#i', '', $pc);
@@ -13,7 +13,7 @@ 
             $errors['pc'] = "Sorry, we couldn't check your postcode right now. Please use the 'All Mps' link above to browse MPs";
     } elseif ($constituency == "") {
             $errors['pc'] = "Sorry, " . _htmlentities($pc) . " isn't a known postcode";
-            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");
        } else {
             $MEMBER = new MEMBER(array('constituency' => $constituency));
             if ($MEMBER->person_id()) {
@@ -27,5 +27,5 @@ 
         }
     } else {
         $errors['pc'] = "Sorry, " . _htmlentities($pc) . " isn't a valid postcode";
-        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.");
     }

Braces +9 added lines, -4 removed lines

@@ -5,16 +5,20 @@ 
 
 $pc = get_http_var('pc');
 $pc = preg_replace('#[^a-z0-9 ]#i', '', $pc);
-if (!$pc) exit;
+if (!$pc) {
+    exit;
+}
 
 if (validate_postcode($pc)) {
     $constituency = strtolower(MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituency($pc));
     if ($constituency == "CONNECTION_TIMED_OUT") {
             $errors['pc'] = "Sorry, we couldn't check your postcode right now. Please use the 'All Mps' link above to browse MPs";
-    } elseif ($constituency == "") {
+    }
+    elseif ($constituency == "") {
             $errors['pc'] = "Sorry, " . _htmlentities($pc) . " isn't a known postcode";
             twfy_debug ('MP', "Can't display an MP, as submitted postcode didn't match a constituency");
-       } else {
+       }
+       else {
             $MEMBER = new MEMBER(array('constituency' => $constituency));
             if ($MEMBER->person_id()) {
                 // This will cookie the postcode.
@@ -25,7 +29,8 @@ 
                 header('Location: /rss/mp/' . $MEMBER->person_id() . '.rdf');
             }
         }
-    } else {
+    }
+    else {
         $errors['pc'] = "Sorry, " . _htmlentities($pc) . " isn't a valid postcode";
         twfy_debug ('MP', "Can't display an MP because the submitted postcode wasn't of a valid form.");
     }

www/docs/freeourbills/doshare.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
     <?php
 }
 
-$PAGE->block_start(array ('title'=>'Share the \'Free our Bills!\' campaign'));
+$PAGE->block_start(array('title'=>'Share the \'Free our Bills!\' campaign'));
 freeourbills_styles();
 
 freeourbills_share_page();
@@ -25,4 +25,4 @@ 
 
 $PAGE->block_end();
 $PAGE->stripe_end();
-$PAGE->page_end ();
+$PAGE->page_end();

www/docs/freeourbills/techy.php

Spacing +1 added lines, -1 removed lines

@@ -144,4 +144,4 @@
 <?php
 #$PAGE->block_end();
 $PAGE->stripe_end();
-$PAGE->page_end ();
+$PAGE->page_end();

www/docs/freeourbills/index.php

Spacing +1 added lines, -1 removed lines

@@ -138,4 +138,4 @@
     'type' => 'html',
     'content' => '<p align="center"><img title="Duck-billed platypus" src="bill3.jpg" alt="" hspace="10"></p>'
 )));
-$PAGE->page_end ();
+$PAGE->page_end();

www/docs/search/rss/index.php

Braces +3 added lines, -2 removed lines

@@ -44,8 +44,9 @@
         $pagetitle .= " page $pagenum";
     }
     $num = get_http_var('n');
-    if (!is_numeric($num) || $num <= 0)
-        $num = 20;
+    if (!is_numeric($num) || $num <= 0) {
+            $num = 20;
+    }
 
     $DATA->set_page_metadata($this_page, 'title', $pagetitle);
 

Spacing +3 added lines, -3 removed lines

@@ -2,8 +2,8 @@ 
 # vim:sw=4:ts=4:et:nowrap
 
 include_once '../../../includes/easyparliament/init.php';
-include_once INCLUDESPATH."easyparliament/member.php";
-include_once INCLUDESPATH."easyparliament/glossary.php";
+include_once INCLUDESPATH . "easyparliament/member.php";
+include_once INCLUDESPATH . "easyparliament/glossary.php";
 
 if (!DEVSITE) {
     header('Cache-Control: max-age=86400'); # Once a day
@@ -49,7 +49,7 @@ 
 
     $DATA->set_page_metadata($this_page, 'title', $pagetitle);
 
-    $args = array (
+    $args = array(
         's' => $searchstring,
         'p' => $pagenum,
         'pop' => 1,