X-Git-Url: http://git.pjr.cc/?p=gwvp-mini.git;a=blobdiff_plain;f=gwvpmini%2Fgwvpmini_gitrepo.php;h=3ea498cba3a6f31899851ab88f50822816bf972e;hp=8ad572571a8752817b76199b95d5000a0aaea759;hb=5433c422794029259de4512640485aeb650e0c87;hpb=22228c14262a4c2227f9c0ddedffee7356bf615a
diff --git a/gwvpmini/gwvpmini_gitrepo.php b/gwvpmini/gwvpmini_gitrepo.php
index 8ad5725..3ea498c 100644
--- a/gwvpmini/gwvpmini_gitrepo.php
+++ b/gwvpmini/gwvpmini_gitrepo.php
@@ -53,8 +53,8 @@ function gwvpmini_RepoMainPageBody()
{
global $BASE_URL;
- gwvpmini_GitCreateRepoForm();
if(gwvpmini_isLoggedIn()) {
+ gwvpmini_GitCreateRepoForm();
$repos = gwvpmini_GetOwnedRepos($_SESSION["username"]);
if(!$repos) {
echo "You currently own no repos
";
@@ -66,10 +66,17 @@ function gwvpmini_RepoMainPageBody()
$desc = $repo["desc"];
echo "
$name | $desc | ";
echo "";
- $repo_base = gwvpmini_getConfigVal("repodir");
- $cmd = "git --git-dir=\"$repo_base/$name.git\" log -1 2>&1";
- error_log("CMD: $cmd");
- system("$cmd");
+ error_log("CMD: $cmd");
+ //system("$cmd");
+ $fls = popen($cmd, "r");
+ $tks = "";
+ if($fls !== false) while(!feof($fls)) {
+ $tks .= fread($fls,1024);
+ }
+
+ if($tks == "") {
+ echo "No Log Info Yet";
+ } else echo $tks;
echo " | ";
echo "
";
}
@@ -109,9 +116,18 @@ function gwvpmini_GitLogProvider()
echo "$name | $desc | ";
echo "";
$repo_base = gwvpmini_getConfigVal("repodir");
- $cmd = "git --git-dir=\"$repo_base/$name.git\" log -1 2>&1";
+ $cmd = "git --git-dir=\"$repo_base/$name.git\" log -1 2> /dev/null";
error_log("CMD: $cmd");
- system("$cmd");
+ //system("$cmd");
+ $fls = popen($cmd, "r");
+ $tks = "";
+ if($fls !== false) while(!feof($fls)) {
+ $tks .= fread($fls,1024);
+ }
+
+ if($tks == "") {
+ echo "No Log Info Yet";
+ } else echo $tks;
echo " | ";
echo "
";
}
@@ -186,4 +202,40 @@ function gwvpmini_HaveRepo($reponame)
if(file_exists("$repo_base/$reponame.git")) return true;
}
+
+function gwvpmini_RemoveRepo($rid)
+{
+ $repo_base = gwvpmini_getConfigVal("repodir");
+
+ $repdet = gwvpmini_getRepo(null, null, $rid);
+
+ $rname = $repdet["name"];
+
+ error_log("FROM PANTS:".print_r($repdet,true)." ----------- ".print_r($rname, true));
+
+ if($repdet != false && $rname != "") {
+ if(file_exists("$repo_base/$rname.git")) {
+ // recursive remove - frightening
+ if(gwvpmini_RecursiveDelete("$repo_base/$rname.git")) {
+ gwvpmini_RemoveRepoDB($rid);
+ }
+ }
+ } return false;
+}
+
+function gwvpmini_RecursiveDelete($fpath)
+{
+ error_log("RECURSEDETELE: ".$fpath);
+ if(is_file($fpath)){
+ return @unlink($fpath);
+ }
+ elseif(is_dir($fpath)){
+ $scan = glob(rtrim($fpath,'/').'/*');
+ foreach($scan as $index=>$path){
+ gwvpmini_RecursiveDelete($path);
+ }
+ return @rmdir($fpath);
+ }
+}
+
?>
\ No newline at end of file