X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fadmin.pl;h=67c5969fd36a39575d619e8e3bf39ec7c131a21e;hb=d8ac08282dad52789b8bea785e8cddae44085483;hp=767669899cb75c2fb067e376bc726a7f04c26453;hpb=980dc53321ae6c2d3e448b6ca2a0c7d11a65ee8c;p=kivitendo-erp.git

diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index 767669899..67c5969fd 100755
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -47,6 +47,8 @@ use Sys::Hostname;
 
 use SL::Auth;
 use SL::Auth::PasswordPolicy;
+use SL::DB::AuthClient;
+use SL::DB::AuthUser;
 use SL::Form;
 use SL::Iconv;
 use SL::Mailer;
@@ -55,6 +57,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,7 +79,7 @@ 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)') },
@@ -98,13 +101,12 @@ 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 {
       if ($auth->session_tables_present()) {
         delete $::form->{'{AUTH}admin_password'};
-        _apply_dbupgrade_scripts();
       }
 
       call_sub($locale->findsub($form->{action}));
@@ -129,253 +131,6 @@ sub adminlogin {
   print $form->parse_html_template('admin/adminlogin');
 }
 
-sub login {
-  check_auth_db_and_tables();
-  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} };
-
-  $params{admin_password} = $::lx_office_conf{authentication}->{admin_password};
-
-  if (!$main::auth->check_database()) {
-    $form->{title} = $locale->text('Authentification database creation');
-    $form->header();
-    print $form->parse_html_template('admin/check_auth_database', \%params);
-
-    ::end_of_request();
-  }
-
-  if (!$main::auth->check_tables()) {
-    $form->{title} = $locale->text('Authentification tables creation');
-    $form->header();
-    print $form->parse_html_template('admin/check_auth_tables', \%params);
-
-    ::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 {
-  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('admin_password', $form->{'{AUTH}admin_password'});
-  $main::auth->create_or_refresh_session();
-
-  my $memberfile = $::lx_office_conf{paths}->{memberfile};
-  if (!-f $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);
-  }
-
-  _apply_dbupgrade_scripts();
-  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;
-
-  my %members = $main::auth->read_all_users();
-
-  delete $members{"root login"};
-
-  for (values %members) {
-    $_->{templates} =~ s|.*/||;
-    $_->{login_url} =  $::locale->is_utf8 ? Encode::encode('utf-8-strict', $_->{login}) : $_->{login_url};
-  }
-
-  $form->{title}   = "kivitendo " . $locale->text('Administration');
-  $form->{LOCKED}  = -e _nologin_file_name();
-  $form->{MEMBERS} = [ @members{sort { lc $a cmp lc $b } keys %members} ];
-
-  $form->header();
-  print $form->parse_html_template("admin/list_users");
-}
-
 sub add_user {
   $::form->{title}   = "kivitendo " . $::locale->text('Administration') . " / " . $::locale->text('Add User');
 
@@ -402,9 +157,6 @@ sub edit_user {
   # get user
   my $user = User->new(id => $::form->{user}{id});
 
-  # strip basedir from templates directory
-  $user->{templates} =~ s|.*/||;
-
   edit_user_form($user);
 }
 
@@ -759,7 +511,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);
     }
 
@@ -780,6 +532,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);
 
@@ -1075,32 +828,6 @@ sub restore_dataset_start {
   rmdir $tmpdir;
 }
 
-sub unlock_system {
-  my $form   = $main::form;
-  my $locale = $main::locale;
-
-  unlink _nologin_file_name();;
-
-  $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, ">", _nologin_file_name())
-    or $form->error($locale->text('Cannot create Lock!'));
-  close(FH);
-
-  $form->{callback} = "admin.pl?action=list_users";
-
-  $form->redirect($locale->text('Lockfile created!'));
-
-}
-
 sub yes {
   call_sub($main::form->{yes_nextsub});
 }
@@ -1158,33 +885,10 @@ sub dispatcher {
   $form->error($locale->text('No action defined.'));
 }
 
-sub _apply_dbupgrade_scripts {
-  ::end_of_request() if SL::DBUpgrade2->new(form => $::form, dbdriver => 'Pg', auth => 1)->apply_admin_dbupgrade_scripts(1);
-}
-
-sub _nologin_file_name {
-  return $::lx_office_conf{paths}->{userspath} . '/nologin';
-}
-
 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;