X-Git-Url: http://git.pjr.cc/?p=gwvp-mini.git;a=blobdiff_plain;f=gwvpmini%2Fgwvpmini_gitrepo.php;h=d642c929f76f2f8e481ac4975156117c395c00cc;hp=65841094cceaadfe68059b1f60fc87a91e61dd8d;hb=64781bdbf8cbe789d349418253ce34efa43ad884;hpb=27953477dc3274dbf8bc36387030218cfdc68c25
diff --git a/gwvpmini/gwvpmini_gitrepo.php b/gwvpmini/gwvpmini_gitrepo.php
index 6584109..d642c92 100644
--- a/gwvpmini/gwvpmini_gitrepo.php
+++ b/gwvpmini/gwvpmini_gitrepo.php
@@ -63,6 +63,9 @@ 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 | ";
@@ -148,6 +151,8 @@ 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");
@@ -178,16 +183,15 @@ function gwvpmini_GitCreateRepoForm()
echo "";
@@ -201,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"]);
@@ -213,9 +218,24 @@ function gwvpmini_RepoCreate()
}
$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);
+ if($rn == false) {
+ gwvpmini_SendMessage("error", "local repo $clonefrom given as upstream clone, however $clonefrom doesnt exist on this site");
+ header("Location: $BASE_URL/repos");
+ return;
}
}
|