flack / openpsa

lib/org/openpsa/notifications/main.php

Braces +2 added lines, -1 removed lines

@@ -52,7 +52,8 @@
         // TODO: Should we sudo here to ensure getting correct prefs regardless of ACLs?
         try {
             $recipient = midcom_db_person::get_cached($recipient);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return false;
         }
 

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
 
         // If user has preference for this message, we use that
         $personal_preferences = $recipient->list_parameters('org.openpsa.notifications');
-        if (   !empty($personal_preferences)
+        if (!empty($personal_preferences)
             && array_key_exists("{$component}:{$action}", $personal_preferences)) {
             return $personal_preferences[$action];
         }

lib/org/openpsa/invoices/scheduler.php

Braces +2 added lines, -1 removed lines

@@ -126,7 +126,8 @@
         $salesproject = org_openpsa_sales_salesproject_dba::get_cached($this->_deliverable->salesproject);
         try {
             $owner = midcom_db_person::get_cached($salesproject->owner);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return;
         }

Spacing +2 added lines, -2 removed lines

@@ -95,7 +95,7 @@ 
         }
 
         // TODO: Warehouse management: create new order
-        if (   $this->_deliverable->end < $next_cycle_start
+        if ($this->_deliverable->end < $next_cycle_start
             && $this->_deliverable->end != 0) {
             debug_add('Do not register next cycle, the contract ends before');
             return $this->_deliverable->end_subscription();
@@ -328,7 +328,7 @@ 
         }
 
         //If previous cycle was run at the end of the month, the new one should be at the end of the month as well
-        if (   $date->format('t') == $date->format('j')
+        if ($date->format('t') == $date->format('j')
             && $new_date->format('t') != $new_date->format('j')) {
             $new_date->setDate((int) $new_date->format('Y'), (int) $new_date->format('m'), (int) $new_date->format('t'));
         }

lib/org/openpsa/sales/handler/deliverable/view.php

Braces +2 added lines, -1 removed lines

@@ -51,7 +51,8 @@
         }
         try {
             $this->_request_data['product'] = org_openpsa_products_product_dba::get_cached($this->_deliverable->product);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $this->_request_data['product'] = false;
         }
     }

lib/org/openpsa/sales/handler/list.php

Braces +2 added lines, -1 removed lines

@@ -113,7 +113,8 @@
         try {
             $this->_request_data['customer'] = new org_openpsa_contacts_group_dba($guid);
             $qb->add_constraint('customer', '=', $this->_request_data['customer']->id);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $this->_request_data['customer'] = new org_openpsa_contacts_person_dba($guid);
             $qb->add_constraint('customerContact', '=', $this->_request_data['customer']->id);
         }

lib/org/openpsa/contacts/midcom/interfaces.php

Braces +2 added lines, -1 removed lines

@@ -159,7 +159,8 @@
 
         try {
             $object = new $classname($guid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $handler->print_error($type . " {$guid} not found, error " . $e->getMessage());
             return false;
         }

Spacing +4 added lines, -4 removed lines

@@ -77,11 +77,11 @@ 
 
     public function resolve_object_link(midcom_db_topic $topic, midcom_core_dbaobject $object) : ?string
     {
-        if (   $object instanceof org_openpsa_contacts_group_dba
+        if ($object instanceof org_openpsa_contacts_group_dba
             || $object instanceof midcom_db_group) {
             return "group/{$object->guid}/";
         }
-        if (   $object instanceof org_openpsa_contacts_person_dba
+        if ($object instanceof org_openpsa_contacts_person_dba
             || $object instanceof midcom_db_person) {
             return "person/{$object->guid}/";
         }
@@ -110,8 +110,8 @@ 
             // We have a feed URL, but we should check if it is GeoRSS as well
             $items = net_nemein_rss_fetch::raw_fetch($data['rss_url'])->get_items();
 
-            if (   !empty($items)
-                && (   $items[0]->get_latitude()
+            if (!empty($items)
+                && ($items[0]->get_latitude()
                     || $items[0]->get_longitude())) {
                 // This is a GeoRSS feed
                 $data['georss_url'] = $data['rss_url'];

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

Braces +2 added lines, -1 removed lines

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

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

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

Braces +2 added lines, -1 removed lines

@@ -71,7 +71,8 @@
             $owner = org_openpsa_contacts_person_dba::get_cached($salesproject->owner);
             $row['index_owner'] = $owner->name;
             $row['owner'] = org_openpsa_widgets_contact::get($owner->guid)->show_inline();
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
         }
         $row['amount'] = $object->pricePerUnit * $object->units;

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

Spacing +1 added lines, -1 removed lines

@@ -151,7 +151,7 @@
             return;
         }
         foreach ($parameters as $param_data) {
-            if (   empty($param_data['domain'])
+            if (empty($param_data['domain'])
                 || empty($param_data['name'])
                 || empty($param_data['value'])) {
                 // TODO: Log warning

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

Braces +4 added lines, -2 removed lines

@@ -59,7 +59,8 @@ 
     {
         try {
             $person = new org_openpsa_contacts_person_dba($member->person);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return;
         }
@@ -82,7 +83,8 @@ 
                 $row['organization_member'] = $membership;
                 try {
                     $row['organization'] = org_openpsa_contacts_group_dba::get_cached($membership->gid);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     debug_add("Error fetching org_openpsa_contacts_group_dba #{$membership->gid}, skipping", MIDCOM_LOG_WARN);
                     continue;
                 }