X-Git-Url: http://git.pjr.cc/?p=gwvp.git;a=blobdiff_plain;f=gwvplib%2Fgwvpdebug.php;h=4a5c3035157c9275935f7e52f44c2211847347c3;hp=ee44f400efe7fe5685129cd1fa0c86bc210c4f83;hb=942b821d861aba1da43ef6c999141853e9f8b3a8;hpb=74399e0d5226d43656c618451b4e6fc06702e5ab

diff --git a/gwvplib/gwvpdebug.php b/gwvplib/gwvpdebug.php
index ee44f40..4a5c303 100644
--- a/gwvplib/gwvpdebug.php
+++ b/gwvplib/gwvpdebug.php
@@ -8,6 +8,21 @@ function gwvp_DebugEnabled()
 {
 	global $BASE_URL, $LOGIN_TYPE;
 	
+	$isgitagent = false;
+	
+	// tested the user agent bit with jgit from eclipse and normal git... seems to work
+	if(isset($_SERVER["HTTP_USER_AGENT"])) {
+		$agent = $_SERVER["HTTP_USER_AGENT"];
+		error_log("in git backend with user agent $agent");
+		if(stristr($agent, "git")!==false) {
+			$isgitagent = true;
+		}
+	}
+	
+	// we dont wan to send this to a git agent
+	if($isgitagent) return;
+	
+	
 	echo "<pre>";
 	if(isset($_SERVER["PHP_AUTH_USER"])) error_log("authuser: ".$_SERVER["PHP_AUTH_USER"]."\n");
 	echo "USERTYPE: $LOGIN_TYPE\n";
@@ -88,29 +103,42 @@ 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);
 					$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);
-					$userid = gwvp_getUserId("user@localhost");
-					error_log("userid is $userid");
-					gwvp_createGroup("usergroup", "usergroup", 0, $userid);
-					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_createGitRepo("repo1");
-					gwvp_createGitRepo("repo2");
-					gwvp_createGitRepo("repo3");
-					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_createGitRepo($name, $ownerid, $desc, $bundle=null, $defaultperms=0)
+					gwvp_setConfigVal("repodir", "/tmp/");
+					
+					// TODO change these to create not add.
+					system("rm -rf /tmp/repo1.git /tmp/repo2.git /tmp/repo3.git");
+					gwvp_createGitRepo("repo1", $adminid, "test repo1");
+					gwvp_createGitRepo("repo2", $userid1, "test repo2");
+					gwvp_createGitRepo("repo3", $userid2, "test repo3");
+					
+					
 					
 					header("Location: $BASE_URL/debug");
 					break;
@@ -135,12 +163,14 @@ function gwvp_DebugCall()
 function gwvp_DebugBody()
 {
 	global $BASE_URL;
+	
+	
 	?>
 	<a href="<?php echo $BASE_URL?>/debug/errormessage">Generate error message</a><br>
 	<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
 }