flack / openpsa

lib/fi/protie/navigation/main.php

Spacing +7 added lines, -7 removed lines

@@ -338,8 +338,8 @@ 
         $classes = [];
 
         if ($child[MIDCOM_NAV_TYPE] === 'node') {
-            if (   $item[MIDCOM_NAV_ID] === $this->_nap->get_current_node()
-                && (   !$this->_nap->get_current_leaf()
+            if ($item[MIDCOM_NAV_ID] === $this->_nap->get_current_node()
+                && (!$this->_nap->get_current_leaf()
                     || !$this->_nap->get_leaf($this->_nap->get_current_leaf()))) {
                 $classes[] = $this->css_active;
             }
@@ -386,7 +386,7 @@ 
         }
 
         // Add information about the object's status
-        if (   $this->object_status_to_class
+        if ($this->object_status_to_class
             && isset($item[MIDCOM_NAV_OBJECT])
             && $css_status_class = midcom::get()->metadata->get_object_classes($item[MIDCOM_NAV_OBJECT])) {
             $classes[] = $css_status_class;
@@ -405,12 +405,12 @@ 
         echo "<a href=\"{$item[MIDCOM_NAV_ABSOLUTEURL]}\"{$link_class}>{$item[MIDCOM_NAV_NAME]}</a>";
         // If either of the follow nodes switches is on, follow all the nodes
 
-        if (   $item[MIDCOM_NAV_TYPE] === 'node'
+        if ($item[MIDCOM_NAV_TYPE] === 'node'
             && !$this->show_only_current
-            && (   $this->list_levels === 0
+            && ($this->list_levels === 0
                 || $this->_level < $this->list_levels)) {
-            if (   $this->follow_all
-                || (   $this->follow_selected
+            if ($this->follow_all
+                || ($this->follow_selected
                     && in_array($item[MIDCOM_NAV_ID], $this->node_path, true))) {
                 $this->_level++;
                 $this->_list_child_elements($item[MIDCOM_NAV_ID]);

lib/org/openpsa/invoices/status.php

Spacing +3 added lines, -3 removed lines

@@ -85,7 +85,7 @@ 
     {
         $entries = array_merge($this->get_status_entries(), $this->get_journal_entries());
 
-        usort($entries, function ($a, $b) {
+        usort($entries, function($a, $b) {
             if ($a['timestamp'] == $b['timestamp']) {
                 if ($a['order'] == $b['order']) {
                     return 0;
@@ -122,8 +122,8 @@ 
                 'order' => 3
             ];
         }
-        if (   $this->invoice->due
-            && (   (   $this->invoice->due < time()
+        if ($this->invoice->due
+            && (($this->invoice->due < time()
                     && $this->invoice->paid == 0)
                 || $this->invoice->due < $this->invoice->paid)) {
             $entries[] = [

lib/org/openpsa/reports/handler/projects/report.php

Braces +2 added lines, -1 removed lines

@@ -123,7 +123,8 @@
             $row = [];
             try {
                 $row['person'] = org_openpsa_contacts_person_dba::get_cached($hour->person);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
                 continue;
             }

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
         $qb_hr = org_openpsa_expenses_hour_report_dba::new_query_builder();
         $qb_hr->add_constraint('date', '<=', (int) $this->_request_data['query_data']['end']);
         $qb_hr->add_constraint('date', '>=', (int) $this->_request_data['query_data']['start']);
-        if (   array_key_exists('invoiceable_filter', $this->_request_data['query_data'])
+        if (array_key_exists('invoiceable_filter', $this->_request_data['query_data'])
             && $this->_request_data['query_data']['invoiceable_filter'] != -1) {
             $qb_hr->add_constraint('invoiceable', '=', (bool) $this->_request_data['query_data']['invoiceable_filter']);
         }
@@ -59,7 +59,7 @@ 
             $tasks = $this->_expand_task($this->_request_data['query_data']['task']);
             $qb_hr->add_constraint('task', 'IN', $tasks);
         }
-        if (   array_key_exists('hour_type_filter', $this->_request_data['query_data'])
+        if (array_key_exists('hour_type_filter', $this->_request_data['query_data'])
             && $this->_request_data['query_data']['hour_type_filter'] != 'builtin:all') {
             $qb_hr->add_constraint('reportType', '=', $this->_request_data['query_data']['hour_type_filter']);
         }
@@ -150,7 +150,7 @@ 
 
     private function add_to_group($new_row, $matching, $sort, $title)
     {
-        $rows =& $this->_request_data['report']['rows'];
+        $rows = & $this->_request_data['report']['rows'];
         if (array_key_exists($matching, $rows)) {
             $rows[$matching]['rows'][] = $new_row;
             $rows[$matching]['total_hours'] += $new_row['hour']->hours;

lib/org/openpsa/directmarketing/support/bounce_detector.php

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
 }
 $recipient = $_ENV["RECIPIENT"];
 $token_length = strlen($recipient) - strlen($prefix) - strlen($suffix);
-if (   $token_length <= 0
+if ($token_length <= 0
     || substr($recipient, 0, strlen($prefix)) != $prefix
     || substr($recipient, strlen($prefix) + $token_length) != $suffix) {
     error_log("Recipient address does not match address template: $recipient");
@@ -61,7 +61,7 @@ 
         fclose($fh);
         exit(0);
     }
-} elseif (   substr($BOUNCE_LOGGER, 0, strlen("http://")) == "http://"
+} elseif (substr($BOUNCE_LOGGER, 0, strlen("http://")) == "http://"
           || substr($BOUNCE_LOGGER, 0, strlen("https://")) == "https://") {
     $client = new org_openpsa_httplib();
     $client->post($BOUNCE_LOGGER, ["token" => $token]);

lib/org/openpsa/directmarketing/sender.php

Braces +4 added lines, -2 removed lines

@@ -222,7 +222,8 @@ 
             $this->_backend->send($person, $member, $token, $subject, $content, $from);
             self::$_messages_sent++;
             $status = org_openpsa_directmarketing_campaign_messagereceipt_dba::SENT;
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $status = org_openpsa_directmarketing_campaign_messagereceipt_dba::FAILURE;
             if (!$this->test_mode) {
                 $params[] = [
@@ -279,7 +280,8 @@ 
     {
         try {
             $person = org_openpsa_contacts_person_dba::get_cached($member->person);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             debug_add("Person #{$member->person} deleted or missing, removing member (member #{$member->id})");
             $member->orgOpenpsaObtype = org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED;
             $member->delete();

Spacing +3 added lines, -3 removed lines

@@ -80,7 +80,7 @@ 
         parent::__construct();
         $this->_message = $message;
 
-        if (   $this->_message->orgOpenpsaObtype != org_openpsa_directmarketing_campaign_message_dba::EMAIL_TEXT
+        if ($this->_message->orgOpenpsaObtype != org_openpsa_directmarketing_campaign_message_dba::EMAIL_TEXT
             && $this->_message->orgOpenpsaObtype != org_openpsa_directmarketing_campaign_message_dba::EMAIL_HTML) {
             throw new midcom_error('unsupported message type');
         }
@@ -247,7 +247,7 @@ 
         $token .= midcom_helper_misc::random_string($this->token_size - 1, 'abcdefghijklmnopqrstuvwxyz0123456789');
 
         //If token is not free or (very, very unlikely) matches our dummy token, recurse.
-        if (   $token === 'dummy'
+        if ($token === 'dummy'
             || !org_openpsa_directmarketing_campaign_messagereceipt_dba::token_is_free($token)) {
             return $this->_create_token();
         }
@@ -271,7 +271,7 @@ 
             return false;
         }
         $type = $this->_backend->get_type();
-        if (   $person->get_parameter('org.openpsa.directmarketing', "send_all_denied")
+        if ($person->get_parameter('org.openpsa.directmarketing', "send_all_denied")
             || $person->get_parameter('org.openpsa.directmarketing', "send_{$type}_denied")) {
             debug_add("Sending {$type} messages to person {$person->rname} is denied, unsubscribing member (member #{$member->id})");
             $member->orgOpenpsaObtype = org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED;

lib/org/openpsa/documents/document.php

Spacing +4 added lines, -4 removed lines

@@ -74,7 +74,7 @@ 
             return;
         }
         $parent = $this->get_parent();
-        if (   $parent
+        if ($parent
             && $parent->component == 'org.openpsa.documents') {
             midcom::get()->auth->request_sudo('org.openpsa.documents');
 
@@ -170,7 +170,7 @@ 
          * if nothing matched so far and the subtype is alphanumeric, uppercase it on the theory
          * that it's probably a file extension
          */
-        if (   $st_orig == $subtype
+        if ($st_orig == $subtype
             && preg_match('/^[a-z0-9]+$/', $subtype)) {
             $subtype = strtoupper($subtype);
         }
@@ -185,7 +185,7 @@ 
         $properties = $this->get_properties();
         // Copy current properties
         foreach ($properties as $key) {
-            if (   $key != 'guid'
+            if ($key != 'guid'
                 && $key != 'id'
                 && $key != 'metadata') {
                 $backup->$key = $this->{$key};
@@ -217,7 +217,7 @@ 
             $backup_attachment = $backup->create_attachment($original_attachment->name, $original_attachment->title, $original_attachment->mimetype);
 
             $original_handle = $original_attachment->open('r');
-            if (   !$backup_attachment
+            if (!$backup_attachment
                 || !$original_handle) {
                 // Failed to copy the attachment, abort
                 return $backup->delete();

src/midcom/workflow/datamanager.php

Spacing +2 added lines, -2 removed lines

@@ -93,8 +93,8 @@
 
     private function prepare_url($url)
     {
-        if (   substr($url, 0, 1) != '/'
-            && ! preg_match('|^https?://|', $url)) {
+        if (substr($url, 0, 1) != '/'
+            && !preg_match('|^https?://|', $url)) {
             $url = midcom_core_context::get()->get_key(MIDCOM_CONTEXT_ANCHORPREFIX) . $url;
         }
         return '"' . $url . '"';

lib/org/openpsa/invoices/handler/billingdata.php

Spacing +3 added lines, -3 removed lines

@@ -30,8 +30,8 @@ 
     private function load_controller(org_openpsa_invoices_billing_data_dba $bd)
     {
         $schemadb = schemadb::from_path($this->_config->get('schemadb_billing_data'));
-        $vat =& $schemadb->get('default')->get_field('vat');
-        $due =& $schemadb->get('default')->get_field('due');
+        $vat = & $schemadb->get('default')->get_field('vat');
+        $due = & $schemadb->get('default')->get_field('due');
         // Fill VAT select
         $vat_array = explode(',', $this->_config->get('vat_percentages'));
         if (!empty($vat_array)) {
@@ -74,7 +74,7 @@ 
         $data['controller'] = $this->load_controller($bd);
 
         $workflow = $this->get_workflow('datamanager', ['controller' => $data['controller']]);
-        if (   $mode == 'edit'
+        if ($mode == 'edit'
             && $bd->can_do('midgard:delete')) {
             $delete = $this->get_workflow('delete', [
                 'object' => $bd,

lib/net/nemein/rss/handler/admin.php

Spacing +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
         }
 
         // OPML subscription list import support
-        if (   array_key_exists('net_nemein_rss_manage_opml', $_FILES)
+        if (array_key_exists('net_nemein_rss_manage_opml', $_FILES)
             && is_uploaded_file($_FILES['net_nemein_rss_manage_opml']['tmp_name'])) {
             $opml_file = $_FILES['net_nemein_rss_manage_opml']['tmp_name'];