mysociety / theyworkforyou

www/includes/easyparliament/searchlog.php

Braces +2 added lines, -1 removed lines

@@ -36,7 +36,8 @@
     public function add($searchlogdata) {
 
         $ip = getenv('REMOTE_ADDR');
-        if (preg_match('#66\.249\.(6[4-9]|[78]\d|9[0-5])\.#', $ip)) { # Googlebot
+        if (preg_match('#66\.249\.(6[4-9]|[78]\d|9[0-5])\.#', $ip)) {
+# Googlebot
             return;
         }
         if (isset($_SERVER['HTTP_USER_AGENT']) && preg_match('#simplepie|bot#i', $_SERVER['HTTP_USER_AGENT'])) {

Spacing +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
     // Select popular queries
     public function popular_recent($count, $max_chars = null) {
 
-        $q =  $this->db->query("SELECT query_string, count(*) AS c FROM search_query_log
+        $q = $this->db->query("SELECT query_string, count(*) AS c FROM search_query_log
                 WHERE count_hits != 0 AND query_string != 'twat'
            AND query_string != 'suffragettes' AND page_number=1
                 AND query_time > date_sub(NOW(), INTERVAL 1 DAY)
@@ -124,7 +124,7 @@ 
         $rowarray['query'] = $query;
         $rowarray['visible_name'] = $visible_name;
         $rowarray['url'] = $url;
-        $rowarray['display'] = '<a href="' . $url . '">' . ($htmlescape ? _htmlentities($visible_name) : $visible_name). '</a>';
+        $rowarray['display'] = '<a href="' . $url . '">' . ($htmlescape ? _htmlentities($visible_name) : $visible_name) . '</a>';
 
         return $rowarray;
     }
@@ -143,7 +143,7 @@ 
 
     public function admin_popular_searches($count) {
 
-        $q =  $this->db->query("SELECT query_string, count(*) AS c FROM search_query_log
+        $q = $this->db->query("SELECT query_string, count(*) AS c FROM search_query_log
                 WHERE count_hits != 0 AND query_string NOT LIKE '%speaker:%'
                 AND query_time > date_sub(NOW(), INTERVAL 30 DAY)
                 GROUP BY query_string ORDER BY c desc LIMIT $count;");

www/docs/user/prompt/index.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 $anchor = '#addcomment';
 
 $URL = new \MySociety\TheyWorkForYou\Url('userjoin');
-$URL->insert(array('ret'=>$returl.$anchor));
+$URL->insert(array('ret'=>$returl . $anchor));
 $joinurl = $URL->generate();
 
 

www/docs/index-election.php

Spacing +4 added lines, -4 removed lines

@@ -72,7 +72,7 @@ 
 $HANSARDURL = new \MySociety\TheyWorkForYou\Url('hansard');
 $MPURL = new \MySociety\TheyWorkForYou\Url('yourmp');
 
-$PAGE->block_start(array ('id'=>'intro', 'title'=>'Election special! Find out how they performed for YOU:'));
+$PAGE->block_start(array('id'=>'intro', 'title'=>'Election special! Find out how they performed for YOU:'));
 ?>
                         <ol>
 
@@ -89,7 +89,7 @@ 
     } else {
         $CHANGEURL = new \MySociety\TheyWorkForYou\Url('userchangepc');
     }
-    $MEMBER = new MEMBER(array ('postcode'=>$THEUSER->postcode(), 'house'=>1));
+    $MEMBER = new MEMBER(array('postcode'=>$THEUSER->postcode(), 'house'=>1));
     $mpname = $MEMBER->full_name();
     ?>
       <p><a href="<?php echo $MPURL->generate(); ?>"><strong>Find out more about how <?php echo $mpname; ?>, your ex-MP, represented you over the last parliament</strong></a><br>
@@ -185,11 +185,11 @@ 
 //$PAGE->block_end();
 
 $PAGE->stripe_end(array(
-    array (
+    array(
         'type' => 'include',
         'content' => 'whatisthissite'
     ),
-    array (
+    array(
         'type' => 'include',
         'content' => 'sitenews_recent'
     )

classes/Renderer.php

Spacing +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
         $user = new Renderer\User();
         $data = array_merge($user->data, $data);
 
-        if ( isset($page_errors) ) {
+        if (isset($page_errors)) {
             $data['page_errors'] = $page_errors;
         }
 
@@ -95,14 +95,14 @@ 
 
     private static function addCommonURLs($data) {
         $urls = array();
-        if ( isset($data['urls']) ) {
+        if (isset($data['urls'])) {
             $urls = $data['urls'];
         }
 
         $common_urls = array('search', 'alert');
 
-        foreach ( $common_urls as $path ) {
-            if (!isset($urls[$path]) ) {
+        foreach ($common_urls as $path) {
+            if (!isset($urls[$path])) {
                 $url = new Url($path);
                 $urls[$path] = $url->generate();
             }

classes/Url.php

Spacing +4 added lines, -4 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,11 +162,11 @@ 
      *                            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)) {

classes/GlossaryEditQueue.php

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/Policies.php

Braces +2 added lines, -4 removed lines

@@ -366,14 +366,12 @@
     public function limitToSet($set) {
 
         // Sanity check the set exists
-        if (isset($this->sets[$set]))
-        {
+        if (isset($this->sets[$set])) {
             $out = array();
             // Reassemble the new policies list based on the set.
             foreach ($this->sets[$set] as $set_policy)
             {
-                if (isset($this->policies[$set_policy]))
-                {
+                if (isset($this->policies[$set_policy])) {
                     $out[$set_policy] = $this->policies[$set_policy];
                 } else {
                     // if we've limited the policies to a single one then we only

Indentation +12 added lines, -12 removed lines

@@ -397,18 +397,18 @@
     }
 
     public function limitToArray($policies) {
-          $out = array();
-          // Reassemble the new policies list based on the set.
-          foreach ($policies as $policy) {
-              if (isset($this->policies[$policy])) {
-                  $out[$policy] = $this->policies[$policy];
-              }
-          }
-
-          $new_policies = new self();
-          $new_policies->policies = $out;
-
-          return $new_policies;
+            $out = array();
+            // Reassemble the new policies list based on the set.
+            foreach ($policies as $policy) {
+                if (isset($this->policies[$policy])) {
+                    $out[$policy] = $this->policies[$policy];
+                }
+            }
+
+            $new_policies = new self();
+            $new_policies->policies = $out;
+
+            return $new_policies;
     }
 
     public function getPolicyDetails($policyID) {

Spacing +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
 
         $this->all_policy_agreements = $policy_data['agreements'] ?? [];
 
-        if ( $policy_id ) {
+        if ($policy_id) {
             $this->policy_id = $policy_id;
             $this->policies = array(
                 $policy_id => $this->policies[$policy_id]
@@ -145,7 +145,7 @@ 
                     // want to complain here if we're looking for that policy and
                     // it does not exist. Otherwise, if the single policy isn't in
                     // the set we want to return an empty set
-                    if ( !isset($this->policy_id) || $set_policy == $this->policy_id ) {
+                    if (!isset($this->policy_id) || $set_policy == $this->policy_id) {
                         throw new \Exception ('Policy ' . $set_policy . ' in set "' . $set . '" does not exist.');
                     }
                 }
@@ -198,7 +198,7 @@ 
 
         $image = $q['image'];
 
-        if ( $image && file_exists(BASEDIR . '/' . $image)) {
+        if ($image && file_exists(BASEDIR . '/' . $image)) {
             $props['image'] = $image;
             $props['image_license'] = $q['image_license'];
             $props['image_attribution'] = $q['image_attrib'];

www/docs/admin/profile-message.php

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

@@ -91,6 +91,6 @@
     <span class="formw"><input type="submit" name="submit" value="Update"></span>
 </div>
 </form>
-EOF;
+eof;
     return $out;
 }

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
         if ($row['constituency']) {
             $desc .= ', ' . $row['constituency'];
         }
-        $out .= '<option value="'.$p_id.'">'.$desc.'</option>' . "\n";
+        $out .= '<option value="' . $p_id . '">' . $desc . '</option>' . "\n";
     }
 
     $out .= ' </select></span> </div> ';

tests/AlertsTest.php

Spacing +4 added lines, -4 removed lines

@@ -11,7 +11,7 @@ 
      */
     public function getDataSet()
     {
-        return $this->createMySQLXMLDataSet(dirname(__FILE__).'/_fixtures/alerts.xml');
+        return $this->createMySQLXMLDataSet(dirname(__FILE__) . '/_fixtures/alerts.xml');
     }
 
     /**
@@ -31,7 +31,7 @@ 
     {
         $ALERT = new ALERT();
 
-        $response = $ALERT->fetch(0,0);
+        $response = $ALERT->fetch(0, 0);
 
         // Make sure we only get one response
         $this->assertEquals(1, count($response['data']));
@@ -48,7 +48,7 @@ 
     {
         $ALERT = new ALERT();
 
-        $response = $ALERT->fetch(1,0);
+        $response = $ALERT->fetch(1, 0);
 
         // Make sure we only get two responses
         $this->assertEquals(2, count($response['data']));
@@ -65,7 +65,7 @@ 
     {
         $ALERT = new ALERT();
 
-        $response = $ALERT->fetch_between(1,0, '2014-02-03', '2014-02-04');
+        $response = $ALERT->fetch_between(1, 0, '2014-02-03', '2014-02-04');
 
         // Make sure we only get one response
         $this->assertEquals(1, count($response['alerts']));