flack / openpsa

lib/org/openpsa/contacts/handler/duplicates/person.php

Spacing +8 added lines, -8 removed lines

@@ -41,7 +41,7 @@ 
 
     private function load_next()
     {
-        $i =& $this->_request_data['loop_i'];
+        $i = & $this->_request_data['loop_i'];
         while ($i < 100) {
             debug_add("Loop iteration {$i}");
             $qb = new midgard_query_builder('midgard_parameter');
@@ -69,7 +69,7 @@ 
                 continue;
             }
             // Make sure we actually have enough rights to do this
-            if (   !$person1->can_do('midgard:update')
+            if (!$person1->can_do('midgard:update')
                 || !$person1->can_do('midgard:delete')
                 || !$person2->can_do('midgard:update')
                 || !$person2->can_do('midgard:delete')) {
@@ -78,7 +78,7 @@ 
                 continue;
             }
             // Extra sanity check (in case of semi-successful not-duplicate mark)
-            if (   $person1->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $person2->guid)
+            if ($person1->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $person2->guid)
                 || $person2->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $person1->guid)) {
                 debug_add("It seems these two (#{$person1->id} and #{$person2->id}) have also marked as not duplicates, some cleanup might be a good thing", MIDCOM_LOG_WARN);
                 $i++;
@@ -102,7 +102,7 @@ 
             if ($keep == 'both') {
                 $option1->require_do('midgard:update');
                 $option2->require_do('midgard:update');
-                if (   $option1->set_parameter('org.openpsa.contacts.duplicates:not_duplicate', $option2->guid, time())
+                if ($option1->set_parameter('org.openpsa.contacts.duplicates:not_duplicate', $option2->guid, time())
                     && $option2->set_parameter('org.openpsa.contacts.duplicates:not_duplicate', $option1->guid, time())) {
                     // Clear the possible duplicate parameters
                     $option1->delete_parameter('org.openpsa.contacts.duplicates:possible_duplicate', $option2->guid);
@@ -120,11 +120,11 @@ 
                 }
             } else {
                 if ($keep == $option1->guid) {
-                    $person1 =& $option1;
-                    $person2 =& $option2;
+                    $person1 = & $option1;
+                    $person2 = & $option2;
                 } elseif ($keep == $option2->guid) {
-                    $person1 =& $option2;
-                    $person2 =& $option1;
+                    $person1 = & $option2;
+                    $person2 = & $option1;
                 } else {
                     throw new midcom_error('Something weird happened (basically we got bogus data)');
                 }

lib/org/openpsa/contacts/handler/person/view.php

Braces +2 added lines, -1 removed lines

@@ -192,7 +192,8 @@
         foreach ($this->$identifier as $member) {
             try {
                 $this->_request_data['group'] = org_openpsa_contacts_group_dba::get_cached($member->gid);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
                 continue;
             }

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

Spacing +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
     {
         $nap = new midcom_helper_nav();
         $node = $nap->get_node($nap->get_current_node());
-        $compose_url = $node[MIDCOM_NAV_RELATIVEURL] . 'message/compose/' . $data['message']->guid .'/';
+        $compose_url = $node[MIDCOM_NAV_RELATIVEURL] . 'message/compose/' . $data['message']->guid . '/';
         $this->batch_url_base_full = $node[MIDCOM_NAV_RELATIVEURL] . 'message/send_bg/' . $data['message']->guid . '/';
         debug_add("compose_url: {$compose_url}");
         debug_add("batch_url base: {$this->batch_url_base_full}");