mysociety / theyworkforyou

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

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
 
     <meta property="og:site_name" content="TheyWorkForYou">
     <meta property="og:url" content="<?= _htmlentities($page_url) ?>">
-    <meta property="og:title" content="<?= strip_tags( $og_title ?: $page_title ) ?>">
+    <meta property="og:title" content="<?= strip_tags($og_title ?: $page_title) ?>">
     <meta property="og:type" content="website">
 
     <meta name="twitter:card" content="summary_large_image">
@@ -145,7 +145,7 @@ 
 
                 <div class="site-nav__user">
                     <ul>
-                      <?php foreach ($user_nav_links as $nav_link){ ?>
+                      <?php foreach ($user_nav_links as $nav_link) { ?>
                         <li><a href="<?= $nav_link['href']; ?>" title="<?= $nav_link['title']; ?>" class="<?= $nav_link['classes']; ?>">
                             <?= $nav_link['text'] ?>
                         </a></li>
@@ -175,7 +175,7 @@ 
         </div>
     </nav>
 
-    <?php if (isset($random_banner) && $random_banner ) { ?>
+    <?php if (isset($random_banner) && $random_banner) { ?>
       <div class="banner">
           <div class="full-page__row">
               <div class="banner__content">
@@ -190,7 +190,7 @@ 
     <div class="full-page legacy-page static-page">
         <div class="full-page__row">
             <div class="panel">
-            <?php foreach ( $page_errors as $error ) { ?>
+            <?php foreach ($page_errors as $error) { ?>
                 <p><?= $error['text'] ?></p>
             <?php } ?>
             </div>

www/docs/admin/banner.php

Indentation +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
         $out .= '<p><label for="banner">JSON input for announcements and sidebars.<br>';
         $out .= '<span><a href="https://gist.github.com/ajparsons/ff8029afd333122775864b58fbe29433">See example of format</a>, <a href="https://jsonformatter.curiousconcept.com/">Link to online JSON validator</a></span><br>';
     };
-     $out .= '<textarea id="banner_text" name="banner" rows="30" cols="80">' . htmlentities($text) . "</textarea></p>\n";
+        $out .= '<textarea id="banner_text" name="banner" rows="30" cols="80">' . htmlentities($text) . "</textarea></p>\n";
     $out .= '<span class="formw"><input name="btnaction" type="submit" value="Save"></span>';
     $out .= '</form>';
 

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
     $editorial_option = get_http_var('editorial_option');
 }
 
-if ($editorial_option == "banner"){
+if ($editorial_option == "banner") {
     $this_page = 'admin_banner';
 } elseif ($editorial_option == "announcements") {
     $this_page = 'admin_announcement';
@@ -85,7 +85,7 @@ 
     global $editorial_option;
     $banner_text = get_http_var('banner');
     
-    if ( $banner->set_json($banner_text, $editorial_option) ) {
+    if ($banner->set_json($banner_text, $editorial_option)) {
         $out = "<h4>update successful</h4>";
         $out .= "<p>Json is now:</p><p>$banner_text</p>";
     } else {

Braces +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     $editorial_option = get_http_var('editorial_option');
 }
 
-if ($editorial_option == "banner"){
+if ($editorial_option == "banner") {
     $this_page = 'admin_banner';
 } elseif ($editorial_option == "announcements") {
     $this_page = 'admin_announcement';

classes/Utility/House.php

Spacing +6 added lines, -6 removed lines

@@ -55,42 +55,42 @@
 
     public static function getCountryDetails($house) {
         $details = array(
-            HOUSE_TYPE_COMMONS => array (
+            HOUSE_TYPE_COMMONS => array(
                 'country' => 'UK',
                 'assembly' => 'uk-commons',
                 'location' => '– in the House of Commons',
                 'cons_type' => 'WMC',
                 'assembly_name' => 'House of Commons',
             ),
-            HOUSE_TYPE_NI => array (
+            HOUSE_TYPE_NI => array(
                 'country' => 'NORTHERN IRELAND',
                 'assembly' => 'ni',
                 'location' => '– in the Northern Ireland Assembly',
                 'cons_type' => 'NIE',
                 'assembly_name' => 'Northern Ireland Assembly',
             ),
-            HOUSE_TYPE_SCOTLAND => array (
+            HOUSE_TYPE_SCOTLAND => array(
                 'country' => 'SCOTLAND',
                 'assembly' => 'scotland',
                 'location' => '– in the Scottish Parliament',
                 'cons_type' => 'SPC',
                 'assembly_name' => 'Scottish Parliament',
             ),
-            HOUSE_TYPE_WALES => array (
+            HOUSE_TYPE_WALES => array(
                 'country' => 'WALES',
                 'assembly' => 'wales',
                 'location' => '– in the Senedd',
                 'cons_type' => 'WAC',
                 'assembly_name' => 'Senedd',
             ),
-            HOUSE_TYPE_LORDS => array (
+            HOUSE_TYPE_LORDS => array(
                 'country' => 'UK',
                 'assembly' => 'uk-lords',
                 'location' => '– in the House of Lords',
                 'cons_type' => '',
                 'assembly_name' => 'House of Lords',
             ),
-            HOUSE_TYPE_LONDON_ASSEMBLY => array (
+            HOUSE_TYPE_LONDON_ASSEMBLY => array(
                 'country' => 'UK',
                 'assembly' => 'london-assembly',
                 'location' => '– in the London Assembly',

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

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 
 <?php $featured_item = $announcement_manager->get_random_valid_item("sidebar"); ?>
 
-<?php if ( $featured_item ) { ?>
+<?php if ($featured_item) { ?>
 
 <div class="sidebar__unit__featured_side">
   <div class="featured_side__mysociety">

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

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 <?php $featured_item = $announcement_manager->get_random_valid_item("donation"); ?>
 
-<?php if ( $featured_item ) { ?>
+<?php if ($featured_item) { ?>
 
 <div class="sidebar__unit__featured_side">
   <div class="featured_side__content">

classes/Model/AnnouncementManagement.php

Spacing +3 added lines, -3 removed lines

@@ -176,7 +176,7 @@ 
         }
 
         # discard any invalid banners
-        $banners = array_filter($banners, function ($banner) {
+        $banners = array_filter($banners, function($banner) {
             return is_valid_item($banner);
         });
 
@@ -198,12 +198,12 @@ 
         }
 
         # discard any invalid announcements
-        $items = array_filter($items, function ($item) {
+        $items = array_filter($items, function($item) {
             return is_valid_item($item);
         });
 
         # limit to announcements with the correct location
-        $items = array_filter($items, function ($item) use ($location) {
+        $items = array_filter($items, function($item) use ($location) {
             return in_array($location, $item->location);
         });
 

classes/Renderer/Footer.php

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
 
     public $data;
 
-    private $about_links = array ('help', 'about', 'linktous', 'news', 'privacy');
+    private $about_links = array('help', 'about', 'linktous', 'news', 'privacy');
     private $assemblies_links = array('hansard', 'sp_home', 'wales_home', 'ni_home', 'london_home');
     private $international_links = array('australia', 'ireland', 'mzalendo');
     private $tech_links = array('code', 'api', 'data', 'devmailinglist', 'contact');
@@ -28,10 +28,10 @@ 
     public function __construct() {
         $this->data = array();
 
-        $this->data['about'] = $this->get_menu_links( $this->about_links );
-        $this->data['assemblies'] = $this->get_menu_links( $this->assemblies_links );
-        $this->data['international'] = $this->get_menu_links( $this->international_links );
-        $this->data['tech'] = $this->get_menu_links( $this->tech_links );
+        $this->data['about'] = $this->get_menu_links($this->about_links);
+        $this->data['assemblies'] = $this->get_menu_links($this->assemblies_links);
+        $this->data['international'] = $this->get_menu_links($this->international_links);
+        $this->data['tech'] = $this->get_menu_links($this->tech_links);
     }
 
     /**

www/includes/easyparliament/templates/html/homepage/featured-content.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php global $featured_debate_shown; ?>
 <?php $featured_item = $announcement_manager->get_random_valid_item("homepage"); ?>
 
-<?php if ( $featured_item ) { ?>
+<?php if ($featured_item) { ?>
 <h2>The latest</h2>
 <div class="featured-content__wrapper">
 <?php if (isset($featured_item->thumbnail_image_url)) { ?>
@@ -18,7 +18,7 @@ 
 
 <?php } else { ?>
     <?php $featured_debate_shown = true; ?>
-    <?php if ( count($featured) > 0 ) {
+    <?php if (count($featured) > 0) {
                         include 'featured.php';
                     } else { ?>
                         No debates found.

www/includes/easyparliament/page.php

Spacing +34 added lines, -34 removed lines

@@ -19,7 +19,7 @@ 
     public $within_stripe_sidebar = false;
 
     public function page_start() {
-        if ( !$this->page_started() ) {
+        if (!$this->page_started()) {
             $this->checkForAdmin();
             $this->displayHeader();
         }
@@ -32,7 +32,7 @@ 
 
         $data = $h->data;
         $data = array_merge($u->data, $data);
-        if ( isset($page_errors) ) {
+        if (isset($page_errors)) {
             $data['page_errors'] = $page_errors;
         }
         $data['banner_text'] = '';
@@ -52,7 +52,7 @@ 
                 $THISPAGE = new \MySociety\TheyWorkForYou\Url($this_page);
 
                 $LOGINURL = new \MySociety\TheyWorkForYou\Url('userlogin');
-                $LOGINURL->insert(array('ret' => $THISPAGE->generate('none') ));
+                $LOGINURL->insert(array('ret' => $THISPAGE->generate('none')));
 
                 $text = "<a href=\"" . $LOGINURL->generate() . '">' . gettext('You’d better sign in!') . '</a>';
             } else {
@@ -67,7 +67,7 @@ 
     }
 
     public function page_end() {
-        if ( !$this->page_started() ) {
+        if (!$this->page_started()) {
             $this->page_start();
         }
 
@@ -101,7 +101,7 @@ 
         }
     }
 
-    public function stripe_start($type='side', $id='', $extra_class = '') {
+    public function stripe_start($type = 'side', $id = '', $extra_class = '') {
         // $type is one of:
         //  'full' - a full width div
         //  'side' - a white stripe with a coloured sidebar.
@@ -134,7 +134,7 @@ 
     }
 
 
-    public function stripe_end ($contents = array(), $extra = '') {
+    public function stripe_end($contents = array(), $extra = '') {
         // $contents is an array containing 0 or more hashes.
         // Each hash has two values, 'type' and 'content'.
         // 'Type' could be one of these:
@@ -237,7 +237,7 @@ 
     public function include_sidebar_template($sidebarname) {
         global $this_page, $DATA;
 
-            $sidebarpath = INCLUDESPATH.'easyparliament/sidebars/'.$sidebarname.'.php';
+            $sidebarpath = INCLUDESPATH . 'easyparliament/sidebars/' . $sidebarname . '.php';
 
             if (file_exists($sidebarpath)) {
                 include $sidebarpath;
@@ -245,7 +245,7 @@ 
     }
 
 
-    public function block_start($data=array()) {
+    public function block_start($data = array()) {
         // Starts a 'block' div, used mostly on the home page,
         // on the MP page, and in the sidebars.
         // $data is a hash like this:
@@ -392,7 +392,7 @@ 
         if (is_string($message)) {
             // Sometimes we're just sending a single line to this function
             // rather like the bigger array...
-            $message = array (
+            $message = array(
                 'text' => $message
             );
         }
@@ -400,13 +400,13 @@ 
         // if the page has started then we're most likely in an old school page
         // so we should just print out the error, otherwise stick it in the error
         // global which will then be displayed by the header template
-        if ( $this->page_started() ) {
+        if ($this->page_started()) {
             $this->message($message, 'error');
         } else {
-            if ( !isset($page_errors) ) {
+            if (!isset($page_errors)) {
                 $page_errors = array();
             }
-            $page_errors[]  = $message;
+            $page_errors[] = $message;
         }
 
         if ($fatal) {
@@ -423,7 +423,7 @@ 
     }
 
 
-    public function message($message, $class='') {
+    public function message($message, $class = '') {
         // Generates a very simple but common page content.
         // Used for when a user logs out, or votes, or any simple thing
         // where there's a little message and probably a link elsewhere.
@@ -513,7 +513,7 @@ 
             if ($page_title != '') {
                 $page_title .= ': ';
             }
-            $page_title .= format_date ($info['date'], SHORTDATEFORMAT);
+            $page_title .= format_date($info['date'], SHORTDATEFORMAT);
         }
 
         if ($page_title != '') {
@@ -568,7 +568,7 @@ 
 
         if (isset($nextprev['up'])) {
 
-            $uplink = '<span class="up"><a href="' .  $nextprev['up']['url'] . '" title="' . $nextprev['up']['title'] . '">' . $nextprev['up']['body'] . '</a>';
+            $uplink = '<span class="up"><a href="' . $nextprev['up']['url'] . '" title="' . $nextprev['up']['title'] . '">' . $nextprev['up']['body'] . '</a>';
             if (get_http_var('s')) {
                 $URL = new \MySociety\TheyWorkForYou\Url($this_page);
                 $uplink .= '<br><a href="' . $URL->generate() . '">' . gettext('Remove highlighting') . '</a>';
@@ -583,7 +583,7 @@ 
             $next = $nextprev['next'];
 
             if (isset($next['url'])) {
-                $nextlink = '<a href="' .  $next['url'] . '" title="' . $next['title'] . '" class="linkbutton">' . $next['body'] . ' &raquo;</a>';
+                $nextlink = '<a href="' . $next['url'] . '" title="' . $next['title'] . '" class="linkbutton">' . $next['body'] . ' &raquo;</a>';
             } else {
                 $nextlink = $next['body'] . ' &raquo;';
             }
@@ -600,7 +600,7 @@ 
     }
 
 
-    public function search_form($value='') {
+    public function search_form($value = '') {
         global $SEARCHENGINE;
         // Search box on the search page.
         // If $value is set then it will be displayed in the form.
@@ -630,7 +630,7 @@ 
             }
 
         echo '<div class="mainsearchbox">';
-        if ($wtt<2) {
+        if ($wtt < 2) {
                 echo '<form action="', $URL->generate(), '" method="get">';
                 if (get_http_var('o')) {
                     echo '<input type="hidden" name="o" value="', _htmlentities(get_http_var('o')), '">';
@@ -663,16 +663,16 @@ 
                     $ordering = 'd';
                 }
 
-                if ($ordering=='r') {
+                if ($ordering == 'r') {
                 print '<strong>' . gettext('Sorted by relevance') . '</strong>';
                 } else {
                 printf(gettext("<a href='%s'>Sort by relevance</a>"), $orderUrl->generate('html', array('o'=>'r')));
                 }
 
                 print "&nbsp;|&nbsp;";
-                if ($ordering=='d') {
+                if ($ordering == 'd') {
                 print '<strong>' . gettext('Sorted by date:') . ' ' . gettext('newest') . '</strong> / <a href="' . $orderUrl->generate('html', array('o'=>'o')) . '">' . gettext('oldest') . '</a>';
-                } elseif ($ordering=='o') {
+                } elseif ($ordering == 'o') {
                 print '<strong>' . gettext('Sorted by date:') . '</strong> <a href="' . $orderUrl->generate('html', array('o'=>'d')) . '">' . gettext('newest') . '</a> / <strong>' . gettext('oldest') . '</strong>';
                 } else {
                 print gettext("Sort by date:") . ' ';
@@ -685,7 +685,7 @@ 
                 }
 
             print "&nbsp;|&nbsp;";
-            if ($ordering=='p') {
+            if ($ordering == 'p') {
                 print '<strong>' . gettext('Use by person') . '</strong>';
             } else {
                 printf('<a href="%s">', $orderUrl->generate('html', array('o'=>'p')));
@@ -706,7 +706,7 @@ 
         echo '</form> </div>';
     }
 
-    public function login_form ($errors = array()) {
+    public function login_form($errors = array()) {
         // Used for /user/login/ and /user/prompt/
         // $errors is a hash of potential errors from a previous log in attempt.
         ?>
@@ -809,7 +809,7 @@ 
     public function glossary_atoz(&$GLOSSARY) {
     // Print out a nice list of lettered links to glossary pages
 
-        $letters = array ();
+        $letters = array();
 
         foreach ($GLOSSARY->alphabet as $letter => $eps) {
             // if we're writing out the current letter (list or item)
@@ -840,14 +840,14 @@ 
                     <div class="letters">
                         <ul>
     <?php
-        for ($n=0; $n<13; $n++) {
+        for ($n = 0; $n < 13; $n++) {
             print $letters[$n];
         }
         ?>
                         </ul>
                         <ul>
     <?php
-        for ($n=13; $n<26; $n++) {
+        for ($n = 13; $n < 26; $n++) {
             print $letters[$n];
         }
         ?>
@@ -866,12 +866,12 @@ 
 
         // add some extra controls for the administrators
         if ($this_page == "admin_glossary") {
-            print "<a id=\"gl".$term['glossary_id']."\"></a>";
+            print "<a id=\"gl" . $term['glossary_id'] . "\"></a>";
             print "<h3>" . $term['title'] . "</h3>";
             $URL = new \MySociety\TheyWorkForYou\Url('admin_glossary');
             $URL->insert(array("delete_confirm" => $term['glossary_id']));
             $delete_url = $URL->generate();
-            $admin_links = "<br><small><a href=\"".$delete_url."\">delete</a></small>";
+            $admin_links = "<br><small><a href=\"" . $delete_url . "\">delete</a></small>";
         } else {
             $admin_links = "";
         }
@@ -892,9 +892,9 @@ 
             // Add a direct search link for current glossary item
             $URL = new \MySociety\TheyWorkForYou\Url('search');
             // remember to quote the term for phrase matching in search
-            $URL->insert(array('s' => '"'.$term['title'].'"'));
+            $URL->insert(array('s' => '"' . $term['title'] . '"'));
             $search_url = $URL->generate();
-            printf ("\t\t\t\t<p>Search hansard for \"<a href=\"%s\" title=\"View search results for this glossary item\">%s</a>\"</p>", $search_url, $term['title']);
+            printf("\t\t\t\t<p>Search hansard for \"<a href=\"%s\" title=\"View search results for this glossary item\">%s</a>\"</p>", $search_url, $term['title']);
         }
     }
 
@@ -969,7 +969,7 @@ 
 
             // Generate all the page links.
             $URL = new \MySociety\TheyWorkForYou\Url($this_page);
-            $URL->insert( array('wtt' => get_http_var('wtt')) );
+            $URL->insert(array('wtt' => get_http_var('wtt')));
             if (isset($pagedata['s'])) {
                 # XXX: Should be taken out in *one* place, not here + search_form etc.
                 $value = $pagedata['s'];
@@ -1107,7 +1107,7 @@ 
 
                 $body = trim_characters($report['body'], 0, 40);
 
-                $tabledata['rows'][] = array (
+                $tabledata['rows'][] = array(
                     _htmlentities($report['firstname'] . ' ' . $report['lastname']),
                     _htmlentities($body),
                     $report['reported'],
@@ -1189,11 +1189,11 @@ 
         // Returns HTML suitable for putting in the sidebar on Admin pages.
         global $this_page, $DATA;
 
-        $pages = array ('admin_home',
+        $pages = array('admin_home',
                 'admin_comments', 'admin_searchlogs', 'admin_popularsearches', 'admin_failedsearches',
                 'alert_stats', 'admin_statistics', 'admin_reportstats',
                 'admin_commentreports', 'admin_glossary', 'admin_glossary_pending', 'admin_badusers',
-                'admin_profile_message', 'admin_photos', 'admin_mpurls', 'admin_policies', 'admin_banner', 'admin_announcement' ,'admin_featured', 'admin_topics',
+                'admin_profile_message', 'admin_photos', 'admin_mpurls', 'admin_policies', 'admin_banner', 'admin_announcement', 'admin_featured', 'admin_topics',
                 'admin_wikipedia',
                 );