flack / openpsa

lib/net/nemein/rss/fetch.php

Spacing +6 added lines, -6 removed lines

@@ -81,7 +81,7 @@ 
             $etag = trim($parser->data['headers']['etag']);
 
             $feed_etag = $this->_feed->get_parameter('net.nemein.rss', 'etag');
-            if (   !empty($feed_etag)
+            if (!empty($feed_etag)
                 && $feed_etag == $etag) {
                 // Feed hasn't changed, skip updating
                 debug_add("Feed {$this->_feed->url} has not changed since " . date('c', $this->_feed->latestfetch), MIDCOM_LOG_WARN);
@@ -150,7 +150,7 @@ 
         $guid = $item->get_id();
         $title = $item->get_title();
 
-        if (   (   empty($title)
+        if ((empty($title)
                 || trim($title) == '...')
             && empty($guid)) {
             // Something wrong with this entry, skip it
@@ -212,7 +212,7 @@ 
         }
 
         if ($article->id) {
-            if (   $this->apply_values($article, $values, $meta_values)
+            if ($this->apply_values($article, $values, $meta_values)
                 && !$article->update()) {
                 return null;
             }
@@ -241,14 +241,14 @@ 
     private function find_author(net_nemein_rss_parser_item $item) : midcom_db_person
     {
         // Try to figure out item author
-        if (   $this->_feed->forceauthor
+        if ($this->_feed->forceauthor
             && $this->_feed->defaultauthor) {
             // Feed has a "default author" set, use it
             return new midcom_db_person($this->_feed->defaultauthor);
         }
         $author = $this->match_item_author($item);
         $fallback_person_id = 1;
-        if (   !$author
+        if (!$author
             || $author->id == $fallback_person_id) {
             if ($this->_feed->defaultauthor) {
                 // Feed has a "default author" set, use it
@@ -413,7 +413,7 @@ 
             }
         }
 
-        if (   !empty($author_info['username'])
+        if (!empty($author_info['username'])
             && $person = midcom::get()->auth->get_user_by_name($author_info['username'])) {
             return $person->get_storage();
         }

lib/midcom/config/main.php

Spacing +3 added lines, -3 removed lines

@@ -363,7 +363,7 @@ 
         // show_unapproved_objects). Disabled by default. Unsafe to Link Prefetching!
         'metadata_approval' => false,
         'metadata_scheduling' => false,
-        'metadata_lock_timeout' => 60,    // Time in minutes
+        'metadata_lock_timeout' => 60, // Time in minutes
 
         // Set the datamanager schema used by the Metadata Service
         'metadata_schema' => 'file:/midcom/config/metadata_default.inc',
@@ -439,12 +439,12 @@ 
             return $default;
         }
 
-        if (   $key === 'auth_type'
+        if ($key === 'auth_type'
             && !in_array($this->_merged_config[$key], ['Plaintext', 'Legacy', 'SHA256'])) {
             throw new midcom_error('Unsupported authentication type');
         }
         // Check the midcom_config site prefix for absolute local urls
-        if (   $key === 'midcom_site_url'
+        if ($key === 'midcom_site_url'
             && str_starts_with($this->_merged_config[$key], '/')) {
             $this->_merged_config[$key] = midcom::get()->get_page_prefix() . substr($this->_merged_config[$key], 1);
         }

lib/midcom/helper/search/handler/search.php

Spacing +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
      */
     private function search_nodes(array $node, midcom_helper_nav $nap, string $prefix)
     {
-        if (   !array_key_exists($node[MIDCOM_NAV_COMPONENT], $this->_request_data['components'])
+        if (!array_key_exists($node[MIDCOM_NAV_COMPONENT], $this->_request_data['components'])
             && $node[MIDCOM_NAV_COMPONENT] != 'midcom.helper.search') {
             $l10n = $this->_i18n->get_l10n($node[MIDCOM_NAV_COMPONENT]);
             $this->_request_data['components'][$node[MIDCOM_NAV_COMPONENT]] = $l10n->get($node[MIDCOM_NAV_COMPONENT]);
@@ -106,7 +106,7 @@ 
         }
         $this->prepare_formdata($type, $request);
 
-        if (   count(explode(' ', $data['query'])) == 1
+        if (count(explode(' ', $data['query'])) == 1
             && !str_contains($data['query'], '*')
             && $this->_config->get('single_term_auto_wildcard')) {
             //If there is only one search term append * to the query if auto_wildcard is enabled

src/midcom/console/command/cacheinvalidate.php

Braces +2 added lines, -1 removed lines

@@ -44,7 +44,8 @@
     {
         try {
             $this->cache->invalidate_all();
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e) {
             $output->writeln($e->getMessage());
         }
 

lib/midcom/services/rcs/handler.php

Spacing +3 added lines, -3 removed lines

@@ -46,7 +46,7 @@ 
     {
         $this->object = $this->load_object($guid);
 
-        if (   !midcom::get()->config->get('midcom_services_rcs_enable')
+        if (!midcom::get()->config->get('midcom_services_rcs_enable')
             || !$this->object->_use_rcs) {
             throw new midcom_error_notfound("Revision control not supported for " . get_class($this->object) . ".");
         }
@@ -257,7 +257,7 @@ 
             throw new midcom_error_notfound("Revision {$args[1]} does not exist.");
         }
 
-        $data['preview'] = array_filter($this->backend->get_revision($revision), function ($value, $key) {
+        $data['preview'] = array_filter($this->backend->get_revision($revision), function($value, $key) {
             return !is_array($value)
                 && !in_array($value, ['', '0000-00-00'])
                 && midcom_services_rcs::is_field_showable($key);
@@ -287,7 +287,7 @@ 
         $this->object->require_do('midgard:update');
         // TODO: set another privilege for restoring?
 
-        if (   $this->backend->get_history()->version_exists($args[1])
+        if ($this->backend->get_history()->version_exists($args[1])
             && $this->backend->restore_to_revision($args[1])) {
             midcom::get()->uimessages->add($this->_l10n->get('midcom.admin.rcs'), sprintf($this->_l10n->get('restore to version %s successful'), $args[1]));
             return new midcom_response_relocate($this->get_object_url());

lib/midgard/admin/asgard/handler/object/deleted.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
                 'purge' => true
             ]
         ]);
-        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) {
             $this->_request_data['asgard_toolbar']->add_item([

lib/midgard/admin/asgard/handler/object/rcs.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
             return parent::load_object($guid);
         } catch (midcom_error_midgard $e) {
             $mgd_exception = $e->getPrevious();
-            if (   $mgd_exception
+            if ($mgd_exception
                 && $mgd_exception->getCode() == mgd_exception::OBJECT_DELETED) {
                 return $this->load_deleted($guid);
             }

Braces +2 added lines, -1 removed lines

@@ -27,7 +27,8 @@
     {
         try {
             return parent::load_object($guid);
-        } catch (midcom_error_midgard $e) {
+        }
+        catch (midcom_error_midgard $e) {
             $mgd_exception = $e->getPrevious();
             if (   $mgd_exception
                 && $mgd_exception->getCode() == mgd_exception::OBJECT_DELETED) {

lib/fi/protie/navigation/main.php

Spacing +7 added lines, -7 removed lines

@@ -202,8 +202,8 @@ 
         $classes = [];
 
         if ($item[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;
             }
@@ -233,7 +233,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;
@@ -253,11 +253,11 @@ 
         echo "<a href=\"{$item[MIDCOM_NAV_ABSOLUTEURL]}\"{$link_class}>" . htmlspecialchars($item[MIDCOM_NAV_NAME]) . "</a>";
         // If either of the follow nodes switches is on, follow all the nodes
 
-        if (   $item[MIDCOM_NAV_TYPE] === 'node'
-            && (   $this->list_levels === 0
+        if ($item[MIDCOM_NAV_TYPE] === 'node'
+            && ($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/net/nemein/wiki/resolver.php

Spacing +2 added lines, -2 removed lines

@@ -150,7 +150,7 @@ 
             $localpath = $path;
             $matches['latest_parent'] = $folder_tree['/'];
             $missing_levels = 0;
-            while (   $localpath
+            while ($localpath
                    && $localpath != '/') {
                 $localpath = dirname($localpath);
                 $missing_levels++;
@@ -177,7 +177,7 @@ 
 
         $root_folder = $folder;
         $max = 100;
-        while (   $folder[MIDCOM_NAV_COMPONENT] == 'net.nemein.wiki'
+        while ($folder[MIDCOM_NAV_COMPONENT] == 'net.nemein.wiki'
                && (($parent = $folder[MIDCOM_NAV_NODEID]) != -1)
                && $max > 0) {
             $root_folder = $folder;