mysociety / theyworkforyou

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

Spacing +2 added lines, -2 removed lines

@@ -77,7 +77,7 @@ 
         $USERURL->insert(array('u'=>$comment['user_id']));
         ?>
         <div class="comment">
-            <p><a href="<?php echo $USERURL->generate(); ?>" title="See information about this user"><strong><?php echo _htmlentities($comment['firstname']) .' '. _htmlentities($comment['lastname']); ?></strong></a><br>
+            <p><a href="<?php echo $USERURL->generate(); ?>" title="See information about this user"><strong><?php echo _htmlentities($comment['firstname']) . ' ' . _htmlentities($comment['lastname']); ?></strong></a><br>
 <?php
         // Make URLs into links and do <br>s.
         $body = prepare_comment_for_display($comment['body']); // In utility.php
@@ -105,7 +105,7 @@ 
         }
 
         if (($this_page != 'commentreport' &&
-            $this_page != 'addcomment'  &&
+            $this_page != 'addcomment' &&
             $this_page != 'admin_commentreport')
             && $THEUSER->is_able_to('reportcomment')
             && !$comment['modflagged']

Braces +14 added lines, -7 removed lines

@@ -39,13 +39,16 @@ 
     // If we're just previewing a comment, we passed in 'preview' => true.
     $subheading = 'Your annotation would look like this:';
 
-} elseif ($this_page == 'addcomment') {
+}
+elseif ($this_page == 'addcomment') {
     $subheading = 'Previous annotations';
 
-} elseif ($this_page == 'commentreport' || $this_page == 'admin_commentreport') {
+}
+elseif ($this_page == 'commentreport' || $this_page == 'admin_commentreport') {
     $subheading = "";
 
-} else {
+}
+else {
     $subheading = 'Annotations';
 }
 
@@ -69,7 +72,8 @@ 
         if (isset($comment['comment_id'])) {
             ?> id="c<?php echo $comment['comment_id']; ?>"><a name="c<?php echo $comment['comment_id']; ?>"></a>
 <?php
-        } else {
+        }
+        else {
             echo ">\n";
         }
 
@@ -99,7 +103,8 @@ 
             ?>
         <a href="<?php echo $comment['url']; ?>" title="Link to this annotation"><?php echo $time; ?></a>
 <?php
-        } else {
+        }
+        else {
             // There won't be a URL when we're just previewing a comment.
             echo "\t\t$time";
         }
@@ -124,7 +129,8 @@ 
         <a href="<?php echo $URL->generate(); ?>" title="Notify moderators that this annotation needs editing or deleting">Report this annotation</a>
 <?php
 
-        } elseif ($comment['modflagged']) {
+        }
+        elseif ($comment['modflagged']) {
             ?><br>
         This annotation has been reported
 <?php
@@ -139,7 +145,8 @@ 
 
     }
 
-} else {
+}
+else {
 
     ?>
     <p>No annotations</p>

www/includes/easyparliament/templates/api/hansard_calendar.php

Braces +2 added lines, -1 removed lines

@@ -13,6 +13,7 @@
         }
     }
     api_output($out);
-} else {
+}
+else {
     api_error('Please supply a year');
 }

www/includes/easyparliament/templates/api/comments.php

Spacing +3 added lines, -3 removed lines

@@ -82,7 +82,7 @@ 
         // COMMENT REPORTING LINK.
 
         if (($this_page != 'commentreport' &&
-            $this_page != 'addcomment'  &&
+            $this_page != 'addcomment' &&
             $this_page != 'admin_commentreport')
             && $THEUSER->is_able_to('reportcomment')
             && $THEUSER->user_id() != $comment['user_id']
@@ -117,7 +117,7 @@ 
         $date = format_date($date, SHORTDATEFORMAT);
         $time = format_time($time, TIMEFORMAT);
         ?>
-                    <p class="credit"><a href="<?php echo $USERURL->generate(); ?>" title="See information about this user"><strong><?php echo _htmlentities($comment['firstname']) .' '. _htmlentities($comment['lastname']); ?></strong></a><br>
+                    <p class="credit"><a href="<?php echo $USERURL->generate(); ?>" title="See information about this user"><strong><?php echo _htmlentities($comment['firstname']) . ' ' . _htmlentities($comment['lastname']); ?></strong></a><br>
                     <small>Posted on <?php echo $date;
 
         if (isset($comment['url'])) {
@@ -125,7 +125,7 @@ 
 
         } else {
             // There won't be a URL when we're just previewing a comment.
-            print ' '.$time;
+            print ' ' . $time;
         }
         ?> <?php echo $reporthtml; ?></small></p>
 

Braces +16 added lines, -8 removed lines

@@ -39,13 +39,16 @@ 
     // If we're just previewing a comment, we passed in 'preview' => true.
     $subheading = 'Your comment would look like this:';
 
-} elseif ($this_page == 'addcomment') {
+}
+elseif ($this_page == 'addcomment') {
     $subheading = 'Previous annotations';
 
-} elseif ($this_page == 'commentreport' || $this_page == 'admin_commentreport') {
+}
+elseif ($this_page == 'commentreport' || $this_page == 'admin_commentreport') {
     $subheading = "";
 
-} else {
+}
+else {
     $subheading = 'Annotations';
 }
 
@@ -70,7 +73,8 @@ 
 
         if (isset($comment['comment_id'])) {
             $id = 'c' . $comment['comment_id'];
-        } else {
+        }
+        else {
             $id = '';
         }
 
@@ -100,9 +104,11 @@ 
 
             $reporthtml = '(<a href="' . $URL->generate() . '" title="Notify moderators that this comment should be deleted">Report this comment</a>)';
 
-        } elseif ($comment['modflagged']) {
+        }
+        elseif ($comment['modflagged']) {
             $reporthtml = '(This comment has been reported to moderators)';
-        } else {
+        }
+        else {
             // When previewing a comment...
             $reporthtml = '';
         }
@@ -123,7 +129,8 @@ 
         if (isset($comment['url'])) {
             print ' <a href="' . $comment['url'] . '" title="Link to this comment">' . $time . '</a>';
 
-        } else {
+        }
+        else {
             // There won't be a URL when we're just previewing a comment.
             print ' '.$time;
         }
@@ -144,7 +151,8 @@ 
 <?php
     }
 
-} else {
+}
+else {
 
     ?>
                 <div class="comment">

www/includes/easyparliament/templates/api/comments_user.php

Braces +4 added lines, -2 removed lines

@@ -40,7 +40,8 @@ 
         // Get the name of the member whose epobject was commented upon (if any).
         if (isset($comment['speaker']) && $comment['speaker']['name'] != '') {
             $member_name = $comment['speaker']['name'] . ': ';
-        } else {
+        }
+        else {
             $member_name = '';
         }
 
@@ -61,7 +62,8 @@ 
     $PAGE->page_links($data);
     $PAGE->stripe_end();
 
-} else {
+}
+else {
 
     $PAGE->stripe_start();
     ?>

www/includes/easyparliament/editqueue.php

Spacing +5 added lines, -5 removed lines

@@ -84,10 +84,10 @@ 
 
         if ($q->success()) {
             // Set the object variables up.
-            $this->editqueue_id 	= $q->insert_id();
+            $this->editqueue_id = $q->insert_id();
             $this->title			= $data['title'];
             $this->body				= $data['body'];
-            $this->posted			= $data['posted'];
+            $this->posted = $data['posted'];
 
             return $this->editqueue_id;
 
@@ -167,7 +167,7 @@ 
             // the new epobject id and approval details.
             $q = $this->db->query("UPDATE editqueue
                             SET
-                            epobject_id_l='" .  $this->current_epobject_id. "',
+                            epobject_id_l='" .  $this->current_epobject_id . "',
                             editor_id='" . addslashes($THEUSER->user_id()) . "',
                             approved='1',
                             decided='" . $timestamp . "'
@@ -249,7 +249,7 @@ 
         $q = $this->db->query("SELECT eq.edit_id, eq.user_id, u.firstname, u.lastname, eq.glossary_id, eq.title, eq.body, eq.submitted FROM editqueue AS eq, users AS u WHERE eq.user_id = u.user_id AND eq.approved IS NULL ORDER BY eq.submitted DESC;");
         if ($q->success() && $q->rows()) {
             for ($i = 0; $i < ($q->rows()); $i++) {
-                $this->pending[	$q->field($i,"edit_id") ] = $q->row($i);
+                $this->pending[$q->field($i, "edit_id")] = $q->row($i);
             }
 
             $this->update_pending_count();
@@ -361,7 +361,7 @@ 
             // the new epobject id and approval details.
             $q = $this->db->query("UPDATE editqueue
                             SET
-                            glossary_id='" .  $this->current_epobject_id. "',
+                            glossary_id='" .  $this->current_epobject_id . "',
                             editor_id='" . addslashes($THEUSER->user_id()) . "',
                             approved='1',
                             decided='" . $timestamp . "'

Braces +2 added lines, -1 removed lines

@@ -91,7 +91,8 @@
 
             return $this->editqueue_id;
 
-        } else {
+        }
+        else {
             return false;
         }
     }

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 URL($this_page);
 
                 $LOGINURL = new 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 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 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 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 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 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 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 URL($page);
                 $title = '<a href="' . $URL->generate() . '">' . $title . '</a>';
-            } else {
+            }
+            else {
                 $title = '<strong>' . $title . '</strong>';
             }
 

www/includes/easyparliament/sidebars/mps.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
     'body'=>''));
 ?>
 <p>
-    Vacher Dods charge <a href="http://www.dodonline.co.uk/engine.asp?showPage=article&id=2564"> 95 pounds </a> for this list of MPs names. We think democracy should be free. Click <?php echo '<a href="'.$csvurl.'">here</a>'; ?> to download a CSV (Comma Separated Values) file that you can load into Excel.
+    Vacher Dods charge <a href="http://www.dodonline.co.uk/engine.asp?showPage=article&id=2564"> 95 pounds </a> for this list of MPs names. We think democracy should be free. Click <?php echo '<a href="' . $csvurl . '">here</a>'; ?> to download a CSV (Comma Separated Values) file that you can load into Excel.
 </p>
 <?php
 $this->block_end();

www/includes/easyparliament/sidebars/calendar_future.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 list($firstyear, $firstmonth, $day) = explode('-', $min_future_date);
 list($finalyear, $finalmonth, $day) = explode('-', $max_future_date);
 
-$q =  $db->query("SELECT DISTINCT(event_date) AS event_date FROM future
+$q = $db->query("SELECT DISTINCT(event_date) AS event_date FROM future
     WHERE event_date >= :firstdate
     AND event_date <= :finaldate
     AND deleted = 0
@@ -45,7 +45,7 @@ 
 
 if ($q->rows() > 0) {
     $years = array();
-    for ($row=0; $row<$q->rows(); $row++) {
+    for ($row = 0; $row < $q->rows(); $row++) {
         list($year, $month, $day) = explode('-', $q->field($row, 'event_date'));
         $month = intval($month);
         $years[$year][$month][] = intval($day);

Braces +2 added lines, -1 removed lines

@@ -61,7 +61,8 @@
 
         if (!isset($years[$y])) {
             $years[$y] = array(1=>array(), 2=>array(), 3=>array(), 4=>array(), 5=>array(), 6=>array(), 7=>array(), 8=>array(), 9=>array(), 10=>array(), 11=>array(), 12=>array());
-        } else {
+        }
+        else {
             // This year is set. Check it has all the months...
             $minmonth = $y == $firstyear ? $firstmonth : 1;
             $maxmonth = $y == $finalyear ? $finalmonth : 12;

www/includes/easyparliament/sidebars/people.php

Braces +4 added lines, -2 removed lines

@@ -44,7 +44,8 @@ 
 </form>
 
 <?php
-} elseif ($this_page == 'msps') {
+}
+elseif ($this_page == 'msps') {
 ?>
 
 <li><a href="?date=2007-05-03">MSPs at 2007 election</a></li>
@@ -53,7 +54,8 @@ 
 <li><a href="<?=$allurl?>">Historical list of all MSPs</a></li>
 
 <?php
-} else {
+}
+else {
     echo "<li><a href='$allurl'>Historical list of all $rep</a></li>";
 }
 echo '</ul>';