flack / openpsa

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

Spacing +2 added lines, -2 removed lines

@@ -113,7 +113,7 @@ 
 
     protected function match(string $property, array $data1, array $data2) : bool
     {
-        if (   !empty($data1[$property])
+        if (!empty($data1[$property])
             && $data1[$property] == $data2[$property]) {
             return true;
         }
@@ -195,7 +195,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;

Braces +2 added lines, -1 removed lines

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

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

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,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 (   str_contains($email1, $person1['lastname'])
+            if (str_contains($email1, $person1['lastname'])
                 && $email1 == $email2) {
                 $p += 0.5;
             }

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

Spacing +8 added lines, -8 removed lines

@@ -59,7 +59,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');
@@ -87,7 +87,7 @@ 
                 continue;
             }
             // Make sure we actually have enough rights to do this
-            if (   !$object1->can_do('midgard:update')
+            if (!$object1->can_do('midgard:update')
                 || !$object1->can_do('midgard:delete')
                 || !$object2->can_do('midgard:update')
                 || !$object2->can_do('midgard:delete')) {
@@ -96,7 +96,7 @@ 
                 continue;
             }
             // Extra sanity check (in case of semi-successful not-duplicate mark)
-            if (   $object1->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $object2->guid)
+            if ($object1->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $object2->guid)
                 || $object2->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $object1->guid)) {
                 debug_add("It seems these two (#{$object1->id} and #{$object2->id}) have also marked as not duplicates, some cleanup might be a good thing", MIDCOM_LOG_WARN);
                 $i++;
@@ -128,7 +128,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);
@@ -146,11 +146,11 @@ 
                 }
             } else {
                 if ($keep == $option1->guid) {
-                    $object1 =& $option1;
-                    $object2 =& $option2;
+                    $object1 = & $option1;
+                    $object2 = & $option2;
                 } elseif ($keep == $option2->guid) {
-                    $object1 =& $option2;
-                    $object2 =& $option1;
+                    $object1 = & $option2;
+                    $object2 = & $option1;
                 } else {
                     throw new midcom_error('Something weird happened (basically we got bogus data)');
                 }

Braces +4 added lines, -2 removed lines

@@ -82,7 +82,8 @@ 
             try {
                 $object1 = $this->load($param->parentguid);
                 $object2 = $this->load($param->name);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $i++;
                 continue;
             }
@@ -160,7 +161,8 @@ 
                 try {
                     $merger = new org_openpsa_contacts_duplicates_merge($this->mode, $this->_config);
                     $merger->merge_delete($object1, $object2);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     // TODO: Localize
                     midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.contacts'), 'Merge failed, errstr: ' . $e->getMessage(), 'error');
                 }

src/midcom/console/command/cleanup/parameters.php

Braces +2 added lines, -1 removed lines

@@ -49,7 +49,8 @@
                 try {
                     \midgard_object_class::get_object_by_guid($param->parentguid);
                     $seen[$param->parentguid] = true;
-                } catch (\Exception $e) {
+                }
+                catch (\Exception $e) {
                     $seen[$param->parentguid] = false;
                 }
             }

src/midcom/datamanager/schemadb.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 
             if ($path === '') {
                 // Infinite loop, set an UI message and stop executing
-                if (   !isset($schema['extends']['name'])
+                if (!isset($schema['extends']['name'])
                     || $schema['extends']['name'] === $schema_name) {
                     throw new midcom_error('schema ' . $schema_name . ' extends itself');
                 }

lib/net/nehmer/blog/handler/feed.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 
         if ($handler_id == 'feed-category-rss2') {
             // This is not a predefined category from configuration, check if site maintainer allows us to show it
-            if (   !in_array($args[0], $data['categories'])
+            if (!in_array($args[0], $data['categories'])
                 && !$this->_config->get('categories_custom_enable')) {
                 throw new midcom_error('Custom category support is disabled');
             }

lib/org/openpsa/directmarketing/link/log.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 
     public function _on_creating() : bool
     {
-        if (   !$this->referrer
+        if (!$this->referrer
             && !empty($_SERVER['HTTP_REFERER'])) {
             $this->referrer = $_SERVER['HTTP_REFERER'];
         }

lib/net/nemein/tag/tag.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
 
     public function _on_creating() : bool
     {
-        return (   $this->validate_tag($this->tag)
+        return ($this->validate_tag($this->tag)
                 && $this->_check_duplicates() == 0);
     }
 
@@ -69,7 +69,7 @@ 
 
     public function _on_updating() : bool
     {
-        return (   $this->validate_tag($this->tag)
+        return ($this->validate_tag($this->tag)
                 && $this->_check_duplicates() == 0);
     }
 

src/midcom/datamanager/storage/image.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
             $this->save_attachment_list();
         }
 
-        if (   array_intersect_key(array_flip(['description', 'title', 'score']), $this->value)
+        if (array_intersect_key(array_flip(['description', 'title', 'score']), $this->value)
             && $main = $this->get_main()) {
             $needs_update = false;
             if (array_key_exists('description', $this->value)) {