X-Git-Url: http://git.pjr.cc/?p=ga4php.git;a=blobdiff_plain;f=authserver%2Flib%2FauthClient.php;h=677be248f9df2012234ec78052387728a53bbed3;hp=22a08b318ea6b00dfcf231046b9e254f7805cb3a;hb=1065be060c1b237c4fcdfdef6e3e2ee663d1ca33;hpb=b01c2819480261bd5c94de2bf05533c9e82a6ab2

diff --git a/authserver/lib/authClient.php b/authserver/lib/authClient.php
index 22a08b3..677be24 100644
--- a/authserver/lib/authClient.php
+++ b/authserver/lib/authClient.php
@@ -190,17 +190,15 @@ class GAAuthClient {
 		$message["username"] = $username;
 		$message["passcode"] = $passcode;
 		
-		msg_send($sr_queue, MSG_AUTH_USER, $message, true, true, $msg_err);
+		msg_send($sr_queue, MSG_AUTH_USER_TOKEN, $message, true, true, $msg_err);
 		echo "message sent\n";
 		
 		msg_receive($cl_queue, 0, $msg_type, 16384, $msg);
-		echo "message received?\n";
-		print_r($msg);
 		
 		return $msg;
 	}
 	
-	function addUser($username) {
+	function addUser($username, $tokentype="", $hexkey="") {
 		global $MSG_QUEUE_KEY_ID_SERVER, $MSG_QUEUE_KEY_ID_CLIENT;
 		
 		
@@ -219,16 +217,14 @@ class GAAuthClient {
 		
 		
 		$message["username"] = $username;
+		if($tokentype!="") $message["tokentype"] = $tokentype;
+		if($hexkey!="") $message["hexkey"] = $hexkey;
 		
 		msg_send($sr_queue, MSG_ADD_USER_TOKEN, $message, true, true, $msg_err);
-		echo "message sent\n";
 		
 		msg_receive($cl_queue, 0, $msg_type, 16384, $msg);
-		echo "message received?\n";
-		print_r($msg);
 		
 		return $msg;
-		
 	}
 
 	function setTokenType($username, $tokentype) {