X-Git-Url: http://git.pjr.cc/?p=ga4php.git;a=blobdiff_plain;f=lib%2Flib.php;h=da5eace26974dc7697c33e1e852b111ffe77a4e8;hp=aafd167527810a7494624d7391b1005951a9b84d;hb=0c40f0be4dd01156a31dec9c91958170061bb2f8;hpb=b0ca30634151e46bd86cd82993a6d22ffc6073bc

diff --git a/lib/lib.php b/lib/lib.php
index aafd167..da5eace 100644
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -17,7 +17,7 @@
  * and then just manipulate it, then use a checkin function to push the data base into the db...
  */
 
-class GoogleAuthenticator {
+abstract class GoogleAuthenticator {
 	
 	function __construct() {
 	}
@@ -39,11 +39,11 @@ class GoogleAuthenticator {
 	
 	// an internal funciton to get 
 	function internalGetData($username) {
-		$data = getData($username);
+		$data = $this->getData($username);
 		$deco = unserialize(base64_decode($data));
 		
 		if(!$deco) {
-			$deco = createEmptyData();
+			$deco = $this->createEmptyData();
 		}
 		
 		return $deco;
@@ -53,7 +53,7 @@ class GoogleAuthenticator {
 	function internalPutData($username, $data) {
 		$enco = base64_encode(serialize($data));
 		
-		return putData($username, $enco);
+		return $this->putData($username, $enco);
 	}
 	
 
@@ -66,9 +66,9 @@ class GoogleAuthenticator {
 			return false;
 		}
 		
-		$data = internalGetData($username);
+		$data = $this->internalGetData($username);
 		$data["tokentype"] = $tokentype;
-		internalPutData($username, $data);
+		$this->internalPutData($username, $data);
 		
 		return true;	
 	}
@@ -79,11 +79,11 @@ class GoogleAuthenticator {
 		if($key == "") $key = $this->createBase32Key();
 		$hkey = $this->helperb322hex($key);
 		
-		$token = internalGetData($username);
+		$token = $this->internalGetData($username);
 		$token["tokenkey"] = $hkey;
 		$token["tokentype"] = $ttype;
 		
-		internalPutData($username, $token);		
+		$this->internalPutData($username, $token);		
 		return $key;
 	}
 	
@@ -93,9 +93,9 @@ class GoogleAuthenticator {
 	// if the key is invalid or the user doesn't exist.
 	function setUserKey($username, $key) {
 		// consider scrapping this
-		$token = internalGetData($username);
+		$token = $this->internalGetData($username);
 		$token["tokenkey"] = $key;
-		internalPutData($username, $token);		
+		$this->internalPutData($username, $token);		
 	}
 	
 	
@@ -108,16 +108,19 @@ class GoogleAuthenticator {
 	// self explanitory?
 	function deleteUser($username) {
 		// oh, we need to figure out how to do thi?
-		$data = internalGetData($username);
+		$data = $this->internalGetData($username);
 		$data["tokenkey"] = "";
-		internalPutData($username);		
+		$this->internalPutData($username);		
 	}
 	
 	// user has input their user name and some code, authenticate
 	// it
 	function authenticateUser($username, $code) {
 
-		$tokendata = internalGetData($username);
+		error_log("begin auth user");
+		$tokendata = $this->internalGetData($username);
+		$asdf = print_r($tokendata, true);
+		error_log("dat is $asdf");
 		
 		if($tokendata["tokenkey"] == "") {
 			$errorText = "No Assigned Token";
@@ -128,6 +131,9 @@ class GoogleAuthenticator {
 		$ttype = $tokendata["tokentype"];
 		$tlid = $tokendata["tokencounter"];
 		$tkey = $tokendata["tokenkey"];
+		
+		$asdf = print_r($tokendata, true);
+		error_log("dat is $asdf");
 		switch($ttype) {
 			case "HOTP":
 				$st = $tlid;
@@ -137,7 +143,7 @@ class GoogleAuthenticator {
 					//error_log("code: $code, $stest, $tkey, $tid");
 					if($code == $stest) {
 						$tokendata["tokencounter"] = $i;
-						internalPutData($username, $tokendata);
+						$this->internalPutData($username, $tokendata);
 						return true;
 					}
 				}