flack / openpsa

lib/org/openpsa/mail/exec/test.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 midcom::get()->auth->require_admin_user();
 
-if (   empty($_POST['to'])
+if (empty($_POST['to'])
     || empty($_POST['from'])) {
     ?>
     <h2>Send test email</h2>

lib/org/openpsa/mail/template.php

Spacing +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
         foreach ($this->_parameters as $key => $value) {
             $this->_patterns[] = "/__({$key})__/";
 
-            if (   is_array($value)
+            if (is_array($value)
                 || is_object($value)) {
                 $this->_patterns[] = "/__({$key})_([^ \.>\"-]*?)__/";
             }

lib/org/openpsa/invoices/handler/scheduled.php

Braces +4 added lines, -2 removed lines

@@ -57,7 +57,8 @@ 
         try {
             $deliverable = org_openpsa_sales_salesproject_deliverable_dba::get_cached($at_entry->arguments['deliverable']);
             $salesproject = org_openpsa_sales_salesproject_dba::get_cached($deliverable->salesproject);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return $invoice;
         }
@@ -95,7 +96,8 @@ 
                 $object = $classname::get_cached($id);
                 $invoice[$fieldname] = $object->render_link();
                 $invoice['index_' . $fieldname] = $object->get_label();
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }

lib/org/openpsa/invoices/handler/goto.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
             return $this->fail($this->_l10n->get('no invoice number was handed over'));
         }
 
-        $invoicenumber = (int) $_GET['query'] ;
+        $invoicenumber = (int) $_GET['query'];
 
         if ($invoice = org_openpsa_invoices_invoice_dba::get_by_number($invoicenumber)) {
             return new midcom_response_relocate('invoice/' . $invoice->guid . '/');

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/handler/person/view.php

Braces +2 added lines, -1 removed lines

@@ -216,7 +216,8 @@
         foreach ($this->_request_data[$identifier] as $member) {
             try {
                 $this->_request_data['group'] = org_openpsa_contacts_group_dba::get_cached($member->gid);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
                 continue;
             }

Spacing +4 added lines, -4 removed lines

@@ -107,7 +107,7 @@ 
         $invoices_url = $siteconfig->get_node_full_url('org.openpsa.invoices');
         $user_url = $siteconfig->get_node_full_url('org.openpsa.user');
 
-        if (   $invoices_url
+        if ($invoices_url
             && midcom::get()->auth->can_user_do('midgard:create', null, org_openpsa_invoices_invoice_dba::class)
             && $this->_contact->can_do('midgard:update')) {
             $buttons[] = $workflow->get_button($invoices_url . "billingdata/" . $this->_contact->guid . '/', [
@@ -115,8 +115,8 @@ 
             ]);
         }
 
-        if (   $user_url
-            && (   midcom_connection::get_user() == $this->_contact->id
+        if ($user_url
+            && (midcom_connection::get_user() == $this->_contact->id
                 || midcom::get()->auth->can_user_do('org.openpsa.user:access', null, org_openpsa_user_interface::class))) {
             $buttons[] = [
                 MIDCOM_TOOLBAR_URL => $user_url . "view/{$this->_contact->guid}/",
@@ -194,7 +194,7 @@ 
      */
     public function _show_group_memberships($handler_id, array &$data)
     {
-        if (   count($data['organizations']) == 0
+        if (count($data['organizations']) == 0
             && count($data['groups']) == 0) {
             midcom_show_style('show-person-groups-empty');
         } else {

lib/org/openpsa/contacts/duplicates/check.php

Braces +2 added lines, -1 removed lines

@@ -382,7 +382,8 @@
             try {
                 $obj1 = $class::get_cached($arr1['guid']);
                 $obj2 = $class::get_cached($arr2['guid']);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
                 continue;
             }

Spacing +6 added lines, -6 removed lines

@@ -128,7 +128,7 @@ 
             // if user's lastname is part of the email address, check to see if the difference is only in the domain part
             $email1 = preg_replace('/@.+/', '', $person1['email']);
             $email2 = preg_replace('/@.+/', '', $person2['email']);
-            if (   strpos($email1, $person1['lastname']) !== false
+            if (strpos($email1, $person1['lastname']) !== false
                 && $email1 == $email2) {
                 $ret['email_match'] = true;
                 $ret['p'] += 0.5;
@@ -174,7 +174,7 @@ 
 
     private function match($property, array $data1, array $data2)
     {
-        if (   !empty($data1[$property])
+        if (!empty($data1[$property])
             && $data1[$property] == $data2[$property]) {
             return true;
         }
@@ -325,7 +325,7 @@ 
         $persons = $this->get_person_candidates();
 
         $params = [];
-        $params['objects'] =& $persons;
+        $params['objects'] = & $persons;
         $params['mode'] = 'person';
 
         array_walk($persons, [$this, 'check_all_arraywalk'], $params);
@@ -387,7 +387,7 @@ 
                 continue;
             }
 
-            if (   $obj1->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $obj2->guid)
+            if ($obj1->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $obj2->guid)
                 || $obj2->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $obj1->guid)) {
                 // Not-duplicate parameter found, returning zero probability
                 continue;
@@ -415,7 +415,7 @@ 
 
         $groups = $this->get_group_candidates();
         $params = [];
-        $params['objects'] =& $groups;
+        $params['objects'] = & $groups;
         $params['mode'] = 'group';
         array_walk($groups, [$this, 'check_all_arraywalk'], $params);
 
@@ -479,7 +479,7 @@ 
     {
         debug_add($message);
         if ($output) {
-            echo $indent . 'INFO: ' . $message  . "<br/>\n";
+            echo $indent . 'INFO: ' . $message . "<br/>\n";
             flush();
         }
     }

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

@@ -48,7 +48,7 @@ 
 
     private function _get_invoices_for_subscription($deliverable, $at_entry)
     {
-        if (   $deliverable->invoiceByActualUnits
+        if ($deliverable->invoiceByActualUnits
             && $at_entry->arguments['cycle'] > 1) {
             $invoice_sum = $deliverable->invoiced / ($at_entry->arguments['cycle'] - 1);
             if ($invoice_sum == 0) {
@@ -64,8 +64,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);
 
@@ -107,8 +107,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));
                 }