flack / openpsa

lib/midcom/services/auth/backend.php

Braces +2 added lines, -1 removed lines

@@ -87,7 +87,8 @@
                     $param = $param->__object;
                 }
                 $this->_user_cache[$id] = new midcom_core_user($param);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 // Keep it silent while missing user object can mess here
                 $this->_user_cache[$id] = null;
             }

Spacing +2 added lines, -2 removed lines

@@ -100,7 +100,7 @@ 
             return null;
         }
 
-        if (   midcom::get()->config->get('auth_check_client_ip')
+        if (midcom::get()->config->get('auth_check_client_ip')
             && $data['clientip'] != $request->getClientIp()) {
             debug_add("The session had mismatching client IP.", MIDCOM_LOG_INFO);
             debug_add("Expected {$data['clientip']}, got {$request->getClientIp()}.");
@@ -114,7 +114,7 @@ 
             return null;
         }
 
-        if (   !$this->check_timestamp($data['timestamp'], $user)
+        if (!$this->check_timestamp($data['timestamp'], $user)
             || !$this->authenticate($user->username, '', true)) {
             $this->logout($user);
             return null;

lib/midgard/admin/asgard/plugin.php

Spacing +2 added lines, -2 removed lines

@@ -164,7 +164,7 @@ 
 
         $parent = $object->get_parent();
 
-        if (   is_a($object, midcom_db_parameter::class)
+        if (is_a($object, midcom_db_parameter::class)
             && !empty($parent->guid)) {
             // Add "parameters" list to breadcrumb if we're in a param
             $breadcrumb[] = [
@@ -174,7 +174,7 @@ 
         }
 
         $i = 0;
-        while (   !empty($parent->guid)
+        while (!empty($parent->guid)
                && $i < 10) {
             $i++;
             $parent_reflector = midcom_helper_reflector::get($parent);

lib/midgard/admin/asgard/schemadb.php

Spacing +4 added lines, -4 removed lines

@@ -64,7 +64,7 @@ 
 
     protected function add_string_field(string $key, string $type)
     {
-        if (   $key == 'component'
+        if ($key == 'component'
             && $type == midcom_db_topic::class) {
             $this->_add_component_dropdown($key);
             return;
@@ -134,12 +134,12 @@ 
         parent::add_longtext_field($key);
 
         // Check the user preference and configuration
-        if (   in_array($key, ['content', 'description'])
+        if (in_array($key, ['content', 'description'])
             && midgard_admin_asgard_plugin::get_preference('tinymce_enabled')) {
             $this->schema['fields'][$key]['widget'] = 'tinymce';
         }
 
-        if (   in_array($key, ['value', 'code'])
+        if (in_array($key, ['value', 'code'])
             && midgard_admin_asgard_plugin::get_preference('codemirror_enabled')) {
             $this->schema['fields'][$key]['widget'] = 'codemirror';
         }
@@ -257,7 +257,7 @@ 
         if ($score1 > $score2) {
             return 1;
         }
-        if (   $score1 < 3
+        if ($score1 < 3
             || $score1 > 6) {
             return strnatcmp($first, $second);
         }

lib/midgard/admin/asgard/handler/component/configuration.php

Spacing +2 added lines, -2 removed lines

@@ -277,7 +277,7 @@ 
     {
         $success = true;
         foreach ($this->_request_data['config']->_global as $global_key => $global_value) {
-            if (   isset($config[$global_key])
+            if (isset($config[$global_key])
                 && $config[$global_key] != $global_value) {
                 continue;
                 // Skip the ones we will set next
@@ -290,7 +290,7 @@ 
         }
 
         foreach ($config as $key => $value) {
-            if (   is_array($value)
+            if (is_array($value)
                 || is_object($value)) {
                 /**
                  * See http://trac.midgard-project.org/ticket/1442

lib/midgard/admin/asgard/schemadb/config.php

Spacing +2 added lines, -2 removed lines

@@ -61,11 +61,11 @@
                 $fields[$key] = $this->detect_schema($key, $value);
             }
 
-            if (   !isset($this->config->_local[$key])
+            if (!isset($this->config->_local[$key])
                 || $this->config->_local[$key] == $this->config->_global[$key]) {
                 // No local configuration setting, note to user that this is the global value
                 $fields[$key]['title'] = $schema->get_l10n()->get($fields[$key]['title']);
-                $fields[$key]['title'] .= " <span class=\"global\">(" . midcom::get()->i18n->get_string('global value', 'midgard.admin.asgard') .")</span>";
+                $fields[$key]['title'] .= " <span class=\"global\">(" . midcom::get()->i18n->get_string('global value', 'midgard.admin.asgard') . ")</span>";
             }
         }
 

lib/midcom/admin/help/help.php

Spacing +3 added lines, -3 removed lines

@@ -179,9 +179,9 @@ 
         $files = [];
         $pattern = $component_dir . '*.{' . $this->_i18n->get_current_language() . ',' . $this->_i18n->get_fallback_language() . '}.txt';
 
-        foreach (glob($pattern, GLOB_NOSORT|GLOB_BRACE) as $path) {
+        foreach (glob($pattern, GLOB_NOSORT | GLOB_BRACE) as $path) {
             $entry = basename($path);
-            if (   str_starts_with($entry, 'index')
+            if (str_starts_with($entry, 'index')
                 || str_starts_with($entry, 'handler')
                 || str_starts_with($entry, 'urlmethod')) {
                 // Ignore dotfiles, handlers & index.lang.txt
@@ -232,7 +232,7 @@ 
         $data = [];
 
         $exec_path = midcom::get()->componentloader->path_to_snippetpath($component) . '/exec/';
-        if (   !is_dir($exec_path)
+        if (!is_dir($exec_path)
             || !is_readable($exec_path)) {
             // Directory not accessible, skip loading it
             return $data;

lib/midcom/helper/_dbfactory.php

Braces +4 added lines, -2 removed lines

@@ -43,7 +43,8 @@ 
     {
         try {
             $tmp = midgard_object_class::get_object_by_guid($guid);
-        } catch (mgd_exception $e) {
+        }
+        catch (mgd_exception $e) {
             debug_add('Loading object by GUID ' . $guid . ' failed, reason: ' . $e->getMessage(), MIDCOM_LOG_INFO);
 
             throw new midcom_error_midgard($e, $guid);
@@ -163,7 +164,8 @@ 
 
         try {
             return $this->get_cached($classname, $parent_guid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return null;
         }
     }

Spacing +4 added lines, -4 removed lines

@@ -49,7 +49,7 @@ 
             throw new midcom_error_midgard($e, $guid);
         }
         $person_class = midcom::get()->config->get('person_class');
-        if (   get_class($tmp) == 'midgard_person'
+        if (get_class($tmp) == 'midgard_person'
             && $person_class != 'midgard_person') {
             $tmp = new $person_class($guid);
         }
@@ -79,7 +79,7 @@ 
         }
         $object = new $classname($src);
         $cache[$classname][$object->guid] = $object;
-        $cache[$classname][$object->id] =& $cache[$classname][$object->guid];
+        $cache[$classname][$object->id] = & $cache[$classname][$object->guid];
         return $cache[$classname][$object->guid];
     }
 
@@ -127,7 +127,7 @@ 
             return true;
         }
 
-        if (   isset($object->__object)
+        if (isset($object->__object)
             && is_object($object->__object)
             && $object->__object instanceof $class) {
             // Decorator whose MgdSchema object matches
@@ -150,7 +150,7 @@ 
             return $this->get_parent_data_uncached($object);
         });
 
-        if (   empty($parent_guid)
+        if (empty($parent_guid)
             || $parent_guid === $object->guid) {
             return null;
         }

lib/org/openpsa/calendar/event.php

Spacing +2 added lines, -2 removed lines

@@ -141,7 +141,7 @@ 
         }
 
         //Check up
-        if (   !$this->up
+        if (!$this->up
             && $this->title != '__org_openpsa_calendar') {
             $root_event = org_openpsa_calendar_interface::find_root_event();
             $this->up = $root_event->id;
@@ -166,7 +166,7 @@ 
 
     private function _check_timerange() : bool
     {
-        if (   !$this->start
+        if (!$this->start
             || !$this->end) {
             debug_add('Event must have start and end timestamps');
             midcom_connection::set_error(MGD_ERR_RANGE);

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

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
     {
         $this->_object = midcom::get()->dbfactory->get_object_by_guid($guid);
 
-        if (   !is_a($this->_object, midcom_db_topic::class)
+        if (!is_a($this->_object, midcom_db_topic::class)
             && !is_a($this->_object, midcom_db_article::class)) {
             throw new midcom_error_notfound("Moving only topics and articles is supported.");
         }
@@ -76,7 +76,7 @@ 
             $folder = midcom_core_context::get()->get_key(MIDCOM_CONTEXT_ROOTTOPIC);
         }
 
-        if (   is_a($this->_object, midcom_db_topic::class)
+        if (is_a($this->_object, midcom_db_topic::class)
             && $folder->up == $this->_object->id) {
             $tree_disabled = true;
         }
@@ -89,7 +89,7 @@ 
             $selected = ' checked="checked"';
         }
 
-        if (   !is_a($this->_object, midcom_db_topic::class)
+        if (!is_a($this->_object, midcom_db_topic::class)
             && $folder->component !== $this->current_folder->component) {
             // Non-topic objects may only be moved under folders of same component
             $class = 'wrong_component';

Braces +2 added lines, -1 removed lines

@@ -47,7 +47,8 @@
                 $target = new midcom_db_topic($request->request->getInt('move_to'));
                 $this->_move_object($target);
                 midcom::get()->uimessages->add($this->_l10n->get($this->_component), sprintf($this->_l10n->get('moved %s to %s'), $this->_topic->get_label(), $target->get_label()));
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 midcom::get()->uimessages->add($this->_l10n->get($this->_component), $e->getMessage(), 'error');
             }
         }