flack / openpsa

lib/org/openpsa/contacts/duplicates/check.php

Spacing +6 added lines, -6 removed lines

@@ -128,7 +128,7 @@ 
             // if user's lastname is part of the email address, check to see if the difference is only in the domain part
             $email1 = preg_replace('/@.+/', '', $person1['email']);
             $email2 = preg_replace('/@.+/', '', $person2['email']);
-            if (   strpos($email1, $person1['lastname']) !== false
+            if (strpos($email1, $person1['lastname']) !== false
                 && $email1 == $email2) {
                 $ret['email_match'] = true;
                 $ret['p'] += 0.5;
@@ -174,7 +174,7 @@ 
 
     private function match($property, array $data1, array $data2)
     {
-        if (   !empty($data1[$property])
+        if (!empty($data1[$property])
             && $data1[$property] == $data2[$property]) {
             return true;
         }
@@ -325,7 +325,7 @@ 
         $persons = $this->get_person_candidates();
 
         $params = array();
-        $params['objects'] =& $persons;
+        $params['objects'] = & $persons;
         $params['mode'] = 'person';
 
         array_walk($persons, array($this, 'check_all_arraywalk'), $params);
@@ -387,7 +387,7 @@ 
                 continue;
             }
 
-            if (   $obj1->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $obj2->guid)
+            if ($obj1->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $obj2->guid)
                 || $obj2->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $obj1->guid)) {
                 // Not-duplicate parameter found, returning zero probability
                 continue;
@@ -415,7 +415,7 @@ 
 
         $groups = $this->get_group_candidates();
         $params = array();
-        $params['objects'] =& $groups;
+        $params['objects'] = & $groups;
         $params['mode'] = 'group';
         array_walk($groups, array($this, 'check_all_arraywalk'), $params);
 
@@ -479,7 +479,7 @@ 
     {
         debug_add($message);
         if ($output) {
-            echo $indent . 'INFO: ' . $message  . "<br/>\n";
+            echo $indent . 'INFO: ' . $message . "<br/>\n";
             flush();
         }
     }

Braces +2 added lines, -1 removed lines

@@ -382,7 +382,8 @@
             try {
                 $obj1 = $class::get_cached($arr1['guid']);
                 $obj2 = $class::get_cached($arr2['guid']);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
                 continue;
             }

lib/org/openpsa/directmarketing/handler/message/report.php

Spacing +15 added lines, -15 removed lines

@@ -54,7 +54,7 @@ 
         $qb_receipts->add_constraint('message', '=', $this->_message->id);
         $qb_receipts->add_constraint('orgOpenpsaObtype', '=', org_openpsa_directmarketing_campaign_messagereceipt_dba::SENT);
         $receipts = $qb_receipts->execute_unchecked();
-        $receipt_data =& $this->_request_data['report']['receipt_data'];
+        $receipt_data = & $this->_request_data['report']['receipt_data'];
         $receipt_data['first_send'] = time();
         $receipt_data['last_send'] = 0;
         $receipt_data['sent'] = count($receipts);
@@ -87,7 +87,7 @@ 
 
     private function _get_campaign_data($first_send)
     {
-        $campaign_data =& $this->_request_data['report']['campaign_data'];
+        $campaign_data = & $this->_request_data['report']['campaign_data'];
         $qb_unsub = org_openpsa_directmarketing_campaign_member_dba::new_query_builder();
         $qb_unsub->add_constraint('campaign', '=', $this->_message->campaign);
         $qb_unsub->add_constraint('orgOpenpsaObtype', '=', org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED);
@@ -95,8 +95,8 @@ 
         $campaign_data['next_message'] = false;
         // Find "next message" and if present use its sendStarted as constraint for this query
         $qb_messages = org_openpsa_directmarketing_campaign_message_dba::new_query_builder();
-        $qb_messages->add_constraint('campaign', '=',  $this->_message->campaign);
-        $qb_messages->add_constraint('id', '<>',  $this->_message->id);
+        $qb_messages->add_constraint('campaign', '=', $this->_message->campaign);
+        $qb_messages->add_constraint('id', '<>', $this->_message->id);
         $qb_messages->add_constraint('sendStarted', '>', $first_send);
         $qb_messages->add_order('sendStarted', 'DESC');
         $qb_messages->set_limit(1);
@@ -111,7 +111,7 @@ 
     private function _get_link_data($segmentation_param)
     {
         $this->_request_data['report']['link_data'] = array();
-        $link_data =& $this->_request_data['report']['link_data'];
+        $link_data = & $this->_request_data['report']['link_data'];
 
         $link_data['counts'] = array();
         $link_data['percentages'] = array('of_links' => array(), 'of_recipients' => array());
@@ -137,7 +137,7 @@ 
         foreach ($links as $link) {
             $segment = '';
             $segment_notfound = false;
-            if (   $segmentation_param
+            if ($segmentation_param
                 && !empty($link->person)) {
                 try {
                     $person = org_openpsa_contacts_person_dba::get_cached($link->person);
@@ -151,7 +151,7 @@ 
                 if (!isset($link_data['segments'][$segment])) {
                     $link_data['segments'][$segment] = $segment_prototype;
                 }
-                $segment_data =& $link_data['segments'][$segment];
+                $segment_data = & $link_data['segments'][$segment];
             } else {
                 $segment_data = $segment_prototype;
             }
@@ -261,15 +261,15 @@ 
         $this->_initialize_field($array['percentages']['of_links'], $link);
         $this->_initialize_field($array['percentages']['of_recipients'], $link);
 
-        $link_data =& $this->_request_data['report']['link_data'];
-        $array['percentages']['of_links'][$link->target]['total'] = ($array['counts'][$link->target]['total']/$link_data['total'])*100;
-        $array['percentages']['of_links'][$link->target][$link->token] = ($array['counts'][$link->target][$link->token]/$link_data['total'])*100;
+        $link_data = & $this->_request_data['report']['link_data'];
+        $array['percentages']['of_links'][$link->target]['total'] = ($array['counts'][$link->target]['total'] / $link_data['total']) * 100;
+        $array['percentages']['of_links'][$link->target][$link->token] = ($array['counts'][$link->target][$link->token] / $link_data['total']) * 100;
 
-        $receipt_data =& $this->_request_data['report']['receipt_data'];
-        $array['percentages']['of_recipients'][$link->target]['total'] = ((count($array['counts'][$link->target])-1)/($receipt_data['sent']-$receipt_data['bounced']))*100;
-        $array['percentages']['of_recipients'][$link->target][$link->token] = ($array['counts'][$link->target][$link->token]/($receipt_data['sent']-$receipt_data['bounced']))*100;
+        $receipt_data = & $this->_request_data['report']['receipt_data'];
+        $array['percentages']['of_recipients'][$link->target]['total'] = ((count($array['counts'][$link->target]) - 1) / ($receipt_data['sent'] - $receipt_data['bounced'])) * 100;
+        $array['percentages']['of_recipients'][$link->target][$link->token] = ($array['counts'][$link->target][$link->token] / ($receipt_data['sent'] - $receipt_data['bounced'])) * 100;
 
-        if (   !isset($array['percentages']['of_recipients']['total'])
+        if (!isset($array['percentages']['of_recipients']['total'])
             || $array['percentages']['of_recipients'][$link->target]['total'] > $array['percentages']['of_recipients']['total']) {
             $array['percentages']['of_recipients']['total'] = $array['percentages']['of_recipients'][$link->target]['total'];
         }
@@ -335,7 +335,7 @@ 
         $this->_campaign = $this->_master->load_campaign($this->_message->campaign);
         $data['campaign'] = $this->_campaign;
 
-        if (   isset($_POST['oo_dirmar_userule'])
+        if (isset($_POST['oo_dirmar_userule'])
             && !empty($_POST['oo_dirmar_rule_' . $_POST['oo_dirmar_userule']])) {
             return $this->_create_campaign_from_link($_POST['oo_dirmar_userule']);
         }

Braces +2 added lines, -1 removed lines

@@ -142,7 +142,8 @@
                 try {
                     $person = org_openpsa_contacts_person_dba::get_cached($link->person);
                     $segment = $person->get_parameter('org.openpsa.directmarketing.segments', $segmentation_param);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                 }
                 if (empty($segment)) {
                     $segment = $this->_l10n->get('no segment');

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

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 
     public function resolve_object_link(midcom_db_topic $topic, midcom_core_dbaobject $object)
     {
-        if (   $object instanceof org_openpsa_documents_document_dba
+        if ($object instanceof org_openpsa_documents_document_dba
             && $object->topic == $topic->id) {
             return "document/{$object->guid}/";
         }

lib/org/openpsa/documents/handler/document/admin.php

Indentation +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
  * @package org.openpsa.documents
  */
 class org_openpsa_documents_handler_document_admin extends midcom_baseclasses_components_handler
- implements midcom_helper_datamanager2_interfaces_create
+    implements midcom_helper_datamanager2_interfaces_create
 {
     /**
      * The document we're working with (if any).

Spacing +5 added lines, -5 removed lines

@@ -114,7 +114,7 @@ 
 
         $this->_controller = $this->get_controller('simple', $this->_document);
 
-        if (   $data['enable_versioning']
+        if ($data['enable_versioning']
             && !empty($_POST)) {
             $this->_backup_attachment();
         }
@@ -144,7 +144,7 @@ 
             $prefix = $node[MIDCOM_NAV_ABSOLUTEURL];
         }
 
-        return $prefix  . "document/" . $this->_document->guid . "/";
+        return $prefix . "document/" . $this->_document->guid . "/";
     }
 
     /**
@@ -157,8 +157,8 @@ 
         // First, look at post data (from in-form replace/delete buttons)
         if (!empty($_POST['document'])) {
             foreach (array_keys($_POST['document']) as $key) {
-                if (    strpos($key, '_delete')
-                    || (    strpos($key, '_upload')
+                if (strpos($key, '_delete')
+                    || (strpos($key, '_upload')
                         && !strpos($key, 'new_upload'))) {
                     $this->_document->backup_version();
                     return;
@@ -169,7 +169,7 @@ 
         // If nothing is found, try looking in quickform (regular form submission)
         $group = $this->_controller->formmanager->form->getElement('document');
         foreach ($group->getElements() as $element) {
-            if (   preg_match('/e_exist_.+?_file$/', $element->getName())
+            if (preg_match('/e_exist_.+?_file$/', $element->getName())
                 && $element->isUploadedFile()) {
                 $this->_document->backup_version();
                 return;

lib/org/openpsa/expenses/viewer.php

Spacing +3 added lines, -3 removed lines

@@ -39,10 +39,10 @@ 
      */
     public function _on_handle($handler, array $args)
     {
-        if (   strpos($handler, 'index') !== false
+        if (strpos($handler, 'index') !== false
             || strpos($handler, 'list') !== false) {
             $task = false;
-            if (   $handler == 'list_hours_task'
+            if ($handler == 'list_hours_task'
                 || $handler == 'list_hours_task_all') {
                 $task = $args[0];
             }
@@ -64,7 +64,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');
             $date_filter->set_label($this->_l10n->get("timeframe"));

lib/org/openpsa/products/product.php

Spacing +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
             $qb->add_constraint('id', '<>', $this->id);
         }
         // Make sure the product is in the same product group
-        $qb->add_constraint('productGroup', '=', (int)$this->productGroup);
+        $qb->add_constraint('productGroup', '=', (int) $this->productGroup);
 
         return ($qb->count() == 0);
     }

lib/org/openpsa/projects/workflow.php

Spacing +2 added lines, -2 removed lines

@@ -170,7 +170,7 @@ 
     {
         debug_add("task->start() called with user #" . midcom_connection::get_user());
         //PONDER: Check actual status objects for more accurate logic ?
-        if (   $task->status >= org_openpsa_projects_task_status_dba::STARTED
+        if ($task->status >= org_openpsa_projects_task_status_dba::STARTED
             && $task->status <= org_openpsa_projects_task_status_dba::APPROVED) {
             //We already have started status
             debug_add('Task has already been started');
@@ -382,7 +382,7 @@ 
 
     private static function is_manager($task)
     {
-        return (   $task->manager == 0
+        return ($task->manager == 0
                 || midcom_connection::get_user() == $task->manager);
     }
 }

Braces +2 added lines, -1 removed lines

@@ -356,7 +356,8 @@
                 // The agreement allows invoicing only approved hours, therefore don't mark unapproved
                 $qb->add_constraint('metadata.isapproved', '=', true);
             }
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
         }
 

lib/org/openpsa/projects/task.php

Spacing +2 added lines, -2 removed lines

@@ -93,7 +93,7 @@ 
     public function _on_updated()
     {
         // Sync the object's ACL properties into MidCOM ACL system
-        if (   !$this->_skip_acl_refresh) {
+        if (!$this->_skip_acl_refresh) {
             if ($this->orgOpenpsaAccesstype && $this->orgOpenpsaOwnerWg) {
                 debug_add("Synchronizing task ACLs to MidCOM");
                 $sync = new org_openpsa_core_acl_synchronizer();
@@ -326,7 +326,7 @@ 
 
             if ($report_data['invoice']) {
                 $hours['invoiced'] += $report_hours;
-            } elseif (   $report_data['invoiceable']
+            } elseif ($report_data['invoiceable']
                       && ($report_data['isapproved'] || !$invoice_approved_only)) {
                 $hours['invoiceable'] += $report_hours;
             }

Braces +6 added lines, -3 removed lines

@@ -240,7 +240,8 @@ 
                     $salesproject = org_openpsa_sales_salesproject_dba::get_cached($agreement->salesproject);
                     $this->customer = $salesproject->customer;
                 }
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
             }
         } else {
             // No agreement, we can't be invoiceable
@@ -275,7 +276,8 @@ 
         try {
             $agreement = new org_openpsa_sales_salesproject_deliverable_dba($this->agreement);
             $agreement->update_units($this->id, $hours);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
         }
 
         if ($update) {
@@ -302,7 +304,8 @@ 
         try {
             $agreement = new org_openpsa_sales_salesproject_deliverable_dba($this->agreement);
             $invoice_approved_only = $agreement->invoiceApprovedOnly;
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $invoice_approved_only = false;
         }
 

lib/org/openpsa/reports/handler/projects/report.php

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
         $qb_hr = org_openpsa_projects_hour_report_dba::new_query_builder();
         $qb_hr->add_constraint('date', '<=', (int) $this->_request_data['query_data']['end']);
         $qb_hr->add_constraint('date', '>=', (int) $this->_request_data['query_data']['start']);
-        if (   array_key_exists('invoiceable_filter', $this->_request_data['query_data'])
+        if (array_key_exists('invoiceable_filter', $this->_request_data['query_data'])
             && $this->_request_data['query_data']['invoiceable_filter'] != -1) {
             $qb_hr->add_constraint('invoiceable', '=', (bool) $this->_request_data['query_data']['invoiceable_filter']);
         }
@@ -60,7 +60,7 @@ 
             $tasks = $this->_expand_task($this->_request_data['query_data']['task']);
             $qb_hr->add_constraint('task', 'IN', $tasks);
         }
-        if (   array_key_exists('hour_type_filter', $this->_request_data['query_data'])
+        if (array_key_exists('hour_type_filter', $this->_request_data['query_data'])
             && $this->_request_data['query_data']['hour_type_filter'] != 'builtin:all') {
             $qb_hr->add_constraint('reportType', '=', $this->_request_data['query_data']['hour_type_filter']);
         }
@@ -151,7 +151,7 @@ 
 
     private function add_to_group($new_row, $matching, $sort, $title)
     {
-        $rows =& $this->_request_data['report']['rows'];
+        $rows = & $this->_request_data['report']['rows'];
         if (array_key_exists($matching, $rows)) {
             $rows[$matching]['rows'][] = $new_row;
             $rows[$matching]['total_hours'] += $new_row['hour']->hours;

Braces +2 added lines, -1 removed lines

@@ -123,7 +123,8 @@
             $row = array();
             try {
                 $row['person'] = org_openpsa_contacts_person_dba::get_cached($hour->person);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
                 continue;
             }