X-Git-Url: http://git.pjr.cc/?p=gwvp.git;a=blobdiff_plain;f=gwvplib%2Fgwvprepoadmin.php;fp=gwvplib%2Fgwvprepoadmin.php;h=7a0b10c4ec8af8a334b874eb67d12b657b41058c;hp=1ecf30bc58ed05f1220401c7fc5d6142f7ff66d6;hb=0a0b03b67435c01c1059f4b084dd6b07aeae81e3;hpb=e3bdcdac5fc5d9cec5db491543a9ab1c090706cd

diff --git a/gwvplib/gwvprepoadmin.php b/gwvplib/gwvprepoadmin.php
index 1ecf30b..7a0b10c 100644
--- a/gwvplib/gwvprepoadmin.php
+++ b/gwvplib/gwvprepoadmin.php
@@ -53,19 +53,18 @@ function gwvp_DoCreateRepoPage()
 	$reponame = $_REQUEST["reponame"];
 	$repodesc = $_REQUEST["repodesc"];
 	
+	// TODO: this code is bollocks, need to redo
 	if(gwvp_repoExists($reponame)) {
 		gwvp_SendMessage("error", "a repository with the name <b>\"$reponame\"</b> already exists");
 		//header("Location: $BASE_URL/admin/repos/create?reponameobv=$reponame&repodescobv=$repodesc");
+	} else if($_FILES["bundlefile"]["size"] > 0) { // 		if(isset($_FILES["bundlefile"]["size"]))  <--- this needs to happen here TODO
+		error_log("bundle file tmpname is ".$_FILES["bundlefile"]["tmp_name"]);
+		gwvp_createGitRepo($reponame, $_FILES["bundlefile"]["tmp_name"]);
+		gwvp_SendMessage("info", "Repo, $reponame, created");
 	} else if(gwvp_createGitRepo($reponame)) {
-		if(isset($_FILES["bundlefile"]["size"])) {
-			//error_log("bundle file name is ".$_FILES["bundlefile"]["size"]);
-			if($_FILES["bundlefile"]["size"] > 0) {
-				error_log("bundle file tmpname is ".$_FILES["bundlefile"]["tmp_name"]);
-			}
-		}
 		gwvp_SendMessage("info", "Repo, $reponame, created");
-		//header("Location: $BASE_URL/admin/repos");
 	}
+	header("Location: $BASE_URL/admin/repos");
 	
 	
 }
@@ -85,7 +84,7 @@ function gwvp_CreateRepoPageBody()
 	echo "<table>";
 	echo "<tr><td>Repository Name</td><td><input type=\"text\" name=\"reponame\" value=\"$reponameobv\"></td></tr>";
 	echo "<tr><td>Repository Description</td><td><input type=\"text\" name=\"repodesc\" value=\"$repodescobv\"></td></tr>";
-	echo "<tr><td>Repository Bundle</td><td><input type=\"file\" name=\"bundlefile\"></td><td><i>Create a bundle for pro-creating the git repository</i></td></tr>";
+	echo "<tr><td>Repository Bundle</td><td><input type=\"file\" name=\"bundlefile\"></td><td><i>Create a bundle for pro-creating the git repository (export your git bundle with \"git bundle create /tmp/filename --branches\")</i></td></tr>";
 	echo "</table>";
 	echo "<input type=\"submit\" name=\"create\" value=\"Create\"><br>";
 	echo "</form>";