X-Git-Url: http://git.pjr.cc/?a=blobdiff_plain;f=gwvplib%2Fgwvprepoadmin.php;h=66cb85b02775a71c9d684d656324b221e273e7c9;hb=d7ac44cc318972895bfc088ee2e1a27336df6db2;hp=baa7cf195047159acad13eb0e87b175b631cd717;hpb=673b7aa46f8ccbd326113eea024320f70eb7ec10;p=gwvp.git

diff --git a/gwvplib/gwvprepoadmin.php b/gwvplib/gwvprepoadmin.php
index baa7cf1..66cb85b 100644
--- a/gwvplib/gwvprepoadmin.php
+++ b/gwvplib/gwvprepoadmin.php
@@ -55,6 +55,24 @@ function gwvp_DoCreateRepoPage()
 	$reponame = $_REQUEST["reponame"];
 	$repodesc = $_REQUEST["repodesc"];
 	
+	$defperms = 0;
+	
+	if(isset($_REQUEST["defperms"])) {
+		switch($_REQUEST["defperms"]) {
+			case "permsall":
+				$defperms = 0;
+				break;
+			case "permsmeonly":
+				$defperms = 1;
+				break;
+			case "permsinvisible":
+				$defperms = 2;
+				break;
+			default:
+				$defperms = 2;
+		}
+	}
+	
 	// TODO: this code is bollocks, need to redo
 	if(gwvp_repoExists($reponame)) {
 		gwvp_SendMessage("error", "a repository with the name <b>\"$reponame\"</b> already exists");
@@ -63,9 +81,9 @@ function gwvp_DoCreateRepoPage()
 		error_log("bundle file tmpname is ".$_FILES["bundlefile"]["tmp_name"]);
 		// function gwvp_createGitRepo($name, $ownerid, $desc, $defaultperms=0, $bundle=null)
 		// TODO: deal with default perms
-		gwvp_createGitRepo($reponame, $_SESSION["id"], $repodesc, $_FILES["bundlefile"]["tmp_name"]);
+		gwvp_createGitRepo($reponame, $_SESSION["id"], $repodesc, $_FILES["bundlefile"]["tmp_name"], $defperms);
 		gwvp_SendMessage("info", "Repo, $reponame, created");
-	} else if(gwvp_createGitRepo($reponame, $_SESSION["id"], $repodesc)) {
+	} else if(gwvp_createGitRepo($reponame, $_SESSION["id"], $repodesc, null, $defperms)) {
 		gwvp_SendMessage("info", "Repo, $reponame, created");
 	}
 	header("Location: $BASE_URL/admin/repos");
@@ -75,7 +93,9 @@ function gwvp_DoCreateRepoPage()
 
 function gwvp_CreateRepoPageBody()
 {
-	global $BASE_URL, $repo_base;
+	global $BASE_URL;
+	
+	$repo_base = gwvp_getConfigVal("repodir");
 	
 	$reponameobv = "";
 	$repodescobv = "";
@@ -94,9 +114,9 @@ function gwvp_CreateRepoPageBody()
 	echo "<tr><td>Default Permisison Set</td><td bgcolor=\"#eeeeee\">";
 	
 	echo "<table>";
-	echo "<tr><td><input type=\"checkbox\" name=\"permsall\" checked></td><td>Anyone Can Read, Only you can write</td></tr>";
-	echo "<tr><td><input type=\"checkbox\" name=\"permsmeonly\"></td><td>Anyone can see the repository exists, but only you can read or write to it</td></tr>";
-	echo "<tr><td><input type=\"checkbox\" name=\"permsinvisible\"></td><td>Repository only visible to you</td></tr>";
+	echo "<tr><td><input type=\"radio\" name=\"defperms\" value=\"permsall\" checked></td><td>Anyone Can Read, Only you can write</td></tr>";
+	echo "<tr><td><input type=\"radio\" name=\"defperms\" value=\"permsmeonly\"></td><td>Anyone can see the repository exists, but only you can read or write to it</td></tr>";
+	echo "<tr><td><input type=\"radio\" name=\"defperms\" value=\"permsinvisible\"></td><td>Repository only visible to you</td></tr>";
 	echo "</table>";
 	
 	
@@ -124,13 +144,14 @@ function gwvp_RepoAdminPageBody()
 		echo "<h3>Your Repo's</h3>";
 		$ownreps = gwvp_getOwnedRepos($_SESSION["id"]);
 		if($ownreps != false) {
-			echo "<table>";
-			echo "<tr><th>Repo Name</th></tr>";
+			echo "<table border=\"1\">";
+			echo "<tr><th>Repo Name</th><th>Repo description</th></tr>";
 			foreach($ownreps as $repos) {
 				$mjay = print_r($repos, true);
 				error_log("snafu: $mjay");
 				$reponame = $repos["name"];
-				echo "<tr><td>$reponame</td></tr>";
+				$repodesc = $repos["description"];
+				echo "<tr><td>$reponame</td><td>$repodesc</td><td><a href=\"$BASE_URL/admin/repos/manageown\">Manage</a></td></tr>";
 			}
 			echo "</table>";
 		} else {
@@ -144,13 +165,13 @@ function gwvp_RepoAdminPageBody()
 	// i must also remember that the home page will also contain a list of repos and that this page is solely for maintance
 	// and creation of repos - so i dont need to get over-worked about the info stored on this page outside of those activities
 	$rlist = gwvp_GetRepoList();
-	echo "<table border=\"1\"><tr><th>Repo Name</th><th>Repo Description</th><th>Repo Owner</th><th>Control</th></tr>";
+	echo "<table border=\"1\"><tr><th>Repo Name</th><th>Repo Description</th><th>Repo Owner</th></tr>";
 	foreach($rlist as $u_res) {
 		$rid = $u_res["id"];
 		$rname = $u_res["name"];
 		$rdesc = $u_res["description"];
 		$rown = gwvp_getUserName($u_res["owner"]);
-		echo "<tr><td>$rname</td><td>$rdesc</td><td>$rown</td><td><a href=\"$BASE_URL/admin/repos/modify/$rid\">Modify</a></td></tr>";
+		echo "<tr><td>$rname</td><td>$rdesc</td><td>$rown</td><td><a href=\"$BASE_URL/admin/repos/modify/$rid\">Details</a></td></tr>";
 	}
 	echo "</table>";