X-Git-Url: http://git.pjr.cc/?p=ga4php.git;a=blobdiff_plain;f=gaas%2Flib%2FgaasdMessages.php;fp=gaas%2Flib%2FgaasdMessages.php;h=a0b1efa5054eb5f28a0f023613282b2370c69e44;hp=82d6d8eb11df5e3d25c13c2a0d7504666f382948;hb=de4ba479608adbde94ddc8f82fc9bf92b8bf7cd7;hpb=2e867180ea2f5ba6aeaac1509966473424ced8dd

diff --git a/gaas/lib/gaasdMessages.php b/gaas/lib/gaasdMessages.php
index 82d6d8e..a0b1efa 100644
--- a/gaas/lib/gaasdMessages.php
+++ b/gaas/lib/gaasdMessages.php
@@ -195,13 +195,8 @@ function gaasProvisionUser_server($msg)
 		if(userInGroup($msg["username"], confGetVal("ad.domain"), confGetVal("ad.user"), confGetVal("ad.pass"), confGetVal("ad.clientdef"))) {
 			$myga = new gaasdGA();
 			
-			// TODO - figure out how to deal with the token origin - i.e. software/hardware
-			if($msg["origin"] == "hardware") {
-				echo "want a hardware token, but i dont know how to do this yet\n";
-			} else {
-				echo "using software token\n";
-				$myga->setUser($msg["username"], $ttype, "", $tkey);
-			}
+			echo "using software token\n";
+			$myga->setUser($msg["username"], $ttype, "", $tkey);
 		} else {
 			echo "User not in client group\n";
 		}
@@ -307,6 +302,7 @@ function gaasGetUsers_server($msg)
 	$haveTokens = $msg["havetokens"];
 	$userPatter = $msg["userpattern"];
 	$group = $msg["group"];
+	$myga = new gaasdGA();
 	
 	if(confGetval("backend") == "AD") {
 		$adgroup = "";
@@ -314,19 +310,28 @@ function gaasGetUsers_server($msg)
 			$adgroup = confGetVal("ad.admindef");
 		} else {
 			$adgroup = confGetVal("ad.clientdef");
-		}
+		} 
 		$addom = confGetVal("ad.domain");
 		$aduser = confGetVal("ad.user");
 		$adpass = confGetVal("ad.pass");
 		//echo "using group $adgroup for $group\n";
 		
 		$users = getUsersInGroup($addom, $aduser, $adpass, $adgroup);
-		foreach($users as $user => $real) {
-			hasToken($user);
+		foreach($users as $key => $val) {
+			$user = $val["username"];
+			//echo "checking $user for token - ";
+			if($myga->hasToken($user)) {
+				$users[$key]["hastoken"] = true;
+				//echo "yes\n";
+			} else {
+				$users[$key]["hastoken"] = false;
+				//echo "no\n";
+			}
 		}
 	} else {
 		// internal db
 	}
+	//print_r($users);
 	return $users;
 }