flack / openpsa

lib/org/openpsa/invoices/viewer.php

Spacing +8 added lines, -15 removed lines

@@ -56,7 +56,7 @@ 
         }
 
         // generate next action buttons
-        if (   $invoice->can_do('midgard:update')
+        if ($invoice->can_do('midgard:update')
             && count($next_marker) > 0)
         {
             foreach ($next_marker as $mark)
@@ -73,10 +73,8 @@ 
     {
         if ($mode !== 'dashboard')
         {
-            $this->_view_toolbar->add_item
-            (
-                array
-                (
+            $this->_view_toolbar->add_item(
+                array(
                     MIDCOM_TOOLBAR_URL => '',
                     MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('dashboard'),
                     MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_left.png',
@@ -86,8 +84,7 @@ 
         if (midcom::get()->auth->can_user_do('midgard:create', null, 'org_openpsa_invoices_invoice_dba'))
         {
             $workflow = $this->get_workflow('datamanager2');
-            $this->_view_toolbar->add_item($workflow->get_button('invoice/new/', array
-            (
+            $this->_view_toolbar->add_item($workflow->get_button('invoice/new/', array(
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('create invoice'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/printer.png',
             )));
@@ -106,10 +103,8 @@ 
 
             if (sizeof($results) == 1)
             {
-                $toolbar->add_item
-                (
-                    array
-                    (
+                $toolbar->add_item(
+                    array(
                         MIDCOM_TOOLBAR_URL => $urlprefix . key($results) . '/',
                         MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('previous'),
                         MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/back.png',
@@ -129,10 +124,8 @@ 
 
             if (sizeof($results) == 1)
             {
-                $toolbar->add_item
-                (
-                    array
-                    (
+                $toolbar->add_item(
+                    array(
                         MIDCOM_TOOLBAR_URL => $urlprefix . key($results) . '/',
                         MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('next'),
                         MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/next.png',

Braces +2 added lines, -4 removed lines

@@ -68,8 +68,7 @@ 
             if (array_key_exists($this->_schema, $schemadb))
             {
                 $schema_name = $this->_schema;
-            }
-            else
+            } else
             {
                 $schema_name = key($schemadb);
             }
@@ -110,8 +109,7 @@ 
             {
                 $this->_rows[] = array($row);
             }
-        }
-        else
+        } else
         {
             $this->_rows = $rows;
         }

lib/org/openpsa/invoices/status.php

Spacing +9 added lines, -16 removed lines

@@ -115,8 +115,7 @@ 
             $cancelation_invoice = new org_openpsa_invoices_invoice_dba($this->invoice->cancelationInvoice);
             $cancelation_invoice_link = $prefix . 'invoice/' . $cancelation_invoice->guid . '/';
             $cancelation_invoice_link = "<a href=\"" . $cancelation_invoice_link . "\">" . $this->l10n->get('invoice') . " " . $cancelation_invoice->get_label() . "</a>";
-            $entries[] = array
-            (
+            $entries[] = array(
                 'timestamp' => $cancelation_invoice->metadata->created,
                 'message' => sprintf($this->l10n->get('invoice got canceled by %s'), $cancelation_invoice_link),
                 'order' => 4
@@ -124,20 +123,18 @@ 
         }
         else if ($this->invoice->paid)
         {
-            $entries[] = array
-            (
+            $entries[] = array(
                 'timestamp' => $this->invoice->paid,
                 'message' => sprintf($this->l10n->get('marked invoice %s paid'), ''),
                 '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
-            (
+            $entries[] = array(
                 'timestamp' => $this->invoice->due,
                 'message' => $this->l10n->get('overdue'),
                 'order' => 2
@@ -148,8 +145,7 @@ 
         {
             if ($mail_time = $this->invoice->get_parameter('org.openpsa.invoices', 'sent_by_mail'))
             {
-                $entries[] = array
-                (
+                $entries[] = array(
                     'timestamp' => $mail_time,
                     'message' => sprintf($this->l10n->get('marked invoice %s sent per mail'), ''),
                     'order' => 1
@@ -157,16 +153,14 @@ 
             }
             else
             {
-                $entries[] = array
-                (
+                $entries[] = array(
                     'timestamp' => $this->invoice->sent,
                     'message' => sprintf($this->l10n->get('marked invoice %s sent'), ''),
                     'order' => 1
                 );
             }
         }
-        $entries[] = array
-        (
+        $entries[] = array(
             'timestamp' => $this->invoice->metadata->created,
             'message' => sprintf($this->l10n->get('invoice %s created'), ''),
             'order' => 0
@@ -183,8 +177,7 @@ 
 
         foreach ($rows as $row)
         {
-            $entries[] = array
-            (
+            $entries[] = array(
                 'timestamp' => strtotime((string) $row['created']),
                 'message' => $row['title']
             );

Braces +2 added lines, -4 removed lines

@@ -121,8 +121,7 @@ 
                 'message' => sprintf($this->l10n->get('invoice got canceled by %s'), $cancelation_invoice_link),
                 'order' => 4
             );
-        }
-        else if ($this->invoice->paid)
+        } else if ($this->invoice->paid)
         {
             $entries[] = array
             (
@@ -154,8 +153,7 @@ 
                     'message' => sprintf($this->l10n->get('marked invoice %s sent per mail'), ''),
                     'order' => 1
                 );
-            }
-            else
+            } else
             {
                 $entries[] = array
                 (

lib/org/openpsa/invoices/scheduler.php

Spacing +5 added lines, -6 removed lines

@@ -92,7 +92,7 @@ 
         }
 
         // TODO: Warehouse management: create new order
-        if (   $this->_deliverable->end < $next_cycle_start
+        if ($this->_deliverable->end < $next_cycle_start
             && $this->_deliverable->end != 0)
         {
             debug_add('Do not register next cycle, the contract ends before');
@@ -112,8 +112,7 @@ 
 
     private function _create_at_entry($cycle_number, $start)
     {
-        $args = array
-        (
+        $args = array(
             'deliverable' => $this->_deliverable->guid,
             'cycle'       => $cycle_number,
         );
@@ -344,7 +343,7 @@ 
         {
             //If previous cycle was run at the end of the month, the new one should be at the end of the month as well
             $date = new DateTime(gmdate('Y-m-d', $time), new DateTimeZone('GMT'));
-            if (   $date->format('t') == $date->format('j')
+            if ($date->format('t') == $date->format('j')
                 && $new_date->format('t') != $new_date->format('j'))
             {
                 $new_date->setDate((int) $new_date->format('Y'), (int) $new_date->format('m'), (int) $new_date->format('t'));
@@ -415,11 +414,11 @@ 
                 break;
             case 'q':
                 // Quarterly recurring subscription
-                $identifier = ceil(((int)$date->format('n')) / 4) . 'Q' . $date->format('y');
+                $identifier = ceil(((int) $date->format('n')) / 4) . 'Q' . $date->format('y');
                 break;
             case 'hy':
                 // Half-yearly recurring subscription
-                $identifier = ceil(((int)$date->format('n')) / 6) . '/' . $date->format('Y');
+                $identifier = ceil(((int) $date->format('n')) / 6) . '/' . $date->format('Y');
                 break;
             case 'y':
                 // Yearly recurring subscription

Braces +3 added lines, -6 removed lines

@@ -78,8 +78,7 @@ 
                 if (org_openpsa_projects_workflow::complete($task, sprintf($this->_i18n->get_string('completed by subscription %s', 'org.openpsa.sales'), $cycle_number)))
                 {
                     $tasks_completed[] = $task;
-                }
-                else
+                } else
                 {
                     $tasks_not_completed[] = $task;
                 }
@@ -141,8 +140,7 @@ 
         try
         {
             $owner = midcom_db_person::get_cached($salesproject->owner);
-        }
-        catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             $e->log();
             return;
@@ -152,8 +150,7 @@ 
         if (is_null($next_run))
         {
             $next_run_label = $l10n->get('no more cycles');
-        }
-        else
+        } else
         {
             $next_run_label = $l10n->get_formatter()->date($next_run);
         }

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

Braces +5 added lines, -10 removed lines

@@ -55,8 +55,7 @@ 
             {
                 $deliverable = org_openpsa_sales_salesproject_deliverable_dba::get_cached($task->agreement);
                 $item->deliverable = $deliverable->id;
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $e->log();
             }
@@ -155,8 +154,7 @@ 
                 $customer = org_openpsa_contacts_group_dba::get_cached($customer_id);
                 $data['customer_label'] = $customer->official;
                 $data['disabled'] = '';
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $data['customer_label'] = $this->_l10n->get('no customer');
                 $data['disabled'] = ' disabled="disabled"';
@@ -180,21 +178,18 @@ 
                     if ($deliverable->invoiceByActualUnits)
                     {
                         $data['invoiceable_units'] = $task->invoiceableHours;
-                    }
-                    else
+                    } else
                     {
                         $data['invoiceable_units'] = $task->plannedHours;
                     }
-                }
-                catch (midcom_error $e)
+                } catch (midcom_error $e)
                 {
                     $e->log();
                     if ($this->_config->get('default_hourly_price'))
                     {
                         $data['default_price'] = $this->_config->get('default_hourly_price');
                         $data['invoiceable_units'] = $task->invoiceableHours;
-                    }
-                    else
+                    } else
                     {
                         $data['default_price'] = '';
                     }

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

Spacing +1 added lines, -2 removed lines

@@ -50,8 +50,7 @@
 
     public function get_row(midcom_core_dbaobject $at_entry)
     {
-        $invoice = array
-        (
+        $invoice = array(
             'time' => strftime('%Y-%m-%d %H:%M:%S', $at_entry->start),
             'month' => strftime('%B %Y', $at_entry->start),
             'index_month' => strftime('%Y-%m', $at_entry->start),

Braces +3 added lines, -6 removed lines

@@ -60,8 +60,7 @@ 
         {
             $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;
@@ -71,8 +70,7 @@ 
         {
             $type = $this->_i18n->get_l10n('org.openpsa.expenses')->get('invoiceable reports');
             $invoice_sum = $deliverable->units * $deliverable->pricePerUnit;
-        }
-        else
+        } else
         {
             $invoice_sum = $deliverable->price;
             $type = $this->_i18n->get_l10n('org.openpsa.reports')->get('fixed price');
@@ -106,8 +104,7 @@ 
                 $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/crud.php

Spacing +18 added lines, -29 removed lines

@@ -18,7 +18,7 @@ 
     public function _load_schemadb()
     {
         $this->_schemadb = midcom_helper_datamanager2_schema::load_database($this->_config->get('schemadb'));
-        if (   $this->_mode == 'create'
+        if ($this->_mode == 'create'
             && count($this->_master->_handler['args']) == 1)
         {
             // We're creating invoice for chosen customer
@@ -39,7 +39,7 @@ 
      */
     private function _modify_schema()
     {
-        $fields =& $this->_schemadb['default']->fields;
+        $fields = & $this->_schemadb['default']->fields;
         // Fill VAT select
         $vat_array = explode(',', $this->_config->get('vat_percentages'));
         if (!empty($vat_array))
@@ -100,7 +100,7 @@ 
      */
     private function _populate_schema_customers_for_contact($contact_id)
     {
-        $fields =& $this->_schemadb['default']->fields;
+        $fields = & $this->_schemadb['default']->fields;
         $organizations = array(0 => '');
         $member_mc = org_openpsa_contacts_member_dba::new_collector('uid', $contact_id);
         $member_mc->add_constraint('gid.orgOpenpsaObtype', '>', org_openpsa_contacts_group_dba::MYCONTACTS);
@@ -123,7 +123,7 @@ 
 
     private function _populate_schema_contacts_for_customer($customer)
     {
-        $fields =& $this->_schemadb['default']->fields;
+        $fields = & $this->_schemadb['default']->fields;
         // We know the customer company, present contact as a select widget
         $persons_array = array();
         $member_mc = midcom_db_member::new_collector('gid', $customer->id);
@@ -135,7 +135,7 @@ 
                 $person = org_openpsa_contacts_person_dba::get_cached($member);
                 $persons_array[$person->id] = $person->rname;
             }
-            catch (midcom_error $e){}
+            catch (midcom_error $e) {}
         }
         asort($persons_array);
         $fields['customerContact']['widget'] = 'select';
@@ -156,7 +156,7 @@ 
     {
         $this->_object = new org_openpsa_invoices_invoice_dba();
 
-        if (! $this->_object->create())
+        if (!$this->_object->create())
         {
             debug_print_r('We operated on this object:', $this->_object);
             throw new midcom_error("Failed to create a new invoice. Error: " . midcom_connection::get_error_string());
@@ -233,8 +233,7 @@ 
         if ($this->_object->can_do('midgard:update'))
         {
             $workflow = $this->get_workflow('datamanager2');
-            $buttons[] = $workflow->get_button("invoice/edit/{$this->_object->guid}/", array
-            (
+            $buttons[] = $workflow->get_button("invoice/edit/{$this->_object->guid}/", array(
                 MIDCOM_TOOLBAR_ACCESSKEY => 'e',
             ));
         }
@@ -245,8 +244,7 @@ 
             $buttons[] = $workflow->get_button("invoice/delete/{$this->_object->guid}/");
         }
 
-        $buttons[] = array
-        (
+        $buttons[] = array(
             MIDCOM_TOOLBAR_URL => "invoice/items/{$this->_object->guid}/",
             MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('edit invoice items'),
             MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/edit.png',
@@ -255,14 +253,12 @@ 
 
         if (!$this->_object->sent)
         {
-            $buttons[] = array
-            (
+            $buttons[] = array(
                 MIDCOM_TOOLBAR_URL => "invoice/process/",
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('mark sent'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_mail-reply.png',
                 MIDCOM_TOOLBAR_POST => true,
-                MIDCOM_TOOLBAR_POST_HIDDENARGS => array
-                (
+                MIDCOM_TOOLBAR_POST_HIDDENARGS => array(
                     'action' => 'mark_sent',
                     'id' => $this->_object->id,
                     'relocate' => true
@@ -272,14 +268,12 @@ 
         }
         else if (!$this->_object->paid)
         {
-            $buttons[] = array
-            (
+            $buttons[] = array(
                 MIDCOM_TOOLBAR_URL => "invoice/process/",
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('mark paid'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/ok.png',
                 MIDCOM_TOOLBAR_POST => true,
-                MIDCOM_TOOLBAR_POST_HIDDENARGS => array
-                (
+                MIDCOM_TOOLBAR_POST_HIDDENARGS => array(
                     'action' => 'mark_paid',
                     'id' => $this->_object->id,
                     'relocate' => true
@@ -288,11 +282,10 @@ 
             );
         }
 
-        if (   !$this->_object->paid
+        if (!$this->_object->paid
             && $this->_config->get('invoice_pdfbuilder_class'))
         {
-            $buttons[] = array
-            (
+            $buttons[] = array(
                 MIDCOM_TOOLBAR_URL => "invoice/pdf/{$this->_object->guid}/",
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('create pdf'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/printer.png',
@@ -301,14 +294,12 @@ 
             $billing_data = $this->_object->get_billing_data();
             if (intval($billing_data->sendingoption) == 2)
             {
-                $buttons[] = array
-                (
+                $buttons[] = array(
                     MIDCOM_TOOLBAR_URL => "invoice/process/",
                     MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('mark sent_per_mail'),
                     MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_mail-reply.png',
                     MIDCOM_TOOLBAR_POST => true,
-                    MIDCOM_TOOLBAR_POST_HIDDENARGS => array
-                    (
+                    MIDCOM_TOOLBAR_POST_HIDDENARGS => array(
                         'action' => 'send_by_mail',
                         'id' => $this->_object->id,
                         'relocate' => true
@@ -320,14 +311,12 @@ 
 
         if ($this->_object->is_cancelable())
         {
-            $buttons[] = array
-            (
+            $buttons[] = array(
                 MIDCOM_TOOLBAR_URL => "invoice/process/",
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('create cancelation'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/cancel.png',
                 MIDCOM_TOOLBAR_POST => true,
-                MIDCOM_TOOLBAR_POST_HIDDENARGS => array
-                (
+                MIDCOM_TOOLBAR_POST_HIDDENARGS => array(
                     'action' => 'create_cancelation',
                     'id' => $this->_object->id,
                     'relocate' => true

Braces +9 added lines, -18 removed lines

@@ -25,8 +25,7 @@ 
             try
             {
                 $this->_request_data['customer'] = new org_openpsa_contacts_group_dba($this->_master->_handler['args'][0]);
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $this->_request_data['customer'] = new org_openpsa_contacts_person_dba($this->_master->_handler['args'][0]);
             }
@@ -63,32 +62,27 @@ 
         if (!empty($this->_object->customerContact))
         {
             $this->_populate_schema_customers_for_contact($this->_object->customerContact);
-        }
-        else if (array_key_exists('customer', $this->_request_data))
+        } else if (array_key_exists('customer', $this->_request_data))
         {
             if (is_a($this->_request_data['customer'], 'org_openpsa_contacts_group_dba'))
             {
                 $this->_populate_schema_contacts_for_customer($this->_request_data['customer']);
-            }
-            else
+            } else
             {
                 $this->_populate_schema_customers_for_contact($this->_request_data['customer']->id);
             }
-        }
-        else if (!empty($this->_object->customer))
+        } else if (!empty($this->_object->customer))
         {
             try
             {
                 $this->_request_data['customer'] = org_openpsa_contacts_group_dba::get_cached($this->_object->customer);
                 $this->_populate_schema_contacts_for_customer($this->_request_data['customer']);
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $fields['customer']['hidden'] = true;
                 $e->log();
             }
-        }
-        else
+        } else
         {
             // We don't know company, present customer contact as chooser and hide customer field
             $fields['customer']['hidden'] = true;
@@ -134,8 +128,7 @@ 
             {
                 $person = org_openpsa_contacts_person_dba::get_cached($member);
                 $persons_array[$person->id] = $person->rname;
-            }
-            catch (midcom_error $e){}
+            } catch (midcom_error $e){}
         }
         asort($persons_array);
         $fields['customerContact']['widget'] = 'select';
@@ -184,8 +177,7 @@ 
 
             // we got a customer, set description default
             $this->_defaults['description'] = $dummy->get_default('remarks');
-        }
-        else
+        } else
         {
             $due_date = ($this->_config->get('default_due_days') * 3600 * 24) + time();
             $this->_defaults['due'] = $due_date;
@@ -269,8 +261,7 @@ 
                 ),
                 MIDCOM_TOOLBAR_ENABLED => $this->_object->can_do('midgard:update'),
             );
-        }
-        else if (!$this->_object->paid)
+        } else if (!$this->_object->paid)
         {
             $buttons[] = array
             (

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

Spacing +5 added lines, -7 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))
@@ -53,7 +53,7 @@ 
     {
         $billing_data = new org_openpsa_invoices_billing_data_dba();
         $billing_data->linkGuid = $this->_linked_object->guid;
-        if (! $billing_data->create())
+        if (!$billing_data->create())
         {
             debug_print_r('We operated on this object:', $billing_data);
             throw new midcom_error("Failed to create a new billing_data. Error: " . midcom_connection::get_error_string());
@@ -82,11 +82,10 @@ 
         }
 
         $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
-            (
+            $delete = $this->get_workflow('delete', array(
                 'object' => $billing_data[0],
                 'label' => $this->_l10n->get('billing data')
             ));
@@ -109,8 +108,7 @@ 
         $billing_data->require_do('midgard:delete');
         $this->_linked_object = midcom::get()->dbfactory->get_object_by_guid($billing_data->linkGuid);
 
-        $workflow = $this->get_workflow('delete', array
-        (
+        $workflow = $this->get_workflow('delete', array(
             'object' => $billing_data,
             'success_url' => $this->get_relocate_url()
         ));

Braces +1 added lines, -2 removed lines

@@ -81,8 +81,7 @@
             {
                 throw new midcom_error(midcom_connection::get_error_string());
             }
-        }
-        else
+        } else
         {
             $nodes = $object_qb->execute();
             $node = $nodes[0];

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

Spacing +8 added lines, -15 removed lines

@@ -134,8 +134,7 @@ 
 
         if (!empty($this->_request_data['deliverable']))
         {
-            $constraints = array
-            (
+            $constraints = array(
                 'invoice' => $invoice->id,
                 'deliverable' => $this->_request_data['deliverable']->id
             );
@@ -194,12 +193,11 @@ 
     {
         $this->_master->prepare_toolbar('dashboard');
 
-        if (   $this->_topic->can_do('midgard:update')
+        if ($this->_topic->can_do('midgard:update')
             && $this->_topic->can_do('midcom:component_config'))
         {
             $workflow = $this->get_workflow('datamanager2');
-            $this->_node_toolbar->add_item($workflow->get_button('config/', array
-            (
+            $this->_node_toolbar->add_item($workflow->get_button('config/', array(
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('component configuration'),
                 MIDCOM_TOOLBAR_HELPTEXT => $this->_l10n_midcom->get('component configuration helptext'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_folder-properties.png',
@@ -328,16 +326,14 @@ 
         if (midcom::get()->auth->can_user_do('midgard:create', null, 'org_openpsa_invoices_invoice_dba'))
         {
             $workflow = $this->get_workflow('datamanager2');
-            $buttons[] = $workflow->get_button("invoice/new/{$this->_customer->guid}/", array
-            (
+            $buttons[] = $workflow->get_button("invoice/new/{$this->_customer->guid}/", array(
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('create invoice'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/printer.png',
             ));
 
             if ($this->_customer->can_do('midgard:create'))
             {
-                $buttons[] = $workflow->get_button("billingdata/" . $this->_customer->guid . "/", array
-                (
+                $buttons[] = $workflow->get_button("billingdata/" . $this->_customer->guid . "/", array(
                     MIDCOM_TOOLBAR_LABEL => $this->_i18n->get_string('edit billingdata', 'org.openpsa.contacts'),
                     MIDCOM_TOOLBAR_OPTIONS => array('data-refresh-opener' => 'false'),
                 ));
@@ -346,8 +342,7 @@ 
 
         if ($this->_request_data['contacts_url'])
         {
-            $buttons[] = array
-            (
+            $buttons[] = array(
                 MIDCOM_TOOLBAR_URL => $this->_request_data['contacts_url'] . (is_a($this->_customer, 'org_openpsa_contacts_group_dba') ? 'group' : 'person') . "/{$this->_customer->guid}/",
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('go to customer'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/jump-to.png',
@@ -399,10 +394,8 @@ 
 
         if ($sales_url)
         {
-            $this->_view_toolbar->add_item
-            (
-                array
-                (
+            $this->_view_toolbar->add_item(
+                array(
                     MIDCOM_TOOLBAR_URL => $sales_url . "deliverable/{$this->_deliverable->guid}/",
                     MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('go to deliverable'),
                     MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/jump-to.png',

Braces +5 added lines, -10 removed lines

@@ -109,8 +109,7 @@ 
                 $customer = org_openpsa_contacts_group_dba::get_cached($invoice->customer);
                 $entry['customer'] = "<a href=\"{$this->_request_data['invoices_url']}list/customer/all/{$customer->guid}/\">" . $customer->get_label() . "</a>";
                 $entry['index_customer'] = $customer->get_label();
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $entry['customer'] = '';
                 $entry['index_customer'] = '';
@@ -124,8 +123,7 @@ 
                 $contact = org_openpsa_contacts_person_dba::get_cached($invoice->customerContact);
                 $entry['contact'] = "<a href=\"{$this->_request_data['invoices_url']}list/customer/all/{$contact->guid}/\">" . $contact->get_label() . "</a>";
                 $entry['index_contact'] = $contact->get_label();
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $entry['contact'] = '';
                 $entry['index_contact'] = '';
@@ -254,14 +252,12 @@ 
         {
             $mc = org_openpsa_invoices_invoice_item_dba::new_collector('deliverable', $this->_deliverable->id);
             $qb->add_constraint('id', 'IN', $mc->get_values('invoice'));
-        }
-        else if ($this->_customer)
+        } else if ($this->_customer)
         {
             if (is_a($this->_customer, 'org_openpsa_contacts_group_dba'))
             {
                 $qb->add_constraint('customer', '=', $this->_customer->id);
-            }
-            else
+            } else
             {
                 $qb->add_constraint('customerContact', '=', $this->_customer->id);
             }
@@ -318,8 +314,7 @@ 
         try
         {
             $this->_customer = new org_openpsa_contacts_group_dba($args[0]);
-        }
-        catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             $this->_customer = new org_openpsa_contacts_person_dba($args[0]);
         }

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

Indentation +1 added lines, -1 removed lines

@@ -438,7 +438,7 @@
             || !isset($_POST['price'])
             || !isset($_POST['quantity']))
         {
-             throw new midcom_error('Incomplete POST data');
+                throw new midcom_error('Incomplete POST data');
         }
     }
 

Spacing +8 added lines, -13 removed lines

@@ -29,7 +29,7 @@ 
     {
         midcom::get()->auth->require_valid_user();
 
-        if (   empty($_POST['id'])
+        if (empty($_POST['id'])
             || empty($_POST['action']))
         {
             throw new midcom_error('Incomplete POST data');
@@ -40,8 +40,7 @@ 
 
         midcom::get()->skip_page_style = true;
 
-        $data['message'] = array
-        (
+        $data['message'] = array(
             'title' => $this->_l10n->get($this->_component),
             'type' => 'error'
         );
@@ -199,8 +198,7 @@ 
         $mail = new org_openpsa_mail();
 
         // define replacements for subject / body
-        $mail->parameters = array
-        (
+        $mail->parameters = array(
             "INVOICE_LABEL" => $invoice_label,
             "INVOICE_DATE" => $invoice_date,
             "FIRSTNAME" => $contactDetails["firstname"],
@@ -327,7 +325,7 @@ 
         $invoice_sum = 0;
         foreach ($this->_request_data['invoice_items'] as $item)
         {
-            $entry =  array();
+            $entry = array();
             $entry['id'] = $item->id;
             try
             {
@@ -419,8 +417,7 @@ 
             default:
                 throw new midcom_error('Invalid operation "' . $_POST['oper'] . '"');
         }
-        $data['saved_values'] = array
-        (
+        $data['saved_values'] = array(
             'id' => $item->id,
             'quantity' => $item->units,
             'price' => $item->pricePerUnit,
@@ -432,7 +429,7 @@ 
 
     private function _verify_post_data()
     {
-        if (   empty($_POST['oper'])
+        if (empty($_POST['oper'])
             || !isset($_POST['id'])
             || !isset($_POST['description'])
             || !isset($_POST['price'])
@@ -490,10 +487,8 @@ 
         $this->add_breadcrumb("invoice/" . $this->_object->guid . "/", $this->_l10n->get('edit invoice items') . ': ' . $title);
 
         midcom::get()->head->set_pagetitle($this->_l10n->get('edit invoice items') . ': ' . $title);
-        $this->_view_toolbar->add_item
-        (
-            array
-            (
+        $this->_view_toolbar->add_item(
+            array(
                 MIDCOM_TOOLBAR_URL => "invoice/recalculation/{$this->_object->guid}/",
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('recalculate_by_reports'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/edit.png',

Braces +3 added lines, -6 removed lines

@@ -333,8 +333,7 @@ 
             {
                 $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'] = '';
             }
@@ -342,8 +341,7 @@ 
             {
                 $task = org_openpsa_projects_task_dba::get_cached($item->task);
                 $entry['task'] = $task->title;
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $entry['task'] = '';
             }
@@ -395,8 +393,7 @@ 
                     $item = new org_openpsa_invoices_invoice_item_dba();
                     $item->invoice = $invoice->id;
                     $item->create();
-                }
-                else
+                } else
                 {
                     $item = new org_openpsa_invoices_invoice_item_dba((int) $_POST['id']);
                 }