Merging version 2.1 RC to main trunk.

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

diff --git a/admin/users.php b/admin/users.php
index bd3b0eb32d7e7109406b6d7f9158db4e04ef4933..71db09ce2885fb60af50f4d18974d5c1cd621a47 100644 (file)
--- a/admin/users.php
+++ b/admin/users.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    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="..";
 include_once($path_to_root . "/includes/session.inc");
@@ -54,7 +63,8 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
        if ($selected_id != '') 
        {
                update_user($_POST['user_id'], $_POST['real_name'], $_POST['phone'],
-                       $_POST['email'], $_POST['Access'], $_POST['language']);
+                       $_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']));
@@ -64,7 +74,17 @@ 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['phone'], $_POST['email'], $_POST['Access'], $_POST['language'],
+                               $_POST['profile'], check_value('rep_popup'), $_POST['pos']);
+
+                       // 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(), 
+                               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']);
 
                        display_notification_centered(_("A new user has been added."));
        }
@@ -114,13 +134,13 @@ while ($myrow = db_fetch($result))
        label_cell($myrow["user_id"]);
        label_cell($myrow["real_name"]);
        label_cell($myrow["phone"]);
-       label_cell($myrow["email"]);
+       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)
-               edit_button_cell("Delete".$myrow["user_id"], _("Delete"));
+               delete_button_cell("Delete".$myrow["user_id"], _("Delete"));
        else
                label_cell('');
        end_row();
@@ -135,6 +155,8 @@ echo '<br>';
 start_form();
 
 start_table($table_style2);
+
+$_POST['email'] = "";
 if ($selected_id != '') 
 {
        if ($Mode == 'Edit') {
@@ -147,6 +169,9 @@ if ($selected_id != '')
                $_POST['email'] = $myrow["email"];
                $_POST['Access'] = $myrow["full_access"];
                $_POST['language'] = $myrow["language"];
+               $_POST['profile'] = $myrow["print_profile"];
+               $_POST['rep_popup'] = $myrow["rep_popup"];
+               $_POST['pos'] = $myrow["pos"];
        }
        hidden('selected_id', $selected_id);
        hidden('user_id');
@@ -157,6 +182,10 @@ if ($selected_id != '')
 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['rep_popup'] = user_rep_popup();
+       $_POST['pos'] = user_pos();
 }
 $_POST['password'] = "";
 start_row();
@@ -173,12 +202,20 @@ text_row_ex(_("Full Name").":", 'real_name',  50);
 
 text_row_ex(_("Telephone No.:"), 'phone', 30);
 
-text_row_ex(_("Email Address:"), 'email', 50);
+email_row_ex(_("Email Address:"), 'email', 50);
 
 security_headings_list_row(_("Access Level:"), 'Access', null); 
 
 languages_list_row(_("Language:"), 'language', null);
 
+pos_list_row(_("User's POS"). ':', 'pos', null);
+
+print_profiles_list_row(_("Printing profile"). ':', 'profile', null,
+       _('Browser printing support'));
+
+check_row(_("Use popup window for reports:"), 'rep_popup', $_POST['rep_popup'],
+       false, _('Set this option to on if your browser directly supports pdf files'));
+
 end_table(1);
 
 submit_add_or_update_center($selected_id == '', '', true);