flack / openpsa

lib/net/nemein/tag/link.php

Spacing +1 added lines, -1 removed lines

@@ -133,7 +133,7 @@
             }
         }
 
-        if (   is_null($position['longitude'])
+        if (is_null($position['longitude'])
             || is_null($position['latitude'])) {
             // Not enough information for positioning, we need both lon and lat
             return false;

lib/org/openpsa/calendar/event/member.php

Spacing +7 added lines, -7 removed lines

@@ -66,7 +66,7 @@ 
             $event = new org_openpsa_calendar_event_dba($this->eid);
         }
 
-        if (    $recipient->id == midcom_connection::get_user()
+        if ($recipient->id == midcom_connection::get_user()
              && !$event->send_notify_me) {
             //Do not send notification to current user
             debug_add('event->send_notify_me is false and recipient is current user, aborting notify');
@@ -111,7 +111,7 @@ 
                 return false;
         }
 
-        if (   $type == 'cancel'
+        if ($type == 'cancel'
             || $type == 'remove') {
             // TODO: Create iCal export with correct delete commands
         } else {
@@ -185,7 +185,7 @@ 
         while ($stamp <= $end) {
             $ymd = date('Ymd', $stamp);
             debug_add("making sure date {$ymd} has at least one event");
-            $stamp = mktime(0, 0, 1, date('m', $stamp), date('d', $stamp)+1, date('Y', $stamp));
+            $stamp = mktime(0, 0, 1, date('m', $stamp), date('d', $stamp) + 1, date('Y', $stamp));
             if (array_key_exists($ymd, $events_by_date)) {
                 continue;
             }
@@ -202,12 +202,12 @@ 
             $workday_starts = 8;
             $workday_ends = 16;
 
-            $workday_starts_ts = mktime($workday_starts, 0, 0, (int)$ymd_matches[2], (int)$ymd_matches[3], (int)$ymd_matches[1]);
-            $workday_ends_ts = mktime($workday_ends, 0, 0, (int)$ymd_matches[2], (int)$ymd_matches[3], (int)$ymd_matches[1]);
+            $workday_starts_ts = mktime($workday_starts, 0, 0, (int) $ymd_matches[2], (int) $ymd_matches[3], (int) $ymd_matches[1]);
+            $workday_ends_ts = mktime($workday_ends, 0, 0, (int) $ymd_matches[2], (int) $ymd_matches[3], (int) $ymd_matches[1]);
             $last_end_time = false;
             $last_event = false;
             foreach ($events as $event) {
-                if (   $event->end <= $workday_starts_ts
+                if ($event->end <= $workday_starts_ts
                     || $event->start >= $workday_ends_ts) {
                     // We need not to consider this event, it is outside the defined workday
                     continue;
@@ -238,7 +238,7 @@ 
             if ($last_end_time === false) {
                 $last_end_time = $workday_starts_ts;
             }
-            if (   $last_end_time < $workday_ends_ts
+            if ($last_end_time < $workday_ends_ts
                 && (($workday_ends_ts - $last_end_time) >= $amount)) {
                 $slots[] = self::_create_slot($last_end_time, $workday_ends_ts, $last_event);
             }

Braces +4 added lines, -2 removed lines

@@ -150,7 +150,8 @@ 
                 debug_add('person #' . $person->id . 'has no email address, aborting');
                 return false;
             }
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return false;
         }
 
@@ -178,7 +179,8 @@ 
         foreach ($eventmembers as $eid) {
             try {
                 $event = org_openpsa_calendar_event_dba::get_cached($eid);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 continue;
             }
             $ymd = date('Ymd', $event->start);

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();
         }