Additional secondary phone and/or general notes fields in customers, branches, suppliers,

[fa-stable.git] / admin / users.php

diff --git a/admin/users.php b/admin/users.php
index afca5d6c0e9b25e005581db3d8d5affd4a13e8ec..09d60684e3e92dcf3fc4c194cfd583fc2e947374 100644 (file)
--- a/admin/users.php
+++ b/admin/users.php
@@ -9,8 +9,8 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security=15;
-$path_to_root="..";
+$page_security = 'SA_USERS';
+$path_to_root = "..";
 include_once($path_to_root . "/includes/session.inc");
 
 page(_("Users"));
@@ -113,12 +113,8 @@ $result = get_users(check_value('show_inactive'));
 start_form();
 start_table($table_style);
 
-//if ($_SESSION["wa_current_user"]->access == 2)
-       $th = array(_("User login"), _("Full Name"), _("Phone"),
-               _("E-mail"), _("Last Visit"), _("Access Level"), "", "");
-//else         
-//     $th = array(_("User login"), _("Full Name"), _("Phone"),
-//             _("E-mail"), _("Last Visit"), _("Access Level"), "");
+$th = array(_("User login"), _("Full Name"), _("Phone"),
+       _("E-mail"), _("Last Visit"), _("Access Level"), "", "");
 
 inactive_control_column($th);
 table_header($th);     
@@ -133,15 +129,14 @@ while ($myrow = db_fetch($result))
        $last_visit_date = sql2date($myrow["last_visit_date"]);
 
        /*The security_headings array is defined in config.php */
-       $not_me = strcasecmp($myrow["user_id"], $_SESSION["wa_current_user"]->username) &&
-       $_SESSION["wa_current_user"]->access == 2;
+       $not_me = strcasecmp($myrow["user_id"], $_SESSION["wa_current_user"]->username);
 
        label_cell($myrow["user_id"]);
        label_cell($myrow["real_name"]);
        label_cell($myrow["phone"]);
        email_cell($myrow["email"]);
        label_cell($last_visit_date, "nowrap");
-       label_cell($security_headings[$myrow["full_access"]]);
+       label_cell($myrow["role"]);
        
     if ($not_me)
                inactive_control_cell($myrow["id"], $myrow["inactive"], 'users', 'id');
@@ -174,7 +169,7 @@ if ($selected_id != -1)
                $_POST['real_name'] = $myrow["real_name"];
                $_POST['phone'] = $myrow["phone"];
                $_POST['email'] = $myrow["email"];
-               $_POST['Access'] = $myrow["full_access"];
+               $_POST['Access'] = $myrow["role_id"];
                $_POST['language'] = $myrow["language"];
                $_POST['profile'] = $myrow["print_profile"];
                $_POST['rep_popup'] = $myrow["rep_popup"];
@@ -211,7 +206,7 @@ text_row_ex(_("Telephone No.:"), 'phone', 30);
 
 email_row_ex(_("Email Address:"), 'email', 50);
 
-security_headings_list_row(_("Access Level:"), 'Access', null); 
+security_roles_list_row(_("Access Level:"), 'Access', null); 
 
 languages_list_row(_("Language:"), 'language', null);