X-Git-Url: http://git.pjr.cc/?a=blobdiff_plain;f=gwvpmini%2Fgwvpmini_view.php;h=642a9bc4beebd06fc131b1b513d244d6efd5e2f8;hb=a48b0aeb6ebace96e4da61738641b87ff4240c5f;hp=b47c1528b5e0aba2d9607163d746a1e5e64ff263;hpb=3175ff316104151c9cca5d33aa09b61f2da6253c;p=gwvp-mini.git

diff --git a/gwvpmini/gwvpmini_view.php b/gwvpmini/gwvpmini_view.php
index b47c152..642a9bc 100644
--- a/gwvpmini/gwvpmini_view.php
+++ b/gwvpmini/gwvpmini_view.php
@@ -10,7 +10,7 @@ function gwvpmini_RepoViewCallMe()
 {
 	global $repo_view_call;
 	
-	error_log("in admin callme");
+	// error_log("in admin callme");
 	if(isset($_REQUEST["q"])) {
 		$query = $_REQUEST["q"];
 		$qspl = explode("/", $query);
@@ -36,6 +36,9 @@ function gwvpmini_RepoViewCallMe()
 			if($qspl[0] == "reporemovecontribs") {
 				return "gwvpmini_RemoveRepoContributor";
 			}
+			if($qspl[0] == "repoupdatedesc") {
+				return "gwvpmini_RepoUpdateDescription";
+			}
 			return false;
 		}
 		else return false;
@@ -73,6 +76,9 @@ function gwvpmini_RepoViewPageBody()
 	
 	$owner = gwvpmini_GetRepoOwnerDetailsFromName($repo_view_call);
 	$desc = gwvpmini_GetRepoDescFromName($repo_view_call);
+	$editdesc = preg_replace("/\<br\>/", "\n", $desc);
+	
+	$rid = gwvpmini_GetRepoId($repo_view_call);
 	
 	$owner_name = $owner["username"];
 	
@@ -96,8 +102,8 @@ function gwvpmini_RepoViewPageBody()
 	}
 	
 	
-	error_log("STUFF:".print_r($owner,true));
-	if($bperms != "a") $login = $_SESSION["username"]."@password:";
+	// error_log("STUFF:".print_r($owner,true));
+	if($bperms != "a") $login = $_SESSION["username"].":password@";
 	else $login = "";
 	$cloneurl = "git clone $proto$login$sname$BASE_URL/git/$repo_view_call.git";
 	echo "<textarea rows=1 cols=".strlen($cloneurl).">$cloneurl</textarea><br>";
@@ -105,10 +111,13 @@ function gwvpmini_RepoViewPageBody()
 	if($owner_view) $owner_extra = " (YOU)";
 	else $owner_extra = "";
 	
-	echo "<h2>".get_gravatar($owner["email"], 30, 'mm', 'g', true)."$repo_view_call - $owner_name$owner_extra</h2>";
-	echo "<b>$desc</b><br>";
+	echo "<h2>".gwvpmini_HtmlGravatar($owner["email"], 30)."$repo_view_call - $owner_name$owner_extra</h2>";
+	if(!$owner_view) echo "$desc<br>";
 	
 	if($owner_view) {
+		echo "<form method=\"post\" action=\"$BASE_URL/repoupdatedesc/$repo_view_call\">";
+		echo "<h3>Description<h3><textarea name=\"desc\" cols=\"120\" rows=\"5\">$editdesc</textarea><br><input type=\"submit\" name=\"Update\" value=\"Update\">";
+		echo "</form><br>";
 		
 		
 
@@ -120,7 +129,7 @@ function gwvpmini_RepoViewPageBody()
 		if($bperms == "r") $regd = " selected";
 		if($bperms == "x") $expl = " selected";
 		
-		error_log("BPERMS: $bperms");
+		// error_log("BPERMS: $bperms");
 		
 		if($bperms == "x") $cspan = 3;
 		else $cspan = 2;
@@ -141,7 +150,7 @@ function gwvpmini_RepoViewPageBody()
 			foreach($bperms_f as $key=>$val) {
 				if($val == 1) {
 					$dets = gwvpmini_getUser(null, null, $key);
-					echo get_gravatar($dets["email"], 18, 'mm', 'g', true)." <input type=\"checkbox\" name=\"$key\"> ".$dets["username"]."<br>";
+					echo gwvpmini_HtmlGravatar($dets["email"], 18, " ")."<input type=\"checkbox\" name=\"$key\"> ".$dets["username"]."<br>";
 					$nl = 1;
 				}
 			}
@@ -158,7 +167,7 @@ function gwvpmini_RepoViewPageBody()
 		foreach($bperms_f as $key=>$val) {
 			if($val == 2) {
 				$dets = gwvpmini_getUser(null, null, $key);
-				echo get_gravatar($dets["email"], 18, 'mm', 'g', true)." <input type=\"checkbox\" name=\"$key\"> ".$dets["username"]."<br>";
+				echo gwvpmini_HtmlGravatar($dets["email"], 18, " ")."<input type=\"checkbox\" name=\"$key\"> ".$dets["username"]."<br>";
 				$nl = 1;
 			}
 		}
@@ -169,6 +178,7 @@ function gwvpmini_RepoViewPageBody()
 		echo "<input type=\"text\" name=\"contribusername\"> <input type=\"submit\" name=\"Add\" value=\"Add\">";
 		echo "</form><br>";
 		echo "</td></tr></table>";
+		
 	}
 	//echo "command: git log --git-dir=$repo_base/$repo_view_call.git --pretty=format:\"%H\" -10";
 	$rs = popen("git --git-dir=$repo_base/$repo_view_call.git log --pretty=format:\"%H\" -10", "r");
@@ -205,7 +215,7 @@ function gwvpmini_RepoViewPageBody()
 					$flon = "$flin3 (external)";
 				}
 			}
-			echo "<tr><td>".get_gravatar($flin2, 18, 'mm', 'g', true)."$flon</td><td>$flin1</td><td>$flin4</td></tr>";
+			echo "<tr><td>".gwvpmini_HtmlGravatar($flin2, 18)."$flon</td><td>$flin1</td><td>$flin4</td></tr>";
 		}
 		echo "</table>";
 	} else {
@@ -220,12 +230,12 @@ function gwvpmini_UpdateRepoBasePerms()
 	if(isset($_REQUEST["q"])) {
 		$query = $_REQUEST["q"];
 		$qspl = explode("/", $query);
-		error_log("PLOOP:qview".print_r($qspl, true));
+		// error_log("PLOOP:qview".print_r($qspl, true));
 	}
 	
 	if(isset($qspl[1])) $repo_view_call = $qspl[1];
 	else {
-		error_log("PLOOP: no repo name");
+		// error_log("PLOOP: no repo name");
 		header("Location: $BASE_URL/view/$repo_view_call");
 		return;
 	}
@@ -248,9 +258,9 @@ function gwvpmini_UpdateRepoBasePerms()
 	
 	if(!$owner_view) {
 		gwvpmini_SendMessage("error", "failure updating permission for repo");
-		error_log("PLOOP: attempt to update from non-owner");
+		// error_log("PLOOP: attempt to update from non-owner");
 	} else {
-		error_log("PLOOP: updateds: ".print_r($_REQUEST, true));
+		// error_log("PLOOP: updateds: ".print_r($_REQUEST, true));
 		gwvpmini_ChangeRepoPerm($rid, "b", $_REQUEST["base_perms"]);
 		gwvpmini_SendMessage("info", "Base permissions for repo updated");
 	}
@@ -265,12 +275,12 @@ function gwvpmini_AddRepoReader()
 	if(isset($_REQUEST["q"])) {
 		$query = $_REQUEST["q"];
 		$qspl = explode("/", $query);
-		error_log("PLOOP:qview".print_r($qspl, true));
+		// error_log("PLOOP:qview".print_r($qspl, true));
 	}
 	
 	if(isset($qspl[1])) $repo_view_call = $qspl[1];
 	else {
-		error_log("PLOOP: no repo name");
+		// error_log("PLOOP: no repo name");
 		// TODO: btw, this makes no sense
 		header("Location: $BASE_URL/view/$repo_view_call");
 		return;
@@ -291,7 +301,7 @@ function gwvpmini_AddRepoReader()
 	}
 	if(!$owner_view) {
 		gwvpmini_SendMessage("error", "failure updating permission for repo");
-		error_log("PLOOP: attempt to update from non-owner");
+		// error_log("PLOOP: attempt to update from non-owner");
 		header("Location: $BASE_URL/view/$repo_view_call");
 		return;
 	}
@@ -327,12 +337,12 @@ function gwvpmini_AddRepoContributor()
 	if(isset($_REQUEST["q"])) {
 		$query = $_REQUEST["q"];
 		$qspl = explode("/", $query);
-		error_log("PLOOP:qview".print_r($qspl, true));
+		// error_log("PLOOP:qview".print_r($qspl, true));
 	}
 	
 	if(isset($qspl[1])) $repo_view_call = $qspl[1];
 	else {
-		error_log("PLOOP: no repo name");
+		// error_log("PLOOP: no repo name");
 		// TODO: btw, this makes no sense
 		header("Location: $BASE_URL/view/$repo_view_call");
 		return;
@@ -353,7 +363,7 @@ function gwvpmini_AddRepoContributor()
 	}
 	if(!$owner_view) {
 		gwvpmini_SendMessage("error", "failure updating permission for repo");
-		error_log("PLOOP: attempt to update from non-owner");
+		// error_log("PLOOP: attempt to update from non-owner");
 		header("Location: $BASE_URL/view/$repo_view_call");
 		return;
 	}
@@ -388,12 +398,12 @@ function gwvpmini_RemoveRepoContributor()
 	if(isset($_REQUEST["q"])) {
 		$query = $_REQUEST["q"];
 		$qspl = explode("/", $query);
-		error_log("PLOOP:qview".print_r($qspl, true));
+		// error_log("PLOOP:qview".print_r($qspl, true));
 	}
 	
 	if(isset($qspl[1])) $repo_view_call = $qspl[1];
 	else {
-		error_log("PLOOP: no repo name");
+		// error_log("PLOOP: no repo name");
 		// TODO: btw, this makes no sense
 		header("Location: $BASE_URL/view/$repo_view_call");
 		return;
@@ -413,7 +423,7 @@ function gwvpmini_RemoveRepoContributor()
 	}
 	if(!$owner_view) {
 		gwvpmini_SendMessage("error", "failure updating permission for repo");
-		error_log("PLOOP: attempt to update from non-owner");
+		// error_log("PLOOP: attempt to update from non-owner");
 		header("Location: $BASE_URL/view/$repo_view_call");
 		return;
 	}
@@ -445,12 +455,12 @@ function gwvpmini_RemoveRepoReader()
 	if(isset($_REQUEST["q"])) {
 		$query = $_REQUEST["q"];
 		$qspl = explode("/", $query);
-		error_log("PLOOP:qview".print_r($qspl, true));
+		// error_log("PLOOP:qview".print_r($qspl, true));
 	}
 
 	if(isset($qspl[1])) $repo_view_call = $qspl[1];
 	else {
-		error_log("PLOOP: no repo name");
+		// error_log("PLOOP: no repo name");
 		// TODO: btw, this makes no sense
 		header("Location: $BASE_URL/view/$repo_view_call");
 		return;
@@ -470,7 +480,7 @@ function gwvpmini_RemoveRepoReader()
 	}
 	if(!$owner_view) {
 		gwvpmini_SendMessage("error", "failure updating permission for repo");
-		error_log("PLOOP: attempt to update from non-owner");
+		// error_log("PLOOP: attempt to update from non-owner");
 		header("Location: $BASE_URL/view/$repo_view_call");
 		return;
 	}
@@ -491,6 +501,52 @@ function gwvpmini_RemoveRepoReader()
 	header("Location: $BASE_URL/view/$repo_view_call");
 	return;
 
+}
+
+function gwvpmini_RepoUpdateDescription()
+{
+	global $BASE_URL, $repo_view_call;
+	
+	if(isset($_REQUEST["q"])) {
+		$query = $_REQUEST["q"];
+		$qspl = explode("/", $query);
+		// error_log("PLOOP:qview".print_r($qspl, true));
+	}
+	
+	if(isset($qspl[1])) $repo_view_call = $qspl[1];
+	else {
+		// error_log("PLOOP: no repo name");
+		// TODO: btw, this makes no sense
+		header("Location: $BASE_URL/view/$repo_view_call");
+		return;
+	}
+	
+	
+	$owner = gwvpmini_GetRepoOwnerDetailsFromName($repo_view_call);
+	$desc = gwvpmini_GetRepoDescFromName($repo_view_call);
+	
+	$owner_name = $owner["username"];
+	
+	$owner_view = false;
+	if(isset($_SESSION["id"])) {
+		if($owner["id"] == $_SESSION["id"]) {
+			$owner_view = true;
+		}
+	}
+	if(!$owner_view) {
+		gwvpmini_SendMessage("error", "failure updating description for repo");
+		// error_log("PLOOP: attempt to update from non-owner");
+		header("Location: $BASE_URL/view/$repo_view_call");
+		return;
+	}
+	
+	$rid = gwvpmini_GetRepoId($repo_view_call);
+	
+	gwvpmini_UpdateRepoDescription($rid, $_REQUEST["desc"]);
+		
+	gwvpmini_SendMessage("info", "Repo description updated");
+	header("Location: $BASE_URL/view/$repo_view_call");
+	return;
 }
 
 ?>
\ No newline at end of file