Completed
Pull Request — master (#1322)
by Nick
07:54 queued 02:46
created
www/docs/section.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -2,8 +2,8 @@  discard block
 block discarded – undo
2 2
 # For displaying any debate calendar, day, debate, speech page or related.
3 3
 
4 4
 include_once '../includes/easyparliament/init.php';
5
-include_once INCLUDESPATH . "easyparliament/glossary.php";
6
-include_once INCLUDESPATH . "easyparliament/recess.php";
5
+include_once INCLUDESPATH."easyparliament/glossary.php";
6
+include_once INCLUDESPATH."easyparliament/recess.php";
7 7
 
8 8
 # Redirect shortcut.
9 9
 # We no longer want to use the gid parameter, it's all id.
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
     $view = new $class_name();
18 18
     $data = $view->display();
19 19
     if ($data) {
20
-        if ( !empty($data['template']) ) {
20
+        if (!empty($data['template'])) {
21 21
             $template = $data['template'];
22 22
         } else {
23 23
             $template = 'section/section';
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
 }
14 14
 
15 15
 if ($type = ucfirst(get_http_var('type'))) {
16
-    $class_name = "MySociety\TheyWorkForYou\SectionView\\${type}View";
16
+    $class_name = "MySociety\TheyWorkForYou\SectionView\\${type}view";
17 17
     $view = new $class_name();
18 18
     $data = $view->display();
19 19
     if ($data) {
Please login to merge, or discard this patch.
www/docs/alert/update-mp/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\Simple($THEUSER);
9 9
 $data = $alert->display();
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/alert/authed.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 // $Id: authed.php,v 1.1 2006-05-26 08:44:46 matthew Exp $
10 10
 
11 11
 include_once '../../includes/easyparliament/init.php';
12
-include_once INCLUDESPATH . '../../commonlib/phplib/auth.php';
12
+include_once INCLUDESPATH.'../../commonlib/phplib/auth.php';
13 13
 
14 14
 header("Content-Type: text/plain");
15 15
 
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
         $db = new ParlDB;
24 24
         $q = $db->query('select alert_id from alerts where email = :email and criteria = :criteria and confirmed and not deleted', array(
25 25
             ':email' => $email,
26
-            ':criteria' => 'speaker:' . $pid
26
+            ':criteria' => 'speaker:'.$pid
27 27
             ));
28 28
         $already_signed = $q->rows();
29 29
         if ($already_signed)
Please login to merge, or discard this patch.
Braces   +8 added lines, -6 removed lines patch added patch discarded remove patch
@@ -16,8 +16,9 @@  discard block
 block discarded – undo
16 16
 $email = get_http_var('email');
17 17
 $sign = get_http_var('sign');
18 18
 $pid = get_http_var('pid');
19
-if (!$pid || !ctype_digit($pid)) print 'not valid';
20
-else {
19
+if (!$pid || !ctype_digit($pid)) {
20
+    print 'not valid';
21
+} else {
21 22
     $authed = auth_verify_with_shared_secret($email, OPTION_AUTH_SHARED_SECRET, $sign);
22 23
     if ($authed) {
23 24
         $db = new ParlDB;
@@ -26,10 +27,11 @@  discard block
 block discarded – undo
26 27
             ':criteria' => 'speaker:' . $pid
27 28
             ));
28 29
         $already_signed = $q->rows();
29
-        if ($already_signed)
30
-            print "already signed";
31
-        else
32
-            print "not signed";
30
+        if ($already_signed) {
31
+                    print "already signed";
32
+        } else {
33
+                    print "not signed";
34
+        }
33 35
     } else {
34 36
         print "not authed";
35 37
     }
Please login to merge, or discard this patch.
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.