flack / openpsa

lib/org/openpsa/user/validator.php

Spacing +3 added lines, -3 removed lines

@@ -58,7 +58,7 @@ 
     {
         $result = $this->is_username_available($fields);
         $accounthelper = $this->get_accounthelper();
-        if (   $fields['password']['switch']
+        if ($fields['password']['switch']
             && !$accounthelper->check_password_strength((string) $fields['password']['password'])) {
             $result = ['password' => $accounthelper->errstr];
         }
@@ -162,9 +162,9 @@ 
         $result = [];
 
         $accounthelper = $this->get_accounthelper(new midcom_db_person($fields["person"]));
-        if (!$accounthelper->check_password_reuse($fields['new_password'])){
+        if (!$accounthelper->check_password_reuse($fields['new_password'])) {
             $result['new_password'] = $accounthelper->errstr;
-        } elseif (!$accounthelper->check_password_strength($fields['new_password'])){
+        } elseif (!$accounthelper->check_password_strength($fields['new_password'])) {
             $result['new_password'] = $accounthelper->errstr;
         }
         return $result ?: true;

Braces +2 added lines, -2 removed lines

@@ -162,9 +162,9 @@
         $result = [];
 
         $accounthelper = $this->get_accounthelper(new midcom_db_person($fields["person"]));
-        if (!$accounthelper->check_password_reuse($fields['new_password'])){
+        if (!$accounthelper->check_password_reuse($fields['new_password'])) {
             $result['new_password'] = $accounthelper->errstr;
-        } elseif (!$accounthelper->check_password_strength($fields['new_password'])){
+        } elseif (!$accounthelper->check_password_strength($fields['new_password'])) {
             $result['new_password'] = $accounthelper->errstr;
         }
         return $result ?: true;

lib/net/nehmer/comments/handler/view.php

Spacing +10 added lines, -10 removed lines

@@ -66,8 +66,8 @@ 
         if (!$this->_schemadb) {
             $this->_schemadb = schemadb::from_path($this->_config->get('schemadb'));
 
-            if (   $this->_config->get('use_captcha')
-                || (   !midcom::get()->auth->user
+            if ($this->_config->get('use_captcha')
+                || (!midcom::get()->auth->user
                     && $this->_config->get('use_captcha_if_anonymous'))) {
                 $fields = $this->_schemadb->get('comment')->get('fields');
                 $fields['captcha'] = [
@@ -80,7 +80,7 @@ 
                 $this->_schemadb->get('comment')->set('fields', $fields);
             }
 
-            if (   $this->_config->get('ratings_enable')
+            if ($this->_config->get('ratings_enable')
                 && $this->_schemadb->get('comment')->has_field('rating')) {
                 $this->_schemadb->get('comment')->get_field('rating')['hidden'] = false;
             }
@@ -145,7 +145,7 @@ 
             $this->_comments = $this->_comments->execute();
         }
 
-        if (   midcom::get()->auth->user
+        if (midcom::get()->auth->user
             || $this->_config->get('allow_anonymous')) {
             $this->_init_post_controller($request);
             if ($response = $this->_process_post($request)) {
@@ -174,7 +174,7 @@ 
      */
     private function _process_post(Request $request)
     {
-        if (   !midcom::get()->auth->user
+        if (!midcom::get()->auth->user
             && !midcom::get()->auth->request_sudo($this->_component)) {
             throw new midcom_error('We were anonymous but could not acquire SUDO privileges, aborting');
         }
@@ -187,7 +187,7 @@ 
                 }
 
                 $formdata = $this->_post_controller->get_form_values();
-                if (   $formdata['subscribe']
+                if ($formdata['subscribe']
                     && midcom::get()->auth->user) {
                     // User wants to subscribe to receive notifications about this comments thread
 
@@ -221,7 +221,7 @@ 
      */
     private function _get_last_modified() : int
     {
-        return array_reduce($this->_comments, function ($carry, net_nehmer_comments_comment $item) {
+        return array_reduce($this->_comments, function($carry, net_nehmer_comments_comment $item) {
             return max($item->metadata->revised, $carry);
         }, 0);
     }
@@ -240,8 +240,8 @@ 
                 $data['comment_toolbar'] = $this->populate_post_toolbar($comment);
                 midcom_show_style('comments-item');
 
-                if (   midcom::get()->auth->admin
-                    || (   midcom::get()->auth->user
+                if (midcom::get()->auth->admin
+                    || (midcom::get()->auth->user
                         && $comment->can_do('midgard:delete'))) {
                     midcom_show_style('comments-admintoolbar');
                 }
@@ -251,7 +251,7 @@ 
             midcom_show_style('comments-nonefound');
         }
 
-        if (   midcom::get()->auth->user
+        if (midcom::get()->auth->user
             || $this->_config->get('allow_anonymous')) {
             midcom_show_style('post-comment');
         } else {

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

Braces +2 added lines, -1 removed lines

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

lib/org/openpsa/directmarketing/handler/campaign/rules.php

Braces +2 added lines, -1 removed lines

@@ -90,7 +90,8 @@
         if ($request->request->has('midcom_helper_datamanager2_save')) {
             try {
                 $rules = $this->_load_rules($request);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 midcom::get()->uimessages->add($this->_component, $this->_l10n->get($e->getMessage()), 'error');
                 return;
             }

lib/org/openpsa/user/handler/person/account.php

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
         $workflow = $this->get_workflow('datamanager', ['controller' => $data['controller']]);
         $response = $workflow->run($request);
 
-        if (   $workflow->get_state() == 'save'
+        if ($workflow->get_state() == 'save'
             && $this->create_account($this->person, $data["controller"]->get_form_values())) {
             midcom::get()->uimessages->add($this->_l10n->get($this->_component), sprintf($this->_l10n->get('person %s created'), $this->person->name));
         }
@@ -77,7 +77,7 @@ 
         $person = new midcom_db_person($guid);
         $accounthelper = new org_openpsa_user_accounthelper($person);
         if ($accounthelper->welcome_email()) {
-            midcom::get()->uimessages->add($this->_l10n->get($this->_component), sprintf($this->_l10n->get('password reset and mail to %s sent'), $person->email ));
+            midcom::get()->uimessages->add($this->_l10n->get($this->_component), sprintf($this->_l10n->get('password reset and mail to %s sent'), $person->email));
         } else {
             midcom::get()->uimessages->add($this->_l10n->get($this->_component), $accounthelper->errstr, 'error');
         }
@@ -133,7 +133,7 @@ 
         $accounthelper = new org_openpsa_user_accounthelper($this->person);
 
         // Update account
-        if (   !$accounthelper->set_account($controller->get_form_values()["username"], $password)
+        if (!$accounthelper->set_account($controller->get_form_values()["username"], $password)
             && midcom_connection::get_error() != MGD_ERR_OK) {
             // Failure, give a message
             midcom::get()->uimessages->add($this->_l10n->get($this->_component), $this->_l10n->get("failed to update the user account, reason") . ': ' . $accounthelper->errstr, 'error');

lib/org/openpsa/products/handler/product/create.php

Braces +2 added lines, -1 removed lines

@@ -63,7 +63,8 @@
         if ($group > 0) {
             try {
                 $this->parent = new org_openpsa_products_product_group_dba($group);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }

lib/net/nehmer/blog/handler/view.php

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
             ]);
         }
 
-        if (   $this->_article->topic === $this->_topic->id
+        if ($this->_article->topic === $this->_topic->id
             && $this->_article->can_do('midgard:delete')) {
             $delete = $this->get_workflow('delete', ['object' => $this->_article]);
             $buttons[] = $delete->get_button($this->router->generate('delete', ['guid' => $this->_article->guid]));
@@ -73,7 +73,7 @@ 
         if ($this->_config->get('comments_enable')) {
             if ($node = net_nehmer_comments_interface::get_node($this->_topic, $this->_config->get('comments_topic'))) {
                 $data['comments_url'] = $node[MIDCOM_NAV_RELATIVEURL] . "comment/{$this->_article->guid}/";
-                if (   $this->_topic->can_do('midgard:update')
+                if ($this->_topic->can_do('midgard:update')
                     && $this->_topic->can_do('net.nehmer.comments:moderation')) {
                     net_nehmer_comments_viewer::add_head_elements();
                 }

src/midcom/datamanager/helper/autocomplete.php

Spacing +4 added lines, -6 removed lines

@@ -76,7 +76,7 @@ 
     private function apply_constraints(midcom_core_query $query, array $constraints)
     {
         foreach ($constraints as $key => $data) {
-            if (   !array_key_exists('value', $data)
+            if (!array_key_exists('value', $data)
                 || empty($data['field'])
                 || empty($data['op'])) {
                 debug_add("Constraint #{$key} is not correctly defined, skipping", MIDCOM_LOG_WARN);
@@ -137,7 +137,7 @@ 
     {
         $query = $this->request["term"];
         $wildcard_query = $query;
-        if (   isset($this->request['auto_wildcards'])
+        if (isset($this->request['auto_wildcards'])
             && !str_contains($query, '%')) {
             switch ($this->request['auto_wildcards']) {
                 case 'start':
@@ -245,9 +245,7 @@ 
                 return $label;
             }
         }
-        return midcom_helper_reflector::get($object)->get_object_label($object) ?:
-            self::build_label($object, array_column($result_headers, 'name')) ?:
-            $object::class . ' #' . $object->id;
+        return midcom_helper_reflector::get($object)->get_object_label($object) ?: self::build_label($object, array_column($result_headers, 'name')) ?: $object::class . ' #' . $object->id;
     }
 
     private static function build_label($object, array $fields) : string
@@ -282,7 +280,7 @@ 
             }
             return self::sanitize_label($value);
         }
-        if (   $field == 'username'
+        if ($field == 'username'
             && $object instanceof midcom_db_person) {
             $account = new midcom_core_account($object);
             return self::sanitize_label($account->get_username());

lib/midcom/helper/reflector/nameresolver.php

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
     public function get_object_name(?string $name_property = null) : ?string
     {
         $name_property ??= midcom_helper_reflector::get_name_property($this->_object);
-        if (    empty($name_property)
+        if (empty($name_property)
             || !midcom_helper_reflector::get($this->_object)->property_exists($name_property)) {
             // Could not resolve valid property
             return null;
@@ -124,7 +124,7 @@ 
 
             $qb->add_constraint($child_name_property, '=', $name);
             if ($qb->count()) {
-                debug_add("Name clash in sibling class {$schema_type} for " . $this->_object::class . " #{$this->_object->id} (path '" . midcom_helper_reflector_tree::resolve_path($this->_object, '/') . "')" );
+                debug_add("Name clash in sibling class {$schema_type} for " . $this->_object::class . " #{$this->_object->id} (path '" . midcom_helper_reflector_tree::resolve_path($this->_object, '/') . "')");
                 return false;
             }
         }
@@ -199,7 +199,7 @@ 
         } while (!$this->name_is_unique());
 
         // Get a copy of the current, usable name
-        $ret = (string)$this->_object->{$name_prop};
+        $ret = (string) $this->_object->{$name_prop};
         // Restore the original name
         $this->_object->{$name_prop} = $original_name;
         return $ret;