[Tikiwiki-cvs] tiki commxmlrpc.php,1.22.2.1,1.22.2.2

[<sy...@us...>]

Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1792

Modified Files:
      Tag: BRANCH-1-10
	commxmlrpc.php 
Log Message:
[FIX]intertiki: can also send object with intertiki

Index: commxmlrpc.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/commxmlrpc.php,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -d -r1.22.2.1 -r1.22.2.2
--- commxmlrpc.php	25 Oct 2007 20:00:51 -0000	1.22.2.1
+++ commxmlrpc.php	29 Oct 2007 16:37:20 -0000	1.22.2.2
@@ -38,7 +38,11 @@
 	$pos = $params->getParam(9); $pos = $pos->scalarval();
 	$alias = $params->getParam(10); $alias = $alias->scalarval();
 
-	list($ok, $user, $error) = $userlib->validate_user($user, $pass, '', '');
+	if ($user != 'admin' && $prefs['feature_intertiki'] == 'y' && !empty($prefs['feature_intertiki_mymaster'])) {
+		$ok = $userlib->intervalidate($prefs['interlist'][$prefs['feature_intertiki_mymaster']], $user, $pass, false);
+	} else {
+		list($ok, $user, $error) = $userlib->validate_user($user, $pass, '', '');
+	}
 	if (!$ok) {
 		return new XML_RPC_Response(0, 101, "Invalid username or password");
 	}