flack / openpsa

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

lib/org/openpsa/directmarketing/handler/message/report.php

Braces +2 added lines, -1 removed lines

@@ -142,7 +142,8 @@
                 try {
                     $person = org_openpsa_contacts_person_dba::get_cached($link->person);
                     $segment = $person->get_parameter('org.openpsa.directmarketing.segments', $segmentation_param);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                 }
                 if (empty($segment)) {
                     $segment = $this->_l10n->get('no segment');

Spacing +12 added lines, -12 removed lines

@@ -37,7 +37,7 @@ 
         $qb_receipts->add_constraint('orgOpenpsaObtype', '=', org_openpsa_directmarketing_campaign_messagereceipt_dba::SENT);
         $qb_receipts->add_order('metadata.created');
         $receipts = $qb_receipts->execute_unchecked();
-        $receipt_data =& $this->_request_data['report']['receipt_data'];
+        $receipt_data = & $this->_request_data['report']['receipt_data'];
         $receipt_data['first_send'] = $receipts[0]->metadata->created ?? 0;
         $receipt_data['last_send'] = end($receipts)->metadata->created ?? 0;
         $receipt_data['sent'] = count($receipts);
@@ -64,7 +64,7 @@ 
 
     private function _get_campaign_data(int $first_send)
     {
-        $campaign_data =& $this->_request_data['report']['campaign_data'];
+        $campaign_data = & $this->_request_data['report']['campaign_data'];
         $qb_unsub = org_openpsa_directmarketing_campaign_member_dba::new_query_builder();
         $qb_unsub->add_constraint('campaign', '=', $this->_message->campaign);
         $qb_unsub->add_constraint('orgOpenpsaObtype', '=', org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED);
@@ -88,7 +88,7 @@ 
     private function _get_link_data($segmentation_param)
     {
         $this->_request_data['report']['link_data'] = [];
-        $link_data =& $this->_request_data['report']['link_data'];
+        $link_data = & $this->_request_data['report']['link_data'];
 
         $link_data['counts'] = [];
         $link_data['percentages'] = ['of_links' => [], 'of_recipients' => []];
@@ -114,7 +114,7 @@ 
         foreach ($links as $link) {
             $segment = '';
             $segment_notfound = false;
-            if (   $segmentation_param
+            if ($segmentation_param
                 && !empty($link->person)) {
                 try {
                     $person = org_openpsa_contacts_person_dba::get_cached($link->person);
@@ -128,7 +128,7 @@ 
                 if (!isset($link_data['segments'][$segment])) {
                     $link_data['segments'][$segment] = $segment_prototype;
                 }
-                $segment_data =& $link_data['segments'][$segment];
+                $segment_data = & $link_data['segments'][$segment];
             } else {
                 $segment_data = $segment_prototype;
             }
@@ -238,15 +238,15 @@ 
         $this->_initialize_field($array['percentages']['of_links'], $link);
         $this->_initialize_field($array['percentages']['of_recipients'], $link);
 
-        $link_data =& $this->_request_data['report']['link_data'];
-        $array['percentages']['of_links'][$link->target]['total'] = ($array['counts'][$link->target]['total']/$link_data['total'])*100;
-        $array['percentages']['of_links'][$link->target][$link->token] = ($array['counts'][$link->target][$link->token]/$link_data['total'])*100;
+        $link_data = & $this->_request_data['report']['link_data'];
+        $array['percentages']['of_links'][$link->target]['total'] = ($array['counts'][$link->target]['total'] / $link_data['total']) * 100;
+        $array['percentages']['of_links'][$link->target][$link->token] = ($array['counts'][$link->target][$link->token] / $link_data['total']) * 100;
 
-        $receipt_data =& $this->_request_data['report']['receipt_data'];
-        $array['percentages']['of_recipients'][$link->target]['total'] = ((count($array['counts'][$link->target])-1)/($receipt_data['sent']-$receipt_data['bounced']))*100;
-        $array['percentages']['of_recipients'][$link->target][$link->token] = ($array['counts'][$link->target][$link->token]/($receipt_data['sent']-$receipt_data['bounced']))*100;
+        $receipt_data = & $this->_request_data['report']['receipt_data'];
+        $array['percentages']['of_recipients'][$link->target]['total'] = ((count($array['counts'][$link->target]) - 1) / ($receipt_data['sent'] - $receipt_data['bounced'])) * 100;
+        $array['percentages']['of_recipients'][$link->target][$link->token] = ($array['counts'][$link->target][$link->token] / ($receipt_data['sent'] - $receipt_data['bounced'])) * 100;
 
-        if (   !isset($array['percentages']['of_recipients']['total'])
+        if (!isset($array['percentages']['of_recipients']['total'])
             || $array['percentages']['of_recipients'][$link->target]['total'] > $array['percentages']['of_recipients']['total']) {
             $array['percentages']['of_recipients']['total'] = $array['percentages']['of_recipients'][$link->target]['total'];
         }

lib/org/openpsa/directmarketing/importer.php

Braces +2 added lines, -1 removed lines

@@ -300,7 +300,8 @@
                     $organization = $this->_import_subscribers_organization($subscriber);
                     $this->_import_subscribers_organization_member($subscriber, $person, $organization);
                 }
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
                 // Clean up possibly created data
                 $this->_clean_new_objects();

Spacing +3 added lines, -3 removed lines

@@ -133,7 +133,7 @@ 
             // User is or has been subscriber earlier, update status
             $member = $members[0];
 
-            if (   $member->orgOpenpsaObtype == org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED
+            if ($member->orgOpenpsaObtype == org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED
                 || $member->orgOpenpsaObtype == org_openpsa_directmarketing_campaign_member_dba::NORMAL) {
                 $this->_import_status['already_subscribed']++;
                 return;
@@ -173,7 +173,7 @@ 
 
             $qb = org_openpsa_contacts_group_dba::new_query_builder();
             $schema = $this->_schemadbs['organization']->get('default');
-            if (   $schema->has_field('company_id')
+            if ($schema->has_field('company_id')
                 && !empty($subscriber['organization']['company_id'])) {
                 // Imported data has a company id, we use that instead of name
                 $qb->add_constraint($schema->get_field('company_id')['storage']['location'], '=', $subscriber['organization']['company_id']);
@@ -181,7 +181,7 @@ 
                 // Seek by official name
                 $qb->add_constraint('official', '=', $subscriber['organization']['official']);
 
-                if (   $schema->has_field('city')
+                if ($schema->has_field('city')
                     && !empty($subscriber['organization']['city'])) {
                     // Imported data has a city, we use also that for matching
                     $qb->add_constraint($schema->get_field('city')['storage']['location'], '=', $subscriber['organization']['city']);

lib/org/openpsa/directmarketing/exec/cleanup.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     echo "            <th>{$type}</th>\n";
     echo "            <td style=\"text-align: right;\">" . number_format($count) . "</td>\n";
     if (isset($cleanups_kept[$type])) {
-        echo "            <td style=\"text-align: right;\">" . number_format($cleanups_kept[$type]) ."</td>\n";
+        echo "            <td style=\"text-align: right;\">" . number_format($cleanups_kept[$type]) . "</td>\n";
     }
     echo "        </tr>\n";
 }