@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | foreach ( $calendar as $year => $months ) { |
3 | 3 | foreach ($months as $month => $dates) { |
4 | - include '_calendar.php'; |
|
4 | + include '_calendar.php'; |
|
5 | 5 | } |
6 | 6 | } ?> |
@@ -1,5 +1,5 @@ |
||
1 | 1 | <?php |
2 | - foreach ( $calendar as $year => $months ) { |
|
2 | + foreach ($calendar as $year => $months) { |
|
3 | 3 | foreach ($months as $month => $dates) { |
4 | 4 | include '_calendar.php'; |
5 | 5 | } |
@@ -32,8 +32,8 @@ |
||
32 | 32 | </div> |
33 | 33 | </div> |
34 | 34 | <?php } else { |
35 | - $section = false; include '_section_content.php'; |
|
36 | - } ?> |
|
35 | + $section = false; include '_section_content.php'; |
|
36 | + } ?> |
|
37 | 37 | |
38 | 38 | </div> |
39 | 39 |
@@ -19,11 +19,11 @@ |
||
19 | 19 | </div> |
20 | 20 | <div class="full-page"> |
21 | 21 | |
22 | - <?php if ( count($data['rows']) == 0 ) { ?> |
|
22 | + <?php if (count($data['rows']) == 0) { ?> |
|
23 | 23 | <div class="debate-speech"> |
24 | 24 | <div class="full-page__row"> |
25 | 25 | <div class="full-page__unit"> |
26 | - <?php if ( $col_country == 'SCOTLAND' || $col_country == 'NORTHERN IRELAND' ) { ?> |
|
26 | + <?php if ($col_country == 'SCOTLAND' || $col_country == 'NORTHERN IRELAND') { ?> |
|
27 | 27 | We only have information about columns for debates in the House of Commons and the House of Lords. |
28 | 28 | <?php } else { ?> |
29 | 29 | We can't find anything in column <?= $column ?> on <?= $debate_day_human ?>. |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | if ($dayOfWeek < 0) { |
42 | 42 | $dayOfWeek = 6; |
43 | 43 | } |
44 | - ?> |
|
44 | + ?> |
|
45 | 45 | <?php } |
46 | 46 | if (!isset($years)) { ?> |
47 | 47 | <div class="calendar__controls"> |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | } else { |
128 | 128 | $day_section = $section; |
129 | 129 | if ($section == 'sp') { |
130 | - $day_section = 'spdebates'; |
|
130 | + $day_section = 'spdebates'; |
|
131 | 131 | } |
132 | 132 | $urls[$day_section . 'day']->insert(array('d'=>$date)); |
133 | 133 | print "<a href=\"" . $urls[$day_section . 'day']->generate() . "\">$currentDay</a></td>"; |
@@ -1,12 +1,12 @@ discard block |
||
1 | 1 | <div class="calendar"> |
2 | - <?php if(isset($month)){ |
|
3 | - $daysOfWeek = array('Mon','Tue','Wed','Thu','Fri','Sat','Sun'); |
|
2 | + <?php if (isset($month)) { |
|
3 | + $daysOfWeek = array('Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'); |
|
4 | 4 | |
5 | 5 | // What is the first day of the month in question? |
6 | - $firstDayOfMonth = mktime(0,0,0,$month,1,$year); |
|
6 | + $firstDayOfMonth = mktime(0, 0, 0, $month, 1, $year); |
|
7 | 7 | |
8 | 8 | // How many days does this month contain? |
9 | - $numberDays = date('t',$firstDayOfMonth); |
|
9 | + $numberDays = date('t', $firstDayOfMonth); |
|
10 | 10 | |
11 | 11 | // Retrieve some information about the first day of the |
12 | 12 | // month in question. |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | if (isset($info['onday'])) { |
19 | 19 | // 'onday' is like 'yyyy-mm-dd'. |
20 | 20 | $datebits = explode('-', $info['onday']); |
21 | - if (count($datebits)>2 && $datebits[0] == $year && $datebits[1] == $month) { |
|
21 | + if (count($datebits) > 2 && $datebits[0] == $year && $datebits[1] == $month) { |
|
22 | 22 | $toDay = $datebits[2]; |
23 | 23 | } else { |
24 | 24 | $toDay = ''; |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | <?php } |
46 | 46 | if (!isset($years)) { ?> |
47 | 47 | <div class="calendar__controls"> |
48 | - <?php if ( isset($prev) ) { ?> |
|
48 | + <?php if (isset($prev)) { ?> |
|
49 | 49 | <a href="<?= $prev['url'] ?>" class="calendar__controls__previous">←</a> |
50 | 50 | <?php } else { ?> |
51 | 51 | <span class="calendar__controls__previous"> </span> |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | <span class="calendar__controls__current"> |
54 | 54 | <?= $monthName ?> <?= $year ?> |
55 | 55 | </span> |
56 | - <?php if ( isset($next) ) { ?> |
|
56 | + <?php if (isset($next)) { ?> |
|
57 | 57 | <a href="<?= $next['url'] ?>" class="calendar__controls__next">→</a> |
58 | 58 | <?php } else { ?> |
59 | 59 | <span class="calendar__controls__next"> </span> |
@@ -106,11 +106,11 @@ discard block |
||
106 | 106 | // sittings - e.g. WH is only Tuesday-Thursday |
107 | 107 | if ($currentDay == $toDay) { |
108 | 108 | print '<td class="on"'; |
109 | - if ($recess[0] && $recess[0]!=1) print ' title="'.$recess[0].'"'; |
|
109 | + if ($recess[0] && $recess[0] != 1) print ' title="' . $recess[0] . '"'; |
|
110 | 110 | print '>'; |
111 | 111 | } elseif ($recess[0]) { |
112 | 112 | print '<td class="no"'; |
113 | - if ($recess[0]!=1) print ' title="'.$recess[0].'"'; |
|
113 | + if ($recess[0] != 1) print ' title="' . $recess[0] . '"'; |
|
114 | 114 | print '>'; |
115 | 115 | } else { |
116 | 116 | print '<td>'; |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | |
119 | 119 | // Is the $currentDay a member of $dates? If so, |
120 | 120 | // the day should be linked. |
121 | - if (in_array($currentDay,$dates)) { |
|
121 | + if (in_array($currentDay, $dates)) { |
|
122 | 122 | |
123 | 123 | $date = sprintf("%04d-%02d-%02d", $year, $month, $currentDay); |
124 | 124 | |
@@ -156,12 +156,12 @@ discard block |
||
156 | 156 | </tr> |
157 | 157 | </tbody> |
158 | 158 | </table> |
159 | - <?php if(!isset($years)){ ?> |
|
159 | + <?php if (!isset($years)) { ?> |
|
160 | 160 | <div class="calendar__footer"> |
161 | 161 | <?php |
162 | 162 | $y = $urls['day']; |
163 | 163 | $y->reset(); |
164 | - $y->insert(array( 'y' => $year )); |
|
164 | + $y->insert(array('y' => $year)); |
|
165 | 165 | $url = $y->generate(); |
166 | 166 | ?> |
167 | 167 | <a href="<?= $url ?>">See all of <?= $year ?></a> |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <div class="calendar"> |
2 | - <?php if(isset($month)){ |
|
2 | + <?php if(isset($month)) { |
|
3 | 3 | $daysOfWeek = array('Mon','Tue','Wed','Thu','Fri','Sat','Sun'); |
4 | 4 | |
5 | 5 | // What is the first day of the month in question? |
@@ -106,11 +106,15 @@ discard block |
||
106 | 106 | // sittings - e.g. WH is only Tuesday-Thursday |
107 | 107 | if ($currentDay == $toDay) { |
108 | 108 | print '<td class="on"'; |
109 | - if ($recess[0] && $recess[0]!=1) print ' title="'.$recess[0].'"'; |
|
109 | + if ($recess[0] && $recess[0]!=1) { |
|
110 | + print ' title="'.$recess[0].'"'; |
|
111 | + } |
|
110 | 112 | print '>'; |
111 | 113 | } elseif ($recess[0]) { |
112 | 114 | print '<td class="no"'; |
113 | - if ($recess[0]!=1) print ' title="'.$recess[0].'"'; |
|
115 | + if ($recess[0]!=1) { |
|
116 | + print ' title="'.$recess[0].'"'; |
|
117 | + } |
|
114 | 118 | print '>'; |
115 | 119 | } else { |
116 | 120 | print '<td>'; |
@@ -49,7 +49,7 @@ |
||
49 | 49 | <?php } ?> |
50 | 50 | </a> |
51 | 51 | <?php } |
52 | - if ( isset($row['excerpt']) ) { ?> |
|
52 | + if ( isset($row['excerpt']) ) { ?> |
|
53 | 53 | <p class="business-list__excerpt"> |
54 | 54 | <?= trim_characters($row['excerpt'], 0, 200 ) ?> |
55 | 55 | </p> |
@@ -84,6 +84,6 @@ |
||
84 | 84 | <?php } ?> |
85 | 85 | </div> |
86 | 86 | |
87 | - <?php $search_title = "Search $title"; include '_search.php'; ?> |
|
87 | + <?php $search_title = "search $title"; include '_search.php'; ?> |
|
88 | 88 | |
89 | 89 | </div> |
@@ -6,32 +6,32 @@ discard block |
||
6 | 6 | <?= $parent_title ?> |
7 | 7 | </h1> |
8 | 8 | <p class="business-section__header__date"> |
9 | - <?= format_date( $info['date'], LONGERDATEFORMAT ) ?> |
|
9 | + <?= format_date($info['date'], LONGERDATEFORMAT) ?> |
|
10 | 10 | </p> |
11 | 11 | </div> |
12 | - <?php if ( isset($rows) ) { ?> |
|
12 | + <?php if (isset($rows)) { ?> |
|
13 | 13 | <div class="business-section__primary"> |
14 | 14 | <ul class="business-list"> |
15 | 15 | <?php |
16 | 16 | $prevlevel = ''; |
17 | - foreach ( $rows as $row ) { ?> |
|
18 | - <?php if ( $row['htype'] == 10 ) { |
|
19 | - if ( $prevlevel == 'sub' ) { ?> |
|
17 | + foreach ($rows as $row) { ?> |
|
18 | + <?php if ($row['htype'] == 10) { |
|
19 | + if ($prevlevel == 'sub') { ?> |
|
20 | 20 | </ul> |
21 | 21 | </li> |
22 | - <?php } elseif ( $prevlevel == 'top' ) { ?> |
|
22 | + <?php } elseif ($prevlevel == 'top') { ?> |
|
23 | 23 | </li> |
24 | 24 | <?php } ?> |
25 | 25 | <li> |
26 | 26 | <?php } else { |
27 | - if ( $prevlevel == '' ) { ?> |
|
27 | + if ($prevlevel == '') { ?> |
|
28 | 28 | <li> |
29 | - <?php } elseif ( $prevlevel == 'top' ) { ?> |
|
29 | + <?php } elseif ($prevlevel == 'top') { ?> |
|
30 | 30 | <ul> |
31 | 31 | <li> |
32 | 32 | <?php } ?> |
33 | 33 | <?php } ?> |
34 | - <?php if ( isset($row['excerpt']) && strstr($row['excerpt'], "was asked—") ) { ?> |
|
34 | + <?php if (isset($row['excerpt']) && strstr($row['excerpt'], "was asked—")) { ?> |
|
35 | 35 | <div class="business-list__title"> |
36 | 36 | <h3> |
37 | 37 | <?= $row['body'] ?> |
@@ -42,26 +42,26 @@ discard block |
||
42 | 42 | <h3> |
43 | 43 | <?= $row['body'] ?> |
44 | 44 | </h3> |
45 | - <?php if ( isset($row['contentcount']) && $row['contentcount'] > 0 ) { ?> |
|
45 | + <?php if (isset($row['contentcount']) && $row['contentcount'] > 0) { ?> |
|
46 | 46 | <span class="business-list__meta"> |
47 | 47 | <?= $row['contentcount'] == 1 ? '1 speech' : $row['contentcount'] . ' speeches' ?> |
48 | 48 | </span> |
49 | 49 | <?php } ?> |
50 | 50 | </a> |
51 | 51 | <?php } |
52 | - if ( isset($row['excerpt']) ) { ?> |
|
52 | + if (isset($row['excerpt'])) { ?> |
|
53 | 53 | <p class="business-list__excerpt"> |
54 | - <?= trim_characters($row['excerpt'], 0, 200 ) ?> |
|
54 | + <?= trim_characters($row['excerpt'], 0, 200) ?> |
|
55 | 55 | </p> |
56 | 56 | <?php } ?> |
57 | - <?php if ( $row['htype'] == 10 ) { |
|
57 | + <?php if ($row['htype'] == 10) { |
|
58 | 58 | $prevlevel = 'top'; |
59 | 59 | } else { |
60 | 60 | $prevlevel = 'sub'; ?> |
61 | 61 | </li> |
62 | 62 | <?php } ?> |
63 | 63 | <?php } ?> |
64 | - <?php if ( $prevlevel == 'sub' ) { ?> |
|
64 | + <?php if ($prevlevel == 'sub') { ?> |
|
65 | 65 | </ul> |
66 | 66 | </li> |
67 | 67 | <?php } ?> |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | </div> |
75 | 75 | <?php |
76 | 76 | include '_calendar_section.php'; |
77 | - include( dirname(__FILE__) . '/../sidebar/looking_for.php' ); |
|
77 | + include(dirname(__FILE__) . '/../sidebar/looking_for.php'); |
|
78 | 78 | ?> |
79 | 79 | </div> |
80 | 80 | <?php } else { ?> |
@@ -12,9 +12,9 @@ |
||
12 | 12 | if ($hansardmajors[$data['info']['major']]['location'] == 'Scotland') { |
13 | 13 | $body = preg_replace('# (S\d[O0WF]-\d+)[, ]#', ' <a href="/spwrans/?spid=$1">$1</a> ', $body); |
14 | 14 | $body = preg_replace_callback('#<citation id="uk\.org\.publicwhip/(.*?)/(.*?)">\[(.*?)\]</citation>#', function($matches) { |
15 | - if ($matches[1] == 'spor') { |
|
16 | - $href_segment = 'sp/?g'; |
|
17 | - } elseif ($matches[1] == 'spwa') { |
|
15 | + if ($matches[1] == 'spor') { |
|
16 | + $href_segment = 'sp/?g'; |
|
17 | + } elseif ($matches[1] == 'spwa') { |
|
18 | 18 | $href_segment = 'spwrans/?'; |
19 | 19 | } else { |
20 | 20 | $href_segment = 'debates/?'; |
@@ -157,7 +157,7 @@ |
||
157 | 157 | <?php # XXX |
158 | 158 | if ($data['info']['major'] == 8 && preg_match('#\d{4}-\d\d-\d\d\.(.*?)\.q#', $speech['gid'], $m)) { |
159 | 159 | ?><p class="debate-speech__question_id"><small> |
160 | - <?= "Question $m[1]" ?> |
|
160 | + <?= "question $m[1]" ?> |
|
161 | 161 | </small></p> |
162 | 162 | <?php } ?> |
163 | 163 | </h2> |
@@ -1,4 +1,4 @@ discard block |
||
1 | - <?php foreach($data['rows'] as $speech) { ?> |
|
1 | + <?php foreach ($data['rows'] as $speech) { ?> |
|
2 | 2 | |
3 | 3 | <?php |
4 | 4 | |
@@ -65,34 +65,34 @@ discard block |
||
65 | 65 | 'url' => $speech['source_url'] |
66 | 66 | ); |
67 | 67 | $major = $data['info']['major']; |
68 | - if ($major==1 || $major==2 || (($major==3 || $major==4) && isset($speech['speaker']['house'])) || $major==101 || $major==6) { |
|
68 | + if ($major == 1 || $major == 2 || (($major == 3 || $major == 4) && isset($speech['speaker']['house'])) || $major == 101 || $major == 6) { |
|
69 | 69 | $source['title'] = 'Citation: '; |
70 | - if ($major==1 || $major==2) { |
|
70 | + if ($major == 1 || $major == 2) { |
|
71 | 71 | $source['title'] .= 'HC'; |
72 | - } elseif ($major==3 || $major==4) { |
|
73 | - if ($speech['speaker']['house']==1) { |
|
72 | + } elseif ($major == 3 || $major == 4) { |
|
73 | + if ($speech['speaker']['house'] == 1) { |
|
74 | 74 | $source['title'] .= 'HC'; |
75 | 75 | } else { |
76 | 76 | $source['title'] .= 'HL'; |
77 | 77 | } |
78 | - } elseif ($major==6) { |
|
78 | + } elseif ($major == 6) { |
|
79 | 79 | $source['title'] .= $data['section_title']; |
80 | 80 | } else { |
81 | 81 | $source['title'] .= 'HL'; |
82 | 82 | } |
83 | 83 | $source['title'] .= ' Deb, ' . format_date($data['info']['date'], LONGDATEFORMAT) . ', c' . $speech['colnum']; |
84 | - if ($major==2) { |
|
84 | + if ($major == 2) { |
|
85 | 85 | $source['title'] .= 'WH'; |
86 | - } elseif ($major==3) { |
|
86 | + } elseif ($major == 3) { |
|
87 | 87 | $source['title'] .= 'W'; |
88 | - } elseif ($major==4) { |
|
88 | + } elseif ($major == 4) { |
|
89 | 89 | $source['title'] .= 'WS'; |
90 | 90 | } |
91 | 91 | } else { |
92 | 92 | $source['title'] = null; |
93 | 93 | } |
94 | 94 | |
95 | - if ($hansardmajors[$data['info']['major']]['location']=='Scotland'){ |
|
95 | + if ($hansardmajors[$data['info']['major']]['location'] == 'Scotland') { |
|
96 | 96 | $source['text'] = 'Official Report source'; |
97 | 97 | } else { |
98 | 98 | $source['text'] = 'Hansard source'; |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | |
110 | 110 | <div class="debate-speech__speaker-and-content"> |
111 | 111 | |
112 | - <?php if(isset($speech['speaker']) && count($speech['speaker']) > 0) { ?> |
|
112 | + <?php if (isset($speech['speaker']) && count($speech['speaker']) > 0) { ?> |
|
113 | 113 | <h2 class="debate-speech__speaker"> |
114 | 114 | <?php |
115 | 115 | |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | <?php } ?> |
167 | 167 | <div class="debate-speech__content"><?=$body ?></div> |
168 | 168 | |
169 | - <?php if ( $section ) { |
|
169 | + <?php if ($section) { |
|
170 | 170 | if ($speech['voting_data']) { ?> |
171 | 171 | |
172 | 172 | <div class="debate-speech__question-answered"> |
@@ -191,10 +191,10 @@ discard block |
||
191 | 191 | |
192 | 192 | // Video |
193 | 193 | if ($data['info']['major'] == 1 && !$individual_item) { # Commons debates only |
194 | - if ($speech['video_status']&4) { ?> |
|
194 | + if ($speech['video_status'] & 4) { ?> |
|
195 | 195 | <a href="<?= $speech['commentsurl'] ?>" class="watch debate-speech__meta__link" onclick="return moveVideo(\'debate/'<?= $speech['gid'] ?>\');">Watch this</a> |
196 | 196 | <?php |
197 | - } elseif (!$speech['video'] && $speech['video_status']&1 && !($speech['video_status']&8)) { |
|
197 | + } elseif (!$speech['video'] && $speech['video_status'] & 1 && !($speech['video_status'] & 8)) { |
|
198 | 198 | $gid_type = $data['info']['major'] == 1 ? 'debate' : 'lords'; ?> |
199 | 199 | <a href="/video/?from=debate&gid=<?= $gid_type ?>/<?= $speech['gid'] ?>" class="timestamp debate-speech__meta__link">Video match this</a> |
200 | 200 | <?php |
@@ -298,7 +298,7 @@ discard block |
||
298 | 298 | $moreinfo[] = $row['totalcomments'] . " $plural"; |
299 | 299 | } |
300 | 300 | if (count($moreinfo) > 0) { |
301 | - print "<small>(" . implode (', ', $moreinfo) . ") </small>"; |
|
301 | + print "<small>(" . implode(', ', $moreinfo) . ") </small>"; |
|
302 | 302 | } |
303 | 303 | } else { |
304 | 304 | // Nothing in this item, so no link. |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | $source['title'] = null; |
93 | 93 | } |
94 | 94 | |
95 | - if ($hansardmajors[$data['info']['major']]['location']=='Scotland'){ |
|
95 | + if ($hansardmajors[$data['info']['major']]['location']=='Scotland') { |
|
96 | 96 | $source['text'] = 'Official Report source'; |
97 | 97 | } else { |
98 | 98 | $source['text'] = 'Hansard source'; |
@@ -190,7 +190,8 @@ discard block |
||
190 | 190 | } # End of voting HTML |
191 | 191 | |
192 | 192 | // Video |
193 | - if ($data['info']['major'] == 1 && !$individual_item) { # Commons debates only |
|
193 | + if ($data['info']['major'] == 1 && !$individual_item) { |
|
194 | +# Commons debates only |
|
194 | 195 | if ($speech['video_status']&4) { ?> |
195 | 196 | <a href="<?= $speech['commentsurl'] ?>" class="watch debate-speech__meta__link" onclick="return moveVideo(\'debate/'<?= $speech['gid'] ?>\');">Watch this</a> |
196 | 197 | <?php |
@@ -242,7 +243,8 @@ discard block |
||
242 | 243 | </li> |
243 | 244 | <?php |
244 | 245 | } |
245 | - if (!$section || !$individual_item) { # XXX ?> |
|
246 | + if (!$section || !$individual_item) { |
|
247 | +# XXX ?> |
|
246 | 248 | <li class="link-to-speech"> |
247 | 249 | <span class="link-to-speech__label">Link to this speech</span> |
248 | 250 | <a href="<?= $speech['listurl'] ?>" class="link debate-speech__meta__link">In context</a> |
@@ -10,17 +10,17 @@ |
||
10 | 10 | <input type="submit" value="Search" class="button search-section__submit"> |
11 | 11 | </div> |
12 | 12 | </div> |
13 | - <?php if ( isset($search_sections) ) { ?> |
|
14 | - <?php if ( count($search_sections) == 1 ) { ?> |
|
13 | + <?php if (isset($search_sections)) { ?> |
|
14 | + <?php if (count($search_sections) == 1) { ?> |
|
15 | 15 | <input name="section" value="<?= $search_sections[0]['section'] ?>" type="hidden"> |
16 | - <?php } else if ( count($search_sections) > 1 ) { ?> |
|
16 | + <?php } else if (count($search_sections) > 1) { ?> |
|
17 | 17 | <div class="search-section__filters"> |
18 | - <?php foreach ( $search_sections as $section ) { ?> |
|
18 | + <?php foreach ($search_sections as $section) { ?> |
|
19 | 19 | <label><input name="section[]" value="<?= $section['section'] ?>" type="checkbox" checked="checked"><?= $section['title'] ?></label> |
20 | 20 | <?php } ?> |
21 | 21 | </div> |
22 | 22 | <?php } |
23 | - } else if ( isset($section) ) { ?> |
|
23 | + } else if (isset($section)) { ?> |
|
24 | 24 | <input name="section" value="<?= $section ?>" type="hidden"> |
25 | 25 | <?php } ?> |
26 | 26 | </form> |
@@ -1,5 +1,5 @@ discard block |
||
1 | - <?php if ( isset($mini_survey) ) { |
|
2 | - if ( $mini_survey['show'] ) { ?> |
|
1 | + <?php if (isset($mini_survey)) { |
|
2 | + if ($mini_survey['show']) { ?> |
|
3 | 3 | <form class="minisurvey" method="post" action="<?=OPTION_SURVEY_URL?>"> |
4 | 4 | <p>Did you find what you were looking for?</p> |
5 | 5 | <input type="hidden" name="sourceidentifier" value="twfy-mini-2"> |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | |
18 | 18 | <input type="submit" value="Submit answer"> |
19 | 19 | </form> |
20 | - <?php } else if ( $mini_survey['answered'] ) { ?> |
|
20 | + <?php } else if ($mini_survey['answered']) { ?> |
|
21 | 21 | <p>Thanks for answering</p> |
22 | 22 | <?php } ?> |
23 | 23 | <?php } ?> |
@@ -41,7 +41,7 @@ |
||
41 | 41 | <div class="row nested-row"> |
42 | 42 | <div class="homepage-in-the-news homepage-content-section"> |
43 | 43 | <?php if ( $featured ) { |
44 | - include dirname(__FILE__) . "/../homepage/featured.php"; |
|
44 | + include dirname(__FILE__) . "/../homepage/featured.php"; |
|
45 | 45 | } ?> |
46 | 46 | </div> |
47 | 47 | <div class="homepage-create-alert homepage-content-section"> |
@@ -4,10 +4,10 @@ discard block |
||
4 | 4 | <div class="hero__mp-search__wrap"> |
5 | 5 | <h1>Do your MLAs represent you?</h1> |
6 | 6 | <div class="row collapse"> |
7 | - <?php if ( count($data['regional']) > 0 ) { ?> |
|
7 | + <?php if (count($data['regional']) > 0) { ?> |
|
8 | 8 | <ul class="homepage-rep-list"> |
9 | 9 | <li>Your MLAs: </li> |
10 | - <?php foreach ( $data['regional'] as $mla ) { ?> |
|
10 | + <?php foreach ($data['regional'] as $mla) { ?> |
|
11 | 11 | <li class="homepage-rep-list__rep"><a href="/mla/?p=<?= $mla['person_id'] ?>"><?= $mla['name'] ?></a></li> |
12 | 12 | <?php } ?> |
13 | 13 | </ul> |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | <div class="panel panel--flushtop clearfix"> |
41 | 41 | <div class="row nested-row"> |
42 | 42 | <div class="homepage-in-the-news homepage-content-section"> |
43 | - <?php if ( $featured ) { |
|
43 | + <?php if ($featured) { |
|
44 | 44 | include dirname(__FILE__) . "/../homepage/featured.php"; |
45 | 45 | } ?> |
46 | 46 | </div> |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | <div class="homepage-recently homepage-content-section"> |
86 | 86 | <h2>Recently in the Northern Ireland Assembly</h2> |
87 | 87 | <ul class="recently__list"><?php |
88 | - foreach ( $debates['recent'] as $recent ) { |
|
88 | + foreach ($debates['recent'] as $recent) { |
|
89 | 89 | include dirname(__FILE__) . '/../homepage/recent-debates.php'; |
90 | 90 | } |
91 | 91 | ?></ul> |
@@ -135,12 +135,16 @@ discard block |
||
135 | 135 | } |
136 | 136 | |
137 | 137 | $recess_major = 1; # For all of UK Parliament |
138 | - if ($hansardmajors[$data['info']['major']]['location'] == 'NI') |
|
139 | - $recess_major = 5; |
|
140 | - elseif ($hansardmajors[$data['info']['major']]['location'] == 'Scotland') |
|
141 | - $recess_major = 4; # For all of Scotland |
|
142 | - elseif ($data['info']['major'] == 101) |
|
143 | - $recess_major = 101; # Lords slightly different |
|
138 | + if ($hansardmajors[$data['info']['major']]['location'] == 'NI') { |
|
139 | + $recess_major = 5; |
|
140 | + } elseif ($hansardmajors[$data['info']['major']]['location'] == 'Scotland') { |
|
141 | + $recess_major = 4; |
|
142 | + } |
|
143 | + # For all of Scotland |
|
144 | + elseif ($data['info']['major'] == 101) { |
|
145 | + $recess_major = 101; |
|
146 | + } |
|
147 | + # Lords slightly different |
|
144 | 148 | $recess = recess_prettify($currentDay, $month, $year, $recess_major); |
145 | 149 | |
146 | 150 | // Is this day actually Today in the real world? |
@@ -149,11 +153,15 @@ discard block |
||
149 | 153 | // sittings - e.g. WH is only Tuesday-Thursday |
150 | 154 | if ($currentDay == $toDay) { |
151 | 155 | print '<td class="on"'; |
152 | - if ($recess[0] && $recess[0]!=1) print ' title="'.$recess[0].'"'; |
|
156 | + if ($recess[0] && $recess[0]!=1) { |
|
157 | + print ' title="'.$recess[0].'"'; |
|
158 | + } |
|
153 | 159 | print '>'; |
154 | 160 | } elseif ($recess[0]) { |
155 | 161 | print '<td class="no"'; |
156 | - if ($recess[0]!=1) print ' title="'.$recess[0].'"'; |
|
162 | + if ($recess[0]!=1) { |
|
163 | + print ' title="'.$recess[0].'"'; |
|
164 | + } |
|
157 | 165 | print '>'; |
158 | 166 | } else { |
159 | 167 | print '<td>'; |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | // $data['info'] may have 'onday', a 'yyyy-mm-dd' date which indicates |
24 | 24 | // which date will be highlighted (otherwise, today is). |
25 | 25 | |
26 | -include_once INCLUDESPATH."easyparliament/recess.php"; |
|
26 | +include_once INCLUDESPATH . "easyparliament/recess.php"; |
|
27 | 27 | global $PAGE, $DATA, $this_page, $hansardmajors; |
28 | 28 | |
29 | 29 | twfy_debug("TEMPLATE", "hansard_calendar.php"); |
@@ -40,13 +40,13 @@ discard block |
||
40 | 40 | |
41 | 41 | |
42 | 42 | // Create array containing abbreviations of days of week. |
43 | - $daysOfWeek = array('Mon','Tue','Wed','Thu','Fri','Sat','Sun'); |
|
43 | + $daysOfWeek = array('Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'); |
|
44 | 44 | |
45 | 45 | // What is the first day of the month in question? |
46 | - $firstDayOfMonth = mktime(0,0,0,$month,1,$year); |
|
46 | + $firstDayOfMonth = mktime(0, 0, 0, $month, 1, $year); |
|
47 | 47 | |
48 | 48 | // How many days does this month contain? |
49 | - $numberDays = date('t',$firstDayOfMonth); |
|
49 | + $numberDays = date('t', $firstDayOfMonth); |
|
50 | 50 | |
51 | 51 | // Retrieve some information about the first day of the |
52 | 52 | // month in question. |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | if (isset($data['info']['onday'])) { |
61 | 61 | // 'onday' is like 'yyyy-mm-dd'. |
62 | 62 | $datebits = explode('-', $data['info']['onday']); |
63 | - if (count($datebits)>2 && $datebits[0] == $year && $datebits[1] == $month) { |
|
63 | + if (count($datebits) > 2 && $datebits[0] == $year && $datebits[1] == $month) { |
|
64 | 64 | $toDay = $datebits[2]; |
65 | 65 | } else { |
66 | 66 | $toDay = ''; |
@@ -149,11 +149,11 @@ discard block |
||
149 | 149 | // sittings - e.g. WH is only Tuesday-Thursday |
150 | 150 | if ($currentDay == $toDay) { |
151 | 151 | print '<td class="on"'; |
152 | - if ($recess[0] && $recess[0]!=1) print ' title="'.$recess[0].'"'; |
|
152 | + if ($recess[0] && $recess[0] != 1) print ' title="' . $recess[0] . '"'; |
|
153 | 153 | print '>'; |
154 | 154 | } elseif ($recess[0]) { |
155 | 155 | print '<td class="no"'; |
156 | - if ($recess[0]!=1) print ' title="'.$recess[0].'"'; |
|
156 | + if ($recess[0] != 1) print ' title="' . $recess[0] . '"'; |
|
157 | 157 | print '>'; |
158 | 158 | } else { |
159 | 159 | print '<td>'; |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | |
162 | 162 | // Is the $currentDay a member of $dates? If so, |
163 | 163 | // the day should be linked. |
164 | - if (in_array($currentDay,$dates)) { |
|
164 | + if (in_array($currentDay, $dates)) { |
|
165 | 165 | |
166 | 166 | $date = sprintf("%04d-%02d-%02d", $year, $month, $currentDay); |
167 | 167 |