X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fadmin.pl;h=a08891a8f825897c05366bb65d8aeee57f8cc2fb;hb=fe73e0d261229f181e8133283b530509773d2151;hp=3fba37cc8ccbdb757f37399eeeeb17481c743080;hpb=82c41aacb54996848276f5cb00c6587bf20f03a7;p=kivitendo-erp.git diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl old mode 100644 new mode 100755 index 3fba37cc8..a08891a8f --- a/bin/mozilla/admin.pl +++ b/bin/mozilla/admin.pl @@ -32,16 +32,18 @@ # #====================================================================== -$menufile = "menu.ini"; +my $menufile = "menu.ini"; use DBI; use CGI; -use POSIX qw(strftime); -use IO::File; -use Fcntl; use English qw(-no_match_vars); +use Fcntl; +use File::Copy; +use IO::File; +use POSIX qw(strftime); use Sys::Hostname; +use SL::Auth; use SL::Form; use SL::Mailer; use SL::User; @@ -51,13 +53,20 @@ use SL::DBUpgrade2; use SL::DBUtils; require "bin/mozilla/common.pl"; +require "bin/mozilla/admin_groups.pl"; -our $cgi = new CGI(''); +use strict; -$form = new Form; -$form->{"root"} = "root login"; +our $cgi = new CGI(''); +our $form = new Form; +our $locale = new Locale $main::language, "admin"; +our $auth = SL::Auth->new(); -$locale = new Locale $language, "admin"; +if ($auth->session_tables_present()) { + $auth->expire_sessions(); + $auth->restore_session(); + $auth->set_session_value('rpw', $form->{rpw}); +} # customization if (-f "bin/mozilla/custom_$form->{script}") { @@ -69,38 +78,27 @@ $form->{stylesheet} = "lx-office-erp.css"; $form->{favicon} = "favicon.ico"; if ($form->{action}) { + if ($auth->authenticate_root($form->{rpw}, 0) != $auth->OK()) { + $form->{error_message} = $locale->text('Incorrect Password!'); + adminlogin(); + exit; + } + $auth->create_or_refresh_session() if ($auth->session_tables_present()); - $subroutine = $locale->findsub($form->{action}); + call_sub($locale->findsub($form->{action})); - if ($subroutine eq 'login') { - if ($form->{rpw}) { - $form->{rpw} = crypt $form->{rpw}, "ro"; - } - } +} elsif ($auth->authenticate_root($form->{rpw}, 0) == $auth->OK()) { - check_password(); + $auth->create_or_refresh_session() if ($auth->session_tables_present()); - call_sub($subroutine); + login(); } else { - # if there are no drivers bail out $form->error($locale->text('No Database Drivers available!')) unless (User->dbdrivers); - # create memberfile - if (!-f $memberfile) { - open(FH, ">$memberfile") or $form->error("$memberfile : $ERRNO"); - print FH qq|# SQL-Ledger Accounting members - -[root login] -password= - -|; - close FH; - } - adminlogin(); } @@ -110,56 +108,258 @@ password= # end sub adminlogin { + my $form = $main::form; + my $locale = $main::locale; - $form->{title} = - qq|Lx-Office ERP $form->{version} | . $locale->text('Administration'); + $form->{title} = qq|Lx-Office ERP $form->{version} | . $locale->text('Administration'); $form->header(); - print $form->parse_html_template2('admin/adminlogin'); + print $form->parse_html_template('admin/adminlogin'); } sub login { + check_auth_db_and_tables(); list_users(); } -sub list_users { +sub logout { + $main::auth->destroy_session(); + adminlogin(); +} + +sub check_auth_db_and_tables { + my $form = $main::form; + my $locale = $main::locale; + + my %params; + + map { $params{"db_${_}"} = $main::auth->{DB_config}->{$_} } keys %{ $auth->{DB_config} }; - $form->error($locale->text('File locked!')) if (-f "${memberfile}.LCK"); + if (!$main::auth->check_database()) { + $form->{title} = $locale->text('Authentification database creation'); + $form->header(); + print $form->parse_html_template('admin/check_auth_database', \%params); - open(FH, "$memberfile") or $form->error("$memberfile : $ERRNO"); + exit 0; + } - my %members; + if (!$main::auth->check_tables()) { + $form->{title} = $locale->text('Authentification tables creation'); + $form->header(); + print $form->parse_html_template('admin/check_auth_tables', \%params); - while () { + exit 0; + } + + if (-f $main::memberfile) { + my $memberdir = ""; + + if ($main::memberfile =~ m|^.*/|) { + $memberdir = $&; + } + + my $backupdir = "${memberdir}member-file-migration"; + + $form->{title} = $locale->text('User data migration'); + $form->header(); + print $form->parse_html_template('admin/user_migration', { 'memberfile' => $main::memberfile, + 'backupdir' => $backupdir }); + + exit 0 + } +} + +sub create_auth_db { + my $form = $main::form; + + $main::auth->create_database('superuser' => $form->{db_superuser}, + 'superuser_password' => $form->{db_superuser_password}, + 'template' => $form->{db_template}); + login(); +} + +sub create_auth_tables { + my $form = $main::form; + my $locale = $main::locale; + + $main::auth->create_tables(); + $main::auth->set_session_value('rpw', $form->{rpw}); + $main::auth->create_or_refresh_session(); + + if (!-f $main::memberfile) { + # New installation -- create a standard group with full access + my %members; + my $group = { + 'name' => $locale->text('Full Access'), + 'description' => $locale->text('Full access to all functions'), + 'rights' => { map { $_ => 1 } SL::Auth::all_rights() }, + 'members' => [ map { $_->{id} } values %members ], + }; + + $main::auth->save_group($group); + } + + login(); +} + +sub migrate_users { + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my $locale = $main::locale; + + my $memberdir = ""; + + if ($main::memberfile =~ m|^.*/|) { + $memberdir = $&; + } + + my $backupdir = "${memberdir}member-file-migration"; + + if (! -d $backupdir && !mkdir $backupdir, 0700) { + $form->error(sprintf($locale->text('The directory "%s" could not be created:\n%s'), $backupdir, $!)); + } + + copy $main::memberfile, "users/member-file-migration/members"; + + my $in = IO::File->new($main::memberfile, "r"); + + $form->error($locale->text('Could not open the old memberfile.')) if (!$in); + + my (%members, $login); + + while (<$in>) { chomp; - if (/^\[.*\]/) { + next if (m/^\s*\#/); + + if (m/^\[.*\]/) { $login = $_; $login =~ s/(\[|\])//g; + $login =~ s/^\s*//; + $login =~ s/\s*$//; $members{$login} = { "login" => $login }; + next; } - if (/^([a-z]+)=(.*)/) { - $members{$login}->{$1} = $2; + if ($login && m/=/) { + my ($key, $value) = split m/\s*=\s*/, $_, 2; + $key =~ s|^\s*||; + $value =~ s|\s*$||; + + $value =~ s|\\r||g; + $value =~ s|\\n|\n|g; + + $members{$login}->{$key} = $value; } } - close(FH); + $in->close(); + + delete $members{"root login"}; + + map { $_->{dbpasswd} = unpack 'u', $_->{dbpasswd} } values %members; + + while (my ($login, $params) = each %members) { + $main::auth->save_user($login, %{ $params }); + $main::auth->change_password($login, $params->{password}, 1); + + my $conf_file = "${memberdir}${login}.conf"; + + if (-f $conf_file) { + copy $conf_file, "${backupdir}/${login}.conf"; + unlink $conf_file; + } + } + + unlink $main::memberfile; + + my @member_list = sort { lc $a->{login} cmp lc $b->{login} } values %members; + + $form->{title} = $locale->text('User data migration'); + $form->header(); + print $form->parse_html_template('admin/user_migration_done', { 'MEMBERS' => \@member_list }); + + $main::lxdebug->leave_sub(); +} + +sub create_standard_group_ask { + my $form = $main::form; + my $locale = $main::locale; + + $form->{title} = $locale->text('Create a standard group'); + + $form->header(); + print $form->parse_html_template("admin/create_standard_group_ask"); +} + +sub create_standard_group { + my $form = $main::form; + my $locale = $main::locale; + + my %members = $main::auth->read_all_users(); + + my $groups = $main::auth->read_groups(); + + foreach my $group (values %{$groups}) { + if (($form->{group_id} != $group->{id}) + && ($form->{name} eq $group->{name})) { + $form->show_generic_error($locale->text("A group with that name does already exist.")); + } + } + + my $group = { + 'name' => $locale->text('Full Access'), + 'description' => $locale->text('Full access to all functions'), + 'rights' => { map { $_ => 1 } SL::Auth::all_rights() }, + 'members' => [ map { $_->{id} } values %members ], + }; + + $main::auth->save_group($group); + + user_migration_complete(1); +} + +sub dont_create_standard_group { + user_migration_complete(0); +} + +sub user_migration_complete { + my $standard_group_created = shift; + + my $form = $main::form; + my $locale = $main::locale; + + $form->{title} = $locale->text('User migration complete'); + $form->header(); + + print $form->parse_html_template('admin/user_migration_complete', { 'standard_group_created' => $standard_group_created }); +} + +sub list_users { + my $form = $main::form; + my $locale = $main::locale; + + my %members = $main::auth->read_all_users(); delete $members{"root login"}; + map { $_->{templates} =~ s|.*/||; } values %members; - $form->{title} = "Lx-Office ERP " . $locale->text('Administration'); - $form->{LOCKED} = -e "$userspath/nologin"; + $form->{title} = "Lx-Office ERP " . $locale->text('Administration'); + $form->{LOCKED} = -e "$main::userspath/nologin"; $form->{MEMBERS} = [ @members{sort { lc $a cmp lc $b } keys %members} ]; $form->header(); - print $form->parse_html_template2("admin/list_users"); + print $form->parse_html_template("admin/list_users"); } sub add_user { + my $form = $main::form; + my $locale = $main::locale; + $form->{title} = "Lx-Office ERP " . $locale->text('Administration') . " / " @@ -177,7 +377,10 @@ sub add_user { edit_user_form($myconfig); } -sub edit { +sub edit_user { + my $form = $main::form; + my $locale = $main::locale; + $form->{title} = "Lx-Office ERP " @@ -188,10 +391,7 @@ sub edit { $form->isblank("login", $locale->text("The login is missing.")); # get user - my $myconfig = new User "$memberfile", "$form->{login}"; - - $myconfig->{signature} =~ s/\\n/\r\n/g; - $myconfig->{address} =~ s/\\n/\r\n/g; + my $myconfig = new User($form->{login}); # strip basedir from templates directory $myconfig->{templates} =~ s|.*/||; @@ -202,29 +402,32 @@ sub edit { 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 = qw(1,000.00 1000.00 1.000,00 1000,00); + my @valid_numberformats = ('1,000.00', '1000.00', '1.000,00', '1000,00'); $form->{ALL_NUMBERFORMATS} = [ map { { "format" => $_, "selected" => $_ eq $myconfig->{numberformat} } } @valid_numberformats ]; - %countrycodes = User->country_codes; + my %countrycodes = User->country_codes; $form->{ALL_COUNTRYCODES} = []; - foreach $countrycode (sort { $countrycodes{$a} cmp $countrycodes{$b} } keys %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 "$templates") { - $form->error(sprintf($locale->text("The directory %s does not exist."), $templates)); + if (!-d "$main::templates") { + $form->error(sprintf($locale->text("The directory %s does not exist."), $main::templates)); } - opendir TEMPLATEDIR, "$templates/." or $form->error("$templates : $ERRNO"); + opendir TEMPLATEDIR, "$main::templates/." or $form->error("$main::templates : $ERRNO"); my @all = readdir(TEMPLATEDIR); - my @alldir = sort grep { -d "$templates/$_" && !/^\.\.?$/ } @all; - my @allhtml = sort grep { -f "$templates/$_" && /\.html$/ } @all; + my @alldir = sort grep { -d "$main::templates/$_" && !/^\.\.?$/ } @all; + my @allhtml = sort grep { -f "$main::templates/$_" && /\.html$/ } @all; closedir TEMPLATEDIR; @alldir = grep !/\.(html|tex|sty|odt|xml|txb)$/, @alldir; @@ -236,10 +439,10 @@ sub edit_user_form { $form->{ALL_TEMPLATES} = [ map { { "name", => $_, "selected" => $_ eq $myconfig->{templates} } } @alldir ]; - $lastitem = $allhtml[0]; + my $lastitem = $allhtml[0]; $lastitem =~ s/-.*//g; $form->{ALL_MASTER_TEMPLATES} = [ { "name" => $lastitem, "selected" => $lastitem eq "German" } ]; - foreach $item (@allhtml) { + foreach my $item (@allhtml) { $item =~ s/-.*//g; next if ($item eq $lastitem); @@ -255,82 +458,40 @@ sub edit_user_form { map { $form->{"myc_${_}"} = $myconfig->{$_} } keys %{ $myconfig }; - # access control - my @acsorder = (); - my %acs = (); - my %excl = (); - open(FH, $menufile) or $form->error("$menufile : $ERRNO"); - - while ($item = ) { - next unless $item =~ /\[/; - next if $item =~ /\#/; + my $groups = []; - $item =~ s/(\[|\])//g; - chomp $item; + if ($form->{edit}) { + my $user_id = $main::auth->get_user_id($form->{login}); + my $all_groups = $main::auth->read_groups(); - my ($level, $menuitem); - - if ($item =~ /--/) { - ($level, $menuitem) = split /--/, $item, 2; - } else { - $level = $item; - $menuitem = $item; - push @acsorder, $item; + foreach my $group (values %{ $all_groups }) { + push @{ $groups }, $group if (grep { $user_id == $_ } @{ $group->{members} }); } - $acs{$level} ||= []; - push @{ $acs{$level} }, $menuitem; - - } - - foreach $item (split(/;/, $myconfig->{acs})) { - ($key, $value) = split /--/, $item, 2; - $excl{$key}{$value} = 1; + $groups = [ sort { lc $a->{name} cmp lc $b->{name} } @{ $groups } ]; } - $form->{ACLS} = []; - $form->{all_acs} = ""; - - foreach $key (@acsorder) { - my $acl = { "checked" => $form->{login} ? !$excl{$key}->{$key} : 1, - "name" => "${key}--${key}", - "title" => $key, - "SUBACLS" => [], }; - $form->{all_acs} .= "${key}--${key};"; - - foreach $item (@{ $acs{$key} }) { - next if ($key eq $item); - - my $subacl = { "checked" => $form->{login} ? !$excl{$key}->{$item} : 1, - "name" => "${key}--${item}", - "title" => $item }; - push @{ $acl->{SUBACLS} }, $subacl; - $form->{all_acs} .= "${key}--${item};"; - } - push @{ $form->{ACLS} }, $acl; - } - - chop $form->{all_acs}; + $form->{CAN_CHANGE_PASSWORD} = $main::auth->can_change_password(); $form->header(); - print $form->parse_html_template2("admin/edit_user"); + print $form->parse_html_template("admin/edit_user", { 'GROUPS' => $groups }); } -sub save { +sub save_user { + my $form = $main::form; + my $locale = $main::locale; $form->{dbdriver} = 'Pg'; # no spaces allowed in login name - ($form->{login}) = split / /, $form->{login}; - + $form->{login} =~ s|\s||g; $form->isblank("login", $locale->text('Login name missing!')); # check for duplicates if (!$form->{edit}) { - $temp = new User "$memberfile", "$form->{login}"; - - if ($temp->{login}) { - $form->error("$form->{login} " . $locale->text('is already a member!')); + 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); } } @@ -345,30 +506,20 @@ sub save { } # is there a basedir - if (!-d "$templates") { - $form->error(sprintf($locale->text("The directory %s does not exist."), $templates)); + if (!-d "$main::templates") { + $form->error(sprintf($locale->text("The directory %s does not exist."), $main::templates)); } # add base directory to $form->{templates} $form->{templates} =~ s|.*/||; - $form->{templates} = "$templates/$form->{templates}"; - - $myconfig = new User "$memberfile", "$form->{login}"; + $form->{templates} = "$main::templates/$form->{templates}"; - # redo acs variable and delete all the acs codes - my @acs; - foreach $item (split m|;|, $form->{all_acs}) { - my $name = "ACS_${item}"; - $name =~ s| |+|g; - push @acs, $item if !$form->{$name}; - delete $form->{$name}; - } - $form->{acs} = join ";", @acs; + my $myconfig = new User($form->{login}); $form->isblank("dbname", $locale->text('Dataset missing!')); $form->isblank("dbuser", $locale->text('Database User missing!')); - foreach $item (keys %{$form}) { + foreach my $item (keys %{$form}) { $myconfig->{$item} = $form->{$item}; } @@ -377,13 +528,20 @@ sub save { $myconfig->{stylesheet} = $form->{userstylesheet}; } - $myconfig->save_member($memberfile, $userspath); + $myconfig->save_member(); - if ($webdav) { - @webdavdirs = + if ($main::auth->can_change_password() + && defined $form->{new_password} + && ($form->{new_password} ne '********')) { + $main::auth->change_password($form->{login}, $form->{new_password}); + } + + my ($login, $password, $newfile); + if ($main::webdav) { + my @webdavdirs = qw(angebote bestellungen rechnungen anfragen lieferantenbestellungen einkaufsrechnungen); - foreach $directory (@webdavdirs) { - $file = "webdav/" . $directory . "/webdav-user"; + foreach my $directory (@webdavdirs) { + my $file = "webdav/" . $directory . "/webdav-user"; if ($form->{$directory}) { if (open(HTACCESS, "$file")) { while () { @@ -417,7 +575,7 @@ sub save { } $form->{templates} =~ s|.*/||; - $form->{templates} = "${templates}/$form->{templates}"; + $form->{templates} = "$main::templates/$form->{templates}"; $form->{mastertemplates} =~ s|.*/||; # create user template directory and copy master files @@ -429,20 +587,20 @@ sub save { umask(007); # copy templates to the directory - opendir TEMPLATEDIR, "$templates/." or $form - error("$templates : $ERRNO"); - @templates = grep /$form->{mastertemplates}.*?\.(html|tex|sty|xml|txb)$/, + opendir TEMPLATEDIR, "$main::templates/." or $form->error("$main::templates : $ERRNO"); + my @templates = grep /$form->{mastertemplates}.*?\.(html|tex|sty|odt|xml|txb)$/, readdir TEMPLATEDIR; closedir TEMPLATEDIR; - foreach $file (@templates) { - open(TEMP, "$templates/$file") - or $form->error("$templates/$file : $ERRNO"); + foreach my $file (@templates) { + open(TEMP, "$main::templates/$file") + or $form->error("$main::templates/$file : $ERRNO"); - $file =~ s/$form->{mastertemplates}-//; + $file =~ s/\Q$form->{mastertemplates}\E-//; open(NEW, ">$form->{templates}/$file") or $form->error("$form->{templates}/$file : $ERRNO"); - while ($line = ) { + while (my $line = ) { print NEW $line; } close(TEMP); @@ -453,26 +611,49 @@ sub save { } } + # 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}); + + foreach my $group_id (@{ $form->{new_user_group_ids} }) { + my $group = $all_groups->{$group_id}; + + next if !$group; + + push @{ $group->{members} }, $user{id}; + $main::auth->save_group($group); + } + } + $form->redirect($locale->text('User saved!')); } -sub delete { - $form->error($locale->text('File locked!')) if (-f ${memberfile} . LCK); - open(FH, ">${memberfile}.LCK") or $form->error("${memberfile}.LCK : $ERRNO"); - close(FH); +sub save_user_as_new { + my $form = $main::form; + + $form->{login} = $form->{new_user_login}; + delete @{$form}{qw(edit new_user_login)}; - my $members = Inifile->new($memberfile); - my $templates = $members->{$form->{login}}->{templates}; - delete $members->{$form->{login}}; - $members->write(); - unlink "${memberfile}.LCK"; + save_user(); +} + +sub delete_user { + my $form = $main::form; + my $locale = $main::locale; + + my %members = $main::auth->read_all_users(); + my $templates = $members{$form->{login}}->{templates}; + + $main::auth->delete_user($form->{login}); if ($templates) { my $templates_in_use = 0; - foreach $login (keys %{ $members }) { - next if $login =~ m/^[A-Z]+$/; - next if $members->{$login}->{templates} ne $templates; + + foreach my $login (keys %members) { + next if $form->{login} eq $login; + next if $members{$login}->{templates} ne $templates; $templates_in_use = 1; last; } @@ -483,9 +664,6 @@ sub delete { } } - # delete config file for user - unlink "$userspath/$form->{login}.conf"; - $form->redirect($locale->text('User deleted!')); } @@ -501,6 +679,8 @@ sub login_name { sub get_value { my $line = shift; + my $form = $main::form; + my ($null, $value) = split(/=/, $line, 2); # remove comments @@ -512,49 +692,8 @@ sub get_value { $value; } -sub change_admin_password { - - $form->{title} = - qq|Lx-Office ERP | - . $locale->text('Administration') . " / " - . $locale->text('Change Admin Password'); - - $form->header(); - print $form->parse_html_template2("admin/change_admin_password"); -} - -sub change_password { - if ($form->{"password"} ne $form->{"password_again"}) { - $form->{title} = - qq|Lx-Office ERP | - . $locale->text('Administration') . " / " - . $locale->text('Change Admin Password'); - - $form->header(); - $form->error($locale->text("The passwords do not match.")); - } - - $root->{password} = $form->{password}; - - $root->{'root login'} = 1; - $root->save_member($memberfile); - - $form->{callback} = - "$form->{script}?action=list_users&rpw=$root->{password}"; - - $form->redirect($locale->text('Password changed!')); -} - -sub check_password { - $root = new User "$memberfile", $form->{root}; - - if (!defined($root->{password}) || ($root->{password} ne $form->{rpw})) { - $form->error($locale->text('Incorrect Password!')); - } - -} - sub pg_database_administration { + my $form = $main::form; $form->{dbdriver} = 'Pg'; dbselect_source(); @@ -562,6 +701,9 @@ sub pg_database_administration { } sub dbselect_source { + my $form = $main::form; + my $locale = $main::locale; + $form->{dbport} = '5432'; $form->{dbuser} = 'postgres'; $form->{dbdefault} = 'template1'; @@ -569,21 +711,40 @@ sub dbselect_source { $form->{title} = "Lx-Office ERP / " . $locale->text('Database Administration'); - $form->{ALLOW_DBBACKUP} = "$pg_dump_exe" ne "DISABLED"; + # Intentionnaly disabled unless fixed to work with the authentication DB. + $form->{ALLOW_DBBACKUP} = 0; # "$pg_dump_exe" ne "DISABLED"; $form->header(); - print $form->parse_html_template2("admin/dbadmin"); + print $form->parse_html_template("admin/dbadmin"); } -sub continue { - call_sub($form->{"nextsub"}); +sub test_db_connection { + my $form = $main::form; + my $locale = $main::locale; + + $form->{dbdriver} = 'Pg'; + User::dbconnect_vars($form, $form->{dbname}); + + my $dbh = DBI->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}); + + $form->{connection_ok} = $dbh ? 1 : 0; + $form->{errstr} = $DBI::errstr; + + $dbh->disconnect() if ($dbh); + + $form->{title} = $locale->text('Database Connection Test'); + $form->header(); + print $form->parse_html_template("admin/test_db_connection"); } -sub back { - call_sub($form->{"back_nextsub"}); +sub continue { + call_sub($main::form->{"nextsub"}); } sub update_dataset { + my $form = $main::form; + my $locale = $main::locale; + $form->{title} = "Lx-Office ERP " . $locale->text('Database Administration') . " / " @@ -594,10 +755,13 @@ sub update_dataset { $form->{ALL_UPDATED} = !scalar @need_updates; $form->header(); - print $form->parse_html_template2("admin/update_dataset"); + print $form->parse_html_template("admin/update_dataset"); } sub dbupdate { + my $form = $main::form; + my $locale = $main::locale; + $form->{stylesheet} = "lx-office-erp.css"; $form->{title} = $locale->text("Dataset upgrade"); $form->header(); @@ -609,7 +773,7 @@ sub dbupdate { $| = 1; - print $form->parse_html_template2("admin/dbupgrade_all_header"); + print $form->parse_html_template("admin/dbupgrade_all_header"); foreach my $i (@update_rows) { restore_form($saved_form); @@ -618,7 +782,7 @@ sub dbupdate { my $controls = parse_dbupdate_controls($form, $form->{dbdriver}); - print $form->parse_html_template2("admin/dbupgrade_header"); + print $form->parse_html_template("admin/dbupgrade_header"); $form->{dbupdate} = $form->{dbname}; $form->{$form->{dbname}} = 1; @@ -626,19 +790,22 @@ sub dbupdate { User->dbupdate($form); User->dbupdate2($form, $controls); - print $form->parse_html_template2("admin/dbupgrade_footer"); + print $form->parse_html_template("admin/dbupgrade_footer"); } - print $form->parse_html_template2("admin/dbupgrade_all_done"); + print $form->parse_html_template("admin/dbupgrade_all_done"); } sub create_dataset { - $form->{dbsources} = join " ", map { "[${_}]" } sort User->dbsources(\%$form); + my $form = $main::form; + my $locale = $main::locale; + + $form->{dbsources} = join " ", map { "[${_}]" } sort User->dbsources($form); $form->{CHARTS} = []; - opendir SQLDIR, "sql/." or $form - error($ERRNO); - foreach $item (sort grep /-chart\.sql\z/, readdir SQLDIR) { + opendir SQLDIR, "sql/." or $form->error($ERRNO); + foreach my $item (sort grep /-chart\.sql\z/, readdir SQLDIR) { next if ($item eq 'Default-chart.sql'); $item =~ s/-chart\.sql//; push @{ $form->{CHARTS} }, { "name" => $item, @@ -646,15 +813,27 @@ sub create_dataset { } closedir SQLDIR; - my $default_charset = $dbcharset; + my $default_charset = $main::dbcharset; $default_charset ||= Common::DEFAULT_CHARSET; - $form->{DBENCODINGS} = []; + my $cluster_encoding = User->dbclusterencoding($form); + if ($cluster_encoding && ($cluster_encoding =~ m/^(?:UTF-?8|UNICODE)$/i)) { + if ($main::dbcharset !~ m/^UTF-?8$/i) { + $form->show_generic_error($locale->text('The selected PostgreSQL installation uses UTF-8 as its encoding. ' . + 'Therefore you have to configure Lx-Office to use UTF-8 as well.'), + 'back_button' => 1); + } - foreach my $encoding (@Common::db_encodings) { - push @{ $form->{DBENCODINGS} }, { "dbencoding" => $encoding->{dbencoding}, - "label" => $encoding->{label}, - "selected" => $encoding->{charset} eq $default_charset }; + $form->{FORCE_DBENCODING} = 'UNICODE'; + + } else { + $form->{DBENCODINGS} = []; + + foreach my $encoding (@Common::db_encodings) { + push @{ $form->{DBENCODINGS} }, { "dbencoding" => $encoding->{dbencoding}, + "label" => $encoding->{label}, + "selected" => $encoding->{charset} eq $default_charset }; + } } $form->{title} = @@ -663,10 +842,13 @@ sub create_dataset { . $locale->text('Create Dataset'); $form->header(); - print $form->parse_html_template2("admin/create_dataset"); + print $form->parse_html_template("admin/create_dataset"); } sub dbcreate { + my $form = $main::form; + my $locale = $main::locale; + $form->isblank("db", $locale->text('Dataset missing!')); User->dbcreate(\%$form); @@ -677,11 +859,14 @@ sub dbcreate { . $locale->text('Create Dataset'); $form->header(); - print $form->parse_html_template2("admin/dbcreate"); + print $form->parse_html_template("admin/dbcreate"); } sub delete_dataset { - @dbsources = User->dbsources_unused(\%$form, $memberfile); + my $form = $main::form; + my $locale = $main::locale; + + my @dbsources = User->dbsources_unused($form); $form->error($locale->text('Nothing to delete!')) unless @dbsources; $form->{title} = @@ -691,10 +876,12 @@ sub delete_dataset { $form->{DBSOURCES} = [ map { { "name", $_ } } sort @dbsources ]; $form->header(); - print $form->parse_html_template2("admin/delete_dataset"); + print $form->parse_html_template("admin/delete_dataset"); } sub dbdelete { + my $form = $main::form; + my $locale = $main::locale; if (!$form->{db}) { $form->error($locale->text('No Dataset selected!')); @@ -707,16 +894,19 @@ sub dbdelete { . $locale->text('Database Administration') . " / " . $locale->text('Delete Dataset'); $form->header(); - print $form->parse_html_template2("admin/dbdelete"); + print $form->parse_html_template("admin/dbdelete"); } sub backup_dataset { + my $form = $main::form; + my $locale = $main::locale; + $form->{title} = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Backup Dataset'); - if ("$pg_dump_exe" eq "DISABLED") { + if ("$main::pg_dump_exe" eq "DISABLED") { $form->error($locale->text('Database backups and restorations are disabled in lx-erp.conf.')); } @@ -729,18 +919,21 @@ sub backup_dataset { $form->{from} = "Lx-Office Admin <${username}\@${hostname}>"; $form->header(); - print $form->parse_html_template2("admin/backup_dataset"); + print $form->parse_html_template("admin/backup_dataset"); } sub backup_dataset_start { + my $form = $main::form; + my $locale = $main::locale; + $form->{title} = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Backup Dataset'); - $pg_dump_exe ||= "pg_dump"; + $main::pg_dump_exe ||= "pg_dump"; - if ("$pg_dump_exe" eq "DISABLED") { + if ("$main::pg_dump_exe" eq "DISABLED") { $form->error($locale->text('Database backups and restorations are disabled in lx-erp.conf.')); } @@ -766,7 +959,7 @@ sub backup_dataset_start { push @args, ("-p", $form->{dbport}) if ($form->{dbport}); push @args, $form->{dbname}; - my $cmd = "${pg_dump_exe} " . join(" ", map { s/\\/\\\\/g; s/\"/\\\"/g; $_ } @args); + my $cmd = "$main::pg_dump_exe " . join(" ", map { s/\\/\\\\/g; s/\"/\\\"/g; $_ } @args); my $name = "dataset_backup_$form->{dbname}_" . strftime("%Y%m%d", localtime()) . ".tar"; if ($form->{destination} ne "email") { @@ -805,7 +998,7 @@ sub backup_dataset_start { map { $mail->{$_} = $form->{$_} } qw(from to cc subject message); - $mail->{charset} = $dbcharset ? $dbcharset : Common::DEFAULT_CHARSET; + $mail->{charset} = $main::dbcharset ? $main::dbcharset : Common::DEFAULT_CHARSET; $mail->{attachments} = [ { "filename" => $tmp, "name" => $name } ]; $mail->send(); @@ -818,21 +1011,24 @@ sub backup_dataset_start { . $locale->text('Backup Dataset'); $form->header(); - print $form->parse_html_template2("admin/backup_dataset_email_done"); + print $form->parse_html_template("admin/backup_dataset_email_done"); } } sub restore_dataset { + my $form = $main::form; + my $locale = $main::locale; + $form->{title} = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Restore Dataset'); - if ("$pg_restore_exe" eq "DISABLED") { + if ("$main::pg_restore_exe" eq "DISABLED") { $form->error($locale->text('Database backups and restorations are disabled in lx-erp.conf.')); } - my $default_charset = $dbcharset; + my $default_charset = $main::dbcharset; $default_charset ||= Common::DEFAULT_CHARSET; $form->{DBENCODINGS} = []; @@ -844,18 +1040,21 @@ sub restore_dataset { } $form->header(); - print $form->parse_html_template2("admin/restore_dataset"); + print $form->parse_html_template("admin/restore_dataset"); } sub restore_dataset_start { + my $form = $main::form; + my $locale = $main::locale; + $form->{title} = "Lx-Office ERP " . $locale->text('Database Administration') . " / " . $locale->text('Restore Dataset'); - $pg_restore_exe ||= "pg_restore"; + $main::pg_restore_exe ||= "pg_restore"; - if ("$pg_restore_exe" eq "DISABLED") { + if ("$main::pg_restore_exe" eq "DISABLED") { $form->error($locale->text('Database backups and restorations are disabled in lx-erp.conf.')); } @@ -942,7 +1141,7 @@ sub restore_dataset_start { push @args, ("-p", $form->{dbport}) if ($form->{dbport}); push @args, $tmp; - my $cmd = "${pg_restore_exe} " . join(" ", map { s/\\/\\\\/g; s/\"/\\\"/g; $_ } @args); + my $cmd = "$main::pg_restore_exe " . join(" ", map { s/\\/\\\\/g; s/\"/\\\"/g; $_ } @args); my $in = IO::File->new("$cmd 2>&1 |"); @@ -953,10 +1152,10 @@ sub restore_dataset_start { $form->error($locale->text('The pg_restore process could not be started.')); } - $AUTOFLUSH = 1; + $English::AUTOFLUSH = 1; $form->header(); - print $form->parse_html_template2("admin/restore_dataset_start_header"); + print $form->parse_html_template("admin/restore_dataset_start_header"); while (my $line = <$in>) { print $line; @@ -964,32 +1163,93 @@ sub restore_dataset_start { $in->close(); $form->{retval} = $CHILD_ERROR >> 8; - print $form->parse_html_template2("admin/restore_dataset_start_footer"); + print $form->parse_html_template("admin/restore_dataset_start_footer"); unlink "${tmpdir}/.pgpass", $tmp; rmdir $tmpdir; } sub unlock_system { + my $form = $main::form; + my $locale = $main::locale; - unlink "$userspath/nologin"; + unlink "$main::userspath/nologin"; - $form->{callback} = - "$form->{script}?action=list_users&rpw=$root->{password}"; + $form->{callback} = "admin.pl?action=list_users"; $form->redirect($locale->text('Lockfile removed!')); } sub lock_system { + my $form = $main::form; + my $locale = $main::locale; - open(FH, ">$userspath/nologin") + open(FH, ">$main::userspath/nologin") or $form->error($locale->text('Cannot create Lock!')); close(FH); - $form->{callback} = - "$form->{script}?action=list_users&rpw=$root->{password}"; + $form->{callback} = "admin.pl?action=list_users"; $form->redirect($locale->text('Lockfile created!')); } + +sub yes { + call_sub($main::form->{yes_nextsub}); +} + +sub no { + call_sub($main::form->{no_nextsub}); +} + +sub add { + call_sub($main::form->{add_nextsub}); +} + +sub edit { + my $form = $main::form; + + $form->{edit_nextsub} ||= 'edit_user'; + + call_sub($form->{edit_nextsub}); +} + +sub delete { + my $form = $main::form; + + $form->{delete_nextsub} ||= 'delete_user'; + + call_sub($form->{delete_nextsub}); +} + +sub save { + my $form = $main::form; + + $form->{save_nextsub} ||= 'save_user'; + + call_sub($form->{save_nextsub}); +} + +sub back { + call_sub($main::form->{back_nextsub}); +} + +sub dispatcher { + my $form = $main::form; + my $locale = $main::locale; + + foreach my $action (qw(create_standard_group dont_create_standard_group + save_user delete_user save_user_as_new)) { + if ($form->{"action_${action}"}) { + call_sub($action); + return; + } + } + + call_sub($form->{default_action}) if ($form->{default_action}); + + $form->error($locale->text('No action defined.')); +} + +1;