flack / openpsa

lib/org/openpsa/sales/validator.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
         if ($result === true) {
             $result = array();
         }
-        if (   (   empty($fields['end_date'])
+        if ((empty($fields['end_date'])
                 || $fields['end_date'] == '0000-00-00')
             && empty($fields['continuous'])) {
             $result['end'] = midcom::get()->i18n->get_string('select either end date or continuous', 'org.openpsa.sales');
@@ -34,7 +34,7 @@ 
     public function validate_units(array $fields)
     {
         $result = array();
-        if (   empty($fields['invoiceByActualUnits'])
+        if (empty($fields['invoiceByActualUnits'])
             && empty($fields['plannedUnits'])) {
             $result['plannedUnits'] = midcom::get()->i18n->get_string('select either planned units or invoice by actual units', 'org.openpsa.sales');
             return $result;

lib/org/openpsa/user/handler/group/create.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
         $this->_group = new midcom_db_group();
         if (!$this->_group->create()) {
             debug_print_r('We operated on this object:', $this->_group);
-            throw new midcom_error('Failed to create a new group. Last Midgard error was: '. midcom_connection::get_error_string());
+            throw new midcom_error('Failed to create a new group. Last Midgard error was: ' . midcom_connection::get_error_string());
         }
 
         return $this->_group;

lib/org/openpsa/widgets/grid/main.php

Spacing +4 added lines, -4 removed lines

@@ -104,7 +104,7 @@ 
         if (file_exists(MIDCOM_STATIC_ROOT . $jqgrid_path . 'i18n/grid.locale-' . $language . '.js')) {
             $lang = $language;
         }
-        $head->add_jsfile(MIDCOM_STATIC_URL . $jqgrid_path . 'i18n/grid.locale-'. $lang . '.js');
+        $head->add_jsfile(MIDCOM_STATIC_URL . $jqgrid_path . 'i18n/grid.locale-' . $lang . '.js');
         $head->add_jsfile(MIDCOM_STATIC_URL . $jqgrid_path . 'jquery.jqgrid.min.js');
 
         org_openpsa_widgets_ui::add_head_elements();
@@ -159,7 +159,7 @@ 
     public function set_option($key, $value, $autoquote_string = true)
     {
         $this->_raw_options[$key] = $value;
-        if (   $autoquote_string
+        if ($autoquote_string
             && is_string($value)) {
             $value = '"' . str_replace('"', '\\"', $value) . '"';
         } elseif ($value === true) {
@@ -192,7 +192,7 @@ 
     public function set_select_column($name, $label, $options, array $selectdata)
     {
         $selectstring = implode(';', array_map(
-            function ($key, $value) {
+            function($key, $value) {
                 return $key . ':' . $value;
             },
             array_keys($selectdata),
@@ -243,7 +243,7 @@ 
      */
     public function remove_column($name)
     {
-        if (   empty($name)
+        if (empty($name)
             || !array_key_exists($name, $this->_columns)) {
             throw new midcom_error('Invalid column name ' . $name);
         }

lib/org/openpsa/invoices/invoice.php

Spacing +2 added lines, -2 removed lines

@@ -275,11 +275,11 @@
             $deliverable = null;
             foreach (array_keys($mc_task_key) as $key) {
                 try {
-                    $deliverable = new org_openpsa_sales_salesproject_deliverable_dba((int)$mc_task_agreement->get_subkey($key, 'agreement'));
+                    $deliverable = new org_openpsa_sales_salesproject_deliverable_dba((int) $mc_task_agreement->get_subkey($key, 'agreement'));
                     $invoice_item->pricePerUnit = $deliverable->pricePerUnit;
                     $invoice_item->deliverable = $deliverable->id;
                     //calculate price
-                    if (   $deliverable->invoiceByActualUnits
+                    if ($deliverable->invoiceByActualUnits
                         || $deliverable->plannedUnits == 0) {
                         $invoice_item->units = $hours;
                     } else {

Braces +10 added lines, -5 removed lines

@@ -65,7 +65,8 @@ 
     {
         try {
             $invoice_sender = new midcom_db_person($invoicer);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return;
         }
 
@@ -154,7 +155,8 @@ 
             try {
                 $task = new org_openpsa_projects_task_dba($id);
                 $task->update_cache();
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
             }
         }
 
@@ -285,7 +287,8 @@ 
                     } else {
                         $invoice_item->units = $deliverable->plannedUnits;
                     }
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     $e->log();
                     $invoice_item->units = $hours;
                 }
@@ -353,14 +356,16 @@ 
         if (!empty($this->customer)) {
             try {
                 return org_openpsa_contacts_group_dba::get_cached($this->customer);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }
         if (!empty($this->customerContact)) {
             try {
                 return org_openpsa_contacts_person_dba::get_cached($this->customerContact);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }

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

Indentation +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
     public static function get_by_object(org_openpsa_invoices_interfaces_customer $object)
     {
         if (   !($bd = self::get_billing_data('org_openpsa_contacts_group_dba', $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', $object->customerContact))) {
             $bd = new org_openpsa_invoices_billing_data_dba();
             $due = midcom_baseclasses_components_configuration::get('org.openpsa.invoices', 'config')->get('default_due_days');

Spacing +1 added lines, -1 removed lines

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

Braces +6 added lines, -3 removed lines

@@ -77,7 +77,8 @@ 
             // if the property useContactAddress is set
             $billing_data[0]->set_address();
             return $billing_data[0];
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return false;
         }
@@ -122,10 +123,12 @@ 
     {
         try {
             return new org_openpsa_contacts_person_dba($this->linkGuid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             try {
                 return new org_openpsa_contacts_group_dba($this->linkGuid);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 debug_add("Failed to load contact with GUID: " . $this->linkGuid . " - last error:" . $e->getMessage(), MIDCOM_LOG_ERROR);
                 return false;
             }

lib/org/openpsa/sales/handler/view.php

Spacing +5 added lines, -5 removed lines

@@ -83,7 +83,7 @@ 
             );
         }
 
-        if (   $this->_config->get('sales_pdfbuilder_class')
+        if ($this->_config->get('sales_pdfbuilder_class')
             && $this->_salesproject->can_do('midgard:update')
             && $this->is_pdf_creatable()) {
             $workflow = $this->get_workflow('datamanager2');
@@ -123,7 +123,7 @@ 
         $this->_request_data['schemadb_salesproject_deliverable'] = midcom_helper_datamanager2_schema::load_database($this->_config->get('schemadb_deliverable'));
 
         $this->_request_data['controller'] = midcom_helper_datamanager2_controller::create('ajax');
-        $this->_request_data['controller']->schemadb =& $this->_request_data['schemadb_salesproject'];
+        $this->_request_data['controller']->schemadb = & $this->_request_data['schemadb_salesproject'];
         $this->_request_data['controller']->set_storage($this->_salesproject);
         $this->_request_data['controller']->process_ajax();
     }
@@ -179,7 +179,7 @@ 
         $this->_request_data['deliverables_objects'] = array();
         foreach ($deliverables as $deliverable) {
             $this->_controllers[$deliverable->id] = midcom_helper_datamanager2_controller::create('ajax');
-            $this->_controllers[$deliverable->id]->schemadb =& $this->_request_data['schemadb_salesproject_deliverable'];
+            $this->_controllers[$deliverable->id]->schemadb = & $this->_request_data['schemadb_salesproject_deliverable'];
             $this->_controllers[$deliverable->id]->set_storage($deliverable);
             $this->_controllers[$deliverable->id]->process_ajax();
             $this->_request_data['deliverables_objects'][$deliverable->guid] = $deliverable;
@@ -228,7 +228,7 @@ 
             if ($deliverable->orgOpenpsaObtype == org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION) {
                 if ($entries = $deliverable->get_at_entries()) {
                     $toolbar['label'] = sprintf($this->_l10n->get('next invoice will be generated on %s'), $formatter->date($entries[0]->start));
-                    if (   $entries[0]->status == midcom_services_at_entry_dba::SCHEDULED
+                    if ($entries[0]->status == midcom_services_at_entry_dba::SCHEDULED
                         && midcom::get()->auth->can_user_do('midgard:create', null, 'org_openpsa_invoices_invoice_dba')) {
                         $toolbar['buttons']['run_cycle'] = $this->_l10n->get('generate now');
                     }
@@ -241,7 +241,7 @@ 
             if ($deliverable->invoiced > 0) {
                 $toolbar['label'] = $this->_l10n->get('invoiced') . ': ' . $formatter->number($deliverable->invoiced);
             }
-        } elseif (   $deliverable->orgOpenpsaObtype != org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION
+        } elseif ($deliverable->orgOpenpsaObtype != org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION
                  && midcom::get()->auth->can_user_do('midgard:create', null, 'org_openpsa_invoices_invoice_dba')) {
             //not invoiced yet
             $client_class = $this->_config->get('calculator');

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

Braces +2 added lines, -1 removed lines

@@ -48,7 +48,8 @@
         try {
             $pdf_helper->render_and_attach();
             return $this->reply(true, $this->_l10n->get('pdf created'));
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return $this->reply(false, $this->_l10n->get('pdf creation failed') . ': ' . $e->getMessage());
         }
     }

lib/org/openpsa/documents/handler/finder.php

Spacing +4 added lines, -4 removed lines

@@ -29,10 +29,10 @@
         org_openpsa_widgets_contact::add_head_elements();
 
         $head = midcom::get()->head;
-        $head->add_jsfile(MIDCOM_JQUERY_UI_URL. '/widgets/draggable.min.js');
-        $head->add_jsfile(MIDCOM_JQUERY_UI_URL. '/widgets/droppable.min.js');
-        $head->add_jsfile(MIDCOM_JQUERY_UI_URL. '/widgets/selectable.min.js');
-        $head->add_jsfile(MIDCOM_JQUERY_UI_URL. '/widgets/tabs.min.js');
+        $head->add_jsfile(MIDCOM_JQUERY_UI_URL . '/widgets/draggable.min.js');
+        $head->add_jsfile(MIDCOM_JQUERY_UI_URL . '/widgets/droppable.min.js');
+        $head->add_jsfile(MIDCOM_JQUERY_UI_URL . '/widgets/selectable.min.js');
+        $head->add_jsfile(MIDCOM_JQUERY_UI_URL . '/widgets/tabs.min.js');
         $head->add_jsfile(MIDCOM_STATIC_URL . $prefix . 'js/elfinder.min.js');
 
         $lang = midcom::get()->i18n->get_current_language();

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

Spacing +5 added lines, -5 removed lines

@@ -30,7 +30,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
             try {
@@ -47,7 +47,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)) {
@@ -90,7 +90,7 @@ 
      */
     private function _populate_schema_customers_for_contact($contact_id)
     {
-        $fields =& $this->_schemadb['default']->fields;
+        $fields = & $this->_schemadb['default']->fields;
         $organizations = array(0 => '');
 
         $qb = org_openpsa_contacts_group_dba::new_query_builder();
@@ -112,7 +112,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();
         $qb = org_openpsa_contacts_person_dba::new_query_builder();
@@ -236,7 +236,7 @@ 
 
             // sending per email enabled in billing data?
             $billing_data = org_openpsa_invoices_billing_data_dba::get_by_object($this->_object);
-            if (    !$this->_object->sent
+            if (!$this->_object->sent
                  && intval($billing_data->sendingoption) == 2) {
                 $buttons[] = $this->build_button('send_by_mail', 'stock-icons/16x16/stock_mail-reply.png');
             }

Braces +4 added lines, -2 removed lines

@@ -35,7 +35,8 @@ 
             // We're creating invoice for chosen customer
             try {
                 $this->customer = new org_openpsa_contacts_group_dba($this->_master->_handler['args'][0]);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $this->contact = new org_openpsa_contacts_person_dba($this->_master->_handler['args'][0]);
             }
         }
@@ -75,7 +76,8 @@ 
             try {
                 $this->customer = org_openpsa_contacts_group_dba::get_cached($this->_object->customer);
                 $this->_populate_schema_contacts_for_customer($this->customer);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $fields['customer']['hidden'] = true;
                 $e->log();
             }