flack / openpsa

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) {
+            }
+            catch (midcom_error) {
                 $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/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/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)) {

lib/midcom/services/cache/module/content.php

Spacing +5 added lines, -5 removed lines

@@ -163,8 +163,8 @@ 
         $this->_uncached = $config->get('cache_module_content_uncached');
         $this->_headers_strategy = $this->get_strategy('cache_module_content_headers_strategy');
         $this->_headers_strategy_authenticated = $this->get_strategy('cache_module_content_headers_strategy_authenticated');
-        $this->_default_lifetime = (int)$config->get('cache_module_content_default_lifetime');
-        $this->_default_lifetime_authenticated = (int)$config->get('cache_module_content_default_lifetime_authenticated');
+        $this->_default_lifetime = (int) $config->get('cache_module_content_default_lifetime');
+        $this->_default_lifetime_authenticated = (int) $config->get('cache_module_content_default_lifetime_authenticated');
 
         if ($this->_headers_strategy == 'no-cache') {
             // we can't call no_cache() here, because it would try to call back to this class via the global getter
@@ -531,7 +531,7 @@ 
      */
     public function write_meta_cache(string $content_id, Request $request, Response $response)
     {
-        if (   $this->_uncached
+        if ($this->_uncached
             || $this->_no_cache) {
             return;
         }
@@ -593,7 +593,7 @@ 
 
     public function store_dl_content(int $context, string $dl_cache_data, Request $request)
     {
-        if (   $this->_no_cache
+        if ($this->_no_cache
             || $this->_uncached) {
             return;
         }
@@ -627,7 +627,7 @@ 
 
         /* TODO: Doublecheck the way this is handled, now we just don't send it
          * if headers_strategy implies caching */
-        if (   !$response->headers->has('Content-Length')
+        if (!$response->headers->has('Content-Length')
             && !in_array($this->_headers_strategy, ['public', 'private'])) {
             $response->headers->set("Content-Length", strlen($response->getContent()));
         }

lib/midcom/core/collector.php

Spacing +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
             if ($counter <= $this->_offset) {
                 continue;
             }
-            if (   $this->_limit
+            if ($this->_limit
                 && $counter > ($this->_offset + $this->_limit)) {
                 break;
             }

lib/midcom/helper/reflector/tree.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
     private static function _check_permissions(bool $deleted) : bool
     {
         // PONDER: Check for some generic user privilege instead  ??
-        if (   $deleted
+        if ($deleted
             && !midcom::get()->auth->admin
             && !midcom::get()->auth->is_component_sudo()) {
             debug_add('Non-admins are not allowed to list deleted objects', MIDCOM_LOG_ERROR);

lib/org/openpsa/relatedto/finder.php

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
             }
         }
 
-        if (   empty($link->toComponent)
+        if (empty($link->toComponent)
             && !empty($link->fromComponent)) {
             debug_add("Setting property 'toComponent' to '{$component}'");
             $link->toComponent = $component;
@@ -61,7 +61,7 @@ 
             $link->fromComponent = $component;
         }
 
-        if (   empty($link->toGuid)
+        if (empty($link->toGuid)
             && !empty($link->fromGuid)) {
             $link->toClass = get_class($obj);
             $link->toGuid = $obj->guid;