Completed
Pull Request — master (#965)
by Nick
05:26
created
www/docs/api/api_getComments.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 }
25 25
 
26 26
 function api_getComments_start_date($start_date) {
27
-        $args = array (
27
+        $args = array(
28 28
             'start_date' => $start_date,
29 29
             'end_date' => get_http_var('end_date')
30 30
         );
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 }
34 34
 
35 35
 function api_getComments_search($s) {
36
-        $args = array (
36
+        $args = array(
37 37
             's' => $s,
38 38
             'p' => get_http_var('page'),
39 39
             'num' => get_http_var('num'),
Please login to merge, or discard this patch.
www/docs/api/api_getMLA.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-include_once INCLUDESPATH . 'easyparliament/member.php';
4
-include_once dirname(__FILE__) . '/api_getPerson.php';
3
+include_once INCLUDESPATH.'easyparliament/member.php';
4
+include_once dirname(__FILE__).'/api_getPerson.php';
5 5
 
6 6
 function api_getMLA_front() {
7 7
 ?>
Please login to merge, or discard this patch.
www/docs/api/api_getMSPs.php 1 patch
Spacing   +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
-include_once dirname(__FILE__) . '/api_getMembers.php';
3
+include_once dirname(__FILE__).'/api_getMembers.php';
4 4
 
5 5
 function api_getMSPs_front() {
6 6
 ?>
Please login to merge, or discard this patch.
www/docs/api/api_getWMS.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-include_once dirname(__FILE__) . '/api_getHansard.php';
3
+include_once dirname(__FILE__).'/api_getHansard.php';
4 4
 
5 5
 function api_getWMS_front() {
6 6
 ?>
@@ -100,11 +100,11 @@  discard block
 block discarded – undo
100 100
     _api_getHansard_year('WMS', $y);
101 101
 }
102 102
 function api_getWMS_search($s) {
103
-    _api_getHansard_search( array(
103
+    _api_getHansard_search(array(
104 104
         's' => $s,
105 105
         'pid' => get_http_var('person'),
106 106
         'type' => 'wms',
107
-    ) );
107
+    ));
108 108
 }
109 109
 function api_getWMS_person($pid) {
110 110
     _api_getHansard_search(array(
Please login to merge, or discard this patch.
www/docs/api/api_getMPsInfo.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -27,10 +27,10 @@  discard block
 block discarded – undo
27 27
     $db = new ParlDB;
28 28
     $last_mod = 0;
29 29
     $q = $db->query("select person_id, data_key, data_value, lastupdate from personinfo
30
-        where person_id in (" . $ids . ")");
30
+        where person_id in (" . $ids.")");
31 31
     if ($q->rows()) {
32 32
         $output = array();
33
-        for ($i=0; $i<$q->rows(); $i++) {
33
+        for ($i = 0; $i < $q->rows(); $i++) {
34 34
             $data_key = $q->field($i, 'data_key');
35 35
             if (count($fields) && !in_array($data_key, $fields))
36 36
                 continue;
@@ -41,10 +41,10 @@  discard block
 block discarded – undo
41 41
                 $last_mod = $time;
42 42
         }
43 43
         $q = $db->query("select memberinfo.*, person_id from memberinfo, member
44
-            where memberinfo.member_id=member.member_id and person_id in (" . $ids . ")
44
+            where memberinfo.member_id=member.member_id and person_id in (" . $ids.")
45 45
             order by person_id,member_id");
46 46
         if ($q->rows()) {
47
-            for ($i=0; $i<$q->rows(); $i++) {
47
+            for ($i = 0; $i < $q->rows(); $i++) {
48 48
                 $data_key = $q->field($i, 'data_key');
49 49
                 if (count($fields) && !in_array($data_key, $fields))
50 50
                     continue;
Please login to merge, or discard this patch.
Braces   +21 added lines, -11 removed lines patch added patch discarded remove patch
@@ -20,7 +20,9 @@  discard block
 block discarded – undo
20 20
     $ids = preg_split('#\s*,\s*#', $ids, -1, PREG_SPLIT_NO_EMPTY);
21 21
     $safe_ids = array(0);
22 22
     foreach ($ids as $id) {
23
-        if (ctype_digit($id)) $safe_ids[] = $id;
23
+        if (ctype_digit($id)) {
24
+            $safe_ids[] = $id;
25
+        }
24 26
     }
25 27
     $ids = join(',', $safe_ids);
26 28
 
@@ -32,13 +34,15 @@  discard block
 block discarded – undo
32 34
         $output = array();
33 35
         for ($i=0; $i<$q->rows(); $i++) {
34 36
             $data_key = $q->field($i, 'data_key');
35
-            if (count($fields) && !in_array($data_key, $fields))
36
-                continue;
37
+            if (count($fields) && !in_array($data_key, $fields)) {
38
+                            continue;
39
+            }
37 40
             $pid = $q->field($i, 'person_id');
38 41
             $output[$pid][$data_key] = $q->field($i, 'data_value');
39 42
             $time = strtotime($q->field($i, 'lastupdate'));
40
-            if ($time > $last_mod)
41
-                $last_mod = $time;
43
+            if ($time > $last_mod) {
44
+                            $last_mod = $time;
45
+            }
42 46
         }
43 47
         $q = $db->query("select memberinfo.*, person_id from memberinfo, member
44 48
             where memberinfo.member_id=member.member_id and person_id in (" . $ids . ")
@@ -46,16 +50,22 @@  discard block
 block discarded – undo
46 50
         if ($q->rows()) {
47 51
             for ($i=0; $i<$q->rows(); $i++) {
48 52
                 $data_key = $q->field($i, 'data_key');
49
-                if (count($fields) && !in_array($data_key, $fields))
50
-                    continue;
53
+                if (count($fields) && !in_array($data_key, $fields)) {
54
+                                    continue;
55
+                }
51 56
                 $mid = $q->field($i, 'member_id');
52 57
                 $pid = $q->field($i, 'person_id');
53
-                if (!isset($output[$pid]['by_member_id'])) $output[$pid]['by_member_id'] = array();
54
-                if (!isset($output[$pid]['by_member_id'][$mid])) $output[$pid]['by_member_id'][$mid] = array();
58
+                if (!isset($output[$pid]['by_member_id'])) {
59
+                    $output[$pid]['by_member_id'] = array();
60
+                }
61
+                if (!isset($output[$pid]['by_member_id'][$mid])) {
62
+                    $output[$pid]['by_member_id'][$mid] = array();
63
+                }
55 64
                 $output[$pid]['by_member_id'][$mid][$data_key] = $q->field($i, 'data_value');
56 65
                 $time = strtotime($q->field($i, 'lastupdate'));
57
-                if ($time > $last_mod)
58
-                    $last_mod = $time;
66
+                if ($time > $last_mod) {
67
+                                    $last_mod = $time;
68
+                }
59 69
             }
60 70
         }
61 71
         ksort($output);
Please login to merge, or discard this patch.
www/docs/api/index.php 3 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -26,17 +26,17 @@  discard block
 block discarded – undo
26 26
     $match = 0;
27 27
     foreach ($methods as $method => $data) {
28 28
         if (strtolower($q_method) == strtolower($method)) {
29
-      if (isset($data['superuser']) && $data['superuser']) {
29
+        if (isset($data['superuser']) && $data['superuser']) {
30 30
         $super_check = api_is_superuser_key($key);
31 31
         if (!$super_check) {
32 32
                 if (get_http_var('docs')) {
33
-                  api_front_page();
33
+                    api_front_page();
34 34
                 } else {
35
-                  api_error('Invalid API key.');
36
-                  exit;
37
-              }
35
+                    api_error('Invalid API key.');
36
+                    exit;
37
+                }
38 38
             }
39
-      }
39
+        }
40 40
 
41 41
             api_log_call($key);
42 42
             $match++;
@@ -73,9 +73,9 @@  discard block
 block discarded – undo
73 73
             '". Possible functions are: ' .
74 74
             join(', ', array_keys($methods));
75 75
         if (get_http_var('output')) {
76
-          api_error($msg);
76
+            api_error($msg);
77 77
         } else {
78
-          api_front_page($msg);
78
+            api_front_page($msg);
79 79
         }
80 80
     } else {
81 81
         if (get_http_var('docs')) {
Please login to merge, or discard this patch.
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -47,20 +47,20 @@  discard block
 block discarded – undo
47 47
             foreach ($data['parameters'] as $parameter) {
48 48
                 if ($q_param = trim(get_http_var($parameter))) {
49 49
                     $match++;
50
-                    include_once 'api_'. $method . '.php';
51
-                    api_call_user_func_or_error('api_' . $method . '_' . $parameter, array($q_param), 'API call not yet functional', 'api');
50
+                    include_once 'api_'.$method.'.php';
51
+                    api_call_user_func_or_error('api_'.$method.'_'.$parameter, array($q_param), 'API call not yet functional', 'api');
52 52
                     break;
53 53
                 }
54 54
             }
55 55
             if ($match == 1 && (get_http_var('output') || !get_http_var('docs'))) {
56 56
                 if ($data['required']) {
57
-                    api_error('No parameter provided to function "' .
58
-                    _htmlspecialchars($q_method) .
59
-                        '". Possible choices are: ' .
60
-                        join(', ', $data['parameters']) );
57
+                    api_error('No parameter provided to function "'.
58
+                    _htmlspecialchars($q_method).
59
+                        '". Possible choices are: '.
60
+                        join(', ', $data['parameters']));
61 61
                 } else {
62
-                    include_once 'api_'. $method . '.php';
63
-                    api_call_user_func_or_error('api_' . $method, array(), 'API call not yet functional', 'api');
62
+                    include_once 'api_'.$method.'.php';
63
+                    api_call_user_func_or_error('api_'.$method, array(), 'API call not yet functional', 'api');
64 64
                     break;
65 65
                 }
66 66
             }
@@ -69,8 +69,8 @@  discard block
 block discarded – undo
69 69
     }
70 70
     if (!$match) {
71 71
         api_log_call($key);
72
-        $msg = 'Unknown function "' . _htmlspecialchars($q_method) .
73
-            '". Possible functions are: ' .
72
+        $msg = 'Unknown function "'._htmlspecialchars($q_method).
73
+            '". Possible functions are: '.
74 74
             join(', ', array_keys($methods));
75 75
         if (get_http_var('output')) {
76 76
           api_error($msg);
@@ -93,29 +93,29 @@  discard block
 block discarded – undo
93 93
     $DATA->set_page_metadata($this_page, 'title', "$method function");
94 94
     $PAGE->page_start();
95 95
     $PAGE->stripe_start();
96
-    include_once 'api_'. $method . '.php';
97
-    print '<p align="center"><strong>https://www.theyworkforyou.com/api/' . $method . '</strong></p>';
98
-    api_call_user_func_or_error('api_' . $method . '_front', array(), 'No documentation yet', 'html');
96
+    include_once 'api_'.$method.'.php';
97
+    print '<p align="center"><strong>https://www.theyworkforyou.com/api/'.$method.'</strong></p>';
98
+    api_call_user_func_or_error('api_'.$method.'_front', array(), 'No documentation yet', 'html');
99 99
 ?>
100 100
 <h4>Explorer</h4>
101 101
 <p>Try out this function without writing any code!</p>
102 102
 <form method="get" action="?#output">
103 103
 <p>
104 104
 <?php foreach ($methods[$method]['parameters'] as $parameter) {
105
-    print $parameter . ': <input type="text" name="'.$parameter.'" value="';
105
+    print $parameter.': <input type="text" name="'.$parameter.'" value="';
106 106
     if ($val = get_http_var($parameter))
107 107
         print _htmlspecialchars($val);
108 108
     print '" size="30"><br>';
109 109
 }
110 110
 ?>
111 111
 Output:
112
-<input id="output_js" type="radio" name="output" value="js"<?php if (get_http_var('output')=='js' || !get_http_var('output')) print ' checked'?>>
112
+<input id="output_js" type="radio" name="output" value="js"<?php if (get_http_var('output') == 'js' || !get_http_var('output')) print ' checked'?>>
113 113
 <label for="output_js">JS</label>
114
-<input id="output_xml" type="radio" name="output" value="xml"<?php if (get_http_var('output')=='xml') print ' checked'?>>
114
+<input id="output_xml" type="radio" name="output" value="xml"<?php if (get_http_var('output') == 'xml') print ' checked'?>>
115 115
 <label for="output_xml">XML</label>
116
-<input id="output_php" type="radio" name="output" value="php"<?php if (get_http_var('output')=='php') print ' checked'?>>
116
+<input id="output_php" type="radio" name="output" value="php"<?php if (get_http_var('output') == 'php') print ' checked'?>>
117 117
 <label for="output_php">Serialised PHP</label>
118
-<input id="output_rabx" type="radio" name="output" value="rabx"<?php if (get_http_var('output')=='rabx') print ' checked'?>>
118
+<input id="output_rabx" type="radio" name="output" value="rabx"<?php if (get_http_var('output') == 'rabx') print ' checked'?>>
119 119
 <label for="output_rabx">RABX</label>
120 120
 
121 121
 <input type="submit" value="Go">
@@ -126,12 +126,12 @@  discard block
 block discarded – undo
126 126
         $qs = array();
127 127
         foreach ($methods[$method]['parameters'] as $parameter) {
128 128
             if (get_http_var($parameter))
129
-                $qs[] = _htmlspecialchars(rawurlencode($parameter) . '=' . urlencode(get_http_var($parameter)));
129
+                $qs[] = _htmlspecialchars(rawurlencode($parameter).'='.urlencode(get_http_var($parameter)));
130 130
         }
131 131
         print '<h4><a name="output"></a>Output</h4>';
132 132
         print '<p>URL for this: <strong>https://www.theyworkforyou.com/api/';
133
-        print $method . '?' . join('&amp;', $qs) . '&amp;output='._htmlspecialchars(get_http_var('output')).'</strong></p>';
134
-        print '<pre>' . _htmlspecialchars($explorer) . '</pre>';
133
+        print $method.'?'.join('&amp;', $qs).'&amp;output='._htmlspecialchars(get_http_var('output')).'</strong></p>';
134
+        print '<pre>'._htmlspecialchars($explorer).'</pre>';
135 135
     }
136 136
     $sidebar = api_sidebar();
137 137
     $PAGE->stripe_end(array($sidebar));
Please login to merge, or discard this patch.
Braces   +9 added lines, -5 removed lines patch added patch discarded remove patch
@@ -103,13 +103,15 @@  discard block
 block discarded – undo
103 103
 <p>
104 104
 <?php foreach ($methods[$method]['parameters'] as $parameter) {
105 105
     print $parameter . ': <input type="text" name="'.$parameter.'" value="';
106
-    if ($val = get_http_var($parameter))
107
-        print _htmlspecialchars($val);
106
+    if ($val = get_http_var($parameter)) {
107
+            print _htmlspecialchars($val);
108
+    }
108 109
     print '" size="30"><br>';
109 110
 }
110 111
 ?>
111 112
 Output:
112
-<input id="output_js" type="radio" name="output" value="js"<?php if (get_http_var('output')=='js' || !get_http_var('output')) print ' checked'?>>
113
+<input id="output_js" type="radio" name="output" value="js"<?php if (get_http_var('output')=='js' || !get_http_var('output')) {
114
+    print ' checked'?>>
113 115
 <label for="output_js">JS</label>
114 116
 <input id="output_xml" type="radio" name="output" value="xml"<?php if (get_http_var('output')=='xml') print ' checked'?>>
115 117
 <label for="output_xml">XML</label>
@@ -124,9 +126,11 @@  discard block
 block discarded – undo
124 126
 <?php
125 127
     if ($explorer) {
126 128
         $qs = array();
129
+}
127 130
         foreach ($methods[$method]['parameters'] as $parameter) {
128
-            if (get_http_var($parameter))
129
-                $qs[] = _htmlspecialchars(rawurlencode($parameter) . '=' . urlencode(get_http_var($parameter)));
131
+            if (get_http_var($parameter)) {
132
+                            $qs[] = _htmlspecialchars(rawurlencode($parameter) . '=' . urlencode(get_http_var($parameter)));
133
+            }
130 134
         }
131 135
         print '<h4><a name="output"></a>Output</h4>';
132 136
         print '<p>URL for this: <strong>https://www.theyworkforyou.com/api/';
Please login to merge, or discard this patch.
www/docs/api/api_getMPs.php 1 patch
Spacing   +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
-include_once dirname(__FILE__) . '/api_getMembers.php';
3
+include_once dirname(__FILE__).'/api_getMembers.php';
4 4
 
5 5
 function api_getMPs_front() {
6 6
 ?>
Please login to merge, or discard this patch.
www/docs/glossary/index.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -52,8 +52,8 @@  discard block
 block discarded – undo
52 52
     $DATA->set_page_metadata($this_page, 'heading', $term['title']);
53 53
 }
54 54
 else {
55
-    $DATA->set_page_metadata ($this_page, 'title', $GLOSSARY->current_letter.': Glossary index');
56
-    $DATA->set_page_metadata ($this_page, 'heading', 'Glossary index');
55
+    $DATA->set_page_metadata($this_page, 'title', $GLOSSARY->current_letter.': Glossary index');
56
+    $DATA->set_page_metadata($this_page, 'heading', 'Glossary index');
57 57
 }
58 58
 
59 59
 $PAGE->page_start();
@@ -72,13 +72,13 @@  discard block
 block discarded – undo
72 72
     $URL->update(array("gl" => $GLOSSARY->next_term['glossary_id']));
73 73
     $next_link = $URL->generate('url');
74 74
 
75
-    $nextprev = array (
76
-        'next'	=> array (
75
+    $nextprev = array(
76
+        'next'	=> array(
77 77
             'url'	=> $next_link,
78 78
             'title'	=> 'Next term',
79 79
             'body'	=> $GLOSSARY->next_term['title']
80 80
         ),
81
-        'prev'	=> array (
81
+        'prev'	=> array(
82 82
             'url'	=> $previous_link,
83 83
             'title'	=> 'Previous term',
84 84
             'body'	=> $GLOSSARY->previous_term['title']
@@ -111,8 +111,8 @@  discard block
 block discarded – undo
111 111
     }
112 112
 }
113 113
 
114
-$PAGE->stripe_end(array (
115
-    array (
114
+$PAGE->stripe_end(array(
115
+    array(
116 116
         'type'		=> 'nextprev',
117 117
         'content'	=> ''
118 118
     )
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,8 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 if (isset($term) && $term) {
3 3
     $this_page = 'glossary_item';
4
-}
5
-else {
4
+} else {
6 5
     $this_page = "glossary";
7 6
 }
8 7
 
@@ -50,8 +49,7 @@  discard block
 block discarded – undo
50 49
 if ($term) {
51 50
     $DATA->set_page_metadata($this_page, 'title', $term['title'].': Glossary item');
52 51
     $DATA->set_page_metadata($this_page, 'heading', $term['title']);
53
-}
54
-else {
52
+} else {
55 53
     $DATA->set_page_metadata ($this_page, 'title', $GLOSSARY->current_letter.': Glossary index');
56 54
     $DATA->set_page_metadata ($this_page, 'heading', 'Glossary index');
57 55
 }
Please login to merge, or discard this patch.
www/docs/bills/2005-06/legislative-and-regulatory-reform/index.php 2 patches
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -2,10 +2,10 @@  discard block
 block discarded – undo
2 2
 
3 3
 $this_page = 'bill_index';
4 4
 include_once '../../../../includes/easyparliament/init.php';
5
-$DATA->set_page_metadata($this_page, 'heading','Legislative and Regulatory Reform Bill');
5
+$DATA->set_page_metadata($this_page, 'heading', 'Legislative and Regulatory Reform Bill');
6 6
 $PAGE->page_start();
7 7
 $PAGE->stripe_start();
8
-$PAGE->block_start(array ('title'=>'House of Commons - Normal Run'));
8
+$PAGE->block_start(array('title'=>'House of Commons - Normal Run'));
9 9
 ?>
10 10
 <ul>
11 11
 
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 print '</ul>';
60 60
 $PAGE->block_end();
61 61
 $includes = array(
62
-    array (
62
+    array(
63 63
         'type' => 'include',
64 64
         'content' => 'bills_intro'
65 65
     ),
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
     $intitle = true;
78 78
     $title = '';
79 79
     foreach ($f as $r) {
80
-        if ($line<1) {
80
+        if ($line < 1) {
81 81
             $line++;
82 82
             continue;
83 83
         }
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
             }
97 97
             continue;
98 98
         }
99
-        if (substr($r, 0, 8)=='Bill 141') continue;
99
+        if (substr($r, 0, 8) == 'Bill 141') continue;
100 100
         if (preg_match('#\s+([1-4]?[05])$#', $r, $m)) {
101 101
             if ($line != $m[1]) {
102 102
                 print "ERROR! $line $m[1] $r";
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
         if ($r == "\n") {
142 142
             continue;
143 143
         }
144
-        if ($line<1) {
144
+        if ($line < 1) {
145 145
             $line++;
146 146
             continue;
147 147
         }
@@ -155,9 +155,9 @@  discard block
 block discarded – undo
155 155
             $number = $m[1];
156 156
             $amendments[$number] = '';
157 157
         } elseif (preg_match('#To move the following Clause#', $r)) {
158
-            preg_match('#\n(.*?)$#', $amendments[$number-1], $m);
159
-            $amendments[$number-1] = preg_replace('#\n(.*?)$#', '', $amendments[$number-1]);
160
-            $amendments[$number] .= '*' . trim($m[1]) . "*\n$r";
158
+            preg_match('#\n(.*?)$#', $amendments[$number - 1], $m);
159
+            $amendments[$number - 1] = preg_replace('#\n(.*?)$#', '', $amendments[$number - 1]);
160
+            $amendments[$number] .= '*'.trim($m[1])."*\n$r";
161 161
         } else {
162 162
             $amendments[$number] .= $r;
163 163
         }
@@ -180,9 +180,9 @@  discard block
 block discarded – undo
180 180
             $page = $m[1]; $line = $m[2]; $clause = $m[3];
181 181
             $from_text = $m[4]; $end_line = $m[5]; $insert = $m[6];
182 182
             unset($amendments[$num]);
183
-            $bill[$page][$line] = str_replace($from_text, "$from_text <del title='$num'>", $bill[$page][$line]) . '</del><ins title="'.$num.'">' . $insert . '</ins>';
184
-            for ($i=$line+1; $i<=$end_line; $i++) {
185
-                $bill[$page][$i] = '<del title="'.$num.'">' . $bill[$page][$i] . '</del>';
183
+            $bill[$page][$line] = str_replace($from_text, "$from_text <del title='$num'>", $bill[$page][$line]).'</del><ins title="'.$num.'">'.$insert.'</ins>';
184
+            for ($i = $line + 1; $i <= $end_line; $i++) {
185
+                $bill[$page][$i] = '<del title="'.$num.'">'.$bill[$page][$i].'</del>';
186 186
             }
187 187
         }
188 188
         # Page  4, line 9 [Clause 6], leave out from `under' to `creating' and insert `this Part making provision'
@@ -198,25 +198,25 @@  discard block
 block discarded – undo
198 198
             $from_text = $m[4]; $to_text = $m[5]; $to_line = $m[6];
199 199
             $insert = $m[7];
200 200
             unset($amendments[$num]);
201
-            $bill[$page][$from_line] = str_replace($from_text, "$from_text <del title='$num'>", $bill[$page][$from_line]) . '</del>';
202
-            for ($i=$from_line+1; $i<$to_line; $i++) {
203
-                $bill[$page][$i] = '<del title="'.$num.'">' . $bill[$page][$i] . '</del>';
201
+            $bill[$page][$from_line] = str_replace($from_text, "$from_text <del title='$num'>", $bill[$page][$from_line]).'</del>';
202
+            for ($i = $from_line + 1; $i < $to_line; $i++) {
203
+                $bill[$page][$i] = '<del title="'.$num.'">'.$bill[$page][$i].'</del>';
204 204
             }
205
-            $bill[$page][$to_line] = '<del title="'.$num.'">' . str_replace($to_text, "</del><ins title='$num'>$insert</ins> $to_text", $bill[$page][$to_line]);
205
+            $bill[$page][$to_line] = '<del title="'.$num.'">'.str_replace($to_text, "</del><ins title='$num'>$insert</ins> $to_text", $bill[$page][$to_line]);
206 206
         }
207 207
         # Page  3, line 13 [Clause 4], leave out from beginning to `confer' and insert `An order under this Part may not make provision to'
208 208
         if (preg_match('#Page\s+(\d+), line (\d+) \[Clause (\d+)\], leave out from beginning to `(.*?)\' and insert `(.*?)\'#s', $amendment, $m)) {
209 209
             $page = $m[1]; $line = $m[2]; $clause = $m[3];
210 210
             $to_text = $m[4]; $insert = $m[5];
211 211
             unset($amendments[$num]);
212
-            $bill[$page][$line] = "<ins title='$num'>$insert</ins><del title='$num'>" . str_replace($to_text, "</del> $to_text", $bill[$page][$line]);
212
+            $bill[$page][$line] = "<ins title='$num'>$insert</ins><del title='$num'>".str_replace($to_text, "</del> $to_text", $bill[$page][$line]);
213 213
         }
214 214
         # Page   19, line 2 [Clause 34], leave out from `under' to the end of the line and insert `...'
215 215
         if (preg_match('#Page\s+(\d+), line (\d+) \[Clause (\d+)\], leave out from `(.*?)\' to the end of the line and insert\s+`(.*?)\'#s', $amendment, $m)) {
216 216
             $page = $m[1]; $line = $m[2]; $clause = $m[3];
217 217
             $from_text = $m[4]; $insert = $m[5];
218 218
             unset($amendments[$num]);
219
-            $bill[$page][$line] = str_replace($from_text, "$from_text <del title='$num'>", $bill[$page][$line]) . "</del><ins title='$num'>$insert</ins>";
219
+            $bill[$page][$line] = str_replace($from_text, "$from_text <del title='$num'>", $bill[$page][$line])."</del><ins title='$num'>$insert</ins>";
220 220
         }
221 221
         # Page   4 [Clause 7], leave out line 26 and insert `An order under this Part may not make provision to--'
222 222
         if (preg_match('#Page\s+(\d+) \[Clause (\d+)\], leave out line (\d+)(?: and insert `(.*?)\')?#', $amendment, $m)) {
@@ -247,14 +247,14 @@  discard block
 block discarded – undo
247 247
             foreach ($clauses[$clause] as $subclause_num => $subclause) {
248 248
                 foreach ($subclause as $subsubclause_num => $subsubclause) {
249 249
                     $startP = $subsubclause['startP'];
250
-                    if ($startP==$page && $subsubclause['startL']==$line) {
250
+                    if ($startP == $page && $subsubclause['startL'] == $line) {
251 251
                         if ($startP == $subsubclause['endP']) {
252 252
                             unset($amendments[$num]);
253
-                            for ($i = $subsubclause['startL']; $i<=$subsubclause['endL']; $i++) {
254
-                                $bill[$page][$i] = '<del title="'.$num.'">' . $bill[$page][$i] . '</del>';
253
+                            for ($i = $subsubclause['startL']; $i <= $subsubclause['endL']; $i++) {
254
+                                $bill[$page][$i] = '<del title="'.$num.'">'.$bill[$page][$i].'</del>';
255 255
                             }
256 256
                             if ($insert) {
257
-                                $bill[$page][$i-1] .= "<ins title='$num'>$insert</ins>";
257
+                                $bill[$page][$i - 1] .= "<ins title='$num'>$insert</ins>";
258 258
                             }
259 259
                         }
260 260
                     }
@@ -270,21 +270,21 @@  discard block
 block discarded – undo
270 270
             foreach ($clauses[$clause] as $subclause_num => $subclause) {
271 271
                 foreach ($subclause as $subsubclause_num => $subsubclause) {
272 272
                     $startP = $subsubclause['startP'];
273
-                    if ($startP==$page && $subsubclause['startL']==$line) {
273
+                    if ($startP == $page && $subsubclause['startL'] == $line) {
274 274
                         if ($startP == $subsubclause['endP']) {
275 275
                             unset($amendments[$num]);
276 276
                             $finished = true;
277 277
                         }
278 278
                     }
279 279
                     if ($finished) {
280
-                        for ($i = $subsubclause['startL']; $i<=$subsubclause['endL']; $i++) {
281
-                            $bill[$page][$i] = '<del title="'.$num.'">' . $bill[$page][$i] . '</del>';
280
+                        for ($i = $subsubclause['startL']; $i <= $subsubclause['endL']; $i++) {
281
+                            $bill[$page][$i] = '<del title="'.$num.'">'.$bill[$page][$i].'</del>';
282 282
                         }
283 283
                     }
284 284
                 }
285 285
                 if ($finished) {
286 286
                     if ($insert) {
287
-                        $bill[$page][$i-1] .= "<ins title='$num'>$insert</ins>";
287
+                        $bill[$page][$i - 1] .= "<ins title='$num'>$insert</ins>";
288 288
                     }
289 289
                     break;
290 290
                 }
@@ -296,16 +296,16 @@  discard block
 block discarded – undo
296 296
             $finished = false;
297 297
             foreach ($clauses[$clause] as $subclause_num => $subclause) {
298 298
                 foreach ($subclause as $subsubclause_num => $subsubclause) {
299
-                    if ($subsubclause['startP']==$page && $subsubclause['startL']==$line) {
299
+                    if ($subsubclause['startP'] == $page && $subsubclause['startL'] == $line) {
300 300
                         unset($amendments[$num]);
301 301
                         $finished = true;
302 302
                     }
303 303
                     if ($finished) {
304
-                        for ($p = $subsubclause['startP']; $p<=$subsubclause['endP']; $p++) {
305
-                            if ($p>$subsubclause['startP']) $starti = 1;
304
+                        for ($p = $subsubclause['startP']; $p <= $subsubclause['endP']; $p++) {
305
+                            if ($p > $subsubclause['startP']) $starti = 1;
306 306
                             else $starti = $subsubclause['startL'];
307
-                            for ($i = $starti; $i<=$subsubclause['endL']; $i++) { # XXX Doesn't really work spanning pages
308
-                                $bill[$p][$i] = '<del title="'.$num.'">' . $bill[$p][$i] . '</del>';
307
+                            for ($i = $starti; $i <= $subsubclause['endL']; $i++) { # XXX Doesn't really work spanning pages
308
+                                $bill[$p][$i] = '<del title="'.$num.'">'.$bill[$p][$i].'</del>';
309 309
                             }
310 310
                         }
311 311
                     }
Please login to merge, or discard this patch.
Braces   +14 added lines, -5 removed lines patch added patch discarded remove patch
@@ -96,7 +96,9 @@  discard block
 block discarded – undo
96 96
             }
97 97
             continue;
98 98
         }
99
-        if (substr($r, 0, 8)=='Bill 141') continue;
99
+        if (substr($r, 0, 8)=='Bill 141') {
100
+            continue;
101
+        }
100 102
         if (preg_match('#\s+([1-4]?[05])$#', $r, $m)) {
101 103
             if ($line != $m[1]) {
102 104
                 print "ERROR! $line $m[1] $r";
@@ -224,7 +226,9 @@  discard block
 block discarded – undo
224 226
             $insert = isset($m[4]) ? $m[4] : null;
225 227
             unset($amendments[$num]);
226 228
             $bill[$page][$line] = '<del title="'.$num.'">'.$bill[$page][$line].'</del>';
227
-            if ($insert) $bill[$page][$line] .= '<ins title="'.$num.'">'.$insert.'</ins>';
229
+            if ($insert) {
230
+                $bill[$page][$line] .= '<ins title="'.$num.'">'.$insert.'</ins>';
231
+            }
228 232
         }
229 233
         # Page 8, line 24 [Clause 14], at end insert-- `...'
230 234
         if (preg_match('#Page\s+(\d+), line (\d+) \[Clause (\d+)\], (?:at end|after subsection \(\d+\)) insert--\s+`(.*?)\'#s', $amendment, $m)) {
@@ -302,8 +306,11 @@  discard block
 block discarded – undo
302 306
                     }
303 307
                     if ($finished) {
304 308
                         for ($p = $subsubclause['startP']; $p<=$subsubclause['endP']; $p++) {
305
-                            if ($p>$subsubclause['startP']) $starti = 1;
306
-                            else $starti = $subsubclause['startL'];
309
+                            if ($p>$subsubclause['startP']) {
310
+                                $starti = 1;
311
+                            } else {
312
+                                $starti = $subsubclause['startL'];
313
+                            }
307 314
                             for ($i = $starti; $i<=$subsubclause['endL']; $i++) { # XXX Doesn't really work spanning pages
308 315
                                 $bill[$p][$i] = '<del title="'.$num.'">' . $bill[$p][$i] . '</del>';
309 316
                             }
@@ -321,7 +328,9 @@  discard block
 block discarded – undo
321 328
             foreach ($clauses[$clause] as $subclause_num => $subclause) {
322 329
                 foreach ($subclause as $subsubclause_num => $subsubclause) {
323 330
                     if ($subsubclause['endP'] > $page) { $page = $subsubclause['endP']; $line = 0; }
324
-                    if ($subsubclause['endL'] > $line) $line = $subsubclause['endL'];
331
+                    if ($subsubclause['endL'] > $line) {
332
+                        $line = $subsubclause['endL'];
333
+                    }
325 334
                 }
326 335
             }
327 336
             $bill[$page][$line] .= "<ins title='$num'>$amendment</ins>\n\n";
Please login to merge, or discard this patch.