mysociety / theyworkforyou

classes/Homepage.php

Spacing +10 added lines, -10 removed lines

@@ -57,14 +57,14 @@ 
         $gid = $featured->get_gid();
         $gidCheck = new Gid($gid);
         $gid = $gidCheck->checkForRedirect();
-        if ( $gid ) {
+        if ($gid) {
             $title = $featured->get_title();
             $context = $featured->get_context();
             $related = $featured->get_related();
             $item = $this->getFeaturedDebate($gid, $title, $context, $related);
         } else {
             $item = $debatelist->display('recent_debates', array('days' => 7, 'num' => 1), 'none');
-            if ( isset($item['data']) && count($item['data']) ) {
+            if (isset($item['data']) && count($item['data'])) {
                 $item = $item['data'][0];
                 $more_url = new Url('debates');
                 $item['more_url'] = $more_url->generate();
@@ -95,8 +95,8 @@ 
         $item['featured'] = true;
 
         $related_debates = array();
-        foreach ( $related as $related_gid ) {
-            if ( $related_gid ) {
+        foreach ($related as $related_gid) {
+            if ($related_gid) {
                 $related_item = $debatelist->display('featured_gid', array('gid' => $related_gid), 'none');
                 $related_debates[] = $related_item['data'];
             }
@@ -121,21 +121,21 @@ 
 
         $recent_content = array();
 
-        foreach ( $this->recent_types as $class => $recent ) {
+        foreach ($this->recent_types as $class => $recent) {
             $class = "\\$class";
             $instance = new $class();
             $more_url = new Url($recent[1]);
-            if ( $recent[0] == 'recent_pbc_debates' ) {
-                $content = array( 'data' => $instance->display($recent[0], array('num' => 5), 'none') );
+            if ($recent[0] == 'recent_pbc_debates') {
+                $content = array('data' => $instance->display($recent[0], array('num' => 5), 'none'));
             } else {
                 $content = $instance->display($recent[0], array('days' => 7, 'num' => 1), 'none');
-                if ( isset($content['data']) && count($content['data']) ) {
+                if (isset($content['data']) && count($content['data'])) {
                     $content = $content['data'][0];
                 } else {
                     $content = array();
                 }
             }
-            if ( $content ) {
+            if ($content) {
                 $content['more_url'] = $more_url->generate();
                 $content['desc'] = $recent[2];
                 $recent_content[] = $content;
@@ -154,7 +154,7 @@ 
             WHERE event_date >= :date
             AND deleted = 0
             ORDER BY event_date, chamber, pos",
-            array( ':date' => $date )
+            array(':date' => $date)
         );
 
         if (!$q->rows()) {

Braces +12 added lines, -6 removed lines

@@ -62,7 +62,8 @@ 
             $context = $featured->get_context();
             $related = $featured->get_related();
             $item = $this->getFeaturedDebate($gid, $title, $context, $related);
-        } else {
+        }
+        else {
             $item = $debatelist->display('recent_debates', array('days' => 7, 'num' => 1), 'none');
             if ( isset($item['data']) && count($item['data']) ) {
                 $item = $item['data'][0];
@@ -71,7 +72,8 @@ 
                 $item['desc'] = 'Commons Debates';
                 $item['related'] = array();
                 $item['featured'] = false;
-            } else {
+            }
+            else {
                 $item = array();
             }
         }
@@ -82,9 +84,11 @@ 
     public function getFeaturedDebate($gid, $title, $context, $related) {
         if (strpos($gid, 'lords') !== false) {
             $debatelist = new \LORDSDEBATELIST;
-        } elseif (strpos($gid, 'westminhall') !== false) {
+        }
+        elseif (strpos($gid, 'westminhall') !== false) {
             $debatelist = new \WHALLLIST;
-        } else {
+        }
+        else {
             $debatelist = new \DEBATELIST;
         }
 
@@ -127,11 +131,13 @@ 
             $more_url = new Url($recent[1]);
             if ( $recent[0] == 'recent_pbc_debates' ) {
                 $content = array( 'data' => $instance->display($recent[0], array('num' => 5), 'none') );
-            } else {
+            }
+            else {
                 $content = $instance->display($recent[0], array('days' => 7, 'num' => 1), 'none');
                 if ( isset($content['data']) && count($content['data']) ) {
                     $content = $content['data'][0];
-                } else {
+                }
+                else {
                     $content = array();
                 }
             }

www/includes/utility.php

Doc Comments +23 added lines

@@ -318,6 +318,9 @@ 
 $format_date_months = array('', 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December');
 $format_date_months_short = array('', 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
 
+/**
+ * @param string $format
+ */
 function format_date($date, $format) {
     global $format_date_months, $format_date_months_short;
     // Pass it a date (YYYY-MM-DD) and a
@@ -342,6 +345,9 @@ 
 }
 
 
+/**
+ * @param string $format
+ */
 function format_time($time, $format) {
     // Pass it a time (HH:MM:SS) and a
     // PHP date format string (eg, "H:i")
@@ -486,6 +492,7 @@ 
 
 /**
  * Filters user input to remove unwanted HTML tags etc
+ * @param string $filter_type
  */
 function filter_user_input($text, $filter_type) {
     // We use this to filter any major user input, especially comments.
@@ -750,12 +757,18 @@ 
 /* verp_envelope_sender RECIPIENT
  * Construct a VERP envelope sender for an email to RECIPIENT
  */
+/**
+ * @return string|null
+ */
 function twfy_verp_envelope_sender($recipient) {
     $envelope_sender = verp_envelope_sender($recipient, 'twfy', EMAILDOMAIN);
 
     return $envelope_sender;
 }
 
+/**
+ * @param string $message
+ */
 function send_email($to, $subject, $message, $bulk = false, $from = '', $want_bounces = false) {
     // Use this rather than PHP's mail() direct, so we can make alterations
     // easily to all the emails we send out from the site.
@@ -814,6 +827,9 @@ 
 }
 
 // Call this with a key name to get a COOKIE variable.
+/**
+ * @param string $name
+ */
 function get_cookie_var($name, $default='') {
     if (array_key_exists($name, $_COOKIE)) {
         return clean_var($_COOKIE[$name]);
@@ -1058,6 +1074,10 @@ 
     }
 }
 
+/**
+ * @param integer $major
+ * @param MySociety\TheyWorkForYou\Url $LISTURL
+ */
 function _major_summary_title($major, $data, $LISTURL, $daytext) {
     global $hansardmajors;
 
@@ -1107,6 +1127,9 @@ 
     return $return;
 }
 
+/**
+ * @param string|null $url
+ */
 function redirect($url) {
     if (defined('TESTING')) {
         print "Location: $url";

classes/Utility/Hansard.php

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,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) {
@@ -30,13 +30,13 @@ 
 
 
     public static function gid_to_url($gid) {
-        if ( !$gid ) {
+        if (!$gid) {
             return '';
         }
         global $hansardmajors;
         $db = new \ParlDB();
 
-        $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", array( ':gid' => $gid ));
+        $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", array(':gid' => $gid));
         $url_gid = fix_gid_from_db($gid);
         $url = new \MySociety\TheyWorkForYou\Url($hansardmajors[$q->field(0, 'major')]['page']);
         $url->insert(array('id' => $url_gid));

classes/SectionView/NiView.php

Spacing +8 added lines, -8 removed lines

@@ -32,7 +32,7 @@ 
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'ni' )
+            array('section' => 'ni')
         );
     }
 
@@ -52,23 +52,23 @@ 
 
         $debates = $DEBATELIST->display('recent_debates', array('days' => 30, 'num' => 6), 'none');
         $MOREURL = new \MySociety\TheyWorkForYou\Url('nidebatesfront');
-        $MOREURL->insert( array( 'more' => 1 ) );
+        $MOREURL->insert(array('more' => 1));
 
         // this makes sure that we don't repeat this debate in the list below
         $random_debate = NULL;
-        if ( isset($debates['data']) && count($debates['data']) ) {
+        if (isset($debates['data']) && count($debates['data'])) {
             $random_debate = $debates['data'][0];
         }
 
         $recent = array();
-        if ( isset($debates['data']) && count($debates['data']) ) {
+        if (isset($debates['data']) && count($debates['data'])) {
             // at the start of a session there may be less than 6
             // debates
             $max = 6;
-            if ( count($debates['data']) < 6 ) {
+            if (count($debates['data']) < 6) {
                 $max = count($debates['data']);
             }
-            for ( $i = 1; $i < $max; $i++ ) {
+            for ($i = 1; $i < $max; $i++) {
                 $debate = $debates['data'][$i];
                 $debate['desc'] = "Northern Ireland Assembly debates";
                 $debate['more_url'] = $MOREURL->generate();
@@ -77,7 +77,7 @@ 
         }
 
         $featured = array();
-        if ( $random_debate ) {
+        if ($random_debate) {
             $featured = $random_debate;
             $featured['more_url'] = $MOREURL->generate();
             $featured['desc'] = 'Northern Ireland Assembly debate';
@@ -86,7 +86,7 @@ 
         }
 
         $data['featured'] = $featured;
-        $data['debates'] = array( 'recent' => $recent);
+        $data['debates'] = array('recent' => $recent);
 
         $data['regional'] = $this->getMLAList();
         $data['template'] = 'ni/index';

classes/Url.php

Doc Comments +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
     /**
      * Remove Session Key/Value Pair
      *
-     * @param array $arr A list array of key names to remove
+     * @param string[] $arr A list array of key names to remove
      */
 
     public function remove($arr) {

Spacing +4 added lines, -4 removed lines

@@ -42,7 +42,7 @@ 
 
         // These stores an associative array of key/value pairs that
         // we'll want passed on to other pages.
-        $this->session_vars = array ();
+        $this->session_vars = array();
 
         // Prevent things using $DATA running if it hasn't been set, ie in testing
         if (isset($DATA)) {
@@ -93,7 +93,7 @@ 
 
     public function reset() {
         // Call this to remove all the session_vars.
-        $this->session_vars = array ();
+        $this->session_vars = array();
     }
 
     /**
@@ -162,11 +162,11 @@ 
      *                            override just one or two of them.
      */
 
-    public function generate($encode = "html", $overrideVars=array()) {
+    public function generate($encode = "html", $overrideVars = array()) {
 
         global $DATA;
 
-        $url_args = array ();
+        $url_args = array();
 
         foreach (array_merge($this->session_vars, $overrideVars) as $key => $var) {
             if (is_array($var)) {

Braces +8 added lines, -4 removed lines

@@ -173,18 +173,22 @@
                 foreach ($var as $v) {
                     $url_args[] = "$key=" . urlencode(stripslashes($v));
                 }
-            } elseif ($var != null)
-                $url_args[] = "$key=" . urlencode(stripslashes($var));
+            }
+            elseif ($var != null) {
+                            $url_args[] = "$key=" . urlencode(stripslashes($var));
+            }
         }
 
         $page_url = WEBPATH . $DATA->page_metadata($this->destinationpage, "url");
 
         if (sizeof($url_args) == 0) {
             return $page_url;
-        } else {
+        }
+        else {
             if ($encode == "html") {
                 return $page_url . "?" . implode("&", $url_args);
-            } elseif ($encode == "none" || $encode == "url") {
+            }
+            elseif ($encode == "none" || $encode == "url") {
                 return $page_url . "?" . implode("&", $url_args);
             }
         }

classes/Utility/LibFilter.php

Spacing +16 added lines, -16 removed lines

@@ -209,7 +209,7 @@ 
             }, $data);
 
         foreach (array_keys($this->tag_counts) as $tag) {
-            for ($i=0; $i<$this->tag_counts[$tag]; $i++) {
+            for ($i = 0; $i < $this->tag_counts[$tag]; $i++) {
                 $data .= "</$tag>";
             }
         }
@@ -228,7 +228,7 @@ 
                 if (!in_array($name, $this->no_close)) {
                     if (isset($this->tag_counts[$name])) {
                         $this->tag_counts[$name]--;
-                        return '</'.$name.'>';
+                        return '</' . $name . '>';
                     }
                 }
             } else {
@@ -244,9 +244,9 @@ 
             $ending = $matches[3];
             if (in_array($name, array_keys($this->allowed))) {
                 $params = "";
-                preg_match_all("/([a-z0-9]+)=([\"'])(.*?)\\2/si", $body, $matches_2, PREG_SET_ORDER);		# <foo a="b" />
-                preg_match_all("/([a-z0-9]+)(=)([^\"\s']+)/si", $body, $matches_1, PREG_SET_ORDER);		# <foo a=b />
-                preg_match_all("/([a-z0-9]+)=([\"'])([^\"']*?)\s*$/si", $body, $matches_3, PREG_SET_ORDER);	# <foo a="b />
+                preg_match_all("/([a-z0-9]+)=([\"'])(.*?)\\2/si", $body, $matches_2, PREG_SET_ORDER); # <foo a="b" />
+                preg_match_all("/([a-z0-9]+)(=)([^\"\s']+)/si", $body, $matches_1, PREG_SET_ORDER); # <foo a=b />
+                preg_match_all("/([a-z0-9]+)=([\"'])([^\"']*?)\s*$/si", $body, $matches_3, PREG_SET_ORDER); # <foo a="b />
                 $matches = array_merge($matches_1, $matches_2, $matches_3);
 
                 foreach ($matches as $match) {
@@ -275,7 +275,7 @@ 
                 if ($ending) {
                     $ending = ' /';
                 }
-                return '<'.$name.$params.$ending.'>';
+                return '<' . $name . $params . $ending . '>';
             } else {
                 return '';
             }
@@ -286,7 +286,7 @@ 
             if ($this->strip_comments) {
                 return '';
             } else {
-                return '<'.$data.'>';
+                return '<' . $data . '>';
             }
         }
 
@@ -302,7 +302,7 @@ 
 
         if (preg_match("/^([^:]+)\:/si", $data, $matches)) {
             if (!in_array($matches[1], $this->allowed_protocols)) {
-                $data = '#'.substr($data, strlen($matches[1])+1);
+                $data = '#' . substr($data, strlen($matches[1]) + 1);
             }
         }
 
@@ -352,7 +352,7 @@ 
         # if there are less than 5, just allow it as-is
         #
 
-        if (strlen($data_notags)<5) {
+        if (strlen($data_notags) < 5) {
             return $data;
         }
 
@@ -397,7 +397,7 @@ 
             $data
         );
 
-        return $m[1].$data.$m[3];
+        return $m[1] . $data . $m[3];
     }
 
     #####################################################################################
@@ -474,7 +474,7 @@ 
 
 
 
-        return $m[1].$m[2].$m[3];
+        return $m[1] . $m[2] . $m[3];
     }
 
 
@@ -496,7 +496,7 @@ 
 
         if ($term != ';') {
 
-            return '&amp;'.$preamble;
+            return '&amp;' . $preamble;
         }
 
         #
@@ -505,7 +505,7 @@ 
 
         if ($this->is_valid_entity($preamble)) {
 
-            return '&'.$preamble;
+            return '&' . $preamble;
         }
 
 
@@ -513,7 +513,7 @@ 
         # not an allowed antity, so escape the ampersand
         #
 
-        return '&amp;'.$preamble;
+        return '&amp;' . $preamble;
     }
 
 
@@ -562,7 +562,7 @@ 
     # inside strings. within general text, we decode hex/dec entities.
     #
 
-    public function decode_entities($data, $in_attribute=1) {
+    public function decode_entities($data, $in_attribute = 1) {
 
         $data = preg_replace_callback('!(&)#(\d+);?!', array($this, 'decode_dec_entity'), $data);
         $data = preg_replace_callback('!(&)#x([0-9a-f]+);?!i', array($this, 'decode_hex_entity'), $data);
@@ -603,7 +603,7 @@ 
         #
 
         if ($d > 127) {
-            if ($orig_type == '%') { return '%'.dechex($d); }
+            if ($orig_type == '%') { return '%' . dechex($d); }
             if ($orig_type == '&') { return "&#$d;"; }
         }
 

Braces +13 added lines, -6 removed lines

@@ -177,7 +177,8 @@ 
             $data = preg_replace("/<([^>]*?)(?=<|$)/", "<$1>", $data);
             $data = preg_replace("/(^|>)([^<]*?)(?=>)/", "$1<$2", $data);
 
-        } else {
+        }
+        else {
 
             #
             # escape stray brackets
@@ -231,7 +232,8 @@ 
                         return '</'.$name.'>';
                     }
                 }
-            } else {
+            }
+            else {
                 return '';
             }
         }
@@ -268,7 +270,8 @@ 
                 if (!$ending) {
                     if (isset($this->tag_counts[$name])) {
                         $this->tag_counts[$name]++;
-                    } else {
+                    }
+                    else {
                         $this->tag_counts[$name] = 1;
                     }
                 }
@@ -276,7 +279,8 @@ 
                     $ending = ' /';
                 }
                 return '<'.$name.$params.$ending.'>';
-            } else {
+            }
+            else {
                 return '';
             }
         }
@@ -285,7 +289,8 @@ 
         if (preg_match("/^!--(.*)--$/si", $data)) {
             if ($this->strip_comments) {
                 return '';
-            } else {
+            }
+            else {
                 return '<'.$data.'>';
             }
         }
@@ -324,7 +329,9 @@ 
             while (1) {
                 $len = strlen($data);
                 $data = preg_replace("/<({$tags})(\s[^>]*)?(><\\/\\1>|\\/>)/", '', $data);
-                if ($len == strlen($data)) break;
+                if ($len == strlen($data)) {
+                    break;
+                }
             }
         }
 

www/includes/easyparliament/templates/html/hansard_recent_mostvotes.php

Braces +2 added lines, -1 removed lines

@@ -32,7 +32,8 @@
             $URL = new \MySociety\TheyWorkForYou\Url('member');
             $URL->insert(array('id'=>$row['speaker']['member_id']));
             $member = '<a href="' . $URL->generate() . '">' . $row['speaker']['name'] . '</a>: ';
-        } else {
+        }
+        else {
             $member = '';
         }
         ?>

www/includes/easyparliament/templates/html/hansard_search.php

Spacing +4 added lines, -4 removed lines

@@ -66,7 +66,7 @@ 
 if (isset ($data['rows']) && count($data['rows']) > 0) {
 
     echo '<dl id="searchresults">';
-    for ($i=0; $i<count($data['rows']); $i++) {
+    for ($i = 0; $i < count($data['rows']); $i++) {
 
         $row = $data['rows'][$i];
         echo '<dt><a href="', $row['listurl'], '">';
@@ -79,14 +79,14 @@ 
         }
         if (isset($row['collapsed']) && $row['collapsed'] && $row['subsection_id']) {
             $URL = new \MySociety\TheyWorkForYou\Url('search');
-            $URL->insert(array('s' => $info['s'] . " segment:$row[subsection_id]" ));
+            $URL->insert(array('s' => $info['s'] . " segment:$row[subsection_id]"));
             echo ' <a href="', $URL->generate(), '">See ', $row['collapsed'],
-            ' other result', $row['collapsed']>1?'s':'', ' from this ',
+            ' other result', $row['collapsed'] > 1 ? 's' : '', ' from this ',
             $hansardmajors[$row['major']]['singular'], '</a>';
         }
         echo '</small>';
         if ($match = get_http_var('match')) {
-            echo ' &ndash; <a href="/search/record.php?result=', $row['gid'] , '&amp;match=', _htmlspecialchars($match), '">This is the correct match</a>';
+            echo ' &ndash; <a href="/search/record.php?result=', $row['gid'], '&amp;match=', _htmlspecialchars($match), '">This is the correct match</a>';
         }
         echo '</dt> <dd><p>';
         if (isset($row['speaker']) && count($row['speaker'])) {

www/includes/easyparliament/page.php

Spacing +39 added lines, -39 removed lines

@@ -19,7 +19,7 @@ 
     public $within_stripe_sidebar = false;
 
     public function page_start() {
-        if ( !$this->page_started() ) {
+        if (!$this->page_started()) {
             $this->checkForAdmin();
             $this->displayHeader();
         }
@@ -32,7 +32,7 @@ 
 
         $data = $h->data;
         $data = array_merge($u->data, $data);
-        if ( isset($page_errors) ) {
+        if (isset($page_errors)) {
             $data['page_errors'] = $page_errors;
         }
         $data['banner_text'] = '';
@@ -52,7 +52,7 @@ 
                 $THISPAGE = new \MySociety\TheyWorkForYou\Url($this_page);
 
                 $LOGINURL = new \MySociety\TheyWorkForYou\Url('userlogin');
-                $LOGINURL->insert(array('ret' => $THISPAGE->generate('none') ));
+                $LOGINURL->insert(array('ret' => $THISPAGE->generate('none')));
 
                 $text = "<a href=\"" . $LOGINURL->generate() . "\">You'd better sign in!</a>";
             } else {
@@ -67,7 +67,7 @@ 
     }
 
     public function page_end() {
-        if ( !$this->page_started() ) {
+        if (!$this->page_started()) {
             $this->page_start();
         }
 
@@ -101,7 +101,7 @@ 
         }
     }
 
-    public function stripe_start($type='side', $id='', $extra_class = '') {
+    public function stripe_start($type = 'side', $id = '', $extra_class = '') {
         // $type is one of:
         //  'full' - a full width div
         //  'side' - a white stripe with a coloured sidebar.
@@ -131,7 +131,7 @@ 
     }
 
 
-    public function stripe_end ($contents = array(), $extra = '') {
+    public function stripe_end($contents = array(), $extra = '') {
         // $contents is an array containing 0 or more hashes.
         // Each hash has two values, 'type' and 'content'.
         // 'Type' could be one of these:
@@ -234,7 +234,7 @@ 
     public function include_sidebar_template($sidebarname) {
         global $this_page, $DATA;
 
-            $sidebarpath = INCLUDESPATH.'easyparliament/sidebars/'.$sidebarname.'.php';
+            $sidebarpath = INCLUDESPATH . 'easyparliament/sidebars/' . $sidebarname . '.php';
 
             if (file_exists($sidebarpath)) {
                 include $sidebarpath;
@@ -242,7 +242,7 @@ 
     }
 
 
-    public function block_start($data=array()) {
+    public function block_start($data = array()) {
         // Starts a 'block' div, used mostly on the home page,
         // on the MP page, and in the sidebars.
         // $data is a hash like this:
@@ -389,7 +389,7 @@ 
         if (is_string($message)) {
             // Sometimes we're just sending a single line to this function
             // rather like the bigger array...
-            $message = array (
+            $message = array(
                 'text' => $message
             );
         }
@@ -397,13 +397,13 @@ 
         // if the page has started then we're most likely in an old school page
         // so we should just print out the error, otherwise stick it in the error
         // global which will then be displayed by the header template
-        if ( $this->page_started() ) {
+        if ($this->page_started()) {
             $this->message($message, 'error');
         } else {
-            if ( !isset($page_errors) ) {
+            if (!isset($page_errors)) {
                 $page_errors = array();
             }
-            $page_errors[]  = $message;
+            $page_errors[] = $message;
         }
 
         if ($fatal) {
@@ -420,7 +420,7 @@ 
     }
 
 
-    public function message($message, $class='') {
+    public function message($message, $class = '') {
         // Generates a very simple but common page content.
         // Used for when a user logs out, or votes, or any simple thing
         // where there's a little message and probably a link elsewhere.
@@ -498,7 +498,7 @@ 
             if ($page_title != '') {
                 $page_title .= ': ';
             }
-            $page_title .= format_date ($info['date'], SHORTDATEFORMAT);
+            $page_title .= format_date($info['date'], SHORTDATEFORMAT);
         }
 
         if ($page_title != '') {
@@ -553,7 +553,7 @@ 
 
         if (isset($nextprev['up'])) {
 
-            $uplink = '<span class="up"><a href="' .  $nextprev['up']['url'] . '" title="' . $nextprev['up']['title'] . '">' . $nextprev['up']['body'] . '</a>';
+            $uplink = '<span class="up"><a href="' . $nextprev['up']['url'] . '" title="' . $nextprev['up']['title'] . '">' . $nextprev['up']['body'] . '</a>';
             if (get_http_var('s')) {
                 $URL = new \MySociety\TheyWorkForYou\Url($this_page);
                 $uplink .= '<br><a href="' . $URL->generate() . '">Remove highlighting</a>';
@@ -568,7 +568,7 @@ 
             $next = $nextprev['next'];
 
             if (isset($next['url'])) {
-                $nextlink = '<a href="' .  $next['url'] . '" title="' . $next['title'] . '" class="linkbutton">' . $next['body'] . ' &raquo;</a>';
+                $nextlink = '<a href="' . $next['url'] . '" title="' . $next['title'] . '" class="linkbutton">' . $next['body'] . ' &raquo;</a>';
             } else {
                 $nextlink = $next['body'] . ' &raquo;';
             }
@@ -585,7 +585,7 @@ 
     }
 
 
-    public function search_form($value='') {
+    public function search_form($value = '') {
         global $SEARCHENGINE;
         // Search box on the search page.
         // If $value is set then it will be displayed in the form.
@@ -615,7 +615,7 @@ 
             }
 
         echo '<div class="mainsearchbox">';
-        if ($wtt<2) {
+        if ($wtt < 2) {
                 echo '<form action="', $URL->generate(), '" method="get">';
                 if (get_http_var('o')) {
                     echo '<input type="hidden" name="o" value="', _htmlentities(get_http_var('o')), '">';
@@ -624,7 +624,7 @@ 
                     echo '<input type="hidden" name="house" value="', _htmlentities(get_http_var('house')), '">';
                 }
                 echo '<input type="text" name="q" value="', _htmlentities($value), '" size="50"> ';
-                echo '<input type="submit" value=" ', ($wtt?'Modify search':'Search'), ' ">';
+                echo '<input type="submit" value=" ', ($wtt ? 'Modify search' : 'Search'), ' ">';
                 $URL = new \MySociety\TheyWorkForYou\Url('search');
             $URL->insert(array('adv' => 1));
                 echo '&nbsp;&nbsp; <a href="' . $URL->generate() . '">More&nbsp;options</a>';
@@ -646,16 +646,16 @@ 
                     $ordering = 'd';
                 }
 
-                if ($ordering=='r') {
+                if ($ordering == 'r') {
                 print '<strong>Sorted by relevance</strong>';
                 } else {
                 printf("<a href='%s'>Sort by relevance</a>", $orderUrl->generate('html', array('o'=>'r')));
                 }
 
                 print "&nbsp;|&nbsp;";
-                if ($ordering=='d') {
+                if ($ordering == 'd') {
                 print '<strong>Sorted by date: newest</strong> / <a href="' . $orderUrl->generate('html', array('o'=>'o')) . '">oldest</a>';
-                } elseif ($ordering=='o') {
+                } elseif ($ordering == 'o') {
                 print '<strong>Sorted by date:</strong> <a href="' . $orderUrl->generate('html', array('o'=>'d')) . '">newest</a> / <strong>oldest</strong>';
                 } else {
                 printf("Sort by date: <a href='%s'>newest</a> / <a href='%s'>oldest</a>",
@@ -663,7 +663,7 @@ 
                 }
 
             print "&nbsp;|&nbsp;";
-            if ($ordering=='p') {
+            if ($ordering == 'p') {
                 print '<strong>Use by person</strong>';
             } else {
                 printf('<a href="%s">Show use by person</a>', $orderUrl->generate('html', array('o'=>'p')));
@@ -687,7 +687,7 @@ 
         include_once INCLUDESPATH . 'easyparliament/templates/html/search_advanced.php';
     }
 
-    public function login_form ($errors = array()) {
+    public function login_form($errors = array()) {
         // Used for /user/login/ and /user/prompt/
         // $errors is a hash of potential errors from a previous log in attempt.
         ?>
@@ -791,7 +791,7 @@ 
     public function glossary_atoz(&$GLOSSARY) {
     // Print out a nice list of lettered links to glossary pages
 
-        $letters = array ();
+        $letters = array();
 
         foreach ($GLOSSARY->alphabet as $letter => $eps) {
             // if we're writing out the current letter (list or item)
@@ -824,14 +824,14 @@ 
                     <div class="letters">
                         <ul>
     <?php
-        for ($n=0; $n<13; $n++) {
+        for ($n = 0; $n < 13; $n++) {
             print $letters[$n];
         }
         ?>
                         </ul>
                         <ul>
     <?php
-        for ($n=13; $n<26; $n++) {
+        for ($n = 13; $n < 26; $n++) {
             print $letters[$n];
         }
         ?>
@@ -850,12 +850,12 @@ 
 
         // add some extra controls for the administrators
         if ($this_page == "admin_glossary") {
-            print "<a id=\"gl".$term['glossary_id']."\"></a>";
+            print "<a id=\"gl" . $term['glossary_id'] . "\"></a>";
             print "<h3>" . $term['title'] . "</h3>";
             $URL = new \MySociety\TheyWorkForYou\Url('admin_glossary');
             $URL->insert(array("delete_confirm" => $term['glossary_id']));
             $delete_url = $URL->generate();
-            $admin_links = "<br><small><a href=\"".$delete_url."\">delete</a></small>";
+            $admin_links = "<br><small><a href=\"" . $delete_url . "\">delete</a></small>";
         }
         else {
             $admin_links = "";
@@ -878,9 +878,9 @@ 
             // Add a direct search link for current glossary item
             $URL = new \MySociety\TheyWorkForYou\Url('search');
             // remember to quote the term for phrase matching in search
-            $URL->insert(array('s' => '"'.$term['title'].'"'));
+            $URL->insert(array('s' => '"' . $term['title'] . '"'));
             $search_url = $URL->generate();
-            printf ("\t\t\t\t<p>Search hansard for \"<a href=\"%s\" title=\"View search results for this glossary item\">%s</a>\"</p>", $search_url, $term['title']);
+            printf("\t\t\t\t<p>Search hansard for \"<a href=\"%s\" title=\"View search results for this glossary item\">%s</a>\"</p>", $search_url, $term['title']);
         }
     }
 
@@ -955,7 +955,7 @@ 
 
             // Generate all the page links.
             $URL = new \MySociety\TheyWorkForYou\Url($this_page);
-            $URL->insert( array('wtt' => get_http_var('wtt')) );
+            $URL->insert(array('wtt' => get_http_var('wtt')));
             if (isset($pagedata['s'])) {
                 # XXX: Should be taken out in *one* place, not here + search_form etc.
                 $value = $pagedata['s'];
@@ -1093,7 +1093,7 @@ 
 
                 $body = trim_characters($report['body'], 0, 40);
 
-                $tabledata['rows'][] = array (
+                $tabledata['rows'][] = array(
                     _htmlentities($report['firstname'] . ' ' . $report['lastname']),
                     _htmlentities($body),
                     $report['reported'],
@@ -1124,13 +1124,13 @@ 
         // $page is the name of the page the dates should link to.
 
         // Create array containing abbreviations of days of week.
-        $daysOfWeek = array('Mon','Tue','Wed','Thu','Fri','Sat','Sun');
+        $daysOfWeek = array('Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun');
 
         // What is the first day of the month in question?
-        $firstDayOfMonth = mktime(0,0,0,$month,1,$year);
+        $firstDayOfMonth = mktime(0, 0, 0, $month, 1, $year);
 
         // How many days does this month contain?
-        $numberDays = date('t',$firstDayOfMonth);
+        $numberDays = date('t', $firstDayOfMonth);
 
         // Retrieve some information about the first day of the
         // month in question.
@@ -1211,7 +1211,7 @@ 
 
             // Is the $currentDay a member of $dateArray? If so,
             // the day should be linked.
-            if (in_array($currentDay,$dateArray)) {
+            if (in_array($currentDay, $dateArray)) {
 
                 $date = sprintf("%04d-%02d-%02d", $year, $month, $currentDay);
 
@@ -1312,8 +1312,8 @@ 
         // Returns HTML suitable for putting in the sidebar on Admin pages.
         global $this_page, $DATA;
 
-        $pages = array ('admin_home',
-                'admin_comments','admin_trackbacks', 'admin_searchlogs', 'admin_popularsearches', 'admin_failedsearches',
+        $pages = array('admin_home',
+                'admin_comments', 'admin_trackbacks', 'admin_searchlogs', 'admin_popularsearches', 'admin_failedsearches',
                 'alert_stats', 'admin_statistics', 'admin_reportstats',
                 'admin_commentreports', 'admin_glossary', 'admin_glossary_pending', 'admin_badusers',
                 'admin_photos', 'admin_mpurls', 'admin_policies', 'admin_banner', 'admin_featured', 'admin_topics'

Braces +78 added lines, -37 removed lines

@@ -55,7 +55,8 @@ 
                 $LOGINURL->insert(array('ret' => $THISPAGE->generate('none') ));
 
                 $text = "<a href=\"" . $LOGINURL->generate() . "\">You'd better sign in!</a>";
-            } else {
+            }
+            else {
                 $text = "That's all folks!";
             }
             $this_page = 'home';
@@ -88,7 +89,8 @@ 
     public function within_stripe() {
         if ($this->within_stripe_main == true || $this->within_stripe_sidebar == true) {
             return true;
-        } else {
+        }
+        else {
             return false;
         }
     }
@@ -96,7 +98,8 @@ 
     public function within_stripe_sidebar() {
         if ($this->within_stripe_sidebar == true) {
             return true;
-        } else {
+        }
+        else {
             return false;
         }
     }
@@ -114,7 +117,10 @@ 
         //  'foot' - For the bottom stripe on hansard debates/wrans listings.
         // $id is the value of an id for this div (if blank, not used).
         ?>
-        <div class="stripe-<?php echo $type; ?><?php if ($extra_class != '') echo ' ' . $extra_class; ?>"<?php
+        <div class="stripe-<?php echo $type; ?><?php if ($extra_class != '') {
+    echo ' ' . $extra_class;
+}
+?>"<?php
         if ($id != '') {
             print ' id="' . $id . '"';
         }
@@ -192,20 +198,24 @@ 
 
         if (count($contents) == 0) {
             print "\t\t\t&nbsp;\n";
-        } else {
+        }
+        else {
             #print '<div class="sidebar">';
             foreach ($contents as $hash) {
                 if (isset($hash['type'])) {
                     if ($hash['type'] == 'include') {
                         $this->include_sidebar_template($hash['content']);
 
-                    } elseif ($hash['type'] == 'nextprev') {
+                    }
+                    elseif ($hash['type'] == 'nextprev') {
                         $this->nextprevlinks();
 
-                    } elseif ($hash['type'] == 'html') {
+                    }
+                    elseif ($hash['type'] == 'html') {
                         print $hash['content'];
 
-                    } elseif ($hash['type'] == 'extrahtml') {
+                    }
+                    elseif ($hash['type'] == 'extrahtml') {
                         $extrahtml .= $hash['content'];
                     }
                 }
@@ -256,7 +266,8 @@ 
 
         if (isset($data['id']) && $data['id'] != '') {
             $id = ' id="' . $data['id'] . '"';
-        } else {
+        }
+        else {
             $id = '';
         }
 
@@ -304,7 +315,8 @@ 
             // This is the page title of the parent.
             $section_text = $DATA->page_metadata($parent_page, 'title');
 
-        } else {
+        }
+        else {
             // Top level page - no parent, hence no parental title.
             $section_text = '';
         }
@@ -318,7 +330,8 @@ 
 
         if ($page_text == '' && !is_bool($page_text)) {
             // If the metadata 'heading' is set, but empty, we display nothing.
-        } elseif ($page_text == false) {
+        }
+        elseif ($page_text == false) {
             // But if it just hasn't been set, we use the 'title'.
             $page_text = $DATA->page_metadata($this_page, "title");
         }
@@ -326,7 +339,8 @@ 
         if ($page_text == $section_text) {
             // We don't want to print both.
             $section_text = '';
-        } elseif (!$page_text && $section_text) {
+        }
+        elseif (!$page_text && $section_text) {
             // Bodge for if we have a section_text but no page_text.
             $page_text = $section_text;
             $section_text = '';
@@ -340,7 +354,8 @@ 
                     print "\n\t\t\t\t<br><span>$page_text</span>\n";
                 }
                 print "</h1>\n";
-            } elseif ($page_text) {
+            }
+            elseif ($page_text) {
                 print "\t\t\t\t<h1>$page_text</h1>\n";
             }
         }
@@ -399,7 +414,8 @@ 
         // global which will then be displayed by the header template
         if ( $this->page_started() ) {
             $this->message($message, 'error');
-        } else {
+        }
+        else {
             if ( !isset($page_errors) ) {
                 $page_errors = array();
             }
@@ -479,7 +495,9 @@ 
 
         global $DATA, $this_page;
 
-        if ($this->page_started()) return;
+        if ($this->page_started()) {
+            return;
+        }
         // The page's HTML hasn't been started yet, so we'd better do it.
 
         // Set the page title (in the <title></title>).
@@ -487,7 +505,8 @@ 
 
         if (isset($info['text_heading'])) {
             $page_title = $info['text_heading'];
-        } elseif (isset($info['text'])) {
+        }
+        elseif (isset($info['text'])) {
             // Use a truncated version of the page's main item's body text.
             // trim_words() is in utility.php. Trim to 40 chars.
             $page_title = trim_characters($info['text'], 0, 40);
@@ -539,7 +558,8 @@ 
             if (isset($prev['url'])) {
                 $prevlink = '<a href="' . $prev['url'] . '" title="' . $prev['title'] . '" class="linkbutton">&laquo; ' . $prev['body'] . '</a>';
 
-            } else {
+            }
+            else {
                 $prevlink = '&laquo; ' . $prev['body'];
             }
         }
@@ -569,7 +589,8 @@ 
 
             if (isset($next['url'])) {
                 $nextlink = '<a href="' .  $next['url'] . '" title="' . $next['title'] . '" class="linkbutton">' . $next['body'] . ' &raquo;</a>';
-            } else {
+            }
+            else {
                 $nextlink = $next['body'] . ' &raquo;';
             }
         }
@@ -599,7 +620,8 @@ 
         if ($value == '') {
             if (get_http_var('q') !== '') {
                 $value = get_http_var('q');
-            } else {
+            }
+            else {
                 $value = get_http_var('s');
             }
         }
@@ -629,8 +651,11 @@ 
             $URL->insert(array('adv' => 1));
                 echo '&nbsp;&nbsp; <a href="' . $URL->generate() . '">More&nbsp;options</a>';
                 echo '<br>';
-                if ($wtt) print '<input type="hidden" name="wtt" value="1">';
-        } else { ?>
+                if ($wtt) {
+                    print '<input type="hidden" name="wtt" value="1">';
+                }
+        }
+        else { ?>
     <form action="http://www.writetothem.com/lords" method="get">
     <input type="hidden" name="pid" value="<?=_htmlentities(get_http_var('pid')) ?>">
     <input type="submit" style="font-size: 150%" value=" I want to write to this Lord "><br>
@@ -648,16 +673,19 @@ 
 
                 if ($ordering=='r') {
                 print '<strong>Sorted by relevance</strong>';
-                } else {
+                }
+                else {
                 printf("<a href='%s'>Sort by relevance</a>", $orderUrl->generate('html', array('o'=>'r')));
                 }
 
                 print "&nbsp;|&nbsp;";
                 if ($ordering=='d') {
                 print '<strong>Sorted by date: newest</strong> / <a href="' . $orderUrl->generate('html', array('o'=>'o')) . '">oldest</a>';
-                } elseif ($ordering=='o') {
+                }
+                elseif ($ordering=='o') {
                 print '<strong>Sorted by date:</strong> <a href="' . $orderUrl->generate('html', array('o'=>'d')) . '">newest</a> / <strong>oldest</strong>';
-                } else {
+                }
+                else {
                 printf("Sort by date: <a href='%s'>newest</a> / <a href='%s'>oldest</a>",
                     $orderUrl->generate('html', array('o'=>'d')), $orderUrl->generate('html', array('o'=>'o')));
                 }
@@ -665,7 +693,8 @@ 
             print "&nbsp;|&nbsp;";
             if ($ordering=='p') {
                 print '<strong>Use by person</strong>';
-            } else {
+            }
+            else {
                 printf('<a href="%s">Show use by person</a>', $orderUrl->generate('html', array('o'=>'p')));
             }
             echo '</div>';
@@ -888,7 +917,8 @@ 
             if ($GLOSSARY->num_search_matches > 1) {
                 $plural = "them";
                 $definition = "some definitions";
-            } else {
+            }
+            else {
                 $plural = "it";
                 $definition = "a definition";
             }
@@ -941,7 +971,8 @@ 
             if ($page < 10) {
                 $firstpage = 1;
                 $lastpage = 10;
-            } else {
+            }
+            else {
                 $firstpage = $page - 10;
                 $lastpage = $page + 9;
             }
@@ -971,7 +1002,8 @@ 
 
                 if ($n > 1) {
                     $URL->insert(array('p'=>$n));
-                } else {
+                }
+                else {
                     // No page number for the first page.
                     $URL->remove(array('p'));
                 }
@@ -981,7 +1013,8 @@ 
 
                 if ($n != $page) {
                     $pagelinks[] = '<a href="' . $URL->generate() . '">' . $n . '</a>';
-                } else {
+                }
+                else {
                     $pagelinks[] = "<strong>$n</strong>";
                 }
             }
@@ -1028,7 +1061,8 @@ 
             $USERURL = new \MySociety\TheyWorkForYou\Url('userview');
             $USERURL->insert(array('id'=>$data['user_id']));
             $username = '<a href="' . $USERURL->generate() . '">' . _htmlentities($data['user_name']) . '</a>';
-        } else {
+        }
+        else {
             $username = _htmlentities($data['user_name']);
         }
         ?>
@@ -1043,7 +1077,8 @@ 
             ?>
                 <p>&nbsp;<br><em>This report has not been resolved.</em></p>
 <?php
-        } else {
+        }
+        else {
             ?>
                 <p><em>This report was resolved on <?php echo $data['resolved']; ?></em></p>
 <?php
@@ -1087,7 +1122,8 @@ 
                         'cid' => $report['comment_id'],
                     ));
                     $editlink = '<a href="' . $EDITURL->generate() . '">View</a>';
-                } else {
+                }
+                else {
                     $editlink = 'Locked';
                 }
 
@@ -1104,7 +1140,8 @@ 
 
             $this->display_table($tabledata);
 
-        } else {
+        }
+        else {
 
             print "<p>There are no outstanding annotation reports.</p>\n";
         }
@@ -1144,7 +1181,8 @@ 
         $nowDateComponents = getdate();
         if ($nowDateComponents['mon'] == $month && $nowDateComponents['year'] == $year) {
             $toDay = $nowDateComponents['mday'];
-        } else {
+        }
+        else {
             $toDay = '';
         }
 
@@ -1205,7 +1243,8 @@ 
             // If so, higlight it.
             if ($currentDay == $toDay) {
                 $calendar .= '<td class="on">';
-            } else {
+            }
+            else {
                 $calendar .= '<td>';
             }
 
@@ -1221,7 +1260,8 @@ 
 
                 // $currentDay is not a member of $dateArray.
 
-            } else {
+            }
+            else {
 
                 $calendar .= "$currentDay</td>";
             }
@@ -1327,7 +1367,8 @@ 
             if ($page != $this_page) {
                 $URL = new \MySociety\TheyWorkForYou\Url($page);
                 $title = '<a href="' . $URL->generate() . '">' . $title . '</a>';
-            } else {
+            }
+            else {
                 $title = '<strong>' . $title . '</strong>';
             }