flack / openpsa

lib/org/openpsa/invoices/handler/invoice/items.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 
         $invoice_sum = 0;
         foreach ($this->_object->get_invoice_items() as $item) {
-            $entry =  array();
+            $entry = array();
             $entry['id'] = $item->id;
             try {
                 $deliverable = org_openpsa_sales_salesproject_deliverable_dba::get_cached($item->deliverable);
@@ -148,7 +148,7 @@ 
 
     private function _verify_post_data()
     {
-        if (   empty($_POST['oper'])
+        if (empty($_POST['oper'])
             || !isset($_POST['id'])
             || !isset($_POST['description'])
             || !isset($_POST['price'])

Braces +4 added lines, -2 removed lines

@@ -38,13 +38,15 @@
             try {
                 $deliverable = org_openpsa_sales_salesproject_deliverable_dba::get_cached($item->deliverable);
                 $entry['deliverable'] = $deliverable->title;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $entry['deliverable'] = '';
             }
             try {
                 $task = org_openpsa_projects_task_dba::get_cached($item->task);
                 $entry['task'] = $task->title;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $entry['task'] = '';
             }
 

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

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
     {
         $schemadb = midcom_helper_datamanager2_schema::load_database($this->_config->get('schemadb_billing_data'));
 
-        $fields =& $schemadb[$this->get_schema_name()]->fields;
+        $fields = & $schemadb[$this->get_schema_name()]->fields;
         // Fill VAT select
         $vat_array = explode(',', $this->_config->get('vat_percentages'));
         if (!empty($vat_array)) {
@@ -76,7 +76,7 @@ 
         }
 
         $workflow = $this->get_workflow('datamanager2', array('controller' => $data['controller']));
-        if (   $mode == 'edit'
+        if ($mode == 'edit'
             && $billing_data[0]->can_do('midgard:delete')) {
             $delete = $this->get_workflow('delete', array(
                 'object' => $billing_data[0],

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

Braces +6 added lines, -3 removed lines

@@ -66,7 +66,8 @@ 
             try {
                 $task = org_openpsa_projects_task_dba::get_cached($this->task);
                 $url = $projects_url . 'task/' . $task->guid . '/';
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
             }
         }
         if (   $url == ''
@@ -74,7 +75,8 @@ 
             try {
                 $deliverable = org_openpsa_sales_salesproject_deliverable_dba::get_cached($this->deliverable);
                 $url = $sales_url . 'deliverable/' . $deliverable->guid . '/';
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
             }
         }
         if ($url != '') {
@@ -96,7 +98,8 @@ 
                     $deliverable = new org_openpsa_sales_salesproject_deliverable_dba($this->deliverable);
                     self::update_deliverable($deliverable);
                 }
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }

lib/org/openpsa/invoices/status.php

Spacing +3 added lines, -3 removed lines

@@ -85,7 +85,7 @@ 
     {
         $entries = array_merge($this->get_status_entries(), $this->get_journal_entries());
 
-        usort($entries, function ($a, $b) {
+        usort($entries, function($a, $b) {
             if ($a['timestamp'] == $b['timestamp']) {
                 if ($a['order'] == $b['order']) {
                     return 0;
@@ -122,8 +122,8 @@ 
                 'order' => 3
             );
         }
-        if (   $this->invoice->due
-            && (   (   $this->invoice->due < time()
+        if ($this->invoice->due
+            && (($this->invoice->due < time()
                     && $this->invoice->paid == 0)
                 || $this->invoice->due < $this->invoice->paid)) {
             $entries[] = array(

lib/org/openpsa/reports/viewer.php

Braces +2 added lines, -1 removed lines

@@ -174,7 +174,8 @@
             try {
                 midcom_db_topic::get_cached($node_guid);
                 $this->_available_generators[$component] = $loc;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 debug_add("topic for component '{$component}' not found or accessible");
             }
         }

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

Spacing +5 added lines, -5 removed lines

@@ -49,7 +49,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) {
@@ -65,8 +65,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);
 
@@ -109,8 +109,8 @@ 
         foreach ($at_entries 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

@@ -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());

lib/org/openpsa/products/handler/group/edit.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
         $this->_group = new org_openpsa_products_product_group_dba($args[0]);
 
         $data['controller'] = midcom_helper_datamanager2_controller::create('simple');
-        $data['controller']->schemadb =& $this->_request_data['schemadb_group'];
+        $data['controller']->schemadb = & $this->_request_data['schemadb_group'];
         $data['controller']->set_storage($this->_group);
         if (!$data['controller']->initialize()) {
             throw new midcom_error("Failed to initialize a DM2 controller instance for product {$this->_group->id}.");

lib/org/openpsa/products/handler/product/create.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
      */
     public function load_schemadb()
     {
-        $this->_schemadb =& $this->_request_data['schemadb_product'];
+        $this->_schemadb = & $this->_request_data['schemadb_product'];
 
         return $this->_schemadb;
     }

Braces +2 added lines, -1 removed lines

@@ -132,7 +132,8 @@
         } elseif ((int) $args[0] > 0) {
             try {
                 $this->parent = new org_openpsa_products_product_group_dba((int) $args[0]);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }

lib/org/openpsa/products/handler/product/crud.php

Spacing +1 added lines, -1 removed lines

@@ -43,6 +43,6 @@
      */
     public function _load_schemadb()
     {
-        $this->_schemadb =& $this->_request_data['schemadb_product'];
+        $this->_schemadb = & $this->_request_data['schemadb_product'];
     }
 }