X-Git-Url: http://git.pjr.cc/?p=gwvp.git;a=blobdiff_plain;f=gwvplib%2Fgwvpdatabase.php;fp=gwvplib%2Fgwvpdatabase.php;h=a79adb0eb360f210d4e70b3e41d9b1f0f194ec16;hp=d9b51cd3b0404b927cfe6b497dfe3c18d3f04713;hb=74399e0d5226d43656c618451b4e6fc06702e5ab;hpb=0a0b03b67435c01c1059f4b084dd6b07aeae81e3

diff --git a/gwvplib/gwvpdatabase.php b/gwvplib/gwvpdatabase.php
index d9b51cd..a79adb0 100644
--- a/gwvplib/gwvpdatabase.php
+++ b/gwvplib/gwvpdatabase.php
@@ -26,6 +26,7 @@ function gwvp_dbCreateSQLiteStructure($dbloc)
 		CREATE TABLE groups (
 	    "groups_id" INTEGER PRIMARY KEY AUTOINCREMENT,
 	    "groups_name" TEXT,
+	    "groups_description" TEXT,
 	    "groups_is_admin" INTEGER,
 		"groups_owner_id" INTEGER
 		)';
@@ -118,6 +119,7 @@ function gwvp_ConnectDB()
 	return $DB_CONNECTION;
 }
 
+// TODO: we have to define what "Status" is
 function gwvp_createUser($email, $fullname, $password, $username, $desc, $status)
 {
 	$conn = gwvp_ConnectDB();
@@ -125,7 +127,9 @@ function gwvp_createUser($email, $fullname, $password, $username, $desc, $status
 	// TODO: change from sha1
 	$shapass = sha1($password);
 	//error_log("Create user called with $email");
-	$conn->query("insert into users values (null, '$fullname', '$shapass', '$username', '$email', '$desc', '$status')");
+	$sql = "insert into users values (null, '$fullname', '$shapass', '$username', '$email', '$desc', '$status')";
+	error_log("Creating user, $sql");
+	return $conn->query($sql);
 	/*
 	 * 	    "users_id" INTEGER PRIMARY KEY AUTOINCREMENT,
 	 "user_full_name" TEXT,
@@ -196,7 +200,7 @@ function gwvp_deleteUser($email)
 	$conn->query($sql);
 }
 
-function gwvp_createGroup($group_name, $is_admin, $owner_id)
+function gwvp_createGroup($group_name, $group_desc, $is_admin, $owner_id)
 {
 	$conn = gwvp_ConnectDB();
 
@@ -214,7 +218,8 @@ function gwvp_createGroup($group_name, $is_admin, $owner_id)
 	} else {
 		$is_admin_t = 0;
 	}
-	$sql = "insert into groups values( null, '$group_name', '$is_admin_t', '$owner_id')";
+	$sql = "insert into groups values( null, '$group_name', '$group_desc', '$is_admin_t', '$owner_id')";
+	
 
 	$conn->query($sql);
 
@@ -350,6 +355,39 @@ function gwvp_getGroupId($groupname)
 	return $return;
 }
 
+function gwvp_getGroup($gid)
+{
+	/* 
+	 * 	$groupsql = '
+		CREATE TABLE groups (
+	    "groups_id" INTEGER PRIMARY KEY AUTOINCREMENT,
+	    "groups_name" TEXT,
+	    "groups_is_admin" INTEGER,
+		"groups_owner_id" INTEGER
+		)';
+
+	 */
+	$conn = gwvp_ConnectDB();
+	
+	$sql = "select * from groups where groups_id='$gid'";
+	
+	$res = $conn->query($sql);
+	$return = false;
+	foreach($res as $u_res) {
+		$return["id"] = $u_res["groups_id"];
+		$return["name"] = $u_res["groups_name"];
+		if($u_res["groups_is_admin"] == 1) {
+			$return["isadmin"] = true;
+		} else {
+			$return["isadmin"] = false;
+		}
+		$return["ownerid"] = $u_res["groups_owner_id"];
+		$return["description"] = $u_res["groups_description"];
+	}
+	
+	return $return;
+}
+
 function gwvp_getUserId($useremail=null, $username = null)
 {
 	$conn = gwvp_ConnectDB();
@@ -369,6 +407,26 @@ function gwvp_getUserId($useremail=null, $username = null)
 	return $return;
 }
 
+function gwvp_getUserName($id = null, $email=null)
+{
+	$conn = gwvp_ConnectDB();
+
+	if($email != null) { 
+		$sql = "select user_username from users where user_email='$email'";
+	} else if($id != null) {
+		$sql = "select user_username from users where users_id='$id'";
+	} else return false;
+
+	$res = $conn->query($sql);
+	$return = false;
+	foreach($res as $u_res) {
+		$return = $u_res["user_username"];
+	}
+
+	return $return;
+}
+
+
 function gwvp_getUserEmail($id)
 {
 	$conn = gwvp_ConnectDB();
@@ -447,6 +505,7 @@ function gwvp_IsUserAdmin($email=null, $username = null)
 
 	$res = $conn->query($sql);
 	$rn = 0;
+	$gid = false;
 	foreach($res as $u_res) {
 		$gid[$rn] = $u_res["groupmember_groupid"];
 		$rn++;