X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fadmin.pl;h=7f0b80de85dd3d59628a0c337f5d86f82b2f6b12;hb=cf8a444d01e67f5b06345721632e55cdbedbc905;hp=7e12b0e05dc06b418a111810803abdbfea7709bd;hpb=7321146cf5a08364a9db2ddddbb0b74a5d3fc4c9;p=kivitendo-erp.git diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl index 7e12b0e05..7f0b80de8 100755 --- a/bin/mozilla/admin.pl +++ b/bin/mozilla/admin.pl @@ -98,7 +98,7 @@ sub run { if ($form->{action}) { if ($auth->authenticate_root($form->{'{AUTH}admin_password'}) != $auth->OK()) { $auth->punish_wrong_login; - $form->{error_message} = $locale->text('Incorrect Password!'); + $form->{error} = $locale->text('Incorrect Password!'); $auth->delete_session_value('admin_password'); adminlogin(); } else { @@ -759,7 +759,7 @@ sub create_dataset { if ($cluster_encoding && ($cluster_encoding =~ m/^(?:UTF-?8|UNICODE)$/i)) { if ($::lx_office_conf{system}->{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.'), + 'Therefore you have to configure kivitendo to use UTF-8 as well.'), 'back_button' => 1); } @@ -1178,7 +1178,7 @@ sub _search_templates { -d ($::lx_office_conf{paths}->{templates} . "/$_") && !/^\.\.?$/ && !m/\.(?:html|tex|sty|odt|xml|txb)$/ - && !m/^(?:webpages$|print$|\.)/ + && !m/^(?:webpages$|print$|mail$|\.)/ } keys %dir_h; tie %dir_h, 'IO::Dir', "$::lx_office_conf{paths}->{templates}/print";