flack / openpsa

lib/net/nemein/redirector/viewer.php

Braces +2 added lines, -1 removed lines

@@ -152,7 +152,8 @@
                     try {
                         $topic = new midcom_db_topic($id);
                         $id = $topic->id;
-                    } catch (midcom_error $e) {
+                    }
+                    catch (midcom_error $e) {
                         $e->log();
                         break;
                     }

Spacing +2 added lines, -2 removed lines

@@ -19,8 +19,8 @@
     public function _on_initialize()
     {
         // Match /
-        if (   $this->_config->get('redirection_type') === null
-            || (   $this->_topic->can_do('net.nemein.redirector:noredirect')
+        if ($this->_config->get('redirection_type') === null
+            || ($this->_topic->can_do('net.nemein.redirector:noredirect')
                 && !$this->_config->get('admin_redirection'))) {
             $this->_request_switch['redirect'] = [
                 'handler' => [net_nemein_redirector_handler_tinyurl::class, 'list'],

lib/net/nemein/wiki/handler/feed.php

Braces +2 added lines, -1 removed lines

@@ -66,7 +66,8 @@
             try {
                 $author = new midcom_db_person($wikipage->metadata->revisor);
                 $item->author = $author->name;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
 

lib/net/nemein/wiki/handler/latest.php

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
                     return;
                 }
 
-                if (   $history['date'] < $from
+                if ($history['date'] < $from
                     || $history['date'] > $to) {
                     // We can ignore revisions outside the timeframe
                     continue;
@@ -93,7 +93,7 @@ 
         $this->_seek_updated($from);
 
         $i = 0;
-        while (   $this->_updated_pages < $this->_max_pages
+        while ($this->_updated_pages < $this->_max_pages
                && $i < 20) {
             // Expand seek by another two weeks
             $to = $from;

lib/net/nemein/rss/parser/item.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
     public function get_link($key = 0, $rel = 'alternate')
     {
         $link = parent::get_link($key, $rel);
-        if (   $rel !== 'alternate'
+        if ($rel !== 'alternate'
             || $key !== 0) {
             return $link;
         }

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

@@ -336,7 +336,7 @@ 
         while ($parent = $object->get_parent()) {
             // Verify that this topic is within the current sites tree, if it is not,
             // we ignore it.
-            if (   is_a($parent, midcom_db_topic::class)
+            if (is_a($parent, midcom_db_topic::class)
                 && $this->is_node_in_tree($parent->id, $this->get_root_node())) {
                 return $parent;
             }
@@ -390,7 +390,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;
                 }
@@ -504,7 +504,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 +9 added lines, -9 removed lines

@@ -292,7 +292,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');
             }
@@ -354,11 +354,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;
         }
@@ -374,9 +374,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())
         );
     }
@@ -434,7 +434,7 @@ 
             $guid = $source;
         }
 
-        if (   $object === null
+        if ($object === null
             && mgd_is_guid($guid)) {
             try {
                 $object = midcom::get()->dbfactory->get_object_by_guid($guid);
@@ -467,7 +467,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;
         }
@@ -500,7 +500,7 @@ 
      */
     public function can_unlock() : bool
     {
-        return (   $this->__object->can_do('midcom:unlock')
+        return ($this->__object->can_do('midcom:unlock')
                 || midcom::get()->auth->can_user_do('midcom:unlock', null, midcom_services_auth::class));
     }
 
@@ -511,7 +511,7 @@ 
      */
     public function unlock() : bool
     {
-        if (   $this->can_unlock()
+        if ($this->can_unlock()
             && $this->__object->unlock()) {
             $this->_cache = [];
             return true;

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/cache/module/nap.php

Braces +2 added lines, -1 removed lines

@@ -132,7 +132,8 @@
                       && $nodeobject = $nav->get_node($node->id)) {
                 $napobject = $nav->get_leaf($nodeobject[MIDCOM_NAV_ID] . '-' . $object->id);
             }
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
         }
         return $napobject;

Spacing +4 added lines, -4 removed lines

@@ -71,7 +71,7 @@ 
             // Get parent from DB and compare to catch moves
             if ($parent = $napobject[MIDCOM_NAV_OBJECT]->get_parent()) {
                 $parent_entry = $this->get_guid($parent->guid);
-                if (   $parent_entry
+                if ($parent_entry
                     && $parent_entry[MIDCOM_NAV_ID] != $cached_node_id) {
                     $this->backend->delete($parent_entry[MIDCOM_NAV_ID] . '-leaves');
                 }
@@ -86,7 +86,7 @@ 
             $parent_id = $napobject[MIDCOM_NAV_NODEID];
             $parent_entry = $this->get_node($parent_id);
 
-            if (   $parent_entry
+            if ($parent_entry
                 && array_key_exists(MIDCOM_NAV_SUBNODES, $parent_entry)) {
                 unset($parent_entry[MIDCOM_NAV_SUBNODES]);
                 $this->put_node($parent_id, $parent_entry);
@@ -96,7 +96,7 @@ 
             if ($parent = $napobject[MIDCOM_NAV_OBJECT]->get_parent()) {
                 $parent_entry_from_object = $this->get_guid($parent->guid);
 
-                if (    !empty($parent_entry_from_object[MIDCOM_NAV_ID])
+                if (!empty($parent_entry_from_object[MIDCOM_NAV_ID])
                      && !empty($parent_entry[MIDCOM_NAV_ID])
                      && $parent_entry_from_object[MIDCOM_NAV_ID] != $parent_entry[MIDCOM_NAV_ID]) {
                     unset($parent_entry_from_object[MIDCOM_NAV_SUBNODES]);
@@ -122,7 +122,7 @@ 
             $nav = new midcom_helper_nav;
             if ($object instanceof midcom_db_topic) {
                 $napobject = $nav->get_node($object->id);
-            } elseif (   ($node = $nav->find_closest_topic($object))
+            } elseif (($node = $nav->find_closest_topic($object))
                       && $nodeobject = $nav->get_node($node->id)) {
                 $napobject = $nav->get_leaf($nodeobject[MIDCOM_NAV_ID] . '-' . $object->id);
             }