flack / openpsa

lib/org/openpsa/mail/backend.php

Braces +4 added lines, -2 removed lines

@@ -46,7 +46,8 @@ 
                     $object = self::_load_backend($backend, $params);
                     debug_add('Using backend ' . $backend);
                     return $object;
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     debug_add('Failed to load backend ' . $backend . ', message:' . $e->getMessage());
                 }
             }
@@ -76,7 +77,8 @@ 
             $this->mail($message);
             $this->error = null;
             return true;
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             $this->error = $e->getMessage();
             return false;
         }

src/midcom/grid/provider.php

Spacing +3 added lines, -3 removed lines

@@ -236,7 +236,7 @@ 
 
     private function _convert_to_localdata() : string
     {
-        return "var " . $this->_grid->get_identifier() . '_entries = ' .  json_encode($this->get_rows()) . ";\n";
+        return "var " . $this->_grid->get_identifier() . '_entries = ' . json_encode($this->get_rows()) . ";\n";
     }
 
     private function _render_json()
@@ -269,7 +269,7 @@ 
             $this->_sort_field = $query['sidx'];
             $this->_sort_direction = strtoupper($query['sord'] ?? 'ASC');
         }
-        if (   !empty($query['_search'])
+        if (!empty($query['_search'])
             && $query['_search'] === 'true') {
             foreach ($query as $field => $value) {
                 if (in_array($field, ['_search', 'nd', 'page', 'rows', 'sidx', 'sord'])) {
@@ -294,7 +294,7 @@ 
 
         $this->_total_rows = $query->count();
 
-        if (   $this->_datatype == 'json'
+        if ($this->_datatype == 'json'
             && !empty($this->_results_per_page)) {
             $query->set_limit($this->_results_per_page);
             if (!empty($this->_offset)) {

lib/org/openpsa/directmarketing/handler/import.php

Spacing +2 added lines, -2 removed lines

@@ -142,7 +142,7 @@ 
         $contacts = $importer->parse($input);
         if (!empty($contacts)) {
             $this->_request_data['import_status'] = $importer->import_subscribers($contacts, $this->_request_data['campaign']);
-            if (   $this->_request_data['import_status']['subscribed_new'] > 0
+            if ($this->_request_data['import_status']['subscribed_new'] > 0
                 || $this->_request_data['import_status']['already_subscribed'] > 0) {
                 $this->_import_success = true;
             }
@@ -199,7 +199,7 @@ 
                 $read_rows = 0;
                 $handle = fopen($data['tmp_file'], 'r');
                 $total_columns = 0;
-                while (   $read_rows < 2
+                while ($read_rows < 2
                        && $csv_line = fgetcsv($handle, 1000, $data['separator'])) {
                     if ($total_columns == 0) {
                         $total_columns = count($csv_line);

lib/org/openpsa/documents/handler/document/admin.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 
         $this->_controller = $this->load_controller();
 
-        if (   $data['enable_versioning']
+        if ($data['enable_versioning']
             && $request->request->count() > 0) {
             $this->_backup_attachment($request);
         }

lib/org/openpsa/core/queryfilter.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
         $user = midcom::get()->auth->user->get_storage();
 
         if ($request->request->get('unset_filter') == $filter_id) {
-            if (   $user->get_parameter("org_openpsa_core_filter", $filter_id)
+            if ($user->get_parameter("org_openpsa_core_filter", $filter_id)
                 && !$user->delete_parameter("org_openpsa_core_filter", $filter_id)) {
                 $message_content = sprintf(
                     $l10n->get('the handed filter for %s could not be set as parameter'),

src/midcom/console/command/cleanup/privileges.php

Braces +2 added lines, -1 removed lines

@@ -50,7 +50,8 @@
                 try {
                     \midgard_object_class::get_object_by_guid($priv->objectguid);
                     $seen_parents[$priv->objectguid] = true;
-                } catch (\Exception $e) {
+                }
+                catch (\Exception $e) {
                     $seen_parents[$priv->objectguid] = false;
                 }
             }

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('org.openpsa.user'), 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('org.openpsa.user'), $this->_l10n->get("failed to update the user account, reason") . ': ' . midcom_connection::get_error_string(), 'error');

lib/org/openpsa/directmarketing/campaign/ruleresolver.php

Spacing +2 added lines, -2 removed lines

@@ -270,7 +270,7 @@ 
      */
     private function add_misc_rule(array $rule, string $class, string $person_property)
     {
-        $persons = [ 0 => -1];
+        $persons = [0 => -1];
         $match = $rule['match'];
         $constraint_match = "IN";
         if ($rule['match'] == '<>') {
@@ -342,7 +342,7 @@ 
         $ret = [];
 
         foreach ($object->get_properties() as $property) {
-            if (   $property[0] == '_'
+            if ($property[0] == '_'
                 || in_array($property, $skip_properties)) {
                 // Skip private or otherwise invalid properties
                 continue;

Braces +4 added lines, -2 removed lines

@@ -110,7 +110,8 @@ 
         try {
             $this->process_classes($rules['classes'], $rules['type']);
             return true;
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return false;
         }
@@ -225,7 +226,8 @@ 
             $guid = $mc_parameter->get_subkey($parameter_key, 'parentguid');
             try {
                 $parent = midcom::get()->dbfactory->get_object_by_guid($guid);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
                 continue;
             }

lib/midcom/core/query.php

Spacing +2 added lines, -2 removed lines

@@ -102,7 +102,7 @@ 
             $this->_user_id = midcom::get()->auth->acl->get_user_id();
         }
 
-        if (   $this->hide_invisible
+        if ($this->hide_invisible
             && !$this->_visibility_checks_added) {
             if (!midcom::get()->config->get('show_hidden_objects')) {
                 $this->add_constraint('metadata.hidden', '=', false);
@@ -168,7 +168,7 @@ 
         // Deal with empty arrays, which would produce invalid queries
         // This is done here to avoid repetitive code in callers, and because
         // it's easy enough to generalize: IN empty set => always false, NOT IN empty set => always true
-        if (   is_array($value)
+        if (is_array($value)
             && empty($value)) {
             if ($operator == 'NOT IN') {
                 return;