@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | ); |
125 | 125 | $hansardmajors[104] = $hansardmajors[4]; |
126 | 126 | |
127 | -$parties = array ( |
|
127 | +$parties = array( |
|
128 | 128 | 'Bp' => 'Bishop', |
129 | 129 | 'Con' => 'Conservative', |
130 | 130 | 'CWM' => 'Deputy Speaker', |
@@ -166,9 +166,9 @@ discard block |
||
166 | 166 | */ |
167 | 167 | |
168 | 168 | // Constants for various house types |
169 | -define ('HOUSE_TYPE_ROYAL', 0); |
|
170 | -define ('HOUSE_TYPE_COMMONS', 1); |
|
171 | -define ('HOUSE_TYPE_LORDS', 2); |
|
172 | -define ('HOUSE_TYPE_NI', 3); |
|
173 | -define ('HOUSE_TYPE_SCOTLAND', 4); |
|
174 | -define ('HOUSE_TYPE_WALES', 5); |
|
169 | +define('HOUSE_TYPE_ROYAL', 0); |
|
170 | +define('HOUSE_TYPE_COMMONS', 1); |
|
171 | +define('HOUSE_TYPE_LORDS', 2); |
|
172 | +define('HOUSE_TYPE_NI', 3); |
|
173 | +define('HOUSE_TYPE_SCOTLAND', 4); |
|
174 | +define('HOUSE_TYPE_WALES', 5); |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | <p></p> |
17 | 17 | <?php |
18 | 18 | |
19 | -$PAGE->block_start(array ('title'=>'Share this with your friends')); |
|
19 | +$PAGE->block_start(array('title'=>'Share this with your friends')); |
|
20 | 20 | |
21 | 21 | #foi2009_sharethis_link(); |
22 | 22 | #foi2009_share_page(); |
@@ -25,4 +25,4 @@ discard block |
||
25 | 25 | |
26 | 26 | $PAGE->block_end(); |
27 | 27 | $PAGE->stripe_end(); |
28 | -$PAGE->page_end (); |
|
28 | +$PAGE->page_end(); |
@@ -7,7 +7,7 @@ |
||
7 | 7 | |
8 | 8 | $PAGE->page_start(); |
9 | 9 | $PAGE->stripe_start(); |
10 | -$PAGE->block_start(array ('id'=>'intro', 'title'=>'We need your help:')); |
|
10 | +$PAGE->block_start(array('id'=>'intro', 'title'=>'We need your help:')); |
|
11 | 11 | |
12 | 12 | echo '<div id="foi2009">'; |
13 | 13 | echo $foi2009_message; |
@@ -14,7 +14,7 @@ |
||
14 | 14 | } elseif ($constituency == "") { |
15 | 15 | $errors['pc'] = "Sorry, " . _htmlentities($pc) . " isn't a known postcode"; |
16 | 16 | twfy_debug ('MP', "Can't display an MP, as submitted postcode didn't match a constituency"); |
17 | - } else { |
|
17 | + } else { |
|
18 | 18 | $MEMBER = new MEMBER(array('constituency' => $constituency)); |
19 | 19 | if ($MEMBER->person_id()) { |
20 | 20 | // This will cookie the postcode. |
@@ -1,7 +1,7 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | include_once '../../includes/easyparliament/init.php'; |
4 | -include_once INCLUDESPATH."easyparliament/member.php"; |
|
4 | +include_once INCLUDESPATH . "easyparliament/member.php"; |
|
5 | 5 | |
6 | 6 | $pc = get_http_var('pc'); |
7 | 7 | $pc = preg_replace('#[^a-z0-9 ]#i', '', $pc); |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | $errors['pc'] = "Sorry, we couldn't check your postcode right now. Please use the 'All Mps' link above to browse MPs"; |
14 | 14 | } elseif ($constituency == "") { |
15 | 15 | $errors['pc'] = "Sorry, " . _htmlentities($pc) . " isn't a known postcode"; |
16 | - twfy_debug ('MP', "Can't display an MP, as submitted postcode didn't match a constituency"); |
|
16 | + twfy_debug('MP', "Can't display an MP, as submitted postcode didn't match a constituency"); |
|
17 | 17 | } else { |
18 | 18 | $MEMBER = new MEMBER(array('constituency' => $constituency)); |
19 | 19 | if ($MEMBER->person_id()) { |
@@ -27,5 +27,5 @@ discard block |
||
27 | 27 | } |
28 | 28 | } else { |
29 | 29 | $errors['pc'] = "Sorry, " . _htmlentities($pc) . " isn't a valid postcode"; |
30 | - twfy_debug ('MP', "Can't display an MP because the submitted postcode wasn't of a valid form."); |
|
30 | + twfy_debug('MP', "Can't display an MP because the submitted postcode wasn't of a valid form."); |
|
31 | 31 | } |
@@ -5,16 +5,20 @@ discard block |
||
5 | 5 | |
6 | 6 | $pc = get_http_var('pc'); |
7 | 7 | $pc = preg_replace('#[^a-z0-9 ]#i', '', $pc); |
8 | -if (!$pc) exit; |
|
8 | +if (!$pc) { |
|
9 | + exit; |
|
10 | +} |
|
9 | 11 | |
10 | 12 | if (validate_postcode($pc)) { |
11 | 13 | $constituency = strtolower(MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituency($pc)); |
12 | 14 | if ($constituency == "CONNECTION_TIMED_OUT") { |
13 | 15 | $errors['pc'] = "Sorry, we couldn't check your postcode right now. Please use the 'All Mps' link above to browse MPs"; |
14 | - } elseif ($constituency == "") { |
|
16 | + } |
|
17 | + elseif ($constituency == "") { |
|
15 | 18 | $errors['pc'] = "Sorry, " . _htmlentities($pc) . " isn't a known postcode"; |
16 | 19 | twfy_debug ('MP', "Can't display an MP, as submitted postcode didn't match a constituency"); |
17 | - } else { |
|
20 | + } |
|
21 | + else { |
|
18 | 22 | $MEMBER = new MEMBER(array('constituency' => $constituency)); |
19 | 23 | if ($MEMBER->person_id()) { |
20 | 24 | // This will cookie the postcode. |
@@ -25,7 +29,8 @@ discard block |
||
25 | 29 | header('Location: /rss/mp/' . $MEMBER->person_id() . '.rdf'); |
26 | 30 | } |
27 | 31 | } |
28 | - } else { |
|
32 | + } |
|
33 | + else { |
|
29 | 34 | $errors['pc'] = "Sorry, " . _htmlentities($pc) . " isn't a valid postcode"; |
30 | 35 | twfy_debug ('MP', "Can't display an MP because the submitted postcode wasn't of a valid form."); |
31 | 36 | } |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | <?php |
17 | 17 | } |
18 | 18 | |
19 | -$PAGE->block_start(array ('title'=>'Share the \'Free our Bills!\' campaign')); |
|
19 | +$PAGE->block_start(array('title'=>'Share the \'Free our Bills!\' campaign')); |
|
20 | 20 | freeourbills_styles(); |
21 | 21 | |
22 | 22 | freeourbills_share_page(); |
@@ -25,4 +25,4 @@ discard block |
||
25 | 25 | |
26 | 26 | $PAGE->block_end(); |
27 | 27 | $PAGE->stripe_end(); |
28 | -$PAGE->page_end (); |
|
28 | +$PAGE->page_end(); |
@@ -144,4 +144,4 @@ |
||
144 | 144 | <?php |
145 | 145 | #$PAGE->block_end(); |
146 | 146 | $PAGE->stripe_end(); |
147 | -$PAGE->page_end (); |
|
147 | +$PAGE->page_end(); |
@@ -138,4 +138,4 @@ |
||
138 | 138 | 'type' => 'html', |
139 | 139 | 'content' => '<p align="center"><img title="Duck-billed platypus" src="bill3.jpg" alt="" hspace="10"></p>' |
140 | 140 | ))); |
141 | -$PAGE->page_end (); |
|
141 | +$PAGE->page_end(); |
@@ -44,8 +44,9 @@ |
||
44 | 44 | $pagetitle .= " page $pagenum"; |
45 | 45 | } |
46 | 46 | $num = get_http_var('n'); |
47 | - if (!is_numeric($num) || $num <= 0) |
|
48 | - $num = 20; |
|
47 | + if (!is_numeric($num) || $num <= 0) { |
|
48 | + $num = 20; |
|
49 | + } |
|
49 | 50 | |
50 | 51 | $DATA->set_page_metadata($this_page, 'title', $pagetitle); |
51 | 52 |
@@ -2,8 +2,8 @@ discard block |
||
2 | 2 | # vim:sw=4:ts=4:et:nowrap |
3 | 3 | |
4 | 4 | include_once '../../../includes/easyparliament/init.php'; |
5 | -include_once INCLUDESPATH."easyparliament/member.php"; |
|
6 | -include_once INCLUDESPATH."easyparliament/glossary.php"; |
|
5 | +include_once INCLUDESPATH . "easyparliament/member.php"; |
|
6 | +include_once INCLUDESPATH . "easyparliament/glossary.php"; |
|
7 | 7 | |
8 | 8 | if (!DEVSITE) { |
9 | 9 | header('Cache-Control: max-age=86400'); # Once a day |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | |
50 | 50 | $DATA->set_page_metadata($this_page, 'title', $pagetitle); |
51 | 51 | |
52 | - $args = array ( |
|
52 | + $args = array( |
|
53 | 53 | 's' => $searchstring, |
54 | 54 | 'p' => $pagenum, |
55 | 55 | 'pop' => 1, |
@@ -2,12 +2,12 @@ discard block |
||
2 | 2 | |
3 | 3 | $this_page = 'hansard_bugs'; |
4 | 4 | include_once '../../includes/easyparliament/init.php'; |
5 | -$DATA->set_page_metadata($this_page, 'heading','Official Hansard problems'); |
|
5 | +$DATA->set_page_metadata($this_page, 'heading', 'Official Hansard problems'); |
|
6 | 6 | |
7 | 7 | $PAGE->page_start(); |
8 | 8 | $PAGE->stripe_start(); |
9 | 9 | |
10 | -$PAGE->block_start(array ('title'=>'Things currently noticeable to the user')); |
|
10 | +$PAGE->block_start(array('title'=>'Things currently noticeable to the user')); |
|
11 | 11 | ?> |
12 | 12 | |
13 | 13 | <style type="text/css"> |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | |
111 | 111 | <?php |
112 | 112 | $PAGE->block_end(); |
113 | -$PAGE->block_start(array ('title'=>'Things not noticeable to the user')); |
|
113 | +$PAGE->block_start(array('title'=>'Things not noticeable to the user')); |
|
114 | 114 | ?> |
115 | 115 | |
116 | 116 | <ul> |