mysociety / theyworkforyou

www/docs/admin/edittopic.php

Indentation +19 added lines, -19 removed lines

@@ -11,34 +11,34 @@ 
 
 $slug = get_http_var('id');
 if ($slug) {
-  $topic = $topics->getTopic($slug);
+    $topic = $topics->getTopic($slug);
 } else {
-  $topic = new \MySociety\TheyWorkForYou\Topic();
+    $topic = new \MySociety\TheyWorkForYou\Topic();
 }
 
 $action = get_http_var('action');
 switch ($action) {
     case 'add':
       $success = add_topic($topic);
-      break;
+        break;
     case 'update':
       $success = update_topic($topic);
-      break;
+        break;
     case 'setimage':
       $success = add_image($topic);
-      break;
+        break;
     case 'addcontent':
       $success = add_content($topic);
-      break;
+        break;
     case 'deletecontent':
       $success = delete_content($topic);
-      break;
+        break;
     case 'addpolicysets':
       $success = add_policy_sets($topic);
-      break;
+        break;
     case 'addpolicies':
       $success = add_policies($topic);
-      break;
+        break;
     default:
       $success = NULL;
 }
@@ -125,10 +125,10 @@ 
             <select name="sets[]" multiple>
               <option value="">None</option>
             <?php
-              $policies = new \MySociety\TheyWorkForYou\Policies;
-              $set_descriptions = $policies->getSetDescriptions();
-              $related_sets = $topic->getPolicySets();
-              foreach ($set_descriptions as $set => $description) { ?>
+                $policies = new \MySociety\TheyWorkForYou\Policies;
+                $set_descriptions = $policies->getSetDescriptions();
+                $related_sets = $topic->getPolicySets();
+                foreach ($set_descriptions as $set => $description) { ?>
               <option value="<?= $set ?>" <?= in_array($set, $related_sets) ? 'selected' : '' ?>><?= $description ?></option>
             <?php } ?>
             <input type="submit" value="Update">
@@ -143,10 +143,10 @@ 
             <select name="policies[]" multiple>
               <option value="">None</option>
             <?php
-              $policies = new \MySociety\TheyWorkForYou\Policies;
-              $all_policies = $policies->getPolicies();
-              $related_policies = $topic->getPolicies();
-              foreach ($all_policies as $number => $description) { ?>
+                $policies = new \MySociety\TheyWorkForYou\Policies;
+                $all_policies = $policies->getPolicies();
+                $related_policies = $topic->getPolicies();
+                foreach ($all_policies as $number => $description) { ?>
               <option value="<?= $number ?>" <?= in_array($number, $related_policies) ? 'selected' : '' ?>><?= $description ?></option>
             <?php } ?>
 
@@ -214,9 +214,9 @@ 
             $file_info['tmp_name'],
             $topic->image_path()
         );
-     } catch (ErrorException $e) {
+        } catch (ErrorException $e) {
         return false;
-     }
+        }
 
     if ($image_saved) {
         return $topic->save();

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

@@ -40,7 +40,7 @@
       $success = add_policies($topic);
       break;
     default:
-      $success = NULL;
+      $success = null;
 }
 
 if (!is_null($success)) {

www/docs/admin/failedsearches.php

Spacing +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
     $max_time = relative_time($row['max_time']);
     $min_time = str_replace(" ago", "", $min_time);
     $max_time = str_replace(" ago", "", $max_time);
-    $rows[] = array (
+    $rows[] = array(
         $row['count_ips'],
         $row['group_count'],
         '<a href="'.$row['url'].'">'._htmlentities($row['query']).'</a>',
@@ -29,8 +29,8 @@ 
     );
 }
 
-$tabledata = array (
-    'header' => array (
+$tabledata = array(
+    'header' => array(
         'Distinct IPs',
         'Number of times',
         'Query',

www/docs/admin/popularsearches.php

Spacing +4 added lines, -4 removed lines

@@ -14,14 +14,14 @@
 
 $rows = array();
 foreach ($search_popular as $row) {
-    $rows[] = array (
-        '<a href="'.$row['url'].'">' . _htmlentities($row['query']) . '</a>',
+    $rows[] = array(
+        '<a href="'.$row['url'].'">'._htmlentities($row['query']).'</a>',
         $row['c'],
     );
 }
 
-$tabledata = array (
-    'header' => array (
+$tabledata = array(
+    'header' => array(
         'Query',
         'Count'
     ),

www/docs/admin/alert_stats.php

Spacing +18 added lines, -18 removed lines

@@ -7,7 +7,7 @@ 
 
 $PAGE->page_start();
 $PAGE->stripe_start();
-$PAGE->block_start(array ('id'=>'alerts', 'title'=>'Alert Statistics'));
+$PAGE->block_start(array('id'=>'alerts', 'title'=>'Alert Statistics'));
 $db = new ParlDB;
 
 $q_confirmed = $db->query('select count(*) as c from alerts where confirmed and not deleted');
@@ -18,13 +18,13 @@ 
 
 print '<h3>Headline stats</h3> <table>';
 $data = array(
-    'header' => array( 'Alert Type', 'Count' ),
+    'header' => array('Alert Type', 'Count'),
     'rows' => array(
-        array( 'Confirmed', $q_confirmed->field('0', 'c') ),
-        array( 'Not Confirmed', $q_not_confirmed->field('0', 'c') ),
-        array( 'Deleted', $q_deleted->field('0', 'c') ),
-        array( 'For a Speaker<sup>*</sup>', $q_speaker->field('0', 'c') ),
-        array( 'For a Keyword', $q_keyword->field('0', 'c') ),
+        array('Confirmed', $q_confirmed->field('0', 'c')),
+        array('Not Confirmed', $q_not_confirmed->field('0', 'c')),
+        array('Deleted', $q_deleted->field('0', 'c')),
+        array('For a Speaker<sup>*</sup>', $q_speaker->field('0', 'c')),
+        array('For a Keyword', $q_keyword->field('0', 'c')),
     )
 );
 
@@ -35,17 +35,17 @@ 
 $q = $db->query('select alert_id, criteria from alerts where criteria not like "%speaker:%" and criteria like "%,%" and confirmed and not deleted');
 print '<h3>People who probably wanted separate signups</h3>';
 $rows = array();
-for ($i=0; $i<$q->rows(); $i++) {
+for ($i = 0; $i < $q->rows(); $i++) {
     $id = $q->field($i, 'alert_id');
     $criteria = $q->field($i, 'criteria');
     $rows[] = array($id, $critera);
 }
-$data = array( 'rows' => $rows );
+$data = array('rows' => $rows);
 $PAGE->display_table($data);
 
 $q = $db->query('select count(*) as c, criteria from alerts where criteria like "speaker:%" and confirmed and not deleted group by criteria order by c desc');
 $tots = array(); $name = array();
-for ($i=0; $i<$q->rows(); $i++) {
+for ($i = 0; $i < $q->rows(); $i++) {
     $c = $q->field($i, 'c');
     $criteria = $q->field($i, 'criteria');
     if (!preg_match('#^speaker:(\d+)#', $criteria, $m)) continue;
@@ -59,7 +59,7 @@ 
 }
 $q = $db->query('select count(*) as c, criteria from alerts where criteria like "speaker:%" and not confirmed group by criteria order by c desc');
 $unconfirmed = array();
-for ($i=0; $i<$q->rows(); $i++) {
+for ($i = 0; $i < $q->rows(); $i++) {
     $c = $q->field($i, 'c');
     $criteria = $q->field($i, 'criteria');
     if (!preg_match('#^speaker:(\d+)#', $criteria, $m)) continue;
@@ -70,15 +70,15 @@ 
     }
 }
 
-$people_header = array( 'Name', 'Confirmed', 'Unconfirmed');
+$people_header = array('Name', 'Confirmed', 'Unconfirmed');
 print '<h3>Alert signups by MP/Peer</h3>';
 $rows = array();
 foreach ($tots as $person_id => $c) {
     $u = isset($unconfirmed[$person_id]) ? $unconfirmed[$person_id] : 0;
-    $rows[] = array( $name[$person_id], $c, $u );
+    $rows[] = array($name[$person_id], $c, $u);
 }
 $data = array(
-    'header' => array( 'Name', 'Confirmed', 'Unconfirmed'),
+    'header' => array('Name', 'Confirmed', 'Unconfirmed'),
     'rows' => $rows
 );
 $PAGE->display_table($data);
@@ -87,14 +87,14 @@ 
 $confirmed = array();
 $total = array();
 $q = $db->query("select count(*) as c, criteria from alerts where criteria not like '%speaker:%' and confirmed and not deleted group by criteria having c>1 order by c desc");
-for ($i=0; $i<$q->rows(); $i++) {
+for ($i = 0; $i < $q->rows(); $i++) {
     $c = $q->field($i, 'c');
     $criteria = $q->field($i, 'criteria');
     $confirmed[$criteria] = $c;
     $total[$criteria] = 1;
 }
 $q = $db->query("select count(*) as c, criteria from alerts where criteria not like '%speaker:%' and not confirmed group by criteria having c>1 order by c desc");
-for ($i=0; $i<$q->rows(); $i++) {
+for ($i = 0; $i < $q->rows(); $i++) {
     $c = $q->field($i, 'c');
     $criteria = $q->field($i, 'criteria');
     $unconfirmed[$criteria] = $c;
@@ -105,10 +105,10 @@ 
 foreach ($total as $criteria => $tot) {
     $c = isset($confirmed[$criteria]) ? $confirmed[$criteria] : 0;
     $u = isset($unconfirmed[$criteria]) ? $unconfirmed[$criteria] : 0;
-    $rows[] = array( $criteria, $c, $u );
+    $rows[] = array($criteria, $c, $u);
 }
 $data = array(
-    'header' => array( 'Criteria', 'Confirmed', 'Unconfirmed'),
+    'header' => array('Criteria', 'Confirmed', 'Unconfirmed'),
     'rows' => $rows
 );
 $PAGE->display_table($data);

Braces +12 added lines, -4 removed lines

@@ -48,11 +48,15 @@ 
 for ($i=0; $i<$q->rows(); $i++) {
     $c = $q->field($i, 'c');
     $criteria = $q->field($i, 'criteria');
-    if (!preg_match('#^speaker:(\d+)#', $criteria, $m)) continue;
+    if (!preg_match('#^speaker:(\d+)#', $criteria, $m)) {
+        continue;
+    }
     $person_id = $m[1];
     $MEMBER = new MEMBER(array('person_id'=>$person_id));
     if ($MEMBER->valid) {
-        if (!array_key_exists($person_id, $tots)) $tots[$person_id] = 0;
+        if (!array_key_exists($person_id, $tots)) {
+            $tots[$person_id] = 0;
+        }
         $tots[$person_id] += $c;
         $name[$person_id] = $MEMBER->full_name();
     }
@@ -62,10 +66,14 @@ 
 for ($i=0; $i<$q->rows(); $i++) {
     $c = $q->field($i, 'c');
     $criteria = $q->field($i, 'criteria');
-    if (!preg_match('#^speaker:(\d+)#', $criteria, $m)) continue;
+    if (!preg_match('#^speaker:(\d+)#', $criteria, $m)) {
+        continue;
+    }
     $person_id = $m[1];
     if (isset($name[$person_id])) {
-        if (!array_key_exists($person_id, $unconfirmed)) $unconfirmed[$person_id] = 0;
+        if (!array_key_exists($person_id, $unconfirmed)) {
+            $unconfirmed[$person_id] = 0;
+        }
         $unconfirmed[$person_id] += $c;
     }
 }

www/docs/admin/featured.php

Spacing +9 added lines, -9 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,11 +113,11 @@ 
     $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';
+        include INCLUDESPATH.'easyparliament/templates/html/homepage/featured.php';
     } else {
         print "<p>A random debate from the last 7 days will be displayed</p>";
     }
@@ -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) {
@@ -186,7 +186,7 @@ 
     $featured->set_related(array($related1, $related2, $related3));
 
     $out = "<h4>update successful</h4>";
-    $out .= "<p>Title set to " . _htmlspecialchars($title) . " and gid to " . _htmlspecialchars($gid) . "</p>";
+    $out .= "<p>Title set to "._htmlspecialchars($title)." and gid to "._htmlspecialchars($gid)."</p>";
 
     return $out;
 }

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

www/docs/admin/banner.php

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
     $out = '<form action="banner.php" method="post">';
     $out .= '<input name="action" type="hidden" value="Save">';
     $out .= '<p><label for="banner">Contents (HTML permitted)</label><br>';
-    $out .= '<textarea id="banner_text" name="banner" rows="5" cols="80">' . htmlentities($text) . "</textarea></p>\n";
+    $out .= '<textarea id="banner_text" name="banner" rows="5" cols="80">'.htmlentities($text)."</textarea></p>\n";
     $out .= '<span class="formw"><input type="button" id="preview" value="Preview"> <input name="btnaction" type="submit" value="Save"></span>';
     $out .= '</form>';
 
@@ -61,7 +61,7 @@ 
     global $banner;
     $banner_text = get_http_var('banner');
 
-    if ( $banner->set_text($banner_text) ) {
+    if ($banner->set_text($banner_text)) {
         $out = "<h4>update successful</h4>";
         $out .= "<p>Banner text is now:</p><p>$banner_text</p>";
     } else {

www/docs/admin/badusers.php

Spacing +12 added lines, -12 removed lines

@@ -32,18 +32,18 @@ 
 $rows = array();
 $USERURL = new URL('userview');
 
-for ($row=0; $row<$q->rows(); $row++) {
+for ($row = 0; $row < $q->rows(); $row++) {
 
     $user_id = $q->field($row, 'user_id');
 
     // Get the total comments posted for this user.
     $r = $db->query("SELECT COUNT(*) AS totalcount
                     FROM	comments
-                    WHERE	user_id = '" . $user_id . "'");
+                    WHERE	user_id = '" . $user_id."'");
 
     $totalcomments = $r->field(0, 'totalcount');
 
-    $percentagedeleted = ( $q->field($row, 'deletedcount') / $totalcomments ) * 100;
+    $percentagedeleted = ($q->field($row, 'deletedcount') / $totalcomments) * 100;
 
 
     // Get complaints made about this user's comments, but not upheld.
@@ -59,8 +59,8 @@ 
 
     $USERURL->insert(array('u'=>$user_id));
 
-    $rows[] = array (
-        '<a href="' . $USERURL->generate() . '">' . $q->field($row, 'firstname') . ' ' . $q->field($row, 'lastname') . '</a>',
+    $rows[] = array(
+        '<a href="'.$USERURL->generate().'">'.$q->field($row, 'firstname').' '.$q->field($row, 'lastname').'</a>',
         $totalcomments,
         $q->field($row, 'deletedcount'),
         $percentagedeleted.'%',
@@ -68,8 +68,8 @@ 
     );
 }
 
-$tabledata = array (
-    'header' => array (
+$tabledata = array(
+    'header' => array(
         'Name',
         'Total comments',
         'Number deleted',
@@ -105,7 +105,7 @@ 
 $rows = array();
 $USERURL = new URL('userview');
 
-for ($row=0; $row<$q->rows(); $row++) {
+for ($row = 0; $row < $q->rows(); $row++) {
 
     $user_id = $q->field($row, 'user_id');
 
@@ -117,15 +117,15 @@ 
                     WHERE	user_id = '$user_id'
                     AND		upheld = '1'");
 
-    $rows[] = array (
-        '<a href="' . $USERURL->generate() . '">' . $q->field($row, 'firstname') . ' ' . $q->field($row, 'lastname') . '</a>',
+    $rows[] = array(
+        '<a href="'.$USERURL->generate().'">'.$q->field($row, 'firstname').' '.$q->field($row, 'lastname').'</a>',
         $q->field($row, 'rejectedcount'),
         $r->field(0, 'upheldcount')
     );
 
 }
-$tabledata = array (
-    'header' => array (
+$tabledata = array(
+    'header' => array(
         'Name',
         'Reports not upheld',
         'Reports upheld'

www/docs/admin/reporting_stats.php

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
 
 $PAGE->page_start();
 $PAGE->stripe_start();
-$PAGE->block_start(array ('id'=>'alerts', 'title'=>'Reporting Statistics'));
+$PAGE->block_start(array('id'=>'alerts', 'title'=>'Reporting Statistics'));
 $db = new ParlDB;
 $q = $db->query('select year(created) as the_year, month(created) as the_month, count(*) as c from alerts where confirmed and not deleted group by year(created) desc, month(created) desc');
 print '<h3>Alert signups per month</h3> <table>';
@@ -16,7 +16,7 @@ 
 print '<thead><tr><th>Year</th><th style="padding-right: 15px;">Month</th><th>Sign Ups</th><tr></thead>';
 
 $row_count = $q->rows();
-for ($i=0; $i<$row_count; $i++) {
+for ($i = 0; $i < $row_count; $i++) {
     $year = $q->field($i, 'the_year');
     $month = $q->field($i, 'the_month');
     $count = $q->field($i, 'c');

www/docs/admin/websites.php

Spacing +12 added lines, -12 removed lines

@@ -3,7 +3,7 @@ 
 include_once '../../includes/easyparliament/init.php';
 #include_once INCLUDESPATH . 'easyparliament/commentreportlist.php';
 #include_once INCLUDESPATH . 'easyparliament/searchengine.php';
-include_once INCLUDESPATH . 'easyparliament/member.php';
+include_once INCLUDESPATH.'easyparliament/member.php';
 #include_once INCLUDESPATH . 'easyparliament/people.php';
 
 $this_page = 'admin_mpurls';
@@ -54,10 +54,10 @@ 
 
         $out = "<h3>Edit person: $name</h3>\n";
 
-        $out .= '<form action="websites.php?editperson=' . $q->field($row, 'person_id') . '" method="post">';
+        $out .= '<form action="websites.php?editperson='.$q->field($row, 'person_id').'" method="post">';
         $out .= '<input name="action" type="hidden" value="SaveURL">';
         $out .= '<label for="url">URL:</label>';
-        $out .= '<span class="formw"><input id="url" name="url" type="text"  size="60" value="' . $q->field($row, 'mp_website') . '"></span>' . "\n";
+        $out .= '<span class="formw"><input id="url" name="url" type="text"  size="60" value="'.$q->field($row, 'mp_website').'"></span>'."\n";
         $out .= '<span class="formw"><input name="btnaction" type="submit" value="Save URL"></span>';
         $out .= '</form>';
     }
@@ -83,15 +83,15 @@ 
         $out .= '<li>';
         $name = member_full_name($q->field($row, 'house'), $q->field($row, 'title'), $q->field($row, 'given_name'), $q->field($row, 'family_name'), $q->field($row, 'lordofname'));
         $mp_website = $q->field($row, 'data_value');
-        $out .= ' <small>[<a href="websites.php?editperson=' . $q->field($row, 'person_id') . '"';
+        $out .= ' <small>[<a href="websites.php?editperson='.$q->field($row, 'person_id').'"';
         if ($mp_website) {
-            $out .= ' title="Change URL ' . $mp_website . '">Edit URL</a>]</small>';
+            $out .= ' title="Change URL '.$mp_website.'">Edit URL</a>]</small>';
         } else {
             $out .= '>Add URL</a>]</small>';
         }
-        $out .= ' ' . $name;
+        $out .= ' '.$name;
         if ($q->field($row, 'constituency')) {
-            $out .= ' (' . $q->field($row, 'constituency') . ')';
+            $out .= ' ('.$q->field($row, 'constituency').')';
         }
         $out .= "</li>\n";
     }
@@ -107,7 +107,7 @@ 
     $sysretval = 0;
     $personid = get_http_var('editperson');
 
-    $q  = $db->query("DELETE FROM personinfo WHERE data_key = 'mp_website' AND personinfo.person_id = :person_id", array(
+    $q = $db->query("DELETE FROM personinfo WHERE data_key = 'mp_website' AND personinfo.person_id = :person_id", array(
         ':person_id' => $personid
         ));
 
@@ -119,9 +119,9 @@ 
     }
 
     if ($q->success()) {
-        exec($scriptpath . "/db2xml.pl --update_person --personid=" . escapeshellarg($personid) . " --debug", $exec_output);
+        exec($scriptpath."/db2xml.pl --update_person --personid=".escapeshellarg($personid)." --debug", $exec_output);
         $out = '<p id="warning">';
-        foreach ($exec_output as $message) {$out .= $message . "<br>";}
+        foreach ($exec_output as $message) {$out .= $message."<br>"; }
         $out .= '</p>';
         # ../../../scripts/db2xml.pl  --update_person --personid=10001
     }
@@ -140,9 +140,9 @@ 
 
     $rettext .= '<div id="subnav_websites">';
     foreach ($subnav as $label => $path) {
-        $rettext .=  '<a href="'. $path . '">'. $label .'</a>';
+        $rettext .= '<a href="'.$path.'">'.$label.'</a>';
     }
-    $rettext .=  '</div>';
+    $rettext .= '</div>';
 
     return $rettext;
 }