Completed
Pull Request — master (#1490)
by Sam
06:10
created
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/homepage/featured.php 1 patch
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.
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.
www/includes/easyparliament/templates/html/section/year.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
                 foreach ( $years as $year => $months ) { ?>
25 25
             <div class="calendar-year">
26 26
                 <?php foreach ($months as $month => $dates) {
27
-                  include '_calendar.php';
27
+                    include '_calendar.php';
28 28
                 } ?>
29 29
             </div>
30 30
             <?php }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -8,20 +8,20 @@
 block discarded – undo
8 8
         </div>
9 9
         <div class="business-section__solo">
10 10
             <div class="calendar__controls">
11
-                <?php if ( isset( $prev ) ) { ?>
11
+                <?php if (isset($prev)) { ?>
12 12
                 <a href="<?= $prev['url'] ?>" class="calendar__controls__previous">&larr; <?= $prev['title'] ?></a>
13 13
                 <?php } else { ?>
14 14
                 <span class="calendar__controls__previous"></span>
15 15
                 <?php } ?>
16 16
                 <span class="calendar__controls__current"><?= $year ?></span>
17
-                <?php if ( isset( $next ) ) { ?>
17
+                <?php if (isset($next)) { ?>
18 18
                 <a href="<?= $next['url'] ?>" class="calendar__controls__next"><?= $next['title'] ?> &rarr;</a>
19 19
                 <?php } else { ?>
20 20
                 <span class="calendar__controls__next"></span>
21 21
                 <?php } ?>
22 22
             </div>
23
-            <?php if ( isset($years) ) {
24
-                foreach ( $years as $year => $months ) { ?>
23
+            <?php if (isset($years)) {
24
+                foreach ($years as $year => $months) { ?>
25 25
             <div class="calendar-year">
26 26
                 <?php foreach ($months as $month => $dates) {
27 27
                   include '_calendar.php';
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,6 +34,6 @@
 block discarded – undo
34 34
         </div>
35 35
     </div>
36 36
 
37
-    <?php $search_title = "Search $title"; include '_search.php'; ?>
37
+    <?php $search_title = "search $title"; include '_search.php'; ?>
38 38
 
39 39
 </div>
Please login to merge, or discard this patch.
www/includes/easyparliament/templates/html/section/pbc_index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,14 +22,14 @@
 block discarded – undo
22 22
 
23 23
         <div class="business-section__primary">
24 24
             <ul class="business-list">
25
-                <?php foreach ( $content['data'] as $date => $bills ) { ?>
25
+                <?php foreach ($content['data'] as $date => $bills) { ?>
26 26
                 <li>
27 27
                     <span class="business-list__title">
28 28
                         <h3>
29 29
                             <?= $date ?>
30 30
                         </h3>
31 31
                     </span>
32
-                    <?php foreach ( $bills as $bill ) { ?>
32
+                    <?php foreach ($bills as $bill) { ?>
33 33
                     <p>
34 34
                     <a href="<?= $bill['url'] ?>" class="business-list__title">
35 35
                         <?= $bill['bill'] ?> &ndash; <?= $bill['sitting'] ?>
Please login to merge, or discard this patch.
www/includes/easyparliament/templates/html/section/_calendar_section.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
             <?php
2 2
             foreach ( $calendar as $year => $months ) {
3 3
                 foreach ($months as $month => $dates) {
4
-                     include '_calendar.php';
4
+                        include '_calendar.php';
5 5
                 }
6 6
             } ?>
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
             <?php
2
-            foreach ( $calendar as $year => $months ) {
2
+            foreach ($calendar as $year => $months) {
3 3
                 foreach ($months as $month => $dates) {
4 4
                      include '_calendar.php';
5 5
                 }
Please login to merge, or discard this patch.
www/includes/easyparliament/templates/html/section/column.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,8 +32,8 @@
 block discarded – undo
32 32
         </div>
33 33
     </div>
34 34
   <?php } else {
35
-      $section = false; include '_section_content.php';
36
-  } ?>
35
+        $section = false; include '_section_content.php';
36
+    } ?>
37 37
 
38 38
 </div>
39 39
 
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,11 +19,11 @@
 block discarded – undo
19 19
 </div>
20 20
 <div class="full-page">
21 21
 
22
-  <?php if ( count($data['rows']) == 0 ) { ?>
22
+  <?php if (count($data['rows']) == 0) { ?>
23 23
     <div class="debate-speech">
24 24
         <div class="full-page__row">
25 25
             <div class="full-page__unit">
26
-                <?php if ( $col_country == 'SCOTLAND' || $col_country == 'NORTHERN IRELAND' ) { ?>
26
+                <?php if ($col_country == 'SCOTLAND' || $col_country == 'NORTHERN IRELAND') { ?>
27 27
                     We only have information about columns for debates in the House of Commons and the House of Lords.
28 28
                 <?php } else { ?>
29 29
                     We can't find anything in column <?= $column ?> on <?= $debate_day_human ?>.
Please login to merge, or discard this patch.
www/includes/easyparliament/templates/html/section/_calendar.php 3 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
     if ($dayOfWeek < 0) {
42 42
         $dayOfWeek = 6;
43 43
     }
44
-  ?>
44
+    ?>
45 45
   <?php }
46 46
     if (!isset($years)) { ?>
47 47
     <div class="calendar__controls">
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
                     } else {
128 128
                         $day_section = $section;
129 129
                         if ($section == 'sp') {
130
-                          $day_section = 'spdebates';
130
+                            $day_section = 'spdebates';
131 131
                         }
132 132
                         $urls[$day_section . 'day']->insert(array('d'=>$date));
133 133
                         print "<a href=\"" . $urls[$day_section . 'day']->generate() . "\">$currentDay</a></td>";
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@  discard block
 block discarded – undo
1 1
 <div class="calendar">
2
-  <?php if(isset($month)){
3
-    $daysOfWeek = array('Mon','Tue','Wed','Thu','Fri','Sat','Sun');
2
+  <?php if (isset($month)) {
3
+    $daysOfWeek = array('Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun');
4 4
 
5 5
     // What is the first day of the month in question?
6
-    $firstDayOfMonth = mktime(0,0,0,$month,1,$year);
6
+    $firstDayOfMonth = mktime(0, 0, 0, $month, 1, $year);
7 7
 
8 8
     // How many days does this month contain?
9
-    $numberDays = date('t',$firstDayOfMonth);
9
+    $numberDays = date('t', $firstDayOfMonth);
10 10
 
11 11
     // Retrieve some information about the first day of the
12 12
     // month in question.
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
     if (isset($info['onday'])) {
19 19
         // 'onday' is like 'yyyy-mm-dd'.
20 20
         $datebits = explode('-', $info['onday']);
21
-        if (count($datebits)>2 && $datebits[0] == $year && $datebits[1] == $month) {
21
+        if (count($datebits) > 2 && $datebits[0] == $year && $datebits[1] == $month) {
22 22
             $toDay = $datebits[2];
23 23
         } else {
24 24
             $toDay = '';
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
   <?php }
46 46
     if (!isset($years)) { ?>
47 47
     <div class="calendar__controls">
48
-        <?php if ( isset($prev) ) { ?>
48
+        <?php if (isset($prev)) { ?>
49 49
         <a href="<?= $prev['url'] ?>" class="calendar__controls__previous">&larr;</a>
50 50
         <?php } else { ?>
51 51
         <span class="calendar__controls__previous">&nbsp;</span>
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
         <span class="calendar__controls__current">
54 54
             <?= $monthName ?> <?= $year ?>
55 55
         </span>
56
-        <?php if ( isset($next) ) { ?>
56
+        <?php if (isset($next)) { ?>
57 57
         <a href="<?= $next['url'] ?>" class="calendar__controls__next">&rarr;</a>
58 58
         <?php } else { ?>
59 59
         <span class="calendar__controls__next">&nbsp;</span>
@@ -106,11 +106,11 @@  discard block
 block discarded – undo
106 106
                 // sittings - e.g. WH is only Tuesday-Thursday
107 107
                 if ($currentDay == $toDay) {
108 108
                     print '<td class="on"';
109
-                    if ($recess[0] && $recess[0]!=1) print ' title="'.$recess[0].'"';
109
+                    if ($recess[0] && $recess[0] != 1) print ' title="' . $recess[0] . '"';
110 110
                     print '>';
111 111
                 } elseif ($recess[0]) {
112 112
                     print '<td class="no"';
113
-                    if ($recess[0]!=1) print ' title="'.$recess[0].'"';
113
+                    if ($recess[0] != 1) print ' title="' . $recess[0] . '"';
114 114
                     print '>';
115 115
                 } else {
116 116
                     print '<td>';
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 
119 119
                 // Is the $currentDay a member of $dates? If so,
120 120
                 // the day should be linked.
121
-                if (in_array($currentDay,$dates)) {
121
+                if (in_array($currentDay, $dates)) {
122 122
 
123 123
                     $date = sprintf("%04d-%02d-%02d", $year, $month, $currentDay);
124 124
 
@@ -156,12 +156,12 @@  discard block
 block discarded – undo
156 156
             </tr>
157 157
         </tbody>
158 158
     </table>
159
-  <?php if(!isset($years)){ ?>
159
+  <?php if (!isset($years)) { ?>
160 160
     <div class="calendar__footer">
161 161
     <?php
162 162
         $y = $urls['day'];
163 163
         $y->reset();
164
-        $y->insert(array( 'y' => $year ));
164
+        $y->insert(array('y' => $year));
165 165
         $url = $y->generate();
166 166
     ?>
167 167
     <a href="<?= $url ?>">See all of <?= $year ?></a>
Please login to merge, or discard this patch.
Braces   +7 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <div class="calendar">
2
-  <?php if(isset($month)){
2
+  <?php if(isset($month)) {
3 3
     $daysOfWeek = array('Mon','Tue','Wed','Thu','Fri','Sat','Sun');
4 4
 
5 5
     // What is the first day of the month in question?
@@ -106,11 +106,15 @@  discard block
 block discarded – undo
106 106
                 // sittings - e.g. WH is only Tuesday-Thursday
107 107
                 if ($currentDay == $toDay) {
108 108
                     print '<td class="on"';
109
-                    if ($recess[0] && $recess[0]!=1) print ' title="'.$recess[0].'"';
109
+                    if ($recess[0] && $recess[0]!=1) {
110
+                        print ' title="'.$recess[0].'"';
111
+                    }
110 112
                     print '>';
111 113
                 } elseif ($recess[0]) {
112 114
                     print '<td class="no"';
113
-                    if ($recess[0]!=1) print ' title="'.$recess[0].'"';
115
+                    if ($recess[0]!=1) {
116
+                        print ' title="'.$recess[0].'"';
117
+                    }
114 118
                     print '>';
115 119
                 } else {
116 120
                     print '<td>';
Please login to merge, or discard this patch.
www/includes/easyparliament/templates/html/section/day.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
                       <?php } ?>
50 50
                     </a>
51 51
                   <?php }
52
-                  if ( isset($row['excerpt']) ) { ?>
52
+                    if ( isset($row['excerpt']) ) { ?>
53 53
                     <p class="business-list__excerpt">
54 54
                         <?= trim_characters($row['excerpt'], 0, 200 ) ?>
55 55
                     </p>
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -84,6 +84,6 @@
 block discarded – undo
84 84
       <?php } ?>
85 85
     </div>
86 86
 
87
-    <?php $search_title = "Search $title"; include '_search.php'; ?>
87
+    <?php $search_title = "search $title"; include '_search.php'; ?>
88 88
 
89 89
 </div>
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -6,32 +6,32 @@  discard block
 block discarded – undo
6 6
                 <?= $parent_title ?>
7 7
             </h1>
8 8
             <p class="business-section__header__date">
9
-                <?= format_date( $info['date'], LONGERDATEFORMAT ) ?>
9
+                <?= format_date($info['date'], LONGERDATEFORMAT) ?>
10 10
             </p>
11 11
         </div>
12
-      <?php if ( isset($rows) ) { ?>
12
+      <?php if (isset($rows)) { ?>
13 13
         <div class="business-section__primary">
14 14
             <ul class="business-list">
15 15
               <?php
16 16
                 $prevlevel = '';
17
-                foreach ( $rows as $row ) { ?>
18
-                <?php if ( $row['htype'] == 10 ) {
19
-                    if ( $prevlevel == 'sub' ) { ?>
17
+                foreach ($rows as $row) { ?>
18
+                <?php if ($row['htype'] == 10) {
19
+                    if ($prevlevel == 'sub') { ?>
20 20
                     </ul>
21 21
                     </li>
22
-                    <?php } elseif ( $prevlevel == 'top' ) { ?>
22
+                    <?php } elseif ($prevlevel == 'top') { ?>
23 23
                     </li>
24 24
                     <?php } ?>
25 25
                     <li>
26 26
                 <?php } else {
27
-                    if ( $prevlevel == '' ) { ?>
27
+                    if ($prevlevel == '') { ?>
28 28
                     <li>
29
-                    <?php } elseif ( $prevlevel == 'top' ) { ?>
29
+                    <?php } elseif ($prevlevel == 'top') { ?>
30 30
                     <ul>
31 31
                     <li>
32 32
                     <?php } ?>
33 33
                 <?php } ?>
34
-                  <?php if ( isset($row['excerpt']) && strstr($row['excerpt'], "was asked&#8212;") ) { ?>
34
+                  <?php if (isset($row['excerpt']) && strstr($row['excerpt'], "was asked&#8212;")) { ?>
35 35
                     <div class="business-list__title">
36 36
                         <h3>
37 37
                             <?= $row['body'] ?>
@@ -42,26 +42,26 @@  discard block
 block discarded – undo
42 42
                         <h3>
43 43
                             <?= $row['body'] ?>
44 44
                         </h3>
45
-                      <?php if ( isset($row['contentcount']) && $row['contentcount'] > 0 ) { ?>
45
+                      <?php if (isset($row['contentcount']) && $row['contentcount'] > 0) { ?>
46 46
                         <span class="business-list__meta">
47 47
                             <?= $row['contentcount'] == 1 ? '1 speech' : $row['contentcount'] . ' speeches' ?>
48 48
                         </span>
49 49
                       <?php } ?>
50 50
                     </a>
51 51
                   <?php }
52
-                  if ( isset($row['excerpt']) ) { ?>
52
+                  if (isset($row['excerpt'])) { ?>
53 53
                     <p class="business-list__excerpt">
54
-                        <?= trim_characters($row['excerpt'], 0, 200 ) ?>
54
+                        <?= trim_characters($row['excerpt'], 0, 200) ?>
55 55
                     </p>
56 56
                   <?php } ?>
57
-                <?php if ( $row['htype'] == 10 ) {
57
+                <?php if ($row['htype'] == 10) {
58 58
                     $prevlevel = 'top';
59 59
                 } else {
60 60
                     $prevlevel = 'sub'; ?>
61 61
                 </li>
62 62
                 <?php } ?>
63 63
               <?php } ?>
64
-                <?php if ( $prevlevel == 'sub' ) { ?>
64
+                <?php if ($prevlevel == 'sub') { ?>
65 65
                 </ul>
66 66
                 </li>
67 67
                 <?php } ?>
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
             </div>
75 75
             <?php
76 76
                 include '_calendar_section.php';
77
-                include( dirname(__FILE__) . '/../sidebar/looking_for.php' );
77
+                include(dirname(__FILE__) . '/../sidebar/looking_for.php');
78 78
             ?>
79 79
         </div>
80 80
       <?php } else { ?>
Please login to merge, or discard this patch.