flack / openpsa

lib/org/openpsa/projects/handler/task/resourcing.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
             return new midcom_response_relocate($this->router->generate('task_view', ['guid' => $guid]));
         }
 
-        if (   $request->request->has('save')
+        if ($request->request->has('save')
             && $prospects = $request->request->all('org_openpsa_projects_prospects')) {
             $qb = org_openpsa_projects_task_resource_dba::new_query_builder();
             $qb->add_constraint('guid', 'IN', array_keys($prospects));
@@ -89,7 +89,7 @@ 
                     // create relatedto
                     org_openpsa_relatedto_plugin::create($event, 'org.openpsa.calendar', $this->_task, 'org.openpsa.projects');
                 }
-                if (   $update_prospect
+                if ($update_prospect
                     && !$prospect->update()) {
                     debug_add('Failed to update prospect: ' . midcom_connection::get_error_string(), MIDCOM_LOG_ERROR);
                 }

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

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'),

lib/org/openpsa/reports/handler/invoices/report.php

Spacing +5 added lines, -5 removed lines

@@ -56,7 +56,7 @@ 
 
     private function _get_invoices_for_subscription(org_openpsa_sales_salesproject_deliverable_dba $deliverable, midcom_services_at_entry_dba $at_entry) : array
     {
-        if (   $deliverable->invoiceByActualUnits
+        if ($deliverable->invoiceByActualUnits
             && $at_entry->arguments['cycle'] > 1) {
             $months = midcom_baseclasses_components_configuration::get('org.openpsa.sales', 'config')->get('subscription_profit_months');
             $cutoff = (new DateTime)->modify('-' . $months . ' months');
@@ -81,8 +81,8 @@ 
         $time = $at_entry->start;
         $scheduler = new org_openpsa_invoices_scheduler($deliverable);
 
-        while (   $time < $this->_request_data['end']
-               && (   $time < $deliverable->end
+        while ($time < $this->_request_data['end']
+               && ($time < $deliverable->end
                    || $deliverable->continuous)) {
             $invoices[] = $this->get_invoice_for_deliverable($deliverable, $invoice_sum, $time, $calculation_base);
 
@@ -124,8 +124,8 @@ 
         foreach ($qb->execute() as $at_entry) {
             try {
                 $deliverable = org_openpsa_sales_salesproject_deliverable_dba::get_cached($at_entry->arguments['deliverable']);
-                if (   $deliverable->continuous
-                    || (   $deliverable->start < $this->_request_data['end']
+                if ($deliverable->continuous
+                    || ($deliverable->start < $this->_request_data['end']
                         && $deliverable->end > $this->_request_data['start'])) {
                     $invoices = array_merge($invoices, $this->_get_invoices_for_subscription($deliverable, $at_entry));
                 }

Braces +2 added lines, -1 removed lines

@@ -132,7 +132,8 @@
                         && $deliverable->end > $this->_request_data['start'])) {
                     $invoices = array_merge($invoices, $this->_get_invoices_for_subscription($deliverable, $at_entry));
                 }
-            } catch (midcom_error) {
+            }
+            catch (midcom_error) {
             }
         }
         $invoices = array_merge($invoices, $this->_get_deliverable_invoices());

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;

lib/midcom/baseclasses/components/handler/dataexport.php

Spacing +5 added lines, -5 removed lines

@@ -108,7 +108,7 @@ 
         foreach ($this->_datamanagers as $type => $datamanager) {
             foreach ($datamanager->get_schema($this->schemas[$type])->get('fields') as $name => $config) {
                 $title = $config['title'];
-                if (   $this->include_totals
+                if ($this->include_totals
                     && $config['type'] == 'number') {
                     $this->_totals[$type . '-' . $name] = 0;
                 }
@@ -172,18 +172,18 @@ 
                     $data = array_pad($data, $target_size, '');
                     continue;
                 }
-                $object =& $row[$type];
+                $object = & $row[$type];
 
                 $datamanager->set_storage($object, $this->schemas[$type]);
 
-                if (   $this->include_guid
+                if ($this->include_guid
                     && $type == $first_type) {
                     $data[] = $object->guid;
                 }
 
                 $csvdata = $datamanager->get_content_csv();
                 foreach ($datamanager->get_schema()->get('fields') as $fieldname => $config) {
-                    if (   $this->include_totals
+                    if ($this->include_totals
                         && $config['type'] == 'number') {
                         $this->_totals[$type . '-' . $fieldname] += $csvdata[$fieldname];
                     }
@@ -211,7 +211,7 @@ 
         if (empty($this->csv['charset'])) {
             // Default to ISO-LATIN-15 (Latin-1 with EURO sign etc)
             $this->csv['charset'] = 'ISO-8859-15';
-            if (   $request->server->has('HTTP_USER_AGENT')
+            if ($request->server->has('HTTP_USER_AGENT')
                 && !preg_match('/Windows/i', $request->server->get('HTTP_USER_AGENT'))) {
                 // Except when not on windows, then default to UTF-8
                 $this->csv['charset'] = 'UTF-8';