X-Git-Url: http://git.pjr.cc/?a=blobdiff_plain;f=authserver%2Flib%2Flib.php;h=6ae1d813f63d3b34b406d7f589f99c3c16b9cb3b;hb=ac262b9b316777bed9e908b8b85200b8a14256f7;hp=c938b8ebf69bc35e8c8f3330228d7faae85ae3ef;hpb=da4ac26dcfd94c9f8b7e8e43f50f671bdd94dfd0;p=ga4php.git

diff --git a/authserver/lib/lib.php b/authserver/lib/lib.php
index c938b8e..6ae1d81 100644
--- a/authserver/lib/lib.php
+++ b/authserver/lib/lib.php
@@ -1,8 +1,7 @@
 <?php
 
-if(!isset($MSG_QUEUE_KEY_ID_SERVER)) $MSG_QUEUE_KEY_ID_SERVER = "189751072"; // i would use ftok, but its crap
-if(!isset($MSG_QUEUE_KEY_ID_CLIENT)) $MSG_QUEUE_KEY_ID_CLIENT = "189751073"; // ftok is not ok!
-global $MSG_QUEUE_KEY_ID_SERVER, $MSG_QUEUE_KEY_ID_CLIENT;
+if(!isset($TCP_PORT_NUMBER)) $TCP_PORT_NUMBER = 21446;
+global $TCP_PORT_NUMBER;
 
 define("MSG_AUTH_USER_TOKEN", 1);
 define("MSG_ADD_USER_TOKEN", 2);
@@ -88,6 +87,8 @@ function getDatabase()
 		$dbobject->query($sql);
 		$sql = 'CREATE TABLE "radclients" ("rad_id" INTEGER PRIMARY KEY AUTOINCREMENT,"rad_name" TEXT, "rad_ip" TEXT, "rad_secret" TEXT, "rad_desc" TEXT);';
 		$dbobject->query($sql);
+		$sql = 'CREATE TABLE "hardwaretokens" ("tok_id" INTEGER PRIMARY KEY AUTOINCREMENT,"tok_name" TEXT, "tok_key" TEXT, "tok_type" TEXT);';
+		$dbobject->query($sql);
 	}
 	
 	return $dbobject;
@@ -99,7 +100,7 @@ function closeDatabase($db) {
 
 class gaasGA extends GoogleAuthenticator {
 	function getData($username) {
-		echo "called into getdata\n";
+		//echo "called into getdata\n";
 		
 		// get our database connection
 		$dbObject = getDatabase();
@@ -111,17 +112,17 @@ class gaasGA extends GoogleAuthenticator {
 		$result = $dbObject->query($sql);
 		
 		// check the result
-		echo "next1\n";
+		//echo "next1\n";
 		if(!$result) return false;
 		
 		// now just retreieve all the data (there should only be one, but whatever)
-		echo "next2\n";
+		//echo "next2\n";
 		$tokendata = false;
 		foreach($result as $row) {
 			$tokendata = $row["users_tokendata"];
 		}
 
-		echo "next3, $username, $tokendata\n";
+		//echo "next3, $username, $tokendata\n";
 		// now we have our data, we just return it. If we got no data
 		// we'll just return false by default
 		return $tokendata;
@@ -139,11 +140,11 @@ class gaasGA extends GoogleAuthenticator {
 		$res = $dbObject->query($sql);
 		if($res->fetchColumn() > 0) {
 			// do update
-			error_log("doing userdata update");
+			//error_log("doing userdata update");
 			$sql = "update users set users_tokendata='$data' where users_username='$username'";
 		} else {
 			// do insert
-			error_log("doing user data create");
+			//error_log("doing user data create");
 			$sql = "insert into users values (NULL, '$username', '', '', '$data', '')";
 		}