From 4531a6c712b2529a01f31ddde2ef4d7045d173c7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20Sch=C3=B6ling?= Date: Thu, 16 Feb 2012 20:51:50 +0100 Subject: [PATCH] =?utf8?q?Usermaske=20im=20Adminbereich=20vor=20logins=20a?= =?utf8?q?us=20sessions=20gesch=C3=BCtzt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Notwendigerweise zusätzlich User->new und Auth->read_user auf %params umgeschrieben. --- SL/Auth.pm | 41 ++-- SL/Dispatcher.pm | 2 +- SL/User.pm | 12 +- bin/mozilla/admin.pl | 249 +++++++++++------------ bin/mozilla/login.pl | 4 +- scripts/console | 2 +- scripts/dbupgrade2_tool.pl | 2 +- scripts/rose_auto_create_model.pl | 2 +- scripts/task_server.pl | 2 +- t/Support/TestSetup.pm | 2 +- templates/webpages/admin/edit_user.html | 112 ++++------ templates/webpages/admin/list_users.html | 2 +- 12 files changed, 200 insertions(+), 232 deletions(-) diff --git a/SL/Auth.pm b/SL/Auth.pm index d8552686b..d00edb812 100644 --- a/SL/Auth.pm +++ b/SL/Auth.pm @@ -54,7 +54,7 @@ sub get_user_dbh { my ($self, $login, %params) = @_; my $may_fail = delete $params{may_fail}; - my %user = $self->read_user($login); + my %user = $self->read_user(login => $login); my $dbh = SL::DBConnect->connect( $user{dbconnect}, $user{dbuser}, @@ -244,9 +244,9 @@ sub dbdisconnect { sub check_tables { $main::lxdebug->enter_sub(); - my $self = shift; + my ($self, $dbh) = @_; - my $dbh = $self->dbconnect(); + $dbh ||= $self->dbconnect(); my $query = qq|SELECT COUNT(*) FROM pg_tables WHERE (schemaname = 'auth') AND (tablename = 'user')|; my ($count) = $dbh->selectrow_array($query); @@ -438,15 +438,25 @@ sub read_all_users { sub read_user { $main::lxdebug->enter_sub(); - my $self = shift; - my $login = shift; + my ($self, %params) = @_; my $dbh = $self->dbconnect(); + + my (@where, @values); + if ($params{login}) { + push @where, 'u.login = ?'; + push @values, $params{login}; + } + if ($params{id}) { + push @where, 'u.id = ?'; + push @values, $params{id}; + } + my $where = join ' AND ', '1 = 1', @where; my $query = qq|SELECT u.id, u.login, cfg.cfg_key, cfg.cfg_value FROM auth.user_config cfg LEFT JOIN auth."user" u ON (cfg.user_id = u.id) - WHERE (u.login = ?)|; - my $sth = prepare_execute_query($main::form, $dbh, $query, $login); + WHERE $where|; + my $sth = prepare_execute_query($main::form, $dbh, $query, @values); my %user_data; @@ -485,23 +495,26 @@ sub delete_user { my $self = shift; my $login = shift; - my $u_dbh = $self->get_user_dbh($login, may_fail => 1); my $dbh = $self->dbconnect; + my $id = $self->get_user_id($login); + my $user_db_exists; - $dbh->begin_work; + $dbh->rollback and return $::lxdebug->leave_sub if (!$id); - my $query = qq|SELECT id FROM auth."user" WHERE login = ?|; + my $u_dbh = $self->get_user_dbh($login, may_fail => 1); + $user_db_exists = $self->check_tables($u_dbh) if $u_dbh; - my ($id) = selectrow_query($::form, $dbh, $query, $login); + $u_dbh->begin_work if $u_dbh && $user_db_exists; - $dbh->rollback and return $::lxdebug->leave_sub if (!$id); + $dbh->begin_work; do_query($::form, $dbh, qq|DELETE FROM auth.user_group WHERE user_id = ?|, $id); do_query($::form, $dbh, qq|DELETE FROM auth.user_config WHERE user_id = ?|, $id); - do_query($::form, $u_dbh, qq|UPDATE employee SET deleted = 't' WHERE login = ?|, $login) if $u_dbh; + do_query($::form, $dbh, qq|DELETE FROM auth.user WHERE id = ?|, $id); + do_query($::form, $u_dbh, qq|UPDATE employee SET deleted = 't' WHERE login = ?|, $login) if $u_dbh && $user_db_exists; $dbh->commit; - $u_dbh->commit if $u_dbh; + $u_dbh->commit if $u_dbh && $user_db_exists; $::lxdebug->leave_sub; } diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm index e9f7dac09..dbb476d6c 100644 --- a/SL/Dispatcher.pm +++ b/SL/Dispatcher.pm @@ -205,7 +205,7 @@ sub handle_request { } else { show_error('login/password_error', 'session') if SL::Auth::SESSION_EXPIRED == $session_result; - %::myconfig = $::auth->read_user($::form->{login}); + %::myconfig = $::auth->read_user(login => $::form->{login}); show_error('login/password_error', 'password') unless $::myconfig{login}; diff --git a/SL/User.pm b/SL/User.pm index 5d58b5dac..acbe5cf76 100644 --- a/SL/User.pm +++ b/SL/User.pm @@ -49,12 +49,12 @@ use strict; sub new { $main::lxdebug->enter_sub(); - my ($type, $login) = @_; + my ($type, %params) = @_; my $self = {}; - if ($login ne "") { - my %user_data = $main::auth->read_user($login); + if ($params{id} || $params{login}) { + my %user_data = $main::auth->read_user(%params); map { $self->{$_} = $user_data{$_} } keys %user_data; } @@ -102,7 +102,7 @@ sub login { my $rc = -3; if ($self->{login}) { - my %myconfig = $main::auth->read_user($self->{login}); + my %myconfig = $main::auth->read_user(login => $self->{login}); # check if database is down my $dbh = SL::DBConnect->connect($myconfig{dbconnect}, $myconfig{dbuser}, $myconfig{dbpasswd}) @@ -787,5 +787,9 @@ sub error { $main::lxdebug->leave_sub(); } +sub data { + +{ %{ $_[0] } } +} + 1; diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl index 6d518fcbd..9e34fba20 100755 --- a/bin/mozilla/admin.pl +++ b/bin/mozilla/admin.pl @@ -73,6 +73,16 @@ our $form; our $locale; our $auth; +my @valid_dateformats = qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd); +my @valid_numberformats = ('1,000.00', '1000.00', '1.000,00', '1000,00'); +my @all_stylesheets = qw(lx-office-erp.css Win2000.css); +my @all_menustyles = ( + { id => 'old', title => $::locale->text('Old (on the side)') }, + { id => 'v3', title => $::locale->text('Top (CSS)') }, + { id => 'v4', title => $::locale->text('Top (CSS) new') }, + { id => 'neu', title => $::locale->text('Top (Javascript)') }, +); + sub run { $::lxdebug->enter_sub; my $session_result = shift; @@ -366,14 +376,12 @@ sub list_users { } sub add_user { - my $form = $main::form; - my $locale = $main::locale; - - $form->{title} = "Lx-Office ERP " . $locale->text('Administration') . " / " . $locale->text('Add User'); + $::form->{title} = "Lx-Office ERP " . $::locale->text('Administration') . " / " . $::locale->text('Add User'); # Note: Menu Style 'v3' is not compatible to all browsers! # "menustyle" => "old" sets the HTML Menu to default. - my $myconfig = { +# User does not have a well behaved new constructor, so we#Ll just have to build one ourself + my $user = bless { "vclimit" => 200, "countrycode" => "de", "numberformat" => "1.000,00", @@ -383,179 +391,122 @@ sub add_user { dbport => $::auth->{DB_config}->{port} || 5432, dbuser => $::auth->{DB_config}->{user} || 'lxoffice', dbhost => $::auth->{DB_config}->{host} || 'localhost', - }; + }, 'User'; - - edit_user_form($myconfig); + edit_user_form($user); } sub edit_user { - my $form = $main::form; - my $locale = $main::locale; - - $form->{title} = "Lx-Office ERP " . $locale->text('Administration') . " / " . $locale->text('Edit User'); - $form->{edit} = 1; - - $form->isblank("login", $locale->text("The login is missing.")); + $::form->{title} = "Lx-Office ERP " . $::locale->text('Administration') . " / " . $::locale->text('Edit User'); + $::form->{edit} = 1; # get user - my $myconfig = new User($form->{login}); + my $user = User->new(id => $::form->{user}{id}); # strip basedir from templates directory - $myconfig->{templates} =~ s|.*/||; + $user->{templates} =~ s|.*/||; - edit_user_form($myconfig); + edit_user_form($user); } sub edit_user_form { - my ($myconfig) = @_; - - my $form = $main::form; - my $locale = $main::locale; - - my @valid_dateformats = qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd); - $form->{ALL_DATEFORMATS} = [ map { { "format" => $_, "selected" => $_ eq $myconfig->{dateformat} } } @valid_dateformats ]; - - my @valid_numberformats = ('1,000.00', '1000.00', '1.000,00', '1000,00'); - $form->{ALL_NUMBERFORMATS} = [ map { { "format" => $_, "selected" => $_ eq $myconfig->{numberformat} } } @valid_numberformats ]; - - my %countrycodes = User->country_codes; - $form->{ALL_COUNTRYCODES} = []; - foreach my $countrycode (sort { $countrycodes{$a} cmp $countrycodes{$b} } keys %countrycodes) { - push @{ $form->{ALL_COUNTRYCODES} }, { "value" => $countrycode, - "name" => $countrycodes{$countrycode}, - "selected" => $countrycode eq $myconfig->{countrycode} }; - } - - # is there a templates basedir - if (!-d $::lx_office_conf{paths}->{templates}) { - $form->error(sprintf($locale->text("The directory %s does not exist."), $::lx_office_conf{paths}->{templates})); - } - - opendir TEMPLATEDIR, $::lx_office_conf{paths}->{templates} or $form->error($::lx_office_conf{paths}->{templates} . " : $ERRNO"); - my @all = readdir(TEMPLATEDIR); - my @alldir = sort grep { -d ($::lx_office_conf{paths}->{templates} . "/$_") && !/^\.\.?$/ } @all; - closedir TEMPLATEDIR; - - @alldir = grep !/\.(html|tex|sty|odt|xml|txb)$/, @alldir; - @alldir = grep !/^(webpages|print|\.svn)$/, @alldir; - - $form->{ALL_TEMPLATES} = [ map { { "name", => $_, "selected" => $_ eq $myconfig->{templates} } } @alldir ]; - - # mastertemplates - opendir TEMPLATEDIR, "$::lx_office_conf{paths}->{templates}/print" or $form->error("$::lx_office_conf{paths}->{templates}/print" . " : $ERRNO"); - my @allmaster = readdir(TEMPLATEDIR); - closedir TEMPLATEDIR; - - @allmaster = sort grep { -d ("$::lx_office_conf{paths}->{templates}/print" . "/$_") && !/^\.\.?$/ } @allmaster; - @allmaster = reverse grep !/Default/, @allmaster; - push @allmaster, 'Default'; - @allmaster = reverse @allmaster; - - foreach my $item (@allmaster) { - push @{ $form->{ALL_MASTER_TEMPLATES} }, { "name" => $item, "selected" => $item eq "German" }; - } - - # css dir has styles that are not intended as general layouts. - # reverting to hardcoded list - $form->{ALL_STYLESHEETS} = [ map { { "name" => $_, "selected" => $_ eq $myconfig->{stylesheet} } } qw(lx-office-erp.css Win2000.css) ]; - - $form->{"menustyle_" . $myconfig->{menustyle} } = 1; - - map { $form->{"myc_${_}"} = $myconfig->{$_} } keys %{ $myconfig }; + my ($user) = @_; + my %cc = $user->country_codes; + my @all_countrycodes = map { id => $_, title => $cc{$_} }, sort { $cc{$a} cmp $cc{$b} } keys %cc; + my ($all_dir, $all_master) = _search_templates(); my $groups = []; - if ($form->{edit}) { - my $user_id = $main::auth->get_user_id($form->{login}); - my $all_groups = $main::auth->read_groups(); + if ($::form->{edit}) { + my $user_id = $::auth->get_user_id($::form->{login}); + my $all_groups = $::auth->read_groups(); - foreach my $group (values %{ $all_groups }) { + for my $group (values %{ $all_groups }) { push @{ $groups }, $group if (grep { $user_id == $_ } @{ $group->{members} }); } $groups = [ sort { lc $a->{name} cmp lc $b->{name} } @{ $groups } ]; } - $form->{CAN_CHANGE_PASSWORD} = $main::auth->can_change_password(); - - $form->header(); - print $form->parse_html_template("admin/edit_user", { 'GROUPS' => $groups }); + $::form->header; + print $::form->parse_html_template("admin/edit_user", { + GROUPS => $groups, + CAN_CHANGE_PASSWORD => $::auth->can_change_password, + user => $user->data, + all_stylesheets => \@all_stylesheets, + all_numberformats => \@valid_numberformats, + all_dateformats => \@valid_dateformats, + all_countrycodes => \@all_countrycodes, + all_menustyles => \@all_menustyles, + all_templates => $all_dir, + all_master_templates => $all_master, + }); } sub save_user { my $form = $main::form; my $locale = $main::locale; - $form->{dbdriver} = 'Pg'; + my $user = $form->{user}; + + $user->{dbdriver} = 'Pg'; - # no spaces allowed in login name - $form->{login} =~ s|\s||g; - $form->isblank("login", $locale->text('Login name missing!')); + if (!$::form->{edit}) { + # no spaces allowed in login name + $user->{login} =~ s/\s//g; + $::form->show_generic_error($::locale->text('Login name missing!')) unless $user->{login}; - # check for duplicates - if (!$form->{edit}) { - my %members = $main::auth->read_all_users(); - if ($members{$form->{login}}) { - $form->show_generic_error($locale->text('Another user with the login #1 does already exist.', $form->{login}), 'back_button' => 1); + # check for duplicates + my %members = $::auth->read_all_users; + if ($members{$user->{login}}) { + $::form->show_generic_error($locale->text('Another user with the login #1 does already exist.', $user->{login}), 'back_button' => 1); } } # no spaces allowed in directories - ($form->{newtemplates}) = split / /, $form->{newtemplates}; - - if ($form->{newtemplates}) { - $form->{templates} = $form->{newtemplates}; - } else { - $form->{templates} = - ($form->{usetemplates}) ? $form->{usetemplates} : $form->{login}; - } + ($::form->{newtemplates}) = split / /, $::form->{newtemplates}; + $user->{templates} = $::form->{newtemplates} || $::form->{usetemplates} || $user->{login}; # is there a basedir if (!-d $::lx_office_conf{paths}->{templates}) { - $form->error(sprintf($locale->text("The directory %s does not exist."), $::lx_office_conf{paths}->{templates})); + $::form->error(sprintf($::locale->text("The directory %s does not exist."), $::lx_office_conf{paths}->{templates})); } # add base directory to $form->{templates} - $form->{templates} =~ s|.*/||; - $form->{templates} = $::lx_office_conf{paths}->{templates} . "/$form->{templates}"; - - my $myconfig = new User($form->{login}); + $user->{templates} =~ s|.*/||; + $user->{templates} = $::lx_office_conf{paths}->{templates} . "/$user->{templates}"; - $form->isblank("dbname", $locale->text('Dataset missing!')); - $form->isblank("dbuser", $locale->text('Database User missing!')); + my $myconfig = new User(id => $form->{id}); - foreach my $item (keys %{$form}) { - $myconfig->{$item} = $form->{$item}; - } + $::form->show_generic_error($::locale->text('Dataset missing!')) unless $user->{dbname}; + $::form->show_generic_error($::locale->text('Database User missing!')) unless $user->{dbuser}; - delete $myconfig->{stylesheet}; - if ($form->{userstylesheet}) { - $myconfig->{stylesheet} = $form->{userstylesheet}; + foreach my $item (keys %{$user}) { + $myconfig->{$item} = $user->{$item}; } - $myconfig->save_member(); + $myconfig->save_member; - $form->{templates} =~ s|.*/||; - $form->{templates} = $::lx_office_conf{paths}->{templates} . "/$form->{templates}"; - $form->{mastertemplates} =~ s|.*/||; + $user->{templates} =~ s|.*/||; + $user->{templates} = $::lx_office_conf{paths}->{templates} . "/$user->{templates}"; + $::form->{mastertemplates} =~ s|.*/||; # create user template directory and copy master files - if (!-d "$form->{templates}") { + if (!-d "$user->{templates}") { umask(002); - if (mkdir "$form->{templates}", oct("771")) { + if (mkdir "$user->{templates}", oct("771")) { umask(007); # copy templates to the directory my $oldcurrdir = getcwd(); - if (!chdir("$::lx_office_conf{paths}->{templates}/print/$form->{mastertemplates}")) { - $form->error("$ERRNO: chdir $::lx_office_conf{paths}->{templates}/print/$form->{mastertemplates}"); + if (!chdir("$::lx_office_conf{paths}->{templates}/print/$::form->{mastertemplates}")) { + $form->error("$ERRNO: chdir $::lx_office_conf{paths}->{templates}/print/$::form->{mastertemplates}"); } - my $newdir = File::Spec->catdir($oldcurrdir, $form->{templates}); + my $newdir = File::Spec->catdir($oldcurrdir, $user->{templates}); find( sub @@ -584,14 +535,14 @@ sub save_user { chdir($oldcurrdir); } else { - $form->error("$ERRNO: $form->{templates}"); + $form->error("$ERRNO: $user->{templates}"); } } # Add new user to his groups. if (ref $form->{new_user_group_ids} eq 'ARRAY') { my $all_groups = $main::auth->read_groups(); - my %user = $main::auth->read_user($form->{login}); + my %user = $main::auth->read_user(login => $user->{login}); foreach my $group_id (@{ $form->{new_user_group_ids} }) { my $group = $all_groups->{$group_id}; @@ -604,26 +555,27 @@ sub save_user { } if ($main::auth->can_change_password() - && defined $form->{new_password} - && ($form->{new_password} ne '********')) { + && defined $::form->{new_password} + && ($::form->{new_password} ne '********')) { my $verifier = SL::Auth::PasswordPolicy->new; - my $result = $verifier->verify($form->{new_password}, 1); + my $result = $verifier->verify($::form->{new_password}, 1); if ($result != SL::Auth::PasswordPolicy->OK()) { $form->error($::locale->text('The settings were saved, but the password was not changed.') . ' ' . join(' ', $verifier->errors($result))); } - $main::auth->change_password($form->{login}, $form->{new_password}); + $main::auth->change_password($user->{login}, $::form->{new_password}); } - $form->redirect($locale->text('User saved!')); + $::form->redirect($::locale->text('User saved!')); } sub save_user_as_new { my $form = $main::form; - $form->{login} = $form->{new_user_login}; - delete @{$form}{qw(edit new_user_login)}; + $form->{user}{login} = $::form->{new_user_login}; + delete $form->{user}{id}; + delete @{$form}{qw(id edit new_user_login)}; save_user(); } @@ -632,16 +584,22 @@ sub delete_user { my $form = $main::form; my $locale = $main::locale; + my $user = $::form->{user} || {}; + + $::form->show_generic_error($::locale->text('Missing user id!')) unless $user->{id}; + + my $loaded_user = User->new(id => $user->{id}); + my %members = $main::auth->read_all_users(); - my $templates = $members{$form->{login}}->{templates}; + my $templates = $members{$loaded_user->{login}}->{templates}; - $main::auth->delete_user($form->{login}); + $main::auth->delete_user($loaded_user->{login}); if ($templates) { my $templates_in_use = 0; foreach my $login (keys %members) { - next if $form->{login} eq $login; + next if $loaded_user->{login} eq $login; next if $members{$login}->{templates} ne $templates; $templates_in_use = 1; last; @@ -1233,4 +1191,31 @@ sub _nologin_file_name { return $::lx_office_conf{paths}->{userspath} . '/nologin'; } +sub _search_templates { + # is there a templates basedir + if (!-d $::lx_office_conf{paths}->{templates}) { + $::form->error(sprintf($::locale->text("The directory %s does not exist."), $::lx_office_conf{paths}->{templates})); + } + + opendir TEMPLATEDIR, $::lx_office_conf{paths}->{templates} or $::form->error($::lx_office_conf{paths}->{templates} . " : $ERRNO"); + my @all = readdir(TEMPLATEDIR); + my @alldir = sort grep { -d ($::lx_office_conf{paths}->{templates} . "/$_") && !/^\.\.?$/ } @all; + closedir TEMPLATEDIR; + + @alldir = grep !/\.(html|tex|sty|odt|xml|txb)$/, @alldir; + @alldir = grep !/^(webpages|print|\.svn)$/, @alldir; + + # mastertemplates + opendir TEMPLATEDIR, "$::lx_office_conf{paths}->{templates}/print" or $::form->error("$::lx_office_conf{paths}->{templates}/print" . " : $ERRNO"); + my @allmaster = readdir(TEMPLATEDIR); + closedir TEMPLATEDIR; + + @allmaster = sort grep { -d ("$::lx_office_conf{paths}->{templates}/print" . "/$_") && !/^\.\.?$/ } @allmaster; + @allmaster = reverse grep !/Default/, @allmaster; + push @allmaster, 'Default'; + @allmaster = reverse @allmaster; + + return \@alldir, \@allmaster; +} + 1; diff --git a/bin/mozilla/login.pl b/bin/mozilla/login.pl index 665cb9193..b5b0f1794 100644 --- a/bin/mozilla/login.pl +++ b/bin/mozilla/login.pl @@ -61,7 +61,7 @@ sub run { $action = 'login'; } if ($action) { - %::myconfig = $auth->read_user($form->{login}) if ($form->{login}); + %::myconfig = $auth->read_user(login => $form->{login}) if ($form->{login}); $::locale = Locale->new($::myconfig{countrycode}) if $::myconfig{countrycode}; if (SL::Auth::OK != $auth->authenticate($::myconfig{login}, $form->{password})) { @@ -106,7 +106,7 @@ sub login { ::end_of_request(); } - my $user = new User $form->{login}; + my $user = User->new(login => $form->{login}); # if we get an error back, bale out my $result; diff --git a/scripts/console b/scripts/console index 50febadb6..0d5e20a25 100755 --- a/scripts/console +++ b/scripts/console @@ -73,7 +73,7 @@ sub lxinit { require "bin/mozilla/common.pl"; - die "cannot find user $login" unless %::myconfig = $::auth->read_user($login); + die "cannot find user $login" unless %::myconfig = $::auth->read_user(login => $login); $::form->{login} = $login; # normaly implicit at login diff --git a/scripts/dbupgrade2_tool.pl b/scripts/dbupgrade2_tool.pl index deee26409..f82cb595b 100755 --- a/scripts/dbupgrade2_tool.pl +++ b/scripts/dbupgrade2_tool.pl @@ -429,7 +429,7 @@ if ($opt_user) { "and to create them."); } - %myconfig = $auth->read_user($opt_user); + %myconfig = $auth->read_user(login => $opt_user); if (!$myconfig{login}) { $form->error($form->format_string("The user '#1' does not exist.", $opt_user)); diff --git a/scripts/rose_auto_create_model.pl b/scripts/rose_auto_create_model.pl index 12ac0bdaf..79aef1c76 100755 --- a/scripts/rose_auto_create_model.pl +++ b/scripts/rose_auto_create_model.pl @@ -60,7 +60,7 @@ sub setup { $::form = new Form; $::auth = SL::Auth->new(); $::user = User->new($login); - %::myconfig = $auth->read_user($login); + %::myconfig = $auth->read_user(login => $login); $::request = { cgi => CGI->new({}) }; $form->{script} = 'rose_meta_data.pl'; $form->{login} = $login; diff --git a/scripts/task_server.pl b/scripts/task_server.pl index 9bf2cb384..5854a5197 100755 --- a/scripts/task_server.pl +++ b/scripts/task_server.pl @@ -50,7 +50,7 @@ sub lxinit { require "bin/mozilla/common.pl"; - die "cannot find user $login" unless %::myconfig = $::auth->read_user($login); + die "cannot find user $login" unless %::myconfig = $::auth->read_user(login => $login); die "cannot find locale for user $login" unless $::locale = Locale->new('de'); } diff --git a/t/Support/TestSetup.pm b/t/Support/TestSetup.pm index c23b4fd7f..5b6e2bb1f 100644 --- a/t/Support/TestSetup.pm +++ b/t/Support/TestSetup.pm @@ -33,7 +33,7 @@ sub _login { require "bin/mozilla/common.pl"; - die "cannot find user $login" unless %::myconfig = $::auth->read_user($login); + die "cannot find user $login" unless %::myconfig = $::auth->read_user(login => $login); $::form->{login} = $login; # normaly implicit at login diff --git a/templates/webpages/admin/edit_user.html b/templates/webpages/admin/edit_user.html index dc8ccab97..77ed62ee4 100644 --- a/templates/webpages/admin/edit_user.html +++ b/templates/webpages/admin/edit_user.html @@ -1,5 +1,7 @@ [%- USE T8 %] -[% USE HTML %] +[%- USE HTML %] +[%- USE L %] + @@ -8,11 +10,11 @@ function open_connection_test_window() { // host name port user passwd var url = "admin.pl?INPUT_ENCODING=UTF-8&action=test_db_connection&" + - "dbhost=" + encodeURIComponent(get_input_value("dbhost")) + "&" + - "dbport=" + encodeURIComponent(get_input_value("dbport")) + "&" + - "dbname=" + encodeURIComponent(get_input_value("dbname")) + "&" + - "dbuser=" + encodeURIComponent(get_input_value("dbuser")) + "&" + - "dbpasswd=" + encodeURIComponent(get_input_value("dbpasswd")) + "&"; + "dbhost=" + encodeURIComponent(get_input_value("user.dbhost")) + "&" + + "dbport=" + encodeURIComponent(get_input_value("user.dbport")) + "&" + + "dbname=" + encodeURIComponent(get_input_value("user.dbname")) + "&" + + "dbuser=" + encodeURIComponent(get_input_value("user.dbuser")) + "&" + + "dbpasswd=" + encodeURIComponent(get_input_value("user.dbpasswd")) + "&"; var parm = centerParms(400,300) + ",width=400,height=300,status=yes,scrollbars=yes"; @@ -34,9 +36,9 @@ [% 'Login Name' | $T8 %] [%- IF edit %] - [% HTML.escape(myc_login) %] + [% HTML.escape(user.login) %] [%- ELSE %] - + [%- END %] @@ -48,57 +50,57 @@ [% 'Name' | $T8 %] - + [% 'E-mail' | $T8 %] - + [% 'Signature' | $T8 %] - + [% 'Phone' | $T8 %] - + [% 'Fax' | $T8 %] - + [% 'Company' | $T8 %] - + [% 'Address' | $T8 %] - + [% 'Tax number' | $T8 %] - + [% 'Ust-IDNr' | $T8 %] - + [% 'DUNS-Nr' | $T8 %] - + [% 'SEPA creditor ID' | $T8 %] - + @@ -107,61 +109,36 @@ - + - + - + - + - + - + - + @@ -169,33 +146,21 @@ - + - + - +
[% 'Date Format' | $T8 %] - - [% L.select_tag('user.dateformat', L.options_for_select(all_dateformats, default=user.dateformat)) %]
[% 'Number Format' | $T8 %] - - [% L.select_tag('user.numberformat', L.options_for_select(all_numberformats, default=user.numberformat)) %]
[% 'Dropdown Limit' | $T8 %]
[% 'Language' | $T8 %] - - [% L.select_tag('user.countrycode', L.options_for_select(all_countrycodes, title='title', default=user.countrycode)) %]
[% 'Stylesheet' | $T8 %] - - [% L.select_tag('user.stylesheet', L.options_for_select(all_stylesheets, default=user.stylesheet)) %]
[% 'Printer' | $T8 %]
[% 'Use Templates' | $T8 %] - - [% L.select_tag('usetemplates', L.options_for_select(all_templates, default=user.templates)) %]
[% 'New Templates' | $T8 %]
[% 'Setup Templates' | $T8 %] - - [% L.select_tag('mastertemplates', L.options_for_select(all_master_templates, default='German')) %]
[% 'Setup Menu' | $T8 %] - - [% L.select_tag('user.menustyle', L.options_for_select(all_menustyles, title='title', default=user.menustyle)) %]
[% 'Mandatory Departments' | $T8 %] - [% 'No' | $T8 %] - [% 'Yes' | $T8 %] + [% 'No' | $T8 %] + [% 'Yes' | $T8 %]
@@ -211,21 +176,21 @@ [% 'Driver' | $T8 %] PostgreSQL [% 'Host' | $T8 %] - + [% 'Dataset' | $T8 %] - + [% 'Port' | $T8 %] - + [% 'Database User' | $T8 %] - + [% 'Password' | $T8 %] - + @@ -285,6 +250,7 @@ $("#action_save_user_as_new").attr('value', '1'); $("#new_user_login").attr('value', new_user_login); + $("#user_id").attr('value', ''); $("#Form").submit(); }); }); diff --git a/templates/webpages/admin/list_users.html b/templates/webpages/admin/list_users.html index 2e6228fb9..2c625da60 100644 --- a/templates/webpages/admin/list_users.html +++ b/templates/webpages/admin/list_users.html @@ -21,7 +21,7 @@ [% FOREACH row = MEMBERS %] -  [% HTML.escape(row.login) %] +  [% HTML.escape(row.login) %]  [% HTML.escape(row.name) %]  [% HTML.escape(row.company) %]  [% HTML.escape(row.templates) %] -- 2.20.1