flack / openpsa

src/midcom/datamanager/extension/transformer/multipleTransformer.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
                     return [];
                 }
                 $results = explode($this->multiple_separator, substr($input, 1, -1));
-                if (   !empty($this->config['widget_config']['id_field'])
+                if (!empty($this->config['widget_config']['id_field'])
                     && $this->config['widget_config']['id_field'] == 'id') {
                     $results = array_map(intval(...), $results);
                 }
@@ -67,7 +67,7 @@ 
 
     public function reverseTransform(mixed $array) : mixed
     {
-        if (!is_array($array) ) {
+        if (!is_array($array)) {
             throw new TransformationFailedException('Expected an array.');
         }
 

src/midcom/dba/privileges.php

Spacing +3 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
      */
     public function set_privilege($privilege, $assignee = null, int $value = MIDCOM_PRIVILEGE_ALLOW, string $classname = '') : bool
     {
-        if (   !$this->can_do('midgard:update')
+        if (!$this->can_do('midgard:update')
             || !$this->can_do('midgard:privileges')) {
             debug_add("Failed to set a privilege, midgard:update or midgard:privileges on " . static::class . " {$this->guid} not granted for the current user.",
             MIDCOM_LOG_ERROR);
@@ -96,7 +96,7 @@ 
      */
     public function unset_privilege($privilege, $assignee = null, string $classname = '') : bool
     {
-        if (   !$this->can_do('midgard:update')
+        if (!$this->can_do('midgard:update')
             || !$this->can_do('midgard:privileges')) {
             debug_add("Failed to unset a privilege, midgard:update or midgard:privileges on " . static::class . " {$this->guid} not granted for the current user.",
             MIDCOM_LOG_ERROR);
@@ -125,7 +125,7 @@ 
      *     midcom_core_group object or subtype thereof.
      * @param string $classname An optional class name to which a SELF privilege is restricted to.
      */
-    public function get_privilege(string $privilege, midcom_core_user|midcom_core_group|string $assignee, string $classname = '')
+    public function get_privilege(string $privilege, midcom_core_user | midcom_core_group | string $assignee, string $classname = '')
     {
         if (!$this->can_do('midgard:privileges')) {
             debug_add("Failed to get a privilege, midgard:update or midgard:privileges on " . static::class . " {$this->guid} not granted for the current user.",

lib/midcom/helper/imagefilter.php

Spacing +3 added lines, -3 removed lines

@@ -323,7 +323,7 @@ 
         $tmpfile = null;
         $imagesize = getimagesize($this->_filename);
 
-        if (   $imagesize[2] == IMAGETYPE_JPEG
+        if ($imagesize[2] == IMAGETYPE_JPEG
             && $this->_jpegtran_available()) {
             /* jpegtran */
             $operations = [
@@ -390,7 +390,7 @@ 
         $imagesize = getimagesize($this->_filename);
 
         // Try lossless jpegtran rotation if possible
-        if (   $imagesize[2] == IMAGETYPE_JPEG
+        if ($imagesize[2] == IMAGETYPE_JPEG
             && ($rotate % 90 == 0)
             && $this->_jpegtran_available()) {
             $tmpfile = $this->_get_tempfile();
@@ -502,7 +502,7 @@ 
      */
     public function fill(?int $x = null, ?int $y = null, ?string $color = null, string $gravity = 'center')
     {
-        if (   empty($x)
+        if (empty($x)
             || empty($y)
             || empty($color)) {
             //This is a bit silly, but here for backwards compatibility...

lib/midgard/admin/asgard/navigation.php

Spacing +14 added lines, -14 removed lines

@@ -34,7 +34,7 @@ 
         $this->_component = 'midgard.admin.asgard';
 
         $this->_object = $object;
-        $this->_request_data =& $request_data;
+        $this->_request_data = & $request_data;
 
         $root_types = midgard_admin_asgard_plugin::get_root_classes();
 
@@ -50,7 +50,7 @@ 
             // we go through the path bottom up and show the first root type we find
             foreach (array_reverse($this->_object_path) as $node) {
                 foreach (array_keys($root_types) as $root_type) {
-                    if (   $node instanceof $root_type
+                    if ($node instanceof $root_type
                         || midcom_helper_reflector::is_same_class($root_type, $node->__midcom_class_name__)) {
                         $this->expanded_root_types[] = $root_type;
                         break;
@@ -62,7 +62,7 @@ 
 
     protected function _is_collapsed(string $type, int $total) : bool
     {
-        return (   $total > $this->_config->get('max_navigation_entries')
+        return ($total > $this->_config->get('max_navigation_entries')
                 && empty($_GET['show_all_' . $type]));
     }
 
@@ -78,7 +78,7 @@ 
         foreach ($ref->get_child_classes() as $class) {
             $qb = $ref->_child_objects_type_qb($class, $object, false);
 
-            if (   !$qb
+            if (!$qb
                 || !($count = $qb->count_unchecked())) {
                 continue;
             }
@@ -124,7 +124,7 @@ 
     {
         $qb = $ref->_root_objects_qb();
 
-        if (   !$qb
+        if (!$qb
             || !($total = $qb->count_unchecked())) {
             return;
         }
@@ -202,7 +202,7 @@ 
         }
 
         echo "<a href=\"" . midcom_connection::get_url('self') . "__mfa/asgard/object/{$mode}/{$object->guid}/\" title=\"GUID: {$object->guid}, ID: {$object->id}\">{$icon}{$label}</a>\n";
-        if (   $selected
+        if ($selected
             || $autoexpand) {
             $this->_list_child_elements($object, $level + 1);
         }
@@ -222,7 +222,7 @@ 
                 continue;
             }
 
-            if (   method_exists($class, 'navigation')
+            if (method_exists($class, 'navigation')
                 && ($this->_request_data['plugin_name'] == "asgard_{$component}")) {
                 $this->_request_data['expanded'] = true;
                 midcom_show_style('midgard_admin_asgard_navigation_section_header');
@@ -256,13 +256,13 @@ 
         if ($this->_is_selected($object)) {
             $css_class .= ' selected';
         }
-        if (   is_object($this->_object)
-            && (   $object->guid == $this->_object->guid
-                || (   $this->_object instanceof midcom_db_parameter
+        if (is_object($this->_object)
+            && ($object->guid == $this->_object->guid
+                || ($this->_object instanceof midcom_db_parameter
                     && $object->guid == $this->_object->parentguid))) {
             $css_class .= ' current';
         }
-        if ( !$object->can_do('midgard:update')) {
+        if (!$object->can_do('midgard:update')) {
             $css_class .= ' readonly';
         }
         return $css_class;
@@ -283,7 +283,7 @@ 
         // Get the types that might have special display conditions
         // @TODO: Should this just include to the configuration selection, although it would break the consistency
         // of other similar preference sets, which simply override the global settings?
-        if (   ($selected = midgard_admin_asgard_plugin::get_preference('midgard_types'))
+        if (($selected = midgard_admin_asgard_plugin::get_preference('midgard_types'))
             && preg_match_all('/\|([a-z0-9\.\-_]+)/', $selected, $regs)) {
             $types = array_flip($regs[1]);
             if ($exclude) {
@@ -301,7 +301,7 @@ 
             }
 
             // If the regular expression has been set, check which types should be shown
-            $label_mapping = array_filter($label_mapping, function ($root_type) use ($regexp, $exclude) {
+            $label_mapping = array_filter($label_mapping, function($root_type) use ($regexp, $exclude) {
                 return preg_match($regexp, $root_type) == $exclude;
             }, ARRAY_FILTER_USE_KEY);
         }
@@ -331,7 +331,7 @@ 
          * click if nothing is expanded
          */
         $types_shown = false;
-        if (    !empty($expanded_types)
+        if (!empty($expanded_types)
              && midgard_admin_asgard_plugin::get_preference('navigation_type') === 'dropdown') {
             $this->_draw_select_navigation();
             $types_shown = true;

lib/org/openpsa/user/accounthelper.php

Spacing +3 added lines, -3 removed lines

@@ -151,7 +151,7 @@ 
         $account = $this->get_account();
         if (!empty($new_password)) {
             // check if the new encrypted password was already used
-            if (   !$this->check_password_reuse($new_password)
+            if (!$this->check_password_reuse($new_password)
                 || !$this->check_password_strength($new_password)) {
                 return false;
             }
@@ -423,7 +423,7 @@ 
 
     public static function get_person_by_formdata(array $data) : ?midcom_db_person
     {
-        if (   empty($data['username'])
+        if (empty($data['username'])
             || empty($data['password'])) {
             return null;
         }
@@ -472,7 +472,7 @@ 
          * If the maximum number of attempts is reached and the oldest attempt
          * on the stack is within our defined timeframe, we block the account
          */
-        if (   count($attempts) >= $max_attempts
+        if (count($attempts) >= $max_attempts
             && $attempts[$max_attempts - 1] >= (time() - ($timeframe * 60))) {
             $this->disable_account();
             $stat = false;

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;
             }