flack / openpsa

lib/midcom/helper/nav/main.php

Braces +2 added lines, -1 removed lines

@@ -296,7 +296,8 @@
         // the tree. This is, for example, used by the on-delete cache invalidation.
         try {
             $object = midcom::get()->dbfactory->get_object_by_guid($guid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             debug_add("Could not load GUID {$guid}, trying to continue anyway. Last error was: " . $e->getMessage(), MIDCOM_LOG_WARN);
         }
         if (!empty($object)) {

Spacing +3 added lines, -3 removed lines

@@ -340,7 +340,7 @@ 
         while ($parent = $object->get_parent()) {
             // Verify that this topic is within the current sites tree, if it is not,
             // we ignore it.
-            if (   $parent instanceof midcom_db_topic
+            if ($parent instanceof midcom_db_topic
                 && $this->is_node_in_tree($parent->id, $this->get_root_node())) {
                 return $parent;
             }
@@ -394,7 +394,7 @@ 
                     $entry = "<span class=\"{$current_class}\">{$entry}</span>";
                 }
             } else {
-                if (   !empty($data['napobject'][MIDCOM_NAV_GUID])
+                if (!empty($data['napobject'][MIDCOM_NAV_GUID])
                     && in_array($data['napobject'][MIDCOM_NAV_GUID], $skip_guids)) {
                     continue;
                 }
@@ -508,7 +508,7 @@ 
                     $id = "custom-{$key}";
 
                     $url = "{$prefix}{$entry[MIDCOM_NAV_URL]}";
-                    if (   str_starts_with($entry[MIDCOM_NAV_URL], '/')
+                    if (str_starts_with($entry[MIDCOM_NAV_URL], '/')
                         || preg_match('|^https?://|', $entry[MIDCOM_NAV_URL])) {
                         $url = $entry[MIDCOM_NAV_URL];
                     }

lib/midcom/helper/nav/leaf.php

Braces +2 added lines, -1 removed lines

@@ -52,7 +52,8 @@
         } elseif (!empty($this->data[MIDCOM_NAV_GUID])) {
             try {
                 $this->data[MIDCOM_NAV_OBJECT] = midcom::get()->dbfactory->get_object_by_guid($this->data[MIDCOM_NAV_GUID]);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
             }
         } else {
             debug_add("Warning: The leaf {$this->leafid} of topic {$topic->id} does set neither a GUID nor an object.");

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
     public function is_readable_by(string $user_id) : bool
     {
-        return (   empty($this->object)
+        return (empty($this->object)
                 || !$this->guid
                 || !$user_id
                 || midcom::get()->auth->acl->can_do_byguid('midgard:read', $this->guid, $this->object->__midcom_class_name__, $user_id));

lib/midcom/helper/metadata.php

Braces +2 added lines, -1 removed lines

@@ -658,7 +658,8 @@
             && mgd_is_guid($guid)) {
             try {
                 $object = midcom::get()->dbfactory->get_object_by_guid($guid);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 debug_add("Failed to create a metadata instance for the GUID {$guid}: " . $e->getMessage(), MIDCOM_LOG_WARN);
                 debug_print_r("Source was:", $source);
 

Spacing +8 added lines, -8 removed lines

@@ -254,7 +254,7 @@ 
     {
         if (in_array($key, $this->field_config['timebased'])) {
             // This is ugly, but seems the only possible way...
-            if (   isset($this->__metadata->$key)
+            if (isset($this->__metadata->$key)
                 && (string) $this->__metadata->$key !== "0001-01-01T00:00:00+00:00") {
                 return (int) $this->__metadata->$key->format('U');
             }
@@ -315,11 +315,11 @@ 
         }
 
         $now = time();
-        if (   $this->get('schedulestart')
+        if ($this->get('schedulestart')
             && $this->get('schedulestart') > $now) {
             return false;
         }
-        if (   $this->get('scheduleend')
+        if ($this->get('scheduleend')
             && $this->get('scheduleend') < $now) {
             return false;
         }
@@ -335,9 +335,9 @@ 
     public function is_object_visible_onsite() : bool
     {
         return
-        (   (   midcom::get()->config->get('show_hidden_objects')
+        ((midcom::get()->config->get('show_hidden_objects')
              || $this->is_visible())
-         && (   midcom::get()->config->get('show_unapproved_objects')
+         && (midcom::get()->config->get('show_unapproved_objects')
              || $this->is_approved())
         );
     }
@@ -394,7 +394,7 @@ 
             $guid = $source;
         }
 
-        if (   $object === null
+        if ($object === null
             && mgd_is_guid($guid)) {
             try {
                 $object = midcom::get()->dbfactory->get_object_by_guid($guid);
@@ -427,7 +427,7 @@ 
         }
 
         // Lock was created by the user, return "not locked"
-        if (   !empty(midcom::get()->auth->user->guid)
+        if (!empty(midcom::get()->auth->user->guid)
             && $this->get('locker') === midcom::get()->auth->user->guid) {
             return false;
         }
@@ -454,7 +454,7 @@ 
      */
     public function can_unlock() : bool
     {
-        return (  (midcom::get()->auth->user && midcom::get()->auth->user->guid == $this->__object->metadata->locker)
+        return ((midcom::get()->auth->user && midcom::get()->auth->user->guid == $this->__object->metadata->locker)
                 || $this->__object->can_do('midcom:unlock')
                 || midcom::get()->auth->can_user_do('midcom:unlock', null, midcom_services_auth::class));
     }

lib/midcom/admin/folder/handler/order.php

Braces +2 added lines, -1 removed lines

@@ -69,7 +69,8 @@
         // Use the DB Factory to resolve the class and to get the object
         try {
             $object = midcom::get()->dbfactory->get_object_by_guid($identifier);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             // This is probably a pseudo leaf, store the score to the current node
             $this->_topic->set_parameter('midcom.helper.nav.score', $identifier, $score);
             return true;

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
         }
 
         // Approve if possible
-        if (   $approval_status
+        if ($approval_status
             && $object->can_do('midcom:approve')) {
             $object->metadata->approve();
         }

lib/midcom/services/permalinks/main.php

Braces +2 added lines, -1 removed lines

@@ -72,7 +72,8 @@
 
         try {
             $object = midcom::get()->dbfactory->get_object_by_guid($guid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             debug_add("Failed to resolve the GUID {$guid}, this is most probably an access denied error.", MIDCOM_LOG_ERROR);
             debug_add('Last MidCOM error string: ' . $e->getMessage());
             return null;

lib/midcom/services/indexer/document/midcom.php

Spacing +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
      */
     public function members_to_fields()
     {
-        if (   empty($this->topic_guid)
+        if (empty($this->topic_guid)
             || empty($this->topic_url)
             || empty($this->component)) {
             //if one of those is missing, we override all three to ensure consistency

lib/midcom/config/test.php

Indentation +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
             $this->add('Setting: upload_max_filesize', self::OK, ini_get('upload_max_filesize'));
         } else {
             $this->add('Setting: upload_max_filesize',
-                             self::WARNING, "To make bulk uploads (for exampe in the Image Gallery) useful, you should increase the Upload limit to something above 50 MB. (Current setting: {$upload_limit})");
+                                self::WARNING, "To make bulk uploads (for exampe in the Image Gallery) useful, you should increase the Upload limit to something above 50 MB. (Current setting: {$upload_limit})");
         }
 
         $post_limit = $this->ini_get_filesize('post_max_size');

Braces +2 added lines, -1 removed lines

@@ -81,7 +81,8 @@
                 $class = $config->get_backend_class();
                 new $class(new midcom_db_topic, $config);
                 $this->add("MidCOM RCS", self::OK, $class);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $this->add("MidCOM RCS", self::ERROR, $e->getMessage());
             }
         } else {

lib/midgard/admin/asgard/toolbar.php

Braces +2 added lines, -1 removed lines

@@ -117,7 +117,8 @@
                                 }
                                 break;
                         }
-                    } catch (midcom_error $e) {
+                    }
+                    catch (midcom_error $e) {
                         $e->log();
                     }
                 }

Spacing +3 added lines, -3 removed lines

@@ -142,7 +142,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[] = [
@@ -203,7 +203,7 @@ 
     private function get_toolbar_update_items(midcom_core_dbaobject $object) : array
     {
         $buttons = [];
-        if (   $object instanceof midcom_db_topic
+        if ($object instanceof midcom_db_topic
             && $object->component
             && $object->can_do('midcom:component_config')) {
             $buttons[] = [
@@ -241,7 +241,7 @@ 
             MIDCOM_TOOLBAR_ENABLED => $object->can_do('midgard:privileges'),
         ];
 
-        if (   midcom::get()->componentloader->is_installed('midcom.helper.replicator')
+        if (midcom::get()->componentloader->is_installed('midcom.helper.replicator')
             && midcom::get()->auth->admin) {
             $buttons[] = [
                 MIDCOM_TOOLBAR_URL => "__mfa/asgard_midcom.helper.replicator/object/{$object->guid}/",

lib/midgard/admin/user/handler/list.php

Braces +2 added lines, -1 removed lines

@@ -217,7 +217,8 @@
 
         try {
             $account = new midcom_core_account($person);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             midcom::get()->uimessages->add($this->_l10n->get('midgard.admin.user'), sprintf($this->_l10n->get('failed to get the user with id %s'), $person->id), 'error');
             return;
         }