mysociety / theyworkforyou

www/includes/easyparliament/templates/html/glossary/addterm.php

Indentation +6 added lines, -6 removed lines

@@ -21,12 +21,12 @@
             <p>It seems we already have <?= ngettext('a definition', 'some definitions', $glossary->num_search_matches) ?> for that. Would you care to see <?= ngettext('it', 'them', $glossary->num_search_matches) ?>?</p>
             <ul class="glossary">
             <?php
-              foreach ($glossary->search_matches as $match) {
-                  $URL = new \MySociety\TheyWorkForYou\Url('glossary');
-                  $URL->insert(['gl' => $match['glossary_id']]);
-                  $URL->remove(['g']);
-                  $term_link = $URL->generate('url');
-                  ?>
+                foreach ($glossary->search_matches as $match) {
+                    $URL = new \MySociety\TheyWorkForYou\Url('glossary');
+                    $URL->insert(['gl' => $match['glossary_id']]);
+                    $URL->remove(['g']);
+                    $term_link = $URL->generate('url');
+                    ?>
                   <li>
                     <a href="<?= $term_link ?>"><?= $match['title']?></a>
                   </li>

www/includes/easyparliament/metadata.php

Spacing +6 added lines, -6 removed lines

@@ -66,7 +66,7 @@ 
 
 */
 
-$page =  [
+$page = [
 
     // Things used on EVERY page, unless overridden for a page:
     'default' =>  [
@@ -498,24 +498,24 @@ 
         'url'			=> 'glossary/',
     ],
     'glossary_addterm' => [
-        'menu'			=> array (
+        'menu'			=> array(
             'text'			=> 'Add a term',
             'title'			=> "Add a definition for a term to the glossary"
         ),
         'parent'		=> 'help_us_out',
         'title'			=> 'Add a glossary item',
         'url'			=> 'addterm/',
-        'session_vars'	=> array ('g')
+        'session_vars'	=> array('g')
     ],
     'glossary_addlink' => [
-        'menu'			=> array (
+        'menu'			=> array(
             'text'			=> 'Add a link',
             'title'			=> "Add an external link"
         ),
         'parent'		=> 'help_us_out',
         'title'			=> 'Add a link',
         'url'			=> 'addlink/',
-        'session_vars'	=> array ('g')
+        'session_vars'	=> array('g')
     ],
     'glossary_item' => [
         'heading'		=> 'Glossary heading',
@@ -1361,7 +1361,7 @@ 
 // The text displayed on the page itself will also be this,
 // UNLESS the section has a 'heading', in which case that's used instead.
 
-$section =  [
+$section = [
 
 
     'about' =>  [

www/includes/easyparliament/glossary.php

Spacing +7 added lines, -7 removed lines

@@ -24,12 +24,12 @@ 
 include_once INCLUDESPATH . "easyparliament/searchengine.php";
 
 class GLOSSARY {
-    public $num_terms;			// how many glossary entries do we have
+    public $num_terms; // how many glossary entries do we have
     // (changes depending on how GLOSSARY is called
-    public $hansard_count;		// how many times does the phrase appear in hansard?
-    public $query;				// search term
-    public $glossary_id;		// if this is set then we only have 1 glossary term
-    public $current_term;		// will only be set if we have a valid epobject_id
+    public $hansard_count; // how many times does the phrase appear in hansard?
+    public $query; // search term
+    public $glossary_id; // if this is set then we only have 1 glossary term
+    public $current_term; // will only be set if we have a valid epobject_id
     public $current_letter;
 
     // constructor...
@@ -72,7 +72,7 @@ 
 
         // These stop stupid submissions.
         // everything should be lowercase.
-        $this->stopwords = [ "the", "of", "to", "and", "for", "in", "a", "on", "is", "that", "will", "secretary", "are", "ask", "state", "have", "be", "has", "by", "with", "i", "not", "what", "as", "it", "hon", "he", "which", "from", "if", "been", "this", "s", "we", "at", "government", "was", "my", "an", "department", "there", "make", "or", "made", "their", "all", "but", "they", "how", "debate" ];
+        $this->stopwords = ["the", "of", "to", "and", "for", "in", "a", "on", "is", "that", "will", "secretary", "are", "ask", "state", "have", "be", "has", "by", "with", "i", "not", "what", "as", "it", "hon", "he", "which", "from", "if", "been", "this", "s", "we", "at", "government", "was", "my", "an", "department", "there", "make", "or", "made", "their", "all", "but", "they", "how", "debate"];
 
     }
 
@@ -189,7 +189,7 @@ 
         global $THEUSER;
 
         if (!$THEUSER->is_able_to('addterm')) {
-            error ("Sorry, you are not allowed to add Glossary terms.");
+            error("Sorry, you are not allowed to add Glossary terms.");
             return false;
         }
 

www/includes/easyparliament/page.php

Braces +2 added lines, -4 removed lines

@@ -816,16 +816,14 @@
 
         if (isset($args['blankform']) && $args['blankform'] == 1) {
             $formcontent = "";
-        }
-        else {
+        } else {
             $formcontent = _htmlentities(get_http_var('g'));
         }
 
         if ($THEUSER->isloggedin()) {
             $URL = new \MySociety\TheyWorkForYou\Url($args['action']);
             $URL->remove(array('g'));
-        }
-        else {
+        } else {
             $URL = new \MySociety\TheyWorkForYou\Url('userprompt');
             $URL->remove(array('g'));
             $type = "<input type=\"hidden\" name=\"type\" value=\"2\">";

www/docs/addlink/index.php

Spacing +7 added lines, -7 removed lines

@@ -1,16 +1,16 @@ 
     <?php
 
 include_once '../../includes/easyparliament/init.php';
-include_once INCLUDESPATH."easyparliament/glossary.php";
-include_once INCLUDESPATH."easyparliament/glossarylist.php";
+include_once INCLUDESPATH . "easyparliament/glossary.php";
+include_once INCLUDESPATH . "easyparliament/glossarylist.php";
 
 $this_page = "glossary_addlink";
 
-$args = array( 'action' => $this_page);
+$args = array('action' => $this_page);
 
 // First things first...
 
-if ((get_http_var('g') != '') && (get_http_var('previewterm') == '') ) {
+if ((get_http_var('g') != '') && (get_http_var('previewterm') == '')) {
     // We're searching for something.
     $args['s'] = filter_user_input(get_http_var('g'), 'strict');
     $GLOSSARY = new GLOSSARY($args);
@@ -25,7 +25,7 @@ 
 
 $PAGE->stripe_start();
 
-$data = array (
+$data = array(
     'title' => get_http_var('g'),
     'body'	=> get_http_var('definition')
 );
@@ -115,8 +115,8 @@ 
 
     $PAGE->glossary_atoz($GLOSSARY);
 
-    $PAGE->stripe_end(array (
-        array (
+    $PAGE->stripe_end(array(
+        array(
             'type'		=> 'include',
             'content'	=> 'glossary_add'
         )

Braces +3 added lines, -6 removed lines

@@ -14,8 +14,7 @@ 
     // We're searching for something.
     $args['s'] = filter_user_input(get_http_var('g'), 'strict');
     $GLOSSARY = new GLOSSARY($args);
-}
-else {
+} else {
     $args['sort'] = "regexp_replace";
     $GLOSSARY = new GLOSSARY($args);
     $args['s'] = filter_user_input(get_http_var('g'), 'strict');
@@ -86,13 +85,11 @@ 
             if ($args['count']) {
                 // Display the Add definition form
                 $PAGE->glossary_add_link_form($args);
-            }
-            else {
+            } else {
                 print "<h4>No dice!</h4><p>Much as we'd love you to add a definition for <strong></strong>, it doesn't seem to appear in hansard at all...</p>";
                 $PAGE->glossary_links();
             }
-        }
-        else {
+        } else {
             print "<h4>Humdinger!</h4><p>it would appear that you aren't allowed to add glossary terms. How odd...</p>";
             $PAGE->glossary_links();
         }

www/docs/addterm/index.php

Spacing +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php
 
 include_once '../../includes/easyparliament/init.php';
-include_once INCLUDESPATH."easyparliament/glossary.php";
-include_once INCLUDESPATH."easyparliament/glossarylist.php";
+include_once INCLUDESPATH . "easyparliament/glossary.php";
+include_once INCLUDESPATH . "easyparliament/glossarylist.php";
 
 $view = new MySociety\TheyWorkForYou\GlossaryView\AddTermView();
 $data = $view->display();

www/docs/parsing/index.php

Spacing +5 added lines, -5 removed lines

@@ -15,12 +15,12 @@ 
 $html = RAWDATA . 'cmpages/';
 $xml = RAWDATA . 'scrapedxml/';
 $dir = array('debates', 'wrans', 'wms', 'westminhall', 'lordspages', 'ni');
-$majors = array(1,3,4,2,101,5);
+$majors = array(1, 3, 4, 2, 101, 5);
 
 $hdates = array();
 $db = new ParlDB;
 $q = $db->query('SELECT DISTINCT(hdate) AS hdate, major FROM hansard');
-for ($i=0; $i<$q->rows(); $i++) {
+for ($i = 0; $i < $q->rows(); $i++) {
     $hdates[$q->field($i, 'hdate')][$q->field($i, 'major')] = true;
 }
 
@@ -36,7 +36,7 @@ 
     $out = array();
     $dh = opendir("$html$bit/");
     while (false !== ($filename = readdir($dh))) {
-        if (substr($filename, -5)!='.html' || substr($filename, -8, 3)=='tmp') continue;
+        if (substr($filename, -5) != '.html' || substr($filename, -8, 3) == 'tmp') continue;
         #if ($bit=='lordspages' && substr($filename,7,4)!='2005') continue;
         preg_match('#^(.*?)(\d\d\d\d-\d\d-\d\d)(.*?)\.#', $filename, $m);
         $part = ucfirst($m[1]); $date = $m[2]; $version = $m[3];
@@ -44,8 +44,8 @@ 
         $stat = stat("$html$bit/$filename");
         $base = substr($filename, 0, -5);
         if (!is_file("$xml$bit/$base.xml")) {
-            if ($date>'2001-05-11')
-                $out[$date][] = "<li>$date : $part version $version, size $stat[7] bytes, last modified ".date('Y-m-d H:i:s', $stat[9])."</li>\n";
+            if ($date > '2001-05-11')
+                $out[$date][] = "<li>$date : $part version $version, size $stat[7] bytes, last modified " . date('Y-m-d H:i:s', $stat[9]) . "</li>\n";
         } else {
             if (!array_key_exists($date, $hdates) || !array_key_exists($majors[$k], $hdates[$date])) {
                 $notloaded .= "<li>$date : $part version $version</li>\n";

Braces +12 added lines, -5 removed lines

@@ -36,16 +36,21 @@ 
     $out = array();
     $dh = opendir("$html$bit/");
     while (false !== ($filename = readdir($dh))) {
-        if (substr($filename, -5)!='.html' || substr($filename, -8, 3)=='tmp') continue;
+        if (substr($filename, -5)!='.html' || substr($filename, -8, 3)=='tmp') {
+            continue;
+        }
         #if ($bit=='lordspages' && substr($filename,7,4)!='2005') continue;
         preg_match('#^(.*?)(\d\d\d\d-\d\d-\d\d)(.*?)\.#', $filename, $m);
         $part = ucfirst($m[1]); $date = $m[2]; $version = $m[3];
-        if (!isset($out[$date])) $out[$date] = array();
+        if (!isset($out[$date])) {
+            $out[$date] = array();
+        }
         $stat = stat("$html$bit/$filename");
         $base = substr($filename, 0, -5);
         if (!is_file("$xml$bit/$base.xml")) {
-            if ($date>'2001-05-11')
-                $out[$date][] = "<li>$date : $part version $version, size $stat[7] bytes, last modified ".date('Y-m-d H:i:s', $stat[9])."</li>\n";
+            if ($date>'2001-05-11') {
+                            $out[$date][] = "<li>$date : $part version $version, size $stat[7] bytes, last modified ".date('Y-m-d H:i:s', $stat[9])."</li>\n";
+            }
         } else {
             if (!array_key_exists($date, $hdates) || !array_key_exists($majors[$k], $hdates[$date])) {
                 $notloaded .= "<li>$date : $part version $version</li>\n";
@@ -66,7 +71,9 @@ 
 <p>Note this currently only works for new data - ie. if there's any data at all
 in the database for the date, it won't appear hear</p>
 <?php
-if ($notloaded) print "<ul>$notloaded</ul>";
+if ($notloaded) {
+    print "<ul>$notloaded</ul>";
+}
 
 $PAGE->stripe_end();
 $PAGE->page_end();

www/docs/glossary/index.php

Spacing +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
     $URL->update(["gl" => $GLOSSARY->next_term['glossary_id']]);
     $next_link = $URL->generate('url');
 
-    $nextprev =  [
+    $nextprev = [
         'next'	=>  [
             'url'	=> $next_link,
             'title'	=> 'Next term',
@@ -117,7 +117,7 @@ 
 
 $URL = new \MySociety\TheyWorkForYou\Url('glossary_addterm');
 $add_url = $URL->generate();
-print "<p>Think you know a phrase that should be here? Help us improve the site by <a href=\"".$add_url."\">adding it</a>.</p>";
+print "<p>Think you know a phrase that should be here? Help us improve the site by <a href=\"" . $add_url . "\">adding it</a>.</p>";
 
 $PAGE->stripe_end([
     [

classes/GlossaryView/AddTermView.php

Indentation +62 added lines, -62 removed lines

@@ -5,11 +5,11 @@ 
 namespace MySociety\TheyWorkForYou\GlossaryView;
 
 class AddTermView {
-  public $glossary;
+    public $glossary;
 
-  public function display(): array {
+    public function display(): array {
     if (!$this->has_access()) {
-      return ['error' => _("You don't have permission to manage the glossary")];
+        return ['error' => _("You don't have permission to manage the glossary")];
     }
 
     $data = [];
@@ -26,130 +26,130 @@ 
     $data['glossary'] = $this->glossary;
 
     if (get_http_var('submitterm') != '') {
-      $data = $this->add_glossary_entry($data);
+        $data = $this->add_glossary_entry($data);
     } elseif ((get_http_var('g') != '') && (get_http_var('previewterm') == '')) {
-      $data = $this->check_glossary_entry($data);
+        $data = $this->check_glossary_entry($data);
     } elseif (get_http_var('previewterm') != '') {
-      $data['definition'] = get_http_var('definition');
-      $data['preview'] = 1;
+        $data['definition'] = get_http_var('definition');
+        $data['preview'] = 1;
     } else {
-      $data = $this->add_example_urls($data);
+        $data = $this->add_example_urls($data);
     }
 
     $URL = new \MySociety\TheyWorkForYou\Url('glossary_addterm');
     $data['form_url'] = $URL->generate();
 
     return $data;
-  }
+    }
 
-  protected function has_access(): bool {
+    protected function has_access(): bool {
     global $THEUSER;
 
     if (!$THEUSER->is_able_to('addterm')) {
-      return false;
+        return false;
     }
 
     return true;
-  }
+    }
 
-  protected function has_stop_words(): bool {
+    protected function has_stop_words(): bool {
     if (in_array($this->glossary->query, $this->glossary->stopwords)) {
-      return true;
+        return true;
     }
     return false;
-  }
+    }
 
-  protected function check_term_is_useful(array $data): array {
+    protected function check_term_is_useful(array $data): array {
     if ($this->has_stop_words()) {
-      $data['error'] = 'Sorry, that phrase appears too many times to be a useful as a link within the parliamentary record.';
+        $data['error'] = 'Sorry, that phrase appears too many times to be a useful as a link within the parliamentary record.';
     } elseif (isset($data['appearances']) && !$data['appearances']) {
-      $data['error'] = "Unfortunately <strong>" . $data['term'] . "</strong>, doesn't seem to appear in hansard at all...</p>";
+        $data['error'] = "Unfortunately <strong>" . $data['term'] . "</strong>, doesn't seem to appear in hansard at all...</p>";
     } elseif ($this->glossary->num_search_matches > 0) {
-      $data['show_matches'] = 1;
-      $data['error'] = 'Existing matches';
-      $data['count'] = $this->glossary->num_search_matches;
+        $data['show_matches'] = 1;
+        $data['error'] = 'Existing matches';
+        $data['count'] = $this->glossary->num_search_matches;
     }
 
     return $data;
-  }
+    }
 
-  protected function get_appearance_count(string $term): int {
+    protected function get_appearance_count(string $term): int {
     global $SEARCHENGINE;
     $SEARCHENGINE = new \SEARCHENGINE($term);
     $count = $SEARCHENGINE->run_count(0, 10000);
     return $count;
-  }
+    }
 
-  protected function check_glossary_entry(array $data): array {
-      $data['appearances'] = $this->get_appearance_count($data['term']);
-      $data['definition'] = '';
-      $data = $this->check_term_is_useful($data);
+    protected function check_glossary_entry(array $data): array {
+        $data['appearances'] = $this->get_appearance_count($data['term']);
+        $data['definition'] = '';
+        $data = $this->check_term_is_useful($data);
 
-      if (!isset($data['error'])) {
+        if (!isset($data['error'])) {
         $data['definition'] = '';
         $list = new \HANSARDLIST();
         $examples = $list->display('search', [
-          'num' => 5,
-          's' => $data['term'],
-          'view_override' => 'glossary_search',
+            'num' => 5,
+            's' => $data['term'],
+            'view_override' => 'glossary_search',
         ], 'none');
         $data['examples'] = $examples['rows'];
-      }
+        }
 
-      return $data;
-  }
+        return $data;
+    }
 
-  protected function add_glossary_entry(array $data): array {
-      $data['submitted'] = 1;
-      $data['body'] = get_http_var('definition');
-      $data = $this->check_term_is_useful($data);
+    protected function add_glossary_entry(array $data): array {
+        $data['submitted'] = 1;
+        $data['body'] = get_http_var('definition');
+        $data = $this->check_term_is_useful($data);
 
-      $success = false;
-      if (!isset($data['error'])) {
+        $success = false;
+        if (!isset($data['error'])) {
         $entry = [
-          'title' => $data['term'],
-          'body'  => $data['body'],
+            'title' => $data['term'],
+            'body'  => $data['body'],
         ];
         $success = $this->glossary->create($data);
-      }
+        }
 
-      if (is_int($success)) {
+        if (is_int($success)) {
         $data['success'] = 1;
-      } elseif (is_array($success)) {
+        } elseif (is_array($success)) {
         $data = array_merge($data, $success);
-      } else {
+        } else {
         if (!isset($data['error'])) {
-          $data['error'] = "Sorry, there was an error and we were unable to add your Glossary item.";
+            $data['error'] = "Sorry, there was an error and we were unable to add your Glossary item.";
+        }
         }
-      }
 
-      return $data;
-  }
+        return $data;
+    }
 
-  protected function add_example_urls(array $data): array {
+    protected function add_example_urls(array $data): array {
     $URL = new \MySociety\TheyWorkForYou\Url('glossary');
 
     $examples = [
-      'technical' => [
+        'technical' => [
         'name' => 'Early Day Motion', 'id' => 90, 
-      ],
-      'organisation' => [
+        ],
+        'organisation' => [
         'name' => 'Devon County Council', 'id' => 12,
-      ],
-      'document' => [
+        ],
+        'document' => [
         'name' => 'Hutton Report', 'id' => 7,
-      ],
+        ],
     ];
 
     $example_urls = [];
     foreach ($examples as $name => $example) {
-      $URL->insert(["gl" => $example['id']]);
-      $example['url'] = $URL->generate();
-      $example_urls[$name] = $example;
+        $URL->insert(["gl" => $example['id']]);
+        $example['url'] = $URL->generate();
+        $example_urls[$name] = $example;
     }  
 
     $data['example_urls'] = $example_urls;
     return $data;
-  }
+    }
 
 }