mysociety / theyworkforyou

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

Spacing +20 added lines, -20 removed lines

@@ -26,31 +26,31 @@ 
                           Based on postcode <strong><?= $mp_data['postcode'] ?></strong>
                           <a href="<?= $mp_data['change_url'] ?>">(Change postcode)</a>
                       </p>
-                    <?php if ( isset( $mp_data ) && $type != 'mlas' ) { ?>
-                      <h3>Your <?= $mp_data['former'] ? $mp_data['former'] . ' ' : '' ?><?= $rep_name ?> is</h3>
+                    <?php if (isset($mp_data) && $type != 'mlas') { ?>
+                      <h3>Your <?= $mp_data['former'] ? $mp_data['former'].' ' : '' ?><?= $rep_name ?> is</h3>
                     </div>
                     <a href="<?= $mp_data['mp_url'] ?>" class="people-list__person">
                     <img class="people-list__person__image" src="<?= $mp_data['image'] ?>">
                         <h2 class="people-list__person__name"><?= $mp_data['name'] ?></h2>
                         <p class="people-list__person__memberships">
                         <span class="people-list__person__constituency"><?= $mp_data['constituency'] ?></span>
-                        <span class="people-list__person__party <?= strtolower( $mp_data['party'] ) ?>"><?= $mp_data['party'] ?></span>
+                        <span class="people-list__person__party <?= strtolower($mp_data['party']) ?>"><?= $mp_data['party'] ?></span>
                         </p>
                     </a>
                     <?php }
-                    if ( isset($reps) ) {
-                        if ( isset($mp_data) && $type != 'mlas' ) { ?>
+                    if (isset($reps)) {
+                        if (isset($mp_data) && $type != 'mlas') { ?>
                     <div class="people-list__your-mp__replist-header">
                         <?php } ?>
                       <h3>Your <?=$former ?> <?= $rep_plural == 'MSPs' ? 'regional ' : '' ?><?= $rep_plural ?> are</h3>
                     </div>
-                        <?php foreach ( $reps as $rep ) { ?>
+                        <?php foreach ($reps as $rep) { ?>
                     <a href="<?= $rep['mp_url'] ?>" class="people-list__person">
                     <img class="people-list__person__image" src="<?= $rep['image'] ?>">
                         <h2 class="people-list__person__name"><?= $rep['name'] ?></h2>
                         <p class="people-list__person__memberships">
                         <span class="people-list__person__constituency"><?= $rep['constituency'] ?></span>
-                        <span class="people-list__person__party <?= strtolower( $rep['party'] ) ?>"><?= $rep['party'] ?></span>
+                        <span class="people-list__person__party <?= strtolower($rep['party']) ?>"><?= $rep['party'] ?></span>
                         </p>
                     </a>
                         <?php } ?>
@@ -65,9 +65,9 @@ 
             <div class="search-page__section search-page__section--search">
                 <div class="search-page__section__primary">
                     <p class="search-page-main-inputs">
-                    <?php if ( $type == 'peers' ) { ?>
+                    <?php if ($type == 'peers') { ?>
                         <label for="find-mp-by-name-or-postcode">Find <?= $rep_plural ?> by name:</label>
-                    <?php } elseif ( $type == 'mlas' || $type == 'msps' ) { ?>
+                    <?php } elseif ($type == 'mlas' || $type == 'msps') { ?>
                         <label for="find-mp-by-name-or-postcode">Find your <?= $rep_name ?> by postcode:</label>
                     <?php } else { ?>
                         <label for="find-mp-by-name-or-postcode">Find your <?= $rep_name ?> by name or postcode:</label>
@@ -108,12 +108,12 @@ 
             <div class="search-page__section__primary">
             <h2>All <?= $rep_plural ?></h2>
 
-                <?php if ( $type != 'peers' ) { ?>
+                <?php if ($type != 'peers') { ?>
                 <ul class="search-result-display-options">
-                    <?php if ( $order == 'given_name' ) { ?>
+                    <?php if ($order == 'given_name') { ?>
                     <li><strong>Sorted by</strong> First name</li>
                     <li>Sort by <a href="<?= $urls['by_last'] ?>">Last name</a> / <a href="<?= $urls['by_party'] ?>">Party</a></li>
-                    <?php } else if ( $order == 'party' ) { ?>
+                    <?php } else if ($order == 'party') { ?>
                     <li><strong>Sorted by</strong> Party</li>
                     <li>Sort by <a href="<?= $urls['by_first'] ?>">First name</a> / <a href="<?= $urls['by_last'] ?>">Last name</a></li>
                     <?php } else { ?>
@@ -123,7 +123,7 @@ 
                 </ul>
                 <?php } else { ?>
                 <ul class="search-result-display-options">
-                    <?php if ( $order == 'party' ) { ?>
+                    <?php if ($order == 'party') { ?>
                     <li><strong>Sorted by</strong> Party</li>
                     <li>Sort by <a href="<?= $urls['by_name'] ?>">Name</a></li>
                     <?php } else { ?>
@@ -173,10 +173,10 @@ 
                     }
                 }
                 $initial_link = '';
-                foreach ( $data as $person ) {
+                foreach ($data as $person) {
                     if ($order != 'party') {
-                        $initial = substr( strtoupper($person[$a_to_z_key]), 0, 1);
-                        if ( $initial != $current_initial ) {
+                        $initial = substr(strtoupper($person[$a_to_z_key]), 0, 1);
+                        if ($initial != $current_initial) {
                             $current_initial = $initial;
                             $initial_link = "name=\"$initial\" ";
                         } else {
@@ -188,7 +188,7 @@ 
                 <img class="people-list__person__image" src="<?= $person['image'] ?>">
                         <h2 class="people-list__person__name"><?= ucfirst($person['name']) ?></h2>
                         <p class="people-list__person__memberships">
-                        <?php if ( $person['constituency'] ) { ?>
+                        <?php if ($person['constituency']) { ?>
                         <span class="people-list__person__constituency"><?= $person['constituency'] ?></span>
                         <?php } ?>
                         <span class="people-list__person__party <?= strtolower($person['party']) ?>"><?= $person['party'] ?></span>
@@ -206,7 +206,7 @@ 
                 <a href="<?= $urls['by_csv'] ?>">Download this list as a CSV</a>
                     suitable for Excel
                 </p>
-                <?php if ( $type == 'mps' ) { ?>
+                <?php if ($type == 'mps') { ?>
                 <form method="get" action="<?= $urls['plain'] ?>" class="sidebar-item-with-icon sidebar-item-with-icon--date">
                     <p>
                         Or view a past list
@@ -250,7 +250,7 @@ 
                   })
                 });
                 </script>
-                <?php } else if ( $type == 'msps' ) { ?>
+                <?php } else if ($type == 'msps') { ?>
                     <p class="past-list-dates" id="past-list-dates">
                         <a href="<?= $urls['plain'] ?>?date=2011-05-05">MSPs at 2011 election</a>
                         <a href="<?= $urls['plain'] ?>?date=2007-05-03">MSPs at 2007 election</a>
@@ -264,7 +264,7 @@ 
                     </p>
                 <?php } ?>
 
-                <?php include( dirname(__FILE__) . '/../sidebar/looking_for.php' ) ?>
+                <?php include(dirname(__FILE__).'/../sidebar/looking_for.php') ?>
             </div>
         </div>
 

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

Spacing +11 added lines, -11 removed lines

@@ -45,7 +45,7 @@ 
             <div class="panel panel--flushtop clearfix">
                 <div class="row nested-row">
                     <div class="homepage-in-the-news homepage-content-section">
-                        <?php if ( count($featured) > 0 ) {
+                        <?php if (count($featured) > 0) {
                             include 'homepage/featured.php';
                         } else { ?>
                             No debates found.
@@ -100,14 +100,14 @@ 
                     <div class="homepage-recently homepage-content-section">
                         <h2>Recently in Parliament</h2>
                         <ul class="recently__list"><?php
-                            foreach ( $debates['recent'] as $recent ) {
+                            foreach ($debates['recent'] as $recent) {
                                 include 'homepage/recent-debates.php';
                             }
                         ?></ul>
                     </div>
                     <div class="homepage-upcoming homepage-content-section">
                         <h2>Upcoming</h2>
-                        <?php if ( count($calendar) ) { ?>
+                        <?php if (count($calendar)) { ?>
                         <div class="upcoming__controls">
                             <!--
                                 These controls should make the upcoming section slide to the next day.
@@ -126,25 +126,25 @@ 
                             </div>
                         </div>
                         <?php $first = true; $count = 0;
-                            foreach ( $calendar as $date => $places ) {
+                            foreach ($calendar as $date => $places) {
                                 $count++; ?>
                                 <div class="cal-wrapper <?= $first ? 'visible' : 'hidden' ?>" id="day-<?= $count ?>" data-count="<?= $count ?>" data-date="<?= format_date($date, SHORTDATEFORMAT); ?>">
                                 <?php foreach ($places as $place => $events) { ?>
                                     <?php $first = false; ?>
                                     <h3><?= $place ?></h3>
                                     <ul class="upcoming__list">
-                                        <?php for ( $i = 0; $i < 3; $i++ ) {
-                                            if ( isset( $events[$i] ) ) { ?>
+                                        <?php for ($i = 0; $i < 3; $i++) {
+                                            if (isset($events[$i])) { ?>
                                         <li>
                                             <h4 class="upcoming__title"><a href="<?= $events[$i]['link_external'] ?>"><?= $events[$i]['title'] ?></a></h4>
                                             <p class="meta"><?php
                                                 $meta_items = array();
                                                 $meta_items[] = $events[$i]['debate_type'];
-                                                if( isset($events[$i]['time_start']) && $events[$i]['time_start'] != '00:00:00' ){
+                                                if (isset($events[$i]['time_start']) && $events[$i]['time_start'] != '00:00:00') {
                                                     $times = format_time($events[$i]['time_start'], 'g:i a');
 
-                                                    if( isset($events[$i]['time_end']) && $events[$i]['time_end'] != '00:00:00' ){
-                                                        $times = $times . ' - ' . format_time($events[$i]['time_end'], 'g:i a');
+                                                    if (isset($events[$i]['time_end']) && $events[$i]['time_end'] != '00:00:00') {
+                                                        $times = $times.' - '.format_time($events[$i]['time_end'], 'g:i a');
                                                     }
                                                     $meta_items[] = $times;
                                                 }
@@ -155,7 +155,7 @@ 
                                         <?php } ?>
                                         <?php } ?>
                                     </ul>
-                                    <?php if ( count($events) - 3 > 0 ) { ?>
+                                    <?php if (count($events) - 3 > 0) { ?>
                                     <a href="/calendar/?d=<?= format_date($date, 'Y-m-d') ?>" class="upcoming__more">And <?= count($events) - 3 ?> more</a><!-- (just links to relevant upcoming page) -->
                                     <?php } ?>
                             <?php } ?>
@@ -163,7 +163,7 @@ 
                         <?php } ?>
                         <?php } else {
                             list($recess, $from, $to) = recess_prettify(date('j'), date('n'), date('Y'), 1);
-                            if ( $recess ) { ?>
+                            if ($recess) { ?>
                                 <p>
                                 Parliament is on holiday until <?= format_date($to, LONGERDATEFORMAT) ?>.
                                 Follow us on <a href="https://twitter.com/theyworkforyou">Twitter</a> and you'll

www/includes/easyparliament/templates/html/footer.php

Spacing +5 added lines, -5 removed lines

@@ -84,13 +84,13 @@
         $db->display_total_duration();
 
         $duration = getmicrotime() - STARTTIME;
-        twfy_debug ("TIME", "Total time for page: $duration seconds.");
+        twfy_debug("TIME", "Total time for page: $duration seconds.");
         if (!isset($_SERVER['WINDIR'])) {
             $rusage = getrusage();
-            $duration = $rusage['ru_utime.tv_sec']*1000000 + $rusage['ru_utime.tv_usec'] - STARTTIMEU;
-            twfy_debug ('TIME', "Total user time: $duration microseconds.");
-            $duration = $rusage['ru_stime.tv_sec']*1000000 + $rusage['ru_stime.tv_usec'] - STARTTIMES;
-            twfy_debug ('TIME', "Total system time: $duration microseconds.");
+            $duration = $rusage['ru_utime.tv_sec'] * 1000000 + $rusage['ru_utime.tv_usec'] - STARTTIMEU;
+            twfy_debug('TIME', "Total user time: $duration microseconds.");
+            $duration = $rusage['ru_stime.tv_sec'] * 1000000 + $rusage['ru_stime.tv_usec'] - STARTTIMES;
+            twfy_debug('TIME', "Total system time: $duration microseconds.");
         }
 
 ?>

www/includes/easyparliament/templates/html/static/search_help.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 </li>
 
 <?php
-$user_agent = ( isset( $_SERVER['HTTP_USER_AGENT'] ) ) ? strtolower( $_SERVER['HTTP_USER_AGENT'] ) : '';
+$user_agent = (isset($_SERVER['HTTP_USER_AGENT'])) ? strtolower($_SERVER['HTTP_USER_AGENT']) : '';
 if (stristr($user_agent, 'Firefox/')) {
 ?>
      <li>You can also add TheyWorkForYou to <a href="http://mycroft.mozdev.org/download.html?name=theyworkforyou">Firefox's search box</a>.</li>

www/includes/easyparliament/templates/api/hansard_gid.php

Indentation +1 added lines, -1 removed lines

@@ -67,4 +67,4 @@
     api_output($out);
 } else {
     api_error('Nothing');
-   }
+    }

Spacing +7 added lines, -7 removed lines

@@ -12,16 +12,16 @@ 
 
 $out = array();
 if (isset ($data['rows'])) {
-    for ($i=0; $i<count($data['rows']); $i++) {
+    for ($i = 0; $i < count($data['rows']); $i++) {
         $row = $data['rows'][$i];
         if (count($row) == 0) continue;
         if ($row['htype'] == '12') {
             if (isset($row['speaker']) && count($row['speaker']) > 0) {
                 $speaker = $row['speaker'];
-                if (is_file(BASEDIR . IMAGEPATH . 'mps/' . $speaker['person_id'] . '.jpeg')) {
-                    $row['speaker']['image'] = IMAGEPATH . 'mps/' . $speaker['person_id'] . '.jpeg';
-                } elseif (is_file(BASEDIR . IMAGEPATH . 'mps/' . $speaker['person_id'] . '.jpg')) {
-                    $row['speaker']['image'] = IMAGEPATH . 'mps/' . $speaker['person_id'] . '.jpg';
+                if (is_file(BASEDIR.IMAGEPATH.'mps/'.$speaker['person_id'].'.jpeg')) {
+                    $row['speaker']['image'] = IMAGEPATH.'mps/'.$speaker['person_id'].'.jpeg';
+                } elseif (is_file(BASEDIR.IMAGEPATH.'mps/'.$speaker['person_id'].'.jpg')) {
+                    $row['speaker']['image'] = IMAGEPATH.'mps/'.$speaker['person_id'].'.jpg';
                 }
                 $desc = '';
                 if (isset($speaker['office'])) {
@@ -29,11 +29,11 @@ 
                     foreach ($speaker['office'] as $off) {
                         $desc[] = $off['pretty'];
                     }
-                    $desc = join(', ', $desc) . '; ';
+                    $desc = join(', ', $desc).'; ';
                 }
 
                 if ($speaker['house'] == 1 && $speaker['party'] != 'Speaker' && $speaker['party'] != 'Deputy Speaker' && $speaker['constituency']) {
-                    $desc .= $speaker['constituency'] . ', ';
+                    $desc .= $speaker['constituency'].', ';
                 }
                 $desc .= _htmlentities($speaker['party']);
                 if ($desc) $row['speaker']['desc'] = $desc;

Braces +9 added lines, -4 removed lines

@@ -14,7 +14,9 @@ 
 if (isset ($data['rows'])) {
     for ($i=0; $i<count($data['rows']); $i++) {
         $row = $data['rows'][$i];
-        if (count($row) == 0) continue;
+        if (count($row) == 0) {
+            continue;
+        }
         if ($row['htype'] == '12') {
             if (isset($row['speaker']) && count($row['speaker']) > 0) {
                 $speaker = $row['speaker'];
@@ -36,7 +38,9 @@ 
                     $desc .= $speaker['constituency'] . ', ';
                 }
                 $desc .= _htmlentities($speaker['party']);
-                if ($desc) $row['speaker']['desc'] = $desc;
+                if ($desc) {
+                    $row['speaker']['desc'] = $desc;
+                }
             }
         }
         $out[] = $row;
@@ -52,8 +56,9 @@ 
                 $has_content = false;
             }
             $entry = $row;
-            if (isset($row['excerpt']))
-                $entry['excerpt'] = trim_characters($entry['excerpt'], 0, 200);
+            if (isset($row['excerpt'])) {
+                            $entry['excerpt'] = trim_characters($entry['excerpt'], 0, 200);
+            }
             if ($has_content) {
             } else {
                 unset($entry['listurl']);

www/includes/easyparliament/templates/api/comments.php

Spacing +5 added lines, -5 removed lines

@@ -69,7 +69,7 @@ 
         }
 
         if (isset($comment['comment_id'])) {
-            $id = 'c' . $comment['comment_id'];
+            $id = 'c'.$comment['comment_id'];
         } else {
             $id = '';
         }
@@ -82,7 +82,7 @@ 
         // COMMENT REPORTING LINK.
 
         if (($this_page != 'commentreport' &&
-            $this_page != 'addcomment'  &&
+            $this_page != 'addcomment' &&
             $this_page != 'admin_commentreport')
             && $THEUSER->is_able_to('reportcomment')
             && $THEUSER->user_id() != $comment['user_id']
@@ -98,7 +98,7 @@ 
                 'ret' 	=> $comment['url']
             ));
 
-            $reporthtml = '(<a href="' . $URL->generate() . '" title="Notify moderators that this comment should be deleted">Report this comment</a>)';
+            $reporthtml = '(<a href="'.$URL->generate().'" title="Notify moderators that this comment should be deleted">Report this comment</a>)';
 
         } elseif ($comment['modflagged']) {
             $reporthtml = '(This comment has been reported to moderators)';
@@ -117,11 +117,11 @@ 
         $date = format_date($date, SHORTDATEFORMAT);
         $time = format_time($time, TIMEFORMAT);
         ?>
-                    <p class="credit"><a href="<?php echo $USERURL->generate(); ?>" title="See information about this user"><strong><?php echo _htmlentities($comment['firstname']) .' '. _htmlentities($comment['lastname']); ?></strong></a><br>
+                    <p class="credit"><a href="<?php echo $USERURL->generate(); ?>" title="See information about this user"><strong><?php echo _htmlentities($comment['firstname']).' '._htmlentities($comment['lastname']); ?></strong></a><br>
                     <small>Posted on <?php echo $date;
 
         if (isset($comment['url'])) {
-            print ' <a href="' . $comment['url'] . '" title="Link to this comment">' . $time . '</a>';
+            print ' <a href="'.$comment['url'].'" title="Link to this comment">'.$time.'</a>';
 
         } else {
             // There won't be a URL when we're just previewing a comment.

www/includes/easyparliament/templates/api/comments_user.php

Spacing +4 added lines, -4 removed lines

@@ -39,20 +39,20 @@
 
         // Get the name of the member whose epobject was commented upon (if any).
         if (isset($comment['speaker']) && $comment['speaker']['name'] != '') {
-            $member_name = $comment['speaker']['name'] . ': ';
+            $member_name = $comment['speaker']['name'].': ';
         } else {
             $member_name = '';
         }
 
-        $user_name = _htmlentities($comment['firstname'] . ' ' . $comment['lastname']);
+        $user_name = _htmlentities($comment['firstname'].' '.$comment['lastname']);
 
         // We're grouping things by epobject_id, so we're going to display the number
         // of comments on this epobject.
         $plural = $comment['total_comments'] == 1 ? ' comment' : ' comments';
 
-        echo "\t\t\t\t<p><a href=\"$comment[url]\">$comment[total_comments]$plural</a> to <strong>" . $member_name . $hansardtext . "</strong><br>\n";
+        echo "\t\t\t\t<p><a href=\"$comment[url]\">$comment[total_comments]$plural</a> to <strong>".$member_name.$hansardtext."</strong><br>\n";
         echo "\t\t\t\t<small>(posted on $date)</small><br>\n";
-        echo "\t\t\t\t" . prepare_comment_for_display($comment['body']) . "</p>"; ?>
+        echo "\t\t\t\t".prepare_comment_for_display($comment['body'])."</p>"; ?>
 
 <?php
         $PAGE->stripe_end();

www/includes/easyparliament/templates/api/hansard_date.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 
 if (isset ($data['rows'])) {
     $out = array();
-    for ($i=0; $i<count($data['rows']); $i++) {
+    for ($i = 0; $i < count($data['rows']); $i++) {
         $row = $data['rows'][$i];
 
         if ($row['htype'] == '10' && isset($row['excerpt']) && strstr($row['excerpt'], "was asked&#8212;")) {
@@ -40,7 +40,7 @@ 
         if ($row['htype'] == '10') {
             $out[] = array('entry' => $entry, 'subs' => array());
         } else {
-            $out[sizeof($out)-1]['subs'][] = $entry;
+            $out[sizeof($out) - 1]['subs'][] = $entry;
         }
 
     }

Braces +3 added lines, -2 removed lines

@@ -27,8 +27,9 @@
         }
 
         $entry = $row;
-        if (isset($row['excerpt']))
-            $entry['excerpt'] = trim_characters($entry['excerpt'], 0, 200);
+        if (isset($row['excerpt'])) {
+                    $entry['excerpt'] = trim_characters($entry['excerpt'], 0, 200);
+        }
         if ($has_content) {
         } else {
             unset($entry['listurl']);

www/includes/easyparliament/commentreport.php

Spacing +46 added lines, -46 removed lines

@@ -27,12 +27,12 @@ 
     public $firstname = '';
     public $lastname = '';
     public $body = '';
-    public $reported = NULL;	// datetime
-    public $resolved = NULL; 	// datetime
-    public $resolvedby = ''; 	// user_id
-    public $locked = NULL; 	// datetime
-    public $lockedby = '';		// user_id
-    public $upheld = ''; 		// boolean
+    public $reported = NULL; // datetime
+    public $resolved = NULL; // datetime
+    public $resolvedby = ''; // user_id
+    public $locked = NULL; // datetime
+    public $lockedby = ''; // user_id
+    public $upheld = ''; // boolean
 
     // If the user was logged in, this will be set:
     public $user_id = '';
@@ -40,7 +40,7 @@ 
     public $email = '';
 
 
-    public function __construct($report_id='') {
+    public function __construct($report_id = '') {
         // Pass it a report id and it gets and sets this report's data.
 
         $this->db = new ParlDB;
@@ -50,8 +50,8 @@ 
             $q = $this->db->query("SELECT commentreports.comment_id,
                                     commentreports.user_id,
                                     commentreports.body,
-                                    DATE_FORMAT(commentreports.reported, '" . SHORTDATEFORMAT_SQL . ' ' . TIMEFORMAT_SQL . "') AS reported,
-                                    DATE_FORMAT(commentreports.resolved, '" . SHORTDATEFORMAT_SQL . ' ' . TIMEFORMAT_SQL . "') AS resolved,
+                                    DATE_FORMAT(commentreports.reported, '" . SHORTDATEFORMAT_SQL.' '.TIMEFORMAT_SQL."') AS reported,
+                                    DATE_FORMAT(commentreports.resolved, '" . SHORTDATEFORMAT_SQL.' '.TIMEFORMAT_SQL."') AS resolved,
                                     commentreports.resolvedby,
                                     commentreports.locked,
                                     commentreports.lockedby,
@@ -71,11 +71,11 @@ 
 
             if ($q->rows() > 0) {
                 $this->report_id		= $report_id;
-                $this->comment_id 		= $q->field(0, 'comment_id');
-                $this->body 			= $q->field(0, 'body');
+                $this->comment_id = $q->field(0, 'comment_id');
+                $this->body = $q->field(0, 'body');
                 $this->reported 		= $q->field(0, 'reported');
                 $this->resolved 		= $q->field(0, 'resolved');
-                $this->resolvedby 		= $q->field(0, 'resolvedby');
+                $this->resolvedby = $q->field(0, 'resolvedby');
                 $this->locked 			= $q->field(0, 'locked');
                 $this->lockedby			= $q->field(0, 'lockedby');
                 $this->upheld 			= $q->field(0, 'upheld');
@@ -95,8 +95,8 @@ 
                 $q = $this->db->query("SELECT commentreports.comment_id,
                                     commentreports.user_id,
                                     commentreports.body,
-                                    DATE_FORMAT(commentreports.reported, '" . SHORTDATEFORMAT_SQL . ' ' . TIMEFORMAT_SQL . "') AS reported,
-                                    DATE_FORMAT(commentreports.resolved, '" . SHORTDATEFORMAT_SQL . ' ' . TIMEFORMAT_SQL . "') AS resolved,
+                                    DATE_FORMAT(commentreports.reported, '" . SHORTDATEFORMAT_SQL.' '.TIMEFORMAT_SQL."') AS reported,
+                                    DATE_FORMAT(commentreports.resolved, '" . SHORTDATEFORMAT_SQL.' '.TIMEFORMAT_SQL."') AS resolved,
                                     commentreports.resolvedby,
                                     commentreports.locked,
                                     commentreports.lockedby,
@@ -111,11 +111,11 @@ 
 
                 if ($q->rows() > 0) {
                 $this->report_id		= $report_id;
-                $this->comment_id 		= $q->field(0, 'comment_id');
-                $this->body 			= $q->field(0, 'body');
+                $this->comment_id = $q->field(0, 'comment_id');
+                $this->body = $q->field(0, 'body');
                 $this->reported 		= $q->field(0, 'reported');
                 $this->resolved 		= $q->field(0, 'resolved');
-                $this->resolvedby 		= $q->field(0, 'resolvedby');
+                $this->resolvedby = $q->field(0, 'resolvedby');
                 $this->locked 			= $q->field(0, 'locked');
                 $this->lockedby			= $q->field(0, 'lockedby');
                 $this->upheld 			= $q->field(0, 'upheld');
@@ -131,7 +131,7 @@ 
     public function report_id() { return $this->report_id; }
     public function comment_id() { return $this->comment_id; }
     public function user_id() { return $this->user_id; }
-    public function user_name() { return $this->firstname . ' ' . $this->lastname; }
+    public function user_name() { return $this->firstname.' '.$this->lastname; }
     public function firstname() { return $this->firstname; }
     public function lastname() { return $this->lastname; }
     public function email() { return $this->email; }
@@ -162,7 +162,7 @@ 
         global $THEUSER, $PAGE;
 
         if (!$THEUSER->is_able_to('reportcomment')) {
-            $PAGE->error_message ("Sorry, you are not allowed to post reports.");
+            $PAGE->error_message("Sorry, you are not allowed to post reports.");
             return false;
         }
 
@@ -175,7 +175,7 @@ 
 
             $q = $this->db->query("SELECT report_id
                             FROM	commentreports
-                            WHERE	user_id = '" . $THEUSER->user_id() . "'
+                            WHERE	user_id = '" . $THEUSER->user_id()."'
                             AND		reported + 0 > NOW() - $flood_time_limit");
 
             if ($q->rows() > 0) {
@@ -230,19 +230,19 @@ 
 
         if ($q->success()) {
             // Inserted OK, so set up this object's variables.
-            $this->report_id 	= $q->insert_id();
-            $this->comment_id 	= $COMMENT->comment_id();
-            $this->body			= $body;
-            $this->reported		= $time;
+            $this->report_id = $q->insert_id();
+            $this->comment_id = $COMMENT->comment_id();
+            $this->body = $body;
+            $this->reported = $time;
 
             if ($THEUSER->isloggedin()) {
-                $this->user_id		= $THEUSER->user_id();
+                $this->user_id = $THEUSER->user_id();
                 $this->firstname	= $THEUSER->firstname();
                 $this->lastname		= $THEUSER->lastname();
             } else {
-                $this->email		= $reportdata['email'];
-                $this->firstname 	= $reportdata['firstname'];
-                $this->lastname		= $reportdata['lastname'];
+                $this->email = $reportdata['email'];
+                $this->firstname = $reportdata['firstname'];
+                $this->lastname = $reportdata['lastname'];
             }
 
 
@@ -258,10 +258,10 @@ 
                 'cid'=>$this->comment_id
             ));
 
-            $emailbody = "A new comment report has been filed by " . $this->user_name() . ".\n\n";
-            $emailbody .= "COMMENT:\n" . $COMMENT->body() . "\n\n";
-            $emailbody .= "REPORT:\n" . $this->body . "\n\n";
-            $emailbody .= "To manage this report follow this link: https://" . DOMAIN . $URL->generate('none') . "\n";
+            $emailbody = "A new comment report has been filed by ".$this->user_name().".\n\n";
+            $emailbody .= "COMMENT:\n".$COMMENT->body()."\n\n";
+            $emailbody .= "REPORT:\n".$this->body."\n\n";
+            $emailbody .= "To manage this report follow this link: https://".DOMAIN.$URL->generate('none')."\n";
 
             send_email(REPORTLIST, 'New comment report', $emailbody);
 
@@ -274,14 +274,14 @@ 
                 $email = $this->email();
             }
 
-            $data = array (
+            $data = array(
                 'to' 			=> $email,
                 'template' 		=> 'report_acknowledge'
             );
-            $merge = array (
+            $merge = array(
                 'FIRSTNAME' 	=> $this->firstname(),
                 'LASTNAME' 		=> $this->lastname(),
-                'COMMENTURL' 	=> "https://" . DOMAIN . $COMMENT->url(),
+                'COMMENTURL' 	=> "https://".DOMAIN.$COMMENT->url(),
                 'REPORTBODY' 	=> strip_tags($this->body())
             );
 
@@ -302,7 +302,7 @@ 
         $data = array();
 
         if (is_numeric($this->report_id)) {
-            $data = array (
+            $data = array(
                 'report_id' 	=> $this->report_id(),
                 'comment_id' 	=> $this->comment_id(),
                 'user_id' 		=> $this->user_id(),
@@ -339,10 +339,10 @@ 
         if ($THEUSER->is_able_to('deletecomment')) {
             $time = gmdate("Y-m-d H:i:s");
 
-            $q = $this->db->query ("UPDATE commentreports
+            $q = $this->db->query("UPDATE commentreports
                             SET		locked = '$time',
-                                    lockedby = '" . $THEUSER->user_id() . "'
-                            WHERE	report_id = '" . $this->report_id . "'
+                                    lockedby = '".$THEUSER->user_id()."'
+                            WHERE	report_id = '" . $this->report_id."'
                             ");
 
             if ($q->success()) {
@@ -350,11 +350,11 @@ 
                 $this->lockedby = $THEUSER->user_id();
                 return true;
             } else {
-                $PAGE->error_message ("Sorry, we were unable to lock this report.");
+                $PAGE->error_message("Sorry, we were unable to lock this report.");
                 return false;
             }
         } else {
-            $PAGE->error_message ("You are not authorised to delete annotations.");
+            $PAGE->error_message("You are not authorised to delete annotations.");
             return false;
         }
     }
@@ -363,10 +363,10 @@ 
     public function unlock() {
         // Unlock a comment so it can be examined by someone else.
 
-        $q = $this->db->query ("UPDATE commentreports
+        $q = $this->db->query("UPDATE commentreports
                         SET		locked = NULL,
                                 lockedby = NULL
-                        WHERE	report_id = '" . $this->report_id . "'
+                        WHERE	report_id = '" . $this->report_id."'
                         ");
 
         if ($q->success()) {
@@ -437,16 +437,16 @@ 
 
                     return true;
                 } else {
-                    $PAGE->error_message ("Sorry, we couldn't resolve this report.");
+                    $PAGE->error_message("Sorry, we couldn't resolve this report.");
                     return false;
                 }
             } else {
-                $PAGE->error_message ("This report has already been resolved (on " . $this->resolved . ")");
+                $PAGE->error_message("This report has already been resolved (on ".$this->resolved.")");
                 return false;
             }
 
         } else {
-            $PAGE->error_message ("You are not authorised to resolve reports.");
+            $PAGE->error_message("You are not authorised to resolve reports.");
             return false;
         }
     }

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

@@ -27,10 +27,10 @@ 
     public $firstname = '';
     public $lastname = '';
     public $body = '';
-    public $reported = NULL;	// datetime
-    public $resolved = NULL; 	// datetime
+    public $reported = null;	// datetime
+    public $resolved = null; 	// datetime
     public $resolvedby = ''; 	// user_id
-    public $locked = NULL; 	// datetime
+    public $locked = null; 	// datetime
     public $lockedby = '';		// user_id
     public $upheld = ''; 		// boolean
 
@@ -370,8 +370,8 @@ 
                         ");
 
         if ($q->success()) {
-            $this->locked = NULL;
-            $this->lockedby = NULL;
+            $this->locked = null;
+            $this->lockedby = null;
             return true;
         } else {
             return false;
@@ -431,8 +431,8 @@ 
 
                     $this->resolved = $time;
                     $this->resolvedby = $THEUSER->user_id();
-                    $this->locked = NULL;
-                    $this->lockedby = NULL;
+                    $this->locked = null;
+                    $this->lockedby = null;
                     $this->upheld = $upheld;
 
                     return true;