X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fadmin.pl;h=464c6de9a11b50989d78147e69b0a676a325321f;hb=a11d7a85a9b73798acb3a11b6ba4251ba331b19c;hp=7f0b80de85dd3d59628a0c337f5d86f82b2f6b12;hpb=da6d6eb04e6d16be889378e28d89d25e47d81293;p=kivitendo-erp.git

diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index 7f0b80de8..464c6de9a 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";
@@ -164,24 +165,6 @@ sub check_auth_db_and_tables {
 
     ::end_of_request();
   }
-
-  my $memberfile = $::lx_office_conf{paths}->{memberfile};
-  if (-f $memberfile) {
-    my $memberdir = "";
-
-    if ($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' => $memberfile,
-                                                               'backupdir'  => $backupdir });
-
-    ::end_of_request();
-  }
 }
 
 sub create_auth_db {
@@ -219,142 +202,6 @@ sub create_auth_tables {
   login();
 }
 
-sub migrate_users {
-  $main::lxdebug->enter_sub();
-
-  my $form      = $main::form;
-  my $locale    = $main::locale;
-
-  my $memberdir = "";
-
-  my $memberfile = $::lx_office_conf{paths}->{memberfile};
-  if ($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 $memberfile, "users/member-file-migration/members";
-
-  my $in = IO::File->new($memberfile, "r");
-
-  $form->error($locale->text('Could not open the old memberfile.')) if (!$in);
-
-  my (%members, $login);
-
-  while (<$in>) {
-    chomp;
-
-    next if (m/^\s*\#/);
-
-    if (m/^\[.*\]/) {
-      $login = $_;
-      $login =~ s/(\[|\])//g;
-      $login =~ s/^\s*//;
-      $login =~ s/\s*$//;
-
-      $members{$login} = { "login" => $login };
-      next;
-    }
-
-    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;
-    }
-  }
-
-  $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 $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;
@@ -780,6 +627,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 +1015,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$|mail$|\.)/
-  } 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;