mysociety / theyworkforyou

www/includes/easyparliament/commentreportlist.php

Spacing +11 added lines, -11 removed lines

@@ -24,7 +24,7 @@ 
         // available for editing, it's accurate.
         $this->_update_locked();
 
-        $data = $this->_get_data_by_recent ();
+        $data = $this->_get_data_by_recent();
 
         $this->render($data);
 
@@ -67,7 +67,7 @@ 
         $q = $this->db->query("SELECT comments.comment_id,
                                 commentreports.report_id,
                                 commentreports.body,
-                                DATE_FORMAT(commentreports.reported, '" . SHORTDATEFORMAT_SQL . ' ' . TIMEFORMAT_SQL . "') AS reported,
+                                DATE_FORMAT(commentreports.reported, '" . SHORTDATEFORMAT_SQL.' '.TIMEFORMAT_SQL."') AS reported,
                                 commentreports.locked,
                                 users.firstname,
                                 users.lastname
@@ -84,7 +84,7 @@ 
         $r = $this->db->query("SELECT comments.comment_id,
         commentreports.report_id,
         commentreports.body,
-        DATE_FORMAT(commentreports.reported, '". SHORTDATEFORMAT_SQL . ' ' . TIMEFORMAT_SQL . "') AS reported,
+        DATE_FORMAT(commentreports.reported, '". SHORTDATEFORMAT_SQL.' '.TIMEFORMAT_SQL."') AS reported,
         commentreports.locked,
         commentreports.firstname,
         commentreports.lastname
@@ -99,11 +99,11 @@ 
 
         if ($q->rows() > 0) {
 
-            for ($n=0; $n<$q->rows(); $n++) {
+            for ($n = 0; $n < $q->rows(); $n++) {
 
-                $data[] = array (
-                    'report_id'		=> $q->field($n,'report_id'),
-                    'comment_id' 	=> $q->field($n,'comment_id'),
+                $data[] = array(
+                    'report_id'		=> $q->field($n, 'report_id'),
+                    'comment_id' 	=> $q->field($n, 'comment_id'),
                     'firstname'		=> $q->field($n, 'firstname'),
                     'lastname'		=> $q->field($n, 'lastname'),
                     'body'			=> $q->field($n, 'body'),
@@ -114,10 +114,10 @@ 
 
         }
         if ($r->rows() > 0) {
-            for ($n=0; $n<$r->rows(); $n++) {
-                $data[] = array (
-                    'report_id'		=> $r->field($n,'report_id'),
-                    'comment_id' 	=> $r->field($n,'comment_id'),
+            for ($n = 0; $n < $r->rows(); $n++) {
+                $data[] = array(
+                    'report_id'		=> $r->field($n, 'report_id'),
+                    'comment_id' 	=> $r->field($n, 'comment_id'),
                     'firstname'		=> $r->field($n, 'firstname'),
                     'lastname'		=> $r->field($n, 'lastname'),
                     'body'			=> $r->field($n, 'body'),

www/includes/easyparliament/trackback.php

Spacing +25 added lines, -25 removed lines

@@ -51,7 +51,7 @@ 
     public function moderate_trackbacks() { return $this->moderate_trackbacks; }
 
 
-    public function display ($view, $args=array(), $format='html') {
+    public function display($view, $args = array(), $format = 'html') {
         // $view is one of:
         //	'epobject_id' - display the pings for one epobject.
         // 	'recent' - to get the most recent pings to anywhere.
@@ -69,13 +69,13 @@ 
             $trackbackdata = $this->$function($args);
 
         } else {
-            $PAGE->error_message ("You haven't specified a valid view type.");
+            $PAGE->error_message("You haven't specified a valid view type.");
             return false;
         }
 
-        $data = array (
+        $data = array(
             'data' 	=> $trackbackdata,
-            'info'	=> array (
+            'info'	=> array(
                 'view' => $view
             )
         );
@@ -86,7 +86,7 @@ 
         $this->render($view, $data, $format);
     }
 
-    public function render($view, $data, $format='html') {
+    public function render($view, $data, $format = 'html') {
 
         if ($format != 'html') {
             $format = 'html';
@@ -95,7 +95,7 @@ 
         // We currently only have one kind of trackback template, so
         // we're ignoring $view here I'm afraid...
 
-        include (INCLUDESPATH."easyparliament/templates/$format/trackbacks" . ".php");
+        include (INCLUDESPATH."easyparliament/templates/$format/trackbacks".".php");
 
     }
 
@@ -123,7 +123,7 @@ 
         // Check this epobject_id exists.
         $q = $this->db->query("SELECT epobject_id
                         FROM	epobject
-                        WHERE	epobject_id = '" . addslashes($epobject_id) . "'");
+                        WHERE	epobject_id = '" . addslashes($epobject_id)."'");
 
         if ($q->rows() == 0) {
             $this->_trackback_response(1, "Sorry, we don't have a valid epobject_id.");
@@ -131,24 +131,24 @@ 
 
 
         // Still here? Then we're trackbacking to a valid hansard item.
-        $url 		= $trackbackdata['url'];
-        $source_ip	= $trackbackdata['source_ip'];
+        $url = $trackbackdata['url'];
+        $source_ip = $trackbackdata['source_ip'];
         // These all strip_tags too.
-        $title 		= trim_characters(html_entity_decode($trackbackdata['title']), 0, 255);
-        $excerpt 	= trim_characters(html_entity_decode($trackbackdata['excerpt']), 0, 255);
-        $blog_name 	= trim_characters(html_entity_decode($trackbackdata['blog_name']), 0, 255);
+        $title = trim_characters(html_entity_decode($trackbackdata['title']), 0, 255);
+        $excerpt = trim_characters(html_entity_decode($trackbackdata['excerpt']), 0, 255);
+        $blog_name = trim_characters(html_entity_decode($trackbackdata['blog_name']), 0, 255);
 
-        $visible 		= $this->moderate_trackbacks ? 0 : 1;
+        $visible = $this->moderate_trackbacks ? 0 : 1;
 
         $q = $this->db->query("INSERT INTO trackbacks
                         (epobject_id, blog_name, title, excerpt, url, source_ip, posted, visible)
                         VALUES
-                        ('" . addslashes($epobject_id) . "',
-                        '" . addslashes($blog_name) . "',
-                        '" . addslashes($title) . "',
-                        '" . addslashes($excerpt) . "',
-                        '" . addslashes($url) . "',
-                        '" . addslashes($source_ip) . "',
+                        ('" . addslashes($epobject_id)."',
+                        '" . addslashes($blog_name)."',
+                        '" . addslashes($title)."',
+                        '" . addslashes($excerpt)."',
+                        '" . addslashes($url)."',
+                        '" . addslashes($source_ip)."',
                         NOW(),
                         '$visible')
                         ");
@@ -158,7 +158,7 @@ 
             $this->_trackback_response(0);
 
         } else {
-            die ("Sorry, we could not save the trackback to the database. Please <a href=\"mailto:" . CONTACTEMAIL . "\">email us</a> to let us know. Thanks.");
+            die ("Sorry, we could not save the trackback to the database. Please <a href=\"mailto:".CONTACTEMAIL."\">email us</a> to let us know. Thanks.");
         }
     }
 
@@ -192,14 +192,14 @@ 
                                 url,
                                 posted
                         FROM 	trackbacks
-                        WHERE 	epobject_id = '" . addslashes($epobject_id) . "'
+                        WHERE 	epobject_id = '" . addslashes($epobject_id)."'
                         AND 	visible = 1
                         ORDER BY posted ASC
                         ");
 
         if ($q->rows() > 0) {
-            for ($row=0; $row<$q->rows(); $row++) {
-                $trackbackdata[] = array (
+            for ($row = 0; $row < $q->rows(); $row++) {
+                $trackbackdata[] = array(
                     'trackback_id' 	=> $q->field($row, 'trackback_id'),
                     'epobject_id'	=> $q->field($row, 'epobject_id'),
                     'blog_name' 	=> $q->field($row, 'blog_name'),
@@ -247,8 +247,8 @@ 
                         ");
 
         if ($q->rows() > 0) {
-            for ($row=0; $row<$q->rows(); $row++) {
-                $trackbackdata[] = array (
+            for ($row = 0; $row < $q->rows(); $row++) {
+                $trackbackdata[] = array(
                     'trackback_id' 	=> $q->field($row, 'trackback_id'),
                     'epobject_id'	=> $q->field($row, 'epobject_id'),
                     'blog_name' 	=> $q->field($row, 'blog_name'),

www/includes/easyparliament/editqueue.php

Spacing +29 added lines, -29 removed lines

@@ -75,19 +75,19 @@ 
                         (user_id, edit_type, title, body, submitted)
                         VALUES
                         (
-                        '" . addslashes($THEUSER->user_id()) . "',
-                        '" . $data['edit_type'] . "',
-                        '" . addslashes($data['title']) . "',
-                        '" . addslashes($data['body']) . "',
-                        '" . $data['posted'] . "'
+                        '" . addslashes($THEUSER->user_id())."',
+                        '" . $data['edit_type']."',
+                        '" . addslashes($data['title'])."',
+                        '" . addslashes($data['body'])."',
+                        '" . $data['posted']."'
                         );");
 
         if ($q->success()) {
             // Set the object variables up.
-            $this->editqueue_id 	= $q->insert_id();
+            $this->editqueue_id = $q->insert_id();
             $this->title			= $data['title'];
             $this->body				= $data['body'];
-            $this->posted			= $data['posted'];
+            $this->posted = $data['posted'];
 
             return $this->editqueue_id;
 
@@ -126,10 +126,10 @@ 
             $q = $this->db->query("INSERT INTO epobject
                             (title, body, type, created)
                             VALUES
-                            ('" . addslashes($this->pending[$approval_id]['title']) . "',
-                            '" . addslashes($this->pending[$approval_id]['body']) . "',
-                            '" . $data['epobject_type'] . "',
-                            '" . $timestamp . "');");
+                            ('" . addslashes($this->pending[$approval_id]['title'])."',
+                            '" . addslashes($this->pending[$approval_id]['body'])."',
+                            '" . $data['epobject_type']."',
+                            '" . $timestamp."');");
 
             // If that didn't work we can't go any further...
             if (!$q->success()) {
@@ -148,14 +148,14 @@ 
                     $q = $this->db->query("INSERT INTO glossary
                                     (epobject_id, type, visible)
                                     VALUES
-                                    ('" . $q->insert_id() . "',
+                                    ('" . $q->insert_id()."',
                                     '2',
                                     '1');");
                     // Again, no point carrying on if this fails,
                     // so remove the previous entry
                     if (!$q->success()) {
                         print "glossary trouble!";
-                        $q = $this->db->query("delete from epobject where epobject_id=" . $previous_insert_id . "");
+                        $q = $this->db->query("delete from epobject where epobject_id=".$previous_insert_id."");
                         return false;
                     }
                     break;
@@ -167,11 +167,11 @@ 
             // the new epobject id and approval details.
             $q = $this->db->query("UPDATE editqueue
                             SET
-                            epobject_id_l='" .  $this->current_epobject_id. "',
-                            editor_id='" . addslashes($THEUSER->user_id()) . "',
+                            epobject_id_l='" .  $this->current_epobject_id."',
+                            editor_id='" . addslashes($THEUSER->user_id())."',
                             approved='1',
-                            decided='" . $timestamp . "'
-                            WHERE edit_id=" . $approval_id . ";");
+                            decided='" . $timestamp."'
+                            WHERE edit_id=" . $approval_id.";");
             if (!$q->success()) {
                 break;
             }
@@ -210,10 +210,10 @@ 
             // Update the editqueue with setting approved=0
             $q = $this->db->query("UPDATE editqueue
                             SET
-                            editor_id='" . addslashes($THEUSER->user_id()) . "',
+                            editor_id='" . addslashes($THEUSER->user_id())."',
                             approved='0',
-                            decided='" . $timestamp . "'
-                            WHERE edit_id=" . $decline_id . ";");
+                            decided='" . $timestamp."'
+                            WHERE edit_id=" . $decline_id.";");
             if (!$q->success()) {
                 break;
             }
@@ -249,7 +249,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();
@@ -344,10 +344,10 @@ 
             $q = $this->db->query("INSERT INTO glossary
                             (title, body, type, created, visible)
                             VALUES
-                            ('" . addslashes($this->pending[$approval_id]['title']) . "',
-                            '" . addslashes($this->pending[$approval_id]['body']) . "',
-                            '" . $data['epobject_type'] . "',
-                            '" . $timestamp . "',
+                            ('" . addslashes($this->pending[$approval_id]['title'])."',
+                            '" . addslashes($this->pending[$approval_id]['body'])."',
+                            '" . $data['epobject_type']."',
+                            '" . $timestamp."',
                             1);");
 
             // If that didn't work we can't go any further...
@@ -361,11 +361,11 @@ 
             // the new epobject id and approval details.
             $q = $this->db->query("UPDATE editqueue
                             SET
-                            glossary_id='" .  $this->current_epobject_id. "',
-                            editor_id='" . addslashes($THEUSER->user_id()) . "',
+                            glossary_id='" .  $this->current_epobject_id."',
+                            editor_id='" . addslashes($THEUSER->user_id())."',
                             approved='1',
-                            decided='" . $timestamp . "'
-                            WHERE edit_id=" . $approval_id . ";");
+                            decided='" . $timestamp."'
+                            WHERE edit_id=" . $approval_id.";");
             if (!$q->success()) {
                 break;
             }

Braces +4 added lines, -8 removed lines

@@ -174,8 +174,7 @@ 
                             WHERE edit_id=" . $approval_id . ";");
             if (!$q->success()) {
                 break;
-            }
-            else {
+            } else {
                 // Now send them an email telling them they've been approved
 
 
@@ -216,8 +215,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]);
             }
@@ -255,8 +253,7 @@ 
             $this->update_pending_count();
 
             return true;
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -368,8 +365,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]);
             }

www/includes/easyparliament/glossarylist.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 class GLOSSARYLIST {
 
-    public function render($data, $format='html', $template='glossary') {
+    public function render($data, $format = 'html', $template = 'glossary') {
         // Once we have the data that's to be rendered,
         // include the template.
 

www/includes/easyparliament/glossary.php

Spacing +24 added lines, -24 removed lines

@@ -27,16 +27,16 @@ 
 
 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
@@ -75,16 +75,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();
         }
 
@@ -93,11 +93,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();
@@ -140,7 +140,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)
 
@@ -151,12 +151,12 @@ 
         $query = "SELECT g.glossary_id, g.title, g.body, u.user_id, u.firstname, u.lastname
             FROM editqueue AS eq, glossary AS g, users AS u
             WHERE g.glossary_id=eq.glossary_id AND u.user_id=eq.user_id AND g.visible=1
-                AND g.title LIKE '%" . $this->query . "%'
+                AND g.title LIKE '%" . $this->query."%'
             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();
         }
@@ -192,12 +192,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;
         }
 
@@ -209,7 +209,7 @@ 
 
             $q = $this->db->query("SELECT glossary_id
                             FROM	editqueue
-                            WHERE	user_id = '" . $THEUSER->user_id() . "'
+                            WHERE	user_id = '" . $THEUSER->user_id()."'
                             AND		submitted + 0 > NOW() - $flood_time_limit");
 
             if ($q->rows() > 0) {
@@ -250,7 +250,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;
@@ -264,7 +264,7 @@ 
         // should be the complete and linked url.
         // NB. This should only match when $body is a definition beginning with "http:"
         if (is_string($body) && preg_match("/^(http:*[^\s])$/i", $body)) {
-            $body = "<a href=\"" . $body . "\" title=\"External link to " . $body . "\">" . $body . "</a>";
+            $body = "<a href=\"".$body."\" title=\"External link to ".$body."\">".$body."</a>";
             return ($body);
         }
 
@@ -286,7 +286,7 @@ 
 
             $URL->update(array("gl" => $glossary_id));
             # The regex here ensures that the phrase is only matched if it's not already within <a> tags, preventing double-linking. Kudos to http://stackoverflow.com/questions/7798829/php-regular-expression-to-match-keyword-outside-html-tag-a
-            $findwords[$glossary_id] = "/\b(" . $term_title . ")\b(?!(?>[^<]*(?:<(?!\/?a\b)[^<]*)*)<\/a>)/i";
+            $findwords[$glossary_id] = "/\b(".$term_title.")\b(?!(?>[^<]*(?:<(?!\/?a\b)[^<]*)*)<\/a>)/i";
             // catch glossary terms within their own definitions
             if ($glossary_id == $this->glossary_id) {
                 $replacewords[] = "<strong>\\1</strong>";
@@ -305,7 +305,7 @@ 
         // 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);
+            $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

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/rss/hansard_search.php

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
 twfy_debug("TEMPLATE", "rss/hansard_search.php");
 
 if (isset ($data['rows']) && count($data['rows']) > 0) {
-    for ($i=0; $i<count($data['rows']); $i++) {
+    for ($i = 0; $i < count($data['rows']); $i++) {
         $row = $data['rows'][$i];
 
         $hdate = format_date($row['hdate'], 'D, d M Y');
@@ -37,16 +37,16 @@ 
         if (isset($row['parent']) && count($row['parent']) > 0) {
             echo strip_tags($row['parent']['body']);
         }
-        echo (' (' . format_date($row['hdate'], SHORTDATEFORMAT) . ')');
+        echo (' ('.format_date($row['hdate'], SHORTDATEFORMAT).')');
 ?></title>
 <link>https://www.theyworkforyou.com<?=$row['listurl'] ?></link>
 <pubDate><?=$date ?></pubDate>
 <description><?php
         if (isset($row['speaker']) && count($row['speaker'])) {
             $name = ucfirst($row['speaker']['name']);
-            echo entities_to_numbers($name) . ': ';
+            echo entities_to_numbers($name).': ';
         }
-        echo _htmlspecialchars(str_replace(array('&#8212;', '<span class="hi">', '</span>'), array('-', '<b>', '</b>'), $row['extract'])) . "</description>\n</item>\n";
+        echo _htmlspecialchars(str_replace(array('&#8212;', '<span class="hi">', '</span>'), array('-', '<b>', '</b>'), $row['extract']))."</description>\n</item>\n";
     }
 }
 ?>

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
         $row = $data['rows'][$i];
 
         $hdate = format_date($row['hdate'], 'D, d M Y');
-        if (isset($row['htime']) && $row['htime'] != NULL) {
+        if (isset($row['htime']) && $row['htime'] != null) {
             $htime = format_time($row['htime'], 'H:i:s');
         } else {
             $htime = '00:00:00';

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

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 
             <p><?= $error ?></p>
 
-        <?php if ( $rep_search_url ) { ?>
+        <?php if ($rep_search_url) { ?>
         </div>
 
         <div class="full-page__unit">

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

Indentation +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
                               <?php foreach ($segment['votes']->positions as $key_vote) {
 
                                 if (isset($policy_last_update[$key_vote['policy_id']]) && $policy_last_update[$key_vote['policy_id']] > $most_recent) {
-                                  $most_recent = $policy_last_update[$key_vote['policy_id']];
+                                    $most_recent = $policy_last_update[$key_vote['policy_id']];
                                 }
 
                                 if ( $key_vote['has_strong'] || $key_vote['position'] == 'has never voted on' ) {
@@ -81,7 +81,7 @@ 
 
                                 include '_vote_description.php';
 
-                              } ?>
+                                } ?>
                             </ul>
 
                             <div class="share-vote-descriptions">

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-include_once INCLUDESPATH . "easyparliament/templates/html/mp/header.php";
+include_once INCLUDESPATH."easyparliament/templates/html/mp/header.php";
 ?>
 
 <div class="full-page">
@@ -63,7 +63,7 @@ 
                                   $most_recent = $policy_last_update[$key_vote['policy_id']];
                                 }
 
-                                if ( $key_vote['has_strong'] || $key_vote['position'] == 'has never voted on' ) {
+                                if ($key_vote['has_strong'] || $key_vote['position'] == 'has never voted on') {
                                     $description = ucfirst($key_vote['desc']);
                                 } else {
                                     $description = sprintf(
@@ -87,7 +87,7 @@ 
                             <div class="share-vote-descriptions">
                                 <p>Share a screenshot of these votes:</p>
 
-                                <a href="#" class="fb-share-button-tracked" data-title="<?= $single_policy_page ? '' : $segment['title'] . ' ' ?><?= $page_title ?>" data-href="<?= $abs_member_url ?>/votes?policy=<?= $segment['key'] ?>" data-image="<?= $abs_member_url ?>/policy_set_png?policy_set=<?= $segment['key'] ?>" "See how <?= $full_name ?> voted on <?= $segment["title"] ?>">Share</a>
+                                <a href="#" class="fb-share-button-tracked" data-title="<?= $single_policy_page ? '' : $segment['title'].' ' ?><?= $page_title ?>" data-href="<?= $abs_member_url ?>/votes?policy=<?= $segment['key'] ?>" data-image="<?= $abs_member_url ?>/policy_set_png?policy_set=<?= $segment['key'] ?>" "See how <?= $full_name ?> voted on <?= $segment["title"] ?>">Share</a>
 
                                 <a class="twitter-share-button" href="https://twitter.com/share" data-size="small" data-url="<?= $abs_member_url ?>/votes?policy=<?= $segment['key'] ?>">Tweet</a>
                                 </div>

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; ?>
 

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 
                 <?php if ($has_voting_record): ?>
 
-                    <?php $displayed_votes = FALSE; ?>
+                    <?php $displayed_votes = false; ?>
 
                     <?php foreach ($key_votes_segments as $segment): ?>
 
@@ -94,7 +94,7 @@ 
                                 <small>Last updated: <?= format_date($most_recent, LONGDATEFORMAT) ?></small>
                             </div>
 
-                            <?php $displayed_votes = TRUE; ?>
+                            <?php $displayed_votes = true; ?>
 
                         <?php endif; ?>
 

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

Indentation +4 added lines, -4 removed lines

@@ -38,11 +38,11 @@ 
                 if ( isset($divisions) && $divisions ) {
                     if ($has_voting_record) {
                         foreach ($divisions as $division) {
-                          $displayed_votes = TRUE;
+                            $displayed_votes = TRUE;
 
-                          if ($current_date != $division['date']) {
+                            if ($current_date != $division['date']) {
                             if ($current_date != '' ) {
-                              print('</ul></div>');
+                                print('</ul></div>');
                             }
                             $current_date = $division['date'];
                             $sidebar_links[] = $division['date'];
@@ -51,7 +51,7 @@ 
                             <h2><?= strftime('%e %b %Y', strtotime($division['date'])) ?></h2>
                              <ul class="vote-descriptions policy-votes">
                           <?php }
-                          include('_division_description.php');
+                            include('_division_description.php');
                         }
                         echo('</div>');
                     }

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-include_once INCLUDESPATH . "easyparliament/templates/html/mp/header.php";
+include_once INCLUDESPATH."easyparliament/templates/html/mp/header.php";
 ?>
 
 <div class="full-page">
@@ -35,13 +35,13 @@ 
                 $current_date = '';
                 $sidebar_links = array();
 
-                if ( isset($divisions) && $divisions ) {
+                if (isset($divisions) && $divisions) {
                     if ($has_voting_record) {
                         foreach ($divisions as $division) {
                           $displayed_votes = TRUE;
 
                           if ($current_date != $division['date']) {
-                            if ($current_date != '' ) {
+                            if ($current_date != '') {
                               print('</ul></div>');
                             }
                             $current_date = $division['date'];
@@ -67,7 +67,7 @@ 
 
             <div class="sidebar__unit in-page-nav">
                 <ul data-magellan-expedition="fixed">
-                  <?php foreach($sidebar_links as $date) { ?>
+                  <?php foreach ($sidebar_links as $date) { ?>
                     <li data-magellan-arrival="<?= strftime('%Y-%m-%d', strtotime($date)) ?>">
                         <a href="#<?= strftime('%Y-%m-%d', strtotime($date)) ?>">
                             <?= strftime('%e %b %Y', strtotime($date)) ?>

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -30,15 +30,15 @@
 
                 <?php
 
-                $displayed_votes = FALSE;
-                $show_all = TRUE;
+                $displayed_votes = false;
+                $show_all = true;
                 $current_date = '';
                 $sidebar_links = array();
 
                 if ( isset($divisions) && $divisions ) {
                     if ($has_voting_record) {
                         foreach ($divisions as $division) {
-                          $displayed_votes = TRUE;
+                          $displayed_votes = true;
 
                           if ($current_date != $division['date']) {
                             if ($current_date != '' ) {