mysociety / theyworkforyou

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

Braces +6 added lines, -3 removed lines

@@ -18,10 +18,13 @@
 # Content goes here
 foreach ($data['dates'] as $date => $day_events) {
     foreach ($order as $i => $chamber) {
-        if (!array_key_exists($chamber, $day_events))
-            continue;
+        if (!array_key_exists($chamber, $day_events)) {
+                    continue;
+        }
         $events = $day_events[$chamber];
-        if ($plural[$i]) $chamber .= 's';
+        if ($plural[$i]) {
+            $chamber .= 's';
+        }
         print "<h2 class='calendar'>$chamber";
         if (in_array($major[$i], $data['majors'])) {
             $URL = new \MySociety\TheyWorkForYou\Url($hansardmajors[$major[$i]]['page_all']);

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

Braces +6 added lines, -2 removed lines

@@ -18,7 +18,9 @@ 
     }
     $PAGE->block_start(array('id'=>'recentcomments', 'title'=>$title));
 
-    if ($this_page != 'home') $PAGE->page_links($data);
+    if ($this_page != 'home') {
+        $PAGE->page_links($data);
+    }
     $USERURL = new \MySociety\TheyWorkForYou\Url('userview');
     ?>
                         <ul>
@@ -50,7 +52,9 @@ 
                         <p><a href="<?php echo $MOREURL->generate(); ?>#c<?php echo count($data['comments'])+1; ?>">See more annotations posted recently</a></p>
 <?php
     }
-    if ($this_page != 'home') $PAGE->page_links($data);
+    if ($this_page != 'home') {
+        $PAGE->page_links($data);
+    }
     $PAGE->block_end();
 }
 ?>

classes/Utility/LibFilter.php

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

classes/Db/Query.php

Braces +19 added lines, -10 removed lines

@@ -112,7 +112,8 @@ 
 
                 if (is_int($paramValue)) {
                     $paramType = \PDO::PARAM_INT;
-                } else {
+                }
+                else {
                     $paramType = \PDO::PARAM_STR;
                 }
 
@@ -121,7 +122,8 @@ 
 
             $pdoStatement->execute();
 
-        } else {
+        }
+        else {
             // Execute the raw query
             $pdoStatement = $this->conn->query($sql);
         }
@@ -131,13 +133,16 @@ 
             $this->error($this->conn->errorCode() . ': ' . $this->conn->errorInfo()[2]);
         }
 
-        if (!$this->success) return;
+        if (!$this->success) {
+            return;
+        }
 
         if ( (!$pdoStatement) or (empty($pdoStatement)) ) {
             // A failed query.
             $this->success = false;
 
-        } else {
+        }
+        else {
 
             // A successful SELECT, SHOW, EXPLAIN or DESCRIBE query.
             $this->success = true;
@@ -150,7 +155,8 @@ 
             // Sanity check that lastInsertId() is actually a number, otherwise panic
             if (is_numeric($this->conn->lastInsertId())) {
                 $this->insert_id = (int) $this->conn->lastInsertId();
-            } else {
+            }
+            else {
                 throw new Exception('Last connection ID was not numeric!');
             }
             $this->affected_rows = $pdoStatement->rowCount();
@@ -176,8 +182,9 @@ 
 
     // After SELECT.
     public function field($row_index, $column_name) {
-        if ($this->rows > 0)
-            return $this->data[$row_index][$column_name];
+        if ($this->rows > 0) {
+                    return $this->data[$row_index][$column_name];
+        }
         return "";
     }
 
@@ -188,8 +195,9 @@ 
 
     // After SELECT.
     public function row($row_index) {
-        if ($this->success && $this->rows > 0)
-            return $this->data[$row_index];
+        if ($this->success && $this->rows > 0) {
+                    return $this->data[$row_index];
+        }
         return array();
     }
 
@@ -212,7 +220,8 @@ 
                     if ($n == "email" || $n == "password" || $n == "postcode") {
                         // Don't want to risk this data being displayed on any page.
                         $html .= "<td>**MASKED**</td>";
-                    } else {
+                    }
+                    else {
                         $html .= "<td>" . _htmlentities($field) . "</td>";
                     }
                 }

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

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

www/includes/easyparliament/hansardlist.php

Braces +231 added lines, -113 removed lines

@@ -138,8 +138,9 @@ 
 
         global $PAGE;
 
-        if ($view == 'search' && (!defined('FRONT_END_SEARCH') || !FRONT_END_SEARCH))
-            return false;
+        if ($view == 'search' && (!defined('FRONT_END_SEARCH') || !FRONT_END_SEARCH)) {
+                    return false;
+        }
 
         $validviews = array ('calendar', 'date', 'gid', 'person', 'search', 'search_min', 'search_video', 'recent', 'recent_mostvotes', 'biggest_debates', 'recent_wrans', 'recent_wms', 'column', 'mp', 'bill', 'session', 'recent_debates', 'recent_pbc_debates', 'featured_gid');
         if (in_array($view, $validviews)) {
@@ -149,7 +150,8 @@ 
             // Get all the data that's to be rendered.
             $data = $this->$function($args);
 
-        } else {
+        }
+        else {
             // Don't have a valid $view.
             $PAGE->error_message ("You haven't specified a view type.");
             return false;
@@ -290,7 +292,8 @@ 
                 $sectiondata = $sectiondata[0];
             }
 
-        } else {
+        }
+        else {
             // This item *is* a section, so just return that.
 
             $sectiondata = $itemdata;
@@ -326,12 +329,15 @@ 
             );
 
             $subsectiondata = $this->_get_hansard_data($input);
-            if (count($subsectiondata) == 0)
-                $subsectiondata = null;
-            else
-                $subsectiondata = $subsectiondata[0];
+            if (count($subsectiondata) == 0) {
+                            $subsectiondata = null;
+            }
+            else {
+                            $subsectiondata = $subsectiondata[0];
+            }
 
-        } elseif ($itemdata['htype'] == '11') {
+        }
+        elseif ($itemdata['htype'] == '11') {
             // It's a subsection, so use the item itself.
             $subsectiondata = $itemdata;
         }
@@ -359,10 +365,12 @@ 
             // Debate subsection or section - get the next one.
             if ($hansardmajors[$itemdata['major']]['type'] == 'other' && $hansardmajors[$itemdata['major']]['location'] == 'UK') {
                 $where = 'htype = 11';
-            } else {
+            }
+            else {
                 $where = "(htype = 10 OR htype = 11)";
             }
-        } else {
+        }
+        else {
             // Anything else in debates - get the next element that isn't
             // a subsection or section, and is within THIS subsection.
             $where = "subsection_id = '" . $itemdata['subsection_id'] . "' AND (htype != 10 AND htype != 11)";
@@ -434,12 +442,14 @@ 
                         'url'		=> $prevdata[0]['listurl'],
                         'title'		=> $prevdata[0]['body']
                     );
-                } else {
+                }
+                else {
                     // Linking to the prev speaker.
 
                     if (isset($prevdata[0]['speaker']) && count($prevdata[0]['speaker']) > 0) {
                         $title = $prevdata[0]['speaker']['name'];
-                    } else {
+                    }
+                    else {
                         $title = '';
                     }
                     $nextprevdata['prev'] = array (
@@ -478,12 +488,14 @@ 
                         'url'		=> $nextdata[0]['listurl'],
                         'title'		=> $nextdata[0]['body']
                     );
-                } else {
+                }
+                else {
                     // Linking to the next speaker.
 
                     if (isset($nextdata[0]['speaker']) && count($nextdata[0]['speaker']) > 0) {
                         $title = $nextdata[0]['speaker']['name'];
-                    } else {
+                    }
+                    else {
                         $title = '';
                     }
                     $nextprevdata['next'] = array (
@@ -503,7 +515,8 @@ 
                 'title'	=> '',
                 'url'	=> $URL->generate() . $this->url,
             );
-        } elseif ($itemdata['htype'] == '10' || $itemdata['htype'] == '11') {
+        }
+        elseif ($itemdata['htype'] == '10' || $itemdata['htype'] == '11') {
             $URL = new \MySociety\TheyWorkForYou\Url($this->listpage);
             // Create URL for this (sub)section's date.
             $URL->insert(array('d' => $itemdata['hdate']));
@@ -514,7 +527,8 @@ 
                 'title'	=> '',
                 'url' 	=> $URL->generate()
             );
-        } else {
+        }
+        else {
             // We'll be setting $nextprevdata['up'] within $this->get_data_by_gid()
             // because we need to know the name and url of the parent item, which
             // we don't have here. Life sucks.
@@ -550,7 +564,8 @@ 
                             FROM 	hansard
                             WHERE 	major = :major
                             AND		hdate > :date", $params);
-            } else {
+            }
+            else {
                 $q = $this->db->query("SELECT MAX(hdate) AS hdate
                             FROM 	hansard
                             WHERE 	major = :major
@@ -565,7 +580,8 @@ 
 
                 if ($nextorprev == 'next') {
                     $body = 'Next day';
-                } else {
+                }
+                else {
                     $body = 'Previous day';
                 }
 
@@ -605,7 +621,8 @@ 
 
         if (isset($args['date'])) {
             $date = $args['date'];
-        } else {
+        }
+        else {
             $PAGE->error_message ("Sorry, we don't have a date.");
             return false;
         }
@@ -661,7 +678,8 @@ 
         $q = $this->db->query ("SELECT gid_to FROM gidredirect WHERE gid_from = :gid", array(':gid' => $gid));
         if ($q->rows() == 0) {
             $itemdata = $this->_get_hansard_data($input);
-        } else {
+        }
+        else {
             do {
                 $gid = $q->field(0, 'gid_to');
                 $q = $this->db->query("SELECT gid_to FROM gidredirect WHERE gid_from = :gid", array(':gid' => $gid));
@@ -841,7 +859,8 @@ 
         if (isset($args['days']) && is_numeric($args['days'])) {
             $limit = 'LIMIT :limit';
             $params[':limit'] = $args['days'];
-        } else {
+        }
+        else {
             $limit = '';
         }
 
@@ -850,7 +869,8 @@ 
 
             $major = 'WHERE major = :major';
             $params[':major'] = $this->major;
-        } else {
+        }
+        else {
             $major = '';
         }
 
@@ -908,7 +928,8 @@ 
         if (isset($this->major)) {
             $majorwhere = "AND hansard.major = :hansard_major ";
             $params[':hansard_major'] = $this->major;
-        } else {
+        }
+        else {
             // We're getting results for all debates/wrans/etc.
             $majorwhere = '';
         }
@@ -973,7 +994,8 @@ 
                 }
             }
             $data['rows'] = $speeches;
-        } else {
+        }
+        else {
             $data['rows'] = array();
         }
         return $data;
@@ -1000,10 +1022,12 @@ 
             // $args['s'] should have been tidied up by the time we get here.
             // eg, by doing filter_user_input($s, 'strict');
             $searchstring = $args['s'];
-        } else {
+        }
+        else {
             if ( isset($args['exceptions']) ) {
                 throw new \Exception('No search string provided.');
-            } else {
+            }
+            else {
                 $PAGE->error_message("No search string");
                 return false;
             }
@@ -1022,22 +1046,25 @@ 
         else {
             $results_per_page = 20;
         }
-        if ($results_per_page > 1000)
-            $results_per_page = 1000;
+        if ($results_per_page > 1000) {
+                    $results_per_page = 1000;
+        }
 
         $data['info']['results_per_page'] = $results_per_page;
 
         // What page are we on?
         if (isset($args['p']) && is_numeric($args['p'])) {
             $page = $args['p'];
-        } else {
+        }
+        else {
             $page = 1;
         }
         $data['info']['page'] = $page;
 
         if (isset($args['e'])) {
             $encode = 'url';
-        } else {
+        }
+        else {
             $encode = 'html';
         }
 
@@ -1051,10 +1078,18 @@ 
         // Get the gids from Xapian
         $sort_order = 'date';
         if (isset($args['o'])) {
-            if ($args['o']=='d') $sort_order = 'newest';
-            if ($args['o']=='o') $sort_order = 'oldest';
-            elseif ($args['o']=='c') $sort_order = 'created';
-            elseif ($args['o']=='r') $sort_order = 'relevance';
+            if ($args['o']=='d') {
+                $sort_order = 'newest';
+            }
+            if ($args['o']=='o') {
+                $sort_order = 'oldest';
+            }
+            elseif ($args['o']=='c') {
+                $sort_order = 'created';
+            }
+            elseif ($args['o']=='r') {
+                $sort_order = 'relevance';
+            }
         }
 
         $data['searchdescription'] = $SEARCHENGINE->query_description_long();
@@ -1114,7 +1149,9 @@ 
                     FROM future
                     LEFT JOIN future_people ON id=calendar_id AND witness=0
                     WHERE id = $id AND deleted=0");
-                if ($q->rows() == 0) continue;
+                if ($q->rows() == 0) {
+                    continue;
+                }
 
                 $itemdata = $q->row(0);
 
@@ -1123,8 +1160,9 @@ 
                     in_array($itemdata['chamber'], array(
                         'Commons: Main Chamber', 'Lords: Main Chamber',
                         'Commons: Westminster Hall',
-                    )))
-                        continue;
+                    ))) {
+                                        continue;
+                }
 
                 list($cal_item, $cal_meta) = \MySociety\TheyWorkForYou\Utility\Calendar::meta($itemdata);
                 $body = $this->prepare_search_result_for_display($cal_item) . '.';
@@ -1139,7 +1177,8 @@ 
 
                 if ($itemdata['event_date'] >= date('Y-m-d')) {
                     $title = 'Upcoming Business';
-                } else {
+                }
+                else {
                     $title = 'Previous Business';
                 }
                 $itemdata['gid']            = $id;
@@ -1149,7 +1188,8 @@ 
                 $itemdata['listurl']        = '/calendar/?d=' . $itemdata['event_date'] . '#cal' . $itemdata['id'];
                 $itemdata['major']          = 'F';
 
-            } else {
+            }
+            else {
 
                 // Get the data for the gid from the database
                 $q = $this->db->query("SELECT hansard.gid, hansard.hdate,
@@ -1165,7 +1205,8 @@ 
                 if ($q->rows() > 1) {
                     if ( $isset($args['exceptions']) ) {
                         throw new \Exception("Got more than one row getting data for $gid.");
-                    } else {
+                    }
+                    else {
                         $PAGE->error_message("Got more than one row getting data for $gid");
                     }
                 }
@@ -1220,27 +1261,39 @@ 
                         }
                         if ($itemdata['major'] == 5) {
                             $itemdata['parent']['body'] = 'Northern Ireland Assembly: ' . $itemdata['parent']['body'];
-                        } elseif ($itemdata['major'] == 6) {
+                        }
+                        elseif ($itemdata['major'] == 6) {
                             $itemdata['parent']['body'] = 'Public Bill Committee: ' . $itemdata['parent']['body'];
-                        } elseif ($itemdata['major'] == 7) {
+                        }
+                        elseif ($itemdata['major'] == 7) {
                             $itemdata['parent']['body'] = 'Scottish Parliament: ' . $itemdata['parent']['body'];
                         }
 
-                    } else {
+                    }
+                    else {
                         // It's a section, so it will be its own title.
                         $itemdata['parent']['body'] = $itemdata['body'];
                         $itemdata['body'] = '';
                     }
 
-                } else {
+                }
+                else {
                     // Wrans or WMS
                     $section = $this->_get_section($itemdata);
                     $subsection = $this->_get_subsection($itemdata);
                     $body = $hansardmajors[$itemdata['major']]['title'] . ' — ';
-                    if (isset($section['body'])) $body .= $section['body'];
-                    if (isset($subsection['body'])) $body .= ': ' . $subsection['body'];
-                    if (isset($subsection['listurl'])) $listurl = $subsection['listurl'];
-                    else $listurl = '';
+                    if (isset($section['body'])) {
+                        $body .= $section['body'];
+                    }
+                    if (isset($subsection['body'])) {
+                        $body .= ': ' . $subsection['body'];
+                    }
+                    if (isset($subsection['listurl'])) {
+                        $listurl = $subsection['listurl'];
+                    }
+                    else {
+                        $listurl = '';
+                    }
                     $itemdata['parent'] = array (
                         'body' => $body,
                         'listurl' => $listurl
@@ -1268,7 +1321,8 @@ 
                                 $itemdata['speaker'] = $this->_get_speaker($itemdata['person_id'], $itemdata['hdate'], $itemdata['htime'], $itemdata['major']);
                             }
                         }
-                    } elseif ($itemdata['htype'] == 10) {
+                    }
+                    elseif ($itemdata['htype'] == 10) {
                         $itemdata['body'] = '';
                         $itemdata['extract'] = '';
                     }
@@ -1367,17 +1421,20 @@ 
                 return $data;
             }
 
-        } elseif (isset($args['year']) && is_numeric($args['year'])) {
+        }
+        elseif (isset($args['year']) && is_numeric($args['year'])) {
 
             if (isset($args['month']) && is_numeric($args['month'])) {
                 // A particular month.
                 $action = 'month';
-            } else {
+            }
+            else {
                 // A single year.
                 $action = 'year';
             }
 
-        } else {
+        }
+        else {
             // The year to date so far.
             $action = 'recentyear';
         }
@@ -1405,7 +1462,8 @@ 
 
             if ($q->field(0, 'hdate') != NULL) {
                 $recentdate = $q->field(0, 'hdate');
-            } else {
+            }
+            else {
                 $PAGE->error_message("Couldn't find the most recent date");
                 return $data;
             }
@@ -1433,7 +1491,8 @@ 
                     $firstmonth = 12 + $firstmonth; // ()
                 };
 
-            } else {
+            }
+            else {
                 // $action == 'recentyear'
 
                 // Get the most recent year's results.
@@ -1443,7 +1502,8 @@ 
 
 
 
-        } else {
+        }
+        else {
             // $action == 'year' or 'month'.
 
             $firstyear = $args['year'];
@@ -1452,7 +1512,8 @@ 
             if ($action == 'month') {
                 $firstmonth = intval($args['month']);
                 $finalmonth = intval($args['month']);
-            } else {
+            }
+            else {
                 $firstmonth = 1;
                 $finalmonth = 12;
             }
@@ -1524,7 +1585,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...
 
@@ -1565,7 +1627,9 @@ 
                     'url' => $YEARURL->generate()
                 );
 
-            } else { // action is 'year'.
+            }
+            else {
+// action is 'year'.
 
                 $nextprev['prev'] = array ('body' => 'Previous year');
                 $nextprev['next'] = array ('body' => 'Next year');
@@ -1684,7 +1748,8 @@ 
             ) {
             $fieldsarr['epobject'] = array ('body');
             $join = 'LEFT OUTER JOIN epobject ON hansard.epobject_id = epobject.epobject_id';
-        } else {
+        }
+        else {
             $join = '';
         }
 
@@ -1712,14 +1777,16 @@ 
         if ($order != '') {
             # You can't use parameters for order by clauses
             $order_by_clause = "ORDER BY $order";
-        } else {
+        }
+        else {
             $order_by_clause = '';
         }
 
         if ($limit != '') {
             $params[':limit'] = $limit;
             $limit = "LIMIT :limit";
-        } else {
+        }
+        else {
             $limit = '';
         }
 
@@ -1790,7 +1857,8 @@ 
                         $where = "section_id = '" . $item['epobject_id'] . "'
                             AND subsection_id = '" . $item['epobject_id'] . "'";
 
-                    } else {
+                    }
+                    else {
                         // Subsection - get a count of items within this subsection.
                         $where = "subsection_id = '" . $item['epobject_id'] . "'";
                     }
@@ -1803,7 +1871,8 @@ 
 
                     if ($r->rows() > 0) {
                         $item['contentcount'] = $r->field(0, 'count');
-                    } else {
+                    }
+                    else {
                         $item['contentcount'] = '0';
                     }
                 }
@@ -1820,7 +1889,8 @@ 
                     if ($item['htype'] == '10') {
                         $where = 'hansard.section_id = :epobject_id
                             AND hansard.subsection_id = :epobject_id';
-                    } elseif ($item['htype'] == '11') {
+                    }
+                    elseif ($item['htype'] == '11') {
                         $where = 'hansard.subsection_id = :epobject_id';
                     }
 
@@ -1865,7 +1935,8 @@ 
                         $id = preg_replace('#^.*?_.*?_#', '', $item['gid']);
                         $fragment = $this->url . $id;
                         $item['commentsurl'] = $COMMENTSURL->generate() . $fragment;
-                    } else {
+                    }
+                    else {
                         $COMMENTSURL->insert(array('id' => $item['gid']));
                         $item['commentsurl'] = $COMMENTSURL->generate();
                     }
@@ -1927,7 +1998,8 @@ 
 
         if ($q->rows() > 0) {
             $votes['user']['yes'] = $q->field(0, 'totalvotes');
-        } else {
+        }
+        else {
             $votes['user']['yes'] = '0';
         }
 
@@ -1940,7 +2012,8 @@ 
 
         if ($q->rows() > 0) {
             $votes['user']['no'] = $q->field(0, 'totalvotes');
-        } else {
+        }
+        else {
             $votes['user']['no'] = '0';
         }
 
@@ -1956,7 +2029,8 @@ 
         if ($q->rows() > 0) {
             $votes['anon']['yes'] = $q->field(0, 'yes_votes');
             $votes['anon']['no'] = $q->field(0, 'no_votes');
-        } else {
+        }
+        else {
             $votes['anon']['yes'] = '0';
             $votes['anon']['no'] = '0';
         }
@@ -1980,10 +2054,12 @@ 
         // );
 
         // $url_args is an array of other key/value pairs to be appended in the GET string.
-        if ($id_data['major'])
-            $LISTURL = new \MySociety\TheyWorkForYou\Url($hansardmajors[$id_data['major']]['page_all']);
-        else
-            $LISTURL = new \MySociety\TheyWorkForYou\Url('wrans');
+        if ($id_data['major']) {
+                    $LISTURL = new \MySociety\TheyWorkForYou\Url($hansardmajors[$id_data['major']]['page_all']);
+        }
+        else {
+                    $LISTURL = new \MySociety\TheyWorkForYou\Url('wrans');
+        }
 
         $fragment = '';
 
@@ -1993,10 +2069,12 @@ 
                 global $DATA;
                 $DATA->set_page_metadata('pbc_clause', 'url', 'pbc/' . $this->url . $id);
                 $LISTURL->remove(array('id'));
-            } else {
+            }
+            else {
                 $LISTURL->insert( array( 'id' => $id_data['gid'] ) );
             }
-        } else {
+        }
+        else {
             // A debate speech or question/answer, etc.
             // We need to get the gid of the parent (sub)section for this item.
             // We use this with the gid of the item itself as an #anchor.
@@ -2012,7 +2090,8 @@ 
 
                 $parent_gid = $this->epobjectid_to_gid[ $parent_epobject_id ];
 
-            } else {
+            }
+            else {
                 // We haven't cached the gid, so fetch from db.
 
                 $r = $this->db->query("SELECT gid
@@ -2035,7 +2114,8 @@ 
                 if ($id_data['major'] == 6) {
                     if (isset($this->bill_lookup[$minor])) {
                         list($title, $session) = $this->bill_lookup[$minor];
-                    } else {
+                    }
+                    else {
                         $qq = $this->db->query('select title, session from bills where id='.$minor);
                         $title = $qq->field(0, 'title');
                         $session = $qq->field(0, 'session');
@@ -2046,7 +2126,8 @@ 
                     global $DATA;
                     $DATA->set_page_metadata('pbc_clause', 'url', "pbc/$url/$parent_gid");
                     $LISTURL->remove(array('id'));
-                } else {
+                }
+                else {
                     $LISTURL->insert( array( 'id' => $parent_gid ) );
                 }
                 // Use a truncated form of this item's gid for the anchor.
@@ -2088,9 +2169,11 @@ 
         # Note identical code to this in search/index.pl
         if ($person_id == 10170 && $hdate == '2014-09-08') {
             $hdate = '2014-09-07';
-        } elseif ($person_id == 11068 && substr($hdate, 0, 7) == '2008-09') {
+        }
+        elseif ($person_id == 11068 && substr($hdate, 0, 7) == '2008-09') {
             $hdate = '2008-08-13';
-        } elseif ($person_id == 25394 && $hdate == '2016-07-01') {
+        }
+        elseif ($person_id == 25394 && $hdate == '2016-07-01') {
             $hdate = '2016-06-16';
         }
 
@@ -2155,7 +2238,8 @@ 
             # Couple of special cases for the election of the NI Speaker
             if ($person_id == 13799 && $hdate == '2007-05-08') {
                 $members = array($members[$htime < '11:00' ? 0 : 1]);
-            } elseif ($person_id == 13831 && $hdate == '2015-01-12') {
+            }
+            elseif ($person_id == 13831 && $hdate == '2015-01-12') {
                 $members = array($members[$htime < '13:00' ? 0 : 1]);
             }
         }
@@ -2170,11 +2254,14 @@ 
         $URL = new \MySociety\TheyWorkForYou\Url('mp'); # Default, house=1
         if ($house==2) {
             $URL = new \MySociety\TheyWorkForYou\Url('peer');
-        } elseif ($house==3) {
+        }
+        elseif ($house==3) {
             $URL = new \MySociety\TheyWorkForYou\Url('mla');
-        } elseif ($house==4) {
+        }
+        elseif ($house==4) {
             $URL = new \MySociety\TheyWorkForYou\Url('msp');
-        } elseif ($house==0) {
+        }
+        elseif ($house==0) {
             $URL = new \MySociety\TheyWorkForYou\Url('royal');
         }
         return $URL;
@@ -2293,7 +2380,8 @@ 
                 $where .= " AND section_id = :epobject_id";
             }
 
-        } else {
+        }
+        else {
             // Just getting a count of the comments on this item.
             $from = "comments";
             $where = 'epobject_id = :epobject_id';
@@ -2413,7 +2501,8 @@ 
             $this->htype = $itemdata['htype'];
             if ($this->htype >= 12) {
                 $this_page = $this->commentspage;
-            } else {
+            }
+            else {
                 $this_page = $this->listpage;
             }
         }
@@ -2454,18 +2543,21 @@ 
             $nextprev = $this->_get_nextprev_items( $sectionrow );
             $data['info']['text_heading'] = $itemdata['body'];
 
-        } elseif ($itemdata['htype'] == '11') {
+        }
+        elseif ($itemdata['htype'] == '11') {
             $nextprev = $this->_get_nextprev_items( $subsectionrow );
             $data['info']['text_heading'] = $itemdata['body'];
 
-        } else {
+        }
+        else {
             // Ordinary lowly item.
             $nextprev = $this->_get_nextprev_items( $itemdata );
 
             if (isset($subsectionrow['gid'])) {
                 $nextprev['up']['url'] 		= $subsectionrow['listurl'];
                 $nextprev['up']['title'] 	= $subsectionrow['body'];
-            } else {
+            }
+            else {
                 $nextprev['up']['url'] 		= $sectionrow['listurl'];
                 $nextprev['up']['title'] 	= $sectionrow['body'];
             }
@@ -2522,7 +2614,8 @@ 
                     throw new RedirectException($data['subrows'][0]['gid']);
                 }
             }
-        } elseif ($itemdata['htype'] == '11') {
+        }
+        elseif ($itemdata['htype'] == '11') {
             // This item is a subsection, so we're displaying everything within it.
 
             # $subsectionrow['trackback'] = $this->_get_trackback_data($subsectionrow);
@@ -2538,7 +2631,8 @@ 
             $data['rows'] = $this->_get_hansard_data($input);
 
 
-        } elseif ($itemdata['htype'] == '12' || $itemdata['htype'] == '13') {
+        }
+        elseif ($itemdata['htype'] == '12' || $itemdata['htype'] == '13') {
             // Debate speech or procedural, so we're just displaying this one item.
 
             # $itemdata['trackback'] = $this->_get_trackback_data($itemdata);
@@ -2633,7 +2727,9 @@ 
             array(':gid_from_spid' => 'uk.org.publicwhip/spq/' . $fixed_spid)
         );
         $gid = $q->field(0, 'mentioned_gid');
-        if ($gid) return $gid;
+        if ($gid) {
+            return $gid;
+        }
         return null;
     }
     public function old_get_gid_from_spid($spid) {
@@ -2642,7 +2738,9 @@ 
             array(':gid_like' => 'uk.org.publicwhip/spwa/%.' . $spid . '.h')
         );
         $gid = $q->field(0, 'gid');
-        if ($gid) return str_replace('uk.org.publicwhip/spwa/', '', $gid);
+        if ($gid) {
+            return str_replace('uk.org.publicwhip/spwa/', '', $gid);
+        }
         return null;
     }
 }
@@ -2668,14 +2766,16 @@ 
         // The most voted on things during how many recent days?
         if (isset($args['days']) && is_numeric($args['days'])) {
             $days = $args['days'];
-        } else {
+        }
+        else {
             $days = 7;
         }
 
         // How many results?
         if (isset($args['num']) && is_numeric($args['num'])) {
             $items_to_list = $args['num'];
-        } else {
+        }
+        else {
             $items_to_list = 5;
         }
 
@@ -2757,7 +2857,8 @@ 
 
             $data['rows'] = $speeches;
 
-        } else {
+        }
+        else {
             $data['rows'] = array ();
         }
 
@@ -2845,10 +2946,12 @@ 
                 $subsection_body = $r->field(0, 'sub_body');
                 if ( $section_body && $subsection_body ) {
                     $parentbody = "$section_body : $subsection_body";
-                } else {
+                }
+                else {
                     $parentbody = "$section_body$subsection_body";
                 }
-            } else if ( $item_data['htype'] == 10 ) {
+            }
+            else if ( $item_data['htype'] == 10 ) {
                 $parentbody = $body;
             }
 
@@ -2856,7 +2959,8 @@ 
             if ( $item_data['htype'] == 12 ) {
                 $childbody = $body;
                 $speaker = $this->_get_speaker($q->field(0, 'person_id'), $q->field(0, 'hdate'), $q->field(0, 'htime'), $this->major );
-            } else {
+            }
+            else {
                 $r = $this->db->query("SELECT e.body, e.title,
                                         h.person_id, h.hdate, h.htime
                                 FROM    hansard h, epobject e
@@ -2928,7 +3032,9 @@ 
 
         // Get the most recent day on which we have a debate.
         $recentday = $this->most_recent_day();
-        if (!count($recentday)) return $data;
+        if (!count($recentday)) {
+            return $data;
+        }
 
         if (!isset($args['days']) || !is_numeric($args['days'])) {
             $args['days'] = 1;
@@ -2940,7 +3046,8 @@ 
         if ($args['num'] == 1) {
             $datewhere = "h.hdate = :hdate";
             $params[':hdate'] = $recentday['hdate'];
-        } else {
+        }
+        else {
             $firstdate = gmdate('Y-m-d', $recentday['timestamp'] - (86400 * $args['days']));
             $datewhere = "h.hdate >= :firstdate
                         AND h.hdate <= :hdate";
@@ -3055,8 +3162,9 @@ 
 
         // Get the most recent day on which we have a debate.
         $recentday = $this->most_recent_day();
-        if (!count($recentday))
-            return array();
+        if (!count($recentday)) {
+                    return array();
+        }
 
         if (!isset($args['days']) || !is_numeric($args['days'])) {
             $args['days'] = 1;
@@ -3068,7 +3176,8 @@ 
         $params = array(':recentdate' => $recentday['hdate']);
         if ($args['num'] == 1) {
             $datewhere = "h.hdate = :recentdate";
-        } else {
+        }
+        else {
             $params[':firstdate'] = gmdate('Y-m-d', $recentday['timestamp'] - (86400 * $args['days']));
             $datewhere = "h.hdate >= :firstdate AND	h.hdate <= :recentdate";
         }
@@ -3189,8 +3298,9 @@ 
 
         // Get the most recent day on which we have wrans.
         $recentday = $this->most_recent_day();
-        if (!count($recentday))
-            return $data;
+        if (!count($recentday)) {
+                    return $data;
+        }
 
         if (!isset($args['days']) || !is_numeric($args['days'])) {
             $args['days'] = 1;
@@ -3202,7 +3312,8 @@ 
         if ($args['num'] == 1) {
             $datewhere = "h.hdate = :datewhere";
             $params[':datewhere'] = $recentday['hdate'];
-        } else {
+        }
+        else {
             $firstdate = gmdate('Y-m-d', $recentday['timestamp'] - (86400 * $args['days']));
             $datewhere = "h.hdate >= :firstdate AND h.hdate <= :hdate";
             $params[':firstdate'] = $firstdate;
@@ -3213,7 +3324,8 @@ 
         // Get a random selection of subsections in wrans.
         if ($hansardmajors[$this->major]['location'] == 'Scotland') {
             $htype = 'htype = 10 and section_id = 0';
-        } else {
+        }
+        else {
             $htype = 'htype = 11 and section_id != 0';
         }
 
@@ -3343,7 +3455,8 @@ 
             );
             if ($chairman) {
                 $comm['chairmen'][$person_id] = $arr;
-            } else {
+            }
+            else {
                 $comm['members'][$person_id] = $arr;
             }
         }
@@ -3470,7 +3583,9 @@ 
     }
 
     public function _get_data_by_recent_pbc_debates($args) {
-        if (!isset($args['num'])) $args['num'] = 20;
+        if (!isset($args['num'])) {
+            $args['num'] = 20;
+        }
         $q = $this->db->query('select gid, minor, hdate from hansard
             where htype=10 and major=6
             order by hdate desc limit ' . $args['num']);
@@ -3484,7 +3599,9 @@ 
             $session = $qq->field(0, 'session');
             list($sitting, $part) = $this->_get_sitting($gid);
             $sitting_txt = make_ranking($sitting) . ' sitting';
-            if ($part>0) $sitting .= ", part $part";
+            if ($part>0) {
+                $sitting .= ", part $part";
+            }
             $data[$hdate][] = array(
                 'bill'=> $title,
                 'sitting' => $sitting_txt,
@@ -3496,8 +3613,9 @@ 
 
     # Given a GID, parse out the sitting number and optional part from it
     public function _get_sitting($gid) {
-        if (preg_match('#_(\d\d)-(\d)_#', $gid, $m))
-            return array($m[1]+0, $m[2]);
+        if (preg_match('#_(\d\d)-(\d)_#', $gid, $m)) {
+                    return array($m[1]+0, $m[2]);
+        }
         return array(0, 0);
     }
 }

www/includes/easyparliament/member.php

Braces +116 added lines, -60 removed lines

@@ -71,15 +71,19 @@ 
         $person_id = '';
         if (isset($args['member_id']) && is_numeric($args['member_id'])) {
             $person_id = $this->member_id_to_person_id($args['member_id']);
-        } elseif (isset($args['name'])) {
+        }
+        elseif (isset($args['name'])) {
             $con = isset($args['constituency']) ? $args['constituency'] : '';
             $person_id = $this->name_to_person_id($args['name'], $con);
-        } elseif (isset($args['constituency'])) {
+        }
+        elseif (isset($args['constituency'])) {
             $still_in_office = isset($args['still_in_office']) ? $args['still_in_office'] : false;
             $person_id = $this->constituency_to_person_id($args['constituency'], $house, $still_in_office);
-        } elseif (isset($args['postcode'])) {
+        }
+        elseif (isset($args['postcode'])) {
             $person_id = $this->postcode_to_person_id($args['postcode'], $house);
-        } elseif (isset($args['person_id']) && is_numeric($args['person_id'])) {
+        }
+        elseif (isset($args['person_id']) && is_numeric($args['person_id'])) {
             $person_id = $args['person_id'];
             $q = $this->db->query("SELECT gid_to FROM gidredirect
                     WHERE gid_from = :gid_from",
@@ -114,7 +118,9 @@ 
         $last_party = null;
         for ($row=0; $row<$q->rows(); $row++) {
             $house          = $q->field($row, 'house');
-            if (!in_array($house, $this->houses)) $this->houses[] = $house;
+            if (!in_array($house, $this->houses)) {
+                $this->houses[] = $house;
+            }
             $const          = $q->field($row, 'constituency');
             $party		= $q->field($row, 'party');
             $entered_house	= $q->field($row, 'entered_house');
@@ -194,7 +200,8 @@ 
         }
         if ($q->rows > 0) {
             return $q->field(0, 'person_id');
-        } else {
+        }
+        else {
             throw new MySociety\TheyWorkForYou\MemberException('Sorry, there is no member with a member ID of "' . _htmlentities($member_id) . '".');
         }
     }
@@ -215,7 +222,9 @@ 
         }
 
         $normalised = MySociety\TheyWorkForYou\Utility\Constituencies::normaliseConstituencyName($constituency);
-        if ($normalised) $constituency = $normalised;
+        if ($normalised) {
+            $constituency = $normalised;
+        }
 
         $params = array();
 
@@ -239,7 +248,8 @@ 
 
         if ($q->rows > 0) {
             return $q->field(0, 'person_id');
-        } else {
+        }
+        else {
             throw new MySociety\TheyWorkForYou\MemberException('Sorry, there is no current member for the "' . _htmlentities(ucwords($constituency)) . '" constituency.');
         }
     }
@@ -254,10 +264,12 @@ 
         $q = "SELECT person_id FROM person_names WHERE type = 'name' ";
         if ($this_page == 'peer') {
             $success = preg_match('#^(.*?) (.*?) of (.*?)$#', $name, $m);
-            if (!$success)
-                $success = preg_match('#^(.*?)() of (.*?)$#', $name, $m);
-            if (!$success)
-                $success = preg_match('#^(.*?) (.*?)()$#', $name, $m);
+            if (!$success) {
+                            $success = preg_match('#^(.*?)() of (.*?)$#', $name, $m);
+            }
+            if (!$success) {
+                            $success = preg_match('#^(.*?) (.*?)()$#', $name, $m);
+            }
             if (!$success) {
                 throw new MySociety\TheyWorkForYou\MemberException('Sorry, that name was not recognised.');
             }
@@ -265,10 +277,12 @@ 
             $params[':family_name'] = $m[2];
             $params[':lordofname'] = $m[3];
             $q .= "AND title = :title AND family_name = :family_name AND lordofname = :lordofname";
-        } elseif ($this_page == 'msp' || $this_page == 'mla' || strstr($this_page, 'mp')) {
+        }
+        elseif ($this_page == 'msp' || $this_page == 'mla' || strstr($this_page, 'mp')) {
             $success = preg_match('#^(.*?) (.*?) (.*?)$#', $name, $m);
-            if (!$success)
-                $success = preg_match('#^(.*?)() (.*)$#', $name, $m);
+            if (!$success) {
+                            $success = preg_match('#^(.*?)() (.*)$#', $name, $m);
+            }
             if (!$success) {
                 throw new MySociety\TheyWorkForYou\MemberException('Sorry, that name was not recognised.');
             }
@@ -288,7 +302,8 @@ 
         $q = $this->db->query($q, $params);
         if (!$q->rows) {
             throw new MySociety\TheyWorkForYou\MemberException('Sorry, we could not find anyone with that name.');
-        } elseif ($q->rows == 1) {
+        }
+        elseif ($q->rows == 1) {
             return $q->field(0, 'person_id');
         }
 
@@ -303,13 +318,17 @@ 
         $params = array();
         if ($this_page == 'peer') {
             $params[':house'] = HOUSE_TYPE_LORDS;
-        } elseif ($this_page == 'msp') {
+        }
+        elseif ($this_page == 'msp') {
             $params[':house'] = HOUSE_TYPE_SCOTLAND;
-        } elseif ($this_page == 'mla') {
+        }
+        elseif ($this_page == 'mla') {
             $params[':house'] = HOUSE_TYPE_NI;
-        } elseif ($this_page == 'royal') {
+        }
+        elseif ($this_page == 'royal') {
             $params[':house'] = HOUSE_TYPE_ROYAL;
-        } else {
+        }
+        else {
             $params[':house'] = HOUSE_TYPE_COMMONS;
         }
 
@@ -328,11 +347,14 @@ 
                 $person_ids[$q->field($i, 'person_id')] = $q->field($i, 'constituency');
             }
             throw new MySociety\TheyWorkForYou\MemberMultipleException($person_ids);
-        } elseif ($q->rows > 0) {
+        }
+        elseif ($q->rows > 0) {
             return $q->field(0, 'person_id');
-        } elseif ($const) {
+        }
+        elseif ($const) {
             return $this->name_to_person_id($name);
-        } else {
+        }
+        else {
             throw new MySociety\TheyWorkForYou\MemberException('Sorry, there is no current member with that name.');
         }
     }
@@ -403,16 +425,21 @@ 
         if (array_key_exists('public_whip_rebellions', $this->extra_info)) {
             $rebellions = $this->extra_info['public_whip_rebellions'];
             $rebel_desc = "<unknown>";
-            if ($rebellions == 0)
-                $rebel_desc = "never";
-            elseif ($rebellions <= 1)
-                $rebel_desc = "hardly ever";
-            elseif ($rebellions <= 3)
-                $rebel_desc = "occasionally";
-            elseif ($rebellions <= 5)
-                $rebel_desc = "sometimes";
-            elseif ($rebellions > 5)
-                $rebel_desc = "quite often";
+            if ($rebellions == 0) {
+                            $rebel_desc = "never";
+            }
+            elseif ($rebellions <= 1) {
+                            $rebel_desc = "hardly ever";
+            }
+            elseif ($rebellions <= 3) {
+                            $rebel_desc = "occasionally";
+            }
+            elseif ($rebellions <= 5) {
+                            $rebel_desc = "sometimes";
+            }
+            elseif ($rebellions > 5) {
+                            $rebel_desc = "quite often";
+            }
             $this->extra_info['public_whip_rebel_description'] = $rebel_desc;
         }
 
@@ -476,8 +503,9 @@ 
     public function family_name() { return $this->family_name; }
     public function full_name($no_mp_title = false) {
         $title = $this->title;
-        if ($no_mp_title && ($this->house_disp==HOUSE_TYPE_COMMONS || $this->house_disp==HOUSE_TYPE_NI || $this->house_disp==HOUSE_TYPE_SCOTLAND))
-            $title = '';
+        if ($no_mp_title && ($this->house_disp==HOUSE_TYPE_COMMONS || $this->house_disp==HOUSE_TYPE_NI || $this->house_disp==HOUSE_TYPE_SCOTLAND)) {
+                    $title = '';
+        }
         return member_full_name($this->house_disp, $title, $this->given_name, $this->family_name, $this->lordofname);
     }
     public function houses() {
@@ -493,48 +521,62 @@ 
     public function party() { return $this->party; }
     public function party_text($party = null) {
         global $parties;
-        if (!$party)
-            $party = $this->party;
+        if (!$party) {
+                    $party = $this->party;
+        }
         if (isset($parties[$party])) {
             return $parties[$party];
-        } else {
+        }
+        else {
             return $party;
         }
     }
 
     public function entered_house($house = 0) {
-        if ($house) return array_key_exists($house, $this->entered_house) ? $this->entered_house[$house] : null;
+        if ($house) {
+            return array_key_exists($house, $this->entered_house) ? $this->entered_house[$house] : null;
+        }
         return $this->entered_house;
     }
     public function entered_house_text($entered_house) {
-        if (!$entered_house) return '';
+        if (!$entered_house) {
+            return '';
+        }
         list($year, $month, $day) = explode('-', $entered_house);
         if ($month==1 && $day==1 && $this->house(HOUSE_TYPE_LORDS)) {
             return $year;
-        } elseif ($month==0 && $day==0) {
+        }
+        elseif ($month==0 && $day==0) {
             return $year;
-        } elseif (checkdate($month, $day, $year) && $year != '9999') {
+        }
+        elseif (checkdate($month, $day, $year) && $year != '9999') {
             return format_date($entered_house, LONGDATEFORMAT);
-        } else {
+        }
+        else {
             return "n/a";
         }
     }
 
     public function left_house($house = null) {
-        if (!is_null($house))
-            return array_key_exists($house, $this->left_house) ? $this->left_house[$house] : null;
+        if (!is_null($house)) {
+                    return array_key_exists($house, $this->left_house) ? $this->left_house[$house] : null;
+        }
         return $this->left_house;
     }
 
     public function left_house_text($left_house) {
-        if (!$left_house) return '';
+        if (!$left_house) {
+            return '';
+        }
         list($year, $month, $day) = explode('-', $left_house);
         if (checkdate($month, $day, $year) && $year != '9999') {
             return format_date($left_house, LONGDATEFORMAT);
-        } elseif ($month==0 && $day==0) {
+        }
+        elseif ($month==0 && $day==0) {
             # Left house date is stored as 1942-00-00 to mean "at some point in 1941"
             return $year - 1;
-        } else {
+        }
+        else {
             return "n/a";
         }
     }
@@ -543,7 +585,8 @@ 
     public function entered_reason_text($entered_reason) {
         if (isset($this->reasons[$entered_reason])) {
             return $this->reasons[$entered_reason];
-        } else {
+        }
+        else {
             return $entered_reason;
         }
     }
@@ -557,13 +600,16 @@ 
                 $max = $q->field(0, 'max');
                 if ($max == $left_house) {
                     return $left_reason[0];
-                } else {
+                }
+                else {
                     return $left_reason[1];
                 }
-            } else {
+            }
+            else {
                 return $left_reason;
             }
-        } else {
+        }
+        else {
             return $left_reason;
         }
     }
@@ -576,7 +622,9 @@ 
             $lh = $this->left_house($h);
             $current[$h] = ($lh['date'] == '9999-12-31');
         }
-        if ($house) return $current[$house];
+        if ($house) {
+            return $current[$house];
+        }
         return $current;
     }
 
@@ -586,13 +634,17 @@ 
         $house = $this->house_disp;
         if ($house == HOUSE_TYPE_COMMONS) {
             $URL = new \MySociety\TheyWorkForYou\Url('mp');
-        } elseif ($house == HOUSE_TYPE_LORDS) {
+        }
+        elseif ($house == HOUSE_TYPE_LORDS) {
             $URL = new \MySociety\TheyWorkForYou\Url('peer');
-        } elseif ($house == HOUSE_TYPE_NI) {
+        }
+        elseif ($house == HOUSE_TYPE_NI) {
             $URL = new \MySociety\TheyWorkForYou\Url('mla');
-        } elseif ($house == HOUSE_TYPE_SCOTLAND) {
+        }
+        elseif ($house == HOUSE_TYPE_SCOTLAND) {
             $URL = new \MySociety\TheyWorkForYou\Url('msp');
-        } elseif ($house == HOUSE_TYPE_ROYAL) {
+        }
+        elseif ($house == HOUSE_TYPE_ROYAL) {
             $URL = new \MySociety\TheyWorkForYou\Url('royal');
         }
         $member_url = make_member_url($this->full_name(true), $this->constituency(), $house, $this->person_id());
@@ -602,17 +654,21 @@ 
                 $protocol = 'http://';
             }
             return $protocol . DOMAIN . $URL->generate('none') . $member_url;
-        } else {
+        }
+        else {
             return $URL->generate('none') . $member_url;
         }
     }
 
     private function _previous_future_mps_query($direction) {
         $entered_house = $this->entered_house(HOUSE_TYPE_COMMONS);
-        if (is_null($entered_house)) return '';
+        if (is_null($entered_house)) {
+            return '';
+        }
         if ($direction == '>') {
             $order = '';
-        } else {
+        }
+        else {
             $order = 'DESC';
         }
         $q = $this->db->query('SELECT *

www/includes/easyparliament/sidebars/minisurvey.php

Braces +8 added lines, -4 removed lines

@@ -34,10 +34,12 @@ 
     $always_ask = 0;
     $show_survey_qn = $current_question;
     setcookie('survey', $current_question, time()+60*60*24*365, '/');
-} elseif ($has_answered_question == $current_question && !$always_ask) {
+}
+elseif ($has_answered_question == $current_question && !$always_ask) {
     $show_survey_qn = $current_question;
     setcookie('survey', $current_question, time()+60*60*24*365, '/');
-} elseif (isset($_COOKIE['survey'])) {
+}
+elseif (isset($_COOKIE['survey'])) {
     $show_survey_qn = $_COOKIE['survey'];
 }
 
@@ -53,7 +55,8 @@ 
         global $MEMBER;
         $page_url = $MEMBER->url(true) . "?answered_survey=$current_question";
         $hide_url = $MEMBER->url() . "?hide_survey=$current_question";
-    } else {
+    }
+    else {
         $URL = new \MySociety\TheyWorkForYou\Url($this_page);
         $URL->insert(array('answered_survey' => $current_question ));
         $page_url = 'https://' . DOMAIN . $URL->generate();
@@ -105,7 +108,8 @@ 
 
 <?php
     $this->block_end();
-} elseif ($has_answered_question) {
+}
+elseif ($has_answered_question) {
     $this->block_start(array('id'=>'survey', 'title'=>"Mini survey"));
 ?>
     Thanks for answering.