X-Git-Url: http://git.pjr.cc/?p=gwvp.git;a=blobdiff_plain;f=gwvplib%2Fgwvpdebug.php;h=2a56674190aae8f9a9641c8e36e7e45483cf27c9;hp=fb8d49c5984838e4cf4a8cf526343cd858b4ac13;hb=507bc8f2818a42d751ed6e2e2fc68ee2bde94016;hpb=7fc39fd33f6a8fcf6893208921cd276ea3f00e61

diff --git a/gwvplib/gwvpdebug.php b/gwvplib/gwvpdebug.php
index fb8d49c..2a56674 100644
--- a/gwvplib/gwvpdebug.php
+++ b/gwvplib/gwvpdebug.php
@@ -9,6 +9,7 @@ function gwvp_DebugEnabled()
 	global $BASE_URL, $LOGIN_TYPE;
 	
 	echo "<pre>";
+	if(isset($_SERVER["PHP_AUTH_USER"])) error_log("authuser: ".$_SERVER["PHP_AUTH_USER"]."\n");
 	echo "USERTYPE: $LOGIN_TYPE\n";
 	echo "BASEURL: $BASE_URL\n";
 	echo "CUSTOM\n";
@@ -87,22 +88,37 @@ function gwvp_DebugCall()
 					break;
 				case "recreatedb":
 					global $db_name;
-					unlink("$db_name");
+					gwvp_forceDisconnect();
+					unlink("$db_name.tmp");
+					rename("$db_name", "$db_name.tmp");
 					gwvp_dbCreateSQLiteStructure("$db_name");
-					//gwvp_createGroup($group_name, $is_admin, $owner_id)
-					//gwvp_createUser($email, $fullname, $password, $username, $desc, $status)
-					//gwvp_addGroupMember($email, $groupname)
+					
+					// admin first
 					gwvp_createUser("admin@localhost", "adminer", "password", "admin", "initial admin user", 0);
-					gwvp_createGroup("admingroup", 1, gwvp_getUserId("admin@localhost"));
+					$adminid = gwvp_getUserId("admin@localhost");
+					gwvp_createGroup("admingroup", "admingroup", 1, $adminid);
+					error_log("adminid is $adminid");
 					gwvp_addGroupMember("admin@localhost", "admingroup");
-					gwvp_createUser("user@localhost", "userer", "password", "user", "initial pleb user", 0);
-					gwvp_createGroup("usergroup", 0, gwvp_getUserId("user@localhost"));
-					gwvp_addGroupMember("user@localhost", "usergroup");
+					
+					// user1
+					gwvp_createUser("user1@localhost", "userer1", "password", "user1", "initial pleb user1", 0);
+					$userid1 = gwvp_getUserId("user1@localhost");
+					error_log("userid1 is $userid1");
+					gwvp_createGroup("usergroup1", "usergroup1", 0, $userid1);
+					gwvp_addGroupMember("user1@localhost", "usergroup1");
+					
+					// user2
+					gwvp_createUser("user2@localhost", "userer2", "password", "user2", "initial pleb user2", 0);
+					$userid2 = gwvp_getUserId("user2@localhost");
+					error_log("userid2 is $userid2");
+					
 					gwvp_SendMessage("info", "blank db re-created");
 					
-					gwvp_AddRepo("repo1", "this is a test repo1", 1);
-					gwvp_AddRepo("repo2", "this is a test repo2", 1);
-					gwvp_AddRepo("repo2", "this is a test repo3", 1);
+					gwvp_AddRepo("repo1", "this is a test repo1", $adminid);
+					gwvp_AddRepo("repo2", "this is a test repo2", $userid1);
+					gwvp_AddRepo("repo3", "this is a test repo3", $userid2);
+					
+					gwvp_setConfigVal("repodir", "/tmp/");
 					
 					header("Location: $BASE_URL/debug");
 					break;
@@ -132,7 +148,7 @@ function gwvp_DebugBody()
 	<a href="<?php echo $BASE_URL?>/debug/infomessage">Generate info message</a><br>
 	<a href="<?php echo $BASE_URL?>/debug/createusersandgroups">Create a bunch of users and groups</a><br>
 	<a href="<?php echo $BASE_URL?>/debug/dropallusersandgroups">Drop users/groups/groupmemberships</a><br>
-	<a href="<?php echo $BASE_URL?>/debug/recreatedb">Recreate db</a><br>
+	<a href="<?php echo $BASE_URL?>/debug/recreatedb">Recreate test db</a><br>
 	<?php
 }