Passed
Push — master ( 5f2bd1...7c2064 )
by
unknown
13:34
created
www/includes/easyparliament/templates/html/search/by-person.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -111,7 +111,8 @@
 block discarded – undo
111 111
                                 <?php if ( $house !=  HOUSE_TYPE_LORDS) { ?>
112 112
                                   <?= isset($speaker['office']) ? ' - ' . join('; ', $speaker['office']) : '' ?>
113 113
                                 <?php } ?>
114
-                              <?php } else { // no $pid ?>
114
+                              <?php } else {
115
+// no $pid ?>
115 116
                                 <?= $speaker['name'] ?>
116 117
                               <?php } ?>
117 118
                             </td>
Please login to merge, or discard this patch.
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -9,19 +9,19 @@  discard block
 block discarded – undo
9 9
             <div class="search-page__section__primary">
10 10
                 <h2><?= sprintf(gettext('Who says <em class="current-search-term">%s</em> the most?'), _htmlentities($searchstring)) ?></h2>
11 11
 
12
-              <?php if ( isset($error) ) { ?>
13
-                <?php if ( $error == 'No results' && isset( $house ) && $house != HOUSE_TYPE_ROYAL ) { ?>
12
+              <?php if (isset($error)) { ?>
13
+                <?php if ($error == 'No results' && isset($house) && $house != HOUSE_TYPE_ROYAL) { ?>
14 14
                   <ul class="search-result-display-options">
15 15
                       <li>
16
-                        <?php if ( $house ==  HOUSE_TYPE_COMMONS) { ?>
16
+                        <?php if ($house == HOUSE_TYPE_COMMONS) { ?>
17 17
                           No results for MPs only
18
-                        <?php } else if ( $house ==  HOUSE_TYPE_LORDS) { ?>
18
+                        <?php } else if ($house == HOUSE_TYPE_LORDS) { ?>
19 19
                           No results for Peers only
20
-                        <?php } else if ( $house == HOUSE_TYPE_SCOTLAND) { ?>
20
+                        <?php } else if ($house == HOUSE_TYPE_SCOTLAND) { ?>
21 21
                           No results for MSPs only
22
-                        <?php } else if ( $house == HOUSE_TYPE_WALES) { ?>
22
+                        <?php } else if ($house == HOUSE_TYPE_WALES) { ?>
23 23
                           <?= gettext('No results for MSs only') ?>
24
-                        <?php } else if ( $house ==  HOUSE_TYPE_NI) { ?>
24
+                        <?php } else if ($house == HOUSE_TYPE_NI) { ?>
25 25
                           No results for MLAs only
26 26
                         <?php } ?>
27 27
                           |
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
                 <?php } ?>
34 34
               <?php } ?>
35 35
 
36
-              <?php if ( $wtt ) { ?>
36
+              <?php if ($wtt) { ?>
37 37
                 <p><strong>Now, try reading what a couple of these Lords are saying,
38 38
                 to help you find someone appropriate. When you've found someone,
39 39
                 follow the "I want to write to (name of lord)" link on their results page
@@ -41,43 +41,43 @@  discard block
 block discarded – undo
41 41
                 </strong></p>
42 42
               <?php } ?>
43 43
 
44
-              <?php if ( isset($speakers) && count($speakers) ) { ?>
44
+              <?php if (isset($speakers) && count($speakers)) { ?>
45 45
 
46
-                  <?php if ( !$wtt ) { ?>
46
+                  <?php if (!$wtt) { ?>
47 47
                     <ul class="search-result-display-options">
48 48
                         <li><?= gettext('Results grouped by person') ?></li>
49 49
                         <li>
50
-                          <?php if ( $house ==  HOUSE_TYPE_ROYAL) { ?>
50
+                          <?php if ($house == HOUSE_TYPE_ROYAL) { ?>
51 51
                             <?= gettext('Show All') ?>
52 52
                           <?php } else { ?>
53 53
                             <a href="<?= $this_url->generate('html') ?>"><?= gettext('Show All') ?></a>
54 54
                           <?php } ?>
55 55
                             |
56
-                          <?php if ( $house ==  HOUSE_TYPE_COMMONS) { ?>
56
+                          <?php if ($house == HOUSE_TYPE_COMMONS) { ?>
57 57
                             MPs only
58 58
                           <?php } else { ?>
59 59
                             <a href="<?= $this_url->generate('html', array('house'=>1)) ?>">MPs only</a>
60 60
                           <?php } ?>
61 61
                             |
62
-                          <?php if ( $house ==  HOUSE_TYPE_LORDS) { ?>
62
+                          <?php if ($house == HOUSE_TYPE_LORDS) { ?>
63 63
                             Peers only
64 64
                           <?php } else { ?>
65 65
                             <a href="<?= $this_url->generate('html', array('house'=>2)) ?>">Lords only</a>
66 66
                           <?php } ?>
67 67
                             |
68
-                          <?php if ( $house ==  HOUSE_TYPE_SCOTLAND) { ?>
68
+                          <?php if ($house == HOUSE_TYPE_SCOTLAND) { ?>
69 69
                             MSPs only
70 70
                           <?php } else { ?>
71 71
                             <a href="<?= $this_url->generate('html', array('house'=>4)) ?>">MSPs only</a>
72 72
                           <?php } ?>
73 73
                             |
74
-                          <?php if ( $house ==  HOUSE_TYPE_WALES) { ?>
74
+                          <?php if ($house == HOUSE_TYPE_WALES) { ?>
75 75
                             <?= gettext('MSs only') ?>
76 76
                           <?php } else { ?>
77 77
                             <a href="<?= $this_url->generate('html', array('house'=>5)) ?>"><?= gettext('MSs only') ?></a>
78 78
                           <?php } ?>
79 79
                             |
80
-                          <?php if ( $house ==  HOUSE_TYPE_NI) { ?>
80
+                          <?php if ($house == HOUSE_TYPE_NI) { ?>
81 81
                             MLAs only
82 82
                           <?php } else { ?>
83 83
                             <a href="<?= $this_url->generate('html', array('house'=>HOUSE_TYPE_NI)) ?>">MLAs only</a>
@@ -98,25 +98,25 @@  discard block
 block discarded – undo
98 98
                         </tr>
99 99
                     </thead>
100 100
                     <tbody>
101
-                      <?php foreach ( $speakers as $pid => $speaker ) { ?>
101
+                      <?php foreach ($speakers as $pid => $speaker) { ?>
102 102
 
103
-                        <?php if ( $wtt && $pid == 0 ) { continue; } // skip heading count for WTT lords list ?>
103
+                        <?php if ($wtt && $pid == 0) { continue; } // skip heading count for WTT lords list ?>
104 104
 
105 105
                         <tr>
106 106
                             <td><?= $speaker['count'] ?></td>
107 107
                             <td>
108
-                              <?php if ( $pid ) { ?>
109
-                                <?php if ( !$wtt || $speaker['left'] == '9999-12-31' ) { ?>
108
+                              <?php if ($pid) { ?>
109
+                                <?php if (!$wtt || $speaker['left'] == '9999-12-31') { ?>
110 110
                                   <a href="/search/?q=<?= _htmlentities($searchstring) ?>&amp;pid=<?= $pid ?><?= isset($wtt) && $speaker['left'] == '9999-12-31' ? '&amp;wtt=2' : '' ?>">
111 111
                                 <?php } ?>
112 112
                                 <?= isset($speaker['name']) ? $speaker['name'] : 'N/A' ?>
113
-                                <?php if ( !$wtt || $speaker['left'] == '9999-12-31' ) { ?>
113
+                                <?php if (!$wtt || $speaker['left'] == '9999-12-31') { ?>
114 114
                                   </a>
115 115
                                 <?php } ?>
116
-                                <?php if ( isset($speaker['party']) ) { ?>
116
+                                <?php if (isset($speaker['party'])) { ?>
117 117
                                   <span class="search-results-grouped__speaker-party">(<?= $speaker['party'] ?>)</span>
118 118
                                 <?php } ?>
119
-                                <?php if ( $house !=  HOUSE_TYPE_LORDS) { ?>
119
+                                <?php if ($house != HOUSE_TYPE_LORDS) { ?>
120 120
                                   <?= isset($speaker['office']) ? ' - ' . join('; ', $speaker['office']) : '' ?>
121 121
                                 <?php } ?>
122 122
                               <?php } else { // no $pid ?>
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
                               <?php } ?>
125 125
                             </td>
126 126
                             <td>
127
-                              <?php if ( format_date($speaker['pmindate'], '%b %Y') == format_date($speaker['pmaxdate'], '%b %Y') ) { ?>
127
+                              <?php if (format_date($speaker['pmindate'], '%b %Y') == format_date($speaker['pmaxdate'], '%b %Y')) { ?>
128 128
                                 <?= format_date($speaker['pmindate'], '%b %Y') ?>
129 129
                               <?php } else { ?>
130 130
                                 <?= format_date($speaker['pmindate'], '%b %Y') ?>&nbsp;&ndash;&nbsp;<?= format_date($speaker['pmaxdate'], '%b %Y') ?>
Please login to merge, or discard this patch.
www/docs/user/index.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -107,10 +107,10 @@
 block discarded – undo
107 107
 
108 108
 // if data has been submitted then handle that
109 109
 if (
110
-      get_http_var("submitted") == "true" && (
110
+        get_http_var("submitted") == "true" && (
111 111
         $this_page == 'useredit' || $this_page == 'otheruseredit' || $this_page == 'userjoin'
112
-      )
113
-   ) {
112
+        )
113
+    ) {
114 114
     // Put all the user-submitted data in an array.
115 115
     $data = $user->getUpdateDetails($this_page, $THEUSER);
116 116
     $data['ret'] = get_http_var("ret");
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
         // We need a user_id. So make sure that exists.
31 31
         // And make sure the user is allowed to do this!
32 32
         $template = 'user/form';
33
-        if (is_numeric( get_http_var("u") ) && $THEUSER->is_able_to("edituser")) {
33
+        if (is_numeric(get_http_var("u")) && $THEUSER->is_able_to("edituser")) {
34 34
 
35 35
             $data = $user->getUserDetails(get_http_var('u'));
36 36
             $data['showall'] = true;
Please login to merge, or discard this patch.
www/docs/admin/users.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
     <input type="hidden" name="scrub" value="$email">
21 21
     <input type="submit" value="Delete user">
22 22
 </form>
23
-EOF;
23
+eof;
24 24
 }
25 25
 
26 26
 $user_data = array(
Please login to merge, or discard this patch.
classes/Topic.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 
54 54
     public function sctitle() {
55 55
         $title = $this->title;
56
-        if (strpos($title, 'The ') === 0 ) {
56
+        if (strpos($title, 'The ') === 0) {
57 57
             $title = lcfirst($title);
58 58
         }
59 59
 
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
             );
243 243
         } else {
244 244
             foreach ($sets as $set) {
245
-                if ($set == '' ) {
245
+                if ($set == '') {
246 246
                     continue;
247 247
                 }
248 248
                 $q = $this->db->query(
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
             );
286 286
         } else {
287 287
             foreach ($policies as $policy) {
288
-                if ($policy == '' ) {
288
+                if ($policy == '') {
289 289
                     continue;
290 290
                 }
291 291
                 $q = $this->db->query(
Please login to merge, or discard this patch.
Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
         $this->db = new \ParlDB;
34 34
 
35 35
         if (is_null($data)) {
36
-          return;
36
+            return;
37 37
         }
38 38
 
39 39
         $this->id = $data['id'];
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
 
125 125
     private function _getContentIDs() {
126 126
         $q = $this->db->query(
127
-          "SELECT body, gid, ep.epobject_id FROM epobject ep
127
+            "SELECT body, gid, ep.epobject_id FROM epobject ep
128 128
            JOIN hansard h on ep.epobject_id = h.epobject_id
129 129
            JOIN topic_epobjects te on te.epobject_id = ep.epobject_id
130 130
            WHERE topic_key = :topic_key",
@@ -178,24 +178,24 @@  discard block
 block discarded – undo
178 178
 
179 179
     public function addContent($gid) {
180 180
         $q = $this->db->query(
181
-          "SELECT epobject_id FROM hansard WHERE gid = :gid",
182
-          array(
181
+            "SELECT epobject_id FROM hansard WHERE gid = :gid",
182
+            array(
183 183
             ":gid" => $gid
184
-          )
184
+            )
185 185
         )->first();
186 186
 
187 187
         if (!$q) {
188
-          return false;
188
+            return false;
189 189
         }
190 190
 
191 191
         $epobject_id = $q['epobject_id'];
192 192
 
193 193
         $q = $this->db->query(
194
-          "INSERT INTO topic_epobjects (topic_key, epobject_id) VALUES (:topic, :ep_id)",
195
-          array(
194
+            "INSERT INTO topic_epobjects (topic_key, epobject_id) VALUES (:topic, :ep_id)",
195
+            array(
196 196
             ":topic" => $this->id,
197 197
             ":ep_id" => $epobject_id
198
-          )
198
+            )
199 199
         );
200 200
 
201 201
         return $q->success();
@@ -203,23 +203,23 @@  discard block
 block discarded – undo
203 203
 
204 204
     public function deleteContent($id) {
205 205
         $q = $this->db->query(
206
-          "DELETE FROM topic_epobjects WHERE topic_key = :topic AND epobject_id = :ep_id",
207
-          array(
206
+            "DELETE FROM topic_epobjects WHERE topic_key = :topic AND epobject_id = :ep_id",
207
+            array(
208 208
             ":topic" => $this->id,
209 209
             ":ep_id" => $id
210
-          )
210
+            )
211 211
         );
212 212
 
213 213
         return $q->success();
214 214
     }
215 215
 
216 216
     public function getPolicySets() {
217
-      $q = $this->db->query(
217
+        $q = $this->db->query(
218 218
         "SELECT policyset FROM topic_policysets WHERE topic_key = :key",
219 219
         array(
220
-          ':key' => $this->id
220
+            ':key' => $this->id
221 221
         )
222
-      );
222
+        );
223 223
 
224 224
         $sets = array();
225 225
         foreach ($q as $row) {
@@ -256,12 +256,12 @@  discard block
 block discarded – undo
256 256
     }
257 257
 
258 258
     public function getPolicies() {
259
-      $q = $this->db->query(
259
+        $q = $this->db->query(
260 260
         'SELECT policy_id FROM topic_policies WHERE topic_key = :key',
261 261
         array(
262
-          ':key' => $this->id
262
+            ':key' => $this->id
263 263
         )
264
-      );
264
+        );
265 265
 
266 266
         $policies = array();
267 267
         foreach ($q as $row) {
@@ -312,7 +312,7 @@  discard block
 block discarded – undo
312 312
 
313 313
     public function save() {
314 314
         $q = $this->db->query(
315
-          "REPLACE INTO topics
315
+            "REPLACE INTO topics
316 316
           (id, title, slug, description, search_string, front_page, image)
317 317
           VALUES
318 318
           (:id, :title, :slug, :description, :search_string, :front_page, :image)",
Please login to merge, or discard this patch.
www/docs/api/api_getHansard.php 1 patch
Spacing   +7 added lines, -7 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 INCLUDESPATH."easyparliament/member.php";
3
+include_once INCLUDESPATH . "easyparliament/member.php";
4 4
 
5 5
 function api_getHansard_front() {
6 6
 ?>
@@ -29,10 +29,10 @@  discard block
 block discarded – undo
29 29
 }
30 30
 
31 31
 function api_getHansard_search($s) {
32
-    _api_getHansard_search( array(
32
+    _api_getHansard_search(array(
33 33
         's' => $s,
34 34
         'pid' => get_http_var('person')
35
-    ) );
35
+    ));
36 36
 }
37 37
 function api_getHansard_person($pid) {
38 38
     _api_getHansard_search(array(
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 }
42 42
 
43 43
 function _api_getHansard_date($type, $d) {
44
-    $args = array ('date' => $d);
44
+    $args = array('date' => $d);
45 45
     $LIST = _api_getListObject($type);
46 46
     $LIST->display('date', $args, 'api');
47 47
 }
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
     $type = isset($array['type']) ? $array['type'] : '';
57 57
     $search = filter_user_input($search, 'strict');
58 58
     if ($pid) {
59
-        $search .= ($search?' ':'') . 'speaker:' . $pid;
59
+        $search .= ($search ? ' ' : '') . 'speaker:' . $pid;
60 60
     }
61 61
     if ($type) {
62 62
         $search .= " section:" . $type;
@@ -91,12 +91,12 @@  discard block
 block discarded – undo
91 91
     }
92 92
 #    $query_desc_short = $SEARCHENGINE->query_description_short();
93 93
     $pagenum = get_http_var('page');
94
-    $args = array (
94
+    $args = array(
95 95
         's' => $search,
96 96
         'p' => $pagenum,
97 97
         'num' => get_http_var('num'),
98 98
         'pop' => 1,
99
-        'o' => ($o=='d' || $o=='r') ? $o : 'd',
99
+        'o' => ($o == 'd' || $o == 'r') ? $o : 'd',
100 100
     );
101 101
     $LIST = new HANSARDLIST();
102 102
     $data = $LIST->display('search', $args, 'none');
Please login to merge, or discard this patch.
www/includes/easyparliament/templates/html/divisions/_your_mp.php 3 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,6 @@
 block discarded – undo
1 1
 <div class="debate-speech__division__your-mp">
2
-  <?php if ( !isset($main_vote_mp) || ! $main_vote_mp) { /* $main_vote_mp is true if an MP has been requested via the URL */ ?>
2
+  <?php if ( !isset($main_vote_mp) || ! $main_vote_mp) {
3
+/* $main_vote_mp is true if an MP has been requested via the URL */ ?>
3 4
     <div class="your-mp__header">
4 5
       <h3>How your <?= $division['members']['singular'] ?> voted</h3>
5 6
       <p>
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <div class="debate-speech__division__your-mp">
2
-  <?php if ( !isset($main_vote_mp) || ! $main_vote_mp) { /* $main_vote_mp is true if an MP has been requested via the URL */ ?>
2
+  <?php if (!isset($main_vote_mp) || !$main_vote_mp) { /* $main_vote_mp is true if an MP has been requested via the URL */ ?>
3 3
     <div class="your-mp__header">
4 4
       <h3>How your <?= $division['members']['singular'] ?> voted</h3>
5 5
       <p>
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
     </div>
10 10
   <?php } ?>
11 11
     <a href="<?= $data['mp_data']['mp_url'] ?>" class="your-mp__content">
12
-      <?php if ( isset($mp_vote) ) { ?>
12
+      <?php if (isset($mp_vote)) { ?>
13 13
         <span class="your-mp__vote your-mp__vote--<?= $mp_vote['vote'] ?>"><?php
14 14
           switch ($mp_vote['vote']) {
15 15
               case 'aye':
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
                   echo 'N/A';
34 34
           }
35 35
         ?></span>
36
-      <?php } else if ( isset($before_mp) || isset($after_mp) ) { ?>
36
+      <?php } else if (isset($before_mp) || isset($after_mp)) { ?>
37 37
         <span class="your-mp__vote">N/A</span>
38 38
       <?php } ?>
39 39
         <img class="your-mp__image" src="<?= $data['mp_data']['image'] ?>">
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
             <h2 class="people-list__person__name"><?= $data['mp_data']['name'] ?></h2>
42 42
             <p class="people-list__person__memberships">
43 43
                 <span class="people-list__person__constituency"><?= $data['mp_data']['constituency'] ?></span>
44
-                <span class="people-list__person__party <?= slugify( $data['mp_data']['party'] ) ?>"><?= $data['mp_data']['party'] ?></span>
44
+                <span class="people-list__person__party <?= slugify($data['mp_data']['party']) ?>"><?= $data['mp_data']['party'] ?></span>
45 45
             </p>
46 46
         </div>
47 47
     </a>
Please login to merge, or discard this patch.
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -11,28 +11,28 @@
 block discarded – undo
11 11
     <a href="<?= $data['mp_data']['mp_url'] ?>" class="your-mp__content">
12 12
       <?php if ( isset($mp_vote) ) { ?>
13 13
         <span class="your-mp__vote your-mp__vote--<?= $mp_vote['vote'] ?>"><?php
14
-          switch ($mp_vote['vote']) {
15
-              case 'aye':
14
+            switch ($mp_vote['vote']) {
15
+                case 'aye':
16 16
                   echo 'Aye';
17
-                  break;
18
-              case 'no':
17
+                    break;
18
+                case 'no':
19 19
                   echo 'No';
20
-                  break;
21
-              case 'absent':
20
+                    break;
21
+                case 'absent':
22 22
                   echo 'Absent';
23
-                  break;
24
-              case 'both':
23
+                    break;
24
+                case 'both':
25 25
                   echo 'Abstain';
26
-                  break;
27
-              case 'tellaye':
26
+                    break;
27
+                case 'tellaye':
28 28
                   echo 'Aye (Teller)';
29
-                  break;
30
-              case 'tellno':
29
+                    break;
30
+                case 'tellno':
31 31
                   echo 'No (Teller)';
32
-                  break;
33
-              default:
32
+                    break;
33
+                default:
34 34
                   echo 'N/A';
35
-          }
35
+            }
36 36
         ?></span>
37 37
       <?php } else if ( isset($before_mp) || isset($after_mp) ) { ?>
38 38
         <span class="your-mp__vote">N/A</span>
Please login to merge, or discard this patch.
classes/Utility/Alert.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
         }
20 20
 
21 21
         if (!empty($details['pid'])) {
22
-            $criteria[] = 'speaker:'.$details['pid'];
22
+            $criteria[] = 'speaker:' . $details['pid'];
23 23
         }
24 24
 
25 25
         $criteria = join(' ', $criteria);
@@ -41,9 +41,9 @@  discard block
 block discarded – undo
41 41
             $token = $row['alert_id'] . '-' . $row['registrationtoken'];
42 42
 
43 43
             $status = 'confirmed';
44
-            if ( !$row['confirmed'] ) {
44
+            if (!$row['confirmed']) {
45 45
                 $status = 'unconfirmed';
46
-            } elseif ( $row['deleted'] == 2 ) {
46
+            } elseif ($row['deleted'] == 2) {
47 47
                 $status = 'suspended';
48 48
             }
49 49
 
@@ -60,21 +60,21 @@  discard block
 block discarded – undo
60 60
 
61 61
     public static function prettifyCriteria($alert_criteria) {
62 62
         $text = '';
63
-        if ( $alert_criteria ) {
63
+        if ($alert_criteria) {
64 64
             $criteria = explode(' ', $alert_criteria);
65 65
             $words = array();
66 66
             $spokenby = array_values(\MySociety\TheyWorkForYou\Utility\Search::speakerNamesForIDs($alert_criteria));
67 67
 
68 68
             foreach ($criteria as $c) {
69
-                if (!preg_match('#^speaker:(\d+)#',$c,$m)) {
69
+                if (!preg_match('#^speaker:(\d+)#', $c, $m)) {
70 70
                     $words[] = $c;
71 71
                 }
72 72
             }
73
-            if ( $spokenby && count($words) ) {
73
+            if ($spokenby && count($words)) {
74 74
                 $text = implode(' or ', $spokenby) . ' mentions [' . implode(' ', $words) . ']';
75
-            } else if ( count( $words ) ) {
75
+            } else if (count($words)) {
76 76
                 $text = '[' . implode(' ', $words) . ']' . ' is mentioned';
77
-            } else if ( $spokenby ) {
77
+            } else if ($spokenby) {
78 78
                 $text = implode(' or ', $spokenby) . " speaks";
79 79
             }
80 80
         }
Please login to merge, or discard this patch.
www/includes/easyparliament/templates/html/divisions/vote.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 
28 28
                   <?php if (isset($data['mp_data'])) {
29 29
                     include('_your_mp.php');
30
-                  } ?>
30
+                    } ?>
31 31
 
32 32
                     <div class="debate-speech__division__details">
33 33
                       <p>
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
                           </span><br>
38 38
                       <?php } else { ?>
39 39
                           <?php if ($mp_vote['with_majority']) { ?>
40
-                              <?php $vote_prefix = 'A majority of ' . $division['members']['plural']  . ' <b>agreed</b> and'; include('_vote_description.php'); ?>
40
+                              <?php $vote_prefix = 'A majority of ' . $division['members']['plural'] . ' <b>agreed</b> and'; include('_vote_description.php'); ?>
41 41
                           <?php } else { ?>
42 42
                               <?php $vote_prefix = 'A majority of ' . $division['members']['plural'] . ' <b>disagreed</b> and'; include('_vote_description.php'); ?>
43 43
                           <?php } ?>
Please login to merge, or discard this patch.
www/includes/easyparliament/templates/html/section/_section_content.php 3 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -12,9 +12,9 @@  discard block
 block discarded – undo
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/?';
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
                     $after_mp = $speech['after_mp'];
192 192
                 }
193 193
                 include dirname(__FILE__) . '/../divisions/_your_mp.php';
194
-              } ?>
194
+                } ?>
195 195
                 <div class="debate-speech__division__details">
196 196
                   <?php include dirname(__FILE__) . '/../divisions/_votes.php'; ?>
197 197
                 </div>
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-foreach($data['rows'] as $speech) { ?>
3
+foreach ($data['rows'] as $speech) { ?>
4 4
 
5 5
     <?php
6 6
 
@@ -63,27 +63,27 @@  discard block
 block discarded – undo
63 63
     $source = array();
64 64
 
65 65
     $major = $data['info']['major'];
66
-    if ($major==1 || $major==2 || (($major==3 || $major==4) && isset($speech['speaker']['house'])) || $major==101 || $major==6) {
66
+    if ($major == 1 || $major == 2 || (($major == 3 || $major == 4) && isset($speech['speaker']['house'])) || $major == 101 || $major == 6) {
67 67
         $source['title'] = 'Citation: ';
68
-        if ($major==1 || $major==2) {
68
+        if ($major == 1 || $major == 2) {
69 69
             $source['title'] .= 'HC';
70
-        } elseif ($major==3 || $major==4) {
71
-            if ($speech['speaker']['house']==1) {
70
+        } elseif ($major == 3 || $major == 4) {
71
+            if ($speech['speaker']['house'] == 1) {
72 72
                 $source['title'] .= 'HC';
73 73
             } else {
74 74
                 $source['title'] .= 'HL';
75 75
             }
76
-        } elseif ($major==6) {
76
+        } elseif ($major == 6) {
77 77
             $source['title'] .= $data['section_title'];
78 78
         } else {
79 79
             $source['title'] .= 'HL';
80 80
         }
81 81
         $source['title'] .= ' Deb, ' . format_date($data['info']['date'], LONGDATEFORMAT) . ', c' . $speech['colnum'];
82
-        if ($major==2) {
82
+        if ($major == 2) {
83 83
             $source['title'] .= 'WH';
84
-        } elseif ($major==3) {
84
+        } elseif ($major == 3) {
85 85
             $source['title'] .= 'W';
86
-        } elseif ($major==4) {
86
+        } elseif ($major == 4) {
87 87
             $source['title'] .= 'WS';
88 88
         }
89 89
     }
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
             <div class="debate-speech__speaker-and-content">
117 117
             <?php } ?>
118 118
 
119
-          <?php if(isset($speech['speaker']) && count($speech['speaker']) > 0) { ?>
119
+          <?php if (isset($speech['speaker']) && count($speech['speaker']) > 0) { ?>
120 120
             <h2 class="debate-speech__speaker">
121 121
                 <?php
122 122
 
@@ -184,17 +184,17 @@  discard block
 block discarded – undo
184 184
                 <?php if ($division['has_description']) { ?>
185 185
                 <div class="debate-speech__division__details">
186 186
                     <span class="policy-vote__text">
187
-                        <?php include( dirname(__FILE__) . '/../divisions/_vote_description.php'); ?>
187
+                        <?php include(dirname(__FILE__) . '/../divisions/_vote_description.php'); ?>
188 188
                     </span><br>
189 189
                 </div>
190 190
                 <?php } ?>
191 191
 
192 192
               <?php if (isset($speech['mp_vote'])) {
193
-                $mp_vote = array( 'vote' => $speech['mp_vote']['vote'] );
194
-                if ( isset($speech['before_mp']) ) {
193
+                $mp_vote = array('vote' => $speech['mp_vote']['vote']);
194
+                if (isset($speech['before_mp'])) {
195 195
                     $before_mp = $speech['before_mp'];
196 196
                 }
197
-                if ( isset($speech['after_mp']) ) {
197
+                if (isset($speech['after_mp'])) {
198 198
                     $after_mp = $speech['after_mp'];
199 199
                 }
200 200
                 include dirname(__FILE__) . '/../divisions/_your_mp.php';
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
             </div>
214 214
             <?php } ?>
215 215
 
216
-            <?php if ( $section ) {
216
+            <?php if ($section) {
217 217
                 if ($speech['voting_data']) { ?>
218 218
 
219 219
                 <div class="debate-speech__question-answered">
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
                     $moreinfo[] = sprintf(ngettext('%s annotation', '%s annotations', $row['totalcomments']), $row['totalcomments']);
352 352
                 }
353 353
                 if (count($moreinfo) > 0) {
354
-                    print "<small>(" . implode (', ', $moreinfo) . ") </small>";
354
+                    print "<small>(" . implode(', ', $moreinfo) . ") </small>";
355 355
                 }
356 356
             } else {
357 357
                 // Nothing in this item, so no link.
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -164,7 +164,7 @@
 block discarded – undo
164 164
               <?php # XXX
165 165
                 if ($data['info']['major'] == 8 && preg_match('#\d{4}-\d\d-\d\d\.(.*?)\.q#', $speech['gid'], $m)) {
166 166
                     ?><p class="debate-speech__question_id"><small>
167
-                    <?= "Question $m[1]" ?>
167
+                    <?= "question $m[1]" ?>
168 168
                     </small></p>
169 169
               <?php } ?>
170 170
 
Please login to merge, or discard this patch.