flack / openpsa

lib/org/openpsa/projects/projectbroker.php

Braces +2 added lines, -1 removed lines

@@ -44,7 +44,8 @@
             if (!$obj instanceof org_openpsa_contacts_person_dba) {
                 try {
                     $obj = new org_openpsa_contacts_person_dba($obj->id);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     $e->log();
                     continue;
                 }

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/mypage/handler/workingon.php

Spacing +1 added lines, -1 removed lines

@@ -152,7 +152,7 @@
         // Set the "now working on" status
         $workingon = new org_openpsa_mypage_workingon();
         if (!$workingon->set($_POST['task'])) {
-            midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.mypage'),  'Failed to set "working on" parameter to "' . $_POST['task'] . '", reason ' . midcom_connection::get_error_string(), 'error');
+            midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.mypage'), 'Failed to set "working on" parameter to "' . $_POST['task'] . '", reason ' . midcom_connection::get_error_string(), 'error');
         }
 
         return new midcom_response_relocate($relocate . "workingon/");

Braces +2 added lines, -1 removed lines

@@ -92,7 +92,8 @@
                         $customer = new org_openpsa_contacts_group_dba($customer_id);
                         $customer_label = $customer->official;
                         $customer = $customer_id;
-                    } catch (midcom_error $e) {
+                    }
+                    catch (midcom_error $e) {
                     }
                 }
             }

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/handler/deliverable/admin.php

Spacing +4 added lines, -4 removed lines

@@ -54,7 +54,7 @@ 
         $this->_load_schemadb();
         $this->_modify_schema();
         $controller = midcom_helper_datamanager2_controller::create('simple');
-        $controller->schemadb =& $this->_schemadb;
+        $controller->schemadb = & $this->_schemadb;
         $controller->set_storage($this->_deliverable, $this->_schema);
         if (!$controller->initialize()) {
             throw new midcom_error("Failed to initialize a DM2 controller instance for deliverable {$this->_deliverable->id}.");
@@ -67,7 +67,7 @@ 
      */
     private function _modify_schema()
     {
-        $fields =& $this->_schemadb['subscription']->fields;
+        $fields = & $this->_schemadb['subscription']->fields;
 
         $mc = new org_openpsa_relatedto_collector($this->_deliverable->guid, 'midcom_services_at_entry_dba');
         $mc->add_object_order('start', 'ASC');
@@ -75,7 +75,7 @@ 
         $at_entries = $mc->get_related_objects();
 
         if (sizeof($at_entries) != 1) {
-            if (   (   $this->_deliverable->continuous
+            if (($this->_deliverable->continuous
                     || $this->_deliverable->end > time())
                 && $this->_deliverable->state == org_openpsa_sales_salesproject_deliverable_dba::STATE_STARTED) {
                 $fields['next_cycle']['hidden'] = false;
@@ -128,7 +128,7 @@ 
         if (!empty($formdata['at_entry']->value)) {
             $entry = new midcom_services_at_entry_dba((int) $formdata['at_entry']->value);
         }
-        if (   isset($formdata['next_cycle'])
+        if (isset($formdata['next_cycle'])
             && !$formdata['next_cycle']->is_empty()) {
             $next_cycle = (int) $formdata['next_cycle']->value->format('U');
         }

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

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
         $this->_load_schema();
 
         $this->_request_data['controller'] = midcom_helper_datamanager2_controller::create('ajax');
-        $this->_request_data['controller']->schemadb =& $this->_request_data['schemadb_salesproject_deliverable'];
+        $this->_request_data['controller']->schemadb = & $this->_request_data['schemadb_salesproject_deliverable'];
         $this->_request_data['controller']->set_storage($this->_deliverable);
         $this->_request_data['controller']->process_ajax();
 

Braces +2 added lines, -1 removed lines

@@ -51,7 +51,8 @@
         }
         try {
             $this->_request_data['product'] = org_openpsa_products_product_dba::get_cached($this->_deliverable->product);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $this->_request_data['product'] = false;
         }
     }

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

Spacing +5 added lines, -5 removed lines

@@ -55,7 +55,7 @@ 
     {
         $this->_load_schemadb();
         $this->_controller = midcom_helper_datamanager2_controller::create('simple');
-        $this->_controller->schemadb =& $this->_schemadb;
+        $this->_controller->schemadb = & $this->_schemadb;
         $this->_controller->set_storage($this->_salesproject, $this->_schema);
         if (!$this->_controller->initialize()) {
             throw new midcom_error("Failed to initialize a DM2 controller instance for salesproject {$this->_salesproject->id}.");
@@ -71,9 +71,9 @@ 
         $this->_load_defaults($args);
 
         $this->_controller = midcom_helper_datamanager2_controller::create('create');
-        $this->_controller->schemadb =& $this->_schemadb;
+        $this->_controller->schemadb = & $this->_schemadb;
         $this->_controller->schemaname = $this->_schema;
-        $this->_controller->callback_object =& $this;
+        $this->_controller->callback_object = & $this;
         $this->_controller->defaults = $this->_defaults;
         if (!$this->_controller->initialize()) {
             throw new midcom_error("Failed to initialize a DM2 create controller.");
@@ -84,7 +84,7 @@ 
     {
         $schemadb = midcom_helper_datamanager2_schema::load_database($this->_config->get('schemadb_salesproject'));
         if ($this->_salesproject) {
-            $fields =& $schemadb['default']->fields;
+            $fields = & $schemadb['default']->fields;
             $fields['customer']['type_config']['options'] = org_openpsa_helpers_list::task_groups($this->_salesproject);
         }
         $this->_schemadb = $schemadb;
@@ -96,7 +96,7 @@ 
         $this->_defaults['owner'] = midcom_connection::get_user();
 
         if (!empty($args[0])) {
-            $fields =& $this->_schemadb['default']->fields;
+            $fields = & $this->_schemadb['default']->fields;
             try {
                 $customer = new org_openpsa_contacts_group_dba($args[0]);
                 $fields['customer']['type_config']['options'] = array(0 => '', $customer->id => $customer->official);

Braces +2 added lines, -1 removed lines

@@ -102,7 +102,8 @@
                 $fields['customer']['type_config']['options'] = array(0 => '', $customer->id => $customer->official);
 
                 $this->_defaults['customer'] = $customer->id;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $customer = new org_openpsa_contacts_person_dba($args[0]);
                 $this->_defaults['customerContact'] = $customer->id;
                 $fields['customer']['type_config']['options'] = org_openpsa_helpers_list::task_groups(new org_openpsa_sales_salesproject_dba, 'id', array($customer->id => true));

lib/org/openpsa/sales/midcom/interfaces.php

Spacing +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
      */
     private function _find_suspects_event(midcom_core_dbaobject $object, $defaults, array &$links_array)
     {
-        if (   !is_array($object->participants)
+        if (!is_array($object->participants)
             || count($object->participants) < 2) {
             //We have invalid list or less than two participants, abort
             return;
@@ -144,7 +144,7 @@ 
      */
     public function new_subscription_cycle(array $args, midcom_baseclasses_components_cron_handler $handler)
     {
-        if (   !isset($args['deliverable'])
+        if (!isset($args['deliverable'])
             || !isset($args['cycle'])) {
             $handler->print_error('deliverable GUID or cycle number not set, aborting');
             return false;

Braces +6 added lines, -3 removed lines

@@ -134,7 +134,8 @@ 
 
         try {
             $deliverable = new org_openpsa_sales_salesproject_deliverable_dba($args['deliverable']);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $handler->print_error("Deliverable {$args['deliverable']} not found: " . midcom_connection::get_error_string());
             return false;
         }
@@ -158,7 +159,8 @@ 
         }
         try {
             $deliverable = new org_openpsa_sales_salesproject_deliverable_dba($args['deliverable']);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $handler->print_error('no deliverable with passed GUID: ' . $args['deliverable'] . ', aborting');
             return false;
         }
@@ -166,7 +168,8 @@ 
         //get the owner of the salesproject the deliverable belongs to
         try {
             $project = new org_openpsa_sales_salesproject_dba($deliverable->salesproject);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $handler->print_error('Failed to load salesproject: ' . $e->getMessage());
             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;

Braces +4 added lines, -2 removed lines

@@ -120,14 +120,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();
             }
         }