mysociety / theyworkforyou

www/includes/technorati.php

Braces +8 added lines, -6 removed lines

@@ -14,7 +14,9 @@ 
         if ($string == 'minute' && $ago > 59) { $ago /= 60; $string = 'hour'; }
         if ($string == 'hour' && $ago > 23) { $ago /= 24; $string = 'day'; }
         if ($string == 'day' && $ago > 13) { $ago /= 7; $string = 'week'; }
-        $ago = round($ago); if ($ago != 1) $string .= 's';
+        $ago = round($ago); if ($ago != 1) {
+            $string .= 's';
+        }
         $body .= '<li><a href="' . $item->xLink . '">' . $item->xTitle . '</a> ('.$ago.' '.$string.' ago)</li>';
     }
     if ($body) {
@@ -64,7 +66,9 @@ 
 #echo "cache miss!";
 
     $a = file($techRati);
-    if (!$a) return false;
+    if (!$a) {
+        return false;
+    }
     set_time_limit (10);
     $contents = implode('', $a);
     //    $cachefp = fopen("cache/{$cacheFilename}.xml", "w");
@@ -121,12 +125,10 @@ 
     $arItems[$itemCount] = new xItem();
     // set new item object's properties
     $arItems[$itemCount]->xTitle = $data;
-  }
-  elseif ($curTag == $permalinkKey) {
+  } elseif ($curTag == $permalinkKey) {
     $arItems[$itemCount]->xPermalink = $data;
     #    $itemCount++;
-  }
-  elseif ($curTag == $linkKey) {
+  } elseif ($curTag == $linkKey) {
     $arItems[$itemCount]->xLink = $data;
     #$itemCount++;
   } elseif ($curTag == $createdKey) {

www/includes/easyparliament/init.php

Braces +3 added lines, -1 removed lines

@@ -41,7 +41,9 @@
 twfy_debug_timestamp("after including utility.php");
 
 // Set the default timezone
-if(function_exists('date_default_timezone_set')) date_default_timezone_set(TIMEZONE);
+if(function_exists('date_default_timezone_set')) {
+    date_default_timezone_set(TIMEZONE);
+}
 
 // Only do clever things with errors if we're not testing, otherwise show as default
 

www/includes/easyparliament/people.php

Braces +25 added lines, -18 removed lines

@@ -107,15 +107,17 @@ 
             $query .= 'LEFT OUTER JOIN personinfo ON member.person_id = personinfo.person_id AND data_key="' . $personinfo_key . '" ';
         }
         $query .= ' JOIN person_names p ON p.person_id = member.person_id AND p.type = "name" ';
-        if (isset($args['date']))
-            $query .= 'AND start_date <= :date AND :date <= end_date ';
-        else
-            $query .= 'AND end_date="9999-12-31" ';
+        if (isset($args['date'])) {
+                    $query .= 'AND start_date <= :date AND :date <= end_date ';
+        } else {
+                    $query .= 'AND end_date="9999-12-31" ';
+        }
         $query .= 'WHERE house=' . $args['house'] . ' ';
-        if (isset($args['date']))
-            $query .= 'AND entered_house <= :date AND :date <= left_house ';
-        elseif (!isset($args['all']) || $args['house'] == 1)
-            $query .= 'AND left_house = (SELECT MAX(left_house) FROM member) ';
+        if (isset($args['date'])) {
+                    $query .= 'AND entered_house <= :date AND :date <= left_house ';
+        } elseif (!isset($args['all']) || $args['house'] == 1) {
+                    $query .= 'AND left_house = (SELECT MAX(left_house) FROM member) ';
+        }
 
         if (isset($args['order'])) {
             $order = $args['order'];
@@ -174,8 +176,9 @@ 
                 $data[$p_id] = $narray;
             }
         }
-        if ($args['house'] == 2 && ($order == 'name' || $order == 'constituency'))
-            uasort($data, array($this, 'by_peer_name'));
+        if ($args['house'] == 2 && ($order == 'name' || $order == 'constituency')) {
+                    uasort($data, array($this, 'by_peer_name'));
+        }
 
         $data = array (
             'info' => array (
@@ -188,14 +191,18 @@ 
 
     }
     public function by_peer_name($a, $b) {
-        if (!$a['family_name'] && !$b['family_name'])
-            return strcmp($a['lordofname'], $b['lordofname']);
-        if (!$a['family_name'])
-            return strcmp($a['lordofname'], $b['family_name']);
-        if (!$b['family_name'])
-            return strcmp($a['family_name'], $b['lordofname']);
-        if (strcmp($a['family_name'], $b['family_name']))
-            return strcmp($a['family_name'], $b['family_name']);
+        if (!$a['family_name'] && !$b['family_name']) {
+                    return strcmp($a['lordofname'], $b['lordofname']);
+        }
+        if (!$a['family_name']) {
+                    return strcmp($a['lordofname'], $b['family_name']);
+        }
+        if (!$b['family_name']) {
+                    return strcmp($a['family_name'], $b['lordofname']);
+        }
+        if (strcmp($a['family_name'], $b['family_name'])) {
+                    return strcmp($a['family_name'], $b['family_name']);
+        }
         return strcmp($a['lordofname'], $b['lordofname']);
     }
 

www/includes/easyparliament/glossary.php

Braces +14 added lines, -15 removed lines

@@ -107,19 +107,19 @@ 
             if (isset($args['glossary_id']) && ($args['glossary_id'] != "")) {
                 $next = 0; $first_term = null;
                 foreach ($this->terms as $term) {
-                    if (!$first_term) $first_term = $term;
+                    if (!$first_term) {
+                        $first_term = $term;
+                    }
                     $last_term = $term;
                     if ($next == 1) {
                         $this->next_term = $term;
                         break;
-                    }
-                    elseif ($term['glossary_id'] == $args['glossary_id']) {
+                    } elseif ($term['glossary_id'] == $args['glossary_id']) {
                         $this->glossary_id = $args['glossary_id'];
                         $this->current_term = $term;
                         $next = 1;
 
-                    }
-                    else {
+                    } else {
                         $this->previous_term = $term;
                     }
                 }
@@ -134,8 +134,7 @@ 
             }
 
             return ($this->num_terms);
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -278,8 +277,9 @@ 
 
         // check for any glossary terms to replace
         foreach ($this->replace_order as $glossary_id => $count) {
-            if ($glossary_id == $this->glossary_id)
-                continue;
+            if ($glossary_id == $this->glossary_id) {
+                            continue;
+            }
 
             $term_body = $this->terms[$glossary_id]['body'];
             $term_title = $this->terms[$glossary_id]['title'];
@@ -290,12 +290,10 @@ 
             // catch glossary terms within their own definitions
             if ($glossary_id == $this->glossary_id) {
                 $replacewords[] = "<strong>\\1</strong>";
-            }
-            else {
+            } else {
                 if ($this_page == "admin_glossary") {
                     $link_url = "#gl".$glossary_id;
-                }
-                else {
+                } else {
                     $link_url = $URL->generate('url');
                 }
                 $title = _htmlentities(trim_characters($term_body, 0, 80));
@@ -304,8 +302,9 @@ 
         }
         // Highlight all occurrences of another glossary term in the definition.
         $body = preg_replace($findwords, $replacewords, $body, 1);
-        if (isset($this->glossary_id))
-            $body = preg_replace("/(?<![>\.\'\/])\b(" . $this->terms[$this->glossary_id]['title'] . ")\b(?![<\'])/i", '<strong>\\1</strong>', $body, 1);
+        if (isset($this->glossary_id)) {
+                    $body = preg_replace("/(?<![>\.\'\/])\b(" . $this->terms[$this->glossary_id]['title'] . ")\b(?![<\'])/i", '<strong>\\1</strong>', $body, 1);
+        }
 
         // Replace any phrases in wikipedia
         // TODO: Merge this code into above, so our gloss and wikipedia

www/includes/easyparliament/templates/html/mp/votes.php

Braces +5 added lines, -2 removed lines

@@ -110,13 +110,16 @@
 
                         <?php endif; ?>
 
-                    <?php else: ?>
+                    <?php else {
+    : ?>
 
                         <div class="panel">
                             <p>This person has not voted on any of the key issues which we keep track of.</p>
                         </div>
 
-                    <?php endif; ?>
+                    <?php endif;
+}
+?>
 
                 <?php endif; ?>
 

www/includes/easyparliament/templates/html/mp/profile.php

Braces +5 added lines, -2 removed lines

@@ -190,11 +190,14 @@
                         <?= $recent_appearances['additional_links'] ?>
                         <?php endif; ?>
 
-                    <?php else: ?>
+                    <?php else {
+    : ?>
 
                         <p>No recent appearances to display.</p>
 
-                    <?php endif; ?>
+                    <?php endif;
+}
+?>
 
                 </div>
                 <?php endif; ?>

www/includes/easyparliament/templates/html/mp/header.php

Braces +5 added lines, -2 removed lines

@@ -27,7 +27,8 @@ 
                                   <?php } ?>
                                 </div>
                             <?php } ?>
-                        <?php else: ?>
+                        <?php else {
+    : ?>
                             <div class="person-data-attribution">
                                 We&rsquo;re missing a photo of <?= $full_name ?>. If you have a
                                 photo <em>that you can release under a Creative Commons Attribution-ShareAlike
@@ -36,7 +37,9 @@ 
                                 Please do not email us about copyrighted photos elsewhere on the internet; we can&rsquo;t
                                 use them.
                             </div>
-                        <?php endif; ?>
+                        <?php endif;
+}
+?>
                         <div class="person-constituency">
                           <?php if ( $constituency && $this_page != 'peer' && $this_page != 'royal' ) { ?>
                             <span class="constituency"><?= $constituency ?></span>

www/includes/easyparliament/templates/html/hansard_search.php

Braces +3 added lines, -1 removed lines

@@ -91,7 +91,9 @@
         echo '</dt> <dd><p>';
         if (isset($row['speaker']) && count($row['speaker'])) {
             echo "<em>" . ucfirst($row['speaker']['name']) . "</em>";
-            if ($row['extract']) echo ": ";
+            if ($row['extract']) {
+                echo ": ";
+            }
         }
 
         echo $row['extract'] . "</p></dd>\n";

www/includes/easyparliament/templates/html/hansard_calendar.php

Braces +16 added lines, -8 removed lines

@@ -135,12 +135,16 @@ 
                 }
 
                 $recess_major = 1; # For all of UK Parliament
-                if ($hansardmajors[$data['info']['major']]['location'] == 'NI')
-                    $recess_major = 5;
-                elseif ($hansardmajors[$data['info']['major']]['location'] == 'Scotland')
-                    $recess_major = 4; # For all of Scotland
-                elseif ($data['info']['major'] == 101)
-                    $recess_major = 101; # Lords slightly different
+                if ($hansardmajors[$data['info']['major']]['location'] == 'NI') {
+                                    $recess_major = 5;
+                } elseif ($hansardmajors[$data['info']['major']]['location'] == 'Scotland') {
+                                    $recess_major = 4;
+                }
+                # For all of Scotland
+                elseif ($data['info']['major'] == 101) {
+                                    $recess_major = 101;
+                }
+                # Lords slightly different
                 $recess = recess_prettify($currentDay, $month, $year, $recess_major);
 
                 // Is this day actually Today in the real world?
@@ -149,11 +153,15 @@ 
                 // sittings - e.g. WH is only Tuesday-Thursday
                 if ($currentDay == $toDay) {
                     print '<td class="on"';
-                    if ($recess[0] && $recess[0]!=1) print ' title="'.$recess[0].'"';
+                    if ($recess[0] && $recess[0]!=1) {
+                        print ' title="'.$recess[0].'"';
+                    }
                     print '>';
                 } elseif ($recess[0]) {
                     print '<td class="no"';
-                    if ($recess[0]!=1) print ' title="'.$recess[0].'"';
+                    if ($recess[0]!=1) {
+                        print ' title="'.$recess[0].'"';
+                    }
                     print '>';
                 } else {
                     print '<td>';