X-Git-Url: http://git.pjr.cc/?a=blobdiff_plain;f=gwvplib%2Fgwvpuseradmin.php;h=d39aeae97a61a34eaa16347a6855d6ea6330291d;hb=c7bb18886251e5187afbdb8d2101e200eb895ab6;hp=63b3cd8cb8bc6ec253bf38e4ed9b149ff86f95a5;hpb=047523a5083efd83dcd94b6d2763c9fddb913c90;p=gwvp.git

diff --git a/gwvplib/gwvpuseradmin.php b/gwvplib/gwvpuseradmin.php
index 63b3cd8..d39aeae 100644
--- a/gwvplib/gwvpuseradmin.php
+++ b/gwvplib/gwvpuseradmin.php
@@ -11,103 +11,209 @@ function gwvp_UserAdminCallMe()
 {
 	if(isset($_REQUEST["q"])) {
 		$query = $_REQUEST["q"];
-		if($query == "admin/users") return "gwvp_UserAdminPage";
+		$qspl = explode("/", $query);
+		if(isset($qspl[0]) && isset($qspl[1])) {
+			if($qspl[0] == "admin" && $qspl[1] == "users") {
+				if(isset($qspl[2])) {
+					switch($qspl[2]) {
+						case "adduser":
+							return "gwvp_AddUserPage";
+							break;
+						case "addgroup":
+							return "gwvp_AddGroupPage";
+							break;
+						case "modify":
+							return "gwvp_ModifyUserPage";
+							break;
+						case "modifygroup":
+							return "gwvp_ModifyGroupPage";
+							break;
+						default:
+							return "gwvp_UserAdminPage";
+					}					
+				} else {
+					return "gwvp_UserAdminPage";
+				}
+			}
+		} 
 		else return false;
 	}
 	
 	return false;
 }
 
+function gwvp_AddUserPage()
+{
+	
+}
+
+function gwvp_AddGroupPage()
+{
+	
+}
+
 function gwvp_UserAdminPage()
 {
 	gwvp_goMainPage("gwvp_UserAdminPageBody");
 }
 
+function gwvp_ModifyUserPage()
+{
+	gwvp_goMainPage("gwvp_ModifyUserPageBody");
+}
 
-function gwvp_UserAdminPageBody()
+function gwvp_ModifyGroupPage()
 {
-	$groups = gwvp_getGroups();
-	$users = gwvp_getUsers();
+	gwvp_goMainPage("gwvp_ModifyGroupPageBody");
+}
+
+function gwvp_ModifyUserPageBody()
+{
+	//error_log("modify user body - coming in");
+	if(!gwvp_CheckAuthLevel("admin")) {
+		gwvp_AuthNoPermsBody();
+		return;
+	}
 	
-	echo "<h2>User/Group Administration</h2>";
-	echo "On this page you can manage users, groups, group membership and update your profile<br>";
-	echo "<table>";
 	
-	// Header part of table
-	echo "<tr><td valign=\"top\"><h3>My Profile</h3></td><td><h3>My Groups</h3></td></tr>";
+	$uid = -1;
+	if(isset($_REQUEST["q"])) {
+		$query = $_REQUEST["q"];
+		$qspl = explode("/", $query);
+		$uid = $qspl[3];
+	}
 	
-	echo "<tr>";
-	// user profile bit
-	echo "<td valign=\"top\">";
-	echo "User profile bits go here";
-	echo "</td>";
+	echo "modify user $uid";
+}
+
+function gwvp_ModifyGroupPageBody()
+{
+	$gid = -1;
+	if(isset($_REQUEST["q"])) {
+		$query = $_REQUEST["q"];
+		$qspl = explode("/", $query);
+		$gid = $qspl[3];
+	}
 	
-	// now the group bit for the user
-	echo "<td valign=\"top\">";
-	echo "User owned groups, and groups their a member of go here";
-	echo "</td>";
-	echo "</tr>";
+	echo "modify group $gid";
+}
+
+function gwvp_UserAdminPageBody()
+{
+	global $LOGIN_TYPE, $BASE_URL;
 	
+	$groups = gwvp_getGroups();
+	$users = gwvp_getUsers();
 	
-	echo "<tr><td valign=\"top\"><h3>Users</h3></td><td><h3>Groups</h3></td></tr>";
+	echo "<h2>Users and Groups</h2>";
+	echo "On this page you can manage users, groups, group membership and update your profile<br>";
+	echo "<table>";
 	
-	// create user bit
-	echo "<tr><td valign=\"top\">";
+	echo "<tr><td colspan=\"2\"><hr></td></tr>";
 	
-	echo "Create User<br>";
-	echo "<form method=\"post\">";
-	echo "<table>";
-	echo "<tr><td>EMail</td><td><input type=\"text\" name=\"email\"></td>";
-	echo "<td>Full Name</td><td><input type=\"text\" name=\"fullname\"></td></tr>";
-	echo "<tr><td>Password</td><td><input type=\"text\" name=\"pass1\"></td>";
-	echo "<td>Password Confirm</td><td><input type=\"text\" name=\"pass2\"></td></tr>";
-	echo "<tr><td>Nickname</td><td><input type=\"text\" name=\"nick\"></td>";
-	echo "<td>Description</td><td><input type=\"text\" name=\"desc\"></td></tr>";
-	echo "<tr><td><input type=\"submit\" name=\"Create\" value=\"Create\" class=\"buttons\"></td></tr>";
-	echo "</table>";
-	echo "</form>";
 	
-	echo "</td><td valign=\"top\">";
+	// Header part of table
+	// user self-management bit
+	if($LOGIN_TYPE != "anon") {
+		echo "<tr><td valign=\"top\"><h3>My Profile</h3></td><td><h3>My Groups</h3></td></tr>";
+		
+		echo "<tr>";
+		// user profile bit
+		echo "<td valign=\"top\">";
+		echo "User profile bits go here";
+		echo "</td>";
+		
+		// now the group bit for the user
+		echo "<td valign=\"top\">";
+		echo "User owned groups, and groups their a member of go here";
+		echo "</td>";
+		echo "</tr>";
+		
+		echo "<tr><td colspan=\"2\"><hr></td></tr>";
+	}
 	
-	// Create group
-	echo "<form method=\"post\">";
-	echo "<table>";
-	echo "<tr><td>Group Name</td><td><input type=\"text\" name=\"groupname\"><td></tr>";
-	echo "<tr><td>Admin Group?</td><td><input type=\"checkbox\" name=\"admingroup\" class=\"mycheckbox\"></td></tr>";
-	echo "<tr><td>Owner</td><td><div><select class=\"myselect\" name=\"groupowner\">";
-	foreach($users as $u_users) {
-		$uid = $u_users["id"];
-		$email = $u_users["email"];
-		$nickname = $u_users["nickname"];
-		$fullname = $u_users["fullname"];
-		echo "<option value=\"$uid\">$nickname, $fullname ($email)</option>";
+	// admin only bit
+	if($LOGIN_TYPE == "admin") {
+		echo "<tr><td valign=\"top\"><h3>Create User</h3></td><td><h3>Create Group</h3></td></tr>";
+		
+		// create user bit
+		echo "<tr><td valign=\"top\">";
+		
+		echo "<form method=\"post\" action=\"$BASE_URL/admin/users/adduser\">";
+		echo "<table>";
+		echo "<tr><td>EMail</td><td><input type=\"text\" name=\"email\"></td>";
+		echo "<td>Full Name</td><td><input type=\"text\" name=\"fullname\"></td></tr>";
+		echo "<tr><td>Password</td><td><input type=\"text\" name=\"pass1\"></td>";
+		echo "<td>Password Confirm</td><td><input type=\"text\" name=\"pass2\"></td></tr>";
+		echo "<tr><td>Username</td><td><input type=\"text\" name=\"username\"></td>";
+		echo "<td>Description</td><td><input type=\"text\" name=\"desc\"></td></tr>";
+		echo "<tr><td><input type=\"submit\" name=\"Create\" value=\"Create\" class=\"buttons\"></td></tr>";
+		echo "</table>";
+		echo "</form>";
+		
+		echo "</td><td valign=\"top\">";
+		
+		// Create group
+		echo "<form method=\"post\" action=\"$BASE_URL/admin/users/addgroup\">";
+		echo "<table>";
+		echo "<tr><td>Group Name</td><td><input type=\"text\" name=\"groupname\"><td></tr>";
+		echo "<tr><td>Admin Group?</td><td><input type=\"checkbox\" name=\"admingroup\" class=\"mycheckbox\"></td></tr>";
+		echo "<tr><td>Owner</td><td><div><select class=\"myselect\" name=\"groupowner\">";
+		foreach($users as $u_users) {
+			$uid = $u_users["id"];
+			$email = $u_users["email"];
+			$username = $u_users["username"];
+			$fullname = $u_users["fullname"];
+			echo "<option value=\"$uid\">$username, $fullname ($email)</option>";
+		}
+		echo "</select></div></td></tr>";
+		
+		
+		
+		echo "<tr><td><input type=\"submit\" name=\"Create\" value=\"Create\" class=\"buttons\"></td></tr>";
+		echo "</table>";
+		echo "</form>";
+		
+		
+		echo "</td></tr>";
+		echo "<tr><td colspan=\"2\"><hr></td></tr>";
 	}
-	echo "</select></div></td></tr>";
-	echo "<tr><td><input type=\"submit\" name=\"Create\" value=\"Create\" class=\"buttons\"></td></tr>";
-	echo "</table>";
-	echo "</form>";
 	
 	
-	echo "</td></tr>";
 	
+	// TODO: whats seen here will depend GREATLY on setting in config - need to fix this later
 	// user list
+	echo "<tr><td valign=\"top\"><h3>Users</h3></td><td><h3>Groups</h3></td></tr>";
+	
 	echo "<tr><td>";
 	echo "<table border=\"1\">";
-	echo "<tr><th>EMail</th><th>Nick Name</th><th>Full Name</th><th>In Groups</th><th>Owns Groups</th><th>Description</th><th>Is Global Admin?</th><th>Status</th></tr>";
+	switch($LOGIN_TYPE) {
+		case "anon":
+			echo "<tr><th>Username</th><th>Groups</th><th>Description</th></tr>";
+			break;
+		case "admin":
+			echo "<tr><th>EMail</th><th>Username</th><th>Full Name</th><th>Groups</th><th>Description</th><th>Admin?</th><th>Status</th><th>Modify</th></tr>";
+			break;
+		case "user":
+			echo "<tr><th>Username</th><th>Groups</th><th>Description</th></tr>";
+			break;
+	}
+		
 	/*
 	 * 		$returns[$rn]["id"] = $u_res["users_id"];
 		$returns[$rn]["fullname"] = $u_res["user_full_name"];
 		$returns[$rn]["password"] = $u_res["user_password"];
-		$returns[$rn]["nickname"] = $u_res["user_nickname"];
+		$returns[$rn]["username"] = $u_res["user_username"];
 		$returns[$rn]["email"] = $u_res["user_email"];
 		$returns[$rn]["desc"] = $u_res["user_desc"];
 		$returns[$rn]["status"] = $u_res["user_status"];
 
 	 */
 	foreach($users as $u_users) {
+		$userid = $u_users["id"];
 		$email = $u_users["email"];
 		$fullname = $u_users["fullname"];
-		$nickname = $u_users["nickname"];
+		$username = $u_users["username"];
 		$desc = $u_users["desc"];
 		$status = $u_users["status"];
 		if(gwvp_IsUserAdmin($email) == 1) {
@@ -116,23 +222,44 @@ function gwvp_UserAdminPageBody()
 			$globaladmin = "No";
 		}
 		
+		
+		// TODO: sort out group prints here
 		$ingroups = gwvp_getGroupsForUser($email);
-		$ugroups = "";
-		foreach($ingroups as $grname) {
-			$ugroups .= "$grname ";
-		}
-		trim($ugroups);
 		
 		$ownedgroups = gwvp_getGroupsOwnedByUser($email);
-		$ogroups = "";
+		$ugroups = "";
 		if($ownedgroups == false) $ogroups = "-";
 		else {
 			foreach($ownedgroups as $gr_u) {
-				$ogroups .= "$gr_u ";
+				$ugroups .= "<font color=\"#3333ff\">$gr_u</font><br>";
+			}
+		}
+		trim($ugroups);
+		
+		
+		foreach($ingroups as $grname) {
+			$isownedgroup = false;
+			foreach($ownedgroups as $gr_u) {
+				if($grname == $gr_u) $isownedgroup = true;
 			}
+			if(!$isownedgroup) $ugroups .= "$grname<br>";
+		}
+		trim($ugroups);
+		
+		switch($LOGIN_TYPE) {
+			case "anon":
+				echo "<tr><td>$username</td><td>$ugroups</td><td>$desc</td></tr>";
+				break;
+			case "admin":
+				echo "<tr><td>$email</td><td>$username</td><td>$fullname</td><td>$ugroups</td><td>$desc</td>";
+				echo "<td>$globaladmin</td><td>$status</td><td><a href=\"$BASE_URL/admin/users/modify/$userid\">Modify</a></td></tr>";
+				break;
+			case "user":
+				echo "<tr><td>$username</td><td>$ugroups</td><td>$desc</td></tr>";
+				break;
 		}
 		
-		echo "<tr><td>$email</td><td>$nickname</td><td>$fullname</td><td>$ugroups</td><td>$ogroups</td><td>$desc</td><td>$globaladmin</td><td>$status</td></tr>";
+		
 	}
 	echo "</table>";
 	
@@ -141,7 +268,19 @@ function gwvp_UserAdminPageBody()
 	// group part of table
 	
 	echo "<table border=\"1\">";
-	echo "<tr><th>Group Name</th><th>Owner</th><th>Global Admin Group?</th></tr>";
+	
+	switch($LOGIN_TYPE) {
+		case "anon":
+			echo "<tr><th>Group Name</th><th>Owner</th></tr>";
+			break;
+		case "admin":
+			echo "<tr><th>Group Name</th><th>Owner</th><th>Admin Group?</th><th>Modify</th></tr>";
+			break;
+		case "user":
+			echo "<tr><th>Group Name</th><th>Owner</th><th>Admin Group?</th></tr>";
+			break;
+	}
+	
 	foreach($groups as $u_groups) {
 		/*
 		 * 		$returns[$rn]["id"] = $u_res["groups_id"];
@@ -153,10 +292,24 @@ function gwvp_UserAdminPageBody()
 
 		 */
 		$gname = $u_groups["name"];
+		$gid = $u_groups["id"];
 		$owner = gwvp_getUserEmail($u_groups["ownerid"]);
 		if($u_groups["admin"]) $gadmin = "Yes";
 		else $gadmin  = "No";
-		echo "<tr><td>$gname</td><td>$owner</td><td>$gadmin</td></tr>";
+
+		switch($LOGIN_TYPE) {
+			case "anon":
+				echo "<tr><td>$gname</td><td>$owner</td></tr>";
+				break;
+			case "admin":
+				echo "<tr><td>$gname</td><td>$owner</td><td>$gadmin</td><td><a href=\"$BASE_URL/admin/users/modifygroup/$gid\">Modify</a></td></tr>";
+				break;
+			case "user":
+				echo "<tr><td>$gname</td><td>$owner</td><td>$gadmin</td></tr>";
+				break;
+		}
+		
+		
 	}
 	echo "</table>";
 	echo "</td></tr></table>";