mysociety / theyworkforyou

www/docs/topic/index.php

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

@@ -7,7 +7,7 @@
 namespace MySociety\TheyWorkForYou;
 
 // Disable the old PAGE class.
-$new_style_template = TRUE;
+$new_style_template = true;
 global $this_page;
 $this_page = 'topics';
 

www/docs/topic/image.php

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

@@ -8,7 +8,7 @@
     $topic = $topics->getTopic($slug);
 }
 
-if (!$slug || !isset($topic) || $topic === NULL) {
+if (!$slug || !isset($topic) || $topic === null) {
     header('HTTP/1.0 404 Not Found');
     exit();
 }

www/docs/admin/featured.php

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

@@ -107,13 +107,13 @@ 
     $related2 = get_http_var('related2');
     $related3 = get_http_var('related3');
 
-    $gid = $url ? get_gid_from_url($url) : NULL;
-    $related_gid1 = $related1 ? get_gid_from_url($related1) : NULL;
-    $related_gid2 = $related2 ? get_gid_from_url($related2) : NULL;
-    $related_gid3 = $related3 ? get_gid_from_url($related3) : NULL;
+    $gid = $url ? get_gid_from_url($url) : null;
+    $related_gid1 = $related1 ? get_gid_from_url($related1) : null;
+    $related_gid2 = $related2 ? get_gid_from_url($related2) : null;
+    $related_gid3 = $related3 ? get_gid_from_url($related3) : null;
 
     print "<h2>Preview Content</h2>";
-    if ( $gid !== NULL ) {
+    if ( $gid !== null ) {
         $h = new MySociety\TheyWorkForYou\Homepage;
         $featured = $h->getFeaturedDebate($gid, $title, $context, array( $related_gid1, $related_gid2, $related_gid3 ));
 
@@ -153,7 +153,7 @@ 
 }
 
 function get_gid_from_url($url) {
-    $gid = NULL;
+    $gid = null;
     $parts = parse_url($url);
     parse_str($parts['query'], $query);
 

Spacing +7 added lines, -7 removed lines

@@ -12,7 +12,7 @@ 
 $out = '';
 if (get_http_var('preview')) {
     preview_featured();
-} else if ( get_http_var('confirm') ) {
+} else if (get_http_var('confirm')) {
     $out = update_featured();
 }
 
@@ -23,13 +23,13 @@ 
 print '</div>';
 
 function gid_to_url($gid) {
-    if ( !$gid ) {
+    if (!$gid) {
         return '';
     }
     global $hansardmajors;
     global $db;
 
-    $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", array( ':gid' => $gid ));
+    $q = $db->query("SELECT major FROM hansard WHERE gid = :gid", array(':gid' => $gid));
     $url_gid = fix_gid_from_db($gid);
     $url = new \URL($hansardmajors[$q->field(0, 'major')]['page']);
     $url->insert(array('id' => $url_gid));
@@ -43,7 +43,7 @@ 
     $related = $featured->get_related();
     $context = $featured->get_context();
 
-    if ( get_http_var('url') ) {
+    if (get_http_var('url')) {
         $url = get_http_var('url');
         $title = get_http_var('title');
         $context = get_http_var('context');
@@ -113,9 +113,9 @@ 
     $related_gid3 = $related3 ? get_gid_from_url($related3) : NULL;
 
     print "<h2>Preview Content</h2>";
-    if ( $gid !== NULL ) {
+    if ($gid !== NULL) {
         $h = new MySociety\TheyWorkForYou\Homepage;
-        $featured = $h->getFeaturedDebate($gid, $title, $context, array( $related_gid1, $related_gid2, $related_gid3 ));
+        $featured = $h->getFeaturedDebate($gid, $title, $context, array($related_gid1, $related_gid2, $related_gid3));
 
         include INCLUDESPATH . 'easyparliament/templates/html/homepage/featured.php';
     } else {
@@ -157,7 +157,7 @@ 
     $parts = parse_url($url);
     parse_str($parts['query'], $query);
 
-    if ( $query['id'] ) {
+    if ($query['id']) {
         if (strpos($parts['path'], 'lords') !== false) {
             $gid = 'uk.org.publicwhip/lords/';
         } elseif (strpos($parts['path'], 'whall') !== false) {

Braces +10 added lines, -5 removed lines

@@ -12,7 +12,8 @@ 
 $out = '';
 if (get_http_var('preview')) {
     preview_featured();
-} else if ( get_http_var('confirm') ) {
+}
+else if ( get_http_var('confirm') ) {
     $out = update_featured();
 }
 
@@ -50,7 +51,8 @@ 
         $related1 = get_http_var('related1');
         $related2 = get_http_var('related2');
         $related3 = get_http_var('related3');
-    } else {
+    }
+    else {
         $url = gid_to_url($gid);
         $related1 = gid_to_url($related[0]);
         $related2 = gid_to_url($related[1]);
@@ -118,7 +120,8 @@ 
         $featured = $h->getFeaturedDebate($gid, $title, $context, array( $related_gid1, $related_gid2, $related_gid3 ));
 
         include INCLUDESPATH . 'easyparliament/templates/html/homepage/featured.php';
-    } else {
+    }
+    else {
         print "<p>A random debate from the last 7 days will be displayed</p>";
     }
 
@@ -160,9 +163,11 @@ 
     if ( $query['id'] ) {
         if (strpos($parts['path'], 'lords') !== false) {
             $gid = 'uk.org.publicwhip/lords/';
-        } elseif (strpos($parts['path'], 'whall') !== false) {
+        }
+        elseif (strpos($parts['path'], 'whall') !== false) {
             $gid = 'uk.org.publicwhip/westminhall/';
-        } else {
+        }
+        else {
             $gid = 'uk.org.publicwhip/debate/';
         }
         $gid .= $query['id'];

www/docs/admin/photos.php

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

@@ -139,7 +139,7 @@ 
 </form>
 
 <p style="clear:both; margin-top: 3em"><a href="/images/mps/photo-status.php">List MPs without photos</a></p>
-EOF;
+eof;
 
     return $out;
 }
@@ -193,7 +193,7 @@ 
     <span class="formw"><input type="submit" name="submit" value="Update attribution"></span>
 </div>
 </form>
-EOF;
+eof;
 
     return $out;
 }

Spacing +2 added lines, -2 removed lines

@@ -94,7 +94,7 @@ 
 
     $houses = array(1 => 'MP', 'Lord', 'MLA', 'MSP');
 
-    for ($i=0; $i<$q->rows(); $i++) {
+    for ($i = 0; $i < $q->rows(); $i++) {
         $p_id = $q->field($i, 'person_id');
         $house = $q->field($i, 'house');
         $desc = member_full_name($house, $q->field($i, 'title'), $q->field($i, 'given_name'), $q->field($i, 'family_name'), $q->field($i, 'lordofname')) .
@@ -112,7 +112,7 @@ 
         } else {
             $desc .= ' [no photo]';
         }
-        $out .= '<option value="'.$p_id.'">'.$desc.'</option>' . "\n";
+        $out .= '<option value="' . $p_id . '">' . $desc . '</option>' . "\n";
     }
 
     $out .= ' </select></span> </div> ';

Braces +45 added lines, -28 removed lines

@@ -26,7 +26,8 @@ 
 $out = '';
 if (get_http_var('submit')) {
     $out = DEVSITE ? submit_photo() : submit_attribution();
-} else {
+}
+else {
     $out = DEVSITE ? display_photo_form() : display_attribution_form();
 }
 print $out;
@@ -36,28 +37,36 @@ 
     $pid = intval(get_http_var('pid'));
     $errors = array();
 
-    if (!array_key_exists('photo', $_FILES))
-        array_push($errors, 'Not got the photo.');
-    elseif ($_FILES['photo']['error'] > 0)
-        array_push($errors, 'There was an error uploading the photo.');
-    elseif (!is_uploaded_file($_FILES['photo']['tmp_name']))
-        array_push($errors, 'Did not get an uploaded file.');
+    if (!array_key_exists('photo', $_FILES)) {
+            array_push($errors, 'Not got the photo.');
+    }
+    elseif ($_FILES['photo']['error'] > 0) {
+            array_push($errors, 'There was an error uploading the photo.');
+    }
+    elseif (!is_uploaded_file($_FILES['photo']['tmp_name'])) {
+            array_push($errors, 'Did not get an uploaded file.');
+    }
     else {
         $tmp_name = $_FILES['photo']['tmp_name'];
 
         $image = new Imagick();
         $image->readImage($tmp_name);
-        if (!$image)
-            array_push($errors, 'Failed to read image from uploaded file');
+        if (!$image) {
+                    array_push($errors, 'Failed to read image from uploaded file');
+        }
             $imageS = clone $image;
-        if (!$image->scaleImage(0, 118))
-            array_push($errors, 'Scaling large failed');
-        if (!$imageS->scaleImage(0, 59))
-            array_push($errors, 'Scaling small failed');
-        if (!$image->writeImage("$dir/mpsL/$pid.jpeg"))
-            array_push($errors, "Saving to $dir/mpsL/$pid.jpeg failed");
-        if (!$imageS->writeImage("$dir/mps/$pid.jpeg"))
-            array_push($errors, "Saving to $dir/mps/$pid.jpeg failed");
+        if (!$image->scaleImage(0, 118)) {
+                    array_push($errors, 'Scaling large failed');
+        }
+        if (!$imageS->scaleImage(0, 59)) {
+                    array_push($errors, 'Scaling small failed');
+        }
+        if (!$image->writeImage("$dir/mpsL/$pid.jpeg")) {
+                    array_push($errors, "Saving to $dir/mpsL/$pid.jpeg failed");
+        }
+        if (!$imageS->writeImage("$dir/mps/$pid.jpeg")) {
+                    array_push($errors, "Saving to $dir/mps/$pid.jpeg failed");
+        }
         if (!$errors) {
             print "<pre>";
             chdir($dir);
@@ -70,8 +79,9 @@ 
         }
     }
 
-    if ($errors)
-        return display_photo_form($errors);
+    if ($errors) {
+            return display_photo_form($errors);
+    }
     return "<p><em>Photo uploaded and resized for pid $pid</em> &mdash; check how it looks <a href=\"/mp?p=$pid\">on their page</a></p>" . display_photo_form();
 }
 
@@ -99,7 +109,9 @@ 
         $house = $q->field($i, 'house');
         $desc = member_full_name($house, $q->field($i, 'title'), $q->field($i, 'given_name'), $q->field($i, 'family_name'), $q->field($i, 'lordofname')) .
                 " " . $houses[$house];
-        if ($q->field($i, 'party')) $desc .= ' (' . $q->field($i, 'party') . ')';
+        if ($q->field($i, 'party')) {
+            $desc .= ' (' . $q->field($i, 'party') . ')';
+        }
         if ($q->field($i, 'constituency')) {
             $desc .= ', ' . $q->field($i, 'constituency');
         }
@@ -107,9 +119,11 @@ 
         list($dummy, $sz) = MySociety\TheyWorkForYou\Utility\Member::findMemberImage($p_id);
         if ($sz == 'L') {
             $desc .= ' [has large photo]';
-        } elseif ($sz == 'S') {
+        }
+        elseif ($sz == 'S') {
             $desc .= ' [has small photo]';
-        } else {
+        }
+        else {
             $desc .= ' [no photo]';
         }
         $out .= '<option value="'.$p_id.'">'.$desc.'</option>' . "\n";
@@ -150,13 +164,16 @@ 
     $attr_link = get_http_var('attr_link');
     $errors = array();
 
-    if (!$pid || !$attr_text)
-        array_push($errors, 'Missing information');
-    elseif ($attr_link && substr($attr_link, 0, 4) != 'http')
-        array_push($errors, 'Bad link');
+    if (!$pid || !$attr_text) {
+            array_push($errors, 'Missing information');
+    }
+    elseif ($attr_link && substr($attr_link, 0, 4) != 'http') {
+            array_push($errors, 'Bad link');
+    }
 
-    if ($errors)
-        return display_attribution_form($errors);
+    if ($errors) {
+            return display_attribution_form($errors);
+    }
 
     # UPDATE
     global $db;

www/docs/section.php

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

@@ -13,7 +13,7 @@
 }
 
 if ($type = ucfirst(get_http_var('type'))) {
-    $class_name = "MySociety\TheyWorkForYou\SectionView\\${type}View";
+    $class_name = "MySociety\TheyWorkForYou\SectionView\\${type}view";
     $view = new $class_name();
     $data = $view->display();
     if ($data) {

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     $view = new $class_name();
     $data = $view->display();
     if ($data) {
-        if ( !empty($data['template']) ) {
+        if (!empty($data['template'])) {
             $template = $data['template'];
         } else {
             $template = 'section/section';

Braces +2 added lines, -1 removed lines

@@ -19,7 +19,8 @@
     if ($data) {
         if ( !empty($data['template']) ) {
             $template = $data['template'];
-        } else {
+        }
+        else {
             $template = 'section/section';
         }
         MySociety\TheyWorkForYou\Renderer::output($template, $data);

scripts/populate-policy-images.php

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

@@ -46,7 +46,7 @@
 }
 
 $count = 0;
-while ( ( $policy = fgetcsv($file) ) !== FALSE ) {
+while ( ( $policy = fgetcsv($file) ) !== false ) {
     if ( intval($policy[0]) ) {
         $policy_id = $policy[0];
         $img_id = $policy[1] ? $policy[1] : $policy_id;

Spacing +4 added lines, -4 removed lines

@@ -33,7 +33,7 @@ 
     exit(1);
 }
 
-if ( !file_exists($csvfile) ) {
+if (!file_exists($csvfile)) {
     print "$csvfile cannot be found\n";
     exit(1);
 }
@@ -46,8 +46,8 @@ 
 }
 
 $count = 0;
-while ( ( $policy = fgetcsv($file) ) !== FALSE ) {
-    if ( intval($policy[0]) ) {
+while (($policy = fgetcsv($file)) !== FALSE) {
+    if (intval($policy[0])) {
         $policy_id = $policy[0];
         $img_id = $policy[1] ? $policy[1] : $policy_id;
         $title = $policy[2];
@@ -69,7 +69,7 @@ 
                 ':image_attribution' => $attribution,
                 ':license_url' => $licence_url)
         );
-        if ( $q->success() ) {
+        if ($q->success()) {
             $count += $q->affected_rows();
         } else {
             print "failed to update data for $policy_id\n";

Braces +2 added lines, -1 removed lines

@@ -71,7 +71,8 @@
         );
         if ( $q->success() ) {
             $count += $q->affected_rows();
-        } else {
+        }
+        else {
             print "failed to update data for $policy_id\n";
         }
     }

tests/Bootstrap.php

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

@@ -8,9 +8,9 @@ 
 // Test to make sure we have the test DB environment variables. If not, this isn't testing, so abort.
 // Define the DB connection constants before we do anything else.
 if (
-    isset($_SERVER['TWFY_TEST_DB_HOST']) AND
-    isset($_SERVER['TWFY_TEST_DB_USER']) AND
-    isset($_SERVER['TWFY_TEST_DB_PASS']) AND
+    isset($_SERVER['TWFY_TEST_DB_HOST']) and
+    isset($_SERVER['TWFY_TEST_DB_USER']) and
+    isset($_SERVER['TWFY_TEST_DB_PASS']) and
     isset($_SERVER['TWFY_TEST_DB_NAME'])
 ) {
 
@@ -37,7 +37,7 @@ 
 }
 
 // Explicitly declare we're in testing (avoids trying deploy-only things)
-define('TESTING', TRUE);
+define('TESTING', true);
 
 // Load up the init script (handles the rest of the config, DB connection etc)
 include_once('www/includes/easyparliament/init.php');

Spacing +2 added lines, -2 removed lines

@@ -21,13 +21,13 @@
     define('OPTION_TWFY_DB_NAME', $_SERVER['TWFY_TEST_DB_NAME']);
     
     // Define the base directory
-    define ("BASEDIR", dirname(__FILE__) . '/../www/docs'); 
+    define("BASEDIR", dirname(__FILE__) . '/../www/docs'); 
 
     # point to the default mapit
     define('OPTION_MAPIT_URL', 'https://mapit.mysociety.org/');
 
     // If there isn't a config file (most likely this is running an automated test) copy one in.
-    if ( ! file_exists(dirname(__FILE__) . '/../conf/general')) {
+    if (!file_exists(dirname(__FILE__) . '/../conf/general')) {
         copy(dirname(__FILE__) . '/../conf/general-example', dirname(__FILE__) . '/../conf/general');
     }
 

Braces +2 added lines, -1 removed lines

@@ -31,7 +31,8 @@
         copy(dirname(__FILE__) . '/../conf/general-example', dirname(__FILE__) . '/../conf/general');
     }
 
-} else {
+}
+else {
     echo "Testing environment variables not set. This will cause bad things to happen if testing happens on production. Aborting.\n";
     exit(1);
 }

www/docs/alert/update-mp/index.php

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

@@ -1,6 +1,6 @@
 <?php
 
-$new_style_template = TRUE;
+$new_style_template = true;
 
 include_once '../../../includes/easyparliament/init.php';
 include_once INCLUDESPATH . 'easyparliament/member.php';

www/docs/user/login/fb.php

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

@@ -9,7 +9,7 @@
     If the input is not OK, the form is displayed again with error messages.
 */
 
-$new_style_template = TRUE;
+$new_style_template = true;
 
 include_once '../../../includes/easyparliament/init.php';
 # need to include this as login code uses error_message

Indentation +3 added lines, -3 removed lines

@@ -27,11 +27,11 @@
 
 $data['fb_login_url'] = $login->getLoginURL();
 if (isset($data['token'])) {
-  $success = $login->loginUser($data['token']);
-  if (!$success) {
+    $success = $login->loginUser($data['token']);
+    if (!$success) {
     $data['error'] = 'Could not login using Facebook token';
     \MySociety\TheyWorkForYou\Renderer::output('login/facebook', $data);
-  }
+    }
 } else {
     \MySociety\TheyWorkForYou\Renderer::output('login/facebook', $data);
 }

Braces +2 added lines, -1 removed lines

@@ -32,6 +32,7 @@
     $data['error'] = 'Could not login using Facebook token';
     \MySociety\TheyWorkForYou\Renderer::output('login/facebook', $data);
   }
-} else {
+}
+else {
     \MySociety\TheyWorkForYou\Renderer::output('login/facebook', $data);
 }