X-Git-Url: http://git.pjr.cc/?p=ga4php.git;a=blobdiff_plain;f=gaas%2Flib%2FgaasdLib.php;fp=gaas%2Flib%2FgaasdLib.php;h=a2b50de42fda00b7422deb0e176bfd13f9ecac21;hp=e9809869db105ffa204b69f2d3d8d19e895f2632;hb=ed1c86a90a6aa87dfc8b90c2242697a73039bfad;hpb=5b32e0186e347f7ac182e5be47b5c6f113ed7482 diff --git a/gaas/lib/gaasdLib.php b/gaas/lib/gaasdLib.php index e980986..a2b50de 100644 --- a/gaas/lib/gaasdLib.php +++ b/gaas/lib/gaasdLib.php @@ -49,11 +49,10 @@ function createDB() return false; } - if($backEnd == "IN") { - $sql = 'CREATE TABLE "users" ("users_id" INTEGER PRIMARY KEY AUTOINCREMENT,"users_username" TEXT, "users_realname" TEXT, "users_password" TEXT, "users_tokendata" TEXT, "users_otk" TEXT);'; - $dbobject->query($sql); - } - + // users_tokendata is used by ga4php, users_otk is the qrcode data link if needed, + // tokentype is the software/hardware token types + $sql = 'CREATE TABLE "users" ("users_id" INTEGER PRIMARY KEY AUTOINCREMENT,"users_username" TEXT, "users_realname" TEXT, "users_password" TEXT, "users_tokendata" TEXT, "users_otk" TEXT, "user_enabled" TEXT, "users_tokentype" TEXT);'; + $dbobject->query($sql); $sql = 'CREATE TABLE "config" ("conf_id" INTEGER PRIMARY KEY AUTOINCREMENT,"conf_name" TEXT, "conf_value" TEXT);'; $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);';