X-Git-Url: http://git.pjr.cc/?p=gwvp-mini.git;a=blobdiff_plain;f=gwvpmini%2Fgwvpmini_gitrepo.php;h=46c4f95790642942cf7b396bc49bd692dc60a575;hp=3ea498cba3a6f31899851ab88f50822816bf972e;hb=b35dc95efeb3c44390afc4eaa0aa295949ef2f9e;hpb=5433c422794029259de4512640485aeb650e0c87

diff --git a/gwvpmini/gwvpmini_gitrepo.php b/gwvpmini/gwvpmini_gitrepo.php
index 3ea498c..46c4f95 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;
@@ -54,7 +54,6 @@ function gwvpmini_RepoMainPageBody()
 	global $BASE_URL;
 	
 	if(gwvpmini_isLoggedIn()) {
-		gwvpmini_GitCreateRepoForm();
 		$repos = gwvpmini_GetOwnedRepos($_SESSION["username"]);
 		if(!$repos) {
 			echo "You currently own no repos<br>";	
@@ -64,9 +63,11 @@ function gwvpmini_RepoMainPageBody()
 			foreach($repos as $repo) {
 				$name = $repo["name"];
 				$desc = $repo["desc"];
+				$repo_base = gwvpmini_getConfigVal("repodir");
+				$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 = "";
@@ -82,6 +83,40 @@ function gwvpmini_RepoMainPageBody()
 			}
 			echo "</table>";
 		}
+		gwvpmini_GitCreateRepoForm();
+		
+		
+		$contreps = gwvpmini_GetContributedRepos($_SESSION["username"]);
+		
+		if($contreps !== false) {
+			echo "<h2>Repos you contribute to</h2>";
+			echo "<table border=\"1\"><tr><th>Repo Name</th><th>Owner</th><th>Repo Description</th><th>Last Log</th></tr>";
+			foreach($contreps as $repo) {
+				$name = $repo["name"];
+				$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");
+				//system("$cmd");
+				$fls = popen($cmd, "r");
+				$tks = "";
+				if($fls !== false) while(!feof($fls)) {
+					$tks .= fread($fls,1024);
+				}
+				
+				if($tks == "") {
+					$lastlog = "No Log Info Yet";
+				} else $lastlog = $tks;
+				
+				$owner = gwvpmini_getUser(null, null, $repo["owner"]);
+				$repname = "<a href=\"$BASE_URL/view/$name\">$name</a>";
+				$repown = gwvpmini_HtmlGravatar($owner["email"], 30, "<br>")."<a href=\"$BASE_URL/user/".$owner["username"]."\">".$owner["username"]."</a>";
+				
+				
+				echo "<tr><td>$repname</td><td>$repown</td><td>$desc</td><td>$lastlog</td></tr>";
+			}
+			echo "</table>";
+		}
 	}
 	return true;
 }
@@ -116,8 +151,8 @@ function gwvpmini_GitLogProvider()
 				echo "<tr><td><a href=\"$BASE_URL/view/$name\">$name</a></td><td>$desc</td>";
 				echo "<td>";
 				$repo_base = gwvpmini_getConfigVal("repodir");
-				$cmd = "git --git-dir=\"$repo_base/$name.git\" log -1 2> /dev/null";
-				error_log("CMD: $cmd");
+				$cmd = "git --git-dir=\"$repo_base/$name.git\" log --all -1 2> /dev/null";
+				// error_log("CMD: $cmd");
 				//system("$cmd");
 				$fls = popen($cmd, "r");
 				$tks = "";
@@ -211,7 +246,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")) {
@@ -225,7 +260,7 @@ function gwvpmini_RemoveRepo($rid)
 
 function gwvpmini_RecursiveDelete($fpath)
 {
-	error_log("RECURSEDETELE: ".$fpath);
+	// error_log("RECURSEDETELE: ".$fpath);
 	if(is_file($fpath)){
 		return @unlink($fpath);
 	}
@@ -237,5 +272,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