X-Git-Url: http://git.pjr.cc/?a=blobdiff_plain;f=gwvpmini%2Fgwvpmini_gitrepo.php;h=65841094cceaadfe68059b1f60fc87a91e61dd8d;hb=746924e785c55b28d1d7a36d3f3dfab79559bc7e;hp=502210eb2a509e0bd16c02d9f2a42466dd7c0083;hpb=a0e234c191ea3c1427355eaa596d1e71b730e34a;p=gwvp-mini.git

diff --git a/gwvpmini/gwvpmini_gitrepo.php b/gwvpmini/gwvpmini_gitrepo.php
index 502210e..6584109 100644
--- a/gwvpmini/gwvpmini_gitrepo.php
+++ b/gwvpmini/gwvpmini_gitrepo.php
@@ -3,7 +3,7 @@ global $HOME_PAGE_PROVIDERS;
 
 
 $CALL_ME_FUNCTIONS["repoadmin"] = "gwvpmini_RepoCallMe";
-$HOME_PAGE_PROVIDERS["gitlog"] = "gwvpmini_GitLogProvider";
+$HOME_PAGE_PROVIDERS["00gitlog"] = "gwvpmini_GitLogProvider";
 
 
 // the home_page_provders bit is an array
@@ -15,15 +15,15 @@ $MENU_ITEMS["10repos"]["link"] = "$BASE_URL/repos";
 function gwvpmini_RepoCallMe()
 {
 
-	error_log("in repoadmin callme - err?");
-	error_log(print_r($_REQUEST, true));
+	// error_log("in repoadmin callme - err?");
+	// error_log(print_r($_REQUEST, true));
 	if(isset($_REQUEST["q"])) {
-		error_log("in repoadmin callme, for Q");
+		// error_log("in repoadmin callme, for Q");
 		$query = $_REQUEST["q"];
 		$qspl = explode("/", $query);
 		if(isset($qspl[0])) {
 			if($qspl[0] == "repos") {
-				error_log("in repos call");
+				// error_log("in repos call");
 				if(isset($qspl[1])) {
 					if($qspl[1] == "create") {
 						return "gwvpmini_RepoCreate";
@@ -31,7 +31,7 @@ function gwvpmini_RepoCallMe()
 						return "gwvpmini_RepoMainPage";
 					}
 				} else {
-					error_log("i got here, where next?");
+					// error_log("i got here, where next?");
 					return "gwvpmini_RepoMainPage";
 				}
 			} else return false;
@@ -67,7 +67,7 @@ function gwvpmini_RepoMainPageBody()
 				$cmd = "git --git-dir=\"$repo_base/$name.git\" log --all -1 2> /dev/null";
 				echo "<tr><td><a href=\"$BASE_URL/view/$name\">$name</a></td><td>$desc</td>";
 				echo "<td>";
-				error_log("CMD: $cmd");
+				// error_log("CMD: $cmd");
 				//system("$cmd");
 				$fls = popen($cmd, "r");
 				$tks = "";
@@ -96,7 +96,7 @@ function gwvpmini_RepoMainPageBody()
 				$desc = $repo["desc"];
 				$repo_base = gwvpmini_getConfigVal("repodir");
 				$cmd = "git --git-dir=\"$repo_base/$name.git\" log --all -1 2> /dev/null";
-				error_log("CMD: $cmd");
+				// error_log("CMD: $cmd");
 				//system("$cmd");
 				$fls = popen($cmd, "r");
 				$tks = "";
@@ -152,7 +152,7 @@ function gwvpmini_GitLogProvider()
 				echo "<td>";
 				$repo_base = gwvpmini_getConfigVal("repodir");
 				$cmd = "git --git-dir=\"$repo_base/$name.git\" log --all -1 2> /dev/null";
-				error_log("CMD: $cmd");
+				// error_log("CMD: $cmd");
 				//system("$cmd");
 				$fls = popen($cmd, "r");
 				$tks = "";
@@ -169,15 +169,6 @@ function gwvpmini_GitLogProvider()
 			echo "</table>";
 		}
 	}
-	
-	$logs = gwvpmini_GetActivityLog();
-	if($logs !== null) {
-		echo "<h2>Global Log</h2><table>";
-		foreach($logs as $ents) {
-			echo "<tr><td>".$ents["type"]."</td><td>".$ents["commitid"]."</td></tr>";
-		}
-		echo "</table>";
-	}
 }
 
 function gwvpmini_GitCreateRepoForm()
@@ -195,6 +186,7 @@ function gwvpmini_GitCreateRepoForm()
 	echo "<option value=\"perms-registered\">Must be Registered To Read</option>";
 	echo "<option value=\"perms-onlywrite\">Only Writers can Read</option>";
 	echo "</select>";
+	echo "<tr><th>Clone From</th><td><input type=\"text\" name=\"clonefrom\"></td></tr>";
 	echo "</td></tr>";
 	echo "<tr><td colspan=\"2\"><input type=\"submit\" name=\"Create\" value=\"Create\"></td></tr>";
 	echo "</table>";
@@ -220,6 +212,13 @@ function gwvpmini_RepoCreate()
 		$inputcheckerror = "Repo name contains invalid characters, repos can only contain a-z, A-Z, 0-9, _, - and .";
 	}
 	
+	$clonefrom = false;
+	if(isset($_REQUEST["clonefrom"])) {
+		if($_REQUEST["clonefrom"] != "") {
+			$clonefrom = $_REQUEST["clonefrom"];
+		}
+	}
+	
 	if(!$inputcheck) {
 		gwvpmini_SendMessage("error", "$inputcheckerror");
 		header("Location: $BASE_URL/repos");
@@ -229,7 +228,7 @@ function gwvpmini_RepoCreate()
 			gwvpmini_SendMessage("error", "Repo ".$_REQUEST["reponame"]." already exists");
 			header("Location: $BASE_URL/repos");
 		} else {
-			gwvpmini_createGitRepo($_REQUEST["reponame"], $_SESSION["id"], $_REQUEST["repodesc"], $_REQUEST["perms"]);
+			gwvpmini_createGitRepo($_REQUEST["reponame"], $_SESSION["id"], $_REQUEST["repodesc"], $_REQUEST["perms"], $clonefrom);
 			gwvpmini_SendMessage("info", "Repo ".$_REQUEST["reponame"]." has been created");
 			header("Location: $BASE_URL/repos");
 		}
@@ -255,7 +254,7 @@ function gwvpmini_RemoveRepo($rid)
 	
 	$rname = $repdet["name"];
 	
-	error_log("FROM PANTS:".print_r($repdet,true)." ----------- ".print_r($rname, true));
+	// error_log("FROM PANTS:".print_r($repdet,true)." ----------- ".print_r($rname, true));
 	
 	if($repdet != false && $rname != "") {
 		if(file_exists("$repo_base/$rname.git")) {
@@ -269,7 +268,7 @@ function gwvpmini_RemoveRepo($rid)
 
 function gwvpmini_RecursiveDelete($fpath)
 {
-	error_log("RECURSEDETELE: ".$fpath);
+	// error_log("RECURSEDETELE: ".$fpath);
 	if(is_file($fpath)){
 		return @unlink($fpath);
 	}
@@ -281,5 +280,12 @@ function gwvpmini_RecursiveDelete($fpath)
 		return @rmdir($fpath);
 	}
 }
+
+function gwvpmini_CompressCommitId($cid)
+{
+	$compressedcid = substr($cid, 0, 5)."...".substr($cid, strlen($cid)-5, strlen($cid));
+	
+	return $compressedcid;
+}
 	
 ?>
\ No newline at end of file