mysociety / theyworkforyou

tests/UtilityTest.php

Indentation +3 added lines, -3 removed lines

@@ -6,8 +6,8 @@ 
 
 class UtilityTest extends PHPUnit_Framework_TestCase
 {
-	public function setUp()
-	{
+    public function setUp()
+    {
         parent::setUp();
         include_once('www/includes/utility.php');
     }
@@ -16,7 +16,7 @@ 
      * Test the escaping of replacement strings for use with
      * preg_replace.
      */
-	public function testPregReplacement()
+    public function testPregReplacement()
     {
         $example = 'try \1 and $0, also backslash \ and dollar $ alone';
         $this->assertEquals(

tests/SectionTest.php

Indentation +6 added lines, -6 removed lines

@@ -18,13 +18,13 @@ 
 
     var $types = array('debates', 'whall', 'wrans', 'wms', 'ni', 'sp', 'spwrans', 'lords');
 
-	public function testDebatesFront() {
+    public function testDebatesFront() {
         foreach ($this->types as $type) {
             $this->fetch_page( array( 'type' => $type ) );
         }
     }
 
-	public function testDebatesYear() {
+    public function testDebatesYear() {
         foreach ($this->types as $type) {
             $page = $this->fetch_page( array( 'type' => $type, 'y' => '2014' ) );
             $this->assertContains('<div class="calendar">', $page);
@@ -33,7 +33,7 @@ 
         }
     }
 
-	public function testDebatesDay() {
+    public function testDebatesDay() {
         foreach ($this->types as $type) {
             $page = $this->fetch_page( array( 'type' => $type, 'd' => '2014-01-01' ) );
             $this->assertContains('Wednesday, 1 January 2014', $page);
@@ -53,7 +53,7 @@ 
         }
     }
 
-	public function testDebatesHeading() {
+    public function testDebatesHeading() {
         foreach ($this->types as $type) {
             if ($type == 'spwrans') {
                 # Only one level of headings on spwrans
@@ -70,7 +70,7 @@ 
         }
     }
 
-	public function testDebatesSubheading() {
+    public function testDebatesSubheading() {
         foreach ($this->types as $type) {
             $page = $this->fetch_page( array( 'type' => $type, 'id' => '2014-01-01b.1.2' ) );
             $this->assertContains("HeadingA", $page);
@@ -99,7 +99,7 @@ 
         }
     }
 
-	public function testDebatesSpeech() {
+    public function testDebatesSpeech() {
         foreach ($this->types as $type) {
             $page = $this->fetch_page( array( 'type' => $type, 'id' => '2014-01-01b.1.3' ) );
             if ($type == 'wrans' || $type == 'spwrans' || $type == 'wms') {

Spacing +8 added lines, -8 removed lines

@@ -20,13 +20,13 @@ 
 
 	public function testDebatesFront() {
         foreach ($this->types as $type) {
-            $this->fetch_page( array( 'type' => $type ) );
+            $this->fetch_page(array('type' => $type));
         }
     }
 
 	public function testDebatesYear() {
         foreach ($this->types as $type) {
-            $page = $this->fetch_page( array( 'type' => $type, 'y' => '2014' ) );
+            $page = $this->fetch_page(array('type' => $type, 'y' => '2014'));
             $this->assertContains('<div class="calendar">', $page);
             $this->assertContains('January', $page);
             $this->assertRegExp('/<td colspan="2">&nbsp;<\/td><td[^>]*><a href="\/' . $type . '\/\?d=2014-01-01">1<\/a><\/td><td[^>]*><span>2<\/span><\/td>/', $page);
@@ -35,7 +35,7 @@ 
 
 	public function testDebatesDay() {
         foreach ($this->types as $type) {
-            $page = $this->fetch_page( array( 'type' => $type, 'd' => '2014-01-01' ) );
+            $page = $this->fetch_page(array('type' => $type, 'd' => '2014-01-01'));
             $this->assertContains('Wednesday, 1 January 2014', $page);
             $this->assertContains('HeadingA', $page);
             if ($type == 'wrans') {
@@ -60,7 +60,7 @@ 
                 continue;
             }
 
-            $page = $this->fetch_page( array( 'type' => $type, 'id' => '2014-01-01b.1.1' ) );
+            $page = $this->fetch_page(array('type' => $type, 'id' => '2014-01-01b.1.1'));
             if ($type == 'wrans') {
                 $this->assertRegexp("#All .*?written answers on 1 Jan 2014#i", $page);
                 $this->assertContains("QuestionA", $page);
@@ -72,7 +72,7 @@ 
 
 	public function testDebatesSubheading() {
         foreach ($this->types as $type) {
-            $page = $this->fetch_page( array( 'type' => $type, 'id' => '2014-01-01b.1.2' ) );
+            $page = $this->fetch_page(array('type' => $type, 'id' => '2014-01-01b.1.2'));
             $this->assertContains("HeadingA", $page);
             if ($type == 'spwrans') {
                 $this->assertContains("QuestionA", $page);
@@ -101,7 +101,7 @@ 
 
 	public function testDebatesSpeech() {
         foreach ($this->types as $type) {
-            $page = $this->fetch_page( array( 'type' => $type, 'id' => '2014-01-01b.1.3' ) );
+            $page = $this->fetch_page(array('type' => $type, 'id' => '2014-01-01b.1.3'));
             if ($type == 'wrans' || $type == 'spwrans' || $type == 'wms') {
                 $this->assertRegexp("#Location: .*?/$type/\?id=2014-01-01b\.1\.2#", $page);
             } else {
@@ -125,13 +125,13 @@ 
      * @group xapian
      */
     public function testGlossaryAndSearchHighlights() {
-            $page = $this->fetch_page( array( 'type' => 'lords', 's' => 'constituency', 'id' => '2014-02-02b.1.3' ) );
+            $page = $this->fetch_page(array('type' => 'lords', 's' => 'constituency', 'id' => '2014-02-02b.1.3'));
             $this->assertContains("constituency", $page);
             $this->assertContains("<span class=\"hi\"><a href=\"/glossary/?gl=1\" title=\"In a general election, each Constituency chooses an MP to represent them....\" class=\"glossary\">constituency</a></span>", $page);
     }
 
     public function testGidRedirect() {
-        $page = $this->fetch_page( array( 'type' => 'wrans', 'id' => '2014-01-01a.187335.h' ) );
+        $page = $this->fetch_page(array('type' => 'wrans', 'id' => '2014-01-01a.187335.h'));
         $this->assertRegexp("#Location: .*?/wrans/\?id=2014-01-01b\.1\.2#", $page);
     }
 }

Braces +16 added lines, -8 removed lines

@@ -41,12 +41,15 @@ 
             if ($type == 'wrans') {
                 $this->assertContains('DepartmentA', $page);
                 $this->assertContains('QuestionA', $page);
-            } elseif ($type == 'spwrans') {
+            }
+            elseif ($type == 'spwrans') {
                 $this->assertContains('QuestionA', $page);
-            } elseif ($type == 'wms') {
+            }
+            elseif ($type == 'wms') {
                 $this->assertContains('DepartmentA', $page);
                 $this->assertContains('StatementA', $page);
-            } else {
+            }
+            else {
                 $this->assertContains('SubheadingA', $page);
                 $this->assertContains('SpeechA', $page);
             }
@@ -64,7 +67,8 @@ 
             if ($type == 'wrans') {
                 $this->assertRegexp("#All .*?written answers on 1 Jan 2014#i", $page);
                 $this->assertContains("QuestionA", $page);
-            } else {
+            }
+            else {
                 $this->assertRegexp("#Location: .*?/$type/\?id=2014-01-01b\.1\.2#", $page);
             }
         }
@@ -77,7 +81,8 @@ 
             if ($type == 'spwrans') {
                 $this->assertContains("QuestionA", $page);
                 $this->assertContains("AnswerA", $page);
-            } elseif ($type == 'wrans') {
+            }
+            elseif ($type == 'wrans') {
                 $this->assertContains("DepartmentA", $page);
                 $this->assertContains("QuestionA", $page);
                 $this->assertContains("AnswerA", $page);
@@ -86,10 +91,12 @@ 
                 $this->assertContains('Mp2 Mp2', $page);
                 $this->assertContains('Birmingham', $page);
                 $this->assertContains('Independent', $page);
-            } elseif ($type == 'wms') {
+            }
+            elseif ($type == 'wms') {
                 $this->assertContains('DepartmentA', $page);
                 $this->assertContains('StatementA', $page);
-            } else {
+            }
+            else {
                 $this->assertContains("SubheadingA", $page);
                 $this->assertContains("SpeechA", $page);
             }
@@ -104,7 +111,8 @@ 
             $page = $this->fetch_page( array( 'type' => $type, 'id' => '2014-01-01b.1.3' ) );
             if ($type == 'wrans' || $type == 'spwrans' || $type == 'wms') {
                 $this->assertRegexp("#Location: .*?/$type/\?id=2014-01-01b\.1\.2#", $page);
-            } else {
+            }
+            else {
                 $this->assertContains("HeadingA", $page);
                 $this->assertContains("SubheadingA", $page);
                 $this->assertContains("2:30 pm", $page);

tests/SearchTest.php

Indentation +4 added lines, -4 removed lines

@@ -7,8 +7,8 @@ 
 
 class SearchTest extends FetchPageTestCase
 {
-	public function setUp()
-	{
+    public function setUp()
+    {
         parent::setUp();
         include_once('www/includes/easyparliament/searchengine.php');
     }
@@ -87,7 +87,7 @@ 
      *
      * @group xapian
      */
-	public function testSearchNormal()
+    public function testSearchNormal()
     {
         $SEARCHENGINE = new SEARCHENGINE('test');
 
@@ -102,7 +102,7 @@ 
      *
      * @group xapian
      */
-	public function testSearchLink()
+    public function testSearchLink()
     {
         $SEARCHENGINE = new SEARCHENGINE('test');
 

Spacing +12 added lines, -12 removed lines

@@ -26,11 +26,11 @@ 
     public function testConstituencySearch()
     {
         $this->assertEquals(
-            array( array( 'Alyn and Deeside' ), false ),
+            array(array('Alyn and Deeside'), false),
             \MySociety\TheyWorkForYou\Utility\Search::searchConstituenciesByQuery('Alyn')
         );
         $this->assertEquals(
-            array( array( 'Alyn and Deeside' ), false ),
+            array(array('Alyn and Deeside'), false),
             \MySociety\TheyWorkForYou\Utility\Search::searchConstituenciesByQuery('Alyn and Deeside')
         );
     }
@@ -119,7 +119,7 @@ 
      */
     public function testSearchPage()
     {
-        $page = $this->fetch_page( array( ) );
+        $page = $this->fetch_page(array( ));
         $this->assertContains('Search', $page);
     }
 
@@ -130,7 +130,7 @@ 
      */
     public function testSearchPageMP()
     {
-        $page = $this->fetch_page( array( 'q' => 'Mary Smith' ) );
+        $page = $this->fetch_page(array('q' => 'Mary Smith'));
         $this->assertContains('Mary Smith', $page);
         $this->assertContains('MP, Amber Valley', $page);
     }
@@ -142,7 +142,7 @@ 
      */
     public function testSearchPageMultipleMP()
     {
-        $page = $this->fetch_page( array( 'q' => 'Jones' ) );
+        $page = $this->fetch_page(array('q' => 'Jones'));
         $this->assertContains('People matching <em class="current-search-term">Jones</em>', $page);
         $this->assertContains('Andrew Jones', $page);
         $this->assertContains('Simon Jones', $page);
@@ -154,7 +154,7 @@ 
      * @group xapian
      */
     public function testSearchPageCons() {
-        $page = $this->fetch_page( array( 'q' => 'Amber' ) );
+        $page = $this->fetch_page(array('q' => 'Amber'));
         $this->assertContains('MP for <em class="current-search-term">Amber</em>', $page);
         $this->assertContains('Mary Smith', $page);
     }
@@ -166,7 +166,7 @@ 
      * @group xapian
      */
     public function testSearchPageConsWithNoMp() {
-        $page = $this->fetch_page( array( 'q' => 'Alyn' ) );
+        $page = $this->fetch_page(array('q' => 'Alyn'));
         $this->assertNotContains('MP for <em class="current-search-term">Alyn</em>', $page);
         $this->assertNotContains('MPs in constituencies matching', $page);
     }
@@ -178,7 +178,7 @@ 
      * @group xapian
      */
     public function testSearchPageMultipleCons() {
-        $page = $this->fetch_page( array( 'q' => 'Liverpool' ) );
+        $page = $this->fetch_page(array('q' => 'Liverpool'));
         $this->assertContains('MPs in constituencies matching <em class="current-search-term">Liverpool</em>', $page);
         $this->assertContains('Susan Brown', $page);
         $this->assertContains('MP, Liverpool, Riverside', $page);
@@ -192,7 +192,7 @@ 
      * @group xapian
      */
     public function testSearchPageGlossary() {
-        $page = $this->fetch_page( array( 'q' => 'other place' ) );
+        $page = $this->fetch_page(array('q' => 'other place'));
         $this->assertContains('Glossary items matching', $page);
         $this->assertContains('<a href="/glossary/?gl=1">&ldquo;other place', $page);
     }
@@ -203,7 +203,7 @@ 
      * @group xapian
      */
     public function testSearchPageSpellCorrect() {
-        $page = $this->fetch_page( array( 'q' => 'plice' ) );
+        $page = $this->fetch_page(array('q' => 'plice'));
         $this->assertContains('Did you mean <a href="/search/?q=place">place', $page);
     }
 
@@ -213,7 +213,7 @@ 
      * @group xapian
      */
     public function testSearchBySpeakerNoResults() {
-        $page = $this->fetch_page( array( 'q' => 'splice', 'o' => 'p' ) );
+        $page = $this->fetch_page(array('q' => 'splice', 'o' => 'p'));
         $this->assertContains('Who says splice the most', $page);
         $this->assertContains('No results', $page);
     }
@@ -240,7 +240,7 @@ 
      * @group xapian
      */
     public function testSearchPageRSS() {
-        $page = $this->fetch_page( array( 'q' => 'test' ) );
+        $page = $this->fetch_page(array('q' => 'test'));
         $this->assertContains('<a href="/search/rss/?s=test">get an RSS feed', $page);
     }
 

classes/Renderer.php

Indentation +5 added lines, -5 removed lines

@@ -84,12 +84,12 @@
         // Require the templates and output
 
         if ($template_only) {
-          require_once INCLUDESPATH . 'easyparliament/templates/html/' . $template . '.php';
+            require_once INCLUDESPATH . 'easyparliament/templates/html/' . $template . '.php';
         } else {
-          header('Content-Type: text/html; charset=utf-8');
-          require_once INCLUDESPATH . 'easyparliament/templates/html/header.php';
-          require_once INCLUDESPATH . 'easyparliament/templates/html/' . $template . '.php';
-          require_once INCLUDESPATH . 'easyparliament/templates/html/footer.php';
+            header('Content-Type: text/html; charset=utf-8');
+            require_once INCLUDESPATH . 'easyparliament/templates/html/header.php';
+            require_once INCLUDESPATH . 'easyparliament/templates/html/' . $template . '.php';
+            require_once INCLUDESPATH . 'easyparliament/templates/html/footer.php';
         }
     }
 

Braces +4 added lines, -2 removed lines

@@ -29,7 +29,8 @@ 
         // Find the user's country. Used by header, so a safe bit to do regardless.
         if (preg_match('#^[A-Z]{2}$#i', get_http_var('country'))) {
             $data['country'] = strtoupper(get_http_var('country'));
-        } else {
+        }
+        else {
             $data['country'] = Utility\Gaze::getCountryByIp($_SERVER["REMOTE_ADDR"]);
         }
 
@@ -85,7 +86,8 @@ 
 
         if ($template_only) {
           require_once INCLUDESPATH . 'easyparliament/templates/html/' . $template . '.php';
-        } else {
+        }
+        else {
           header('Content-Type: text/html; charset=utf-8');
           require_once INCLUDESPATH . 'easyparliament/templates/html/header.php';
           require_once INCLUDESPATH . 'easyparliament/templates/html/' . $template . '.php';

Spacing +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
         $user = new Renderer\User();
         $data = array_merge($user->data, $data);
 
-        if ( isset($page_errors) ) {
+        if (isset($page_errors)) {
             $data['page_errors'] = $page_errors;
         }
 
@@ -95,14 +95,14 @@ 
 
     private static function addCommonURLs($data) {
         $urls = array();
-        if ( isset($data['urls']) ) {
+        if (isset($data['urls'])) {
             $urls = $data['urls'];
         }
 
         $common_urls = array('search', 'alert');
 
-        foreach ( $common_urls as $path ) {
-            if (!isset($urls[$path]) ) {
+        foreach ($common_urls as $path) {
+            if (!isset($urls[$path])) {
                 $url = new Url($path);
                 $urls[$path] = $url->generate();
             }

classes/Renderer/Footer.php

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
 
     public $data;
 
-    private $about_links = array ('help', 'about', 'linktous', 'houserules', 'blog', 'news', 'contact', 'privacy');
+    private $about_links = array('help', 'about', 'linktous', 'houserules', 'blog', 'news', 'contact', 'privacy');
     private $assemblies_links = array('hansard', 'sp_home', 'ni_home', 'wales_home');
     private $international_links = array('newzealand', 'australia', 'ireland', 'mzalendo');
     private $tech_links = array('code', 'api', 'data', 'pombola', 'devmailinglist', 'irc');
@@ -28,10 +28,10 @@ 
     public function __construct() {
         $this->data = array();
 
-        $this->data['about'] = $this->get_menu_links( $this->about_links );
-        $this->data['assemblies'] = $this->get_menu_links( $this->assemblies_links );
-        $this->data['international'] = $this->get_menu_links( $this->international_links );
-        $this->data['tech'] = $this->get_menu_links( $this->tech_links );
+        $this->data['about'] = $this->get_menu_links($this->about_links);
+        $this->data['assemblies'] = $this->get_menu_links($this->assemblies_links);
+        $this->data['international'] = $this->get_menu_links($this->international_links);
+        $this->data['tech'] = $this->get_menu_links($this->tech_links);
     }
 
     /**

Braces +4 added lines, -2 removed lines

@@ -51,7 +51,8 @@ 
             $menu = $DATA->page_metadata($page, 'menu');
             if ($menu) {
                 $title = $menu['text'];
-            } else {
+            }
+            else {
                 $title = $DATA->page_metadata($page, 'title');
             }
             $url = $DATA->page_metadata($page, 'url');
@@ -71,7 +72,8 @@ 
                     'classes' => '',
                     'text'    => $title
                 );
-            } else {
+            }
+            else {
                 $links[] = array(
                     'href'    => $url,
                     'title'   => $tooltip,

classes/Model/Banner.php

Spacing +4 added lines, -4 removed lines

@@ -28,12 +28,12 @@ 
     public function get_text() {
         $text = $this->mem->get('banner');
 
-        if ( $text === false ) {
+        if ($text === false) {
             $q = $this->db->query("SELECT value FROM editorial WHERE item = 'banner'");
 
             if ($q->rows) {
                 $text = $q->field(0, 'value');
-                if ( trim($text) == '' ) {
+                if (trim($text) == '') {
                     $text = NULL;
                 }
                 $this->mem->set('banner', $text, 86400);
@@ -50,8 +50,8 @@ 
             )
         );
 
-        if ( $q->success() ) {
-            if ( trim($text) == '' ) {
+        if ($q->success()) {
+            if (trim($text) == '') {
                 $text = NULL;
             }
             $this->mem->set('banner', $text, 86400);

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

@@ -34,7 +34,7 @@ 
             if ($q->rows) {
                 $text = $q->field(0, 'value');
                 if ( trim($text) == '' ) {
-                    $text = NULL;
+                    $text = null;
                 }
                 $this->mem->set('banner', $text, 86400);
             }
@@ -52,7 +52,7 @@ 
 
         if ( $q->success() ) {
             if ( trim($text) == '' ) {
-                $text = NULL;
+                $text = null;
             }
             $this->mem->set('banner', $text, 86400);
             return true;

classes/Divisions.php

Indentation +67 added lines, -67 removed lines

@@ -38,25 +38,25 @@ 
     }
 
     public static function getMostRecentDivisionDate() {
-      $db = new \ParlDB;
-      $q = $db->query(
+        $db = new \ParlDB;
+        $q = $db->query(
         "SELECT policy_id, max(division_date) as recent from policydivisions GROUP BY policy_id"
-      );
+        );
 
-      $policy_maxes = array();
-      $row_count = $q->rows();
-      for ($n = 0; $n < $row_count; $n++) {
+        $policy_maxes = array();
+        $row_count = $q->rows();
+        for ($n = 0; $n < $row_count; $n++) {
         $policy_maxes[$q->field($n, 'policy_id')] = $q->field( $n, 'recent' );
-      }
-      $policy_maxes['latest'] = $policy_maxes ? max(array_values($policy_maxes)) : '';
-      return $policy_maxes;
+        }
+        $policy_maxes['latest'] = $policy_maxes ? max(array_values($policy_maxes)) : '';
+        return $policy_maxes;
     }
 
     public function getRecentDivisions($number = 20) {
         // Grab distinct divisions as sometimes we have the same division for more than one policy
         // and we don't want to display it twice
         $q = $this->db->query(
-          "SELECT distinct division_id, division_title, yes_text, no_text, division_date, division_number, gid, direction, majority_vote,
+            "SELECT distinct division_id, division_title, yes_text, no_text, division_date, division_number, gid, direction, majority_vote,
           yes_total, no_total, absent_total, both_total
           FROM policydivisions ORDER BY division_date DESC, division_number DESC LIMIT :count",
             array(
@@ -94,7 +94,7 @@ 
         $divisions = array();
         $row_count = $q->rows();
         for ($n = 0; $n < $row_count; $n++) {
-          $divisions[] = $this->getParliamentDivisionDetails($q->row($n));
+            $divisions[] = $this->getParliamentDivisionDetails($q->row($n));
         }
 
         return $divisions;
@@ -148,44 +148,44 @@ 
 
         $row_count = $q->rows();
         for ($n = 0; $n < $row_count; $n++) {
-          $policy_id = $q->field($n, 'policy_id');
+            $policy_id = $q->field($n, 'policy_id');
 
-          if (!array_key_exists($policy_id, $policy_divisions)) {
+            if (!array_key_exists($policy_id, $policy_divisions)) {
             $summary = array(
-              'max' => $q->field($n, 'latest'),
-              'min' => $q->field($n, 'earliest'),
-              'total' => $q->field($n, 'total'),
-              'for' => 0, 'against' => 0, 'absent' => 0, 'both' => 0, 'tell' => 0
+                'max' => $q->field($n, 'latest'),
+                'min' => $q->field($n, 'earliest'),
+                'total' => $q->field($n, 'total'),
+                'for' => 0, 'against' => 0, 'absent' => 0, 'both' => 0, 'tell' => 0
             );
 
             $policy_divisions[$policy_id] = $summary;
-          }
-
-          $summary = $policy_divisions[$policy_id];
-
-          $summary['total'] += $q->field($n, 'total');
-          if ($summary['max'] < $q->field($n, 'latest')) {
-              $summary['max'] = $q->field($n, 'latest');
-          }
-          if ($summary['min'] > $q->field($n, 'latest')) {
-              $summary['min'] = $q->field($n, 'latest');
-          }
-
-          $vote = $q->field($n, 'vote');
-          $policy_vote = str_replace('3', '', $q->field($n, 'policy_vote'));
-          if ( $vote == 'absent' ) {
-              $summary['absent'] += $q->field($n, 'total');
-          } else if ( $vote == 'both' ) {
-              $summary['both'] += $q->field($n, 'total');
-          } else if ( strpos($vote, 'tell') !== FALSE ) {
-              $summary['tell'] += $q->field($n, 'total');
-          } else if ( $policy_vote == $vote ) {
-              $summary['for'] += $q->field($n, 'total');
-          } else if ( $policy_vote != $vote ) {
-              $summary['against'] += $q->field($n, 'total');
-          }
-
-          $policy_divisions[$policy_id] = $summary;
+            }
+
+            $summary = $policy_divisions[$policy_id];
+
+            $summary['total'] += $q->field($n, 'total');
+            if ($summary['max'] < $q->field($n, 'latest')) {
+                $summary['max'] = $q->field($n, 'latest');
+            }
+            if ($summary['min'] > $q->field($n, 'latest')) {
+                $summary['min'] = $q->field($n, 'latest');
+            }
+
+            $vote = $q->field($n, 'vote');
+            $policy_vote = str_replace('3', '', $q->field($n, 'policy_vote'));
+            if ( $vote == 'absent' ) {
+                $summary['absent'] += $q->field($n, 'total');
+            } else if ( $vote == 'both' ) {
+                $summary['both'] += $q->field($n, 'total');
+            } else if ( strpos($vote, 'tell') !== FALSE ) {
+                $summary['tell'] += $q->field($n, 'total');
+            } else if ( $policy_vote == $vote ) {
+                $summary['for'] += $q->field($n, 'total');
+            } else if ( $policy_vote != $vote ) {
+                $summary['against'] += $q->field($n, 'total');
+            }
+
+            $policy_divisions[$policy_id] = $summary;
         }
 
         return $policy_divisions;
@@ -219,17 +219,17 @@ 
         );
 
         $votes = array(
-          'yes_votes' => array(),
-          'no_votes' => array(),
-          'absent_votes' => array(),
-          'both_votes' => array()
+            'yes_votes' => array(),
+            'no_votes' => array(),
+            'absent_votes' => array(),
+            'both_votes' => array()
         );
 
         foreach ($q->data as $vote) {
             $detail = array(
-              'person_id' => $vote['person_id'],
-              'name' => $vote['given_name'] . ' ' . $vote['family_name'],
-              'teller' => false
+                'person_id' => $vote['person_id'],
+                'name' => $vote['given_name'] . ' ' . $vote['family_name'],
+                'teller' => false
             );
 
             if (strpos($vote['vote'], 'tell') !== FALSE) {
@@ -237,13 +237,13 @@ 
             }
 
             if ($vote['vote'] == 'aye' or $vote['vote'] == 'tellaye') {
-              $votes['yes_votes'][] = $detail;
+                $votes['yes_votes'][] = $detail;
             } else if ($vote['vote'] == 'no' or $vote['vote'] == 'tellno') {
-              $votes['no_votes'][] = $detail;
+                $votes['no_votes'][] = $detail;
             } else if ($vote['vote'] == 'absent') {
-              $votes['absent_votes'][] = $detail;
+                $votes['absent_votes'][] = $detail;
             } else if ($vote['vote'] == 'both') {
-              $votes['both_votes'][] = $detail;
+                $votes['both_votes'][] = $detail;
             }
 
         }
@@ -338,11 +338,11 @@ 
         $divisions = array();
         $row_count = $q->rows();
         for ($n = 0; $n < $row_count; $n++) {
-          if ($context == 'Parliament') {
-              $divisions[] = $this->getParliamentDivisionDetails($q->row($n));
-          } else {
-              $divisions[] = $this->getDivisionDetails($q->row($n));
-          }
+            if ($context == 'Parliament') {
+                $divisions[] = $this->getParliamentDivisionDetails($q->row($n));
+            } else {
+                $divisions[] = $this->getDivisionDetails($q->row($n));
+            }
         }
 
         return $divisions;
@@ -444,13 +444,13 @@ 
 
         $division['mp_vote'] = '';
         if (array_key_exists('vote', $row)) {
-          $mp_vote = ' was absent';
-          if ($row['vote'] == 'aye') {
-              $mp_vote = 'voted in favour';
-          } else if ($row['vote'] == 'no') {
-              $mp_vote = 'voted against';
-          }
-          $division['mp_vote'] = $mp_vote;
+            $mp_vote = ' was absent';
+            if ($row['vote'] == 'aye') {
+                $mp_vote = 'voted in favour';
+            } else if ($row['vote'] == 'no') {
+                $mp_vote = 'voted against';
+            }
+            $division['mp_vote'] = $mp_vote;
         }
         $division['division_title'] = $row['division_title'];
         $division['vote'] = $vote;

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

@@ -29,7 +29,7 @@ 
      * @param Member   $member   The member to get positions for.
      */
 
-    public function __construct(Member $member = NULL, PolicyPositions $positions = NULL, Policies $policies = NULL)
+    public function __construct(Member $member = null, PolicyPositions $positions = null, Policies $policies = null)
     {
         $this->member = $member;
         $this->positions = $positions;
@@ -177,7 +177,7 @@ 
               $summary['absent'] += $q->field($n, 'total');
           } else if ( $vote == 'both' ) {
               $summary['both'] += $q->field($n, 'total');
-          } else if ( strpos($vote, 'tell') !== FALSE ) {
+          } else if ( strpos($vote, 'tell') !== false ) {
               $summary['tell'] += $q->field($n, 'total');
           } else if ( $policy_vote == $vote ) {
               $summary['for'] += $q->field($n, 'total');
@@ -232,7 +232,7 @@ 
               'teller' => false
             );
 
-            if (strpos($vote['vote'], 'tell') !== FALSE) {
+            if (strpos($vote['vote'], 'tell') !== false) {
                 $detail['teller'] = true;
             }
 
@@ -399,10 +399,10 @@ 
         $division = array();
 
         $direction = $row['direction'];
-        if ( strpos( $direction, 'strong') !== FALSE ) {
-            $division['strong'] = TRUE;
+        if ( strpos( $direction, 'strong') !== false ) {
+            $division['strong'] = true;
         } else {
-            $division['strong'] = FALSE;
+            $division['strong'] = false;
         }
 
         $division['division_id'] = $row['division_id'];

Spacing +18 added lines, -18 removed lines

@@ -46,7 +46,7 @@ 
       $policy_maxes = array();
       $row_count = $q->rows();
       for ($n = 0; $n < $row_count; $n++) {
-        $policy_maxes[$q->field($n, 'policy_id')] = $q->field( $n, 'recent' );
+        $policy_maxes[$q->field($n, 'policy_id')] = $q->field($n, 'recent');
       }
       $policy_maxes['latest'] = $policy_maxes ? max(array_values($policy_maxes)) : '';
       return $policy_maxes;
@@ -117,7 +117,7 @@ 
     public function getMemberDivisionsForPolicy($policyID = null) {
         $where_extra = '';
         $args = array(':person_id' => $this->member->person_id);
-        if ( $policyID ) {
+        if ($policyID) {
             $where_extra = 'AND policy_id = :policy_id';
             $args[':policy_id'] = $policyID;
         }
@@ -173,15 +173,15 @@ 
 
           $vote = $q->field($n, 'vote');
           $policy_vote = str_replace('3', '', $q->field($n, 'policy_vote'));
-          if ( $vote == 'absent' ) {
+          if ($vote == 'absent') {
               $summary['absent'] += $q->field($n, 'total');
-          } else if ( $vote == 'both' ) {
+          } else if ($vote == 'both') {
               $summary['both'] += $q->field($n, 'total');
-          } else if ( strpos($vote, 'tell') !== FALSE ) {
+          } else if (strpos($vote, 'tell') !== FALSE) {
               $summary['tell'] += $q->field($n, 'total');
-          } else if ( $policy_vote == $vote ) {
+          } else if ($policy_vote == $vote) {
               $summary['for'] += $q->field($n, 'total');
-          } else if ( $policy_vote != $vote ) {
+          } else if ($policy_vote != $vote) {
               $summary['against'] += $q->field($n, 'total');
           }
 
@@ -284,10 +284,10 @@ 
             $votes['against'] . ' ' . make_plural('vote', $votes['against']) . ' against'
         );
 
-        if ( $votes['both'] ) {
+        if ($votes['both']) {
             $actions[] = $votes['both'] . ' ' . make_plural('abstention', $votes['both']);
         }
-        if ( $votes['absent'] ) {
+        if ($votes['absent']) {
             $actions[] = $votes['absent'] . ' ' . make_plural('absence', $votes['absent']);
         }
         if ($max == $min) {
@@ -351,7 +351,7 @@ 
 
     private function constructYesNoVoteDescription($direction, $title, $short_text) {
         $text = ' voted ';
-        if ( $short_text ) {
+        if ($short_text) {
             $text .= $short_text;
         } else {
             $text .= "$direction on <em>$title</em>";
@@ -369,7 +369,7 @@ 
          * votes so we need to generate some text using the title of the division
          */
 
-        switch ( strtolower($vote) ) {
+        switch (strtolower($vote)) {
             case 'yes':
             case 'aye':
                 $description = $this->constructYesNoVoteDescription('yes', $division_title, $yes_text);
@@ -399,7 +399,7 @@ 
         $division = array();
 
         $direction = $row['direction'];
-        if ( strpos( $direction, 'strong') !== FALSE ) {
+        if (strpos($direction, 'strong') !== FALSE) {
             $division['strong'] = TRUE;
         } else {
             $division['strong'] = FALSE;
@@ -471,24 +471,24 @@ 
         for ($n = 0; $n < $row_count; $n++) {
             $policy_id = $q->field($n, 'policy_id');
 
-            if ( !array_key_exists($policy_id, $policies) ) {
+            if (!array_key_exists($policy_id, $policies)) {
                 $policies[$policy_id] = array(
                     'policy_id' => $policy_id,
                     'weak_count' => 0,
                     'divisions' => array()
                 );
-                if ( $this->policies ) {
+                if ($this->policies) {
                     $policies[$policy_id]['desc'] = $this->policies->getPolicies()[$policy_id];
                     $policies[$policy_id]['header'] = $this->policies->getPolicyDetails($policy_id);
                 }
-                if ( $this->positions ) {
+                if ($this->positions) {
                     $policies[$policy_id]['position'] = $this->positions->positionsById[$policy_id];
                 }
             }
 
             $division = $this->getDivisionDetails($q->row($n));
 
-            if ( !$division['strong'] ) {
+            if (!$division['strong']) {
                 $policies[$policy_id]['weak_count']++;
             }
 
@@ -503,9 +503,9 @@ 
 
         $gid = get_canonical_gid($gid);
 
-        $q = $this->db->query("SELECT gid, major FROM hansard WHERE epobject_id = ( SELECT subsection_id FROM hansard WHERE gid = :gid )", array( ':gid' => $gid ));
+        $q = $this->db->query("SELECT gid, major FROM hansard WHERE epobject_id = ( SELECT subsection_id FROM hansard WHERE gid = :gid )", array(':gid' => $gid));
         $parent_gid = $q->field(0, 'gid');
-        if ( !$parent_gid ) {
+        if (!$parent_gid) {
             return '';
         }
         $parent_gid = fix_gid_from_db($parent_gid);

Braces +24 added lines, -12 removed lines

@@ -175,13 +175,17 @@ 
           $policy_vote = str_replace('3', '', $q->field($n, 'policy_vote'));
           if ( $vote == 'absent' ) {
               $summary['absent'] += $q->field($n, 'total');
-          } else if ( $vote == 'both' ) {
+          }
+          else if ( $vote == 'both' ) {
               $summary['both'] += $q->field($n, 'total');
-          } else if ( strpos($vote, 'tell') !== FALSE ) {
+          }
+          else if ( strpos($vote, 'tell') !== FALSE ) {
               $summary['tell'] += $q->field($n, 'total');
-          } else if ( $policy_vote == $vote ) {
+          }
+          else if ( $policy_vote == $vote ) {
               $summary['for'] += $q->field($n, 'total');
-          } else if ( $policy_vote != $vote ) {
+          }
+          else if ( $policy_vote != $vote ) {
               $summary['against'] += $q->field($n, 'total');
           }
 
@@ -238,11 +242,14 @@ 
 
             if ($vote['vote'] == 'aye' or $vote['vote'] == 'tellaye') {
               $votes['yes_votes'][] = $detail;
-            } else if ($vote['vote'] == 'no' or $vote['vote'] == 'tellno') {
+            }
+            else if ($vote['vote'] == 'no' or $vote['vote'] == 'tellno') {
               $votes['no_votes'][] = $detail;
-            } else if ($vote['vote'] == 'absent') {
+            }
+            else if ($vote['vote'] == 'absent') {
               $votes['absent_votes'][] = $detail;
-            } else if ($vote['vote'] == 'both') {
+            }
+            else if ($vote['vote'] == 'both') {
               $votes['both_votes'][] = $detail;
             }
 
@@ -292,7 +299,8 @@ 
         }
         if ($max == $min) {
             return join(', ', $actions) . ', in ' . $max;
-        } else {
+        }
+        else {
             return join(', ', $actions) . ', between ' . $min . '–' . $max;
         }
     }
@@ -340,7 +348,8 @@ 
         for ($n = 0; $n < $row_count; $n++) {
           if ($context == 'Parliament') {
               $divisions[] = $this->getParliamentDivisionDetails($q->row($n));
-          } else {
+          }
+          else {
               $divisions[] = $this->getDivisionDetails($q->row($n));
           }
         }
@@ -353,7 +362,8 @@ 
         $text = ' voted ';
         if ( $short_text ) {
             $text .= $short_text;
-        } else {
+        }
+        else {
             $text .= "$direction on <em>$title</em>";
         }
 
@@ -401,7 +411,8 @@ 
         $direction = $row['direction'];
         if ( strpos( $direction, 'strong') !== FALSE ) {
             $division['strong'] = TRUE;
-        } else {
+        }
+        else {
             $division['strong'] = FALSE;
         }
 
@@ -447,7 +458,8 @@ 
           $mp_vote = ' was absent';
           if ($row['vote'] == 'aye') {
               $mp_vote = 'voted in favour';
-          } else if ($row['vote'] == 'no') {
+          }
+          else if ($row['vote'] == 'no') {
               $mp_vote = 'voted against';
           }
           $division['mp_vote'] = $mp_vote;

classes/Party.php

Spacing +25 added lines, -25 removed lines

@@ -20,7 +20,7 @@ 
     public function __construct($name) {
         // treat Labour and Labour/Co-operative the same as that's how
         // people view them and it'll confuse the results otherwise
-        if ( $name == 'Labour/Co-operative' ) {
+        if ($name == 'Labour/Co-operative') {
             $name = 'Labour';
         }
         $this->name = $name;
@@ -42,7 +42,7 @@ 
                 ':date' => date('Y-m-d'),
             )
         );
-        if ( $member_count->rows ) {
+        if ($member_count->rows) {
             $num_members = $member_count->field(0, 'num_members');
             return $num_members;
         } else {
@@ -70,12 +70,12 @@ 
             )
         );
 
-        if ( $position->rows ) {
+        if ($position->rows) {
             $score = $position->field(0, 'score');
             $score_desc = score_to_strongly($score);
 
-            if ( $want_score ) {
-                return array( $score_desc, $score);
+            if ($want_score) {
+                return array($score_desc, $score);
             } else {
                 return $score_desc;
             }
@@ -114,7 +114,7 @@ 
             ':party' => $this->name
         );
 
-        if ( $this->name == 'Labour' ) {
+        if ($this->name == 'Labour') {
             $party_where = '( party = :party OR party = :party2 )';
             $params = array(
                 ':party' => $this->name,
@@ -122,7 +122,7 @@ 
             );
         }
 
-        for ( $i = 0; $i < $num_divs; $i++ ) {
+        for ($i = 0; $i < $num_divs; $i++) {
             $division_id = $divisions->field($i, 'division_id');
             $weights = $this->get_vote_scores($divisions->field($i, 'policy_vote'));
 
@@ -142,42 +142,42 @@ 
             );
 
             $num_votes = 0;
-            for ( $j = 0; $j < $votes->rows(); $j++ ) {
+            for ($j = 0; $j < $votes->rows(); $j++) {
                 $vote_dir = $votes->field($j, 'vote');
-                if ( $vote_dir == '' ) continue;
-                if ( $vote_dir == 'tellno' ) $vote_dir = 'no';
-                if ( $vote_dir == 'tellaye' ) $vote_dir = 'aye';
+                if ($vote_dir == '') continue;
+                if ($vote_dir == 'tellno') $vote_dir = 'no';
+                if ($vote_dir == 'tellaye') $vote_dir = 'aye';
 
                 $num_votes += $votes->field($j, 'num_votes');
                 $score += ($votes->field($j, 'num_votes') * $weights[$vote_dir]);
             }
 
             $total_votes += $num_votes;
-            $max_score += $num_votes * max( array_values( $weights ) );
+            $max_score += $num_votes * max(array_values($weights));
         }
 
-        if ( $total_votes == 0 ) {
+        if ($total_votes == 0) {
             return null;
         }
 
         // this implies that all the divisions in the policy have a policy
         // position of absent so we set weight to -1 to indicate we can't
         // really say what the parties position is.
-        if ( $max_score == 0 ) {
+        if ($max_score == 0) {
             $weight = -1;
         } else {
-            $weight = 1 - ( $score/$max_score );
+            $weight = 1 - ($score / $max_score);
         }
         $score_desc = score_to_strongly($weight);
 
-        if ( $want_score ) {
-            return array( $score_desc, $weight);
+        if ($want_score) {
+            return array($score_desc, $weight);
         } else {
             return $score_desc;
         }
     }
 
-    public function cache_position( $position ) {
+    public function cache_position($position) {
         $this->db->query(
             "REPLACE INTO partypolicy
                 (party, house, policy_id, score)
@@ -197,9 +197,9 @@ 
             return $positions;
         }
 
-        foreach ( $policies->getPolicies() as $policy_id => $policy_text ) {
-            list( $position, $score ) = $this->$method($policy_id, true);
-            if ( $position === null ) {
+        foreach ($policies->getPolicies() as $policy_id => $policy_text) {
+            list($position, $score) = $this->$method($policy_id, true);
+            if ($position === null) {
                 continue;
             }
 
@@ -219,7 +219,7 @@ 
         $both = 1;
         $agree = 10;
 
-        if ( stripos($vote, '3') !== FALSE ) {
+        if (stripos($vote, '3') !== FALSE) {
             $agree = 50;
             $absent = 25;
             $both = 25;
@@ -230,10 +230,10 @@ 
             'both' => $both
         );
 
-        if ( stripos($vote, 'aye') !== FALSE ) {
+        if (stripos($vote, 'aye') !== FALSE) {
             $scores['aye'] = $agree;
             $scores['no'] = 0;
-        } else if ( stripos($vote, 'no') !== FALSE ) {
+        } else if (stripos($vote, 'no') !== FALSE) {
             $scores['no'] = $agree;
             $scores['aye'] = 0;
         } else {
@@ -256,7 +256,7 @@ 
         $parties = array();
         $party_count = $party_list->rows;
 
-        for ( $i = 0; $i < $party_count; $i++ ) {
+        for ($i = 0; $i < $party_count; $i++) {
             $party = $party_list->field($i, 'party');
             if (
                 !$party

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

@@ -219,7 +219,7 @@ 
         $both = 1;
         $agree = 10;
 
-        if ( stripos($vote, '3') !== FALSE ) {
+        if ( stripos($vote, '3') !== false ) {
             $agree = 50;
             $absent = 25;
             $both = 25;
@@ -230,10 +230,10 @@ 
             'both' => $both
         );
 
-        if ( stripos($vote, 'aye') !== FALSE ) {
+        if ( stripos($vote, 'aye') !== false ) {
             $scores['aye'] = $agree;
             $scores['no'] = 0;
-        } else if ( stripos($vote, 'no') !== FALSE ) {
+        } else if ( stripos($vote, 'no') !== false ) {
             $scores['no'] = $agree;
             $scores['aye'] = 0;
         } else {

Braces +23 added lines, -10 removed lines

@@ -45,7 +45,8 @@ 
         if ( $member_count->rows ) {
             $num_members = $member_count->field(0, 'num_members');
             return $num_members;
-        } else {
+        }
+        else {
             return 0;
         }
     }
@@ -76,10 +77,12 @@ 
 
             if ( $want_score ) {
                 return array( $score_desc, $score);
-            } else {
+            }
+            else {
                 return $score_desc;
             }
-        } else {
+        }
+        else {
             return null;
         }
     }
@@ -144,9 +147,15 @@ 
             $num_votes = 0;
             for ( $j = 0; $j < $votes->rows(); $j++ ) {
                 $vote_dir = $votes->field($j, 'vote');
-                if ( $vote_dir == '' ) continue;
-                if ( $vote_dir == 'tellno' ) $vote_dir = 'no';
-                if ( $vote_dir == 'tellaye' ) $vote_dir = 'aye';
+                if ( $vote_dir == '' ) {
+                    continue;
+                }
+                if ( $vote_dir == 'tellno' ) {
+                    $vote_dir = 'no';
+                }
+                if ( $vote_dir == 'tellaye' ) {
+                    $vote_dir = 'aye';
+                }
 
                 $num_votes += $votes->field($j, 'num_votes');
                 $score += ($votes->field($j, 'num_votes') * $weights[$vote_dir]);
@@ -165,14 +174,16 @@ 
         // really say what the parties position is.
         if ( $max_score == 0 ) {
             $weight = -1;
-        } else {
+        }
+        else {
             $weight = 1 - ( $score/$max_score );
         }
         $score_desc = score_to_strongly($weight);
 
         if ( $want_score ) {
             return array( $score_desc, $weight);
-        } else {
+        }
+        else {
             return $score_desc;
         }
     }
@@ -233,10 +244,12 @@ 
         if ( stripos($vote, 'aye') !== FALSE ) {
             $scores['aye'] = $agree;
             $scores['no'] = 0;
-        } else if ( stripos($vote, 'no') !== FALSE ) {
+        }
+        else if ( stripos($vote, 'no') !== FALSE ) {
             $scores['no'] = $agree;
             $scores['aye'] = 0;
-        } else {
+        }
+        else {
             $scores['both'] = 0;
             $scores['absent'] = 0;
             $scores['no'] = 0;

classes/Office.php

Indentation +25 added lines, -25 removed lines

@@ -19,12 +19,12 @@ 
     public $source;
 
     /**
-    * To String
-    *
-    * Return the office title as a string.
-    *
-    * @return string The title of the office, or "Unnamed Office"
-    */
+     * To String
+     *
+     * Return the office title as a string.
+     *
+     * @return string The title of the office, or "Unnamed Office"
+     */
 
     public function __toString() {
         if (isset ($this->title)){
@@ -35,25 +35,25 @@ 
     }
 
     /**
-    * Pretty Dates
-    *
-    * Return a string containing prettified dates of this office.
-    *
-    * 2004-05-28 and 2004-05-13 are the first dates for data scraped from the
-    * old selctee/privsec pages on parliament.uk (you can see this in
-    * cmpages/chgpages' privsec0001_2004-06-08.html and
-    * selctee0001_2004-06-08.html). So if the date is those dates for those two
-    * things, you don't want to display it because it's not a known start date,
-    * it could have been before that date. 2005-11-10 is because the PPS changes
-    * did not all happen on that date but the website did not update until that
-    * date so it outputs "before" in either from/to date in that case.
-    * 2009-01-16 is the last date before the page disappeared off parliament.uk
-    * entirely so that displays that fact that after then we don't know.
-    *
-    * @todo https://github.com/mysociety/theyworkforyou/issues/632
-    *
-    * @return string The dates of this office in a readable form.
-    */
+     * Pretty Dates
+     *
+     * Return a string containing prettified dates of this office.
+     *
+     * 2004-05-28 and 2004-05-13 are the first dates for data scraped from the
+     * old selctee/privsec pages on parliament.uk (you can see this in
+     * cmpages/chgpages' privsec0001_2004-06-08.html and
+     * selctee0001_2004-06-08.html). So if the date is those dates for those two
+     * things, you don't want to display it because it's not a known start date,
+     * it could have been before that date. 2005-11-10 is because the PPS changes
+     * did not all happen on that date but the website did not update until that
+     * date so it outputs "before" in either from/to date in that case.
+     * 2009-01-16 is the last date before the page disappeared off parliament.uk
+     * entirely so that displays that fact that after then we don't know.
+     *
+     * @todo https://github.com/mysociety/theyworkforyou/issues/632
+     *
+     * @return string The dates of this office in a readable form.
+     */
 
     public function pretty_dates() {
 

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

@@ -64,7 +64,7 @@
         $output = '';
 
         if (
-            !($this->source == 'chgpages/selctee' && $this->from_date == '2004-05-28') AND
+            !($this->source == 'chgpages/selctee' && $this->from_date == '2004-05-28') and
             !($this->source == 'chgpages/privsec' && $this->from_date == '2004-05-13')
         ) {
             if ($this->source == 'chgpages/privsec' && $this->from_date == '2005-11-10') {

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
     */
 
     public function __toString() {
-        if (isset ($this->title)){
+        if (isset ($this->title)) {
             return (string) $this->title;
         } else {
             return 'Unnamed Office';
@@ -70,7 +70,7 @@ 
             if ($this->source == 'chgpages/privsec' && $this->from_date == '2005-11-10') {
                 $output .= 'before ';
             }
-            $output .= format_date($this->from_date,SHORTDATEFORMAT) . ' ';
+            $output .= format_date($this->from_date, SHORTDATEFORMAT) . ' ';
         }
 
         $output .= 'to ';

Braces +5 added lines, -3 removed lines

@@ -27,9 +27,10 @@ 
     */
 
     public function __toString() {
-        if (isset ($this->title)){
+        if (isset ($this->title)) {
             return (string) $this->title;
-        } else {
+        }
+        else {
             return 'Unnamed Office';
         }
     }
@@ -81,7 +82,8 @@ 
 
         if ($this->source == 'chgpages/privsec' && $this->to_date == '2009-01-16') {
             $output .= '<a href="/help/#pps_unknown">unknown</a>';
-        } else {
+        }
+        else {
             $output .= format_date($this->to_date, SHORTDATEFORMAT);
         }