Completed
Pull Request — master (#1324)
by Nick
10:37 queued 04:52
created
www/includes/easyparliament/templates/html/mp/error.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@
 block discarded – undo
6 6
 
7 7
             <p><?= $error ?></p>
8 8
 
9
-        <?php if ( $rep_search_url ) { ?>
9
+        <?php if ($rep_search_url) { ?>
10 10
         </div>
11 11
 
12 12
         <div class="full-page__unit">
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,8 @@
 block discarded – undo
31 31
         <div class="full-page__unit">
32 32
         <p>Or <a href="<?= $all_mps_url ?>">browse all <?= $rep_name ?>s</a>?</p>
33 33
         </div>
34
-        <?php } else { ?>
34
+        <?php }
35
+else { ?>
35 36
         <p>Why not <a href="<?= $all_mps_url ?>">browse all <?= $rep_name ?>s</a>?</p>
36 37
         </div>
37 38
         <?php } ?>
Please login to merge, or discard this patch.
www/includes/easyparliament/templates/html/mp/votes.php 4 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
                               <?php foreach ($segment['votes']->positions as $key_vote) {
61 61
 
62 62
                                 if (isset($policy_last_update[$key_vote['policy_id']]) && $policy_last_update[$key_vote['policy_id']] > $most_recent) {
63
-                                  $most_recent = $policy_last_update[$key_vote['policy_id']];
63
+                                    $most_recent = $policy_last_update[$key_vote['policy_id']];
64 64
                                 }
65 65
 
66 66
                                 if ( $key_vote['has_strong'] || $key_vote['position'] == 'has never voted on' ) {
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 
82 82
                                 include '_vote_description.php';
83 83
 
84
-                              } ?>
84
+                                } ?>
85 85
                             </ul>
86 86
 
87 87
                             <div class="share-vote-descriptions">
Please login to merge, or discard this patch.
Upper-Lower-Casing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 
43 43
                 <?php if ($has_voting_record): ?>
44 44
 
45
-                    <?php $displayed_votes = FALSE; ?>
45
+                    <?php $displayed_votes = false; ?>
46 46
 
47 47
                     <?php foreach ($key_votes_segments as $segment): ?>
48 48
 
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
                                 <small>Last updated: <?= format_date($most_recent, LONGDATEFORMAT) ?></small>
95 95
                             </div>
96 96
 
97
-                            <?php $displayed_votes = TRUE; ?>
97
+                            <?php $displayed_votes = true; ?>
98 98
 
99 99
                         <?php endif; ?>
100 100
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@
 block discarded – undo
63 63
                                   $most_recent = $policy_last_update[$key_vote['policy_id']];
64 64
                                 }
65 65
 
66
-                                if ( $key_vote['has_strong'] || $key_vote['position'] == 'has never voted on' ) {
66
+                                if ($key_vote['has_strong'] || $key_vote['position'] == 'has never voted on') {
67 67
                                     $description = ucfirst($key_vote['desc']);
68 68
                                 } else {
69 69
                                     $description = sprintf(
Please login to merge, or discard this patch.
Braces   +7 added lines, -3 removed lines patch added patch discarded remove patch
@@ -65,7 +65,8 @@  discard block
 block discarded – undo
65 65
 
66 66
                                 if ( $key_vote['has_strong'] || $key_vote['position'] == 'has never voted on' ) {
67 67
                                     $description = ucfirst($key_vote['desc']);
68
-                                } else {
68
+                                }
69
+                                else {
69 70
                                     $description = sprintf(
70 71
                                         'We don&rsquo;t have enough information to calculate %s&rsquo;s position on %s.',
71 72
                                         $full_name,
@@ -110,13 +111,16 @@  discard block
 block discarded – undo
110 111
 
111 112
                         <?php endif; ?>
112 113
 
113
-                    <?php else: ?>
114
+                    <?php else {
115
+    : ?>
114 116
 
115 117
                         <div class="panel">
116 118
                             <p>This person has not voted on any of the key issues which we keep track of.</p>
117 119
                         </div>
118 120
 
119
-                    <?php endif; ?>
121
+                    <?php endif;
122
+}
123
+?>
120 124
 
121 125
                 <?php endif; ?>
122 126
 
Please login to merge, or discard this patch.
www/includes/easyparliament/templates/html/mp/recent.php 3 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -38,11 +38,11 @@  discard block
 block discarded – undo
38 38
                 if ( isset($divisions) && $divisions ) {
39 39
                     if ($has_voting_record) {
40 40
                         foreach ($divisions as $division) {
41
-                          $displayed_votes = TRUE;
41
+                            $displayed_votes = TRUE;
42 42
 
43
-                          if ($current_date != $division['date']) {
43
+                            if ($current_date != $division['date']) {
44 44
                             if ($current_date != '' ) {
45
-                              print('</ul></div>');
45
+                                print('</ul></div>');
46 46
                             }
47 47
                             $current_date = $division['date'];
48 48
                             $sidebar_links[] = $division['date'];
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
                             <h2><?= strftime('%e %b %Y', strtotime($division['date'])) ?></h2>
52 52
                              <ul class="vote-descriptions policy-votes">
53 53
                           <?php }
54
-                          include('_division_description.php');
54
+                            include('_division_description.php');
55 55
                         }
56 56
                         echo('</div>');
57 57
                     }
Please login to merge, or discard this patch.
Upper-Lower-Casing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -30,15 +30,15 @@
 block discarded – undo
30 30
 
31 31
                 <?php
32 32
 
33
-                $displayed_votes = FALSE;
34
-                $show_all = TRUE;
33
+                $displayed_votes = false;
34
+                $show_all = true;
35 35
                 $current_date = '';
36 36
                 $sidebar_links = array();
37 37
 
38 38
                 if ( isset($divisions) && $divisions ) {
39 39
                     if ($has_voting_record) {
40 40
                         foreach ($divisions as $division) {
41
-                          $displayed_votes = TRUE;
41
+                          $displayed_votes = true;
42 42
 
43 43
                           if ($current_date != $division['date']) {
44 44
                             if ($current_date != '' ) {
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -35,13 +35,13 @@  discard block
 block discarded – undo
35 35
                 $current_date = '';
36 36
                 $sidebar_links = array();
37 37
 
38
-                if ( isset($divisions) && $divisions ) {
38
+                if (isset($divisions) && $divisions) {
39 39
                     if ($has_voting_record) {
40 40
                         foreach ($divisions as $division) {
41 41
                           $displayed_votes = TRUE;
42 42
 
43 43
                           if ($current_date != $division['date']) {
44
-                            if ($current_date != '' ) {
44
+                            if ($current_date != '') {
45 45
                               print('</ul></div>');
46 46
                             }
47 47
                             $current_date = $division['date'];
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 
68 68
             <div class="sidebar__unit in-page-nav">
69 69
                 <ul data-magellan-expedition="fixed">
70
-                  <?php foreach($sidebar_links as $date) { ?>
70
+                  <?php foreach ($sidebar_links as $date) { ?>
71 71
                     <li data-magellan-arrival="<?= strftime('%Y-%m-%d', strtotime($date)) ?>">
72 72
                         <a href="#<?= strftime('%Y-%m-%d', strtotime($date)) ?>">
73 73
                             <?= strftime('%e %b %Y', strtotime($date)) ?>
Please login to merge, or discard this patch.
www/includes/easyparliament/templates/html/mp/profile.php 4 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 
80 80
                             include '_vote_description.php';
81 81
 
82
-                          } ?>
82
+                            } ?>
83 83
                         </ul>
84 84
 
85 85
                         <p>We have <b>lots more</b> plain English analysis of <?= $full_name ?>&rsquo;s voting record  on issues like health, welfare, taxation and more. Visit <a href="<?= $member_url ?>/votes"><?= $full_name ?>&rsquo;s full vote analysis page</a> for more.</p>
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 
120 120
                             include '_vote_description.php';
121 121
 
122
-                          } ?>
122
+                            } ?>
123 123
                         </ul>
124 124
 
125 125
                         <p>We have <b>lots more</b> plain English analysis of <?= $full_name ?>&rsquo;s voting record  on issues like health, welfare, taxation and more. Visit <a href="<?= $member_url ?>/votes"><?= $full_name ?>&rsquo;s full vote analysis page</a> for more.</p>
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 
149 149
                             include '_vote_description.php';
150 150
 
151
-                          } ?>
151
+                            } ?>
152 152
                         </ul>
153 153
 
154 154
                         <p>We have <b>lots more</b> plain English analysis of <?= $full_name ?>&rsquo;s voting record  on issues like health, welfare, taxation and more. Visit <a href="<?= $member_url ?>/votes"><?= $full_name ?>&rsquo;s full vote analysis page</a> for more.</p>
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@
 block discarded – undo
105 105
                         <ul class="vote-descriptions">
106 106
                           <?php foreach ($sorted_diffs as $policy_id => $score) {
107 107
 
108
-                            $key_vote = NULL;
108
+                            $key_vote = null;
109 109
                             $description = sprintf(
110 110
                                 '%s <b>%s</b> %s, while most %s MPs <b>%s</b>.',
111 111
                                 $full_name,
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
                 </div>
59 59
               <?php endif; ?>
60 60
 
61
-                <?php if ( !$current_member[HOUSE_TYPE_COMMONS] ) { ?>
61
+                <?php if (!$current_member[HOUSE_TYPE_COMMONS]) { ?>
62 62
                     <?php if (count($policyPositions->positions) > 0) { ?>
63 63
                     <div class="panel">
64 64
                         <a name="votes"></a>
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
 
125 125
                         <p>We have <b>lots more</b> plain English analysis of <?= $full_name ?>&rsquo;s voting record  on issues like health, welfare, taxation and more. Visit <a href="<?= $member_url ?>/votes"><?= $full_name ?>&rsquo;s full vote analysis page</a> for more.</p>
126 126
 
127
-                    <?php elseif (count($policyPositions->positions) > 0 ): ?>
127
+                    <?php elseif (count($policyPositions->positions) > 0): ?>
128 128
                         <?php if (count($party_positions) && $party_member_count > 1) { ?>
129 129
                         <p>
130 130
                         <?= $full_name ?> is a <?= $party ?> MP, and on the <b>vast majority</b> of issues votes the <b>same way</b> as other <?= $party ?> MPs.
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
                         </ul>
153 153
 
154 154
                         <p>We have <b>lots more</b> plain English analysis of <?= $full_name ?>&rsquo;s voting record  on issues like health, welfare, taxation and more. Visit <a href="<?= $member_url ?>/votes"><?= $full_name ?>&rsquo;s full vote analysis page</a> for more.</p>
155
-                    <?php elseif (count($policyPositions->positions) == 0 ): ?>
155
+                    <?php elseif (count($policyPositions->positions) == 0): ?>
156 156
 
157 157
                         <p>No votes to display.</p>
158 158
 
Please login to merge, or discard this patch.
Braces   +9 added lines, -4 removed lines patch added patch discarded remove patch
@@ -86,7 +86,8 @@  discard block
 block discarded – undo
86 86
 
87 87
                     </div>
88 88
                     <?php } ?>
89
-                <?php } else if (count($policyPositions->positions) > 0 || count($sorted_diffs) > 0): ?>
89
+                <?php }
90
+else if (count($policyPositions->positions) > 0 || count($sorted_diffs) > 0): ?>
90 91
                 <div class="panel">
91 92
                     <a name="votes"></a>
92 93
                     <h2 data-magellan-destination="votes"><?= $full_name ?>&rsquo;s voting in Parliament</h2>
@@ -190,11 +191,14 @@  discard block
 block discarded – undo
190 191
                         <?= $recent_appearances['additional_links'] ?>
191 192
                         <?php endif; ?>
192 193
 
193
-                    <?php else: ?>
194
+                    <?php else {
195
+    : ?>
194 196
 
195 197
                         <p>No recent appearances to display.</p>
196 198
 
197
-                    <?php endif; ?>
199
+                    <?php endif;
200
+}
201
+?>
198 202
 
199 203
                 </div>
200 204
                 <?php endif; ?>
@@ -265,7 +269,8 @@  discard block
 block discarded – undo
265 269
                         <p>
266 270
                             <?php if ($eu_stance == 'Leave' || $eu_stance == 'Remain') { ?>
267 271
                                 <strong><?= $full_name ?></strong> campaigned to <?= $eu_stance == 'Leave' ? 'leave' : 'remain in' ?> the European Union
268
-                            <?php } else { ?>
272
+                            <?php }
273
+else { ?>
269 274
                                 We don't know whether <strong><?= $full_name ?></strong> campaigned to leave, or stay in the European Union
270 275
                             <?php } ?>
271 276
                             <small>Source: <a href="http://www.bbc.co.uk/news/uk-politics-eu-referendum-35616946">BBC</a></small>
Please login to merge, or discard this patch.
www/includes/easyparliament/templates/html/mp/_vote_description.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
 <li>
2 2
     <?= $description ?>
3
-    <?php if ( $show_link ) { ?>
3
+    <?php if ($show_link) { ?>
4 4
         <a class="vote-description__source" href="<?= $link ?>">Show votes</a>
5 5
         <?php if (isset($key_vote)) { ?>
6 6
         <a class="vote-description__evidence" href="<?= $link ?>"><?= $key_vote['summary'] ?></a>
Please login to merge, or discard this patch.
www/includes/easyparliament/templates/html/mp/votes_svg.php 4 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
 
29 29
     echo '<?xml version="1.0" encoding="iso-8859-1"?>';
30 30
 
31
- ?>
31
+    ?>
32 32
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
33 33
 <svg width="1000" height="500" viewBox="0 0 1000 500" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" font-family="Droid Sans, Trebuchet">
34 34
 
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@
 block discarded – undo
53 53
     <text font-size="24" font-weight="normal" fill="#000000">
54 54
         <?php foreach ($lines as $j=>$line) { ?>
55 55
             <tspan x="40" y="<?= $stance_y + $stance_padding_top + $stance_baseline_offset + ($stance_lineheight * $j) ?>"><?php
56
-                if (strpos($line, '*') !== False) {
56
+                if (strpos($line, '*') !== false) {
57 57
                     echo preg_replace(
58 58
                         '#(?:^|[*])([^\r\n *][^*\n]*[^\r\n *])(?:$|[*])#i',
59 59
                         $tspan_bold_open . '$1' . $tspan_bold_close,
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
     $stances = array();
4 4
 
5 5
     foreach ($segment['votes']->positions as $key_vote) {
6
-        if ( $key_vote['has_strong'] || $key_vote['position'] == 'has never voted on' ) {
6
+        if ($key_vote['has_strong'] || $key_vote['position'] == 'has never voted on') {
7 7
             $stance = strip_tags($key_vote['desc'], '<b>');
8 8
             $stance = ucfirst($stance);
9 9
             $stance = preg_replace('#</?b>#i', '*', $stance);
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,8 @@
 block discarded – undo
59 59
                         $tspan_bold_open . '$1' . $tspan_bold_close,
60 60
                         $line
61 61
                     );
62
-                } else {
62
+                }
63
+                else {
63 64
                     echo $line;
64 65
                 }
65 66
             ?></tspan>
Please login to merge, or discard this patch.
www/includes/easyparliament/templates/html/alert/index.php 3 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -122,25 +122,25 @@  discard block
 block discarded – undo
122 122
       <?php } ?>
123 123
 
124 124
       <?php
125
-          if(
126
-              (isset($members) && $members->rows() > 0) ||
125
+            if(
126
+                (isset($members) && $members->rows() > 0) ||
127 127
               (isset($constituencies) && count($constituencies) > 0) ||
128 128
               ($alertsearch)
129
-          ) {
130
-              /* We need to disambiguate the user's instructions */
131
-              $member_options = false;
132
-      ?>
129
+            ) {
130
+                /* We need to disambiguate the user's instructions */
131
+                $member_options = false;
132
+        ?>
133 133
         <div class="alert-section alert-section--disambiguation">
134 134
             <div class="alert-section__primary">
135 135
 
136 136
               <?php if (isset($members) && $members->rows() > 0) {
137
-                  $member_options = true; ?>
137
+                    $member_options = true; ?>
138 138
                 <h3>Sign up for alerts when people matching <i><?= _htmlspecialchars($alertsearch) ?></i> speaks</h3>
139 139
                 <ul>
140 140
                   <?php
141 141
                     $q = $members;
142 142
                     for ($n=0; $n<$q->rows(); $n++) {
143
-                  ?>
143
+                    ?>
144 144
                     <li>
145 145
                         <form action="<?= $actionurl ?>" method="post">
146 146
                             <input type="hidden" name="t" value="<?= _htmlspecialchars($token) ?>">
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
               <?php } ?>
161 161
 
162 162
               <?php if (isset($constituencies) && count($constituencies) > 0) {
163
-                  $member_options = true; ?>
163
+                    $member_options = true; ?>
164 164
                 <h3>Sign up for alerts when MPs for constituencies matching <i><?= _htmlspecialchars($alertsearch) ?></i> speaks</h3>
165 165
                 <ul>
166 166
                 <?php foreach ($constituencies as $constituency => $member) { ?>
Please login to merge, or discard this patch.
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <div class="full-page">
2 2
     <div class="full-page__row">
3 3
 
4
-      <?php if ( $message ) { ?>
4
+      <?php if ($message) { ?>
5 5
         <div class="alert-section alert-section--feedback">
6 6
             <div class="alert-section__primary">
7 7
                 <h3><?= $message['title'] ?></h3>
@@ -12,10 +12,10 @@  discard block
 block discarded – undo
12 12
         </div>
13 13
       <?php } ?>
14 14
 
15
-      <?php if ( $results ) { ?>
15
+      <?php if ($results) { ?>
16 16
         <div class="alert-section alert-section--feedback">
17 17
             <div class="alert-section__primary">
18
-              <?php if ( $results == 'alert-confirmed' ) { ?>
18
+              <?php if ($results == 'alert-confirmed') { ?>
19 19
                 <h3>Your alert has been confirmed</h3>
20 20
                 <p>
21 21
                     You will now receive email alerts for the following criteria:
@@ -45,26 +45,26 @@  discard block
 block discarded – undo
45 45
                 </div>
46 46
                 </noscript>
47 47
 
48
-              <?php } elseif ( $results == 'alert-suspended' ) { ?>
48
+              <?php } elseif ($results == 'alert-suspended') { ?>
49 49
                 <h3>Alert suspended</h3>
50 50
                 <p>
51 51
                     You can reactivate the alert at any time, from the sidebar below.
52 52
                 </p>
53 53
 
54
-              <?php } elseif ( $results == 'alert-resumed' ) { ?>
54
+              <?php } elseif ($results == 'alert-resumed') { ?>
55 55
                 <h3>Alert resumed</h3>
56 56
                 <p>
57 57
                     You will now receive email alerts on any day when there
58 58
                     are entries in Hansard that match your criteria.
59 59
                 </p>
60 60
 
61
-              <?php } elseif ( $results == 'alert-deleted' ) { ?>
61
+              <?php } elseif ($results == 'alert-deleted') { ?>
62 62
                 <h3>Alert deleted</h3>
63 63
                 <p>
64 64
                     You will no longer receive this alert.
65 65
                 </p>
66 66
 
67
-              <?php } elseif ( $results == 'alert-fail' ) { ?>
67
+              <?php } elseif ($results == 'alert-fail') { ?>
68 68
                 <h3>Hmmm, something&rsquo;s not right</h3>
69 69
                 <p>
70 70
                     The link you followed to reach this page appears to be incomplete.
@@ -80,14 +80,14 @@  discard block
 block discarded – undo
80 80
                     and let us know, and we'll help out!
81 81
                 </p>
82 82
 
83
-              <?php } elseif ( $results == 'alert-added' ) { ?>
83
+              <?php } elseif ($results == 'alert-added') { ?>
84 84
                 <h3>Your alert has been added</h3>
85 85
                 <p>
86 86
                     You will now receive email alerts on any day when
87 87
                     <?= _htmlspecialchars($criteria) ?> in parliament.
88 88
                 </p>
89 89
 
90
-              <?php } elseif ( $results == 'alert-confirmation' ) { ?>
90
+              <?php } elseif ($results == 'alert-confirmation') { ?>
91 91
                 <h3>We&rsquo;re nearly done&hellip;</h3>
92 92
                 <p>
93 93
                     You should receive an email shortly which will contain a link.
@@ -95,20 +95,20 @@  discard block
 block discarded – undo
95 95
                     and receive future alerts. Thanks.
96 96
                 </p>
97 97
 
98
-              <?php } elseif ( $results == 'alert-exists' ) { ?>
98
+              <?php } elseif ($results == 'alert-exists') { ?>
99 99
                 <h3>You&rsquo;re already subscribed to that!</h3>
100 100
                 <p>
101 101
                     It&rsquo;s good to know you&rsquo;re keen though.
102 102
                 </p>
103 103
 
104
-              <?php } elseif ( $results == 'alert-already-signed' ) { ?>
104
+              <?php } elseif ($results == 'alert-already-signed') { ?>
105 105
                 <h3>We&rsquo;re nearly done</h3>
106 106
                 <p>
107 107
                     You should receive an email shortly which will contain a link.
108 108
                     You will need to follow that link to confirm your email address to receive the alert. Thanks.
109 109
                 </p>
110 110
 
111
-              <?php } elseif ( $results == 'alert-fail' ) { ?>
111
+              <?php } elseif ($results == 'alert-fail') { ?>
112 112
                 <h3>Alert could not be created</h3>
113 113
                 <p>
114 114
                     Sorry, we were unable to create that alert. Please
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
       <?php } ?>
123 123
 
124 124
       <?php
125
-          if(
125
+          if (
126 126
               (isset($members) && $members->rows() > 0) ||
127 127
               (isset($constituencies) && count($constituencies) > 0) ||
128 128
               ($alertsearch)
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
                 <ul>
140 140
                   <?php
141 141
                     $q = $members;
142
-                    for ($n=0; $n<$q->rows(); $n++) {
142
+                    for ($n = 0; $n < $q->rows(); $n++) {
143 143
                   ?>
144 144
                     <li>
145 145
                         <form action="<?= $actionurl ?>" method="post">
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
                             <input type="hidden" name="email" value="<?= _htmlspecialchars($email) ?>">
148 148
                             <input type="hidden" name="pid" value="<?= $q->field($n, 'person_id') ?>">
149 149
                             When
150
-                            <?= member_full_name($q->field($n, 'house'), $q->field($n, 'title'), $q->field($n, 'given_name'), $q->field($n, 'family_name'), $q->field($n, 'lordofname') ) ?>
150
+                            <?= member_full_name($q->field($n, 'house'), $q->field($n, 'title'), $q->field($n, 'given_name'), $q->field($n, 'family_name'), $q->field($n, 'lordofname')) ?>
151 151
                             <?php if ($q->field($n, 'constituency')) { ?>
152 152
                                 (<?= $q->field($n, 'constituency') ?>)
153 153
                             <?php } ?>
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
               <?php } ?>
179 179
 
180 180
               <?php if ($alertsearch) {
181
-                if ( $member_options ) { ?>
181
+                if ($member_options) { ?>
182 182
                 <h3>Sign up for alerts for topics</h3>
183 183
                 <?php } else { ?>
184 184
                 <h3>Great! Can you just confirm what you mean?</h3>
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
                             Receive alerts when <?= _htmlspecialchars($alertsearch_pretty) ?>
193 193
                             <input type="submit" class="button small" value="Subscribe">
194 194
                         </form>
195
-                      <?php if ( isset($mistakes['multiple']) ) { ?>
195
+                      <?php if (isset($mistakes['multiple'])) { ?>
196 196
                         <em class="error">
197 197
                             You have used a comma in your search term &ndash;
198 198
                             are you sure this is what you want? You cannot
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
                             for each individual term.
202 202
                         </em>
203 203
                       <?php } ?>
204
-                      <?php if ( isset($mistakes['postcode_and']) ) { ?>
204
+                      <?php if (isset($mistakes['postcode_and'])) { ?>
205 205
                         <em class="error">
206 206
                             You have used a postcode and something else in your
207 207
                             search term &ndash; are you sure this is what you
@@ -350,17 +350,17 @@  discard block
 block discarded – undo
350 350
             <div class="alert-section__secondary">
351 351
               <?php if ($email_verified) { ?>
352 352
 
353
-                  <?php if ( $alerts ) { ?>
353
+                  <?php if ($alerts) { ?>
354 354
                     <h3>Your current email alerts</h3>
355 355
                     <ul class="alerts-manage__list">
356
-                      <?php foreach ( $alerts as $alert ) { ?>
356
+                      <?php foreach ($alerts as $alert) { ?>
357 357
                         <li>
358 358
                             When <?= _htmlspecialchars($alert['criteria']) ?>.
359 359
                             <form action="<?= $actionurl ?>" method="POST">
360 360
                                 <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
361
-                              <?php if ( $alert['status'] == 'unconfirmed' ) { ?>
361
+                              <?php if ($alert['status'] == 'unconfirmed') { ?>
362 362
                                 <input type="submit" class="button small" name="action" value="Confirm">
363
-                              <?php } elseif ( $alert['status'] == 'suspended' ) { ?>
363
+                              <?php } elseif ($alert['status'] == 'suspended') { ?>
364 364
                                 <input type="submit" class="button small" name="action" value="Resume">
365 365
                               <?php } else { ?>
366 366
                                 <input type="submit" class="button button--secondary small" name="action" value="Suspend">
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
372 372
                     </ul>
373 373
                   <?php } ?>
374 374
 
375
-                  <?php if ( $current_mp ) { ?>
375
+                  <?php if ($current_mp) { ?>
376 376
                     <h3>Your MP alert</h3>
377 377
                     <ul class="alerts-manage__list">
378 378
                         <li>
Please login to merge, or discard this patch.
Braces   +34 added lines, -17 removed lines patch added patch discarded remove patch
@@ -45,26 +45,30 @@  discard block
 block discarded – undo
45 45
                 </div>
46 46
                 </noscript>
47 47
 
48
-              <?php } elseif ( $results == 'alert-suspended' ) { ?>
48
+              <?php }
49
+elseif ( $results == 'alert-suspended' ) { ?>
49 50
                 <h3>Alert suspended</h3>
50 51
                 <p>
51 52
                     You can reactivate the alert at any time, from the sidebar below.
52 53
                 </p>
53 54
 
54
-              <?php } elseif ( $results == 'alert-resumed' ) { ?>
55
+              <?php }
56
+elseif ( $results == 'alert-resumed' ) { ?>
55 57
                 <h3>Alert resumed</h3>
56 58
                 <p>
57 59
                     You will now receive email alerts on any day when there
58 60
                     are entries in Hansard that match your criteria.
59 61
                 </p>
60 62
 
61
-              <?php } elseif ( $results == 'alert-deleted' ) { ?>
63
+              <?php }
64
+elseif ( $results == 'alert-deleted' ) { ?>
62 65
                 <h3>Alert deleted</h3>
63 66
                 <p>
64 67
                     You will no longer receive this alert.
65 68
                 </p>
66 69
 
67
-              <?php } elseif ( $results == 'alert-fail' ) { ?>
70
+              <?php }
71
+elseif ( $results == 'alert-fail' ) { ?>
68 72
                 <h3>Hmmm, something&rsquo;s not right</h3>
69 73
                 <p>
70 74
                     The link you followed to reach this page appears to be incomplete.
@@ -80,14 +84,16 @@  discard block
 block discarded – undo
80 84
                     and let us know, and we'll help out!
81 85
                 </p>
82 86
 
83
-              <?php } elseif ( $results == 'alert-added' ) { ?>
87
+              <?php }
88
+elseif ( $results == 'alert-added' ) { ?>
84 89
                 <h3>Your alert has been added</h3>
85 90
                 <p>
86 91
                     You will now receive email alerts on any day when
87 92
                     <?= _htmlspecialchars($criteria) ?> in parliament.
88 93
                 </p>
89 94
 
90
-              <?php } elseif ( $results == 'alert-confirmation' ) { ?>
95
+              <?php }
96
+elseif ( $results == 'alert-confirmation' ) { ?>
91 97
                 <h3>We&rsquo;re nearly done&hellip;</h3>
92 98
                 <p>
93 99
                     You should receive an email shortly which will contain a link.
@@ -95,20 +101,23 @@  discard block
 block discarded – undo
95 101
                     and receive future alerts. Thanks.
96 102
                 </p>
97 103
 
98
-              <?php } elseif ( $results == 'alert-exists' ) { ?>
104
+              <?php }
105
+elseif ( $results == 'alert-exists' ) { ?>
99 106
                 <h3>You&rsquo;re already subscribed to that!</h3>
100 107
                 <p>
101 108
                     It&rsquo;s good to know you&rsquo;re keen though.
102 109
                 </p>
103 110
 
104
-              <?php } elseif ( $results == 'alert-already-signed' ) { ?>
111
+              <?php }
112
+elseif ( $results == 'alert-already-signed' ) { ?>
105 113
                 <h3>We&rsquo;re nearly done</h3>
106 114
                 <p>
107 115
                     You should receive an email shortly which will contain a link.
108 116
                     You will need to follow that link to confirm your email address to receive the alert. Thanks.
109 117
                 </p>
110 118
 
111
-              <?php } elseif ( $results == 'alert-fail' ) { ?>
119
+              <?php }
120
+elseif ( $results == 'alert-fail' ) { ?>
112 121
                 <h3>Alert could not be created</h3>
113 122
                 <p>
114 123
                     Sorry, we were unable to create that alert. Please
@@ -180,7 +189,8 @@  discard block
 block discarded – undo
180 189
               <?php if ($alertsearch) {
181 190
                 if ( $member_options ) { ?>
182 191
                 <h3>Sign up for alerts for topics</h3>
183
-                <?php } else { ?>
192
+                <?php }
193
+else { ?>
184 194
                 <h3>Great! Can you just confirm what you mean?</h3>
185 195
                 <?php } ?>
186 196
                 <ul>
@@ -255,11 +265,13 @@  discard block
 block discarded – undo
255 265
                     (<?= _htmlspecialchars($pid_member->constituency()) ?>)
256 266
                     speaks.
257 267
                 </h3>
258
-              <?php } elseif ($keyword) { ?>
268
+              <?php }
269
+elseif ($keyword) { ?>
259 270
                 <h3>
260 271
                     Sign up for an alert when <?= _htmlspecialchars($display_keyword) ?>.
261 272
                 </h3>
262
-              <?php } else { ?>
273
+              <?php }
274
+else { ?>
263 275
                 <h3>Request a new TheyWorkForYou email alert</h3>
264 276
               <?php } ?>
265 277
 
@@ -277,9 +289,11 @@  discard block
 block discarded – undo
277 289
                       <?php if ($pid) { ?>
278 290
                         <input type="text" class="form-control" name="alertsearch" id="alertsearch" disabled="disabled"
279 291
                             value="<?= $pid_member->full_name() ?> (<?= _htmlspecialchars($pid_member->constituency()) ?>)">
280
-                      <?php } elseif ($keyword) { ?>
292
+                      <?php }
293
+elseif ($keyword) { ?>
281 294
                         <input type="text" class="form-control" name="alertsearch" id="alertsearch" disabled="disabled" value="<?= _htmlspecialchars($display_keyword) ?>">
282
-                      <?php } else { ?>
295
+                      <?php }
296
+else { ?>
283 297
                         <input type="text" class="form-control" placeholder="Search term, postcode, or MP name" name="alertsearch" id="alertsearch" value="<?= _htmlentities($search_text) ?>">
284 298
                       <?php } ?>
285 299
                         <input type="submit" class="button" value="<?= ($pid || $keyword) ? 'Subscribe' : 'Search' ?>">
@@ -360,9 +374,11 @@  discard block
 block discarded – undo
360 374
                                 <input type="hidden" name="t" value="<?= _htmlspecialchars($alert['token']) ?>">
361 375
                               <?php if ( $alert['status'] == 'unconfirmed' ) { ?>
362 376
                                 <input type="submit" class="button small" name="action" value="Confirm">
363
-                              <?php } elseif ( $alert['status'] == 'suspended' ) { ?>
377
+                              <?php }
378
+elseif ( $alert['status'] == 'suspended' ) { ?>
364 379
                                 <input type="submit" class="button small" name="action" value="Resume">
365
-                              <?php } else { ?>
380
+                              <?php }
381
+else { ?>
366 382
                                 <input type="submit" class="button button--secondary small" name="action" value="Suspend">
367 383
                                 <input type="submit" class="button button--negative small" name="action" value="Delete">
368 384
                               <?php } ?>
@@ -387,7 +403,8 @@  discard block
 block discarded – undo
387 403
                     </ul>
388 404
                   <?php } ?>
389 405
 
390
-              <?php } else { ?>
406
+              <?php }
407
+else { ?>
391 408
                 <p>
392 409
                     If you <a href="/user/?pg=join">join</a> or
393 410
                     <a href="/user/login/?ret=%2Falert%2F">sign in</a>,
Please login to merge, or discard this patch.
www/includes/easyparliament/templates/html/homepage/featured.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@  discard block
 block discarded – undo
1
-                        <?php if ( $featured['featured'] ) { ?>
1
+                        <?php if ($featured['featured']) { ?>
2 2
                         <h2>In the news</h2>
3
-                        <?php if ( isset($featured['headline']) ) { ?>
3
+                        <?php if (isset($featured['headline'])) { ?>
4 4
                         <h3 class="in-the-news__topic"><a href="<?= $featured['list_url'] ?>"><?= $featured['headline'] ?></a></h3>
5
-                        <?php if ( isset($featured['context']) ) { ?>
5
+                        <?php if (isset($featured['context'])) { ?>
6 6
                         <p class="in-the-news__context"><?= $featured['context'] ?></p>
7 7
                         <?php } ?>
8 8
                         <?php } ?>
@@ -15,21 +15,21 @@  discard block
 block discarded – undo
15 15
                             <p class="meta excerpt__category"><a href="<?= $featured['more_url'] ?>"><?= $featured['desc'] ?></a></p>
16 16
                             <p class="excerpt__statement">
17 17
                                 <q>
18
-                                <?php if ( $featured['child']['speaker'] ) { ?>
18
+                                <?php if ($featured['child']['speaker']) { ?>
19 19
                                 <a href="<?= $featured['child']['speaker']['url'] ?>"><?= $featured['child']['speaker']['name'] ?></a> :
20 20
                                 <?php } ?>
21 21
                                 <?= trim_characters($featured['child']['body'], 0, 200) ?>
22 22
                                 </q>
23 23
                             </p>
24 24
                         </div>
25
-                        <?php if ( count($featured['related']) ) { ?>
25
+                        <?php if (count($featured['related'])) { ?>
26 26
                         <div class="in-the-news__key-events">
27 27
                             <!-- No maximum, but less than 4 looks best -->
28 28
                             <ul class="key-events__list">
29 29
                                 <li>
30 30
                                     <h4>Key events</h4>
31 31
                                 </li>
32
-                                <?php foreach ( $featured['related'] as $related ) { ?>
32
+                                <?php foreach ($featured['related'] as $related) { ?>
33 33
                                  <li>
34 34
                                      <a href="<?= $related['list_url'] ?>"><?= $related['parent']['body'] ?></a>
35 35
                                     <p class="meta"><?= format_date($related['hdate'], SHORTDATEFORMAT) ?></p>
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,8 @@
 block discarded – undo
6 6
                         <p class="in-the-news__context"><?= $featured['context'] ?></p>
7 7
                         <?php } ?>
8 8
                         <?php } ?>
9
-                        <?php } else { ?>
9
+                        <?php }
10
+else { ?>
10 11
                         <h2>Random debate</h2>
11 12
                         <?php } ?>
12 13
                         <div class="parliamentary-excerpt">
Please login to merge, or discard this patch.
www/includes/easyparliament/templates/html/section/_business_list.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
         <div class="business-section__primary">
2 2
             <ul class="business-list">
3
-              <?php foreach ( $data as $item ) { ?>
3
+              <?php foreach ($data as $item) { ?>
4 4
                 <li>
5 5
                     <?php include '_business_list_item.php'; ?>
6 6
                 </li>
Please login to merge, or discard this patch.