flack / openpsa

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/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/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';

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

Spacing +12 added lines, -12 removed lines

@@ -33,7 +33,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);
@@ -60,7 +60,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);
@@ -84,7 +84,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' => []];
@@ -110,7 +110,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);
@@ -122,7 +122,7 @@ 
                     $segment_notfound = true;
                 }
                 $link_data['segments'][$segment] ??= $segment_prototype;
-                $segment_data =& $link_data['segments'][$segment];
+                $segment_data = & $link_data['segments'][$segment];
             } else {
                 $segment_data = $segment_prototype;
             }
@@ -230,15 +230,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'];
         }

Braces +2 added lines, -1 removed lines

@@ -114,7 +114,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) {
+                }
+                catch (midcom_error) {
                 }
                 if (empty($segment)) {
                     $segment = $this->_l10n->get('no segment');

src/midcom/datamanager/extension/type/codemirrorType.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $map_attr = function (Options $options, $value) {
+        $map_attr = function(Options $options, $value) {
             $value ??= [];
             $value['class'] = $options['widget_config']['enabled'] ? 'codemirror ' . $options['widget_config']['language'] : 'longtext';
 
@@ -44,7 +44,7 @@ 
             ]
         ]);
 
-        $resolver->setNormalizer('constraints', function (Options $options, $value) {
+        $resolver->setNormalizer('constraints', function(Options $options, $value) {
             if ($options['dm2_type'] == 'php') {
                 $value[] = new php;
             }

src/midcom/datamanager/extension/type/toolbarType.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
                 $operation = $button->getConfig()->getOption('operation');
                 $storage = $view->parent->vars['value'];
 
-                if (   $operation == controller::SAVE
+                if ($operation == controller::SAVE
                     && $storage instanceof dbacontainer
                     && empty($storage->get_value()->id)) {
                     $label = 'create';

lib/net/nemein/rss/fetch.php

Spacing +6 added lines, -6 removed lines

@@ -81,7 +81,7 @@ 
             $etag = trim($parser->data['headers']['etag']);
 
             $feed_etag = $this->_feed->get_parameter('net.nemein.rss', 'etag');
-            if (   !empty($feed_etag)
+            if (!empty($feed_etag)
                 && $feed_etag == $etag) {
                 // Feed hasn't changed, skip updating
                 debug_add("Feed {$this->_feed->url} has not changed since " . date('c', $this->_feed->latestfetch), MIDCOM_LOG_WARN);
@@ -150,7 +150,7 @@ 
         $guid = $item->get_id();
         $title = $item->get_title();
 
-        if (   (   empty($title)
+        if ((empty($title)
                 || trim($title) == '...')
             && empty($guid)) {
             // Something wrong with this entry, skip it
@@ -212,7 +212,7 @@ 
         }
 
         if ($article->id) {
-            if (   $this->apply_values($article, $values, $meta_values)
+            if ($this->apply_values($article, $values, $meta_values)
                 && !$article->update()) {
                 return null;
             }
@@ -241,14 +241,14 @@ 
     private function find_author(net_nemein_rss_parser_item $item) : midcom_db_person
     {
         // Try to figure out item author
-        if (   $this->_feed->forceauthor
+        if ($this->_feed->forceauthor
             && $this->_feed->defaultauthor) {
             // Feed has a "default author" set, use it
             return new midcom_db_person($this->_feed->defaultauthor);
         }
         $author = $this->match_item_author($item);
         $fallback_person_id = 1;
-        if (   !$author
+        if (!$author
             || $author->id == $fallback_person_id) {
             if ($this->_feed->defaultauthor) {
                 // Feed has a "default author" set, use it
@@ -413,7 +413,7 @@ 
             }
         }
 
-        if (   !empty($author_info['username'])
+        if (!empty($author_info['username'])
             && $person = midcom::get()->auth->get_user_by_name($author_info['username'])) {
             return $person->get_storage();
         }

lib/midcom/config/main.php

Spacing +3 added lines, -3 removed lines

@@ -363,7 +363,7 @@ 
         // show_unapproved_objects). Disabled by default. Unsafe to Link Prefetching!
         'metadata_approval' => false,
         'metadata_scheduling' => false,
-        'metadata_lock_timeout' => 60,    // Time in minutes
+        'metadata_lock_timeout' => 60, // Time in minutes
 
         // Set the datamanager schema used by the Metadata Service
         'metadata_schema' => 'file:/midcom/config/metadata_default.inc',
@@ -439,12 +439,12 @@ 
             return $default;
         }
 
-        if (   $key === 'auth_type'
+        if ($key === 'auth_type'
             && !in_array($this->_merged_config[$key], ['Plaintext', 'Legacy', 'SHA256'])) {
             throw new midcom_error('Unsupported authentication type');
         }
         // Check the midcom_config site prefix for absolute local urls
-        if (   $key === 'midcom_site_url'
+        if ($key === 'midcom_site_url'
             && str_starts_with($this->_merged_config[$key], '/')) {
             $this->_merged_config[$key] = midcom::get()->get_page_prefix() . substr($this->_merged_config[$key], 1);
         }

lib/midcom/helper/search/handler/search.php

Spacing +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
      */
     private function search_nodes(array $node, midcom_helper_nav $nap, string $prefix)
     {
-        if (   !array_key_exists($node[MIDCOM_NAV_COMPONENT], $this->_request_data['components'])
+        if (!array_key_exists($node[MIDCOM_NAV_COMPONENT], $this->_request_data['components'])
             && $node[MIDCOM_NAV_COMPONENT] != 'midcom.helper.search') {
             $l10n = $this->_i18n->get_l10n($node[MIDCOM_NAV_COMPONENT]);
             $this->_request_data['components'][$node[MIDCOM_NAV_COMPONENT]] = $l10n->get($node[MIDCOM_NAV_COMPONENT]);
@@ -106,7 +106,7 @@ 
         }
         $this->prepare_formdata($type, $request);
 
-        if (   count(explode(' ', $data['query'])) == 1
+        if (count(explode(' ', $data['query'])) == 1
             && !str_contains($data['query'], '*')
             && $this->_config->get('single_term_auto_wildcard')) {
             //If there is only one search term append * to the query if auto_wildcard is enabled