[TikiWiki-commits] [Git][tikiwiki/tiki][24.x] [FIX] tiki-login.php: Restore PEAR XML_RPC handling for InterTiki login

Victor Emanouilov pushed to branch 24.x at Tiki Wiki CMS Groupware / Tiki


Commits:
32267d73 by Sammy Ndabo at 2026-05-28T05:32:15+00:00
[FIX] tiki-login.php: Restore PEAR XML_RPC handling for InterTiki login
---
* [FIX] tiki-login.php: Restore PEAR XML_RPC handling for InterTiki login

See merge request tikiwiki/tiki!10380

- - - - -


1 changed file:

- tiki-login.php


Changes:

=====================================
tiki-login.php
=====================================
@@ -175,7 +175,7 @@ if (
                 // this is slave intertiki site
                 $response_value = $rpcauth->value();
                 $avatarData = '';
-                if ($rpcauth->valueType() == 'xmlrpcvals') {
+                if (method_exists($rpcauth, 'valueType') && $rpcauth->valueType() == 'xmlrpcvals') {
                     if ($response_value->kindOf() == 'struct') {
                         foreach ($response_value as $key => $value) {
                             if ($key == '') {
@@ -189,6 +189,19 @@ if (
                     } else {
                         $user_details = json_decode($response_value->scalarval(), true);
                     }
+                } elseif ($response_value->kindOf() == 'struct') {
+                    for (;;) {
+                        list($key, $value) = $response_value->structeach();
+                        if ($key == '') {
+                            break;
+                        } elseif ($key == 'user_details') {
+                            $user_details = json_decode($value->scalarval(), true);
+                        } elseif ($key == 'avatarData') {
+                            $avatarData = $value->scalarval();
+                        }
+                    }
+                } else {
+                    $user_details = json_decode($response_value->scalarval(), true);
                 }
                 $requestedUser = $user_details['info']['login']; // use the correct capitalization
                 if (! $userlib->user_exists($requestedUser)) {



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/32267d7350c543d051e243294d85f0085c3c7804

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/32267d7350c543d051e243294d85f0085c3c7804
You're receiving this email because of your account on gitlab.com. Manage all notifications: https://gitlab.com/-/profile/notifications | Help: https://gitlab.com/help

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs