mysociety / theyworkforyou

classes/SectionView/PbcView.php

Spacing +6 added lines, -6 removed lines

@@ -42,12 +42,12 @@ 
 
         if ($bill_id && $id) {
             return $this->display_section_or_speech(array(
-                'gid' => $standingprefix . $id,
+                'gid' => $standingprefix.$id,
             ));
         } elseif ($bill_id) {
             # Display the page for a particular bill
             $this_page = 'pbc_bill';
-            $args = array (
+            $args = array(
                 'id' => $bill_id,
                 'title' => $this->bill,
                 'session' => $this->session,
@@ -60,13 +60,13 @@ 
         } elseif ($this->session && $this->bill) {
             # Illegal bill title, redirect to session page
             $URL = new \MySociety\TheyWorkForYou\Url('pbc_session');
-            header('Location: ' . $URL->generate() . urlencode($this->session));
+            header('Location: '.$URL->generate().urlencode($this->session));
             exit;
         } elseif ($this->session) {
             # Display the bills for a particular session
             $this_page = 'pbc_session';
             $DATA->set_page_metadata($this_page, 'title', "Session $this->session");
-            $args = array (
+            $args = array(
                 'session' => $this->session,
             );
             $data = array();
@@ -88,12 +88,12 @@ 
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'pbc' )
+            array('section' => 'pbc')
         );
     }
 
     protected function front_content() {
-        return $this->list->display( 'recent_pbc_debates', array( 'num' => 50 ), 'none' );
+        return $this->list->display('recent_pbc_debates', array('num' => 50), 'none');
     }
 
     protected function display_front() {

classes/SectionView/NiView.php

Spacing +8 added lines, -8 removed lines

@@ -32,7 +32,7 @@ 
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'ni' )
+            array('section' => 'ni')
         );
     }
 
@@ -52,23 +52,23 @@ 
 
         $debates = $DEBATELIST->display('recent_debates', array('days' => 30, 'num' => 6), 'none');
         $MOREURL = new \MySociety\TheyWorkForYou\Url('nidebatesfront');
-        $MOREURL->insert( array( 'more' => 1 ) );
+        $MOREURL->insert(array('more' => 1));
 
         // this makes sure that we don't repeat this debate in the list below
         $random_debate = NULL;
-        if ( isset($debates['data']) && count($debates['data']) ) {
+        if (isset($debates['data']) && count($debates['data'])) {
             $random_debate = $debates['data'][0];
         }
 
         $recent = array();
-        if ( isset($debates['data']) && count($debates['data']) ) {
+        if (isset($debates['data']) && count($debates['data'])) {
             // at the start of a session there may be less than 6
             // debates
             $max = 6;
-            if ( count($debates['data']) < 6 ) {
+            if (count($debates['data']) < 6) {
                 $max = count($debates['data']);
             }
-            for ( $i = 1; $i < $max; $i++ ) {
+            for ($i = 1; $i < $max; $i++) {
                 $debate = $debates['data'][$i];
                 $debate['desc'] = "Northern Ireland Assembly debates";
                 $debate['more_url'] = $MOREURL->generate();
@@ -77,7 +77,7 @@ 
         }
 
         $featured = array();
-        if ( $random_debate ) {
+        if ($random_debate) {
             $featured = $random_debate;
             $featured['more_url'] = $MOREURL->generate();
             $featured['desc'] = 'Northern Ireland Assembly debate';
@@ -86,7 +86,7 @@ 
         }
 
         $data['featured'] = $featured;
-        $data['debates'] = array( 'recent' => $recent);
+        $data['debates'] = array('recent' => $recent);
 
         $data['regional'] = $this->getMLAList();
         $data['template'] = 'ni/index';

www/docs/admin/glossary_pending.php

Spacing +10 added lines, -10 removed lines

@@ -8,7 +8,7 @@ 
 
 $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'];
@@ -93,7 +93,7 @@ 
 
     // Wiki woo!
     // We need to work out how best to work this...
-    $wiki_link = _htmlspecialchars("http://en.wikipedia.org/wiki/" . strtr($title, " ", "_"));
+    $wiki_link = _htmlspecialchars("http://en.wikipedia.org/wiki/".strtr($title, " ", "_"));
 ?>
         <p>Guessing the wikipedia link - give it a go:<br>
         <a href="<?php echo $wiki_link; ?>" target="_blank"><?php echo $wiki_link; ?></a></p>
@@ -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')
@@ -125,7 +125,7 @@ 
     }
 
     if ($EDITQUEUE->pending_count) {
-        print "<h3>" . $EDITQUEUE->pending_count . " Pending Glossary terms</h3>";
+        print "<h3>".$EDITQUEUE->pending_count." Pending Glossary terms</h3>";
         $EDITQUEUE->display("pending");
     }
     else {

www/docs/admin/glossary.php

Spacing +5 added lines, -5 removed lines

@@ -8,7 +8,7 @@ 
 
 $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
     );

classes/EditQueue.php

Spacing +19 added lines, -19 removed lines

@@ -86,11 +86,11 @@ 
                         (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()) {
@@ -137,10 +137,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()) {
@@ -159,14 +159,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;
@@ -178,11 +178,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;
             }
@@ -221,10 +221,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;
             }
@@ -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();

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

classes/GlossaryEditQueue.php

Spacing +8 added lines, -8 removed lines

@@ -44,10 +44,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...
@@ -61,11 +61,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 +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]);
             }

classes/Url.php

Doc Comments +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
     /**
      * Remove Session Key/Value Pair
      *
-     * @param array $arr A list array of key names to remove
+     * @param string[] $arr A list array of key names to remove
      */
 
     public function remove($arr) {

Spacing +9 added lines, -9 removed lines

@@ -42,7 +42,7 @@ 
 
         // These stores an associative array of key/value pairs that
         // we'll want passed on to other pages.
-        $this->session_vars = array ();
+        $this->session_vars = array();
 
         // Prevent things using $DATA running if it hasn't been set, ie in testing
         if (isset($DATA)) {
@@ -93,7 +93,7 @@ 
 
     public function reset() {
         // Call this to remove all the session_vars.
-        $this->session_vars = array ();
+        $this->session_vars = array();
     }
 
     /**
@@ -162,30 +162,30 @@ 
      *                            override just one or two of them.
      */
 
-    public function generate($encode = "html", $overrideVars=array()) {
+    public function generate($encode = "html", $overrideVars = array()) {
 
         global $DATA;
 
-        $url_args = array ();
+        $url_args = array();
 
         foreach (array_merge($this->session_vars, $overrideVars) as $key => $var) {
             if (is_array($var)) {
                 foreach ($var as $v) {
-                    $url_args[] = "$key=" . urlencode(stripslashes($v));
+                    $url_args[] = "$key=".urlencode(stripslashes($v));
                 }
             } elseif ($var != null)
-                $url_args[] = "$key=" . urlencode(stripslashes($var));
+                $url_args[] = "$key=".urlencode(stripslashes($var));
         }
 
-        $page_url = WEBPATH . $DATA->page_metadata($this->destinationpage, "url");
+        $page_url = WEBPATH.$DATA->page_metadata($this->destinationpage, "url");
 
         if (sizeof($url_args) == 0) {
             return $page_url;
         } else {
             if ($encode == "html") {
-                return $page_url . "?" . implode("&", $url_args);
+                return $page_url."?".implode("&", $url_args);
             } elseif ($encode == "none" || $encode == "url") {
-                return $page_url . "?" . implode("&", $url_args);
+                return $page_url."?".implode("&", $url_args);
             }
         }
     }