mysociety / theyworkforyou

scripts/mprss.php

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

@@ -53,7 +53,7 @@
 			$contentencoded = $row['body'];
 				
 			$hdate = format_date($row['hdate'], 'Y-m-d');
-			if ($row['htime'] != NULL) {
+			if ($row['htime'] != null) {
 				$htime = format_time($row['htime'], 'H:i:s');
 			} else {
 				$htime = '00:00:00';

Indentation +44 added lines, -44 removed lines

@@ -22,47 +22,47 @@ 
 foreach ($q as $person) {
     $person_id = $person['person_id'];
 
-	$args = array ( 'person_id' => $person_id );
-	$speeches = $HANSARDLIST->display('person', $args, 'none');
+    $args = array ( 'person_id' => $person_id );
+    $speeches = $HANSARDLIST->display('person', $args, 'none');
 
-	// Some data about this person that we'll need for the feed.
-	$MEMBER = new MEMBER(array('person_id' => $person_id));
-	$MPURL = new \MySociety\TheyWorkForYou\Url('mp');
-	$MPURL->insert(array('pid'=>$person_id));
-	$mpurl = $MPURL->generate();
+    // Some data about this person that we'll need for the feed.
+    $MEMBER = new MEMBER(array('person_id' => $person_id));
+    $MPURL = new \MySociety\TheyWorkForYou\Url('mp');
+    $MPURL->insert(array('pid'=>$person_id));
+    $mpurl = $MPURL->generate();
 
-	$date = gmdate('Y-m-d');
-	$time = gmdate('H:i:s');
-	$datenow = $date . 'T' . $time . '+00:00';
+    $date = gmdate('Y-m-d');
+    $time = gmdate('H:i:s');
+    $datenow = $date . 'T' . $time . '+00:00';
 
-	// Prepare the meat of the RSS file.
-	$items = '';
-	$entries = '';
-	if (isset ($speeches['rows']) && count($speeches['rows']) > 0) {
+    // Prepare the meat of the RSS file.
+    $items = '';
+    $entries = '';
+    if (isset ($speeches['rows']) && count($speeches['rows']) > 0) {
 
-		foreach ($speeches['rows'] as $n => $row) {
+        foreach ($speeches['rows'] as $n => $row) {
 
-			// While we're linking to individual speeches,
-			// the text is the body of the parent, ie (sub)section.
-			$title = _htmlentities(str_replace('—', '-', $row['parent']['body']));
+            // While we're linking to individual speeches,
+            // the text is the body of the parent, ie (sub)section.
+            $title = _htmlentities(str_replace('—', '-', $row['parent']['body']));
 
-			$link = isset($row['listurl']) ? $row['listurl'] : '';
-			$link = 'https://' . DOMAIN . $link;
+            $link = isset($row['listurl']) ? $row['listurl'] : '';
+            $link = 'https://' . DOMAIN . $link;
 
-			$description = _htmlentities(trim_characters($row['body'], 0, 200));
-			$contentencoded = $row['body'];
+            $description = _htmlentities(trim_characters($row['body'], 0, 200));
+            $contentencoded = $row['body'];
 
-			$hdate = format_date($row['hdate'], 'Y-m-d');
-			if ($row['htime'] != NULL) {
-				$htime = format_time($row['htime'], 'H:i:s');
-			} else {
-				$htime = '00:00:00';
-			}
+            $hdate = format_date($row['hdate'], 'Y-m-d');
+            if ($row['htime'] != NULL) {
+                $htime = format_time($row['htime'], 'H:i:s');
+            } else {
+                $htime = '00:00:00';
+            }
 
-			$date = $hdate . 'T' . $htime . '+00:00';
+            $date = $hdate . 'T' . $htime . '+00:00';
 
-			$items .= '<rdf:li rdf:resource="' . $link . '" />' . "\n";
-			$entries .= "<item rdf:about=\"$link\">
+            $items .= '<rdf:li rdf:resource="' . $link . '" />' . "\n";
+            $entries .= "<item rdf:about=\"$link\">
 	<title>$title</title>
 	<link>$link</link>
 	<description>$description</description>
@@ -71,11 +71,11 @@ 
 </item>
 ";
 
-		}
-	}
+        }
+    }
 
-	// Prepare the whole text of the RSS file.
-	$rsstext = '<?xml version="1.0" encoding="utf-8"?>
+    // Prepare the whole text of the RSS file.
+    $rsstext = '<?xml version="1.0" encoding="utf-8"?>
 <rdf:RDF
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -101,15 +101,15 @@ 
 
 </rdf:RDF>';
 
-	// Write the text to the file...
-	$filename = $rsspath . $person_id . '.rdf';
-	$fh = @fopen($filename, "w");
-	if (!$fh) { # Problem writing, just carry on
-		echo "Could not write to file ($filename)\n";
-		continue;
-	}
-	fwrite($fh, $rsstext);
-	fclose ($fh);
+    // Write the text to the file...
+    $filename = $rsspath . $person_id . '.rdf';
+    $fh = @fopen($filename, "w");
+    if (!$fh) { # Problem writing, just carry on
+        echo "Could not write to file ($filename)\n";
+        continue;
+    }
+    fwrite($fh, $rsstext);
+    fclose ($fh);
 }
 
 #print "Took " . (time()-$starttime) . " seconds\n";

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
 $rsspath = BASEDIR . '/rss/mp/';
 
 // Make things group writable.
-umask (002);
+umask(002);
 
 $HANSARDLIST = new HANSARDLIST();
 $db = $HANSARDLIST->db;
@@ -22,7 +22,7 @@ 
 foreach ($q as $person) {
     $person_id = $person['person_id'];
 
-	$args = array ( 'person_id' => $person_id );
+	$args = array('person_id' => $person_id);
 	$speeches = $HANSARDLIST->display('person', $args, 'none');
 
 	// Some data about this person that we'll need for the feed.
@@ -109,7 +109,7 @@ 
 		continue;
 	}
 	fwrite($fh, $rsstext);
-	fclose ($fh);
+	fclose($fh);
 }
 
 #print "Took " . (time()-$starttime) . " seconds\n";

Braces +5 added lines, -2 removed lines

@@ -16,7 +16,9 @@ 
 
 // Get all the person ids we need feeds for...
 $q = $db->query("SELECT person_id FROM member WHERE left_house='9999-12-31'");
-if ($q->rows() <= 0) exit;
+if ($q->rows() <= 0) {
+    exit;
+}
 
 $starttime = time();
 foreach ($q as $person) {
@@ -104,7 +106,8 @@ 
 	// Write the text to the file...
 	$filename = $rsspath . $person_id . '.rdf';
 	$fh = @fopen($filename, "w");
-	if (!$fh) { # Problem writing, just carry on
+	if (!$fh) {
+# Problem writing, just carry on
 		echo "Could not write to file ($filename)\n";
 		continue;
 	}

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

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

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

classes/User.php

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

@@ -12,7 +12,7 @@ 
  */
 
 class User {
-    public function getUserDetails($user_id = False) {
+    public function getUserDetails($user_id = false) {
         global $THEUSER;
 
         $user = $THEUSER;
@@ -250,7 +250,7 @@ 
             }
 
             if ($details['email'] != $THEUSER->email()) {
-                $results['email_changed'] = True;
+                $results['email_changed'] = true;
             }
 
 

Spacing +11 added lines, -11 removed lines

@@ -32,10 +32,10 @@ 
         $data['url'] = $user->url();
         $data['email'] = $user->email();
         $data['optin'] = $user->optin() == true ? "Yes" : "No";
-        $data['postcode']	= $user->postcode();
+        $data['postcode'] = $user->postcode();
         $data['website']	= $user->url();
-        $data['registrationtime']	= $user->registrationtime();
-        $data['status']= $user->status();
+        $data['registrationtime'] = $user->registrationtime();
+        $data['status'] = $user->status();
         $data["deleted"] = $user->deleted();
         $data["confirmed"] = $user->confirmed();
         $data["status"] = $user->status();
@@ -242,10 +242,10 @@ 
         // Who are we updating? $THEUSER or someone else?
         if ($this_page == "otheruseredit") {
             $who = 'the user’s';
-            $success = $THEUSER->update_other_user ( $details );
+            $success = $THEUSER->update_other_user($details);
         } else {
             $who = 'your';
-            $success = $THEUSER->update_self ( $details );
+            $success = $THEUSER->update_self($details);
         }
 
 
@@ -277,12 +277,12 @@ 
         // If this goes well, the user will have their data
         // added to the database and a confirmation email
         // will be sent to them.
-        $success = $THEUSER->add ( $details );
+        $success = $THEUSER->add($details);
 
         $errors = array();
 
         if (!$success) {
-            $errors["db"] = "Sorry, we were unable to create an account for you. Please <a href=\"mailto:". str_replace('@', '&#64;', CONTACTEMAIL) . "\">let us know</a>. Thanks.";
+            $errors["db"] = "Sorry, we were unable to create an account for you. Please <a href=\"mailto:" . str_replace('@', '&#64;', CONTACTEMAIL) . "\">let us know</a>. Thanks.";
         }
 
         return $errors;
@@ -290,7 +290,7 @@ 
 
     public function getRep($cons_type, $mp_house) {
         global $THEUSER;
-        if ( !$THEUSER->has_postcode() ) {
+        if (!$THEUSER->has_postcode()) {
             return array();
         }
 
@@ -303,11 +303,11 @@ 
         // Scottish homepage
         try {
             $constituencies = \MySociety\TheyWorkForYou\Utility\Postcode::postcodeToConstituencies($THEUSER->postcode());
-            if ( isset($constituencies[$cons_type]) ) {
+            if (isset($constituencies[$cons_type])) {
                 $constituency = $constituencies[$cons_type];
                 $MEMBER = new Member(array('constituency'=>$constituency, 'house'=> $mp_house));
             }
-        } catch ( MemberException $e ) {
+        } catch (MemberException $e) {
             return array();
         }
 
@@ -344,7 +344,7 @@ 
         $mreg = array();
         if ($THEUSER->isloggedin() && $THEUSER->postcode() != '' || $THEUSER->postcode_is_set()) {
             $reps = \MySociety\TheyWorkForYou\Member::getRegionalList($THEUSER->postcode, $mp_house, $cons_type);
-            foreach ( $reps as $rep ) {
+            foreach ($reps as $rep) {
                 $member = new \MySociety\TheyWorkForYou\Member(array('person_id' => $rep['person_id']));
                 $mreg[$rep['person_id']] = $this->constructMPData($member, $THEUSER, $mp_house);
             }

www/docs/user/index.php

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

@@ -5,7 +5,7 @@ 
  * page so leave it like that for now.
  */
 
-$new_style_template = TRUE;
+$new_style_template = true;
 
 include_once '../../includes/easyparliament/init.php';
 # need to include this as login code uses error_message
@@ -127,7 +127,7 @@ 
                 $data['errors'] = $results['errors'];
                 $template = 'user/form';
             } else {
-                $data['edited'] = True;
+                $data['edited'] = true;
                 if (isset($results['email_changed'])) {
                     $data['email_changed'] = $results['email_changed'];
                 }

Indentation +3 added lines, -3 removed lines

@@ -107,10 +107,10 @@
 
 // if data has been submitted then handle that
 if (
-      get_http_var("submitted") == "true" && (
+        get_http_var("submitted") == "true" && (
         $this_page == 'useredit' || $this_page == 'otheruseredit' || $this_page == 'userjoin'
-      )
-   ) {
+        )
+    ) {
     // Put all the user-submitted data in an array.
     $data = $user->getUpdateDetails($this_page, $THEUSER);
     $data['ret'] = get_http_var("ret");

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
         // We need a user_id. So make sure that exists.
         // And make sure the user is allowed to do this!
         $template = 'user/form';
-        if (is_numeric( get_http_var("u") ) && $THEUSER->is_able_to("edituser")) {
+        if (is_numeric(get_http_var("u")) && $THEUSER->is_able_to("edituser")) {
 
             $data = $user->getUserDetails(get_http_var('u'));
             $data['showall'] = true;

www/includes/easyparliament/templates/html/user/form.php

Indentation +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
                   <span class="label">Security status:</span>
                   <span class="formw"><select name="status">
                   <?php
-                  foreach ($statuses as $n => $status_name) { ?>
+                    foreach ($statuses as $n => $status_name) { ?>
                     <option value="<?= $status_name ?>"<?= $status_name == $status ? ' selected' : '' ?>>
                       <?= $status_name ?>
                     </option>

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

@@ -38,7 +38,7 @@ 
                 <input type="hidden" name="pg" value="edit">
               </form>
             <?php } else { ?>
-              <?php if (isset($showall) && $showall == True && isset($user_id)) { ?>
+              <?php if (isset($showall) && $showall == true && isset($user_id)) { ?>
               <h1>Edit the user&rsquo;s details</h1>
               <?php } else { ?>
               <h1>Edit your details</h1>
@@ -131,7 +131,7 @@ 
                 <span class="formw"><input type="text" name="url" id="url" value="<?= _htmlentities($url) ?>" maxlength="255" size="20" class="form"> <small>Optional and public</small></span>
                 </div>
 
-                <?php if (isset($showall) && $showall == True) { ?>
+                <?php if (isset($showall) && $showall == true) { ?>
                   <?php if (isset($errors['status'])) { ?>
                   <p class="error">
                       <?= $errors['status'] ?>
@@ -192,7 +192,7 @@ 
                 <input type="hidden" name="submitted" value="true">
                 <input type="hidden" name="pg" value="<?= _htmlentities($pg) ?>">
 
-                <?php if (isset($showall) && $showall == True && isset($user_id)) { ?>
+                <?php if (isset($showall) && $showall == true && isset($user_id)) { ?>
                     <input type="hidden" name="u" value="<?= _htmlentities($user_id) ?>">
                 <?php } ?>
 

www/includes/easyparliament/templates/html/user/index.php

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

@@ -12,7 +12,7 @@
           <h1>Your details</h1>
           <?php if (isset($edited)) { ?>
             <p>
-              <strong>have been updated<?= isset($email_changed) && $email_changed == True ? " and we&rsquo;ve sent a confirmation email to your new email address" : '' ?>.</strong>
+              <strong>have been updated<?= isset($email_changed) && $email_changed == true ? " and we&rsquo;ve sent a confirmation email to your new email address" : '' ?>.</strong>
             </p>
           <?php } else { ?>
           <p>

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 
           <div class="row">
             <span class="label">Website</span>
-            <span class="formw"><?= $website == '' ? 'none' : '<a rel="nofollow" href="' . _htmlentities($website) . '">'. _htmlentities($website) . '</a>' ?></span>
+            <span class="formw"><?= $website == '' ? 'none' : '<a rel="nofollow" href="' . _htmlentities($website) . '">' . _htmlentities($website) . '</a>' ?></span>
           </div>
 
           <?php if ($facebook_user) { ?>