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/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']);
         }
@@ -58,7 +58,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']);
         }
@@ -146,7 +146,7 @@ 
 
     private function add_to_group(array $new_row, string $matching, string $sort, string $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/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

@@ -79,7 +79,7 @@ 
         $this->from = $from;
         $this->subject = $subject;
 
-        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');
         }
@@ -225,7 +225,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();
         }
@@ -249,7 +249,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/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'];
 

src/midcom/datamanager/datamanager.php

Braces +1 added lines, -2 removed lines

@@ -210,8 +210,7 @@
     {
         $ret = [];
 
-        foreach ($this->storage as $field => $value)
-        {
+        foreach ($this->storage as $field => $value) {
             $ret[$field] = $value->get_value();
             $config = $this->schema->get_field($field);
             if (!empty($config['type_config']['allow_multiple'])) {

Spacing +3 added lines, -3 removed lines

@@ -139,7 +139,7 @@ 
      */
     public function set_storage(midcom_core_dbaobject $storage = null, $schemaname = null) : self
     {
-        if (   $schemaname === null
+        if ($schemaname === null
             && !empty($storage->id)) {
             $schemaname = $storage->get_parameter('midcom.helper.datamanager2', 'schema_name');
         }
@@ -261,7 +261,7 @@ 
             $name = 'midcom_helper_datamanager2';
         }
 
-        if (   $this->form === null
+        if ($this->form === null
             || $this->form->getName() != $name) {
             $config = [
                 'schema' => $this->get_schema()
@@ -336,7 +336,7 @@ 
     {
         $ret = true;
         foreach ($this->storage as $field) {
-            if (   $field instanceof recreateable
+            if ($field instanceof recreateable
                 && !$field->recreate()) {
                 $ret = false;
             }

lib/org/openpsa/contacts/handler/group/create.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 
         $this->_group = new org_openpsa_contacts_group_dba();
 
-        if (   $this->_type == 'organization'
+        if ($this->_type == 'organization'
             && $this->_parent_group) {
             $this->_group->owner = $this->_parent_group->id;
         } else {

lib/org/openpsa/documents/handler/directory/create.php

Spacing +1 added lines, -1 removed lines

@@ -50,6 +50,6 @@
         $indexer = new org_openpsa_documents_midcom_indexer($this->_topic);
         $indexer->index($controller->get_datamanager());
 
-        return $controller->get_datamanager()->get_storage()->get_value()->name. "/";
+        return $controller->get_datamanager()->get_storage()->get_value()->name . "/";
     }
 }

lib/org/openpsa/invoices/midcom/indexer.php

Indentation +5 added lines, -5 removed lines

@@ -9,11 +9,11 @@
 use midcom\datamanager\indexer\client;
 use midcom\datamanager\datamanager;
 
- /**
- * Indexer client class
- *
- * @package org.openpsa.invoices
- */
+    /**
+     * Indexer client class
+     *
+     * @package org.openpsa.invoices
+     */
 class org_openpsa_invoices_midcom_indexer extends client
 {
     public function prepare_document(midcom_services_indexer_document &$document, datamanager $dm)

src/midcom/datamanager/storage/dbanode.php

Braces +2 added lines, -1 removed lines

@@ -30,7 +30,8 @@
         $this->config = $config;
     }
 
-    protected function cast($value) {
+    protected function cast($value)
+    {
         if ($this->config['type'] == 'number' && !is_numeric($value)) {
             $value = (float) $value;
         }