fixing up the "is setup" check in the installer

[gwvp.git] / gwvplib / gwvpuseradmin.php

diff --git a/gwvplib/gwvpuseradmin.php b/gwvplib/gwvpuseradmin.php
index 19f4c71..abe586e 100644 (file)
--- a/gwvplib/gwvpuseradmin.php
+++ b/gwvplib/gwvpuseradmin.php
@@ -55,6 +55,7 @@ function gwvp_AddUserPage()
        $pass2 = $_REQUEST["pass2"];
        $username = $_REQUEST["username"];
        $desc = $_REQUEST["desc"];
+       $sendvalid = isset($_REQUEST["sendvalidation"]);
        
        // now for some validation
        $sendback = false;
@@ -83,6 +84,12 @@ function gwvp_AddUserPage()
                $message .= "Passwords dont match. ";
        }
        
+       if($pass1 == "" && $pass2 == "" && !$sendvalid) {
+               $starpass = true;
+               $sendback = true;
+               $message .= "Password was blank. ";
+       }
+       
        // otherwise, its all good, proceed with user creation
        if($sendback) {
                $_SESSION["sendback_owner"] = "users";
@@ -147,10 +154,6 @@ function gwvp_AddGroupPage()
        $gdesc = $_REQUEST["groupdesc"];
        $owner = $_REQUEST["groupowner"];
        
-       //gwvp_getGroup($gid = null, $gname = null)
-       if($isadmin) error_log("admin true");
-       else error_log("admin not true");
-       
        if(gwvp_getGroup(null, $gname)) {
                $_SESSION["sendback_owner"] = "groups";
                $_SESSION["sendback"] = true;
@@ -159,7 +162,7 @@ function gwvp_AddGroupPage()
                $data["groupdesc"] = $gdesc;
                $data["groupowner"] = $owner;
                if($isadmin) $data["admingroup"] = "checked";
-               //else $data["admingroup"] = "";
+               else $data["admingroup"] = "";
                $data["groupnamestar"] = true;
                
                gwvp_SendMessage("error", "Group name in use");
@@ -431,12 +434,13 @@ function gwvp_UserAdminPageBody()
                
                echo "<form method=\"post\" action=\"$BASE_URL/admin/users/adduser\">";
                echo "<table>";
-               echo "<tr><td>EMail</td><td><input type=\"text\" name=\"email\"$presetemail>$staremail</td>";
-               echo "<td>Full Name</td><td><input type=\"text\" name=\"fullname\"$presetfullname></td></tr>";
-               echo "<tr><td>Password</td><td><input type=\"text\" name=\"pass1\">$starpass</td>";
-               echo "<td>Password Confirm</td><td><input type=\"text\" name=\"pass2\">$starpass</td></tr>";
-               echo "<tr><td>Username</td><td><input type=\"text\" name=\"username\"$presetusername>$starusername</td>";
-               echo "<td>Description</td><td><input type=\"text\" name=\"desc\"$presetdesc></td></tr>";
+               echo "<tr><td bgcolor=\"#eeffee\">EMail</td><td><input type=\"text\" name=\"email\"$presetemail>$staremail</td>";
+               echo "<td bgcolor=\"#eeffee\">Full Name</td><td><input type=\"text\" name=\"fullname\"$presetfullname></td></tr>";
+               echo "<tr><td bgcolor=\"#eeffee\">Password</td><td><input type=\"text\" name=\"pass1\">$starpass</td>";
+               echo "<td bgcolor=\"#eeffee\">Password Confirm</td><td><input type=\"text\" name=\"pass2\">$starpass</td></tr>";
+               echo "<tr><td bgcolor=\"#eeffee\">Username</td><td><input type=\"text\" name=\"username\"$presetusername>$starusername</td>";
+               echo "<td bgcolor=\"#eeffee\">Description</td><td><input type=\"text\" name=\"desc\"$presetdesc></td></tr>";
+               echo "<tr><td colspan=\"4\"><input type=\"checkbox\" name=\"sendvalidation\"> Set account locked and send validation email for initial passsword (not implemented)</td></tr>";
                echo "<tr><td><input type=\"submit\" name=\"Create\" value=\"Create\" class=\"buttons\"></td></tr>";
                echo "</table>";
                echo "</form>";
@@ -478,10 +482,10 @@ function gwvp_UserAdminPageBody()
                // 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\"$presetname>$stargroupname<td></tr>";
-               echo "<tr><td>Group Description</td><td><input type=\"text\" name=\"groupdesc\"$presetdesc><td></tr>";
-               echo "<tr><td>Admin Group?</td><td><input type=\"checkbox\" name=\"admingroup\" class=\"mycheckbox\"$presetgroupadmin></td></tr>";
-               echo "<tr><td>Owner</td><td><div><select class=\"myselect\" name=\"groupowner\">";
+               echo "<tr><td bgcolor=\"#ddddff\">Group Name</td><td bgcolor=\"#ddffdd\"><input type=\"text\" name=\"groupname\"$presetname>$stargroupname<td></tr>";
+               echo "<tr><td bgcolor=\"#ddddff\">Group Description</td><td bgcolor=\"#ddffdd\"><input type=\"text\" name=\"groupdesc\"$presetdesc><td></tr>";
+               echo "<tr><td bgcolor=\"#ddddff\">Admin Group?</td><td bgcolor=\"#ddffdd\"><input type=\"checkbox\" name=\"admingroup\" class=\"mycheckbox\"$presetgroupadmin></td></tr>";
+               echo "<tr><td bgcolor=\"#ddddff\">Owner</td><td bgcolor=\"#ddffdd\"><div><select class=\"myselect\" name=\"groupowner\">";
                foreach($users as $u_users) {
                        $uid = $u_users["id"];
                        $email = $u_users["email"];
@@ -576,6 +580,8 @@ function gwvp_UserAdminPageBody()
                }
                trim($ugroups);
                
+               if($ugroups == "") $ugroups = "-";
+               
                switch($LOGIN_TYPE) {
                        case "anon":
                                echo "<tr><td>$username</td><td>$ugroups</td><td>$desc</td></tr>";