X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fusers.php;h=fbb42a678c2228ce5b3f3237ea1128095f3c78f5;hb=7e6e0807990447d2977b970c3a0fd28dc9250194;hp=e4446570ddc4b771e5081bcb464344464a08b8bc;hpb=a4dca0bf1f12af6c9714036d612aa6bce8454287;p=fa-stable.git diff --git a/admin/users.php b/admin/users.php index e4446570..fbb42a67 100644 --- a/admin/users.php +++ b/admin/users.php @@ -13,7 +13,7 @@ $page_security = 'SA_USERS'; $path_to_root = ".."; include_once($path_to_root . "/includes/session.inc"); -page(_("Users")); +page(_($help_context = "Users")); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); @@ -23,7 +23,7 @@ include_once($path_to_root . "/admin/db/users_db.inc"); simple_page_mode(true); //------------------------------------------------------------------------------------------------- -function can_process() +function can_process($new) { if (strlen($_POST['user_id']) < 4) @@ -33,7 +33,7 @@ function can_process() return false; } - if ($_POST['password'] != "") + if (!$new && ($_POST['password'] != "")) { if (strlen($_POST['password']) < 4) { @@ -55,16 +55,16 @@ function can_process() //------------------------------------------------------------------------------------------------- -if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') +if (($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') && check_csrf_token()) { - if (can_process()) + if (can_process($Mode == 'ADD_ITEM')) { if ($selected_id != -1) { - 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']); + update_user_prefs($selected_id, + get_post(array('user_id', 'real_name', 'phone', 'email', 'role_id', 'language', + 'print_profile', 'rep_popup' => 0, 'pos'))); if ($_POST['password'] != "") update_user_password($selected_id, $_POST['user_id'], md5($_POST['password'])); @@ -74,16 +74,14 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') else { 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']); + $_POST['phone'], $_POST['email'], $_POST['role_id'], $_POST['language'], + $_POST['print_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($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(), - $_POST['profile'], check_value('rep_popup'), user_query_size(), - user_graphic_links(), $_POST['language'], sticky_doc_date(), user_startup_tab()); + $prefs = $_SESSION['wa_current_user']->prefs->get_all(); + + update_user_prefs($id, array_merge($prefs, get_post(array('print_profile', + 'rep_popup' => 0, 'language')))); display_notification_centered(_("A new user has been added.")); } @@ -93,25 +91,34 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') //------------------------------------------------------------------------------------------------- -if ($Mode == 'Delete') +if ($Mode == 'Delete' && check_csrf_token()) { - delete_user($selected_id); - display_notification_centered(_("User has been deleted.")); - $Mode = 'RESET'; + $cancel_delete = 0; + if (key_in_foreign_table($selected_id, 'audit_trail', 'user')) + { + $cancel_delete = 1; + display_error(_("Cannot delete this user because entries are associated with this user.")); + } + if ($cancel_delete == 0) + { + delete_user($selected_id); + display_notification_centered(_("User has been deleted.")); + } //end if Delete group + $Mode = 'RESET'; } //------------------------------------------------------------------------------------------------- if ($Mode == 'RESET') { $selected_id = -1; - $sav = get_post('show_inactive'); + $sav = get_post('show_inactive', null); unset($_POST); // clean all input fields $_POST['show_inactive'] = $sav; } $result = get_users(check_value('show_inactive')); start_form(); -start_table($table_style); +start_table(TABLESTYLE); $th = array(_("User login"), _("Full Name"), _("Phone"), _("E-mail"), _("Last Visit"), _("Access Level"), "", ""); @@ -126,7 +133,9 @@ while ($myrow = db_fetch($result)) alt_table_row_color($k); - $last_visit_date = sql2date($myrow["last_visit_date"]); + $time_format = (user_date_format() == 0 ? "h:i a" : "H:i"); + $last_visit_date = sql2date($myrow["last_visit_date"]). " " . + date($time_format, strtotime($myrow["last_visit_date"])); /*The security_headings array is defined in config.php */ $not_me = strcasecmp($myrow["user_id"], $_SESSION["wa_current_user"]->username); @@ -155,7 +164,7 @@ while ($myrow = db_fetch($result)) inactive_control_row($th); end_table(1); //------------------------------------------------------------------------------------------------- -start_table($table_style2); +start_table(TABLESTYLE2); $_POST['email'] = ""; if ($selected_id != -1) @@ -169,9 +178,9 @@ if ($selected_id != -1) $_POST['real_name'] = $myrow["real_name"]; $_POST['phone'] = $myrow["phone"]; $_POST['email'] = $myrow["email"]; - $_POST['Access'] = $myrow["role_id"]; + $_POST['role_id'] = $myrow["role_id"]; $_POST['language'] = $myrow["language"]; - $_POST['profile'] = $myrow["print_profile"]; + $_POST['print_profile'] = $myrow["print_profile"]; $_POST['rep_popup'] = $myrow["rep_popup"]; $_POST['pos'] = $myrow["pos"]; } @@ -185,15 +194,12 @@ else { //end of if $selected_id only do the else when a new record is being entered text_row(_("User Login:"), "user_id", null, 22, 20); $_POST['language'] = user_language(); - $_POST['profile'] = user_print_profile(); + $_POST['print_profile'] = user_print_profile(); $_POST['rep_popup'] = user_rep_popup(); $_POST['pos'] = user_pos(); } $_POST['password'] = ""; -start_row(); -label_cell(_("Password:")); -label_cell(""); -end_row(); +password_row(_("Password:"), 'password', $_POST['password']); if ($selected_id != -1) { @@ -206,13 +212,13 @@ text_row_ex(_("Telephone No.:"), 'phone', 30); email_row_ex(_("Email Address:"), 'email', 50); -security_roles_list_row(_("Access Level:"), 'Access', null); +security_roles_list_row(_("Access Level:"), 'role_id', null); languages_list_row(_("Language:"), 'language', null); pos_list_row(_("User's POS"). ':', 'pos', null); -print_profiles_list_row(_("Printing profile"). ':', 'profile', null, +print_profiles_list_row(_("Printing profile"). ':', 'print_profile', null, _('Browser printing support')); check_row(_("Use popup window for reports:"), 'rep_popup', $_POST['rep_popup'], @@ -224,4 +230,3 @@ submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); end_page(); -?>