flack / openpsa

lib/org/openpsa/widgets/contact.php

Spacing +8 added lines, -8 removed lines

@@ -140,7 +140,7 @@ 
      */
     private function read_object($person) : bool
     {
-        if (   !is_object($person)
+        if (!is_object($person)
             || !$person instanceof midcom_db_person) {
             // Given $person is not one
             return false;
@@ -164,12 +164,12 @@ 
             }
         }
 
-        if (   $this->_config->get('jabber_enable_presence')
+        if ($this->_config->get('jabber_enable_presence')
             && $person->get_parameter('org.openpsa.jabber', 'jid')) {
             $this->contact_details['jid'] = $person->get_parameter('org.openpsa.jabber', 'jid');
         }
 
-        if (   $this->_config->get('skype_enable_presence')
+        if ($this->_config->get('skype_enable_presence')
             && $person->get_parameter('org.openpsa.skype', 'name')) {
             $this->contact_details['skype'] = $person->get_parameter('org.openpsa.skype', 'name');
         }
@@ -208,7 +208,7 @@ 
         if (!empty($attachments[$type])) {
             return '<img class="photo" src="' . midcom_db_attachment::get_url($attachments[$type]) . '">';
         }
-        if (   $this->_config->get('gravatar_enable')
+        if ($this->_config->get('gravatar_enable')
             && !empty($this->contact_details['email'])) {
             $size = ($type == 'view') ? 500 : 32;
             $gravatar_url = "https://www.gravatar.com/avatar/" . md5(strtolower(trim($this->contact_details['email']))) . "?s=" . $size . '&d=identicon';
@@ -320,7 +320,7 @@ 
 
     private function _show_groups()
     {
-        if (   !$this->show_groups
+        if (!$this->show_groups
             || empty($this->contact_details['id'])) {
             return;
         }
@@ -385,7 +385,7 @@ 
                     $default_shown = true;
                     $cards_to_show[] = $cardname;
                 }
-            } elseif (    $customer->$property
+            } elseif ($customer->$property
                       || ($customer->street && !$inherited_cards_only && !$default_shown)) {
                 $inherited_cards_only = false;
                 $multiple_addresses = true;
@@ -406,8 +406,8 @@ 
 
         foreach ($cards_to_show as $cardname) {
             echo '<div class="vcard">';
-            if (   $multiple_addresses
-                || (   $cardname != 'visiting'
+            if ($multiple_addresses
+                || ($cardname != 'visiting'
                     && !$inherited_cards_only)) {
                 echo '<div style="text-align:center"><em>' . midcom::get()->i18n->get_string($cardname . ' address', 'org.openpsa.contacts') . "</em></div>\n";
             }

lib/org/openpsa/sales/calculator/default.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 
     private function get_units($units = false) : float
     {
-        if (   $this->_deliverable->invoiceByActualUnits
+        if ($this->_deliverable->invoiceByActualUnits
             || $this->_deliverable->plannedUnits == 0) {
             // In most cases we calculate the price based on the actual units entered
             return $units ?: $this->_deliverable->units;

lib/org/openpsa/sales/salesproject/deliverable.php

Spacing +4 added lines, -4 removed lines

@@ -81,7 +81,7 @@ 
     {
         $this->calculate_price(false);
 
-        if (   $this->orgOpenpsaObtype == org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION
+        if ($this->orgOpenpsaObtype == org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION
             && $this->continuous == true) {
             $this->end = 0;
         } elseif ($this->end < $this->start) {
@@ -169,7 +169,7 @@ 
         $calculator->run($this);
         $cost = $calculator->get_cost();
         $price = $calculator->get_price();
-        if (   $price != $this->price
+        if ($price != $this->price
             || $cost != $this->cost) {
             $this->price = $price;
             $this->cost = $cost;
@@ -216,7 +216,7 @@ 
         $units = $agreement_hours['invoiceable'];
         $uninvoiceableUnits = $agreement_hours['reported'] - ($agreement_hours['invoiceable'] + $agreement_hours['invoiced']);
 
-        if (   $units != $this->units
+        if ($units != $this->units
             || $uninvoiceableUnits != $this->uninvoiceableUnits) {
             debug_add("agreement values have changed, setting units to " . $units . ", uninvoiceable: " . $uninvoiceableUnits);
             $this->units = $units;
@@ -270,7 +270,7 @@ 
 
     public function invoice() : bool
     {
-        if (   $this->state >= self::STATE_INVOICED
+        if ($this->state >= self::STATE_INVOICED
             || $this->orgOpenpsaObtype == org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION) {
             return false;
         }

lib/org/openpsa/invoices/billing/data.php

Indentation +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
     public static function get_by_object(org_openpsa_invoices_interfaces_customer $object) : self
     {
         if (   !($bd = self::get_billing_data(org_openpsa_contacts_group_dba::class, $object->customer))
-               // check if the customerContact is set and has invoice_data
+                // check if the customerContact is set and has invoice_data
             && !($bd = self::get_billing_data(org_openpsa_contacts_person_dba::class, $object->customerContact))) {
             $bd = new self();
             $due = midcom_baseclasses_components_configuration::get('org.openpsa.invoices', 'config')->get('default_due_days');

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
      */
     public static function get_by_object(org_openpsa_invoices_interfaces_customer $object) : self
     {
-        if (   !($bd = self::get_billing_data(org_openpsa_contacts_group_dba::class, $object->customer))
+        if (!($bd = self::get_billing_data(org_openpsa_contacts_group_dba::class, $object->customer))
                // check if the customerContact is set and has invoice_data
             && !($bd = self::get_billing_data(org_openpsa_contacts_person_dba::class, $object->customerContact))) {
             $bd = new self();

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

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
     private function load_controller(org_openpsa_invoices_billing_data_dba $bd) : controller
     {
         $schemadb = schemadb::from_path($this->_config->get('schemadb_billing_data'));
-        $vat =& $schemadb->get('default')->get_field('vat');
+        $vat = & $schemadb->get('default')->get_field('vat');
         // Fill VAT select
         $vat_array = explode(',', $this->_config->get('vat_percentages'));
         if (!empty($vat_array)) {
@@ -82,7 +82,7 @@ 
         $data['controller'] = $this->load_controller($bd);
 
         $workflow = $this->get_workflow('datamanager', ['controller' => $data['controller']]);
-        if (   $mode == 'edit'
+        if ($mode == 'edit'
             && $bd->can_do('midgard:delete')) {
             $delete = $this->get_workflow('delete', [
                 'object' => $bd,

lib/org/openpsa/core/acl/synchronizer.php

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
 {
     public function write_acls(midcom_core_dbaobject $object, $owner_id, $accesstype) : bool
     {
-        if (   empty($owner_id)
+        if (empty($owner_id)
             || empty($accesstype)) {
             return false;
         }
@@ -63,14 +63,14 @@ 
 
         if ($privileges) {
             foreach ($privileges as $privilege) {
-                if (   !empty($needed_privileges[$privilege->privilegename])
+                if (!empty($needed_privileges[$privilege->privilegename])
                     && $needed_privileges[$privilege->privilegename]['assignee'] == $privilege->assignee
                     && $needed_privileges[$privilege->privilegename]['value'] == $privilege->value) {
                     unset($needed_privileges[$privilege->privilegename]);
                     continue;
                 }
                 // Clear old ACLs applying to others than current user or selected owner group
-                if (   $privilege->assignee != midcom::get()->auth->user->id
+                if ($privilege->assignee != midcom::get()->auth->user->id
                     && $privilege->assignee != $owner_id) {
                     debug_add("Removing privilege {$privilege->privilegename} from {$privilege->assignee}");
                     $object->unset_privilege($privilege->privilegename, $privilege->assignee);

lib/org/openpsa/helpers/main.php

Indentation +26 added lines, -26 removed lines

@@ -40,31 +40,31 @@
         return $output;
     }
 
-     /**
-      * @param midcom_core_dbaobject $object The object we're working on
-      * @param string $field The schema field name
-      * @return midcom_db_attachment[] List of attachments, indexed by identifier
-      */
-     public static function get_dm2_attachments($object, $field) : array
-     {
-         $attachments = [];
-         $identifiers = explode(',', $object->get_parameter('midcom.helper.datamanager2.type.blobs', 'guids_' . $field));
-         if (empty($identifiers)) {
-             return $attachments;
-         }
-         foreach ($identifiers as $identifier) {
-             $parts = explode(':', $identifier);
-             if (count($parts) != 2) {
-                 continue;
-             }
-             $guid = $parts[1];
-             try {
-                 $attachments[$parts[0]] = midcom_db_attachment::get_cached($guid);
-             } catch (midcom_error $e) {
-                 $e->log();
-             }
-         }
+        /**
+         * @param midcom_core_dbaobject $object The object we're working on
+         * @param string $field The schema field name
+         * @return midcom_db_attachment[] List of attachments, indexed by identifier
+         */
+        public static function get_dm2_attachments($object, $field) : array
+        {
+            $attachments = [];
+            $identifiers = explode(',', $object->get_parameter('midcom.helper.datamanager2.type.blobs', 'guids_' . $field));
+            if (empty($identifiers)) {
+                return $attachments;
+            }
+            foreach ($identifiers as $identifier) {
+                $parts = explode(':', $identifier);
+                if (count($parts) != 2) {
+                    continue;
+                }
+                $guid = $parts[1];
+                try {
+                    $attachments[$parts[0]] = midcom_db_attachment::get_cached($guid);
+                } catch (midcom_error $e) {
+                    $e->log();
+                }
+            }
 
-         return $attachments;
-     }
+            return $attachments;
+        }
 }

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

Spacing +5 added lines, -5 removed lines

@@ -64,7 +64,7 @@ 
 
     private function _get_invoices_for_subscription($deliverable, $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/directmarketing/campaign/ruleresolver.php

Spacing +2 added lines, -2 removed lines

@@ -317,7 +317,7 @@ 
      */
     private function add_misc_rule(array $rule, $class, $person_property) : bool
     {
-        $persons = [ 0 => -1];
+        $persons = [0 => -1];
         $match = $rule['match'];
         $constraint_match = "IN";
         if ($rule['match'] == '<>') {
@@ -393,7 +393,7 @@ 
         $ret = [];
 
         foreach ($object->get_properties() as $property) {
-            if (   preg_match('/^_/', $property)
+            if (preg_match('/^_/', $property)
                 || in_array($property, $skip_properties)
                 || property_exists($object, $property)) {
                 // Skip private or otherwise invalid properties