if($qspl[1] == "switchenable") {
return "gwvpmini_SwitchEnableUser";
}
+ if($qspl[1] == "switchenablerepo") {
+ return "gwvpmini_SwitchEnableRepo";
+ }
} else {\r
error_log("i got here, where next?");\r
return "gwvpmini_AdminMainPage";\r
$rn = $val["name"];
$ds = $val["desc"];
$ow = $val["owner"];
+ $st = $val["status"];
$udet = gwvpmini_getUser(null, null, $ow);
if(!$udet) {
$owl = "Orphaned";
} else {
$owl = $udet["username"]." (".$udet["id"].") - ".$udet["fullname"]." (".$udet["email"].") - <a href=\"mailto:".$udet["email"]."\">Email Owner</a>";
}
- echo "<tr><td><a href=\"$BASE_URL/view/$rn\">$rn</a></td><td>$ds</td><td>$owl</td><td><a href=\"$BASE_URL/admin/removerepo/$id\">Remove</a> <a href=\"$BASE_URL/admin/switchenable/$id\">Disable</a></td></tr>";
+
+ if($st == 1) {
+ $stat = 0;
+ $cstat = "Enable";
+ } else {
+ $stat = 1;\r
+ $cstat = "Disable";
+ }
+
+ echo "<tr><td><a href=\"$BASE_URL/view/$rn\">$rn</a></td><td>$ds</td><td>$owl</td><td><a href=\"$BASE_URL/admin/removerepo/$id\">Remove</a> <a href=\"$BASE_URL/admin/switchenablerepo/$stat/$id\">$cstat</a></td></tr>";
+
}
echo "</table>";
}\r
header("Location: $BASE_URL/admin");\r
}
+
+function gwvpmini_SwitchEnableRepo()
+{
+ global $BASE_URL;\r
+ \r
+ $rid = -1;\r
+ $newst = -1;\r
+ if(isset($_REQUEST["q"])) {\r
+ $query = $_REQUEST["q"];\r
+ $qspl = explode("/", $query);\r
+ if(isset($qspl[2])) {\r
+ $newst = $qspl[2];\r
+ }\r
+ if(isset($qspl[3])) {\r
+ $rid = $qspl[3];\r
+ }\r
+ }\r
+ \r
+ if($newst == 1) $stat = "disabled";\r
+ else $stat = "enabled";\r
+ \r
+ if($rid > 0 && ($newst == 1 || $newst == 0)) {\r
+ $details = gwvpmini_getRepo(null, null, $rid);\r
+ if($newst == 1) gwvpmini_DisableRepo($rid);\r
+ if($newst == 0) gwvpmini_EnableRepo($rid);\r
+ gwvpmini_SendMessage("info", "Repo $uname ($rid) has been $stat");\r
+ } else {\r
+ gwvpmini_SendMessage("info", "Problem disabling repo with rid $rid");\r
+ }\r
+ \r
+ header("Location: $BASE_URL/admin");
+}
?>
\ No newline at end of file
$returns["id"] = $u_res["repos_id"];\r
$returns["name"] = $u_res["repos_name"];\r
$returns["desc"] = $u_res["repos_description"];\r
- $returns["ownerid"] = $u_res["repos_owner"];\r
- $returns["perms"] = $u_res["repos_readperms"];\r
+ $returns["ownerid"] = $u_res["repos_owner"];
+ $returns["status"] = $u_res["repos_status"];\r
}\r
\r
return $returns;\r
\r
}
+// $rid = repo id
+// $uid = user id (a for "anyone", r for "registered")
+// $acc = 0 or 1, 0 = no access, 1 = read access, 2 = write
+// first part of ths is the "base" repo permissions
+// this is spec'd as b:t where t = a (anyone can read), r (only registered can read) or x (explicit read perms)
+function gwvpmini_ChangeRepoPerm($rid, $uid, $acc)
+{
+ $conn = gwvpmini_ConnectDB();
+
+ $sql = "select repos_perms from repos where repos_id='$rid'";
+
+ $res = $conn->query($sql);
+
+ error_log("CHANGEREPOPERMS: call with $rid, $uid, $acc");
+
+ $cperms_t = "";
+ foreach($res as $row) {
+ $cperms_t = $row[0];
+ }
+
+ if($cperms_t === false) return false;
+
+ $permsarray = array();
+ if($cperms_t == "") {
+ $permsarray[$uid] = $acc;
+ } else {
+ $permsarray = unserialize(base64_decode($cperms_t));
+ $permsarray[$uid] = $acc;
+ }
+
+ // check if base is now r or a, we can drop any 1's
+ if($permsarray["b"] == "a" || $permsarray["b"] == "r") {
+ foreach($permsarray as $key => $val) {
+ if($val == 1) {
+ unset($permsarray[$key]);
+ }
+ }
+ }
+
+ $encperms = base64_encode(serialize($permsarray));
+
+ $sql = "update repos set repos_perms='$encperms' where repos_id='$rid'";\r
+
+ $conn->query($sql);
+
+}
+
+//returns 0 for none, 1 for read, 2 for writes
+function gwvpmini_GetRepoPerm($rid, $uid)
+{
+ $conn = gwvpmini_ConnectDB();\r
+ \r
+ $dets = gwvpmini_getRepo(null, null, $rid);
+
+ $sql = "select repos_perms from repos where repos_id='$rid'";\r
+ \r
+ $res = $conn->query($sql);
+
+ error_log("PERMCHECK: FUCK U! $sql");\r
+ \r
+ $cperms_t = false;\r
+ if($res !== false) foreach($res as $row) {\r
+ $cperms_t = $row[0];\r
+ }\r
+ \r
+ if($cperms_t === false) return 0;
+
+ error_log("PERMSCHECK $rid, $uid:".print_r($dets, true));\r
+ \r
+ if($dets === false) return 0;
+
+ if($dets["ownerid"] == $uid) return 2;\r
+ \r
+ $permsarray = unserialize(base64_decode($cperms_t));
+
+ error_log("PERMSARRAY: ".print_r($permsarray,true));
+
+
+ $perm = 0;
+ if($uid != "a") {
+ if(isset($permsarray[$uid])) {
+ $perm = $permsarray[$uid];
+ } else if($permsarray["b"] == "a" ||$permsarray["b"] == "r") {
+ $perm = 1;
+ }
+ } else {
+ if($permsarray["b"] == "a") $perm = 1;
+ }
+
+ return $perm;\r
+
+}
+
function gwvpmini_RemoveRepoDB($id)
{
$conn = gwvpmini_ConnectDB();\r
return $conn->query($sql);
}
-function gwvpmini_DisableUser($uid)
-{
+function gwvpmini_DisableUser($uid)\r
+{\r
$conn = gwvpmini_ConnectDB();\r
- \r
+\r
if($uid < 0) return;\r
- \r
+\r
$sql = "update users set user_status=1 where user_id='$uid'";\r
- \r
- return $conn->query($sql);
+\r
+ return $conn->query($sql);\r
}\r
-
+\r
function gwvpmini_EnableUser($uid)\r
{\r
$conn = gwvpmini_ConnectDB();\r
return $conn->query($sql);\r
}\r
\r
+function gwvpmini_DisableRepo($rid)
+{
+ $conn = gwvpmini_ConnectDB();\r
+ \r
+ if($rid < 0) return;\r
+ \r
+ $sql = "update repos set repos_status=1 where repos_id='$rid'";\r
+ \r
+ return $conn->query($sql);
+}\r
+
+function gwvpmini_EnableRepo($rid)\r
+{\r
+ $conn = gwvpmini_ConnectDB();\r
+\r
+ if($rid < 0) return;
+
+ $sql = "update repos set repos_status=0 where repos_id='$rid'";
+ \r
+ return $conn->query($sql);\r
+}\r
+\r
function gwvpmini_ConnectDB()\r
{\r
"repos_name" TEXT,\r
"repos_description" TEXT,\r
"repos_owner" INTEGER,
- "repos_readperms" TEXT,
+ "repos_perms" TEXT,
+ "repos_status" TEXT,
UNIQUE(repos_name)\r
)';\r
\r
$retval = -1;
if(!$res) return -1;
foreach($res as $row) {
- $reval = (int)$row[0];
+ $retval = (int)$row[0];
}
return $retval;
return $conn->query($sql);\r
}
-function gwvpmini_AddRepo($name, $desc, $ownerid, $perms = "perms-public")
+function gwvpmini_AddRepo($name, $desc, $ownerid)
{
error_log("addrepo in db for $name, $desc, $ownerid");
$conn = gwvpmini_ConnectDB();\r
+
+ $perms["b"] = "a";
+
+ $encperms = base64_encode(serialize($perms));
\r
- $sql = "insert into repos values (null, '$name', '$desc', '$ownerid', '$perms')";\r
+ $sql = "insert into repos values (null, '$name', '$desc', '$ownerid', '$encperms', 0)";\r
\r
$conn->query($sql);\r
}
return $retval;
}\r
-function gwvp_findPeopleLike($search)\r
+function gwvpmini_findPeopleLike($search)\r
{\r
$conn = gwvpmini_ConnectDB();
$retval[$id]["desc"] = $row["repos_description"];\r
$retval[$id]["owner"] = $row["repos_owner"];\r
$retval[$id]["id"] = $row["repos_id"];
+ $retval[$id]["status"] = $row["repos_status"];
}\r
\r
return $retval;\r
\r
}\r
-function gwvp_findReposLike($search)\r
+function gwvpmini_findReposLike($search)\r
{\r
$conn = gwvpmini_ConnectDB();
$retval[$id]["desc"] = $row["repos_description"];
$retval[$id]["owner"] = $row["repos_owner"];
$retval[$id]["id"] = $row["repos_id"];
+ $retval[$id]["status"] = $row["repos_status"];
}
return $retval;
$desc = $repo["desc"];
echo "<tr><td><a href=\"$BASE_URL/view/$name\">$name</a></td><td>$desc</td>";
echo "<td>";\r
- $repo_base = gwvpmini_getConfigVal("repodir");\r
- $cmd = "git --git-dir=\"$repo_base/$name.git\" log -1 2>&1";\r
- error_log("CMD: $cmd");\r
- system("$cmd");\r
+ 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 "</td>";
echo "</tr>";
}
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>&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 "</td>";
echo "</tr>";
}
$search = $_REQUEST["searchstring"];
- $reps = gwvp_findReposLike($search);
- $ppls = gwvp_findPeopleLike($search);
+ $reps = gwvpmini_findReposLike($search);
+ $ppls = gwvpmini_findPeopleLike($search);
$repo_view_call = $qspl[1];
return "gwvpmini_RepoViewPage";\r
} else return false;\r
- } else return false;\r
+ }
+ if($qspl[0] == "updaterepobaseperms") {
+ return "gwvpmini_UpdateRepoBasePerms";
+ }
+ return false;\r
}\r
else return false;\r
}\r
$repo_base = gwvpmini_getConfigVal("repodir");\r
+ $owner_view = false;\r
+
if($_SERVER["SERVER_PORT"] == 443) $proto="https://";
else $proto = "http://";
$sname = $_SERVER["SERVER_NAME"];
$owner_name = $owner["username"];
+
+ if(isset($_SESSION["id"])) {
+ if($owner["id"] == $_SESSION["id"]) {
+ $owner_view = true;
+ }
+ }
+
+
error_log("STUFF:".print_r($owner,true));
$cloneurl = "git clone $proto$sname$BASE_URL/git/$repo_view_call.git";
- echo "<textarea rows=1 cols=".strlen($cloneurl).">$cloneurl</textarea><br>";\r
+ echo "<textarea rows=1 cols=".strlen($cloneurl).">$cloneurl</textarea><br>";
+
+ if($owner_view) $owner_extra = " (YOU)";
+ else $owner_extra = "";\r
- echo "<h2>".get_gravatar($owner["email"], 30, 'mm', 'g', true)."$repo_view_call - $owner_name</h2>";
+ echo "<h2>".get_gravatar($owner["email"], 30, 'mm', 'g', true)."$repo_view_call - $owner_name$owner_extra</h2>";
echo "<b>$desc</b><br>";
+
+ if($owner_view) {
+ $bperms = gwvpmini_GetRepoPerm(gwvpmini_GetRepoId($repo_view_call), "b");
+
+ $anyo = "";
+ $regd = "";
+ $expl = "";
+ if($bperms == "a") $anyo = " selected";\r
+ if($bperms == "r") $regd = " selected";\r
+ if($bperms == "x") $expl = " selected";\r
+
+ error_log("BPERMS: $bperms");
+
+ echo "<form method=\"post\" action=\"$BASE_URL/updaterepobaseperms/$repo_view_call\">";
+ echo "Base Permissions ";
+ echo "<select name=\"base_perms\">";
+ echo "<option value=\"a\"$anyo>Anyone can read</option>";
+ echo "<option value=\"r\"$regd>Only registered users can read</option>";
+ echo "<option value=\"x\"$expl>Explicit read permissions</option>";
+ echo "</select>";
+ echo "<input type=\"submit\" name=\"Set\" value=\"Set\">";
+ echo "</form>";
+ }
//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");
$commitids = array();
echo "<table border=\"1\">";
echo "<tr><th>Committed By</th><th>Date</th><th>Commit Log Entry</th></tr>";
foreach($commitids as $ids) {
- $rs = popen("git --git-dir=$repo_base/$repo_view_call.git log --pretty=format:\"%at%n%ce%n%an%n%s\" $ids -1", "r");
+ $rs = popen("git --git-dir=$repo_base/$repo_view_call.git log --pretty=format:\"%at%n%ce%n%an%n%s\" $ids -1 2> /dev/null", "r");
if($rs) {
$flin1 = trim(fgets($rs));
$flin2 = trim(fgets($rs));
echo "No commit information available yet<br>";
}
}
-\r
+
+function gwvpmini_UpdateRepoBasePerms()
+{
+ global $BASE_URL, $repo_view_call;
+
+ if(isset($_REQUEST["q"])) {\r
+ $query = $_REQUEST["q"];\r
+ $qspl = explode("/", $query);
+ error_log("PLOOP:qview".print_r($qspl, true));\r
+ }
+
+ if(isset($qspl[1])) $repo_view_call = $qspl[1];
+ else {
+ error_log("PLOOP: no repo name");
+ header("Location: $BASE_URL/view/$repo_view_call");
+ return;
+ }
+
+ $newperms = $_REQUEST["base_perms"];
+
+ $owner = gwvpmini_GetRepoOwnerDetailsFromName($repo_view_call);\r
+ $desc = gwvpmini_GetRepoDescFromName($repo_view_call);\r
+ \r
+ $owner_name = $owner["username"];
+
+ $owner_view = false;
+ if(isset($_SESSION["id"])) {\r
+ if($owner["id"] == $_SESSION["id"]) {\r
+ $owner_view = true;\r
+ }\r
+ }
+
+ $rid = gwvpmini_GetRepoId($repo_view_call);
+
+ if(!$owner_view) {
+ gwvpmini_SendMessage("error", "failure updating permission for repo");
+ error_log("PLOOP: attempt to update from non-owner");
+ } else {
+ error_log("PLOOP: updateds: ".print_r($_REQUEST, true));
+ gwvpmini_ChangeRepoPerm($rid, "b", $_REQUEST["base_perms"]);
+ gwvpmini_SendMessage("info", "Base permissions for repo updated");
+ }\r
+
+ header("Location: $BASE_URL/view/$repo_view_call");
+}\r
?>
\ No newline at end of file
projects / gwvp-mini.git / commitdiff