flack / openpsa

lib/org/openpsa/sales/viewer.php

Braces +6 added lines, -12 removed lines

@@ -57,8 +57,7 @@ 
                 $notification_entry->create();
                 //relatedto from notifcation to deliverable
                 org_openpsa_relatedto_plugin::create($notification_entry, 'midcom.services.at', $deliverable, 'org.openpsa.sales', false, array('toExtra' => 'notify_at_entry'));
-            }
-            else
+            } else
             {
                 //get guid of at_entry
                 foreach ($entry_keys as $key => $entry)
@@ -67,8 +66,7 @@ 
                     try
                     {
                         $notification_entry = new midcom_services_at_entry_dba($entry);
-                    }
-                    catch (midcom_error $e)
+                    } catch (midcom_error $e)
                     {
                         //relatedto links to a non-existing at_entry - so create a new one an link to it
                         $notification_entry = new midcom_services_at_entry_dba();
@@ -84,8 +82,7 @@ 
             $notification_entry->component = 'org.openpsa.sales';
             $notification_entry->arguments = array('deliverable' => $deliverable->guid);
             $notification_entry->update();
-        }
-        else
+        } else
         {
             //void date - so delete existing at_entrys for this notify_date
             foreach ($entry_keys as $key => $empty)
@@ -95,8 +92,7 @@ 
                     $notification_entry = new midcom_services_at_entry_dba($mc_entry->get_subkey($key, 'fromGuid'));
                     //check if related at_entry exists & delete it
                     $notification_entry->delete();
-                }
-                catch (midcom_error $e)
+                } catch (midcom_error $e)
                 {
                     $e->log();
                 }
@@ -121,14 +117,12 @@ 
                 if ($object->orgOpenpsaObtype == org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION)
                 {
                     $prefix = $handler->_l10n->get('subscription');
-                }
-                else
+                } else
                 {
                     $prefix = $handler->_l10n->get('single delivery');
                 }
                 $tmp["deliverable/{$object->guid}/"] = $prefix . ': ' . $object->title;
-            }
-            else
+            } else
             {
                 $tmp["salesproject/{$object->guid}/"] = $object->title;
             }

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

Spacing +6 added lines, -8 removed lines

@@ -66,8 +66,7 @@ 
         if ($this->_salesproject->can_do('midgard:update'))
         {
             $workflow = $this->get_workflow('datamanager2');
-            $buttons[] = $workflow->get_button("salesproject/edit/{$this->_salesproject->guid}/", array
-            (
+            $buttons[] = $workflow->get_button("salesproject/edit/{$this->_salesproject->guid}/", array(
                 MIDCOM_TOOLBAR_ACCESSKEY => 'e',
             ));
         }
@@ -81,8 +80,7 @@ 
         if (!empty($this->_request_data['projects_url']))
         {
             $prefix = midcom_connection::get_url('self') . $this->_request_data['projects_url'];
-            $buttons[] = array
-            (
+            $buttons[] = array(
                 MIDCOM_TOOLBAR_URL => $prefix . "project/{$this->_salesproject->guid}/",
                 MIDCOM_TOOLBAR_LABEL => $this->_i18n->get_string('org.openpsa.projects', 'org.openpsa.projects'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/jump-to.png',
@@ -105,7 +103,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();
     }
@@ -164,7 +162,7 @@ 
         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;
@@ -234,7 +232,7 @@ 
                 if (isset($entries[0]))
                 {
                     $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');
@@ -254,7 +252,7 @@ 
                 $toolbar['label'] = $this->_l10n->get('invoiced') . ': ' . $formatter->number($deliverable->invoiced);
             }
         }
-        else if (   $deliverable->orgOpenpsaObtype != org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION
+        else if ($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

Braces +7 added lines, -14 removed lines

@@ -192,16 +192,14 @@ 
             try
             {
                 $data['product'] = org_openpsa_products_product_dba::get_cached($deliverable->product);
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $data['product'] = false;
             }
             if ($deliverable->orgOpenpsaObtype == org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION)
             {
                 midcom_show_style('show-salesproject-deliverables-subscription');
-            }
-            else
+            } else
             {
                 midcom_show_style('show-salesproject-deliverables-item');
             }
@@ -219,13 +217,11 @@ 
             //new, proposed
             $toolbar['buttons']['order'] = $this->_l10n->get('mark ordered');
             $toolbar['buttons']['decline'] = $this->_l10n->get('mark declined');
-        }
-        else if ($deliverable->state == org_openpsa_sales_salesproject_deliverable_dba::STATE_DECLINED)
+        } else if ($deliverable->state == org_openpsa_sales_salesproject_deliverable_dba::STATE_DECLINED)
         {
             //declined, nothing to do...
             return $toolbar;
-        }
-        else if ($deliverable->state < org_openpsa_sales_salesproject_deliverable_dba::STATE_DELIVERED)
+        } else if ($deliverable->state < org_openpsa_sales_salesproject_deliverable_dba::STATE_DELIVERED)
         {
             //started, ordered
             if ($deliverable->orgOpenpsaObtype == org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION)
@@ -240,21 +236,18 @@ 
                         $toolbar['buttons']['run_cycle'] = $this->_l10n->get('generate now');
                     }
                 }
-            }
-            else if ($deliverable->state == org_openpsa_sales_salesproject_deliverable_dba::STATE_ORDERED)
+            } else if ($deliverable->state == org_openpsa_sales_salesproject_deliverable_dba::STATE_ORDERED)
             {
                 $toolbar['buttons']['deliver'] = $this->_l10n->get('mark delivered');
             }
-        }
-        else if ($deliverable->state == org_openpsa_sales_salesproject_deliverable_dba::STATE_INVOICED)
+        } else if ($deliverable->state == org_openpsa_sales_salesproject_deliverable_dba::STATE_INVOICED)
         {
             //delivered, invoiced
             if ($deliverable->invoiced > 0)
             {
                 $toolbar['label'] = $this->_l10n->get('invoiced') . ': ' . $formatter->number($deliverable->invoiced);
             }
-        }
-        else if (   $deliverable->orgOpenpsaObtype != org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION
+        } else if (   $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

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

Spacing +10 added lines, -12 removed lines

@@ -55,9 +55,9 @@ 
     {
         $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())
+        if (!$this->_controller->initialize())
         {
             throw new midcom_error("Failed to initialize a DM2 controller instance for salesproject {$this->_salesproject->id}.");
         }
@@ -72,11 +72,11 @@ 
         $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())
+        if (!$this->_controller->initialize())
         {
             throw new midcom_error("Failed to initialize a DM2 create controller.");
         }
@@ -87,7 +87,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;
@@ -100,7 +100,7 @@ 
 
         if (!empty($args[0]))
         {
-            $fields =& $this->_schemadb['default']->fields;
+            $fields = & $this->_schemadb['default']->fields;
             try
             {
                 $customer = new org_openpsa_contacts_group_dba($args[0]);
@@ -125,7 +125,7 @@ 
     {
         $this->_salesproject = new org_openpsa_sales_salesproject_dba();
 
-        if (! $this->_salesproject->create())
+        if (!$this->_salesproject->create())
         {
             debug_print_r('We operated on this object:', $this->_salesproject);
             throw new midcom_error("Failed to create a new invoice. Error: " . midcom_connection::get_error_string());
@@ -165,8 +165,7 @@ 
 
         midcom::get()->head->set_pagetitle($this->_l10n->get('create salesproject'));
 
-        $workflow = $this->get_workflow('datamanager2', array
-        (
+        $workflow = $this->get_workflow('datamanager2', array(
             'controller' => $this->_controller,
             'save_callback' => array($this, 'save_callback')
         ));
@@ -186,8 +185,7 @@ 
     public function _handler_delete($handler_id, array $args, array &$data)
     {
         $this->_salesproject = new org_openpsa_sales_salesproject_dba($args[0]);
-        $workflow = $this->get_workflow('delete', array
-        (
+        $workflow = $this->get_workflow('delete', array(
             'object' => $this->_salesproject,
             'recursive' => true
         ));

Braces +1 added lines, -2 removed lines

@@ -37,8 +37,7 @@
             {
                 $article = new midcom_db_article($related);
                 echo "<li><a href=\"" . midcom::get()->permalinks->create_permalink($article->guid) . "\">{$article->title}</a></li>\n";
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $e->log();
             }

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

Spacing +3 added lines, -6 removed lines

@@ -94,10 +94,8 @@ 
             if ($this->_request_data['contacts_url'])
             {
                 $url_prefix = $this->_request_data['contacts_url'] . (is_a($this->_request_data['customer'], 'org_openpsa_contacts_group_dba') ? 'group' : 'person') . "/";
-                $this->_view_toolbar->add_item
-                (
-                    array
-                    (
+                $this->_view_toolbar->add_item(
+                    array(
                         MIDCOM_TOOLBAR_URL => $url_prefix . $this->_request_data['customer']->guid . '/',
                         MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('go to customer'),
                         MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/jump-to.png',
@@ -108,8 +106,7 @@ 
         if (midcom::get()->auth->can_user_do('midgard:create', null, 'org_openpsa_sales_salesproject_dba'))
         {
             $workflow = $this->get_workflow('datamanager2');
-            $this->_view_toolbar->add_item($workflow->get_button($create_url, array
-            (
+            $this->_view_toolbar->add_item($workflow->get_button($create_url, array(
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('create salesproject'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_people.png',
             )));

Braces +2 added lines, -4 removed lines

@@ -40,8 +40,7 @@ 
             $data['mode'] = 'customer';
             $data['list_title'] = sprintf($this->_l10n->get('salesprojects with %s'), $data['customer']->get_label());
             $this->add_breadcrumb("", $data['list_title']);
-        }
-        else
+        } else
         {
             $data['mode'] = $this->get_list_mode($args);
             $qb = $this->_add_state_constraint($data['mode'], $qb);
@@ -134,8 +133,7 @@ 
         {
             $this->_request_data['customer'] = new org_openpsa_contacts_group_dba($guid);
             $qb->add_constraint('customer', '=', $this->_request_data['customer']->id);
-        }
-        catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             $this->_request_data['customer'] = new org_openpsa_contacts_person_dba($guid);
             $qb->add_constraint('customerContact', '=', $this->_request_data['customer']->id);

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

Spacing +2 added lines, -3 removed lines

@@ -39,8 +39,7 @@ 
         if ($this->_deliverable->can_do('midgard:update'))
         {
             $workflow = $this->get_workflow('datamanager2');
-            $this->_view_toolbar->add_item($workflow->get_button("deliverable/edit/{$this->_deliverable->guid}/", array
-            (
+            $this->_view_toolbar->add_item($workflow->get_button("deliverable/edit/{$this->_deliverable->guid}/", array(
                 MIDCOM_TOOLBAR_ACCESSKEY => 'e',
             )));
         }
@@ -83,7 +82,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, -4 removed lines

@@ -74,8 +74,7 @@ 
         try
         {
             $object = midcom::get()->dbfactory->get_object_by_guid($guid);
-        }
-        catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             debug_add("Failed to resolve the GUID {$guid}, this is most probably an access denied error.", MIDCOM_LOG_ERROR);
             debug_add('Last MidCOM error string: ' . $e->getMessage());
@@ -171,8 +170,7 @@ 
         if ($interface instanceof midcom_services_permalinks_resolver)
         {
             $result = $interface->resolve_object_link($topic, $object);
-        }
-        else
+        } else
         {
             $result = $interface->_on_resolve_permalink($topic, $interface->get_config_for_topic($topic), $object->guid);
         }

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

Spacing +4 added lines, -6 removed lines

@@ -65,14 +65,14 @@ 
     /**
      * DM2 creation callback, binds to the current content topic.
      */
-    public function & dm2_create_callback (&$controller)
+    public function & dm2_create_callback(&$controller)
     {
         $this->_deliverable = new org_openpsa_sales_salesproject_deliverable_dba();
         $this->_deliverable->salesproject = $this->_salesproject->id;
         $this->_deliverable->state = org_openpsa_sales_salesproject_deliverable_dba::STATE_NEW;
         $this->_deliverable->orgOpenpsaObtype = $this->_product->delivery;
 
-        if (! $this->_deliverable->create())
+        if (!$this->_deliverable->create())
         {
             debug_print_r('We operated on this object:', $this->_deliverable);
             throw new midcom_error('Failed to create a new deliverable. Last Midgard error was: ' . midcom_connection::get_error_string());
@@ -83,8 +83,7 @@ 
 
     public function get_schema_defaults()
     {
-        $defaults = array
-        (
+        $defaults = array(
             'product' => $this->_product->id,
             'units' => 1,
 
@@ -158,8 +157,7 @@ 
 
         midcom::get()->head->set_pagetitle($this->_l10n->get('add offer'));
         midcom::get()->head->add_jsfile(MIDCOM_STATIC_URL . '/' . $this->_component . '/sales.js');
-        $workflow = $this->get_workflow('datamanager2', array
-        (
+        $workflow = $this->get_workflow('datamanager2', array(
             'controller' => $data['controller'],
             'save_callback' => array($this, 'save_callback')
         ));

Braces +2 added lines, -4 removed lines

@@ -46,8 +46,7 @@ 
         {
             $local_filename = midcom_db_attachment::safe_filename($uploaded_file['name']);
             $local_file = $this->_get_file($local_filename, true);
-        }
-        else
+        } else
         {
             $local_file = $this->_file;
         }
@@ -89,8 +88,7 @@ 
             // We're creating a new file
             $local_filename = midcom_db_attachment::safe_filename($_POST['midgard_admin_asgard_filename']);
             $local_file = $this->_get_file($local_filename, true);
-        }
-        else
+        } else
         {
             $local_file = $this->_file;
         }

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

Spacing +2 added lines, -4 removed lines

@@ -72,10 +72,8 @@
         $siteconfig = org_openpsa_core_siteconfig::get_instance();
         $products_url = $siteconfig->get_node_full_url('org.openpsa.products');
         $product_guid = $siteconfig->get_node_guid('org.openpsa.products');
-        $this->_view_toolbar->add_item
-        (
-            array
-            (
+        $this->_view_toolbar->add_item(
+            array(
                 MIDCOM_TOOLBAR_URL => $products_url . 'product/' . $this->_product->get_path(new midcom_db_topic($product_guid)),
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('go to product'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/jump-to.png',

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

Spacing +1 added lines, -2 removed lines

@@ -44,8 +44,7 @@
         $this->_deliverable = new org_openpsa_sales_salesproject_deliverable_dba($args[0]);
         $this->_salesproject = new org_openpsa_sales_salesproject_dba($this->_deliverable->salesproject);
 
-        $supported_operations = array
-        (
+        $supported_operations = array(
             'decline', 'order', 'deliver', 'invoice', 'run_cycle'
         );
 

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

Spacing +8 added lines, -11 removed lines

@@ -54,9 +54,9 @@ 
         $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())
+        if (!$controller->initialize())
         {
             throw new midcom_error("Failed to initialize a DM2 controller instance for deliverable {$this->_deliverable->id}.");
         }
@@ -68,7 +68,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');
@@ -77,7 +77,7 @@ 
 
         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)
             {
@@ -110,8 +110,7 @@ 
         midcom::get()->head->add_jsfile(MIDCOM_STATIC_URL . '/' . $this->_component . '/sales.js');
         midcom::get()->head->set_pagetitle(sprintf($this->_l10n_midcom->get('edit %s'), $this->_l10n->get('deliverable')));
 
-        $workflow = $this->get_workflow('datamanager2', array
-        (
+        $workflow = $this->get_workflow('datamanager2', array(
             'controller' => $data['controller'],
             'save_callback' => array($this, 'save_callback')
         ));
@@ -133,7 +132,7 @@ 
         {
             $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');
@@ -160,8 +159,7 @@ 
         else if ($next_cycle > 0)
         {
             //TODO: This code is copied from scheduler, and should be merged into a separate method at some point
-            $args = array
-            (
+            $args = array(
                 'deliverable' => $this->_deliverable->guid,
                 'cycle'       => 2, //TODO: We might want to calculate the correct cycle number from start and unit at some point
             );
@@ -188,8 +186,7 @@ 
     {
         $deliverable = new org_openpsa_sales_salesproject_deliverable_dba($args[0]);
         $salesproject = $deliverable->get_parent();
-        $workflow = $this->get_workflow('delete', array
-        (
+        $workflow = $this->get_workflow('delete', array(
             'object' => $deliverable,
             'success_url' => "salesproject/{$salesproject->guid}/"
         ));

Braces +2 added lines, -4 removed lines

@@ -145,8 +145,7 @@ 
             {
                 $entry->delete();
                 $this->_deliverable->end_subscription();
-            }
-            else if ($next_cycle != $entry->start)
+            } else if ($next_cycle != $entry->start)
             {
                 //@todo If next_cycle is changed to be in the past, should we check if this would lead
                 //to multiple runs immediately? i.e. if you set a monthly subscriptions next cycle to
@@ -156,8 +155,7 @@ 
                 $entry->start = $next_cycle;
                 $entry->update();
             }
-        }
-        else if ($next_cycle > 0)
+        } else if ($next_cycle > 0)
         {
             //TODO: This code is copied from scheduler, and should be merged into a separate method at some point
             $args = array