X-Git-Url: http://git.pjr.cc/?a=blobdiff_plain;f=gwvpmini%2Fgwvpmini_gitrepo.php;h=d9d9fef42d1020eab054fa11ba43d32b9f9cddad;hb=43b78ea0976ab7ec013c6a1ace53db98ede89012;hp=502210eb2a509e0bd16c02d9f2a42466dd7c0083;hpb=a0e234c191ea3c1427355eaa596d1e71b730e34a;p=gwvp-mini.git
diff --git a/gwvpmini/gwvpmini_gitrepo.php b/gwvpmini/gwvpmini_gitrepo.php
index 502210e..d9d9fef 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;
@@ -63,11 +63,14 @@ function gwvpmini_RepoMainPageBody()
foreach($repos as $repo) {
$name = $repo["name"];
$desc = $repo["desc"];
+
+ if($desc == "") $desc = "none";
+
$repo_base = gwvpmini_getConfigVal("repodir");
$cmd = "git --git-dir=\"$repo_base/$name.git\" log --all -1 2> /dev/null";
echo "
$name | $desc | ";
echo "";
- error_log("CMD: $cmd");
+ // error_log("CMD: $cmd");
//system("$cmd");
$fls = popen($cmd, "r");
$tks = "";
@@ -96,7 +99,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 = "";
@@ -148,11 +151,13 @@ function gwvpmini_GitLogProvider()
foreach($repos as $repo) {
$name = $repo["name"];
$desc = $repo["desc"];
+
+ if($desc == "") $desc = "-";
echo " |
$name | $desc | ";
echo "";
$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 +174,6 @@ function gwvpmini_GitLogProvider()
echo "";
}
}
-
- $logs = gwvpmini_GetActivityLog();
- if($logs !== null) {
- echo "Global Log";
- foreach($logs as $ents) {
- echo "".$ents["type"]." | ".$ents["commitid"]." | ";
- }
- echo " ";
- }
}
function gwvpmini_GitCreateRepoForm()
@@ -187,15 +183,15 @@ function gwvpmini_GitCreateRepoForm()
echo "";
@@ -209,6 +205,7 @@ function gwvpmini_RepoCreate()
// TODO: check the stuff out
// first reponame
$inputcheck = true;
+
// remove a .git at the end if it was input
$_REQUEST["reponame"] = preg_replace("/\.git$/", "", $_REQUEST["reponame"]);
@@ -220,6 +217,47 @@ function gwvpmini_RepoCreate()
$inputcheckerror = "Repo name contains invalid characters, repos can only contain a-z, A-Z, 0-9, _, - and .";
}
+ $clonefrom = false;
+ $fromremote = false;
+ if(isset($_REQUEST["clonefrom"])) {
+ if($_REQUEST["clonefrom"] != "") {
+ $clonefrom = $_REQUEST["clonefrom"];
+ if(preg_match("/git.*:\/\/.*/", $clonefrom)>0) {
+ $fromremote = true;
+ }
+ if(preg_match("/http.*\:\/\//", $clonefrom)>0) $fromremote = true;
+ }
+ }
+
+ if($clonefrom !== false && $fromremote == false) {
+ // check the local repo exists
+ $rn = gwvpmini_getRepo(null, $clonefrom, null);
+ $uid = $_SESSION["id"];
+
+ if($rn == false) {
+ gwvpmini_SendMessage("error", "local repo $clonefrom given as upstream clone, however $clonefrom doesnt exist on this site (or you cant read it unbake)");
+ header("Location: $BASE_URL/repos");
+ return;
+ }
+
+ // resolve repo permissions on the read/clone
+ if(gwvpmini_GetRepoPerm($rn["id"], $uid) < 1) {
+ gwvpmini_SendMessage("error", "local repo $clonefrom given as upstream clone, however $clonefrom doesnt exist on this site (or you cant read it bake)");
+ header("Location: $BASE_URL/repos");
+ return;
+ }
+ }
+
+ $defperms = "a";
+ switch($_REQUEST["perms"]) {
+ case "perms-registered":
+ $defperms = "r";
+ break;
+ case "perms-onlywrite":
+ $defperms = "x";
+ break;
+ }
+
if(!$inputcheck) {
gwvpmini_SendMessage("error", "$inputcheckerror");
header("Location: $BASE_URL/repos");
@@ -229,8 +267,9 @@ 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_SendMessage("info", "Repo ".$_REQUEST["reponame"]." has been created");
+ if(gwvpmini_createGitRepo($_REQUEST["reponame"], $_SESSION["id"], $_REQUEST["repodesc"], $defperms, $clonefrom, $fromremote)) {
+ gwvpmini_SendMessage("info", "Repo ".$_REQUEST["reponame"]." has been created");
+ }
header("Location: $BASE_URL/repos");
}
} else {
@@ -255,7 +294,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 +308,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 +320,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
|