X-Git-Url: http://git.pjr.cc/?p=gwvp-mini.git;a=blobdiff_plain;f=gwvpmini%2Fgwvpmini_db.php;h=82abfda7f0bb7b04420a5afa02bec013270b2620;hp=d75ebcd93eaacd0a0b55809d1495ea0a3c2122cd;hb=b35dc95efeb3c44390afc4eaa0aa295949ef2f9e;hpb=b465be6b98b6bc09b37bba18aa65251fdd224555
diff --git a/gwvpmini/gwvpmini_db.php b/gwvpmini/gwvpmini_db.php
index d75ebcd..82abfda 100644
--- a/gwvpmini/gwvpmini_db.php
+++ b/gwvpmini/gwvpmini_db.php
@@ -6,7 +6,7 @@ $DB_CONNECTION = false;
global $db_url, $db_type;
-error_log("in include for database, $db_type, $db_name");
+//// error_log("in include for database, $db_type, $db_name");
function gwvpmini_DBExists()
@@ -14,15 +14,15 @@ function gwvpmini_DBExists()
global $WEB_ROOT_FS, $BASE_URL, $data_directory, $db_type, $db_name;
// oh this isnt working. poo.
- error_log("checking for $db_name, $db_type");
+ //// error_log("checking for $db_name, $db_type");
if($db_type == "sqlite") {
if(file_exists($db_name)) {
- error_log("Exists");
+ //// error_log("Exists");
return true;
}
else {
- error_log("no exists");
+ //// error_log("no exists");
return false;
}
}
@@ -55,6 +55,232 @@ function gwvpmini_getUser($username=null, $email=null, $id=null)
}
+function gwvpmini_GetActivityLog($nentries = 20, $forid=-1)
+{
+ /*
+ * "activity_id" INTEGER PRIMARY KEY AUTOINCREMENT,
+ "activity_type" TEXT,
+ "activity_date" TEXT,
+ "activity_user" TEXT,
+ "activity_repo" TEXT,
+ "activity_commitid" TEXT,
+ "activity_commitlog" TEXT,
+ "activity_visibleto" TEXT
+
+ */
+ $conn = gwvpmini_ConnectDB();
+
+ if($forid == -1) {
+ // we're searching for anonymous ones
+ $sql = "select * from activity where activity_visibleto='a' order by activity_date desc limit $nentries";
+ } else {
+ $sql = "select * from activity where activity_visibleto='a' or activity_visibleto='r' or activity_visibleto like '%:$forid:%' order by activity_date desc limit $nentries";
+ }
+
+ $vls = $conn->query($sql);
+
+ $nent = 0;
+ $ret = array();
+ if($vls !== false) foreach($vls as $vals) {
+ $ret[$nent]["type"] = $vals["activity_type"];
+ $ret[$nent]["date"] = $vals["activity_date"];
+ $ret[$nent]["userid"] = $vals["activity_user"];
+ $ret[$nent]["repoid"] = $vals["activity_repo"];
+ $ret[$nent]["commitid"] = $vals["activity_commitid"];
+ $ret[$nent]["commitlog"] = $vals["activity_commitlog"];
+ $nent++;
+ }
+
+ if($nent == 0) return false;
+ else return $ret;
+}
+
+
+function gwvpmini_getRepo($ownerid=null, $name=null, $id=null)
+{
+ $conn = gwvpmini_ConnectDB();
+
+ /*
+ * $reposql = '
+ CREATE TABLE "repos" (
+ "repos_id" INTEGER PRIMARY KEY AUTOINCREMENT,
+ "repos_name" TEXT,
+ "repos_description" TEXT,
+ "repos_owner" INTEGER,
+ "repos_readperms" TEXT,
+ UNIQUE(repos_name)
+ )';
+
+ */
+
+ if($ownerid != null) {
+ $res = $conn->query("select * from repos where repos_owner='$ownerid'");
+ } else if($name != null) {
+ $res = $conn->query("select * from repos where repos_name='$name'");
+ } else if($id != null) {
+ $res = $conn->query("select * from repos where repos_id='$id'");
+ } else return false;
+
+ $returns = false;
+ if(!$res) return false;
+ foreach($res as $u_res) {
+ $returns["id"] = $u_res["repos_id"];
+ $returns["name"] = $u_res["repos_name"];
+ $returns["desc"] = $u_res["repos_description"];
+ $returns["ownerid"] = $u_res["repos_owner"];
+ $returns["status"] = $u_res["repos_status"];
+ }
+
+ return $returns;
+
+}
+
+// $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($uid != "b") {
+ if($cperms_t == "") {
+ $permsarray[$uid] = $acc;
+ } else {
+ $permsarray = unserialize(base64_decode($cperms_t));
+ $permsarray[$uid] = $acc;
+ if($acc == 0) {
+ // error_log("PERMSUPDATE: REMOVE $uid");
+ unset($permsarray[$uid]);
+ }
+ }
+ } else {
+ // error_log("CHANGEREPOPERMS for b of $acc");
+ $permsarray["b"] = $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) {
+ // error_log("CHANGEREPOPERMS removed $key $val for base perm change");
+ unset($permsarray[$key]);
+ }
+ }
+ }
+
+ if(is_array($permsarray)) {
+ if(!isset($permsarray["b"])) {
+ // something went wrong, repalce b bit
+ $permsarray["b"] = "a";
+ }
+ } else {
+ // something went even wronger
+ $permsarray["b"] = "a";
+ }
+
+
+ $encperms = base64_encode(serialize($permsarray));
+
+ $sql = "update repos set repos_perms='$encperms' where repos_id='$rid'";
+
+ // error_log("PERMSARRAYNOW $sql ".print_r($permsarray,true));
+
+ $conn->query($sql);
+
+}
+
+function gwvpmini_GetRepoPerms($rid)
+{
+ $conn = gwvpmini_ConnectDB();
+
+ $sql = "select repos_perms from repos where repos_id='$rid'";
+
+ $res = $conn->query($sql);
+
+ $cperms_t = false;
+ if($res !== false) foreach($res as $row) {
+ $cperms_t = $row[0];
+ }
+
+ if($cperms_t === false) return false;
+
+ $permsarray = unserialize(base64_decode($cperms_t));
+
+ return $permsarray;
+}
+
+//returns 0 for none, 1 for read, 2 for writes
+function gwvpmini_GetRepoPerm($rid, $uid)
+{
+ $conn = gwvpmini_ConnectDB();
+
+ $dets = gwvpmini_getRepo(null, null, $rid);
+
+ $sql = "select repos_perms from repos where repos_id='$rid'";
+
+ $res = $conn->query($sql);
+
+ $cperms_t = false;
+ if($res !== false) foreach($res as $row) {
+ $cperms_t = $row[0];
+ }
+
+ if($cperms_t === false) return 0;
+
+ // error_log("PERMSCHECK $rid, $uid:".print_r($dets, true));
+
+ if($dets === false) return 0;
+
+ if($dets["ownerid"] == $uid) return 2;
+
+ $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;
+
+}
+
+function gwvpmini_RemoveRepoDB($id)
+{
+ $conn = gwvpmini_ConnectDB();
+
+ if($id < 0) return;
+
+ $sql = "delete from repos where repos_id='$id'";
+
+ return $conn->query($sql);
+
+}
+
function gwvpmini_RemoveUser($uid)
{
$conn = gwvpmini_ConnectDB();
@@ -66,17 +292,74 @@ function gwvpmini_RemoveUser($uid)
return $conn->query($sql);
}
-function gwvpmini_DisableUser($uid)
+function gwvpmini_UpdateUserEmail($uid, $email)
{
$conn = gwvpmini_ConnectDB();
if($uid < 0) return;
- $sql = "update users set user_status=1 where user_id='$uid'";
+ $sql = "update users set user_email='$email' where user_id='$uid'";
return $conn->query($sql);
+}
+
+function gwvpmini_UpdateUserDesc($uid, $desc)
+{
+ $conn = gwvpmini_ConnectDB();
+
+ if($uid < 0) return;
+
+ $sql = "update users set user_desc='$desc' where user_id='$uid'";
+
+ return $conn->query($sql);
}
+function gwvpmini_SetUserStatusAdmin($uid, $adminstat)
+{
+ $conn = gwvpmini_ConnectDB();
+
+ if($uid < 0) return;
+
+ $sql = "update users set user_level='$adminstat' where user_id='$uid'";
+
+ return $conn->query($sql);
+}
+
+function gwvpmini_UpdateUserPassword($uid, $pass)
+{
+ $conn = gwvpmini_ConnectDB();
+
+ if($uid < 0) return;
+
+ $sql = "update users set user_password='".sha1($pass)."' where user_id='$uid'";
+
+ return $conn->query($sql);
+}
+
+function gwvpmini_DisableUser($uid)
+{
+ $conn = gwvpmini_ConnectDB();
+
+ if($uid < 0) return;
+
+ $sql = "update users set user_status=1 where user_id='$uid'";
+
+ return $conn->query($sql);
+}
+
+function gwvpmini_UpdateRepoDescription($rid, $desc)
+{
+ $conn = gwvpmini_ConnectDB();
+
+ // remove any tag elements
+ $newdesc_r = preg_replace("/[\<\>\;]+/", "", $desc);
+ $newdesc = preg_replace("/\n/", "
", $newdesc_r);
+
+ $sql = "update repos set repos_description='$newdesc' where repos_id='$rid'";
+
+ return $conn->query($sql);
+}
+
function gwvpmini_EnableUser($uid)
{
$conn = gwvpmini_ConnectDB();
@@ -88,20 +371,43 @@ function gwvpmini_EnableUser($uid)
return $conn->query($sql);
}
+function gwvpmini_DisableRepo($rid)
+{
+ $conn = gwvpmini_ConnectDB();
+
+ if($rid < 0) return;
+
+ $sql = "update repos set repos_status=1 where repos_id='$rid'";
+
+ return $conn->query($sql);
+}
+
+function gwvpmini_EnableRepo($rid)
+{
+ $conn = gwvpmini_ConnectDB();
+
+ if($rid < 0) return;
+
+ $sql = "update repos set repos_status=0 where repos_id='$rid'";
+
+ return $conn->query($sql);
+}
+
function gwvpmini_ConnectDB()
{
global $WEB_ROOT_FS, $BASE_URL, $data_directory, $db_type, $db_name, $DB_CONNECTION;
// first check if $DB_CONNECTION IS live
- error_log("in connection $db_type, $db_name");
+ //// error_log("in connection $db_type, $db_name");
+ $db_url = false;
if($DB_CONNECTION != false) return $DB_CONNECTION;
if($db_type == "sqlite") {
$db_url = $db_name;
if(!file_exists($db_name)) {
- error_log("$db_name does not exist - problem");
+ //// error_log("$db_name does not exist - problem");
// TODO: NEED A SETUP AGENT!
gwvpmini_dbCreateSQLiteStructure($db_name);
gwvpmini_setConfigVal("repodir", "$data_directory/repos");
@@ -109,11 +415,11 @@ function gwvpmini_ConnectDB()
}
// and here we go with pdo.
- error_log("attmpting to open db, $db_type:$db_url");
+ // error_log("attmpting to open db, $db_type:$db_url");
try {
$DB_CONNECTION = new PDO("$db_type:$db_url");
} catch(PDOException $exep) {
- error_log("execpt on db open");
+ // error_log("execpt on db open");
return false;
}
@@ -165,6 +471,35 @@ function gwvpmini_AddUser($username, $password, $fullname, $email, $desc, $level
return $retval;
}
+function gwvpmini_AddActivityLog($type, $userid, $repoid, $commitid, $commitlog, $visibleto="a")
+{
+ /*
+ * CREATE TABLE "activity" (
+ "activity_id" INTEGER PRIMARY KEY AUTOINCREMENT,
+ "activity_type" TEXT,
+ "activity_date" TEXT,
+ "activity_user" TEXT,
+ "activity_repo" TEXT,
+ "activity_commitid" TEXT,
+ "activity_commitlog" TEXT,
+ "activity_visibleto" TEXT
+ )';
+
+ */
+
+ $conn = gwvpmini_ConnectDB();
+
+ // TODO: implement visibility
+ //$visibleto = "a";
+
+ $sql = "insert into 'activity' values ( null, '$type', '".time()."', '$userid', '$repoid', '$commitid', '$commitlog', '$visibleto')";
+
+ // error_log("SQL IS $sql");
+
+ $res = $conn->query($sql);
+ if(!$res) return -1;
+ return true;
+}
function gwvpmini_dbCreateSQLiteStructure($dbloc)
{
@@ -195,14 +530,35 @@ function gwvpmini_dbCreateSQLiteStructure($dbloc)
"repos_name" TEXT,
"repos_description" TEXT,
"repos_owner" INTEGER,
- "repos_readperms" TEXT,
+ "repos_perms" TEXT,
+ "repos_status" TEXT,
UNIQUE(repos_name)
)';
// this looks like null, , , user:|group:|authed|anon
// where authed = any authenticated user, anon = everyone (logged in, not logged in, etc)
// read|visible|write = can clone from repo|can see repo exists and see description but not clone from it|can push to repo
- // TODO: is this sufficient? i have to think about it
+ // TODO: is this sufficient? i have to think about it
+
+
+ // type for now will only be "git"
+ // date is obvious
+ // desc is a desction of the activity
+ // link is of the form "repo,reponame,repoid:user,username,useremail,userid" so it
+ // can be attached simply
+ // viewby is a simple list of uid's that should be able to see it... "r" for all registered
+ // "a" for everyone
+ $activitysql = '
+ CREATE TABLE "activity" (
+ "activity_id" INTEGER PRIMARY KEY AUTOINCREMENT,
+ "activity_type" TEXT,
+ "activity_date" TEXT,
+ "activity_user" TEXT,
+ "activity_repo" TEXT,
+ "activity_commitid" TEXT,
+ "activity_commitlog" TEXT,
+ "activity_visibleto" TEXT
+ )';
$configsql = '
CREATE TABLE "config" (
@@ -213,7 +569,7 @@ function gwvpmini_dbCreateSQLiteStructure($dbloc)
try {
$DB_CONNECTION = new PDO("sqlite:$dbloc");
} catch(PDOException $exep) {
- error_log("execpt on db open");
+ // error_log("execpt on db open");
return false;
}
@@ -221,7 +577,8 @@ function gwvpmini_dbCreateSQLiteStructure($dbloc)
$DB_CONNECTION->query($initialuser_admin);
$DB_CONNECTION->query($initialuser_user);
$DB_CONNECTION->query($reposql);
- $DB_CONNECTION->query($configsql);
+ $DB_CONNECTION->query($configsql);
+ $DB_CONNECTION->query($activitysql);
}
function gwvpmini_getConfigVal($confname)
@@ -290,7 +647,7 @@ function gwvpmini_GetRepoId($reponame)
$retval = -1;
if(!$res) return -1;
foreach($res as $row) {
- $reval = (int)$row[0];
+ $retval = (int)$row[0];
}
return $retval;
@@ -313,7 +670,7 @@ function gwvpmini_GetRepoDescFromName($reponame)
$conn = gwvpmini_ConnectDB();
$sql = "select repos_description from repos where repos_name='$reponame'";
- error_log("desc for name sql: $sql");
+ // error_log("desc for name sql: $sql");
$res = $conn->query($sql);
@@ -360,7 +717,7 @@ function gwvpmini_GetRepoOwnerDetailsFromName($reponame)
if(!$res) return -1;
foreach($res as $row) {
$retval = array();
- error_log("STUFF2: ".print_r($row,true));
+ // error_log("STUFF2: ".print_r($row,true));
$retval["id"] = $row["user_id"];
$retval["fullname"] = $row["user_full_name"];
$retval["username"] = $row["user_username"];
@@ -395,13 +752,17 @@ function gwvpmini_setConfigVal($confname, $confval)
return $conn->query($sql);
}
-function gwvpmini_AddRepo($name, $desc, $ownerid, $perms = "perms-public")
+function gwvpmini_AddRepo($name, $desc, $ownerid)
{
- error_log("addrepo in db for $name, $desc, $ownerid");
+ // error_log("addrepo in db for $name, $desc, $ownerid");
$conn = gwvpmini_ConnectDB();
+
+ $perms["b"] = "a";
+
+ $encperms = base64_encode(serialize($perms));
- $sql = "insert into repos values (null, '$name', '$desc', '$ownerid', '$perms')";
+ $sql = "insert into repos values (null, '$name', '$desc', '$ownerid', '$encperms', 0)";
$conn->query($sql);
}
@@ -412,7 +773,7 @@ function gwvpmini_GetUserId($username)
$sql = "select user_id from users where user_username='$username'";
- error_log("userid sql $sql");
+ // error_log("userid sql $sql");
$res = $conn->query($sql);
@@ -430,7 +791,7 @@ function gwvpmini_GetUserNameFromEmail($email)
$sql = "select user_username from users where user_email='$email'";
- error_log("username sql $sql");
+ // error_log("username sql $sql");
$res = $conn->query($sql);
@@ -441,6 +802,7 @@ function gwvpmini_GetUserNameFromEmail($email)
return $retval;
}
+
function gwvpmini_GetOwnedRepos($username)
{
/*
@@ -454,20 +816,69 @@ function gwvpmini_GetOwnedRepos($username)
*/
$conn = gwvpmini_ConnectDB();
+
$uid = gwvpmini_GetUserId($username);
$sql = "select * from repos where repos_owner='$uid'";
- error_log("owned repos sql $sql");
+ // error_log("owned repos sql $sql for username $username");
$res = $conn->query($sql);
+ if($username == "") return false;
$retval = false;
foreach($res as $row) {
$id = $row["repos_id"];
$retval[$id]["name"] = $row["repos_name"];
$retval[$id]["desc"] = $row["repos_description"];
- error_log(print_r($row, true));
+ $retval[$id]["id"] = $row["repos_id"];
+ $retval[$id]["status"] = $row["repos_status"];
+ // error_log(print_r($row, true));
+ }
+
+ // error_log(print_r($retval, true));
+ return $retval;
+}
+
+function gwvpmini_GetContributedRepos($username)
+{
+ /*
+ * CREATE TABLE "repos" (
+ "repos_id" INTEGER PRIMARY KEY AUTOINCREMENT,
+ "repos_name" TEXT,
+ "repos_description" TEXT,
+ "repos_owner" INTEGER
+ )';
+
+ */
+ $conn = gwvpmini_ConnectDB();
+
+
+ $uid = gwvpmini_GetUserId($username);
+ $sql = "select repos_id,repos_description,repos_perms,repos_owner,repos_status,repos_name from repos";
+ $res = $conn->query($sql);
+ if($username == "") return false;
+
+ $retval = false;
+ $rids = null;
+ $i = 0;
+ foreach($res as $row) {
+ $perms = unserialize(base64_decode($row["repos_perms"]));
+ // error_log("CONTRIB: $uid for ".$row["repos_id"]." - ".print_r($perms,true));
+ if(isset($perms["$uid"])) if($perms["$uid"] > 1) {
+ $rids[$i]["id"] = $row["repos_id"];
+ $rids[$i]["desc"] = $row["repos_description"];
+ $rids[$i]["owner"] = $row["repos_owner"];
+ $rids[$i]["status"] = $row["repos_status"];
+ $rids[$i]["name"] = $row["repos_name"];
+ $i++;
+ }
}
+ $retval = $rids;
- error_log(print_r($retval, true));
+ if($i == 0) {
+ // error_log("CONTRIBREPOS: no repos found?");
+ return false;
+ }
+
+ // error_log("CONTRIBREPOS: ".print_r($retval, true));
return $retval;
}
@@ -518,11 +929,43 @@ function gwvpmini_GetUsers($startat = 0, $num = 10)
$retval[$id]["desc"] = $row["user_desc"];
$retval[$id]["level"] = $row["user_level"];
$retval[$id]["status"] = $row["user_status"];
+ $retval[$id]["id"] = $row["user_id"];
}
return $retval;
}
+function gwvpmini_findPeopleLike($search)
+{
+ $conn = gwvpmini_ConnectDB();
+
+ $sql = "select * from users where user_username like '%$search%' or user_full_name like '%$search%'";
+
+ $res = $conn->query($sql);
+
+ if(!$res) {
+ // error_log("SERACHUSER: $sql returned false");
+ return false;
+ } else {
+ // error_log("SERACHUSER: $sql returned true");
+ }
+
+ $retval = false;
+ foreach($res as $row) {
+ $id = $row["user_id"];
+ $retval[$id]["fullname"] = $row["user_full_name"];
+ $retval[$id]["username"] = $row["user_username"];
+ $retval[$id]["email"] = $row["user_email"];
+ $retval[$id]["desc"] = $row["user_desc"];
+ $retval[$id]["level"] = $row["user_level"];
+ $retval[$id]["status"] = $row["user_status"];
+ $retval[$id]["id"] = $row["user_id"];
+ }
+
+ // error_log("SEARCHUSER: array is ".print_r($retval, true));
+ return $retval;
+}
+
function gwvpmini_GetRepos($startat=0, $num=200)
{
$conn = gwvpmini_ConnectDB();
@@ -547,6 +990,8 @@ function gwvpmini_GetRepos($startat=0, $num=200)
$retval[$id]["name"] = $row["repos_name"];
$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;
@@ -554,6 +999,40 @@ function gwvpmini_GetRepos($startat=0, $num=200)
}
+function gwvpmini_findReposLike($search)
+{
+ $conn = gwvpmini_ConnectDB();
+
+ /*
+ * CREATE TABLE "repos" (
+ "repos_id" INTEGER PRIMARY KEY AUTOINCREMENT,
+ "repos_name" TEXT,
+ "repos_description" TEXT,
+ "repos_owner" INTEGER
+ )';
+
+ */
+
+ $sql = "select * from repos where repos_name like '%$search%' or repos_description like '%$search%'";
+
+ $res = $conn->query($sql);
+
+ if(!$res) return false;
+
+ $retval = false;
+ foreach($res as $row) {
+ $id = $row["repos_id"];
+ $retval[$id]["name"] = $row["repos_name"];
+ $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;
+
+}
+
function gwvpmini_GetNRepos()
{
$conn = gwvpmini_ConnectDB();