X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/2cd07f2f94e8e8fdba104dce374d0871cdd0820f..89b7ddcb3281f76bef6d0cb29ea8d0c4817d40fa:/bin/mozilla/admin.pl

diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index 97180b4b7..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";
@@ -76,11 +77,10 @@ our $auth;
 
 my @valid_dateformats = qw(mm/dd/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 Mobile.css kivitendo.css);
+my @all_stylesheets = qw(lx-office-erp.css Mobile.css kivitendo.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)') },
 );
 
@@ -99,7 +99,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 {
@@ -380,16 +380,14 @@ sub list_users {
 sub add_user {
   $::form->{title}   = "kivitendo " . $::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.
-# User does not have a well behaved new constructor, so we#Ll just have to build one ourself
+  # 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",
     "dateformat"   => "dd.mm.yy",
     "stylesheet"   => "kivitendo.css",
-    "menustyle"    => "old",
+    "menustyle"    => "neu",
     dbport         => $::auth->{DB_config}->{port} || 5432,
     dbuser         => $::auth->{DB_config}->{user} || 'lxoffice',
     dbhost         => $::auth->{DB_config}->{host} || 'localhost',
@@ -762,7 +760,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);
     }
 
@@ -783,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);
 
@@ -1170,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;