originally i had planned for the username to be the email address and

[gwvp.git] / gwvplib / gwvpuseradmin.php

diff --git a/gwvplib/gwvpuseradmin.php b/gwvplib/gwvpuseradmin.php
index cb5f997..e282fd0 100644 (file)
--- a/gwvplib/gwvpuseradmin.php
+++ b/gwvplib/gwvpuseradmin.php
@@ -61,7 +61,7 @@ function gwvp_UserAdminPageBody()
        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 "<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>";
@@ -78,9 +78,9 @@ function gwvp_UserAdminPageBody()
        foreach($users as $u_users) {
                $uid = $u_users["id"];
                $email = $u_users["email"];
-               $nickname = $u_users["nickname"];
+               $username = $u_users["username"];
                $fullname = $u_users["fullname"];
-               echo "<option value=\"$uid\">$nickname, $fullname ($email)</option>";
+               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>";
@@ -93,12 +93,12 @@ function gwvp_UserAdminPageBody()
        // user list
        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>Admin?</th><th>Status</th></tr>";
+       echo "<tr><th>EMail</th><th>Username</th><th>Full Name</th><th>In Groups</th><th>Owns Groups</th><th>Description</th><th>Admin?</th><th>Status</th></tr>";
        /*
         *              $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"];
@@ -107,7 +107,7 @@ function gwvp_UserAdminPageBody()
        foreach($users as $u_users) {
                $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) {
@@ -132,7 +132,7 @@ function gwvp_UserAdminPageBody()
                        }
                }
                
-               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 "<tr><td>$email</td><td>$username</td><td>$fullname</td><td>$ugroups</td><td>$ogroups</td><td>$desc</td><td>$globaladmin</td><td>$status</td></tr>";
        }
        echo "</table>";