flack / openpsa

lib/org/openpsa/invoices/invoice/item.php

Spacing +4 added lines, -4 removed lines

@@ -18,7 +18,7 @@ 
 
     public function _on_creating()
     {
-        if (   $this->invoice
+        if ($this->invoice
             && $this->position == 0) {
             $invoice = org_openpsa_invoices_invoice_dba::get_cached($this->invoice);
             $this->position = count($invoice->get_invoice_items()) + 1;
@@ -69,7 +69,7 @@ 
             } catch (midcom_error $e) {
             }
         }
-        if (   $url == ''
+        if ($url == ''
             && $sales_url) {
             try {
                 $deliverable = org_openpsa_sales_salesproject_deliverable_dba::get_cached($this->deliverable);
@@ -91,7 +91,7 @@ 
                 $invoice = new org_openpsa_invoices_invoice_dba($this->invoice);
                 $old_sum = $invoice->sum;
                 self::update_invoice($invoice);
-                if (   $old_sum != $invoice->sum
+                if ($old_sum != $invoice->sum
                     && !empty($this->deliverable)) {
                     $deliverable = new org_openpsa_sales_salesproject_deliverable_dba($this->deliverable);
                     self::update_deliverable($deliverable);
@@ -131,7 +131,7 @@ 
 
         if ($invoiced != $deliverable->invoiced) {
             $deliverable->invoiced = $invoiced;
-            if (   $deliverable->orgOpenpsaObtype !== org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION
+            if ($deliverable->orgOpenpsaObtype !== org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION
                 && $deliverable->state < org_openpsa_sales_salesproject_deliverable_dba::STATE_INVOICED) {
                 $deliverable->state = org_openpsa_sales_salesproject_deliverable_dba::STATE_INVOICED;
             }

lib/org/openpsa/mail/message.php

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
             if (is_string($value)) {
                 $this->_headers[$header] = trim($value);
             }
-            if (   strtolower($header) == 'from'
+            if (strtolower($header) == 'from'
                 || strtolower($header) == 'reply-to'
                 || strtolower($header) == 'to') {
                 $this->_headers[$header] = $this->_encode_address_field($value);

lib/org/openpsa/core/queryfilter.php

Spacing +2 added lines, -2 removed lines

@@ -77,9 +77,9 @@
         $filter_id = $this->_identifier . '_' . $filtername;
         $user = midcom::get()->auth->user->get_storage();
 
-        if (   isset($_POST['unset_filter'])
+        if (isset($_POST['unset_filter'])
             && $_POST['unset_filter'] == $filter_id) {
-            if (   $user->get_parameter("org_openpsa_core_filter", $filter_id)
+            if ($user->get_parameter("org_openpsa_core_filter", $filter_id)
                 && !$user->delete_parameter("org_openpsa_core_filter", $filter_id)) {
                 $message_content = sprintf(
                     $l10n->get('the handed filter for %s could not be set as parameter'),

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

Spacing +6 added lines, -6 removed lines

@@ -45,7 +45,7 @@ 
      */
     public function merge($obj1, $obj2, $merge_mode)
     {
-        if (   $merge_mode !== 'all'
+        if ($merge_mode !== 'all'
             && $merge_mode !== 'future') {
             debug_add("invalid mode {$merge_mode}", MIDCOM_LOG_ERROR);
             throw new midcom_error('invalid merge mode');
@@ -87,9 +87,9 @@ 
                         if (!empty($conf['duplicate_check'])) {
                             $dup = $this->check_duplicate($results, $result, $conf['duplicate_check']);
 
-                            if (   is_object($dup)
+                            if (is_object($dup)
                                 || $dup === false) {
-                                if (   !is_object($dup)
+                                if (!is_object($dup)
                                     || !array_key_exists($dup->id, $todelete)) {
                                     $todelete[$result->id] = $result;
                                 }
@@ -98,7 +98,7 @@ 
                         }
                     }
                 }
-                if (   $needs_update
+                if ($needs_update
                     && !$result->update()) {
                     throw new midcom_error("Failed to update {$classname} #{$result->id}, errstr: " . midcom_connection::get_error_string());
                 }
@@ -147,7 +147,7 @@ 
         }
 
         foreach ($results as $result) {
-            if (   $result->$field === $object->$field
+            if ($result->$field === $object->$field
                 && $result->id !== $object->id) {
                 return $result;
             }
@@ -165,7 +165,7 @@ 
         $changed = false;
         foreach ($person2 as $property => $value) {
             // Copy only simple properties not marked to be skipped missing from person1
-            if (   empty($person2->$property)
+            if (empty($person2->$property)
                 || !empty($person1->$property)
                 || isset($skip_properties[$property])
                 || !is_scalar($value)) {

lib/org/openpsa/contacts/group.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
 
     public function __set($name, $value)
     {
-        if (   $name == 'homepage'
+        if ($name == 'homepage'
             && !empty($value)
             && $value != $this->homepage) {
             $this->_register_prober = true;
@@ -77,7 +77,7 @@ 
 
     public function __get($property)
     {
-        if (   $property == 'invoice_label'
+        if ($property == 'invoice_label'
             || $property == 'postal_label') {
             if (!isset($this->_address_extras[$property])) {
                 $this->_get_address_extra($property);

lib/org/openpsa/projects/task/status.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
     public function _on_created()
     {
         //Remove the resource if necessary
-        if (   $this->type == self::DECLINED
+        if ($this->type == self::DECLINED
             && $this->targetPerson) {
             $qb = org_openpsa_projects_task_resource_dba::new_query_builder();
             $qb->add_constraint('task', '=', $this->task);

lib/org/openpsa/projects/status.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
             $status_changer_label = $this->l10n->get('system');
             $target_person_label = $this->l10n->get('system');
 
-            if (    $status_change->metadata->creator
+            if ($status_change->metadata->creator
                  && $status_change->metadata->creator != $fallback_creator->guid) {
                 $status_changer = org_openpsa_widgets_contact::get($status_change->metadata->creator);
                 $status_changer_label = $status_changer->show_inline();

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

Spacing +4 added lines, -4 removed lines

@@ -54,7 +54,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) {
@@ -140,7 +140,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;
@@ -187,7 +187,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;
@@ -242,7 +242,7 @@ 
 
     public function invoice()
     {
-        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/sales/salesproject.php

Spacing +3 added lines, -3 removed lines

@@ -90,7 +90,7 @@ 
             }
         }
         $profit = $value - $cost;
-        if (   $this->value != $value
+        if ($this->value != $value
             || $this->profit != $profit) {
             $this->value = $value;
             $this->profit = $value - $cost;
@@ -220,12 +220,12 @@ 
 
     public function _on_updating()
     {
-        if (   $this->state != self::STATE_ACTIVE
+        if ($this->state != self::STATE_ACTIVE
             && !$this->end) {
             //Not active anymore and end not set, set it to now
             $this->end = time();
         }
-        if (   $this->end
+        if ($this->end
             && $this->state == self::STATE_ACTIVE) {
             //Returned to active state, clear the end marker.
             $this->end = 0;