mysociety / theyworkforyou

classes/Search/Normal.php

Braces +3 added lines, -1 removed lines

@@ -141,7 +141,9 @@
 
     private function find_members() {
         $searchstring = trim(preg_replace('#-?[a-z]+:[a-z0-9]+#', '', $this->searchstring));
-        if (!$searchstring) return array();
+        if (!$searchstring) {
+            return array();
+        }
 
         $members = array();
 

Spacing +23 added lines, -23 removed lines

@@ -12,12 +12,12 @@ 
         }
 
         $o = get_http_var('o');
-        $args = array (
+        $args = array(
             's' => $this->searchstring,
             'p' => $pagenum,
             'num' => get_http_var('num'),
             'pop' => get_http_var('pop'),
-            'o' => ($o=='d' || $o=='r' || $o=='o') ? $o : 'd',
+            'o' => ($o == 'd' || $o == 'r' || $o == 'o') ? $o : 'd',
         );
 
         return $args;
@@ -55,9 +55,9 @@ 
         }
 
         $sort_order = 'newest';
-        if ( $args['o'] == 'o' ) {
+        if ($args['o'] == 'o') {
             $sort_order = 'oldest';
-        } else if ( $args['o'] == 'r' ) {
+        } else if ($args['o'] == 'r') {
             $sort_order = 'relevance';
         }
 
@@ -73,7 +73,7 @@ 
             return array('error' => $SEARCHENGINE->error);
         } else {
             $LIST = new \HANSARDLIST();
-            $data = $LIST->display('search', $args , 'none');
+            $data = $LIST->display('search', $args, 'none');
             $data['search_type'] = 'normal';
             $data['sort_order'] = $sort_order;
             $data['members'] = $members;
@@ -93,10 +93,10 @@ 
             return false;
         }
 
-        list ($constituencies, ) = \MySociety\TheyWorkForYou\Utility\Search::searchConstituenciesByQuery($searchterm);
+        list ($constituencies,) = \MySociety\TheyWorkForYou\Utility\Search::searchConstituenciesByQuery($searchterm);
 
         $constituency = "";
-        if (count($constituencies)==1) {
+        if (count($constituencies) == 1) {
             $constituency = $constituencies[0];
         }
 
@@ -112,12 +112,12 @@ 
 
                 $MEMBER = new \MySociety\TheyWorkForYou\Member(array('constituency'=>$constituency, 'house' => 1));
                 $cons[] = $MEMBER;
-                if ( $MEMBER->current_member(1) ) {
+                if ($MEMBER->current_member(1)) {
                     $mp_types['mp']++;
                 } else {
                     $mp_types['former']++;
                 }
-            } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
+            } catch (\MySociety\TheyWorkForYou\MemberException $e) {
                 $cons = array();
             }
         } elseif (count($constituencies)) {
@@ -125,12 +125,12 @@ 
                 try {
                     $MEMBER = new \MySociety\TheyWorkForYou\Member(array('constituency'=>$constituency, 'house' => 1));
                     $cons[] = $MEMBER;
-                    if ( $MEMBER->current_member(1) ) {
+                    if ($MEMBER->current_member(1)) {
                         $mp_types['mp']++;
                     } else {
                         $mp_types['former']++;
                     }
-                } catch ( \MySociety\TheyWorkForYou\MemberException $e ) {
+                } catch (\MySociety\TheyWorkForYou\MemberException $e) {
                     continue;
                 }
             }
@@ -147,7 +147,7 @@ 
 
         $q = \MySociety\TheyWorkForYou\Utility\Search::searchMemberDbLookup($searchstring);
         $row_count = $q->rows();
-        for ($n=0; $n<$row_count; $n++) {
+        for ($n = 0; $n < $row_count; $n++) {
             $members[] = $q->field($n, 'person_id');
         }
 
@@ -155,7 +155,7 @@ 
         $q = $db->query("SELECT person FROM moffice WHERE position LIKE :pos ORDER BY from_date DESC, moffice_id",
             array('pos' => "%$searchstring%"));
         $row_count = $q->rows();
-        for ($n=0; $n<$row_count; $n++) {
+        for ($n = 0; $n < $row_count; $n++) {
             $members[] = $q->field($n, 'person');
         }
 
@@ -203,7 +203,7 @@ 
             $link = array(
                 'url' => $url->generate(),
                 'page' => $n,
-                'current' => ( $n == $data['page'] )
+                'current' => ($n == $data['page'])
             );
 
             $links[] = $link;
@@ -244,27 +244,27 @@ 
             $numlinks = $this->generate_pagination_links($data, $URL, $firstpage, $lastpage);
 
             $pagelinks['nums'] = $numlinks;
-            $pagelinks['first_result'] = $page == 1 ? 1 : ( ( $page - 1 ) * $results_per_page ) + 1;
-            $pagelinks['last_result'] = $page == $numpages ? $total_results : $pagelinks['first_result'] + ( $results_per_page - 1 );
+            $pagelinks['first_result'] = $page == 1 ? 1 : (($page - 1) * $results_per_page) + 1;
+            $pagelinks['last_result'] = $page == $numpages ? $total_results : $pagelinks['first_result'] + ($results_per_page - 1);
 
-            if ( $page != 1 ) {
+            if ($page != 1) {
                 $prev_page = $page - 1;
-                $URL->insert(array( 'p' => $prev_page ) );
+                $URL->insert(array('p' => $prev_page));
                 $pagelinks['prev'] = array(
                     'url' => $URL->generate()
                 );
-                $URL->insert(array( 'p' => 1 ) );
+                $URL->insert(array('p' => 1));
                 $pagelinks['firstpage'] = array(
                     'url' => $URL->generate()
                 );
             }
             if ($page != $numpages) {
                 $next_page = $page + 1;
-                $URL->insert(array( 'p' => $next_page ) );
+                $URL->insert(array('p' => $next_page));
                 $pagelinks['next'] = array(
                     'url' => $URL->generate()
                 );
-                $URL->insert(array( 'p' => $numpages ) );
+                $URL->insert(array('p' => $numpages));
                 $pagelinks['lastpage'] = array(
                     'url' => $URL->generate()
                 );
@@ -281,7 +281,7 @@ 
         $links['rss'] = $DATA->page_metadata($this_page, 'rss');
 
         if ($SEARCHENGINE) {
-            $links['email'] = '/alert/?' . ($this->searchstring ? 'alertsearch='.urlencode($this->searchstring) : '');
+            $links['email'] = '/alert/?' . ($this->searchstring ? 'alertsearch=' . urlencode($this->searchstring) : '');
             $links['email_desc'] = $SEARCHENGINE->query_description_long();
         }
 
@@ -295,7 +295,7 @@ 
             $search_engine = new \SEARCHENGINE($filter_ss);
             $links['email_section'] = $links['email'];
             $links['email_desc_section'] = $links['email_desc'];
-            $links['email'] = '/alert/?' . ($filter_ss ? 'alertsearch='.urlencode($filter_ss) : '');
+            $links['email'] = '/alert/?' . ($filter_ss ? 'alertsearch=' . urlencode($filter_ss) : '');
             $links['email_desc'] = $search_engine->query_description_long();
         }
 

classes/SectionView/SpView.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'sp' )
+            array('section' => 'sp')
         );
     }
 }

classes/SectionView/WransView.php

Spacing +6 added lines, -6 removed lines

@@ -12,13 +12,13 @@ 
 
     protected function display_front() {
         global $DATA, $this_page;
-        if ( get_http_var('type') == 'wrans') {
+        if (get_http_var('type') == 'wrans') {
             return parent::display_front();
         }
 
         $data = array();
 
-        $args = array( 'months' => 1 );
+        $args = array('months' => 1);
         $WRANSLIST = new \WRANSLIST;
 
         $wrans = array();
@@ -50,10 +50,10 @@ 
 
     protected function getSearchSections() {
         $sections = array(
-            array( 'section' => 'wrans', 'title' => 'Written Answers' ),
+            array('section' => 'wrans', 'title' => 'Written Answers'),
         );
-        if ( get_http_var('type') == '') {
-            $sections[] = array( 'section' => 'wms', 'title' => 'Written Ministerial Statements' );
+        if (get_http_var('type') == '') {
+            $sections[] = array('section' => 'wms', 'title' => 'Written Ministerial Statements');
         }
         return $sections;
     }
@@ -62,7 +62,7 @@ 
     # speech bar the first (assuming that's the question)
     private $votelinks_so_far = 0;
 
-    protected function generate_votes ($votes, $id, $gid) {
+    protected function generate_votes($votes, $id, $gid) {
         /*
         Returns HTML for the 'Does this answer the question?' links (wrans) in the sidebar.
         $votes = => array (

classes/SectionView/DebatesView.php

Braces +6 added lines, -2 removed lines

@@ -66,7 +66,9 @@ 
     private $first_gid = '';
 
     protected function get_video_html($row, $heading_hpos, $speeches) {
-        if (!$this->first_gid) $this->first_gid = $row['gid'];
+        if (!$this->first_gid) {
+            $this->first_gid = $row['gid'];
+        }
 
         $video_content = '';
         if (!$this->first_video_displayed && $row['video_status']&4 && !($row['video_status']&8)) {
@@ -97,7 +99,9 @@ 
         $adate = $vq->field(0, 'adate');
         $time = $vq->field(0, 'atime');
         $videodb = \MySociety\TheyWorkForYou\Utility\Video::dbConnect();
-        if (!$videodb) return '';
+        if (!$videodb) {
+            return '';
+        }
         $video = \MySociety\TheyWorkForYou\Utility\Video::fromTimestamp($videodb, $adate, $time);
         $start = $video['offset'];
         $out = '';

Spacing +9 added lines, -9 removed lines

@@ -16,7 +16,7 @@ 
         $DEBATELIST = new \DEBATELIST;
         $debates = array();
         $debates['data'] = $DEBATELIST->display('biggest_debates', array('days'=>7, 'num'=>10), 'none');
-        $args = array( 'months' => 1 );
+        $args = array('months' => 1);
         $debates['calendar'] = $DEBATELIST->display('calendar', $args, 'none');
         $debates['rssurl'] = $DATA->page_metadata($this_page, 'rss');
 
@@ -26,7 +26,7 @@ 
 
         $WHALLLIST = new \WHALLLIST;
         $whall['data'] = $WHALLLIST->display('biggest_debates', array('days'=>7, 'num'=>10), 'none');
-        $args = array( 'months' => 1 );
+        $args = array('months' => 1);
         $whall['calendar'] = $WHALLLIST->display('calendar', $args, 'none');
         $whall['rssurl'] = $DATA->page_metadata($this_page, 'rss');
 
@@ -36,7 +36,7 @@ 
 
         $LORDSDEBATELIST = new \LORDSDEBATELIST;
         $lords['data'] = $LORDSDEBATELIST->display('biggest_debates', array('days'=>7, 'num'=>10), 'none');
-        $args = array( 'months' => 1 );
+        $args = array('months' => 1);
         $lords['calendar'] = $LORDSDEBATELIST->display('calendar', $args, 'none');
 
         $lords['rssurl'] = $DATA->page_metadata($this_page, 'rss');
@@ -55,9 +55,9 @@ 
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'debates', 'title' => 'House of Commons' ),
-            array( 'section' => 'lords', 'title' => 'House of Lords' ),
-            array( 'section' => 'whall', 'title' => 'Westminster Hall' )
+            array('section' => 'debates', 'title' => 'House of Commons'),
+            array('section' => 'lords', 'title' => 'House of Lords'),
+            array('section' => 'whall', 'title' => 'Westminster Hall')
         );
     }
 
@@ -69,11 +69,11 @@ 
         if (!$this->first_gid) $this->first_gid = $row['gid'];
 
         $video_content = '';
-        if (!$this->first_video_displayed && $row['video_status']&4 && !($row['video_status']&8)) {
+        if (!$this->first_video_displayed && $row['video_status'] & 4 && !($row['video_status'] & 8)) {
             $video_content = $this->video_sidebar($row, $heading_hpos, $speeches);
             $this->first_video_displayed = true;
         }
-        if (!$video_content && !$this->first_speech_displayed && $row['video_status']&1 && !($row['video_status']&12)) {
+        if (!$video_content && !$this->first_speech_displayed && $row['video_status'] & 1 && !($row['video_status'] & 12)) {
             $video_content = $this->video_advert($row);
             $this->first_speech_displayed = true;
         }
@@ -104,7 +104,7 @@ 
         if ($count > 1) {
             $out .= '<div class="debate__video" id="video_wrap"><div>';
             if ($row['gid'] != $this->first_gid) {
-                $out .= '<p class="video-instructions">This video starts around ' . ($row['hpos']-$heading_hpos) . ' speeches in (<a href="#g' . gid_to_anchor($row['gid']) . '">move there in text</a>)</p>';
+                $out .= '<p class="video-instructions">This video starts around ' . ($row['hpos'] - $heading_hpos) . ' speeches in (<a href="#g' . gid_to_anchor($row['gid']) . '">move there in text</a>)</p>';
             }
         }
         $out .= \MySociety\TheyWorkForYou\Utility\Video::object($video['id'], $start, "$gid_type/$row[gid]");

classes/Utility/Video.php

Braces +10 added lines, -4 removed lines

@@ -19,7 +19,9 @@ 
     }
 
     public static function fromTimestamp($videodb, $date, $time) {
-        if (!$videodb) return null;
+        if (!$videodb) {
+            return null;
+        }
         date_default_timezone_set('Europe/London');
         $epoch = strtotime("$date $time");
         $timestamp = gmdate('c', $epoch);
@@ -38,9 +40,13 @@ 
 
     public static function object($video_id, $start, $gid, $stamping = '', $pid = 0) {
         $flashvars = "gid=$gid&file=$video_id&start=$start";
-        if ($stamping) $flashvars .= '&stamping=1';
-        if ($pid) $flashvars .= '&pid=' . $pid;
-/*
+        if ($stamping) {
+            $flashvars .= '&stamping=1';
+        }
+        if ($pid) {
+            $flashvars .= '&pid=' . $pid;
+        }
+        /*
 <object width='360' height='300'
     classid='clsid:D27CDB6E-AE6D-11cf-96B8-444553540000'
     codebase='http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,0,0'>

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 {
 
     public static function dbConnect() {
-        $connstr = 'host='.OPTION_BBC_DB_HOST.' port='.OPTION_BBC_DB_PORT.' dbname='.OPTION_BBC_DB_NAME.' user='.OPTION_BBC_DB_USER.' password='.OPTION_BBC_DB_PASS;
+        $connstr = 'host=' . OPTION_BBC_DB_HOST . ' port=' . OPTION_BBC_DB_PORT . ' dbname=' . OPTION_BBC_DB_NAME . ' user=' . OPTION_BBC_DB_USER . ' password=' . OPTION_BBC_DB_PASS;
         $videodb = pg_connect($connstr);
 
         return $videodb;

classes/Utility/Constituencies.php

Braces +6 added lines, -4 removed lines

@@ -31,13 +31,15 @@
         $q1 = $db->query($query, array(
             ':name' => $name
             ));
-        if ($q1->rows <= 0)
-            return false;
+        if ($q1->rows <= 0) {
+                    return false;
+        }
 
         $query = "select name from constituency where main_name and cons_id = '".$q1->field(0,'cons_id')."'";
         $q2 = $db->query($query);
-        if ($q2->rows <= 0)
-            return false;
+        if ($q2->rows <= 0) {
+                    return false;
+        }
 
         return $q2->field(0, "name");
     }

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
         if ($q1->rows <= 0)
             return false;
 
-        $query = "select name from constituency where main_name and cons_id = '".$q1->field(0,'cons_id')."'";
+        $query = "select name from constituency where main_name and cons_id = '" . $q1->field(0, 'cons_id') . "'";
         $q2 = $db->query($query);
         if ($q2->rows <= 0)
             return false;

classes/Utility/Search.php

Braces +15 added lines, -7 removed lines

@@ -28,8 +28,9 @@ 
 
             return $data;
         }
-        if (count($gids) == 5000)
-            $data['limit_reached'] = true;
+        if (count($gids) == 5000) {
+                    $data['limit_reached'] = true;
+        }
 
         # Fetch all the speakers of the results, count them up and get min/max date usage
         $speaker_count = array();
@@ -46,8 +47,12 @@ 
                 $mindate[$person_id] = '9999-12-31';
             }
             $speaker_count[$person_id]++;
-            if ($hdate < $mindate[$person_id]) $mindate[$person_id] = $hdate;
-            if ($hdate > $maxdate[$person_id]) $maxdate[$person_id] = $hdate;
+            if ($hdate < $mindate[$person_id]) {
+                $mindate[$person_id] = $hdate;
+            }
+            if ($hdate > $maxdate[$person_id]) {
+                $maxdate[$person_id] = $hdate;
+            }
         }
 
         # Fetch details of all the speakers
@@ -81,8 +86,9 @@ 
                 $dept = $q->field($n, 'dept');
                 $posn = $q->field($n, 'position');
                 $moffice_id = $q->field($n, 'moffice_id');
-                if ($dept && $q->field($n, 'to_date') == '9999-12-31')
-                    $speakers[$pid]['office'][$moffice_id] = prettify_office($posn, $dept);
+                if ($dept && $q->field($n, 'to_date') == '9999-12-31') {
+                                    $speakers[$pid]['office'][$moffice_id] = prettify_office($posn, $dept);
+                }
                 if (!isset($speakers[$pid]['name'])) {
                     $speakers[$pid]['name'] = $full_name . ($house==1?' MP':'');
                 }
@@ -140,7 +146,9 @@ 
      */
 
     public static function searchMemberDbLookup($searchstring, $current_only=false) {
-        if (!$searchstring) return false;
+        if (!$searchstring) {
+            return false;
+        }
         $searchwords = explode(' ', $searchstring, 3);
         $params = array();
         if (count($searchwords) == 1) {

Spacing +18 added lines, -18 removed lines

@@ -36,7 +36,7 @@ 
         $gids = join('","', $gids);
         $db = new \ParlDB;
         $q = $db->query('SELECT person_id,hdate FROM hansard WHERE gid IN ("' . $gids . '")');
-        for ($n=0; $n<$q->rows(); $n++) {
+        for ($n = 0; $n < $q->rows(); $n++) {
             $person_id = $q->field($n, 'person_id');
             $hdate = $q->field($n, 'hdate');
             if (!isset($speaker_count[$person_id])) {
@@ -62,7 +62,7 @@ 
                             WHERE member.person_id IN (' . $person_ids . ')
                             ' . ($house ? " AND house=$house" : '') . '
                             ORDER BY left_house DESC');
-            for ($n=0; $n<$q->rows(); $n++) {
+            for ($n = 0; $n < $q->rows(); $n++) {
                 $mid = $q->field($n, 'member_id');
                 if (!isset($pids[$mid])) {
                     $title = $q->field($n, 'title');
@@ -83,9 +83,9 @@ 
                 if ($dept && $q->field($n, 'to_date') == '9999-12-31')
                     $speakers[$pid]['office'][$moffice_id] = prettify_office($posn, $dept);
                 if (!isset($speakers[$pid]['name'])) {
-                    $speakers[$pid]['name'] = $full_name . ($house==1?' MP':'');
+                    $speakers[$pid]['name'] = $full_name . ($house == 1 ? ' MP' : '');
                 }
-                if ( !isset($speakers[$pid]['party']) && $party ) {
+                if (!isset($speakers[$pid]['party']) && $party) {
                     $speakers[$pid]['party'] = $party;
                 }
             }
@@ -138,7 +138,7 @@ 
      * Return query result from looking for MPs
      */
 
-    public static function searchMemberDbLookup($searchstring, $current_only=false) {
+    public static function searchMemberDbLookup($searchstring, $current_only = false) {
         if (!$searchstring) return false;
         $searchwords = explode(' ', $searchstring, 3);
         $params = array();
@@ -150,8 +150,8 @@ 
             // And here we're assuming the user's put the names in the right order.
             $params[':like_0'] = '%' . $searchwords[0] . '%';
             $params[':like_1'] = '%' . $searchwords[1] . '%';
-            $params[':like_0_and_1'] = '%' . $searchwords[0] . ' '. $searchwords[1] . '%';
-            $params[':like_0_and_1_hyphen'] = '%' . $searchwords[0] . '-'. $searchwords[1] . '%';
+            $params[':like_0_and_1'] = '%' . $searchwords[0] . ' ' . $searchwords[1] . '%';
+            $params[':like_0_and_1_hyphen'] = '%' . $searchwords[0] . '-' . $searchwords[1] . '%';
             $where = "(given_name LIKE :like_0 AND family_name LIKE :like_1)";
             $where .= " OR (given_name LIKE :like_1 AND family_name LIKE :like_0)";
             $where .= " OR (title LIKE :like_0 AND family_name LIKE :like_1)";
@@ -166,9 +166,9 @@ 
             $params[':like_0'] = '%' . $searchwords[0] . '%';
             $params[':like_1'] = '%' . $searchwords[1] . '%';
             $params[':like_2'] = '%' . $searchwords[2] . '%';
-            $params[':like_0_and_1'] = '%' . $searchwords[0] . ' '. $searchwords[1] . '%';
-            $params[':like_1_and_2'] = '%' . $searchwords[1] . ' '. $searchwords[2] . '%';
-            $params[':like_1_and_2_hyphen'] = '%' . $searchwords[1] . '-'. $searchwords[2] . '%';
+            $params[':like_0_and_1'] = '%' . $searchwords[0] . ' ' . $searchwords[1] . '%';
+            $params[':like_1_and_2'] = '%' . $searchwords[1] . ' ' . $searchwords[2] . '%';
+            $params[':like_1_and_2_hyphen'] = '%' . $searchwords[1] . '-' . $searchwords[2] . '%';
             $where = "(given_name LIKE :like_0_and_1 AND family_name LIKE :like_2)";
             $where .= " OR (given_name LIKE :like_0 AND family_name LIKE :like_1_and_2)";
             $where .= " OR (given_name LIKE :like_0 AND family_name LIKE :like_1_and_2_hyphen)";
@@ -183,15 +183,15 @@ 
         return $q;
     }
 
-    public static function searchMemberDbLookupWithNames($searchstring, $current_only=false) {
+    public static function searchMemberDbLookupWithNames($searchstring, $current_only = false) {
         $q = self::searchMemberDbLookup($searchstring, $current_only);
 
-        if ( !$q->rows ) {
+        if (!$q->rows) {
             return $q;
         }
 
         $person_ids = array();
-        for ($i=0; $i<$q->rows(); ++$i) {
+        for ($i = 0; $i < $q->rows(); ++$i) {
             $pid = $q->field($i, 'person_id');
             $person_ids[$pid] = 1;
         }
@@ -238,7 +238,7 @@ 
             // Looks like a postcode - can we find the constituency?
             $constituency = Postcode::postcodeToConstituency($searchterm);
             if ($constituency) {
-                return array( array($constituency), true );
+                return array(array($constituency), true);
             }
         }
 
@@ -252,11 +252,11 @@ 
         $q = $db->query($query, array(':try' => '%' . $try . '%'));
 
         $constituencies = array();
-        for ($n=0; $n<$q->rows(); $n++) {
+        for ($n = 0; $n < $q->rows(); $n++) {
             $constituencies[] = $q->field($n, 'name');
         }
 
-        return array( $constituencies, false );
+        return array($constituencies, false);
     }
 
     /**
@@ -272,7 +272,7 @@ 
         $speakers = [];
 
         foreach ($criteria as $c) {
-            if (preg_match('#^speaker:(\d+)#',$c,$m)) {
+            if (preg_match('#^speaker:(\d+)#', $c, $m)) {
                 $MEMBER = new \MEMBER(array('person_id'=>$m[1]));
                 $speakers[$m[1]] = $MEMBER->full_name();
             }
@@ -291,7 +291,7 @@ 
     public static function speakerIDsToNames($searchstring) {
         $speakers = self::speakerNamesForIDs($searchstring);
 
-        foreach ( $speakers as $id => $name ) {
+        foreach ($speakers as $id => $name) {
             $searchstring = str_replace('speaker:' . $id, "speaker:$name", $searchstring);
         }
 

classes/Topics.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
       $topics = array();
       $count = $q->rows();
 
-      for ($i = 0; $i < $count; $i++ ) {
+      for ($i = 0; $i < $count; $i++) {
           $topic = $q->row($i);
           $topics[$topic['slug']] = new Topic($topic);
       }
@@ -57,7 +57,7 @@ 
       $topics = array();
       $count = $q->rows();
 
-      for ($i = 0; $i < $count; $i++ ) {
+      for ($i = 0; $i < $count; $i++) {
           $topic = $q->row($i);
           $topics[$topic['slug']] = new Topic($topic);
       }

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

@@ -46,7 +46,7 @@
           return new Topic($q->row(0));
       }
 
-      return NULL;
+      return null;
     }
 
     public function getFrontPageTopics() {

Indentation +36 added lines, -36 removed lines

@@ -25,58 +25,58 @@
     }
 
     public function getTopics() {
-      $q = $this->db->query("SELECT id, slug, title, description, search_string, front_page, image FROM topics");
+        $q = $this->db->query("SELECT id, slug, title, description, search_string, front_page, image FROM topics");
 
-      $topics = array();
-      $count = $q->rows();
+        $topics = array();
+        $count = $q->rows();
 
-      for ($i = 0; $i < $count; $i++ ) {
-          $topic = $q->row($i);
-          $topics[$topic['slug']] = new Topic($topic);
-      }
-      return $topics;
+        for ($i = 0; $i < $count; $i++ ) {
+            $topic = $q->row($i);
+            $topics[$topic['slug']] = new Topic($topic);
+        }
+        return $topics;
     }
 
     public function getTopic($topic_name) {
-      $q = $this->db->query(
-          "SELECT id, slug, title, description, search_string, front_page, image FROM topics WHERE slug = :slug",
-          array(':slug' => $topic_name)
-      );
-      if ($q->rows) {
-          return new Topic($q->row(0));
-      }
-
-      return NULL;
+        $q = $this->db->query(
+            "SELECT id, slug, title, description, search_string, front_page, image FROM topics WHERE slug = :slug",
+            array(':slug' => $topic_name)
+        );
+        if ($q->rows) {
+            return new Topic($q->row(0));
+        }
+
+        return NULL;
     }
 
     public function getFrontPageTopics() {
-      $q = $this->db->query(
-          "SELECT id, slug, title, description, search_string, front_page, image FROM topics WHERE front_page = TRUE"
-      );
-
-      $topics = array();
-      $count = $q->rows();
-
-      for ($i = 0; $i < $count; $i++ ) {
-          $topic = $q->row($i);
-          $topics[$topic['slug']] = new Topic($topic);
-      }
-      return $topics;
+        $q = $this->db->query(
+            "SELECT id, slug, title, description, search_string, front_page, image FROM topics WHERE front_page = TRUE"
+        );
+
+        $topics = array();
+        $count = $q->rows();
+
+        for ($i = 0; $i < $count; $i++ ) {
+            $topic = $q->row($i);
+            $topics[$topic['slug']] = new Topic($topic);
+        }
+        return $topics;
     }
 
     public function updateFrontPageTopics($topics) {
         // PDO doesn't cope with arrays so we have to do this by hand :|
         $quoted = array();
         if ($topics) {
-          foreach ($topics as $topic) {
-              $quoted[] = $this->db->quote($topic);
-          }
-          $topics_str = implode(',', $quoted);
+            foreach ($topics as $topic) {
+                $quoted[] = $this->db->quote($topic);
+            }
+            $topics_str = implode(',', $quoted);
 
-          $this->db->query("UPDATE topics SET front_page = TRUE WHERE slug IN ($topics_str)");
-          $this->db->query("UPDATE topics SET front_page = FALSE WHERE slug NOT IN ($topics_str)");
+            $this->db->query("UPDATE topics SET front_page = TRUE WHERE slug IN ($topics_str)");
+            $this->db->query("UPDATE topics SET front_page = FALSE WHERE slug NOT IN ($topics_str)");
         } else {
-          $this->db->query("UPDATE topics SET front_page = FALSE");
+            $this->db->query("UPDATE topics SET front_page = FALSE");
         }
 
         return true;

classes/Policies.php

Indentation +13 added lines, -13 removed lines

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

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

@@ -293,7 +293,7 @@
 
     private $policy_id;
 
-    public function __construct($policy_id = NULL) {
+    public function __construct($policy_id = null) {
         $this->db = new \ParlDB;
 
         if ( $policy_id ) {

Spacing +5 added lines, -5 removed lines

@@ -296,7 +296,7 @@ 
     public function __construct($policy_id = NULL) {
         $this->db = new \ParlDB;
 
-        if ( $policy_id ) {
+        if ($policy_id) {
             $this->policy_id = $policy_id;
             $this->policies = array(
                 $policy_id => $this->policies[$policy_id]
@@ -380,8 +380,8 @@ 
                     // want to complain here if we're looking for that policy and
                     // it does not exist. Otherwise, if the single policy isn't in
                     // the set we want to return an empty set
-                    if ( !isset($this->policy_id) || $set_policy == $this->policy_id ) {
-                        throw new \Exception ('Policy ' . $set_policy . ' in set "' . $set . '" does not exist.');
+                    if (!isset($this->policy_id) || $set_policy == $this->policy_id) {
+                        throw new \Exception('Policy ' . $set_policy . ' in set "' . $set . '" does not exist.');
                     }
                 }
             }
@@ -392,7 +392,7 @@ 
             return $new_policies;
 
         } else {
-            throw new \Exception ('Policy set "' . $set . '" does not exist.');
+            throw new \Exception('Policy set "' . $set . '" does not exist.');
         }
     }
 
@@ -433,7 +433,7 @@ 
 
         $image = $q->field(0, 'image');
 
-        if ( $image && file_exists(BASEDIR . '/' . $image)) {
+        if ($image && file_exists(BASEDIR . '/' . $image)) {
             $props['image'] = $image;
             $props['image_license'] = $q->field(0, 'image_license');
             $props['image_attribution'] = $q->field(0, 'image_attrib');

Braces +2 added lines, -4 removed lines

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