flack / openpsa

lib/midgard/admin/asgard/stylehelper.php

Indentation +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
                 'midcom' => [
                     'style-init' => '',
                     'style-finish' => '',
-                 ]
+                    ]
             ],
             'nodes' => [],
         ];

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
 
     public function __construct(array &$data)
     {
-        $this->_data =& $data;
+        $this->_data = & $data;
         midcom::get()->head->enable_jquery_ui(['accordion']);
     }
 
@@ -33,11 +33,11 @@ 
             return;
         }
 
-        if (   midcom::get()->dbfactory->is_a($this->_data['object'], 'midgard_style')
-            && (   $this->_data['handler_id'] !== 'object_create'
+        if (midcom::get()->dbfactory->is_a($this->_data['object'], 'midgard_style')
+            && ($this->_data['handler_id'] !== 'object_create'
                 || $this->_data['current_type'] == 'midgard_element')) {
             $help_element = $this->_get_help_style_elementnames($this->_data['object']);
-        } elseif (   midcom::get()->dbfactory->is_a($this->_data['object'], 'midgard_element')
+        } elseif (midcom::get()->dbfactory->is_a($this->_data['object'], 'midgard_element')
                   && $this->_data['handler_id'] !== 'object_create') {
             $help_element = $this->_get_help_element();
         }
@@ -49,7 +49,7 @@ 
 
     private function _get_help_element()
     {
-        if (   empty($this->_data['object']->name)
+        if (empty($this->_data['object']->name)
             || empty($this->_data['object']->style)) {
             // We cannot help with empty elements
             return;

lib/midcom/helper/reflector/tree.php

Braces +2 added lines, -1 removed lines

@@ -553,7 +553,8 @@
         $tree = [];
         try {
             $children = self::get_child_objects($parent);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return $tree;
         }
 

Spacing +2 added lines, -2 removed lines

@@ -92,7 +92,7 @@ 
     private static function _check_permissions(bool $deleted) : bool
     {
         // PONDER: Check for some generic user privilege instead  ??
-        if (   $deleted
+        if ($deleted
             && !midcom_connection::is_admin()
             && !midcom::get()->auth->is_component_sudo()) {
             debug_add('Non-admins are not allowed to list deleted objects', MIDCOM_LOG_ERROR);
@@ -221,7 +221,7 @@ 
             $field_type = $field_data['type'];
             $field = $field_data['name'];
 
-            if (   !$field_target
+            if (!$field_target
                 || !isset($for_object->$field_target)) {
                 // Why return false ???
                 return false;

lib/midcom/helper/toolbar/view.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
             ]);
         }
 
-        if (   midcom::get()->config->get('midcom_services_rcs_enable')
+        if (midcom::get()->config->get('midcom_services_rcs_enable')
             && $object->can_do('midgard:update')
             && $object->_use_rcs) {
             $buttons[] = [
@@ -84,7 +84,7 @@ 
             }
 
             $icon = 'stock-icons/16x16/page-' . $icontype . '.png';
-            if (   !midcom::get()->config->get('show_hidden_objects')
+            if (!midcom::get()->config->get('show_hidden_objects')
                 && !$object->metadata->is_visible()) {
                 // Take scheduling into account
                 $icon = 'stock-icons/16x16/page-' . $icontype . '-notpublished.png';

lib/org/openpsa/slideshow/image.php

Spacing +1 added lines, -1 removed lines

@@ -150,7 +150,7 @@
         $rows = $mc->get_rows(['id', 'name', 'guid'], 'id');
 
         foreach ($images as $image) {
-            if (   !isset($rows[$image->attachment])
+            if (!isset($rows[$image->attachment])
                 || !isset($rows[$image->image])
                 || !isset($rows[$image->thumbnail])) {
                 continue;

Braces +4 added lines, -2 removed lines

@@ -48,7 +48,8 @@ 
 
         try {
             $folder = midcom_db_topic::get_cached($this->topic);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
         }
         $folder->delete_attachment(self::FOLDER_THUMBNAIL);
@@ -58,7 +59,8 @@ 
     {
         try {
             return new midcom_db_attachment($this->$type);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return null;
         }

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');
         }
@@ -223,7 +223,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();
         }
@@ -247,7 +247,7 @@ 
             return null;
         }
         $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

@@ -73,7 +73,7 @@ 
 
     public function set_storage(midcom_core_dbaobject $storage = null, string $schemaname = null) : self
     {
-        if (   $schemaname === null
+        if ($schemaname === null
             && !empty($storage->id)) {
             $schemaname = $storage->get_parameter('midcom.helper.datamanager2', 'schema_name');
         }
@@ -164,7 +164,7 @@ 
         }
         $name = $this->get_name($name);
 
-        if (   $this->form === null
+        if ($this->form === null
             || $this->form->getName() != $name) {
             $this->build_form($this->get_builder($name));
         }
@@ -261,7 +261,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 {