@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | WHERE constituency IN ('" . join("','", $a) . "') |
70 | 70 | AND ( ( house = 3 and left_house = '2011-03-24' ) or ( house = 4 and left_house = '2011-03-23') )"); |
71 | 71 | $mreg = array(); |
72 | - for ($i=0; $i<$q->rows(); $i++) { |
|
72 | + for ($i = 0; $i < $q->rows(); $i++) { |
|
73 | 73 | $cons = $q->field($i, 'constituency'); |
74 | 74 | $house = $q->field($i, 'house'); |
75 | 75 | if (($house == 4 && $cons == $current['SPC']) || ($house == 3 && $cons == $current['NIE'])) { |
@@ -134,8 +134,8 @@ discard block |
||
134 | 134 | <li>You were in the <strong><?=$current['SPC']?></strong> constituency, in the <strong><?=$current['SPE']?></strong> region; your constituency MSP was <a href='<?=$mp_url?>'><?=$name?></a>, and your regional MSPs were <?php |
135 | 135 | foreach ($mreg as $k => $n) { |
136 | 136 | print "<a href='/msp/" . make_member_url($n, '', 4) . "'>$n</a>"; |
137 | - if ($k < count($mreg)-2) print ', '; |
|
138 | - elseif ($k == count($mreg)-2) print ' and '; |
|
137 | + if ($k < count($mreg) - 2) print ', '; |
|
138 | + elseif ($k == count($mreg) - 2) print ' and '; |
|
139 | 139 | } |
140 | 140 | echo '.</li>'; |
141 | 141 | } elseif ($country == 'N') { |
@@ -21,7 +21,8 @@ discard block |
||
21 | 21 | if ($pc) { |
22 | 22 | # current will have WMC key. If Scottish, has SPC and SPE too. If NI, has NIE. |
23 | 23 | $mapit = mapit_call('postcode', $pc); |
24 | - if (is_object($mapit)) { # RABX error returns an object |
|
24 | + if (is_object($mapit)) { |
|
25 | +# RABX error returns an object |
|
25 | 26 | print '<p class="error">Afraid we couldn’t find that postcode.</p>'; |
26 | 27 | $pc = ''; |
27 | 28 | } |
@@ -134,8 +135,11 @@ discard block |
||
134 | 135 | <li>You were in the <strong><?=$current['SPC']?></strong> constituency, in the <strong><?=$current['SPE']?></strong> region; your constituency MSP was <a href='<?=$mp_url?>'><?=$name?></a>, and your regional MSPs were <?php |
135 | 136 | foreach ($mreg as $k => $n) { |
136 | 137 | print "<a href='/msp/" . make_member_url($n, '', 4) . "'>$n</a>"; |
137 | - if ($k < count($mreg)-2) print ', '; |
|
138 | - elseif ($k == count($mreg)-2) print ' and '; |
|
138 | + if ($k < count($mreg)-2) { |
|
139 | + print ', '; |
|
140 | + } elseif ($k == count($mreg)-2) { |
|
141 | + print ' and '; |
|
142 | + } |
|
139 | 143 | } |
140 | 144 | echo '.</li>'; |
141 | 145 | } elseif ($country == 'N') { |
@@ -12,8 +12,8 @@ |
||
12 | 12 | |
13 | 13 | $ym = substr($date, 0, 7); |
14 | 14 | if ($ym != $last) { |
15 | - $url = WEBPATH . "news/archives/".str_replace("-", "/", $ym); |
|
16 | - print "<a href=\"$url\">".format_date($ym."-01", "F Y")."</a>"; |
|
15 | + $url = WEBPATH . "news/archives/" . str_replace("-", "/", $ym); |
|
16 | + print "<a href=\"$url\">" . format_date($ym . "-01", "F Y") . "</a>"; |
|
17 | 17 | print "<br>"; |
18 | 18 | $last = $ym; |
19 | 19 | } |
@@ -55,7 +55,7 @@ |
||
55 | 55 | $want['hpos'] = $q->field(0, 'hpos'); |
56 | 56 | |
57 | 57 | $LIST = new DEBATELIST; |
58 | - $args = array ( |
|
58 | + $args = array( |
|
59 | 59 | 's' => $search, |
60 | 60 | 'p' => 1, |
61 | 61 | 'num' => 200, |
@@ -11,7 +11,7 @@ |
||
11 | 11 | $view = new MySociety\TheyWorkForYou\SectionView\WransView(); |
12 | 12 | $data = $view->display(); |
13 | 13 | if ($data) { |
14 | - if ( $data['template'] ) { |
|
14 | + if ($data['template']) { |
|
15 | 15 | $template = $data['template']; |
16 | 16 | } else { |
17 | 17 | $template = 'section/section'; |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | |
12 | 12 | if (!$dept) { |
13 | 13 | } else { |
14 | - $dept = strtolower(str_replace('_',' ',$dept)); |
|
14 | + $dept = strtolower(str_replace('_', ' ', $dept)); |
|
15 | 15 | $q = $db->query('select epobject.epobject_id from hansard,epobject |
16 | 16 | where hansard.epobject_id=epobject.epobject_id and major=3 and section_id=0 |
17 | 17 | and hdate>(select max(hdate) from hansard where major=3) - interval 7 day |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | ':dept' => $dept |
20 | 20 | )); |
21 | 21 | $ids = array(); |
22 | - for ($i=0; $i<$q->rows(); $i++) { |
|
22 | + for ($i = 0; $i < $q->rows(); $i++) { |
|
23 | 23 | $ids[] = $q->field($i, 'epobject_id'); |
24 | 24 | } |
25 | 25 | |
@@ -30,8 +30,8 @@ discard block |
||
30 | 30 | and section_id in (' . join(',', $ids) . ') |
31 | 31 | order by body'); |
32 | 32 | print '<ul>'; |
33 | - for ($i=0; $i<$q->rows(); $i++) { |
|
34 | - print '<li><a href="/wrans/?id=' . fix_gid_from_db($q->field($i, 'gid')). '">' . $q->field($i, 'body'). '</a>'; |
|
33 | + for ($i = 0; $i < $q->rows(); $i++) { |
|
34 | + print '<li><a href="/wrans/?id=' . fix_gid_from_db($q->field($i, 'gid')) . '">' . $q->field($i, 'body') . '</a>'; |
|
35 | 35 | print '</li>'; |
36 | 36 | } |
37 | 37 | print '</ul>'; |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | |
12 | 12 | if (!$dept) { |
13 | 13 | } else { |
14 | - $dept = strtolower(str_replace('_',' ',$dept)); |
|
14 | + $dept = strtolower(str_replace('_', ' ', $dept)); |
|
15 | 15 | $q = $db->query('select epobject.epobject_id from hansard,epobject |
16 | 16 | where hansard.epobject_id=epobject.epobject_id and major=4 and section_id=0 |
17 | 17 | and hdate>(select max(hdate) from hansard where major=4) - interval 7 day |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | ':dept' => $dept |
20 | 20 | )); |
21 | 21 | $ids = array(); |
22 | - for ($i=0; $i<$q->rows(); $i++) { |
|
22 | + for ($i = 0; $i < $q->rows(); $i++) { |
|
23 | 23 | $ids[] = $q->field($i, 'epobject_id'); |
24 | 24 | } |
25 | 25 | |
@@ -30,8 +30,8 @@ discard block |
||
30 | 30 | and section_id in (' . join(',', $ids) . ') |
31 | 31 | order by body'); |
32 | 32 | print '<ul>'; |
33 | - for ($i=0; $i<$q->rows(); $i++) { |
|
34 | - print '<li><a href="/wms/?id=' . fix_gid_from_db($q->field($i, 'gid')). '">' . $q->field($i, 'body'). '</a>'; |
|
33 | + for ($i = 0; $i < $q->rows(); $i++) { |
|
34 | + print '<li><a href="/wms/?id=' . fix_gid_from_db($q->field($i, 'gid')) . '">' . $q->field($i, 'body') . '</a>'; |
|
35 | 35 | print '</li>'; |
36 | 36 | } |
37 | 37 | print '</ul>'; |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | $sysretval = 0; |
108 | 108 | $personid = get_http_var('editperson'); |
109 | 109 | |
110 | - $q = $db->query("DELETE FROM personinfo WHERE data_key = 'mp_website' AND personinfo.person_id = :person_id", array( |
|
110 | + $q = $db->query("DELETE FROM personinfo WHERE data_key = 'mp_website' AND personinfo.person_id = :person_id", array( |
|
111 | 111 | ':person_id' => $personid |
112 | 112 | )); |
113 | 113 | |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | if ($q->success()) { |
122 | 122 | exec($scriptpath . "/db2xml.pl --update_person --personid=" . escapeshellarg($personid) . " --debug", $exec_output); |
123 | 123 | $out = '<p id="warning">'; |
124 | - foreach ($exec_output as $message) {$out .= $message . "<br>";} |
|
124 | + foreach ($exec_output as $message) {$out .= $message . "<br>"; } |
|
125 | 125 | $out .= '</p>'; |
126 | 126 | # ../../../scripts/db2xml.pl --update_person --personid=10001 |
127 | 127 | } |
@@ -140,9 +140,9 @@ discard block |
||
140 | 140 | |
141 | 141 | $rettext .= '<div id="subnav_websites">'; |
142 | 142 | foreach ($subnav as $label => $path) { |
143 | - $rettext .= '<a href="'. $path . '">'. $label .'</a>'; |
|
143 | + $rettext .= '<a href="' . $path . '">' . $label . '</a>'; |
|
144 | 144 | } |
145 | - $rettext .= '</div>'; |
|
145 | + $rettext .= '</div>'; |
|
146 | 146 | |
147 | 147 | return $rettext; |
148 | 148 | } |
@@ -1,7 +1,7 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | include_once '../../includes/easyparliament/init.php'; |
4 | -include_once (INCLUDESPATH."easyparliament/searchlog.php"); |
|
4 | +include_once (INCLUDESPATH . "easyparliament/searchlog.php"); |
|
5 | 5 | |
6 | 6 | $this_page = "admin_popularsearches"; |
7 | 7 | |
@@ -14,14 +14,14 @@ discard block |
||
14 | 14 | |
15 | 15 | $rows = array(); |
16 | 16 | foreach ($search_popular as $row) { |
17 | - $rows[] = array ( |
|
18 | - '<a href="'.$row['url'].'">' . _htmlentities($row['query']) . '</a>', |
|
17 | + $rows[] = array( |
|
18 | + '<a href="' . $row['url'] . '">' . _htmlentities($row['query']) . '</a>', |
|
19 | 19 | $row['c'], |
20 | 20 | ); |
21 | 21 | } |
22 | 22 | |
23 | -$tabledata = array ( |
|
24 | - 'header' => array ( |
|
23 | +$tabledata = array( |
|
24 | + 'header' => array( |
|
25 | 25 | 'Query', |
26 | 26 | 'Count' |
27 | 27 | ), |
@@ -1,7 +1,7 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | include_once '../../includes/easyparliament/init.php'; |
4 | -include_once (INCLUDESPATH."easyparliament/searchlog.php"); |
|
4 | +include_once (INCLUDESPATH . "easyparliament/searchlog.php"); |
|
5 | 5 | |
6 | 6 | $this_page = "admin_searchlogs"; |
7 | 7 | |
@@ -18,8 +18,8 @@ discard block |
||
18 | 18 | $host = trim_characters($host, strlen($host) - 25, 100); |
19 | 19 | $time = relative_time($row['query_time']); |
20 | 20 | $time = str_replace(" ago", "", $time); |
21 | - $rows[] = array ( |
|
22 | - '<a href="'.$row['url'].'">' . _htmlentities($row['query']) . '</a>', |
|
21 | + $rows[] = array( |
|
22 | + '<a href="' . $row['url'] . '">' . _htmlentities($row['query']) . '</a>', |
|
23 | 23 | $row['page_number'], |
24 | 24 | $row['count_hits'], |
25 | 25 | $host, |
@@ -27,8 +27,8 @@ discard block |
||
27 | 27 | ); |
28 | 28 | } |
29 | 29 | |
30 | -$tabledata = array ( |
|
31 | - 'header' => array ( |
|
30 | +$tabledata = array( |
|
31 | + 'header' => array( |
|
32 | 32 | 'Query', |
33 | 33 | 'Page', |
34 | 34 | 'Hits', |