mysociety / theyworkforyou

classes/EditQueue.php

Braces +3 added lines, -6 removed lines

@@ -185,8 +185,7 @@ 
                             WHERE edit_id=" . $approval_id . ";");
             if (!$q->success()) {
                 break;
-            }
-            else {
+            } else {
                 // Now send them an email telling them they've been approved
 
 
@@ -227,8 +226,7 @@ 
                             WHERE edit_id=" . $decline_id . ";");
             if (!$q->success()) {
                 break;
-            }
-            else {
+            } else {
                 // Scrub that one from the list of pending items
                 unset ($this->pending[$decline_id]);
             }
@@ -266,8 +264,7 @@ 
             $this->update_pending_count();
 
             return true;
-        }
-        else {
+        } else {
             return false;
         }
     }

Spacing +2 added lines, -2 removed lines

@@ -178,7 +178,7 @@ 
             // the new epobject id and approval details.
             $q = $this->db->query("UPDATE editqueue
                             SET
-                            epobject_id_l='" .  $this->current_epobject_id. "',
+                            epobject_id_l='" .  $this->current_epobject_id . "',
                             editor_id='" . addslashes($THEUSER->user_id()) . "',
                             approved='1',
                             decided='" . $timestamp . "'
@@ -260,7 +260,7 @@ 
         $q = $this->db->query("SELECT eq.edit_id, eq.user_id, u.firstname, u.lastname, eq.glossary_id, eq.title, eq.body, eq.submitted FROM editqueue AS eq, users AS u WHERE eq.user_id = u.user_id AND eq.approved IS NULL ORDER BY eq.submitted DESC;");
         if ($q->success() && $q->rows()) {
             for ($i = 0; $i < ($q->rows()); $i++) {
-                $this->pending[ $q->field($i,"edit_id") ] = $q->row($i);
+                $this->pending[$q->field($i, "edit_id")] = $q->row($i);
             }
 
             $this->update_pending_count();

classes/GlossaryEditQueue.php

Braces +1 added lines, -2 removed lines

@@ -68,8 +68,7 @@
                             WHERE edit_id=" . $approval_id . ";");
             if (!$q->success()) {
                 break;
-            }
-            else {
+            } else {
                 // Scrub that one from the list of pending items
                 unset ($this->pending[$approval_id]);
             }

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
             // the new epobject id and approval details.
             $q = $this->db->query("UPDATE editqueue
                             SET
-                            glossary_id='" .  $this->current_epobject_id. "',
+                            glossary_id='" .  $this->current_epobject_id . "',
                             editor_id='" . addslashes($THEUSER->user_id()) . "',
                             approved='1',
                             decided='" . $timestamp . "'

www/docs/admin/glossary_pending.php

Spacing +9 added lines, -9 removed lines

@@ -2,13 +2,13 @@ 
 // Some sketchy crap for displaying pending glossary additions
 
 include_once '../../includes/easyparliament/init.php';
-include_once (INCLUDESPATH."easyparliament/glossary.php");
+include_once (INCLUDESPATH . "easyparliament/glossary.php");
 
 $this_page = "admin_glossary_pending";
 
 $EDITQUEUE = new \MySociety\TheyWorkForYou\GlossaryEditQueue;
 
-$args = array (
+$args = array(
     'sort' => "regexp_replace"
 );
 $GLOSSARY = new GLOSSARY($args);
@@ -23,19 +23,19 @@ 
 if (get_http_var('approve')) {
     $approve = get_http_var('approve');
     if (!is_array($approve)) {
-        $approve = array ( $approve );
+        $approve = array($approve);
     }
     // Add all approved items
-    $data = array (
+    $data = array(
         'approvals' => $approve,
         'epobject_type' => 2
     );
     $EDITQUEUE->approve($data);
 }
 elseif (get_http_var('decline')) {
-    $decline = array (get_http_var('decline'));
+    $decline = array(get_http_var('decline'));
     // Dump all declined items
-    $data = array (
+    $data = array(
         'declines' => $decline,
         'epobject_type' => 2
     );
@@ -54,8 +54,8 @@ 
 
     // Mock up a "current term" to send to the display function
     if (get_http_var('previewterm')) {
-        $body	= get_http_var('definition');
-        $title	= get_http_var('g');
+        $body = get_http_var('definition');
+        $title = get_http_var('g');
     }
     else {
         $body = $EDITQUEUE->pending[$glossary_id]['body'];
@@ -115,7 +115,7 @@ 
 
     // add a modification to the database
     if (get_http_var('submitterm') && get_http_var('modify')) {
-        $data = array (
+        $data = array(
             'user_id'	=> get_http_var('userid'),
             'title'		=> get_http_var('g'),
             'body'		=> get_http_var('definition')

www/docs/admin/glossary.php

Spacing +6 added lines, -6 removed lines

@@ -2,13 +2,13 @@ 
 // Some sketchy crap for displaying pending glossary additions
 
 include_once '../../includes/easyparliament/init.php';
-include_once (INCLUDESPATH."easyparliament/glossary.php");
+include_once (INCLUDESPATH . "easyparliament/glossary.php");
 
 $this_page = "admin_glossary";
 
 $EDITQUEUE = new \MySociety\TheyWorkForYou\GlossaryEditQueue;
 
-$args = array (
+$args = array(
     'sort' => "regexp_replace"
 );
 
@@ -21,19 +21,19 @@ 
 if (get_http_var('approve')) {
     $approve = get_http_var('approve');
     if (!is_array($approve)) {
-        $approve = array ( $approve );
+        $approve = array($approve);
     }
     // Add all approved items
-    $data = array (
+    $data = array(
         'approvals' => $approve,
         'epobject_type' => 2
     );
     $EDITQUEUE->approve($data);
 }
 elseif (get_http_var('decline')) {
-    $decline = array (get_http_var('decline'));
+    $decline = array(get_http_var('decline'));
     // Dump all declined items
-    $data = array (
+    $data = array(
         'declines' => $decline,
         'epobject_type' => 2
     );

www/includes/easyparliament/glossary.php

Spacing +21 added lines, -21 removed lines

@@ -21,20 +21,20 @@ 
 */
 
 // This handles basic insertion and approval functions for all epobjects
-include_once INCLUDESPATH."easyparliament/searchengine.php";
+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...
-    public function __construct($args=array()) {
+    public function __construct($args = array()) {
     // We can optionally start the glossary with one of several arguments
     //		1. glossary_id - treat the glossary as a single term
     //		2. glossary_term - search within glossary for a term
@@ -73,16 +73,16 @@ 
 
             // These stop stupid submissions.
             // everything should be lowercase.
-            $this->stopwords = array( "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 = array("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");
 
     }
 
-    public function get_glossary_item($args=array()) {
+    public function get_glossary_item($args = array()) {
         // Search for and fetch glossary item with title or glossary_id
         // We could also search glossary text that contains the title text, for cross references
 
         $this->alphabet = array();
-        foreach (range ("A", "Z") as $letter) {
+        foreach (range("A", "Z") as $letter) {
             $this->alphabet[$letter] = array();
         }
 
@@ -91,11 +91,11 @@ 
             WHERE g.glossary_id=eq.glossary_id AND u.user_id=eq.user_id AND g.visible=1 AND eq.approved=1
             ORDER by g.title");
         if ($q->success() && $q->rows()) {
-            for ($i=0; $i < $q->rows(); $i++) {
-                $this->terms[ $q->field($i,"glossary_id") ] = $q->row($i);
+            for ($i = 0; $i < $q->rows(); $i++) {
+                $this->terms[$q->field($i, "glossary_id")] = $q->row($i);
                 // Now add the epobject to the alphabet navigation.
-                $first_letter = strtoupper(substr($q->field($i,"title"),0,1));
-                $this->alphabet[$first_letter][] = $q->field($i,"glossary_id");
+                $first_letter = strtoupper(substr($q->field($i, "title"), 0, 1));
+                $this->alphabet[$first_letter][] = $q->field($i, "glossary_id");
             }
 
             $this->num_terms = $q->rows();
@@ -138,7 +138,7 @@ 
         }
     }
 
-    public function search_glossary($args=array()) {
+    public function search_glossary($args = array()) {
         // Search for and fetch glossary item with a title
         // Useful for the search page, and nowhere else (so far)
 
@@ -153,8 +153,8 @@ 
             ORDER by g.title";
         $q = $this->db->query($query);
         if ($q->success() && $q->rows()) {
-            for ($i=0; $i < $q->rows(); $i++) {
-                $this->search_matches[ $q->field($i,"glossary_id") ] = $q->row($i);
+            for ($i = 0; $i < $q->rows(); $i++) {
+                $this->search_matches[$q->field($i, "glossary_id")] = $q->row($i);
             }
             $this->num_search_matches = $q->rows();
         }
@@ -190,12 +190,12 @@ 
         global $THEUSER;
 
         if ($data['title'] == '') {
-            error ("Sorry, you can't define a term without a title");
+            error("Sorry, you can't define a term without a title");
             return false;
         }
 
         if ($data['body'] == '') {
-            error ("You haven't entered a definition!");
+            error("You haven't entered a definition!");
             return false;
         }
 
@@ -248,7 +248,7 @@ 
         }
     }
 
-    public function glossarise($body, $tokenize=0, $urlize=0) {
+    public function glossarise($body, $tokenize = 0, $urlize = 0) {
     // Turn a body of text into a link-up wonderland of glossary joy
 
         global $this_page;
@@ -291,7 +291,7 @@ 
             }
             else {
                 if ($this_page == "admin_glossary") {
-                    $link_url = "#gl".$glossary_id;
+                    $link_url = "#gl" . $glossary_id;
                 }
                 else {
                     $link_url = $URL->generate('url');