Completed
Pull Request — master (#965)
by Nick
05:26
created
www/docs/alert/index.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
 $new_style_template = TRUE;
4 4
 
5 5
 include_once '../../includes/easyparliament/init.php';
6
-include_once INCLUDESPATH . 'easyparliament/member.php';
6
+include_once INCLUDESPATH.'easyparliament/member.php';
7 7
 
8 8
 $alert = new MySociety\TheyWorkForYou\AlertView\Standard($THEUSER);
9 9
 $data = $alert->display($THEUSER);
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-$new_style_template = TRUE;
3
+$new_style_template = true;
4 4
 
5 5
 include_once '../../includes/easyparliament/init.php';
6 6
 include_once INCLUDESPATH . 'easyparliament/member.php';
Please login to merge, or discard this patch.
www/docs/search/rss/index.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
     $searchstring = filter_user_input($searchstring, 'strict');
21 21
     $searchspeaker = trim(get_http_var('pid'));
22 22
     if ($searchspeaker) {
23
-        $searchstring .= " speaker:" . $searchspeaker;
23
+        $searchstring .= " speaker:".$searchspeaker;
24 24
     }
25 25
     $searchmajor = trim(get_http_var('section'));
26 26
     if (!$searchmajor) {
@@ -28,16 +28,16 @@  discard block
 block discarded – undo
28 28
         $searchmajor = trim(get_http_var('maj'));
29 29
     }
30 30
     if ($searchmajor) {
31
-        $searchstring .= " section:" . $searchmajor;
31
+        $searchstring .= " section:".$searchmajor;
32 32
     }
33 33
     $searchgroupby = trim(get_http_var('groupby'));
34 34
     if ($searchgroupby) {
35
-        $searchstring .= " groupby:" . $searchgroupby;
35
+        $searchstring .= " groupby:".$searchgroupby;
36 36
     } // We have only one of these, rather than one in HANSARDLIST also
37 37
     global $SEARCHENGINE;
38 38
     $SEARCHENGINE = new SEARCHENGINE($searchstring);
39 39
 
40
-    $pagetitle = "Search: " . $SEARCHENGINE->query_description_short();
40
+    $pagetitle = "Search: ".$SEARCHENGINE->query_description_short();
41 41
 
42 42
     $pagenum = get_http_var('p');
43 43
     if (is_numeric($pagenum) && $pagenum > 1) {
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
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,
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -44,8 +44,9 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
www/docs/search/index.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,8 +3,8 @@
 block discarded – undo
3 3
 $new_style_template = TRUE;
4 4
 
5 5
 include_once '../../includes/easyparliament/init.php';
6
-include_once INCLUDESPATH . "easyparliament/glossary.php";
7
-include_once INCLUDESPATH . 'easyparliament/member.php';
6
+include_once INCLUDESPATH."easyparliament/glossary.php";
7
+include_once INCLUDESPATH.'easyparliament/member.php';
8 8
 
9 9
 if (!DEVSITE) {
10 10
     header('Cache-Control: max-age=900');
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-$new_style_template = TRUE;
3
+$new_style_template = true;
4 4
 
5 5
 include_once '../../includes/easyparliament/init.php';
6 6
 include_once INCLUDESPATH . "easyparliament/glossary.php";
Please login to merge, or discard this patch.
www/docs/hansardbugs/index.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -2,12 +2,12 @@  discard block
 block discarded – undo
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
 block discarded – undo
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>
Please login to merge, or discard this patch.
www/docs/departments/questions.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
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,19 +19,19 @@  discard block
 block discarded – undo
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
 
26
-    print '<h2>' . _htmlspecialchars(ucwords($dept)) . '</h2>';
26
+    print '<h2>'._htmlspecialchars(ucwords($dept)).'</h2>';
27 27
     print '<h3>Written Questions from the past week</h3>';
28 28
     $q = $db->query('select gid,body from hansard,epobject
29 29
         where hansard.epobject_id=epobject.epobject_id and major=3 and subsection_id=0
30
-        and section_id in (' . join(',', $ids) . ')
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>';
Please login to merge, or discard this patch.
www/docs/departments/statements.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
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,19 +19,19 @@  discard block
 block discarded – undo
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
 
26
-    print '<h2>' . _htmlspecialchars(ucwords($dept)) . '</h2>';
26
+    print '<h2>'._htmlspecialchars(ucwords($dept)).'</h2>';
27 27
     print '<h3>Written Ministerial Statements from the past week</h3>';
28 28
     $q = $db->query('select gid,body from hansard,epobject
29 29
         where hansard.epobject_id=epobject.epobject_id and major=4 and subsection_id=0
30
-        and section_id in (' . join(',', $ids) . ')
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>';
Please login to merge, or discard this patch.
www/docs/departments/index.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
     group by body, major
17 17
     order by body');
18 18
 $data = array();
19
-for ($i=0; $i<$q->rows(); $i++) {
19
+for ($i = 0; $i < $q->rows(); $i++) {
20 20
     $body = $q->field($i, 'body');
21 21
     $major = $q->field($i, 'major');
22 22
     $data[$body][$major] = true;
@@ -26,14 +26,14 @@  discard block
 block discarded – undo
26 26
 
27 27
 print '<ul>';
28 28
 foreach ($data as $body => $arr) {
29
-    $link = strtolower(str_replace(' ','_',$body));
29
+    $link = strtolower(str_replace(' ', '_', $body));
30 30
     print '<li>';
31 31
     print $body;
32 32
     print ' &mdash; ';
33 33
     if (isset($arr[3])) {
34 34
         print '<a href="'.$link.'/questions">Written Questions</a>';
35 35
     }
36
-    if (count($arr)==2)
36
+    if (count($arr) == 2)
37 37
         print ' | ';
38 38
     if (isset($arr[4])) {
39 39
         print '<a href="'.$link.'/statements">Written Ministerial Statements</a>';
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -33,8 +33,9 @@
 block discarded – undo
33 33
     if (isset($arr[3])) {
34 34
         print '<a href="'.$link.'/questions">Written Questions</a>';
35 35
     }
36
-    if (count($arr)==2)
37
-        print ' | ';
36
+    if (count($arr)==2) {
37
+            print ' | ';
38
+    }
38 39
     if (isset($arr[4])) {
39 40
         print '<a href="'.$link.'/statements">Written Ministerial Statements</a>';
40 41
     }
Please login to merge, or discard this patch.
www/docs/random/index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 include_once '../../includes/easyparliament/init.php';
4
-include_once INCLUDESPATH . "easyparliament/glossary.php";
4
+include_once INCLUDESPATH."easyparliament/glossary.php";
5 5
 
6 6
 $this_page = "debate";
7 7
 $this_page = "debates";
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 $q = $db->query("select gid from hansard where htype in (10,11) and major=1 and hdate='$date' order by rand() limit 1");
15 15
 $gid = $q->field(0, 'gid');
16 16
 
17
-$args = array (
17
+$args = array(
18 18
     'gid' => fix_gid_from_db($gid),
19 19
     'sort' => 'regexp_replace',
20 20
 );
Please login to merge, or discard this patch.
www/docs/video/stamps.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -19,8 +19,8 @@  discard block
 block discarded – undo
19 19
 $video = \MySociety\TheyWorkForYou\Utility\Video::fromTimestamp($videodb, $adate, $atime);
20 20
 if (!$video) exit;
21 21
 
22
-$start = date('H:i:s', strtotime($video['broadcast_start']. ' GMT'));
23
-$end = date('H:i:s', strtotime($video['broadcast_end'] . ' GMT'));
22
+$start = date('H:i:s', strtotime($video['broadcast_start'].' GMT'));
23
+$end = date('H:i:s', strtotime($video['broadcast_end'].' GMT'));
24 24
 
25 25
 $q = $db->query("select video_timestamps.gid, adate, atime, time_to_sec(timediff(atime, '$start')) as timediff,
26 26
         time_to_sec(timediff(atime, '$end')) as timetoend
@@ -33,26 +33,26 @@  discard block
 block discarded – undo
33 33
 $gids = array();
34 34
 $file_offset = 0;
35 35
 print '<stamps>';
36
-for ($i=0; $i<$q->rows(); $i++) {
36
+for ($i = 0; $i < $q->rows(); $i++) {
37 37
     $gid = str_replace('uk.org.publicwhip/', '', $q->field($i, 'gid'));
38 38
     if (isset($gids[$gid])) continue;
39 39
     $timetoend = $q->field($i, 'timetoend') - $file_offset;
40
-    if ($timetoend>0) {
40
+    if ($timetoend > 0) {
41 41
         $video = \MySociety\TheyWorkForYou\Utility\Video::fromTimestamp($videodb, $q->field($i, 'adate'), $q->field($i, 'atime'));
42
-        $new_start = date('H:i:s', strtotime($video['broadcast_start']. ' GMT'));
42
+        $new_start = date('H:i:s', strtotime($video['broadcast_start'].' GMT'));
43 43
         $file_offset += timediff($new_start, $start);
44 44
         $start = $new_start;
45
-        $end = date('H:i:s', strtotime($video['broadcast_end'] . ' GMT'));
45
+        $end = date('H:i:s', strtotime($video['broadcast_end'].' GMT'));
46 46
     }
47 47
     $timediff = $q->field($i, 'timediff') - $file_offset;
48
-    if ($timediff>=0)
48
+    if ($timediff >= 0)
49 49
         print "<stamp><gid>$gid</gid><file>$video[id]</file><time>$timediff</time></stamp>\n";
50 50
     $gids[$gid] = true;
51 51
 }
52 52
 print '</stamps>';
53 53
 
54 54
 function timediff($a, $b) {
55
-    return substr($a, 0, 2)*3600 + substr($a, 3, 2)*60 + substr($a, 6, 2)
56
-        - substr($b, 0, 2)*3600 - substr($b, 3, 2)*60 - substr($b, 6, 2);
55
+    return substr($a, 0, 2) * 3600 + substr($a, 3, 2) * 60 + substr($a, 6, 2)
56
+        - substr($b, 0, 2) * 3600 - substr($b, 3, 2) * 60 - substr($b, 6, 2);
57 57
 
58 58
 }
Please login to merge, or discard this patch.
Braces   +9 added lines, -4 removed lines patch added patch discarded remove patch
@@ -17,7 +17,9 @@  discard block
 block discarded – undo
17 17
 $adate = $q->field(0, 'adate');
18 18
 $atime = $q->field(0, 'atime');
19 19
 $video = \MySociety\TheyWorkForYou\Utility\Video::fromTimestamp($videodb, $adate, $atime);
20
-if (!$video) exit;
20
+if (!$video) {
21
+    exit;
22
+}
21 23
 
22 24
 $start = date('H:i:s', strtotime($video['broadcast_start']. ' GMT'));
23 25
 $end = date('H:i:s', strtotime($video['broadcast_end'] . ' GMT'));
@@ -35,7 +37,9 @@  discard block
 block discarded – undo
35 37
 print '<stamps>';
36 38
 for ($i=0; $i<$q->rows(); $i++) {
37 39
     $gid = str_replace('uk.org.publicwhip/', '', $q->field($i, 'gid'));
38
-    if (isset($gids[$gid])) continue;
40
+    if (isset($gids[$gid])) {
41
+        continue;
42
+    }
39 43
     $timetoend = $q->field($i, 'timetoend') - $file_offset;
40 44
     if ($timetoend>0) {
41 45
         $video = \MySociety\TheyWorkForYou\Utility\Video::fromTimestamp($videodb, $q->field($i, 'adate'), $q->field($i, 'atime'));
@@ -45,8 +49,9 @@  discard block
 block discarded – undo
45 49
         $end = date('H:i:s', strtotime($video['broadcast_end'] . ' GMT'));
46 50
     }
47 51
     $timediff = $q->field($i, 'timediff') - $file_offset;
48
-    if ($timediff>=0)
49
-        print "<stamp><gid>$gid</gid><file>$video[id]</file><time>$timediff</time></stamp>\n";
52
+    if ($timediff>=0) {
53
+            print "<stamp><gid>$gid</gid><file>$video[id]</file><time>$timediff</time></stamp>\n";
54
+    }
50 55
     $gids[$gid] = true;
51 56
 }
52 57
 print '</stamps>';
Please login to merge, or discard this patch.