X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fusers.php;h=09d60684e3e92dcf3fc4c194cfd583fc2e947374;hb=179e8cf33e77512ca94cf8389ea36a253feebba7;hp=71db09ce2885fb60af50f4d18974d5c1cd621a47;hpb=67d97bfd7398b932698e254d937f905943412561;p=fa-stable.git diff --git a/admin/users.php b/admin/users.php index 71db09ce..09d60684 100644 --- a/admin/users.php +++ b/admin/users.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security=15; -$path_to_root=".."; +$page_security = 'SA_USERS'; +$path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); page(_("Users")); @@ -20,7 +20,7 @@ include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/admin/db/users_db.inc"); -simple_page_mode(false); +simple_page_mode(true); //------------------------------------------------------------------------------------------------- function can_process() @@ -60,14 +60,14 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') if (can_process()) { - if ($selected_id != '') + if ($selected_id != -1) { - update_user($_POST['user_id'], $_POST['real_name'], $_POST['phone'], + update_user($selected_id, $_POST['user_id'], $_POST['real_name'], $_POST['phone'], $_POST['email'], $_POST['Access'], $_POST['language'], $_POST['profile'], check_value('rep_popup'), $_POST['pos']); if ($_POST['password'] != "") - update_user_password($_POST['user_id'], md5($_POST['password'])); + update_user_password($selected_id, $_POST['user_id'], md5($_POST['password'])); display_notification_centered(_("The selected user has been updated.")); } @@ -76,10 +76,9 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') add_user($_POST['user_id'], $_POST['real_name'], md5($_POST['password']), $_POST['phone'], $_POST['email'], $_POST['Access'], $_POST['language'], $_POST['profile'], check_value('rep_popup'), $_POST['pos']); - + $id = db_insert_id(); // use current user display preferences as start point for new user - update_user_display_prefs($_POST['user_id'], - user_price_dec(), user_qty_dec(), user_exrate_dec(), + update_user_display_prefs($id, user_price_dec(), user_qty_dec(), user_exrate_dec(), user_percent_dec(), user_show_gl_info(), user_show_codes(), user_date_format(), user_date_sep(), user_tho_sep(), user_dec_sep(), user_theme(), user_pagesize(), user_hints(), @@ -104,20 +103,20 @@ if ($Mode == 'Delete') //------------------------------------------------------------------------------------------------- if ($Mode == 'RESET') { - $selected_id = ''; - unset($_POST); // clean all input fields + $selected_id = -1; + $sav = get_post('show_inactive'); + unset($_POST); // clean all input fields + $_POST['show_inactive'] = $sav; } -$result = get_users(); +$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); $k = 0; //row colour counter @@ -130,44 +129,47 @@ 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); 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"]]); - edit_button_cell("Edit".$myrow["user_id"], _("Edit")); - if (strcasecmp($myrow["user_id"], $_SESSION["wa_current_user"]->username) && - $_SESSION["wa_current_user"]->access == 2) - delete_button_cell("Delete".$myrow["user_id"], _("Delete")); + label_cell($myrow["role"]); + + if ($not_me) + inactive_control_cell($myrow["id"], $myrow["inactive"], 'users', 'id'); + elseif (check_value('show_inactive')) + label_cell(''); + + edit_button_cell("Edit".$myrow["id"], _("Edit")); + if ($not_me) + delete_button_cell("Delete".$myrow["id"], _("Delete")); else label_cell(''); end_row(); } //END WHILE LIST LOOP -end_table(); -end_form(); -echo '
'; - +inactive_control_row($th); +end_table(1); //------------------------------------------------------------------------------------------------- -start_form(); - start_table($table_style2); $_POST['email'] = ""; -if ($selected_id != '') +if ($selected_id != -1) { if ($Mode == 'Edit') { //editing an existing User $myrow = get_user($selected_id); + $_POST['id'] = $myrow["id"]; $_POST['user_id'] = $myrow["user_id"]; $_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"]; @@ -193,7 +195,7 @@ label_cell(_("Password:")); label_cell(""); end_row(); -if ($selected_id != '') +if ($selected_id != -1) { table_section_title(_("Enter a new password to change, leave empty to keep current.")); } @@ -204,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); @@ -218,7 +220,7 @@ check_row(_("Use popup window for reports:"), 'rep_popup', $_POST['rep_popup'], end_table(1); -submit_add_or_update_center($selected_id == '', '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); end_page();