Completed
Push — master ( a4bf3a...585786 )
by Sam
08:59 queued 03:28
created
www/includes/easyparliament/templates/html/scotland/index.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
                 <div class="row nested-row">
42 42
                     <div class="homepage-in-the-news homepage-content-section">
43 43
                         <?php if ( $featured ) {
44
-                             include dirname(__FILE__) . "/../homepage/featured.php";
44
+                                include dirname(__FILE__) . "/../homepage/featured.php";
45 45
                         } ?>
46 46
                     </div>
47 47
                     <div class="homepage-create-alert homepage-content-section">
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -11,10 +11,10 @@  discard block
 block discarded – undo
11 11
                 </div>
12 12
                 <div class="row">
13 13
                     <div class="medium-9 columns">
14
-                    <?php if ( count($data['regional']) > 0 ) { ?>
14
+                    <?php if (count($data['regional']) > 0) { ?>
15 15
                         <ul class="homepage-rep-list">
16 16
                         <li>Your Regional MSPs:</li>
17
-                        <?php foreach ( $data['regional'] as $msp ) { ?>
17
+                        <?php foreach ($data['regional'] as $msp) { ?>
18 18
                             <li class="homepage-rep-list__rep"><a href="/msp/?p=<?= $msp['person_id'] ?>"><?= $msp['name'] ?></a></li>
19 19
                         <?php } ?>
20 20
                         </ul>
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
             <div class="panel panel--flushtop clearfix">
58 58
                 <div class="row nested-row">
59 59
                     <div class="homepage-in-the-news homepage-content-section">
60
-                        <?php if ( $featured ) {
60
+                        <?php if ($featured) {
61 61
                              include dirname(__FILE__) . "/../homepage/featured.php";
62 62
                         } ?>
63 63
                     </div>
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 
105 105
                         <h2>Recently in Parliament</h2>
106 106
                         <ul class="recently__list"><?php
107
-                            foreach ( $debates['recent'] as $recent ) {
107
+                            foreach ($debates['recent'] as $recent) {
108 108
                                 include dirname(__FILE__) . '/../homepage/recent-debates.php';
109 109
                             }
110 110
                         ?></ul>
Please login to merge, or discard this patch.
www/includes/easyparliament/templates/html/section/_section_content.php 4 patches
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -157,7 +157,7 @@
 block discarded – undo
157 157
               <?php # XXX
158 158
                 if ($data['info']['major'] == 8 && preg_match('#\d{4}-\d\d-\d\d\.(.*?)\.q#', $speech['gid'], $m)) {
159 159
                     ?><p class="debate-speech__question_id"><small>
160
-                    <?= "Question $m[1]" ?>
160
+                    <?= "question $m[1]" ?>
161 161
                     </small></p>
162 162
               <?php } ?>
163 163
             </h2>
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -186,7 +186,8 @@
 block discarded – undo
186 186
                 } # End of voting HTML
187 187
 
188 188
                 // Video
189
-                if ($data['info']['major'] == 1 && !$individual_item) { # Commons debates only
189
+                if ($data['info']['major'] == 1 && !$individual_item) {
190
+# Commons debates only
190 191
                     if ($speech['video_status']&4) { ?>
191 192
                         <a href="<?= $speech['commentsurl'] ?>" class="watch debate-speech__meta__link" onclick="return moveVideo(\'debate/'<?= $speech['gid'] ?>\');">Watch this</a>
192 193
                     <?php
Please login to merge, or discard this patch.
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   +18 added lines, -18 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
     }
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
             <div class="debate-speech__speaker-and-content">
113 113
             <?php } ?>
114 114
 
115
-          <?php if(isset($speech['speaker']) && count($speech['speaker']) > 0) { ?>
115
+          <?php if (isset($speech['speaker']) && count($speech['speaker']) > 0) { ?>
116 116
             <h2 class="debate-speech__speaker">
117 117
                 <?php
118 118
 
@@ -179,17 +179,17 @@  discard block
 block discarded – undo
179 179
                 <?php if ($division['has_description']) { ?>
180 180
                 <div class="debate-speech__division__details">
181 181
                     <span class="policy-vote__text">
182
-                        <?php include( dirname(__FILE__) . '/../divisions/_vote_description.php'); ?>
182
+                        <?php include(dirname(__FILE__) . '/../divisions/_vote_description.php'); ?>
183 183
                     </span><br>
184 184
                 </div>
185 185
                 <?php } ?>
186 186
 
187 187
               <?php if (isset($speech['mp_vote'])) {
188
-                $mp_vote = array( 'vote' => $speech['mp_vote']['vote'] );
189
-                if ( isset($speech['before_mp']) ) {
188
+                $mp_vote = array('vote' => $speech['mp_vote']['vote']);
189
+                if (isset($speech['before_mp'])) {
190 190
                     $before_mp = $speech['before_mp'];
191 191
                 }
192
-                if ( isset($speech['after_mp']) ) {
192
+                if (isset($speech['after_mp'])) {
193 193
                     $after_mp = $speech['after_mp'];
194 194
                 }
195 195
                 include dirname(__FILE__) . '/../divisions/_your_mp.php';
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
             <div class="debate-speech__content"><?=$body ?></div>
202 202
             <?php } ?>
203 203
 
204
-            <?php if ( $section ) {
204
+            <?php if ($section) {
205 205
                 if ($speech['voting_data']) { ?>
206 206
 
207 207
                 <div class="debate-speech__question-answered">
@@ -226,10 +226,10 @@  discard block
 block discarded – undo
226 226
 
227 227
                 // Video
228 228
                 if ($data['info']['major'] == 1 && !$individual_item) { # Commons debates only
229
-                    if ($speech['video_status']&4) { ?>
229
+                    if ($speech['video_status'] & 4) { ?>
230 230
                         <a href="<?= $speech['commentsurl'] ?>" class="watch debate-speech__meta__link" onclick="return moveVideo(\'debate/'<?= $speech['gid'] ?>\');">Watch this</a>
231 231
                     <?php
232
-                    } elseif (!$speech['video'] && $speech['video_status']&1 && !($speech['video_status']&8)) {
232
+                    } elseif (!$speech['video'] && $speech['video_status'] & 1 && !($speech['video_status'] & 8)) {
233 233
                         $gid_type = $data['info']['major'] == 1 ? 'debate' : 'lords'; ?>
234 234
                         <a href="/video/?from=debate&amp;gid=<?= $gid_type ?>/<?= $speech['gid'] ?>" class="timestamp debate-speech__meta__link">Video match this</a>
235 235
                     <?php
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
                     $moreinfo[] = $row['totalcomments'] . " $plural";
360 360
                 }
361 361
                 if (count($moreinfo) > 0) {
362
-                    print "<small>(" . implode (', ', $moreinfo) . ") </small>";
362
+                    print "<small>(" . implode(', ', $moreinfo) . ") </small>";
363 363
                 }
364 364
             } else {
365 365
                 // Nothing in this item, so no link.
Please login to merge, or discard this patch.
www/includes/easyparliament/templates/html/section/recent.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1 1
 <div class="full-page__row">
2 2
     <?php include '_business_section.php'; ?>
3
-    <?php $search_title = "Search $title"; include '_search.php'; ?>
3
+    <?php $search_title = "search $title"; include '_search.php'; ?>
4 4
 </div>
Please login to merge, or discard this patch.
www/includes/easyparliament/templates/rss/hansard_search.php 2 patches
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
         $row = $data['rows'][$i];
26 26
 
27 27
         $hdate = format_date($row['hdate'], 'D, d M Y');
28
-        if (isset($row['htime']) && $row['htime'] != NULL) {
28
+        if (isset($row['htime']) && $row['htime'] != null) {
29 29
             $htime = format_time($row['htime'], 'H:i:s');
30 30
         } else {
31 31
             $htime = '00:00:00';
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 twfy_debug("TEMPLATE", "rss/hansard_search.php");
22 22
 
23 23
 if (isset ($data['rows']) && count($data['rows']) > 0) {
24
-    for ($i=0; $i<count($data['rows']); $i++) {
24
+    for ($i = 0; $i < count($data['rows']); $i++) {
25 25
         $row = $data['rows'][$i];
26 26
 
27 27
         $hdate = format_date($row['hdate'], 'D, d M Y');
Please login to merge, or discard this patch.
www/includes/easyparliament/comment.php 3 patches
Upper-Lower-Casing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
     public $body = '';
32 32
     public $posted = '';
33 33
     public $visible = false;
34
-    public $modflagged = NULL;	// Is a datetime when set.
34
+    public $modflagged = null;	// Is a datetime when set.
35 35
     public $firstname = '';	// Of the person who posted it.
36 36
     public $lastname = '';
37 37
     public $url = '';
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
             $flag = "'$date'";
139 139
 
140 140
         } elseif ($switch == 'off') {
141
-            $date = NULL;
141
+            $date = null;
142 142
             $flag = 'NULL';
143 143
 
144 144
         } else {
Please login to merge, or discard this patch.
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -210,8 +210,8 @@
 block discarded – undo
210 210
                             array(':epobject_id' => $this->epobject_id))->first();
211 211
 
212 212
             if ($q) {
213
-                 // If you change stuff here, you might have to change it in
214
-                 // $COMMENTLIST->_get_comment_data() too...
213
+                    // If you change stuff here, you might have to change it in
214
+                    // $COMMENTLIST->_get_comment_data() too...
215 215
 
216 216
                 $gid = fix_gid_from_db($q['gid']); // In includes/utility.php
217 217
 
Please login to merge, or discard this patch.
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -31,8 +31,8 @@  discard block
 block discarded – undo
31 31
     public $body = '';
32 32
     public $posted = '';
33 33
     public $visible = false;
34
-    public $modflagged = NULL;	// Is a datetime when set.
35
-    public $firstname = '';	// Of the person who posted it.
34
+    public $modflagged = NULL; // Is a datetime when set.
35
+    public $firstname = ''; // Of the person who posted it.
36 36
     public $lastname = '';
37 37
     public $url = '';
38 38
 
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
     public $exists = false;
42 42
 
43 43
 
44
-    public function __construct($comment_id='') {
44
+    public function __construct($comment_id = '') {
45 45
 
46 46
         $this->db = new ParlDB;
47 47
 
@@ -69,12 +69,12 @@  discard block
 block discarded – undo
69 69
             if ($q) {
70 70
 
71 71
                 $this->comment_id 	= $comment_id;
72
-                $this->user_id		= $q['user_id'];
72
+                $this->user_id = $q['user_id'];
73 73
                 $this->epobject_id	= $q['epobject_id'];
74
-                $this->body			= $q['body'];
75
-                $this->posted		= $q['posted'];
76
-                $this->visible		= $q['visible'];
77
-                $this->modflagged	= $q['modflagged'];
74
+                $this->body = $q['body'];
75
+                $this->posted = $q['posted'];
76
+                $this->visible = $q['visible'];
77
+                $this->modflagged = $q['modflagged'];
78 78
 
79 79
                 // Sets the URL and username for this comment. Duh.
80 80
                 $this->_set_url();
@@ -104,9 +104,9 @@  discard block
 block discarded – undo
104 104
     public function comments_enabled() { return $this->comments_enabled; }
105 105
 
106 106
 
107
-    public function display($format='html', $template='comments') {
107
+    public function display($format = 'html', $template = 'comments') {
108 108
 
109
-        $data['comments'][0] = array (
109
+        $data['comments'][0] = array(
110 110
             'comment_id'	=> $this->comment_id,
111 111
             'user_id'		=> $this->user_id,
112 112
             'epobject_id'	=> $this->epobject_id,
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
             $flag = 'NULL';
143 143
 
144 144
         } else {
145
-            $PAGE->error_message ("Why are you trying to switch this comment's modflag to '" . _htmlentities($switch) . "'!");
145
+            $PAGE->error_message("Why are you trying to switch this comment's modflag to '" . _htmlentities($switch) . "'!");
146 146
         }
147 147
 
148 148
         $q = $this->db->query("UPDATE comments
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
             $this->modflagged = $date;
155 155
             return true;
156 156
         } else {
157
-            $message = array (
157
+            $message = array(
158 158
                 'title' => 'Sorry',
159 159
                 'text' => "We couldn't update the annotation's modflag."
160 160
             );
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
             if ($q->success()) {
177 177
                 return true;
178 178
             } else {
179
-                $message = array (
179
+                $message = array(
180 180
                     'title' => 'Sorry',
181 181
                     'text' => "We were unable to delete the annotation."
182 182
                 );
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
             }
186 186
 
187 187
         } else {
188
-            $message = array (
188
+            $message = array(
189 189
                 'title' => 'Sorry',
190 190
                 'text' => "You are not authorised to delete annotations."
191 191
             );
Please login to merge, or discard this patch.
www/includes/easyparliament/staticpages/search_help.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
 </li>
32 32
 
33 33
 <?php
34
-$user_agent = ( isset( $_SERVER['HTTP_USER_AGENT'] ) ) ? strtolower( $_SERVER['HTTP_USER_AGENT'] ) : '';
34
+$user_agent = (isset($_SERVER['HTTP_USER_AGENT'])) ? strtolower($_SERVER['HTTP_USER_AGENT']) : '';
35 35
 if (stristr($user_agent, 'Firefox/')) {
36 36
 ?>
37 37
      <li>You can also add TheyWorkForYou to <a href="http://mycroft.mozdev.org/download.html?name=theyworkforyou">Firefox's search box</a>.</li>
Please login to merge, or discard this patch.
www/includes/easyparliament/commentreport.php 2 patches
Upper-Lower-Casing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -27,10 +27,10 @@  discard block
 block discarded – undo
27 27
     public $firstname = '';
28 28
     public $lastname = '';
29 29
     public $body = '';
30
-    public $reported = NULL;	// datetime
31
-    public $resolved = NULL; 	// datetime
30
+    public $reported = null;	// datetime
31
+    public $resolved = null; 	// datetime
32 32
     public $resolvedby = ''; 	// user_id
33
-    public $locked = NULL; 	// datetime
33
+    public $locked = null; 	// datetime
34 34
     public $lockedby = '';		// user_id
35 35
     public $upheld = ''; 		// boolean
36 36
 
@@ -370,8 +370,8 @@  discard block
 block discarded – undo
370 370
                         ");
371 371
 
372 372
         if ($q->success()) {
373
-            $this->locked = NULL;
374
-            $this->lockedby = NULL;
373
+            $this->locked = null;
374
+            $this->lockedby = null;
375 375
             return true;
376 376
         } else {
377 377
             return false;
@@ -431,8 +431,8 @@  discard block
 block discarded – undo
431 431
 
432 432
                     $this->resolved = $time;
433 433
                     $this->resolvedby = $THEUSER->user_id();
434
-                    $this->locked = NULL;
435
-                    $this->lockedby = NULL;
434
+                    $this->locked = null;
435
+                    $this->lockedby = null;
436 436
                     $this->upheld = $upheld;
437 437
 
438 438
                     return true;
Please login to merge, or discard this patch.
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -27,12 +27,12 @@  discard block
 block discarded – undo
27 27
     public $firstname = '';
28 28
     public $lastname = '';
29 29
     public $body = '';
30
-    public $reported = NULL;	// datetime
31
-    public $resolved = NULL; 	// datetime
32
-    public $resolvedby = ''; 	// user_id
33
-    public $locked = NULL; 	// datetime
34
-    public $lockedby = '';		// user_id
35
-    public $upheld = ''; 		// boolean
30
+    public $reported = NULL; // datetime
31
+    public $resolved = NULL; // datetime
32
+    public $resolvedby = ''; // user_id
33
+    public $locked = NULL; // datetime
34
+    public $lockedby = ''; // user_id
35
+    public $upheld = ''; // boolean
36 36
 
37 37
     // If the user was logged in, this will be set:
38 38
     public $user_id = '';
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
     public $email = '';
41 41
 
42 42
 
43
-    public function __construct($report_id='') {
43
+    public function __construct($report_id = '') {
44 44
         // Pass it a report id and it gets and sets this report's data.
45 45
 
46 46
         $this->db = new ParlDB;
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
         global $THEUSER, $PAGE;
163 163
 
164 164
         if (!$THEUSER->is_able_to('reportcomment')) {
165
-            $PAGE->error_message ("Sorry, you are not allowed to post reports.");
165
+            $PAGE->error_message("Sorry, you are not allowed to post reports.");
166 166
             return false;
167 167
         }
168 168
 
@@ -230,19 +230,19 @@  discard block
 block discarded – undo
230 230
 
231 231
         if ($q->success()) {
232 232
             // Inserted OK, so set up this object's variables.
233
-            $this->report_id 	= $q->insert_id();
234
-            $this->comment_id 	= $COMMENT->comment_id();
235
-            $this->body			= $body;
236
-            $this->reported		= $time;
233
+            $this->report_id = $q->insert_id();
234
+            $this->comment_id = $COMMENT->comment_id();
235
+            $this->body = $body;
236
+            $this->reported = $time;
237 237
 
238 238
             if ($THEUSER->isloggedin()) {
239
-                $this->user_id		= $THEUSER->user_id();
239
+                $this->user_id = $THEUSER->user_id();
240 240
                 $this->firstname	= $THEUSER->firstname();
241 241
                 $this->lastname		= $THEUSER->lastname();
242 242
             } else {
243
-                $this->email		= $reportdata['email'];
244
-                $this->firstname 	= $reportdata['firstname'];
245
-                $this->lastname		= $reportdata['lastname'];
243
+                $this->email = $reportdata['email'];
244
+                $this->firstname = $reportdata['firstname'];
245
+                $this->lastname = $reportdata['lastname'];
246 246
             }
247 247
 
248 248
 
@@ -274,11 +274,11 @@  discard block
 block discarded – undo
274 274
                 $email = $this->email();
275 275
             }
276 276
 
277
-            $data = array (
277
+            $data = array(
278 278
                 'to' 			=> $email,
279 279
                 'template' 		=> 'report_acknowledge'
280 280
             );
281
-            $merge = array (
281
+            $merge = array(
282 282
                 'FIRSTNAME' 	=> $this->firstname(),
283 283
                 'LASTNAME' 		=> $this->lastname(),
284 284
                 'COMMENTURL' 	=> "https://" . DOMAIN . $COMMENT->url(),
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
         $data = array();
303 303
 
304 304
         if (is_numeric($this->report_id)) {
305
-            $data = array (
305
+            $data = array(
306 306
                 'report_id' 	=> $this->report_id(),
307 307
                 'comment_id' 	=> $this->comment_id(),
308 308
                 'user_id' 		=> $this->user_id(),
@@ -339,7 +339,7 @@  discard block
 block discarded – undo
339 339
         if ($THEUSER->is_able_to('deletecomment')) {
340 340
             $time = gmdate("Y-m-d H:i:s");
341 341
 
342
-            $q = $this->db->query ("UPDATE commentreports
342
+            $q = $this->db->query("UPDATE commentreports
343 343
                             SET		locked = '$time',
344 344
                                     lockedby = '" . $THEUSER->user_id() . "'
345 345
                             WHERE	report_id = '" . $this->report_id . "'
@@ -350,11 +350,11 @@  discard block
 block discarded – undo
350 350
                 $this->lockedby = $THEUSER->user_id();
351 351
                 return true;
352 352
             } else {
353
-                $PAGE->error_message ("Sorry, we were unable to lock this report.");
353
+                $PAGE->error_message("Sorry, we were unable to lock this report.");
354 354
                 return false;
355 355
             }
356 356
         } else {
357
-            $PAGE->error_message ("You are not authorised to delete annotations.");
357
+            $PAGE->error_message("You are not authorised to delete annotations.");
358 358
             return false;
359 359
         }
360 360
     }
@@ -363,7 +363,7 @@  discard block
 block discarded – undo
363 363
     public function unlock() {
364 364
         // Unlock a comment so it can be examined by someone else.
365 365
 
366
-        $q = $this->db->query ("UPDATE commentreports
366
+        $q = $this->db->query("UPDATE commentreports
367 367
                         SET		locked = NULL,
368 368
                                 lockedby = NULL
369 369
                         WHERE	report_id = '" . $this->report_id . "'
@@ -437,16 +437,16 @@  discard block
 block discarded – undo
437 437
 
438 438
                     return true;
439 439
                 } else {
440
-                    $PAGE->error_message ("Sorry, we couldn't resolve this report.");
440
+                    $PAGE->error_message("Sorry, we couldn't resolve this report.");
441 441
                     return false;
442 442
                 }
443 443
             } else {
444
-                $PAGE->error_message ("This report has already been resolved (on " . $this->resolved . ")");
444
+                $PAGE->error_message("This report has already been resolved (on " . $this->resolved . ")");
445 445
                 return false;
446 446
             }
447 447
 
448 448
         } else {
449
-            $PAGE->error_message ("You are not authorised to resolve reports.");
449
+            $PAGE->error_message("You are not authorised to resolve reports.");
450 450
             return false;
451 451
         }
452 452
     }
Please login to merge, or discard this patch.
www/docs/news/editme.php 1 patch
Upper-Lower-Casing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 
21 21
 Read <a href="http://www.mysociety.org/2009/01/21/blimey-it-looks-like-the-internets-won/">our victory mySociety blog post</a>,
22 22
 and do join our mailing list. :-)
23
-EOT
23
+eot
24 24
 , '2009-01-21 15:30:00', 'Matthew'),
25 25
 
26 26
 48 => array('API keys, and improved internal links', <<<EOT
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 crowd-sourcing game to match the reference to the exact speech, much like our
46 46
 <a href="https://www.theyworkforyou.com/video/">video matching</a> (nearly 80%
47 47
 of our archive done!). :)
48
-EOT
48
+eot
49 49
 , '2008-07-18 14:01:00', 'Matthew'),
50 50
 
51 51
 47 => array('Video on TheyWorkForYou', <<<EOT
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 
58 58
 <a href="http://www.mysociety.org/2008/06/01/video-recordings-of-the-house-of-commons-on-theyworkforyoucom/">Etienne's post on the mySociety blog</a>
59 59
 has some background information on the project.
60
-EOT
60
+eot
61 61
 , '2008-06-02 18:56:00', 'Matthew'),
62 62
 
63 63
 46 => array('The Scottish Parliament', <<<EOT
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 launching this now to mark the success in getting endorsements for our <a
90 90
 href="/freeourbills/">Free Our Bills campaign</a>, and we'll be rolling out
91 91
 more goodies as the campaign goes along.
92
-EOT
92
+eot
93 93
 , '2008-05-06 13:35:28', 'Matthew'),
94 94
 
95 95
 45 => array('Shadow ministers and spokespersons', <<<EOT
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 This information is given both on a person's page and within any debates they
99 99
 speak in, which could help explain why your local MP is speaking on transport
100 100
 or foreign affairs a lot. :)
101
-EOT
101
+eot
102 102
 , '2008-04-30 08:25:00', 'Matthew'),
103 103
 
104 104
 44 => array('Please donate to help us expand TheyWorkForYou', <<<EOT
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 Unfortunately, the server that TheyWorkForYou sits on is almost full, so we can&#8217;t launch their hard work. Boo!
108 108
 
109 109
 TheyWorkForYou isn&#8217;t an externally funded project, and we need funding from other sources to keep it growing and improving. So if the season has filled you with generosity of spirit, why not <a href="https://secure.mysociety.org/donate/">drop us a few pennies</a> to pay for some upgrades? Any extra beyond what we need will go into the general pot to keep <a href="http://www.mysociety.org/">mySociety</a> running and the developers from starving.
110
-EOT
110
+eot
111 111
 , '2007-12-21 10:07:35', 'Tom'),
112 112
 
113 113
 43 => array('The Queen in Parliament', <<<EOT
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 or just look at past
122 122
 <a href="https://www.theyworkforyou.com/search/?pid=13935&pop=1">prorogation and Queen's speeches</a>
123 123
 more easily than anywhere else I've found.
124
-EOT
124
+eot
125 125
 , '2007-09-11 15:34:47', 'Matthew'),
126 126
 
127 127
 42 => array('Missing confirmation emails', <<<EOT
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 few days have now been sent out, and I've got in touch
133 133
 with anyone who signed up in the days prior to
134 134
 that to let them know what happened.
135
-EOT
135
+eot
136 136
 , "2007-09-03 17:12:47", 'Matthew'),
137 137
 
138 138
 41 => array('The Northern Ireland Assembly', <<<EOT
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 
173 173
 ATB,<br>
174 174
 <a href="http://www.dracos.co.uk/">Matthew Somerville</a>
175
-EOT
175
+eot
176 176
 , "2006-12-11 00:00:00", 'Matthew'),
177 177
 
178 178
 40 => array('TheyWorkForYou API', <<<EOT
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
 Here's my <a href="http://www.mysociety.org/2006/barcamp-london/">BarCamp
192 192
 Presentation</a> launching the API, and a <a href="http://www.dracos.co.uk/work/theyworkforyou/api/fabfarts/">couple</a>
193 193
 of <a href="http://www.mysociety.org/2006/09/02/battle-your-way-to-sedgefield/">applications</a> using it.
194
-EOT
194
+eot
195 195
 , "2006-09-02 17:10:00"),
196 196
 
197 197
 39 => array('New features over the last couple of months', <<<EOT
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
 and when searching a particular person's speeches, we no longer group the results by debate, which
220 220
 was confusing, as you obviously expected to see all the speeches for that person that matched your
221 221
 search terms.
222
-EOT
222
+eot
223 223
 , "2006-08-18 09:46:36"),
224 224
 
225 225
 38 => array("Got an idea for a useful website?", <<<EOT
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
 come up with an idea for a useful site like this one, and it beats all
228 228
 the other ideas, we'll build it for free. <a href="http://www.mysociety.org/proposals2006/submit">Submit an idea</a>
229 229
 or <a href="http://www.mysociety.org/proposals2006/view">read and comment on what other people have submitted</a>.
230
-EOT
230
+eot
231 231
 , "2006-06-06 06:06:06"),
232 232
 
233 233
 37 => array("We've added the Lords, and more", <<<EOT
@@ -237,14 +237,14 @@  discard block
 block discarded – undo
237 237
 also added a feature to the search to help you identify which MPs or
238 238
 Lords are interested in a certain word or phrases. Just search as
239 239
 usual and then click 'Show use by person'.
240
-EOT
240
+eot
241 241
 , "2006-06-01 12:34:56"),
242 242
 
243 243
 36 => array("Changes to the Register of Members' Interests", <<<EOT
244 244
 One of the many things our site does, probably without you realising, is to track the Register of Members' Interests, in which MPs are "to provide information of any pecuniary interest or other material benefit which a Member receives which might reasonably be thought by others to influence his or her actions, speeches or votes in Parliament, or actions taken in the capacity of a Member of Parliament". The latest entry published on the official site has always been shown on MP pages (<a href="https://www.theyworkforyou.com/mp/tony_blair/sedgefield#register">here's Tony Blair's</a>), however we kept all previous editions of the Register safe and sound. And now, after a bit of coding, you can view a history of the Register, either <a href="https://www.theyworkforyou.com/regmem/?f=2005-12-14">comparing particular editions</a>, or for particular MPs (<a href="https://www.theyworkforyou.com/regmem/?p=10001">Diane Abbott</a>, for example). Entries only have to stay on the Register for a year, so this can make for some interesting reading.
245 245
 
246 246
 Happy New Year! :) <a href="https://www.theyworkforyou.com/regmem/">Changes to the Register of Members' Interests</a>
247
-EOT
247
+eot
248 248
 , "2006-01-01 12:36:00"),
249 249
 
250 250
 35 => array("TheyWorkForYou.com Wins Award", <<<EOT
@@ -253,14 +253,14 @@  discard block
 block discarded – undo
253 253
 Thanks to the kind souls who nominated us. We enjoyed ourselves.
254 254
 
255 255
 
256
-EOT
256
+eot
257 257
 , "2005-07-05 23:54:13"),
258 258
 
259 259
 34 => array("NEW! Email this page to a friend", <<<EOT
260 260
 At the top right hand side of every (ex)MP's page, we've added a simple new feature: email the page to a friend.
261 261
 
262 262
 <a href="/mp/">Have a go</a>, and let all your friends know how easy it is to keep tabs on what your former MP did and said in your name during the last Parliament.
263
-EOT
263
+eot
264 264
 , "2005-04-14 23:43:50"),
265 265
 
266 266
 33 => array("Play with Pledgebank, Pound the Streets", <<<EOT
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
 </blockquote>
274 274
 
275 275
 If you're up for it, why not <a href="http://www.pledgebank.com/theywork">sign up now?</a>
276
-EOT
276
+eot
277 277
 , "2005-04-13 22:41:23"),
278 278
 
279 279
 32 => array("NEW! How MPs voted on Key Issues", <<<EOT
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
 This information is the result sophisticated mining of PublicWhip's detailed vote data covering hundreds of Parliamentary divisions.
287 287
 
288 288
 We hope it'll make it easier for you to keep track of where your MP really stands on key issues - after all, They Work For You.
289
-EOT
289
+eot
290 290
 , "2005-04-05 22:59:57"),
291 291
 
292 292
 31 => array("Channel 4 linking to TheyWorkForYou.com", <<<EOT
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
295 295
 We've done a special paint job for users coming from the Channel 4 site, just to make them feel welcome. You can see an example <a href="https://www.theyworkforyou.com/mp/c4/paul_keetch/hereford">here</a>.
296 296
 
297 297
 We'd love to know what you think of this paint job, as we're planning a redesign. As ever, <a href="/contact/">get in touch</a>.
298
-EOT
298
+eot
299 299
 , "2005-04-05 22:53:32"),
300 300
 
301 301
 30 => array("NEW! Email Alerts & Other Features", <<<EOT
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
     - Tom, on behalf of the TheyWorkForYou.com volunteers
358 358
 
359 359
      <a href="https://www.theyworkforyou.com/about/">https://www.theyworkforyou.com/about/</a>  - New volunteers welcome!
360
-EOT
360
+eot
361 361
 , "2005-02-24 22:02:44"),
362 362
 
363 363
 26 => array("New Release of TheyWorkForYou.com Source Code", <<<EOT
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
 Feel free to download it and have a play.
375 375
 
376 376
 Whilst you're at it, don't forget we also publish a full <a href="https://www.theyworkforyou.com/raw/">XML version of the Hansard data</a>.
377
-EOT
377
+eot
378 378
 , "2005-01-25 00:15:19"),
379 379
 
380 380
 25 => array("Search by Date", <<<EOT
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
386 386
 Next step on search is probably an RSS version of keyword searches. We're still very keen to improve overall relevancy of results - anyone out there fancy lending us a Google Appliance to play with?
387 387
 
388 388
 As ever, <a href="/contact/">contact us</a> if you've got any suggestions how we might improve the site, or if you fancy volunteering.
389
-EOT
389
+eot
390 390
 , "2005-01-25 00:16:09"),
391 391
 
392 392
 20 => array("New! Ministerial Statements now included", <<<EOT
@@ -404,7 +404,7 @@  discard block
 block discarded – undo
404 404
 Next up: Select Committees, which promise to be an order of magnitude more challenging. We'll keep you posted.
405 405
 
406 406
 PS We're always on the lookout for new volunteers - <a href="/contact/">contact us</a> if you are keen to help in almost any capacity.
407
-EOT
407
+eot
408 408
 , "2005-01-17 17:44:47"),
409 409
 
410 410
 19 => array("NEW! Westminster Hall debates now available.", <<<EOT
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
422 422
 
423 423
 
424 424
 
425
-EOT
425
+eot
426 426
 , "2004-12-22 23:47:19"),
427 427
 
428 428
 18 => array("RSS feed of your MP's recent appearances", <<<EOT
@@ -436,7 +436,7 @@  discard block
 block discarded – undo
436 436
 RSS is a simple way to publish & distribute content which is frequently updated  (<a href="http://news.bbc.co.uk/1/hi/help/3223484.stm">learn more here</a>.)
437 437
 
438 438
 Some enlightened MPs are now incorporating this useful feed of their Parliamentary activity into their websites. See <a href="http://www.richardallan.org.uk/">Richard Allen's</a> website for a good example.
439
-EOT
439
+eot
440 440
 , "2004-11-27 16:38:41"),
441 441
 
442 442
 16 => array("NEW! MPs' Expenses", <<<EOT
@@ -445,7 +445,7 @@  discard block
 block discarded – undo
445 445
 For example, it is good to note that <a href="https://www.theyworkforyou.com/mp/?pid=10508#expenses">Barbara Roche</a>, a North London MP, does not claim excessive travel expenses.
446 446
 
447 447
 Bear in mind that proper democracy does cost money, so please think twice before using these data as a stick with which to beat your MP. An "expensive" MP might be providing excellent value for money. And vice versa.
448
-EOT
448
+eot
449 449
 , "2004-11-08 10:11:14"),
450 450
 
451 451
 11 => array("TheyWorkForYou.com Development Wiki now public", <<<EOT
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
461 461
 (dissemination is fine, but please don't post the link with the login details embedded in the url)
462 462
 
463 463
 In case you're wondering what we're up to, well, we're just rousing ourselves for another tilt at completing our vision before the next election is called, so if anyone python or php skills and fancies lending a hand, do <a href="/contact/">contact us</a>.
464
-EOT
464
+eot
465 465
 , "2004-10-01 23:14:13"),
466 466
 
467 467
 8 => array("New! Full Source Code Published", <<<EOT
@@ -481,7 +481,7 @@  discard block
 block discarded – undo
481 481
 
482 482
 <a href="https://www.theyworkforyou.com/rss/mp/10508.rdf">https://www.theyworkforyou.com/rss/mp/10508.rdf</a>
483 483
     - Typical MP 'recent appearances' RSS feed, uses person id.
484
-EOT
484
+eot
485 485
 , "2004-07-18 22:58:23"),
486 486
 
487 487
 7 => array("Public Beta Now Live", <<<EOT
@@ -502,7 +502,7 @@  discard block
 block discarded – undo
502 502
 More than the usuals,
503 503
 
504 504
 - <i><a href="https://www.theyworkforyou.com/about/" title="link to About Us page">The TheyWorkForYou.com Volunteers</a></i>
505
-EOT
505
+eot
506 506
 , "2004-06-06 03:02:53"),
507 507
 
508 508
 6 => array("Want to help make us complete?", <<<EOT
@@ -514,14 +514,14 @@  discard block
 block discarded – undo
514 514
 
515 515
 Just <a href="/contact/">contact us</a>.
516 516
 
517
-EOT
517
+eot
518 518
 , "2004-05-21 22:15:22"),
519 519
 
520 520
 5 => array("Know someone who'd like this website?", <<<EOT
521 521
 If you know someone who would appreciate being a beta tester, please <a href="/contact/">contact us</a> with their details.
522 522
 
523 523
 Many thanks.
524
-EOT
524
+eot
525 525
 , "2004-05-21 22:55:24"),
526 526
 
527 527
 4 => array("Welcome to our private beta test", <<<EOT
@@ -538,7 +538,7 @@  discard block
 block discarded – undo
538 538
 In the meantime, please enjoy being the first people to scribble in the margins of Hansard. May you be first of many.
539 539
 
540 540
 - <em>The TheyWorkForYou.com volunteers</em>
541
-EOT
541
+eot
542 542
 , "2004-05-21 22:55:24")
543 543
 );
544 544
 
Please login to merge, or discard this patch.
www/docs/search/index.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-$new_style_template = TRUE;
3
+$new_style_template = true;
4 4
 
5 5
 include_once '../../includes/easyparliament/init.php';
6 6
 include_once INCLUDESPATH . "easyparliament/glossary.php";
Please login to merge, or discard this patch.