X-Git-Url: http://git.pjr.cc/?p=ga4php.git;a=blobdiff_plain;f=example%2Findex.php;fp=example%2Findex.php;h=d70e54212a5aaf5d3dda971fa044141d56f52ea9;hp=b750dbc53f99b3b77b1a36d5462962e35d818048;hb=0c40f0be4dd01156a31dec9c91958170061bb2f8;hpb=b0ca30634151e46bd86cd82993a6d22ffc6073bc

diff --git a/example/index.php b/example/index.php
index b750dbc..d70e542 100644
--- a/example/index.php
+++ b/example/index.php
@@ -1,10 +1,7 @@
 <?php
 
-require_once("../lib/lib.php");
-require_once("tokenstore.php");
-
-$ga = new GoogleAuthenticator("myGetData", "mySetData");
 
+// create/connect a db
 if(isset($_REQUEST["action"])) {
 	switch($_REQUEST["action"]) {
 		case "destroy":
@@ -13,7 +10,6 @@ if(isset($_REQUEST["action"])) {
 	}
 }
 
-// create/connect a db
 global $dbobject;
 $dbobject = false;
 if(file_exists("/tmp/gadata.sqlite")) {
@@ -28,21 +24,30 @@ if(file_exists("/tmp/gadata.sqlite")) {
 	} catch(PDOExceptionÂ $exep) {
 		error_log("execpt on db open");
 	}
-	$sql = 'CREATE TABLE "users" ("users_id" INTEGER PRIMARY KEY AUTOINCREMENT,"users_username" TEXT,"users_tokentype" TEXT,"users_tokenkey" TEXT,"users_tokencounter" integer);';
+	$sql = 'CREATE TABLE "users" ("users_id" INTEGER PRIMARY KEY AUTOINCREMENT,"users_username" TEXT,"users_fullname" TEXT,"users_tokendata" TEXT);';
 	$dbobject->query($sql);
 }
 
 
+require_once("tokenstore.php");
+
+$ga = new myGoogleAuth();
+
+
+
+
 ?>
 <html>
 <h1>Example Page for GA4PHP</h1>
 <a href="index.php">home</a><br>
 
 <?php
+error_log("start switch");
 if(isset($_REQUEST["action"])) {
 	switch($_REQUEST["action"]) {
 		case "createuser":
 			$username = $_REQUEST["username"];
+			$fullname = $_REQUEST["fullname"];
 			$pr = preg_match('/^[a-zA-Z0-9@\.]+$/',"$username");
 			echo "<hr>";
 			if(strlen($username)<3) {
@@ -54,12 +59,13 @@ if(isset($_REQUEST["action"])) {
 				//$keyinhex = $ga->helperb322hex($key);
 				//$url = urlencode($ga->createURL($username, $key, $ttype));
 				//echo "QRCode for user \"$username\" is <img src=\"http://chart.apis.google.com/chart?cht=qr&chl=$url&chs=120x120\"> or type in $key (google authenticator) or $keyinhex (for most other otp's)";
-				$sql = "insert into users values (NULL, '$username', 'TOTP', 'ASDF', '0')";
+				$sql = "insert into users values (NULL, '$username', '$fullname', '0')";
 				$dbobject->query($sql);
 			}
 			echo "<hr>";
 			break;
 		case "provisiontoken":
+			error_log("in provision");
 			$username = $_REQUEST["username"];
 			$ttype = $_REQUEST["ttype"];
 			$key = $ga->setUser($username, "", $ttype);
@@ -92,19 +98,38 @@ if(isset($_REQUEST["action"])) {
 }
 
 ?>
+<h2>Our Users</h2>
+<table border="1">
+<tr><th>Username</th><th>FullName</th></tr>
+<?php
+$res = $dbobject->query("select * from users");
+foreach($res as $row) {
+	$username = $row["users_username"];
+	$fullname = $row["users_fullname"];
+	echo "<tr><th>$username</th><th>$fullname</th></tr>";
+}
+
+?>
+</table>
 <h2>Destroy the DB</h2>
-<a href="index.php?action=destroy">This is UNDOABLE - but this is a test system, so you dont care</a>
+<a href="index.php?action=destroy">This is not UNDOABLE - but this is a test system, so you dont care</a>
+
 <h2>Create a User:</h2>
 <form method="post" action="index.php?action=createuser">
 Username: <input type="text" name="username"><br>
+Full Name: <input type="text" name="fullname"><br>
 <input type="submit" name="go" value="go"><br>
 </form>
+
+
 <hr>
+
+
 <h2>Provision Token</h2>
 <form method="post" action="index.php?action=provisiontoken">
 Username: <select name="username">
 <?php
-$res = $ga->getUserList();
+$res = $ga->getUsers();
 foreach($res as $row) {
 	echo "<option value=\"".$row."\">".$row."</option>";
 }
@@ -113,12 +138,16 @@ foreach($res as $row) {
 Type: <select name="ttype"><option value="HOTP">HOTP</option><option value="TOTP">TOTP</option></select><br>
 <input type="submit" name="go" value="go"><br>
 </form>
+
+
 <hr>
+
+
 <h2>Test Token</h2>
 <form method="post" action="index.php?action=authuser">
 Username: <select name="username">
 <?php
-$res = $ga->getUserList();
+$res = $ga->getUsers();
 foreach($res as $row) {
 	echo "<option value=\"".$row."\">".$row."</option>";
 }
@@ -127,12 +156,16 @@ foreach($res as $row) {
 Code: <input type="text" name="code"><br>
 <input type="submit" name="go" value="go"><br>
 </form>
+
+
 <hr>
+
+
 <h2>Resync Code (only valid for HOTP codes)</h2>
 <form method="post" action="index.php?action=resync">
 Username: <select name="username">
 <?php
-$res = $ga->getUserList();
+$res = $ga->getUsers();
 foreach($res as $row) {
 	echo "<option value=\"".$row."\">".$row."</option>";
 }
