mysociety / theyworkforyou

www/includes/easyparliament/templates/html/mp/votes.php

Indentation +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
                                 $policy_group = $segment['key'];
 
                                 if (isset($policy_last_update[$policy_id]) && $policy_last_update[$policy_id] > $most_recent) {
-                                  $most_recent = $policy_last_update[$policy_id];
+                                    $most_recent = $policy_last_update[$policy_id];
                                 }
 
                                 if ( $key_vote['has_strong'] || $key_vote['position'] == 'has never voted on' ) {
@@ -111,7 +111,7 @@ 
 
                                 include '_vote_description.php';
 
-                              } ?>
+                                } ?>
                             </ul>
 
                             <div class="share-vote-descriptions">

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
                                   $most_recent = $policy_last_update[$policy_id];
                                 }
 
-                                if ( $key_vote['has_strong'] || $key_vote['position'] == 'has never voted on' ) {
+                                if ($key_vote['has_strong'] || $key_vote['position'] == 'has never voted on') {
                                     $description = ucfirst($key_vote['desc']);
                                 } else {
                                     $description = sprintf(
@@ -101,7 +101,7 @@ 
                                     $party_position = $diff['party_position'];
                                     $party_score_difference = $diff["score_difference"];
                                     if ($sorted_diffs[$policy_id]['score_difference'] > $min_diff_score && $party_member_count > 1) {
-                                        $party_voting_line = sprintf( 'Comparable %s MPs %s (%s).', $comparison_party, $diff['party_position'], $diff['party_voting_summary']);
+                                        $party_voting_line = sprintf('Comparable %s MPs %s (%s).', $comparison_party, $diff['party_position'], $diff['party_voting_summary']);
                                     }
                                 } else {
                                     $party_voting_line = null;

Braces +5 added lines, -2 removed lines

@@ -146,13 +146,16 @@
 
                         <?php endif; ?>
 
-                    <?php else: ?>
+                    <?php else {
+    : ?>
 
                         <div class="panel">
                             <p>This person has not voted on any of the key issues which we keep track of.</p>
                         </div>
 
-                    <?php endif; ?>
+                    <?php endif;
+}
+?>
 
                 <?php endif; ?>
                 <?php include('_covid19_panel.php'); ?>

scripts/alertmailer.php

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

@@ -423,7 +423,7 @@
 
     $text .= '====================';
     $sentemails++;
-    mlog("SEND $sentemails : Sending email to $current[email] ... ");
+    mlog("send $sentemails : Sending email to $current[email] ... ");
     $d = array('to' => $current['email'], 'template' => $template);
     $m = array(
         'DATA' => $text,

Spacing +1 added lines, -1 removed lines

@@ -245,7 +245,7 @@
     $data = $DEBATELIST->_get_data_by_search($args);
     $total_results = $data['info']['total_results'];
     $queries++;
-    mlog(", hits " . $total_results . ", time " . (getmicrotime()-$start) . "\n");
+    mlog(", hits " . $total_results . ", time " . (getmicrotime() - $start) . "\n");
 
     # Divisions
     if (preg_match('#^speaker:(\d+)$#', $criteria_raw, $m)) {

classes/Divisions.php

Indentation +57 added lines, -57 removed lines

@@ -192,7 +192,7 @@ 
 
         $divisions = array();
         foreach ($q as $row) {
-          $divisions[] = $this->getParliamentDivisionDetails($row);
+            $divisions[] = $this->getParliamentDivisionDetails($row);
         }
 
         return $divisions;
@@ -247,44 +247,44 @@ 
         );
 
         foreach ($q as $row) {
-          $policy_id = $row['policy_id'];
+            $policy_id = $row['policy_id'];
 
-          if (!array_key_exists($policy_id, $policy_divisions)) {
+            if (!array_key_exists($policy_id, $policy_divisions)) {
             $summary = array(
-              'max' => $row['latest'],
-              'min' => $row['earliest'],
-              'total' => $row['total'],
-              'for' => 0, 'against' => 0, 'absent' => 0, 'both' => 0, 'tell' => 0
+                'max' => $row['latest'],
+                'min' => $row['earliest'],
+                'total' => $row['total'],
+                'for' => 0, 'against' => 0, 'absent' => 0, 'both' => 0, 'tell' => 0
             );
 
             $policy_divisions[$policy_id] = $summary;
-          }
-
-          $summary = $policy_divisions[$policy_id];
-
-          $summary['total'] += $row['total'];
-          if ($summary['max'] < $row['latest']) {
-              $summary['max'] = $row['latest'];
-          }
-          if ($summary['min'] > $row['latest']) {
-              $summary['min'] = $row['latest'];
-          }
-
-          $vote = $row['vote'];
-          $policy_vote = str_replace('3', '', $row['policy_vote']);
-          if ( $vote == 'absent' ) {
-              $summary['absent'] += $row['total'];
-          } else if ( $vote == 'both' ) {
-              $summary['both'] += $row['total'];
-          } else if ( strpos($vote, 'tell') !== false ) {
-              $summary['tell'] += $row['total'];
-          } else if ( $policy_vote == $vote ) {
-              $summary['for'] += $row['total'];
-          } else if ( $policy_vote != $vote ) {
-              $summary['against'] += $row['total'];
-          }
-
-          $policy_divisions[$policy_id] = $summary;
+            }
+
+            $summary = $policy_divisions[$policy_id];
+
+            $summary['total'] += $row['total'];
+            if ($summary['max'] < $row['latest']) {
+                $summary['max'] = $row['latest'];
+            }
+            if ($summary['min'] > $row['latest']) {
+                $summary['min'] = $row['latest'];
+            }
+
+            $vote = $row['vote'];
+            $policy_vote = str_replace('3', '', $row['policy_vote']);
+            if ( $vote == 'absent' ) {
+                $summary['absent'] += $row['total'];
+            } else if ( $vote == 'both' ) {
+                $summary['both'] += $row['total'];
+            } else if ( strpos($vote, 'tell') !== false ) {
+                $summary['tell'] += $row['total'];
+            } else if ( $policy_vote == $vote ) {
+                $summary['for'] += $row['total'];
+            } else if ( $policy_vote != $vote ) {
+                $summary['against'] += $row['total'];
+            }
+
+            $policy_divisions[$policy_id] = $summary;
         }
 
         return $policy_divisions;
@@ -338,17 +338,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()
         );
 
         $party_breakdown = 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()
         );
 
         # Sort Lords specially
@@ -359,12 +359,12 @@ 
 
         foreach ($data as $vote) {
             $detail = array(
-              'person_id' => $vote['person_id'],
-              'name' => ucfirst(member_full_name($args['house'], $vote['title'], $vote['given_name'],
+                'person_id' => $vote['person_id'],
+                'name' => ucfirst(member_full_name($args['house'], $vote['title'], $vote['given_name'],
                     $vote['family_name'], $vote['lordofname'])),
-              'party' => $vote['party'],
-              'proxy' => false,
-              'teller' => false
+                'party' => $vote['party'],
+                'proxy' => false,
+                'teller' => false
             );
 
             if (strpos($vote['vote'], 'tell') !== false) {
@@ -385,23 +385,23 @@ 
             }
 
             if ($vote['vote'] == 'aye' or $vote['vote'] == 'tellaye') {
-              $votes['yes_votes'][] = $detail;
-              @$party_breakdown['yes_votes'][$detail['party']]++;
+                $votes['yes_votes'][] = $detail;
+                @$party_breakdown['yes_votes'][$detail['party']]++;
             } else if ($vote['vote'] == 'no' or $vote['vote'] == 'tellno') {
-              $votes['no_votes'][] = $detail;
-              @$party_breakdown['no_votes'][$detail['party']]++;
+                $votes['no_votes'][] = $detail;
+                @$party_breakdown['no_votes'][$detail['party']]++;
             } else if ($vote['vote'] == 'absent') {
-              $votes['absent_votes'][] = $detail;
-              @$party_breakdown['absent_votes'][$detail['party']]++;
+                $votes['absent_votes'][] = $detail;
+                @$party_breakdown['absent_votes'][$detail['party']]++;
             } else if ($vote['vote'] == 'both') {
-              $votes['both_votes'][] = $detail;
-              @$party_breakdown['both_votes'][$detail['party']]++;
+                $votes['both_votes'][] = $detail;
+                @$party_breakdown['both_votes'][$detail['party']]++;
             }
         }
 
         foreach ($votes as $vote => $count) { // array('yes_votes', 'no_votes', 'absent_votes', 'both_votes') as $vote) {
-          $votes[$vote . '_by_party'] = $votes[$vote];
-          usort($votes[$vote . '_by_party'], function ($a, $b) {
+            $votes[$vote . '_by_party'] = $votes[$vote];
+            usort($votes[$vote . '_by_party'], function ($a, $b) {
                 return $a['party']>$b['party'];
             });
         }

Spacing +24 added lines, -24 removed lines

@@ -68,11 +68,11 @@ 
             ':count' => $number
         );
 
-        if ( is_string($houses) ) {
-            $houses = array( $houses );
+        if (is_string($houses)) {
+            $houses = array($houses);
         }
 
-        if ( is_array($houses) && count($houses) > 0 ) {
+        if (is_array($houses) && count($houses) > 0) {
             $where = 'WHERE house IN ("' . implode('", "', $houses) . '")';
         } elseif (LANGUAGE == 'cy') {
             $where = "WHERE divisions.division_id NOT LIKE '%-en-%'";
@@ -80,7 +80,7 @@ 
             $where = "WHERE divisions.division_id NOT LIKE '%-cy-%'";
         }
 
-        if ( $this->member ) {
+        if ($this->member) {
             $select = "SELECT divisions.*, vote FROM divisions
                 LEFT JOIN persondivisionvotes ON divisions.division_id=persondivisionvotes.division_id AND person_id=:person_id";
             $params[':person_id'] = $this->member->person_id;
@@ -219,7 +219,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;
         }
@@ -276,15 +276,15 @@ 
 
           $vote = $row['vote'];
           $policy_vote = str_replace('3', '', $row['policy_vote']);
-          if ( $vote == 'absent' ) {
+          if ($vote == 'absent') {
               $summary['absent'] += $row['total'];
-          } else if ( $vote == 'both' ) {
+          } else if ($vote == 'both') {
               $summary['both'] += $row['total'];
-          } else if ( strpos($vote, 'tell') !== false ) {
+          } else if (strpos($vote, 'tell') !== false) {
               $summary['tell'] += $row['total'];
-          } else if ( $policy_vote == $vote ) {
+          } else if ($policy_vote == $vote) {
               $summary['for'] += $row['total'];
-          } else if ( $policy_vote != $vote ) {
+          } else if ($policy_vote != $vote) {
               $summary['against'] += $row['total'];
           }
 
@@ -381,7 +381,7 @@ 
                     FROM person_names AS pn
                     WHERE person_id = :person_id
                     AND start_date <= :division_date AND end_date >= :division_date",
-                    [ ':person_id' => $vote['proxy'], ':division_date' => $row['division_date'] ]
+                    [':person_id' => $vote['proxy'], ':division_date' => $row['division_date']]
                 )->first();
                 $detail['proxy'] = ucfirst(member_full_name(
                     HOUSE_TYPE_COMMONS, $q['title'], $q['given_name'],
@@ -405,8 +405,8 @@ 
 
         foreach ($votes as $vote => $count) { // array('yes_votes', 'no_votes', 'absent_votes', 'both_votes') as $vote) {
           $votes[$vote . '_by_party'] = $votes[$vote];
-          usort($votes[$vote . '_by_party'], function ($a, $b) {
-                return $a['party']>$b['party'];
+          usort($votes[$vote . '_by_party'], function($a, $b) {
+                return $a['party'] > $b['party'];
             });
         }
 
@@ -460,10 +460,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) {
@@ -520,8 +520,8 @@ 
     }
 
     private function constructYesNoVoteDescription($direction, $title, $short_text) {
-        $text = ' ' ;
-        if ( $short_text ) {
+        $text = ' ';
+        if ($short_text) {
             $text .= sprintf(gettext('voted %s'), $short_text);
         } else {
             $text .= sprintf(gettext('voted %s on <em>%s</em>'), $direction, $title);
@@ -538,7 +538,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);
@@ -586,7 +586,7 @@ 
 
         if (array_key_exists('direction', $row)) {
             $division['direction'] = $row['direction'];
-            if ( strpos( $row['direction'], 'strong') !== false ) {
+            if (strpos($row['direction'], 'strong') !== false) {
                 $division['strong'] = true;
             } else {
                 $division['strong'] = false;
@@ -618,24 +618,24 @@ 
         foreach ($q as $row) {
             $policy_id = $row['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($row);
 
-            if ( !$division['strong'] ) {
+            if (!$division['strong']) {
                 $policies[$policy_id]['weak_count']++;
             }
 
@@ -650,7 +650,7 @@ 
 
         $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 ))->first();
+        $q = $this->db->query("SELECT gid, major FROM hansard WHERE epobject_id = ( SELECT subsection_id FROM hansard WHERE gid = :gid )", array(':gid' => $gid))->first();
         if (!$q) {
             return '';
         }

classes/Model/Featured.php

Spacing +4 added lines, -4 removed lines

@@ -64,7 +64,7 @@ 
 
         if ($q) {
             $text = $q['value'];
-            if ( trim($text) == '' ) {
+            if (trim($text) == '') {
                 $text = null;
             }
         }
@@ -73,7 +73,7 @@ 
     }
 
     private function _set($key, $value) {
-        if ( trim($value) == '' ) {
+        if (trim($value) == '') {
             $value = null;
         }
         $check_q = $this->db->query(
@@ -82,7 +82,7 @@ 
                 ':key' => $key
             )
         );
-        if ( $check_q->rows() ) {
+        if ($check_q->rows()) {
             $set_q = $this->db->query("UPDATE editorial set value = :value WHERE item = :key",
                 array(
                     ':key' => $key,
@@ -98,7 +98,7 @@ 
             );
         }
 
-        if ( $set_q->success() ) {
+        if ($set_q->success()) {
             return true;
         }
         return false;

classes/SectionView/SpwransView.php

Spacing +20 added lines, -20 removed lines

@@ -21,7 +21,7 @@ 
         $this_page = 'spwransfront';
         $data = array();
 
-        $args = array( 'months' => 1 );
+        $args = array('months' => 1);
         $WRANSLIST = new \SPWRANSLIST;
 
         $wrans = array();
@@ -43,7 +43,7 @@ 
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'spwrans' )
+            array('section' => 'spwrans')
         );
     }
 
@@ -54,29 +54,29 @@ 
         $SPWRANSLIST = new \SPWRANSLIST;
         $gid = $SPWRANSLIST->get_gid_from_spid($spid);
         if ($gid) {
-            if (preg_match('/uk\.org\.publicwhip\/spwa\/(\d{4}-\d\d-\d\d\.(.*))/',$gid,$m)) {
+            if (preg_match('/uk\.org\.publicwhip\/spwa\/(\d{4}-\d\d-\d\d\.(.*))/', $gid, $m)) {
                 $URL = new \MySociety\TheyWorkForYou\Url('spwrans');
                 $URL->reset();
-                $URL->insert( array('id' => $m[1]) );
+                $URL->insert(array('id' => $m[1]));
                 $fragment_identifier = '#g' . $m[2];
                 header('Location: ' . $URL->generate('none') . $fragment_identifier, true, 303);
                 exit;
-            } elseif (preg_match('/uk\.org\.publicwhip\/spor\/(\d{4}-\d\d-\d\d\.(.*))/',$gid,$m)) {
+            } elseif (preg_match('/uk\.org\.publicwhip\/spor\/(\d{4}-\d\d-\d\d\.(.*))/', $gid, $m)) {
                 $URL = new \MySociety\TheyWorkForYou\Url('spdebates');
                 $URL->reset();
-                $URL->insert( array('id' => $m[1]) );
+                $URL->insert(array('id' => $m[1]));
                 $fragment_identifier = '#g' . $m[2];
                 header('Location: ' . $URL->generate('none') . $fragment_identifier, true, 303);
                 exit;
             } else {
-                $PAGE->error_message ("Strange GID ($gid) for that Scottish Parliament ID.");
+                $PAGE->error_message("Strange GID ($gid) for that Scottish Parliament ID.");
             }
         }
-        $PAGE->error_message ("Couldn't match that Scottish Parliament ID to a GID.");
+        $PAGE->error_message("Couldn't match that Scottish Parliament ID to a GID.");
     }
 
     protected function get_question_mentions_html($row_data) {
-        if( count($row_data) == 0 ) {
+        if (count($row_data) == 0) {
             return '';
         }
         $result = '';
@@ -85,17 +85,17 @@ 
         // Keep the references until after the history that's in a timeline:
         $references = array();
         foreach ($row_data as $row) {
-            if( ! $row["date"] ) {
+            if (!$row["date"]) {
                 // If this mention isn't associated with a date, the difference won't be interesting.
                 $last_date = null;
             }
             $description = '';
             if ($last_date && ($last_date != $row["date"])) {
                 // Calculate how long the gap was in days:
-                $daysdiff = (integer)((strtotime($row["date"]) - strtotime($last_date)) / 86400);
+                $daysdiff = (integer) ((strtotime($row["date"]) - strtotime($last_date)) / 86400);
                 $daysstring = ($daysdiff == 1) ? "day" : "days";
                 $further = "";
-                if( $first_difference_output ) {
+                if ($first_difference_output) {
                     $first_difference_output = false;
                 } else {
                     $further = " a further";
@@ -106,7 +106,7 @@ 
             $inner = "BUG: Unknown mention type $row[type]";
             $date = format_date($row['date'], SHORTDATEFORMAT);
             $url = $row['url'];
-            if ( strpos($url, 'business/businessBulletin') !== false ) {
+            if (strpos($url, 'business/businessBulletin') !== false) {
                 $url = str_replace('www.scottish', 'archive.scottish', $url);
             }
             switch ($row["type"]) {
@@ -120,9 +120,9 @@ 
                     $inner = "Mentioned in <a class=\"debate-speech__meta__link\" href=\"$url\">tabled written questions on $date</a>";
                     break;
                 case 4:
-                    if( preg_match('/^uk.org.publicwhip\/spq\/(.*)$/',$row['gid'],$m) ) {
+                    if (preg_match('/^uk.org.publicwhip\/spq\/(.*)$/', $row['gid'], $m)) {
                         $URL = new \MySociety\TheyWorkForYou\Url("spwrans");
-                        $URL->insert( array('spid' => $m[1]) );
+                        $URL->insert(array('spid' => $m[1]));
                         $relative_url = $URL->generate("none");
                         $inner = "Given a <a class=\"debate-speech__meta__link\" href=\"$relative_url\">written answer on $date</a>";
                     }
@@ -131,25 +131,25 @@ 
                     $inner = "Given a holding answer on $date";
                     break;
                 case 6:
-                    if( preg_match('/^uk.org.publicwhip\/spor\/(.*)$/',$row['mentioned_gid'],$m) ) {
+                    if (preg_match('/^uk.org.publicwhip\/spor\/(.*)$/', $row['mentioned_gid'], $m)) {
                         $URL = new \MySociety\TheyWorkForYou\Url("spdebates");
-                        $URL->insert( array('id' => $m[1]) );
+                        $URL->insert(array('id' => $m[1]));
                         $relative_url = $URL->generate("none");
                         $inner = "<a href=\"$relative_url\">Asked in parliament on $date</a>";
                     }
                     break;
                 case 7:
-                    if( preg_match('/^uk.org.publicwhip\/spq\/(.*)$/',$row['mentioned_gid'],$m) ) {
+                    if (preg_match('/^uk.org.publicwhip\/spq\/(.*)$/', $row['mentioned_gid'], $m)) {
                         $referencing_spid = $m[1];
                         $URL = new \MySociety\TheyWorkForYou\Url("spwrans");
-                        $URL->insert( array('spid' => $referencing_spid) );
+                        $URL->insert(array('spid' => $referencing_spid));
                         $relative_url = $URL->generate("none");
                         $inner = "Referenced in <a href=\"$relative_url\">question $referencing_spid</a>";
                         $reference = true;
                     }
                     break;
             }
-            if( $reference ) {
+            if ($reference) {
                 $references[] = "\n<li>$inner.";
             } else {
                 $result .= "\n<li class=\"link-to-hansard\">$description$inner</span>";

classes/SectionView/NiView.php

Spacing +8 added lines, -8 removed lines

@@ -32,7 +32,7 @@ 
 
     protected function getSearchSections() {
         return array(
-            array( 'section' => 'ni' )
+            array('section' => 'ni')
         );
     }
 
@@ -51,23 +51,23 @@ 
 
         $debates = $DEBATELIST->display('recent_debates', array('days' => 30, 'num' => 6), 'none');
         $MOREURL = new \MySociety\TheyWorkForYou\Url('nidebatesfront');
-        $MOREURL->insert( array( 'more' => 1 ) );
+        $MOREURL->insert(array('more' => 1));
 
         // this makes sure that we don't repeat this debate in the list below
         $random_debate = null;
-        if ( isset($debates['data']) && count($debates['data']) ) {
+        if (isset($debates['data']) && count($debates['data'])) {
             $random_debate = $debates['data'][0];
         }
 
         $recent = array();
-        if ( isset($debates['data']) && count($debates['data']) ) {
+        if (isset($debates['data']) && count($debates['data'])) {
             // at the start of a session there may be less than 6
             // debates
             $max = 6;
-            if ( count($debates['data']) < 6 ) {
+            if (count($debates['data']) < 6) {
                 $max = count($debates['data']);
             }
-            for ( $i = 1; $i < $max; $i++ ) {
+            for ($i = 1; $i < $max; $i++) {
                 $debate = $debates['data'][$i];
                 $debate['desc'] = "Northern Ireland Assembly debates";
                 $debate['more_url'] = $MOREURL->generate();
@@ -76,7 +76,7 @@ 
         }
 
         $featured = array();
-        if ( $random_debate ) {
+        if ($random_debate) {
             $featured = $random_debate;
             $featured['more_url'] = $MOREURL->generate();
             $featured['desc'] = 'Northern Ireland Assembly debate';
@@ -85,7 +85,7 @@ 
         }
 
         $data['featured'] = $featured;
-        $data['debates'] = array( 'recent' => $recent);
+        $data['debates'] = array('recent' => $recent);
 
         $data['regional'] = $this->getMLAList();
         $data['template'] = 'ni/index';

classes/Office.php

Spacing +1 added lines, -1 removed lines

@@ -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 ';

classes/FacebookLogin.php

Spacing +3 added lines, -3 removed lines

@@ -43,10 +43,10 @@ 
 
         try {
             $accessToken = $helper->getAccessToken();
-        } catch(\Facebook\Exceptions\FacebookResponseException $e) {
+        } catch (\Facebook\Exceptions\FacebookResponseException $e) {
             $data['error'] = 'Graph returned an error: ' . $e->getMessage();
             return $data;
-        } catch(\Facebook\Exceptions\FacebookSDKException $e) {
+        } catch (\Facebook\Exceptions\FacebookSDKException $e) {
             $data['error'] = 'Facebook SDK returned an error: ' . $e->getMessage();
             return $data;
         }
@@ -67,7 +67,7 @@ 
             return false;
         }
 
-        if (! $accessToken->isLongLived()) {
+        if (!$accessToken->isLongLived()) {
             $oAuth2Client = $this->getFacebookObject()->getOAuth2Client();
             try {
                 $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);

classes/Utility/Wikipedia.php

Indentation +43 added lines, -43 removed lines

@@ -145,59 +145,59 @@
 
     public static function antiTagInTag($content = '', $format = 'htmlhead')
     {
-      $tagend = -1;
-      for( $tagstart = strpos( $content, '<', $tagend + 1 ) ; $tagstart !== false && $tagstart < strlen( $content ); $tagstart = strpos( $content, '<', $tagend ) )
+        $tagend = -1;
+        for( $tagstart = strpos( $content, '<', $tagend + 1 ) ; $tagstart !== false && $tagstart < strlen( $content ); $tagstart = strpos( $content, '<', $tagend ) )
         {
-          // got the start of a tag.  Now find the proper end!
-          $walker = $tagstart + 1;
-          $open = 1;
-          while( $open != 0 && $walker < strlen( $content ) )
+            // got the start of a tag.  Now find the proper end!
+            $walker = $tagstart + 1;
+            $open = 1;
+            while( $open != 0 && $walker < strlen( $content ) )
         {
-          $nextopen = strpos( $content, '<', $walker );
-          $nextclose = strpos( $content, '>', $walker );
-          if( $nextclose === false ) {
-              // ERROR! Open waka without close waka!
-              // echo '<code>Error in antiTagInTag - malformed tag!</code> ';
-              return $content;
-          }
-          if( $nextopen === false || $nextopen > $nextclose ) {
-              // No more opens, but there was a close; or, a close happens before the next open.
-              // walker goes to the close+1, and open decrements
-              $open --;
-              $walker = $nextclose + 1;
-          } elseif( $nextopen < $nextclose ) {
-              // an open before the next close
-              $open ++;
-              $walker = $nextopen + 1;
-          }
+            $nextopen = strpos( $content, '<', $walker );
+            $nextclose = strpos( $content, '>', $walker );
+            if( $nextclose === false ) {
+                // ERROR! Open waka without close waka!
+                // echo '<code>Error in antiTagInTag - malformed tag!</code> ';
+                return $content;
+            }
+            if( $nextopen === false || $nextopen > $nextclose ) {
+                // No more opens, but there was a close; or, a close happens before the next open.
+                // walker goes to the close+1, and open decrements
+                $open --;
+                $walker = $nextclose + 1;
+            } elseif( $nextopen < $nextclose ) {
+                // an open before the next close
+                $open ++;
+                $walker = $nextopen + 1;
+            }
         }
-          $tagend = $walker;
-          if( $tagend > strlen( $content ) ) {
-              $tagend = strlen( $content );
-          } else {
-              $tagend --;
-              $tagstart ++;
-          }
-          $tag = substr( $content, $tagstart, $tagend - $tagstart );
-          $tags[] = '<' . $tag . '>';
-
-          if (function_exists('format_to_output')) {
+            $tagend = $walker;
+            if( $tagend > strlen( $content ) ) {
+                $tagend = strlen( $content );
+            } else {
+                $tagend --;
+                $tagstart ++;
+            }
+            $tag = substr( $content, $tagstart, $tagend - $tagstart );
+            $tags[] = '<' . $tag . '>';
+
+            if (function_exists('format_to_output')) {
             $newtag = format_to_output($tag, $format);
-          } else {
+            } else {
             $newtag = strip_tags($tag);
-          }
+            }
 
-          $newtags[] = '<' . $newtag . '>';
+            $newtags[] = '<' . $newtag . '>';
 
-          if (function_exists('format_to_output')) {
+            if (function_exists('format_to_output')) {
             $newtag = format_to_output($tag, $format);
-          } else {
+            } else {
             $newtag = strip_tags($tag);
-          }
+            }
+        }
+        if (isset($tags)&&isset($newtags)) {
+        $content = str_replace($tags, $newtags, $content);
         }
-      if (isset($tags)&&isset($newtags)) {
-      $content = str_replace($tags, $newtags, $content);
-      }
 
     return $content;
 

Spacing +16 added lines, -16 removed lines

@@ -113,7 +113,7 @@ 
 
             twfy_debug("WIKIPEDIA", "Matched '$phrase'");
             # 1 means only replace one match for phrase per paragraph
-            $source = preg_replace ('{
+            $source = preg_replace('{
             \b(' . $phrase_re . ')\b # Match the phrase itself
             (?!                      # Match as long as the following does *not* apply:
                 (?:                  #   Match, possessively, as many strings of:
@@ -146,39 +146,39 @@ 
     public static function antiTagInTag($content = '', $format = 'htmlhead')
     {
       $tagend = -1;
-      for( $tagstart = strpos( $content, '<', $tagend + 1 ) ; $tagstart !== false && $tagstart < strlen( $content ); $tagstart = strpos( $content, '<', $tagend ) )
+      for ($tagstart = strpos($content, '<', $tagend + 1); $tagstart !== false && $tagstart < strlen($content); $tagstart = strpos($content, '<', $tagend))
         {
           // got the start of a tag.  Now find the proper end!
           $walker = $tagstart + 1;
           $open = 1;
-          while( $open != 0 && $walker < strlen( $content ) )
+          while ($open != 0 && $walker < strlen($content))
         {
-          $nextopen = strpos( $content, '<', $walker );
-          $nextclose = strpos( $content, '>', $walker );
-          if( $nextclose === false ) {
+          $nextopen = strpos($content, '<', $walker);
+          $nextclose = strpos($content, '>', $walker);
+          if ($nextclose === false) {
               // ERROR! Open waka without close waka!
               // echo '<code>Error in antiTagInTag - malformed tag!</code> ';
               return $content;
           }
-          if( $nextopen === false || $nextopen > $nextclose ) {
+          if ($nextopen === false || $nextopen > $nextclose) {
               // No more opens, but there was a close; or, a close happens before the next open.
               // walker goes to the close+1, and open decrements
-              $open --;
+              $open--;
               $walker = $nextclose + 1;
-          } elseif( $nextopen < $nextclose ) {
+          } elseif ($nextopen < $nextclose) {
               // an open before the next close
-              $open ++;
+              $open++;
               $walker = $nextopen + 1;
           }
         }
           $tagend = $walker;
-          if( $tagend > strlen( $content ) ) {
-              $tagend = strlen( $content );
+          if ($tagend > strlen($content)) {
+              $tagend = strlen($content);
           } else {
-              $tagend --;
-              $tagstart ++;
+              $tagend--;
+              $tagstart++;
           }
-          $tag = substr( $content, $tagstart, $tagend - $tagstart );
+          $tag = substr($content, $tagstart, $tagend - $tagstart);
           $tags[] = '<' . $tag . '>';
 
           if (function_exists('format_to_output')) {
@@ -195,7 +195,7 @@ 
             $newtag = strip_tags($tag);
           }
         }
-      if (isset($tags)&&isset($newtags)) {
+      if (isset($tags) && isset($newtags)) {
       $content = str_replace($tags, $newtags, $content);
       }