X-Git-Url: http://git.pjr.cc/?p=ga4php.git;a=blobdiff_plain;f=gaas%2Flib%2FgaasdLib.php;h=e9809869db105ffa204b69f2d3d8d19e895f2632;hp=5cfe52fc6afa2087753c21cae3b79fe670653c3f;hb=40dc7f97626a703a943e27cdcd1a3d6a332a8f27;hpb=1d6adec6039a635e97e31592bbbcbf4357e33c28

diff --git a/gaas/lib/gaasdLib.php b/gaas/lib/gaasdLib.php
index 5cfe52f..e980986 100644
--- a/gaas/lib/gaasdLib.php
+++ b/gaas/lib/gaasdLib.php
@@ -1,23 +1,23 @@
 <?php 
 
-// first include the ga4php.php file itself
-$BASE_DIR = realpath(dirname(__FILE__)."/../../");
-global $BASE_DIR;
+require_once("globalLib.php");
+require_once("gaasdMessages.php");
 
 // messy
 require_once(dirname(__FILE__)."/../../lib/ga4php.php");
 
-
-
 // first we check if our db exists, if not, we're not inited
 $initState = false;
 $backEnd = "";
 global $initState, $backEnd;
 if(file_exists($BASE_DIR."/gaas/gaasd/gaasd.sqlite")) {
 	// then we check if the config vars we need exist in the db
-	$backEndType = confGetVar("backend");
+	$backEndType = confGetVal("backend");
+	
+	echo "backend type is $backEndType\n";
 	
 	if($backEndType == "AD") {
+		echo "init state should be true\n";
 		$backEnd = "AD";
 		
 		// TODO: we should now check all vars are set, but for now this will surfice
@@ -97,7 +97,7 @@ function confDelVar($varname)
 }
 
 // a funciton to deal with Config Vars
-function confGetVar($varname)
+function confGetVal($varname)
 {
 	$db = getDB();
 	
@@ -117,7 +117,7 @@ function confGetVar($varname)
 }
 
 // and a function to put vars
-function confPutVar($varname, $value)
+function confSetVal($varname, $value)
 {
 	$db = getDB();
 	
@@ -132,21 +132,87 @@ function confPutVar($varname, $value)
 }
 
 // now we define our extended class
-class gaasGA extends GoogleAuthenticator
+class gaasdGA extends GoogleAuthenticator
 {
 	
-	function getData($username)
-	{
+	function getData($username) {
+		//echo "called into getdata\n";
+		
+		// get our database connection
+		$dbObject = getDB();
+		
+		// set the sql for retreiving the data
+		$sql = "select users_tokendata from users where users_username='$username'";
+		
+		// run the query
+		$result = $dbObject->query($sql);
+		
+		// check the result
+		//echo "next1\n";
+		if(!$result) return false;
+		
+		// now just retreieve all the data (there should only be one, but whatever)
+		//echo "next2\n";
+		$tokendata = false;
+		foreach($result as $row) {
+			$tokendata = $row["users_tokendata"];
+		}
+
+		//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;
+		
+		// and there you have it, simple eh?
 	}
 	
 	
-	function putData($username, $data)
-	{
+	function putData($username, $data) {
+		// get our database connection
+		$dbObject = getDB();
+		
+		// we need to check if the user exists, and if so put the data, if not create the data
+		$sql = "select * from users where users_username='$username'";
+		$res = $dbObject->query($sql);
+		if($res->fetchColumn() > 0) {
+			// do 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");
+			$sql = "insert into users values (NULL, '$username', '', '', '$data', '')";
+		}
+		
+		if($dbObject->query($sql)) {
+			return true;
+		} else {
+			return false;
+		}
+
 	}
 	
-	
-	function getUsers()
-	{
+	function getUsers() {
+		// get our database connection
+		$dbObject = getDB();
+		
+		// now the sql again
+		$sql = "select users_username from users";
+		
+		// run the query
+		$result = $dbObject->query($sql);
+		
+		// iterate over the results - we expect a simple array containing
+		// a list of usernames
+		$i = 0;
+		$users = array();
+		foreach($result as $row) {
+			$users[$i] = $row["username"];
+			$i++;
+		}
+		
+		// now return the list
+		return $users;
 	}
 }
 ?>
\ No newline at end of file