flack / openpsa

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

Spacing +3 added lines, -4 removed lines

@@ -66,12 +66,12 @@ 
     /**
      * DM2 creation callback, binds to the current content topic.
      */
-    public function & dm2_create_callback (&$controller)
+    public function & dm2_create_callback(&$controller)
     {
         $this->_group = new org_openpsa_products_product_group_dba();
         $this->_group->up = $this->_request_data['up'];
 
-        if (! $this->_group->create())
+        if (!$this->_group->create())
         {
             debug_print_r('We operated on this object:', $this->_group);
             throw new midcom_error('Failed to create a new product group. Last Midgard error was: ' . midcom_connection::get_error_string());
@@ -111,8 +111,7 @@ 
 
         midcom::get()->head->set_pagetitle(sprintf($this->_l10n_midcom->get('create %s'), $this->_l10n->get($this->_schemadb[$this->_schema]->description)));
 
-        $workflow = $this->get_workflow('datamanager2', array
-        (
+        $workflow = $this->get_workflow('datamanager2', array(
             'controller' => $data['controller'],
             'save_callback' => array($this, 'save_callback')
         ));

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/products/midcom/interfaces.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
      */
     public function _on_reindex($topic, $config, &$indexer)
     {
-        if (   !$config->get('index_products')
+        if (!$config->get('index_products')
             && !$config->get('index_groups'))
         {
             debug_add("No indexing to groups and products, skipping", MIDCOM_LOG_WARN);

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/expenses/viewer.php

Spacing +4 added lines, -5 removed lines

@@ -29,8 +29,7 @@ 
                 $create_url .= $task . "/";
             }
 
-            $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 => sprintf($this->_l10n_midcom->get('create %s'), $this->_l10n->get($schemadb[$name]->description)),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_new-event.png',
             )));
@@ -43,12 +42,12 @@ 
     public function _on_handle($handler, array $args)
     {
         $task = false;
-        if (   $handler == 'list_hours_task'
+        if ($handler == 'list_hours_task'
             || $handler == 'list_hours_task_all')
         {
             $task = $args[0];
         }
-        if (   strpos($handler, 'index') !== false
+        if (strpos($handler, 'index') !== false
             || strpos($handler, 'list') !== false)
         {
             $this->_populate_view_toolbar($task);
@@ -68,7 +67,7 @@ 
         $person_filter->set_label($this->_l10n->get("choose user"));
         $qf->add_filter($person_filter);
 
-        if (   $this->_request_data['handler_id'] != 'index_timestamp'
+        if ($this->_request_data['handler_id'] != 'index_timestamp'
             && $this->_request_data['handler_id'] != 'index')
         {
             $date_filter = new org_openpsa_core_filter_timeframe('date');

lib/org/openpsa/expenses/handler/hours/list.php

Spacing +11 added lines, -21 removed lines

@@ -67,10 +67,8 @@ 
 
                 if ($projects_url)
                 {
-                    $this->_view_toolbar->add_item
-                    (
-                        array
-                        (
+                    $this->_view_toolbar->add_item(
+                        array(
                             MIDCOM_TOOLBAR_URL => $projects_url . "task/{$task->guid}/",
                             MIDCOM_TOOLBAR_LABEL => sprintf($this->_l10n->get('show task %s'), $task->title),
                             MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/jump-to.png',
@@ -105,20 +103,16 @@ 
      */
     private function _load_hour_data(array $hours)
     {
-        $reports = array
-        (
-            'invoiceable' => array
-            (
+        $reports = array(
+            'invoiceable' => array(
                 'hours' => 0,
                 'reports' => array(),
             ),
-            'uninvoiceable' => array
-            (
+            'uninvoiceable' => array(
                 'hours' => 0,
                 'reports' => array(),
             ),
-            'invoiced' => array
-            (
+            'invoiced' => array(
                 'hours' => 0,
                 'reports' => array(),
             ),
@@ -132,8 +126,7 @@ 
                 {
                     $reporter = new midcom_db_person($report->person);
                     $reporter_card = new org_openpsa_widgets_contact($reporter);
-                    $this->reporters[$report->person] = array
-                    (
+                    $this->reporters[$report->person] = array(
                         'card' => $reporter_card->show_inline(),
                         'rname' => $reporter->rname
                     );
@@ -192,7 +185,7 @@ 
                     $data['action_options']['mark_uninvoiceable'] = array('label' => $this->_l10n->get('mark_uninvoiceable'));
                     break;
                 case 'uninvoiceable':
-                    $data['action_options']['mark_invoiceable'] =  array('label' => $this->_l10n->get('mark_invoiceable'));
+                    $data['action_options']['mark_invoiceable'] = array('label' => $this->_l10n->get('mark_invoiceable'));
                     break;
             }
             $data['reports'] = $reports;
@@ -210,16 +203,13 @@ 
         $task_conf = midcom_helper_datamanager2_widget_autocomplete::get_widget_config('task');
         $invoice_conf = midcom_helper_datamanager2_widget_autocomplete::get_widget_config('invoice');
 
-        return array
-        (
+        return array(
             'none' => array('label' => midcom::get()->i18n->get_string("choose action", "midcom.admin.user")),
-            'change_task' => array
-            (
+            'change_task' => array(
                 'label' => $this->_l10n->get('change_task'),
                 'widget_config' => $task_conf
             ),
-            'change_invoice' => array
-            (
+            'change_invoice' => array(
                 'label' => $this->_l10n->get('change_invoice'),
                 'widget_config' => $invoice_conf
             )

Braces +1 added lines, -2 removed lines

@@ -172,8 +172,7 @@
                         }
                         $this->_jobs[] = $job;
                     }
-                }
-                catch (midcom_error $e)
+                } catch (midcom_error $e)
                 {
                     $e->log(MIDCOM_LOG_ERROR);
                     debug_print_r('Got this job declaration:', $job);

lib/org/openpsa/expenses/handler/hours/admin.php

Spacing +8 added lines, -9 removed lines

@@ -54,11 +54,11 @@ 
         $defaults['date'] = time();
 
         $controller = midcom_helper_datamanager2_controller::create('create');
-        $controller->schemadb =& $this->_schemadb;
+        $controller->schemadb = & $this->_schemadb;
         $controller->schemaname = $this->_schema;
         $controller->defaults = $defaults;
-        $controller->callback_object =& $this;
-        if (! $controller->initialize())
+        $controller->callback_object = & $this;
+        if (!$controller->initialize())
         {
             throw new midcom_error("Failed to initialize a DM2 create controller.");
         }
@@ -68,7 +68,7 @@ 
     /**
      * DM2 creation callback
      */
-    public function & dm2_create_callback (&$controller)
+    public function & dm2_create_callback(&$controller)
     {
         $this->_hour_report = new org_openpsa_projects_hour_report_dba();
 
@@ -80,7 +80,7 @@ 
         {
             $this->_hour_report->task = $this->_request_data['task'];
         }
-        if (! $this->_hour_report->create())
+        if (!$this->_hour_report->create())
         {
             debug_print_r('We operated on this object:', $this->_hour_report);
             throw new midcom_error("Failed to create a new hour_report under hour_report group #{$this->_request_data['task']}. Error: " . midcom_connection::get_error_string());
@@ -138,9 +138,9 @@ 
 
         $this->_load_schemadb();
         $data['controller'] = midcom_helper_datamanager2_controller::create('simple');
-        $data['controller']->schemadb =& $this->_schemadb;
+        $data['controller']->schemadb = & $this->_schemadb;
         $data['controller']->set_storage($this->_hour_report);
-        if (! $data['controller']->initialize())
+        if (!$data['controller']->initialize())
         {
             throw new midcom_error("Failed to initialize a DM2 controller instance for hour_report {$this->_hour_report->id}.");
         }
@@ -150,8 +150,7 @@ 
         $workflow = $this->get_workflow('datamanager2', array('controller' => $data['controller']));
         if ($this->_hour_report->can_do('midgard:delete'))
         {
-            $delete = $this->get_workflow('delete', array
-            (
+            $delete = $this->get_workflow('delete', array(
                 'object' => $this->_hour_report,
                 'label' => $this->_l10n->get('hour report')
             ));

Braces +5 added lines, -10 removed lines

@@ -75,8 +75,7 @@ 
         if ($task = $controller->formmanager->get_value('task'))
         {
             $this->_hour_report->task = $task;
-        }
-        else if ($this->_request_data['task'])
+        } else if ($this->_request_data['task'])
         {
             $this->_hour_report->task = $this->_request_data['task'];
         }
@@ -111,8 +110,7 @@ 
             $task = new org_openpsa_projects_task_dba($args[1]);
             $task->require_do('midgard:create');
             $data['task'] = $task->id;
-        }
-        else
+        } else
         {
             midcom::get()->auth->require_valid_user();
             $data['task'] = 0;
@@ -176,8 +174,7 @@ 
         {
             $task = org_openpsa_projects_task_dba::get_cached($hour_report->task);
             $options['success_url'] = 'hours/task/' . $task->guid . '/';
-        }
-        catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             $e->log();
         }
@@ -198,8 +195,7 @@ 
         if (isset($_POST['relocate_url']))
         {
             $relocate = $_POST['relocate_url'];
-        }
-        else
+        } else
         {
             debug_print_r('no relocate url was passed ', $_POST);
         }
@@ -235,8 +231,7 @@ 
                 }
                 $hour_report->update();
             }
-        }
-        else
+        } else
         {
             debug_print_r('No reports passed to action handler', $_POST);
         }

lib/org/openpsa/expenses/handler/index.php

Spacing +8 added lines, -13 removed lines

@@ -23,7 +23,7 @@ 
      * @param array &$data The local request data.
      * @return boolean True if the request can be handled, false otherwise.
      */
-    public function _can_handle_index ($handler_id, array $args, array &$data)
+    public function _can_handle_index($handler_id, array $args, array &$data)
     {
         if (isset($args[0]))
         {
@@ -65,7 +65,7 @@ 
      * @param array $args the arguments given to the handler
      * @param array &$data The local request data.
      */
-    public function _handler_index ($handler_id, array $args, array &$data)
+    public function _handler_index($handler_id, array $args, array &$data)
     {
         midcom::get()->auth->require_valid_user();
 
@@ -92,22 +92,18 @@ 
     {
         $week_start = strftime('%Y-%m-%d', $this->_request_data['week_start']);
         $week_end = strftime('%Y-%m-%d', $this->_request_data['week_end']);
-        $buttons = array
-        (
-            array
-            (
+        $buttons = array(
+            array(
                 MIDCOM_TOOLBAR_URL => 'hours/?date[from]=' . $week_start . '&date[to]=' . $week_end,
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('list view'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/view.png',
             ),
-            array
-            (
+            array(
                 MIDCOM_TOOLBAR_URL => $previous_week . "/",
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('previous week'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/back.png',
             ),
-            array
-            (
+            array(
                 MIDCOM_TOOLBAR_URL => $next_week . "/",
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('next week'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/next.png',
@@ -139,7 +135,7 @@ 
             }
 
             $date_identifier = date('Y-m-d', $row['date']);
-            $row_identifier = $task->id . '-' .  $row['person'];
+            $row_identifier = $task->id . '-' . $row['person'];
 
             if (!isset($reports[$row_identifier]))
             {
@@ -155,8 +151,7 @@ 
                     $person_name = '';
                 }
 
-                $reports[$row_identifier] = array
-                (
+                $reports[$row_identifier] = array(
                     'task' => $this->_get_list_link($task->get_label(), null, $task->guid),
                     'index_task' => $task->get_label(),
                     'person' => $person_label,

Braces +6 added lines, -12 removed lines

@@ -28,16 +28,14 @@ 
         if (isset($args[0]))
         {
             $requested_time = $args[0];
-        }
-        else
+        } else
         {
             $requested_time = date('Y-m-d');
         }
         try
         {
             $date = new DateTime($requested_time);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             return false;
         }
@@ -131,8 +129,7 @@ 
             try
             {
                 $task = org_openpsa_projects_task_dba::get_cached($row['task']);
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 // Task couldn't be loaded, probably because of ACL
                 continue;
@@ -148,8 +145,7 @@ 
                     $person_object = org_openpsa_contacts_person_dba::get_cached($row['person']);
                     $person_label = $this->_get_list_link($person_object->name, null, null, $row['person']);
                     $person_name = $person_object->name;
-                }
-                catch (midcom_error $e)
+                } catch (midcom_error $e)
                 {
                     $person_label = $this->_l10n->get('no person');
                     $person_name = '';
@@ -168,8 +164,7 @@ 
                 $reports[$row_identifier]['index_' . $date_identifier] = $row['hours'];
                 $number = $formatter->number($reports[$row_identifier]['index_' . $date_identifier]);
                 $reports[$row_identifier][$date_identifier] = '<a href="' . $prefix . 'hours/edit/' . $guid . '/" ' . $workflow->render_attributes() . '>' . $number . '</a>';
-            }
-            else
+            } else
             {
                 $reports[$row_identifier]['index_' . $date_identifier] += $row['hours'];
                 $reports[$row_identifier][$date_identifier] = $this->_get_list_link($formatter->number($reports[$row_identifier]['index_' . $date_identifier]), $date_identifier, $task->guid, $row['person']);
@@ -192,8 +187,7 @@ 
         if ($date !== null)
         {
             $filters['date'] = array('from' => $date, 'to' => $date);
-        }
-        else
+        } else
         {
             $start = strftime('%Y-%m-%d', $this->_request_data['week_start']);
             $end = strftime('%Y-%m-%d', $this->_request_data['week_end']);

lib/org/openpsa/directmarketing/viewer.php

Spacing +3 added lines, -5 removed lines

@@ -20,12 +20,11 @@ 
      */
     private function _populate_node_toolbar()
     {
-        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',
@@ -48,8 +47,7 @@ 
      */
     public function load_schemas()
     {
-        $schemadbs = array
-        (
+        $schemadbs = array(
             'person' => midcom_helper_datamanager2_schema::load_database($this->_config->get('schemadb_person')),
             'campaign_member' => midcom_helper_datamanager2_schema::load_database($this->_config->get('schemadb_campaign_member')),
             'organization' => midcom_helper_datamanager2_schema::load_database($this->_config->get('schemadb_organization')),

lib/org/openpsa/directmarketing/sender.php

Spacing +5 added lines, -7 removed lines

@@ -203,8 +203,7 @@ 
     public function register_send_job($batch, $url_base, $time = null)
     {
         $time = $time ?: time() + 60;
-        $args = array
-        (
+        $args = array(
             'batch' => $batch,
             'url_base' => $url_base,
         );
@@ -248,8 +247,7 @@ 
             $status = org_openpsa_directmarketing_campaign_messagereceipt_dba::FAILURE;
             if (!$this->test_mode)
             {
-                $params[] = array
-                (
+                $params[] = array(
                     'domain' => 'org.openpsa.directmarketing',
                     'name' => 'send_error_message',
                     'value' => $e->getMessage(),
@@ -290,7 +288,7 @@ 
             $token .= $tokenchars[mt_rand(0, strlen($tokenchars) - 1)];
         }
         //If token is not free or (very, very unlikely) matches our dummy token, recurse.
-        if (   $token === 'dummy'
+        if ($token === 'dummy'
             || !org_openpsa_directmarketing_campaign_messagereceipt_dba::token_is_free($token))
         {
             return $this->_create_token();
@@ -318,7 +316,7 @@ 
             return false;
         }
         $type = $this->_backend->get_type();
-        if (   $person->get_parameter('org.openpsa.directmarketing', "send_all_denied")
+        if ($person->get_parameter('org.openpsa.directmarketing', "send_all_denied")
             || $person->get_parameter('org.openpsa.directmarketing', "send_{$type}_denied"))
         {
             debug_add("Sending {$type} messages to person {$person->rname} is denied, unsubscribing member (member #{$member->id})");
@@ -368,7 +366,7 @@ 
         debug_add("Recursion level is {$level}, limit is {$this->_chunk_max_recurse}");
         /* Make sure we still have results left, if not just recurse...
          (basically this is to avoid returning an empty array when everything is otherwise ok) */
-        if (   count($results) == 0
+        if (count($results) == 0
             && ($level < $this->_chunk_max_recurse))
         {
             debug_add('All our results got filtered, recursing for another round');

Braces +4 added lines, -8 removed lines

@@ -170,8 +170,7 @@ 
         if ($results === false)
         {
             $status = true; //All should be ok
-        }
-        else if ($status = $this->process_results($results, $subject, $content, $from))
+        } else if ($status = $this->process_results($results, $subject, $content, $from))
         {
             //register next batch
             return $this->register_send_job($batch + 1, $url_base);
@@ -242,8 +241,7 @@ 
             $this->_backend->send($person, $member, $token, $subject, $content, $from);
             self::$_messages_sent++;
             $status = org_openpsa_directmarketing_campaign_messagereceipt_dba::SENT;
-        }
-        catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             $status = org_openpsa_directmarketing_campaign_messagereceipt_dba::FAILURE;
             if (!$this->test_mode)
@@ -309,8 +307,7 @@ 
         try
         {
             $person = org_openpsa_contacts_person_dba::get_cached($member->person);
-        }
-        catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             debug_add("Person #{$member->person} deleted or missing, removing member (member #{$member->id})");
             $member->orgOpenpsaObtype = org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED;
@@ -474,8 +471,7 @@ 
         {
             debug_add('TEST mode, adding constraints');
             $qb->add_constraint('orgOpenpsaObtype', '=', org_openpsa_directmarketing_campaign_member_dba::TESTER);
-        }
-        else
+        } else
         {
             debug_add('REAL mode, adding constraints');
             //Fail safe way, exclude those we know we do not want, in case some wanted members have incorrect type...

lib/org/openpsa/directmarketing/campaign/message.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
     public function _on_loaded()
     {
         $this->title = trim($this->title);
-        if (   $this->id
+        if ($this->id
             && empty($this->title))
         {
             $this->title = 'untitled';

Braces +1 added lines, -2 removed lines

@@ -63,8 +63,7 @@
         if ($this->sendCompleted)
         {
             $class .= ' ' . $class . '-completed';
-        }
-        else if ($this->sendStarted)
+        } else if ($this->sendStarted)
         {
             $class .= ' ' . $class . '-started';
         }