flack / openpsa

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

Braces +6 added lines, -3 removed lines

@@ -134,7 +134,8 @@ 
 
         try {
             $deliverable = new org_openpsa_sales_salesproject_deliverable_dba($args['deliverable']);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $handler->print_error("Deliverable {$args['deliverable']} not found: " . midcom_connection::get_error_string());
             return false;
         }
@@ -158,7 +159,8 @@ 
         }
         try {
             $deliverable = new org_openpsa_sales_salesproject_deliverable_dba($args['deliverable']);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $handler->print_error('no deliverable with passed GUID: ' . $args['deliverable'] . ', aborting');
             return false;
         }
@@ -166,7 +168,8 @@ 
         //get the owner of the salesproject the deliverable belongs to
         try {
             $project = new org_openpsa_sales_salesproject_dba($deliverable->salesproject);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $handler->print_error('Failed to load salesproject: ' . $e->getMessage());
             return false;
         }

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
      */
     private function _find_suspects_event(midcom_core_dbaobject $object, org_openpsa_relatedto_dba $defaults, array &$links_array)
     {
-        if (   !is_array($object->participants)
+        if (!is_array($object->participants)
             || count($object->participants) < 2) {
             //We have invalid list or less than two participants, abort
             return;

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

@@ -64,7 +64,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) {
             $invoice_sum = $deliverable->invoiced / ($at_entry->arguments['cycle'] - 1);
             if ($invoice_sum == 0) {
@@ -80,8 +80,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);
 
@@ -123,8 +123,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/ruleresolver.php

Braces +2 added lines, -1 removed lines

@@ -269,7 +269,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;
             }

Spacing +2 added lines, -2 removed lines

@@ -279,7 +279,7 @@ 
      */
     private function add_misc_rule(array $rule, string $class, string $person_property) : bool
     {
-        $persons = [ 0 => -1];
+        $persons = [0 => -1];
         $match = $rule['match'];
         $constraint_match = "IN";
         if ($rule['match'] == '<>') {
@@ -351,7 +351,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;

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