Failed Conditions
Pull Request — master (#1328)
by Nick
33:04 queued 18:05
created
www/includes/easyparliament/templates/html/divisions/vote.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@
 block discarded – undo
113 113
             </div>
114 114
 
115 115
              <ul class="debate-speech__meta debate-speech__links">
116
-             <?php if ( $division['debate_url'] ) { ?>
116
+             <?php if ($division['debate_url']) { ?>
117 117
                   <li class="link-to-speech">
118 118
                       <a class="link debate-speech__meta__link" href="<?= $division['debate_url'] ?>">Show full debate</a>
119 119
                   </li>
Please login to merge, or discard this patch.
www/includes/easyparliament/templates/html/divisions/_vote_list.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -9,10 +9,10 @@
 block discarded – undo
9 9
                     ?>
10 10
                     <ul class="division-list">
11 11
                         <?php foreach ($votes as $vote) {
12
-                          $voter = sprintf('<a href="/mp/?p=%d">%s</a>', $vote['person_id'], $vote['name']);
13
-                          if ($vote['teller']) {
14
-                              $tellers[] = $voter;
15
-                          } else { ?>
12
+                            $voter = sprintf('<a href="/mp/?p=%d">%s</a>', $vote['person_id'], $vote['name']);
13
+                            if ($vote['teller']) {
14
+                                $tellers[] = $voter;
15
+                            } else { ?>
16 16
                             <li><?= $voter ?></li>
17 17
                         <?php
18 18
                             }
Please login to merge, or discard this patch.
www/includes/easyparliament/templates/html/divisions/index.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -7,9 +7,9 @@  discard block
 block discarded – undo
7 7
           </div>
8 8
           <div class="business-section__primary">
9 9
                <?php
10
-               if ( isset($divisions) && $divisions ) {
11
-                 $current_date = '';
12
-               ?>
10
+                if ( isset($divisions) && $divisions ) {
11
+                    $current_date = '';
12
+                ?>
13 13
                <ul class="business-list">
14 14
                     <?php foreach ($divisions as $division) { ?>
15 15
                     <li id="<?= $division['division_id'] ?>">
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
                         <h3><?= format_date($division['date'], LONGERDATEFORMAT) ?></h3>
19 19
                         </span>
20 20
                         <?php
21
-                          $current_date = $division['date'];
21
+                            $current_date = $division['date'];
22 22
                         } ?>
23 23
                         <a href="/divisions/<?= $division['division_id'] ?>" class="business-list__title">
24 24
                             <h3><?= $division['division_title'] ?></h3>
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
           </div>
8 8
           <div class="business-section__primary">
9 9
                <?php
10
-               if ( isset($divisions) && $divisions ) {
10
+               if (isset($divisions) && $divisions) {
11 11
                  $current_date = '';
12 12
                ?>
13 13
                <ul class="business-list">
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
                             <br>
30 30
                             <span class="business-list__meta">
31 31
                                 <?= $division['summary'] ?>
32
-                                <?= $division['mp_vote'] !== '' ? '. <b>Your MP, ' . $mp_name . ', ' . $division['mp_vote'] . '.</b>': '' ?>
32
+                                <?= $division['mp_vote'] !== '' ? '. <b>Your MP, ' . $mp_name . ', ' . $division['mp_vote'] . '.</b>' : '' ?>
33 33
                             </span>
34 34
                         </p>
35 35
                     </li>
Please login to merge, or discard this patch.
www/includes/easyparliament/templates/html/footer.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -84,13 +84,13 @@
 block discarded – undo
84 84
         $db->display_total_duration();
85 85
 
86 86
         $duration = getmicrotime() - STARTTIME;
87
-        twfy_debug ("TIME", "Total time for page: $duration seconds.");
87
+        twfy_debug("TIME", "Total time for page: $duration seconds.");
88 88
         if (!isset($_SERVER['WINDIR'])) {
89 89
             $rusage = getrusage();
90
-            $duration = $rusage['ru_utime.tv_sec']*1000000 + $rusage['ru_utime.tv_usec'] - STARTTIMEU;
91
-            twfy_debug ('TIME', "Total user time: $duration microseconds.");
92
-            $duration = $rusage['ru_stime.tv_sec']*1000000 + $rusage['ru_stime.tv_usec'] - STARTTIMES;
93
-            twfy_debug ('TIME', "Total system time: $duration microseconds.");
90
+            $duration = $rusage['ru_utime.tv_sec'] * 1000000 + $rusage['ru_utime.tv_usec'] - STARTTIMEU;
91
+            twfy_debug('TIME', "Total user time: $duration microseconds.");
92
+            $duration = $rusage['ru_stime.tv_sec'] * 1000000 + $rusage['ru_stime.tv_usec'] - STARTTIMES;
93
+            twfy_debug('TIME', "Total system time: $duration microseconds.");
94 94
         }
95 95
 
96 96
 ?>
Please login to merge, or discard this patch.
www/includes/easyparliament/templates/html/static/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/templates/api/hansard_gid.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,4 +67,4 @@
 block discarded – undo
67 67
     api_output($out);
68 68
 } else {
69 69
     api_error('Nothing');
70
-   }
70
+    }
Please login to merge, or discard this patch.
Braces   +9 added lines, -4 removed lines patch added patch discarded remove patch
@@ -14,7 +14,9 @@  discard block
 block discarded – undo
14 14
 if (isset ($data['rows'])) {
15 15
     for ($i=0; $i<count($data['rows']); $i++) {
16 16
         $row = $data['rows'][$i];
17
-        if (count($row) == 0) continue;
17
+        if (count($row) == 0) {
18
+            continue;
19
+        }
18 20
         if ($row['htype'] == '12') {
19 21
             if (isset($row['speaker']) && count($row['speaker']) > 0) {
20 22
                 $speaker = $row['speaker'];
@@ -36,7 +38,9 @@  discard block
 block discarded – undo
36 38
                     $desc .= $speaker['constituency'] . ', ';
37 39
                 }
38 40
                 $desc .= _htmlentities($speaker['party']);
39
-                if ($desc) $row['speaker']['desc'] = $desc;
41
+                if ($desc) {
42
+                    $row['speaker']['desc'] = $desc;
43
+                }
40 44
             }
41 45
         }
42 46
         $out[] = $row;
@@ -52,8 +56,9 @@  discard block
 block discarded – undo
52 56
                 $has_content = false;
53 57
             }
54 58
             $entry = $row;
55
-            if (isset($row['excerpt']))
56
-                $entry['excerpt'] = trim_characters($entry['excerpt'], 0, 200);
59
+            if (isset($row['excerpt'])) {
60
+                            $entry['excerpt'] = trim_characters($entry['excerpt'], 0, 200);
61
+            }
57 62
             if ($has_content) {
58 63
             } else {
59 64
                 unset($entry['listurl']);
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 
13 13
 $out = array();
14 14
 if (isset ($data['rows'])) {
15
-    for ($i=0; $i<count($data['rows']); $i++) {
15
+    for ($i = 0; $i < count($data['rows']); $i++) {
16 16
         $row = $data['rows'][$i];
17 17
         if (count($row) == 0) continue;
18 18
         if ($row['htype'] == '12') {
Please login to merge, or discard this patch.
www/includes/easyparliament/templates/api/hansard_date.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 
12 12
 if (isset ($data['rows'])) {
13 13
     $out = array();
14
-    for ($i=0; $i<count($data['rows']); $i++) {
14
+    for ($i = 0; $i < count($data['rows']); $i++) {
15 15
         $row = $data['rows'][$i];
16 16
 
17 17
         if ($row['htype'] == '10' && isset($row['excerpt']) && strstr($row['excerpt'], "was asked&#8212;")) {
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
         if ($row['htype'] == '10') {
41 41
             $out[] = array('entry' => $entry, 'subs' => array());
42 42
         } else {
43
-            $out[sizeof($out)-1]['subs'][] = $entry;
43
+            $out[sizeof($out) - 1]['subs'][] = $entry;
44 44
         }
45 45
 
46 46
     }
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,8 +27,9 @@
 block discarded – undo
27 27
         }
28 28
 
29 29
         $entry = $row;
30
-        if (isset($row['excerpt']))
31
-            $entry['excerpt'] = trim_characters($entry['excerpt'], 0, 200);
30
+        if (isset($row['excerpt'])) {
31
+                    $entry['excerpt'] = trim_characters($entry['excerpt'], 0, 200);
32
+        }
32 33
         if ($has_content) {
33 34
         } else {
34 35
             unset($entry['listurl']);
Please login to merge, or discard this patch.
www/includes/easyparliament/sidebars/search_filters.php 3 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
  <select id="section" name="section">
67 67
  <option value="">Any
68 68
 <?php
69
- optgroups(array(
69
+    optgroups(array(
70 70
     'UK Parliament' => array(
71 71
         'uk' => 'All UK',
72 72
         'debates' => 'House of Commons debates',
@@ -85,8 +85,8 @@  discard block
 block discarded – undo
85 85
         'sp' => 'Debates',
86 86
         'spwrans' => 'Written answers',
87 87
     ),
88
- ), $section);
89
- ?>
88
+    ), $section);
89
+    ?>
90 90
  </select>
91 91
  <div class="help">
92 92
  Restrict results to a particular parliament or assembly that we cover (e.g. the
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 if (preg_match('#\s*([0-9/.-]*)\.\.([0-9/.-]*)#', $filter_ss, $m)) {
24 24
     $from = $m[1];
25 25
     $to = $m[2];
26
-    $filter_ss =  preg_replace('#\s*([0-9/.-]*)\.\.([0-9/.-]*)#', '', $filter_ss);
26
+    $filter_ss = preg_replace('#\s*([0-9/.-]*)\.\.([0-9/.-]*)#', '', $filter_ss);
27 27
 }
28 28
 $section = get_http_var('section');
29 29
 if (preg_match('#\s*section:([a-z]*)#', $filter_ss, $m)) {
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
     $filter_ss = preg_replace('#\s*speaker:[0-9]*#', '', $filter_ss);
37 37
 }
38 38
 
39
-$this->block_start(array( 'title' => "Filtering your results"));
39
+$this->block_start(array('title' => "Filtering your results"));
40 40
 
41 41
 ?>
42 42
 <form method="get" action="/search/">
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,9 @@
 block discarded – undo
5 5
         echo '<optgroup label="', $key, '">';
6 6
         foreach ($values as $k => $v) {
7 7
             echo '<option';
8
-            if ($current == $k) echo ' selected';
8
+            if ($current == $k) {
9
+                echo ' selected';
10
+            }
9 11
             echo ' value="', $k, '">', $v;
10 12
         }
11 13
         echo "</optgroup>\n";
Please login to merge, or discard this patch.
www/includes/easyparliament/comment.php 3 patches
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));
211 211
 
212 212
             if ($q->rows() > 0) {
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->field(0, 'gid')); // In includes/utility.php
217 217
 
Please login to merge, or discard this patch.
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.
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->rows() > 0) {
70 70
 
71 71
                 $this->comment_id 	= $comment_id;
72
-                $this->user_id		= $q->field(0, 'user_id');
72
+                $this->user_id = $q->field(0, 'user_id');
73 73
                 $this->epobject_id	= $q->field(0, 'epobject_id');
74
-                $this->body			= $q->field(0, 'body');
75
-                $this->posted		= $q->field(0, 'posted');
76
-                $this->visible		= $q->field(0, 'visible');
77
-                $this->modflagged	= $q->field(0, 'modflagged');
74
+                $this->body = $q->field(0, 'body');
75
+                $this->posted = $q->field(0, 'posted');
76
+                $this->visible = $q->field(0, 'visible');
77
+                $this->modflagged = $q->field(0, '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.