X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fadmin.pl;h=1c7f2594e8fe07c126d06fde7911eb61a108e753;hb=9ead220cfa6c48e0242efc920429e7b393f055f2;hp=9534d95e6cf1f70c668136c059583903f13eb627;hpb=3f26a3a5f90df8b834de122d6fb1dfab59a6e804;p=kivitendo-erp.git diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl index 9534d95e6..1c7f2594e 100755 --- a/bin/mozilla/admin.pl +++ b/bin/mozilla/admin.pl @@ -55,6 +55,7 @@ use SL::Common; use SL::Inifile; use SL::DBUpgrade2; use SL::DBUtils; +use SL::Template; require "bin/mozilla/common.pl"; require "bin/mozilla/admin_groups.pl"; @@ -780,6 +781,7 @@ sub dbcreate { my $locale = $main::locale; $form->isblank("db", $locale->text('Dataset missing!')); + $form->isblank("defaultcurrency", $locale->text('Default currency missing!')); User->dbcreate(\%$form); @@ -1167,24 +1169,9 @@ sub _nologin_file_name { } 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})); - } - - tie my %dir_h, 'IO::Dir', $::lx_office_conf{paths}->{templates}; - - my @alldir = sort grep { - -d ($::lx_office_conf{paths}->{templates} . "/$_") - && !/^\.\.?$/ - && !m/\.(?:html|tex|sty|odt|xml|txb)$/ - && !m/^(?:webpages$|print$|\.)/ - } keys %dir_h; - - tie %dir_h, 'IO::Dir', "$::lx_office_conf{paths}->{templates}/print"; - my @allmaster = ('Standard', sort grep { -d ("$::lx_office_conf{paths}->{templates}/print" . "/$_") && !/^\.\.?$/ && !/^Standard$/ } keys %dir_h); + my %templates = SL::Template->available_templates; - return \@alldir, \@allmaster; + return ($templates{print_templates}, $templates{master_templates}); } 1;