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 . "'

classes/Memcache.php

Spacing +4 added lines, -4 removed lines

@@ -26,9 +26,9 @@ 
 
     public function set($key, $value, $timeout = 3600) {
         if (class_exists('\Memcached')) {
-            self::$memcache->set(OPTION_TWFY_DB_NAME.':'.$key, $value, $timeout);
+            self::$memcache->set(OPTION_TWFY_DB_NAME . ':' . $key, $value, $timeout);
         } else {
-            self::$memcache->set(OPTION_TWFY_DB_NAME.':'.$key, $value, MEMCACHE_COMPRESSED, $timeout);
+            self::$memcache->set(OPTION_TWFY_DB_NAME . ':' . $key, $value, MEMCACHE_COMPRESSED, $timeout);
         }
     }
 
@@ -36,9 +36,9 @@ 
         // see http://php.net/manual/en/memcache.get.php#112056 for explanation of this
         $was_found = false;
         if (class_exists('\Memcached')) {
-            $value = self::$memcache->get(OPTION_TWFY_DB_NAME.':'.$key, null, $was_found);
+            $value = self::$memcache->get(OPTION_TWFY_DB_NAME . ':' . $key, null, $was_found);
         } else {
-            $value = self::$memcache->get(OPTION_TWFY_DB_NAME.':'.$key, $was_found);
+            $value = self::$memcache->get(OPTION_TWFY_DB_NAME . ':' . $key, $was_found);
         }
         if ($was_found === false) {
             return false; // mmmmm

classes/Utility/Alert.php

Spacing +7 added lines, -7 removed lines

@@ -19,7 +19,7 @@ 
         }
 
         if (!empty($details['pid'])) {
-            $criteria[] = 'speaker:'.$details['pid'];
+            $criteria[] = 'speaker:' . $details['pid'];
         }
 
         $criteria = join(' ', $criteria);
@@ -33,13 +33,13 @@ 
                 ':email' => $email
             ));
         $out = '';
-        for ($i=0; $i<$q->rows(); ++$i) {
+        for ($i = 0; $i < $q->rows(); ++$i) {
             $row = $q->row($i);
-            $criteria = explode(' ',$row['criteria']);
+            $criteria = explode(' ', $row['criteria']);
             $ccc = array();
             $current = true;
             foreach ($criteria as $c) {
-                if (preg_match('#^speaker:(\d+)#',$c,$m)) {
+                if (preg_match('#^speaker:(\d+)#', $c, $m)) {
                     $MEMBER = new \MEMBER(array('person_id'=>$m[1]));
                     $ccc[] = 'spoken by ' . $MEMBER->full_name();
                     if (!$MEMBER->current_member_anywhere()) {
@@ -49,12 +49,12 @@ 
                     $ccc[] = $c;
                 }
             }
-            $criteria = join(' ',$ccc);
+            $criteria = join(' ', $ccc);
             $token = $row['alert_id'] . '-' . $row['registrationtoken'];
-            $action = '<form action="/alert/" method="post"><input type="hidden" name="t" value="'.$token.'">';
+            $action = '<form action="/alert/" method="post"><input type="hidden" name="t" value="' . $token . '">';
             if (!$row['confirmed']) {
                 $action .= '<input type="submit" name="action" value="Confirm">';
-            } elseif ($row['deleted']==2) {
+            } elseif ($row['deleted'] == 2) {
                 $action .= '<input type="submit" name="action" value="Resume">';
             } else {
                 $action .= '<input type="submit" name="action" value="Suspend"> <input type="submit" name="action" value="Delete">';

classes/Utility/Calendar.php

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
         } else {
             $title = $e['title'];
             if ($pid = $e['person_id']) {
-                $MEMBER = new \MEMBER(array( 'person_id' => $pid ));
+                $MEMBER = new \MEMBER(array('person_id' => $pid));
                 $name = $MEMBER->full_name();
                 $title .= " &#8211; <a href='/mp/?p=$pid'>$name</a>";
             }

tests/AcceptApiTest.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/api.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/api.xml');
     }
 
     private function fetch_page($method, $vars = array())

tests/TopicsTest.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/topics.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/topics.xml');
     }
 
     private function fetch_topics_page($vars)

tests/AlertsPageTest.php

Spacing +7 added lines, -7 removed lines

@@ -11,7 +11,7 @@ 
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/alertspage.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/alertspage.xml');
     }
 
     private function fetch_page($vars)
@@ -21,37 +21,37 @@ 
 
     public function testFetchPage()
     {
-        $page = $this->fetch_page( array() );
+        $page = $this->fetch_page(array());
         $this->assertContains('TheyWorkForYou Email Alerts', $page);
     }
 
     public function testKeywordOnly() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'elephant'));
         $this->assertContains('Receive alerts when [elephant] is mentioned', $page);
     }
 
     public function testPostCodeOnly() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'SE17 3HE') );
+        $page = $this->fetch_page(array('alertsearch' => 'SE17 3HE'));
         $this->assertContains('when Mrs Test Current-MP', $page);
     }
 
     public function testPostCodeWithKeyWord()
     {
-        $page = $this->fetch_page( array( 'alertsearch' => 'SE17 3HE elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'SE17 3HE elephant'));
         $this->assertContains('You have used a postcode and something else', $page);
         $this->assertContains('Mentions of [elephant] by Mrs Test Current-MP', $page);
         $this->assertNotContains('by your MSP', $page);
     }
 
     public function testScottishPostcodeWithKeyword() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'PH6 2DB elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'PH6 2DB elephant'));
         $this->assertContains('You have used a postcode and something else', $page);
         $this->assertContains('Mentions of [elephant] by your MP, Mr Test2 Current-MP', $page);
         $this->assertContains('Mentions of [elephant] by your MSP, Mrs Test Current-MSP', $page);
     }
 
     public function testPostcodeAndKeywordWithNoSittingMP() {
-        $page = $this->fetch_page( array( 'alertsearch' => 'OX1 4LF elephant') );
+        $page = $this->fetch_page(array('alertsearch' => 'OX1 4LF elephant'));
         $this->assertContains('You have used a postcode and something else', $page);
         $this->assertNotContains('Did you mean to get alerts for when your MP', $page);
     }

tests/DivisionsTest.php

Spacing +5 added lines, -5 removed lines

@@ -17,17 +17,17 @@ 
     }
 
     private function fetch_division_page() {
-        return $this->fetch_page( array( 'pagetype' => 'divisions', 'pid' => 2, 'policy' => 363, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions' ) );
+        return $this->fetch_page(array('pagetype' => 'divisions', 'pid' => 2, 'policy' => 363, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions'));
     }
 
     private function fetch_mp_recent_page()
     {
-        $vars = array( 'pagetype' => 'recent', 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/recent' );
+        $vars = array('pagetype' => 'recent', 'pid' => 2, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/recent');
         return $this->base_fetch_page($vars, 'mp', 'index.php', '/mp/recent.php');
     }
 
     private function fetch_recent_page() {
-        return $this->base_fetch_page( array('url' => '/divisions' ), 'divisions', 'index.php', '/divisions/index.php' );
+        return $this->base_fetch_page(array('url' => '/divisions'), 'divisions', 'index.php', '/divisions/index.php');
     }
 
 
@@ -113,7 +113,7 @@ 
     }
 
     public function testNotEnoughInfoStatement() {
-        return $this->fetch_page( array( 'pagetype' => 'divisions', 'pid' => 2, 'policy' => 810, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions' ) );
+        return $this->fetch_page(array('pagetype' => 'divisions', 'pid' => 2, 'policy' => 810, 'url' => '/mp/2/test_current-mp/test_westminster_constituency/divisions'));
         $this->assertContains('we don’t have enough information to calculate Test Current-MP’s position', $page);
     }
 
@@ -124,7 +124,7 @@ 
     }
 
     public function testSingleDivision() {
-        $page = $this->base_fetch_page( array('url' => '/divisions/division.php', 'vote' => 'pw-3012-01-01-1-commons' ), 'divisions', 'division.php', '/divisions/division.php' );
+        $page = $this->base_fetch_page(array('url' => '/divisions/division.php', 'vote' => 'pw-3012-01-01-1-commons'), 'divisions', 'division.php', '/divisions/division.php');
         $this->assertContains('A majority of MPs  <b>voted in favour</b> of a thing', $page);
         $this->assertContains('198 for', $page);
         $this->assertContains('98 against', $page);