X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fadmin.pl;h=464c6de9a11b50989d78147e69b0a676a325321f;hb=a11d7a85a9b73798acb3a11b6ba4251ba331b19c;hp=95c030390a512faa45e5a9c70be957fdd4221ca7;hpb=6fdf290898b160dd60af5e00fab9f5820394947d;p=kivitendo-erp.git diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl index 95c030390..464c6de9a 100755 --- a/bin/mozilla/admin.pl +++ b/bin/mozilla/admin.pl @@ -40,6 +40,7 @@ use File::Copy; use File::Find; use File::Spec; use Cwd; +use IO::Dir; use IO::File; use POSIX qw(strftime); use Sys::Hostname; @@ -54,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"; @@ -73,13 +75,12 @@ our $form; our $locale; our $auth; -my @valid_dateformats = qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd); +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); +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)') }, ); @@ -91,20 +92,19 @@ sub run { $locale = $::locale; $auth = $::auth; - $::auth->store_root_credentials_in_session($form->{rpw}) if $session_result == SL::Auth->SESSION_OK; - - $form->{stylesheet} = "lx-office-erp.css"; + $::request->{layout} = SL::Layout::Dispatcher->new(style => 'admin'); + $::request->{layout}->use_stylesheet("lx-office-erp.css"); $form->{favicon} = "favicon.ico"; if ($form->{action}) { - if ($auth->authenticate_root($form->{rpw}) != $auth->OK()) { - $form->{error_message} = $locale->text('Incorrect Password!'); - $auth->delete_session_value('rpw'); + if ($auth->authenticate_root($form->{'{AUTH}admin_password'}) != $auth->OK()) { + $auth->punish_wrong_login; + $form->{error} = $locale->text('Incorrect Password!'); + $auth->delete_session_value('admin_password'); adminlogin(); } else { if ($auth->session_tables_present()) { - $::auth->store_root_credentials_in_session($::form->{rpw}); - delete $::form->{rpw}; + delete $::form->{'{AUTH}admin_password'}; _apply_dbupgrade_scripts(); } @@ -148,6 +148,8 @@ sub check_auth_db_and_tables { 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(); @@ -163,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 { @@ -197,7 +181,7 @@ sub create_auth_tables { my $locale = $main::locale; $main::auth->create_tables(); - $main::auth->set_session_value('rpw', $form->{rpw}); + $main::auth->set_session_value('admin_password', $form->{'{AUTH}admin_password'}); $main::auth->create_or_refresh_session(); my $memberfile = $::lx_office_conf{paths}->{memberfile}; @@ -218,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; @@ -378,16 +226,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" => "lx-office-erp.css", - "menustyle" => "old", + "stylesheet" => "kivitendo.css", + "menustyle" => "neu", dbport => $::auth->{DB_config}->{port} || 5432, dbuser => $::auth->{DB_config}->{user} || 'lxoffice', dbhost => $::auth->{DB_config}->{host} || 'localhost', @@ -703,7 +549,7 @@ sub dbupdate { my $form = $main::form; my $locale = $main::locale; - $form->{stylesheet} = "lx-office-erp.css"; + $::request->{layout}->use_stylesheet("lx-office-erp.css"); $form->{title} = $locale->text("Dataset upgrade"); $form->header(); @@ -744,54 +590,30 @@ sub create_dataset { $form->{CHARTS} = []; - opendir SQLDIR, "sql/." or $form->error($ERRNO); - foreach my $item (sort grep /-chart\.sql\z/, readdir SQLDIR) { - next if ($item eq 'Default-chart.sql'); - $item =~ s/-chart\.sql//; - push @{ $form->{CHARTS} }, { "name" => $item, - "selected" => $item eq "Germany-DATEV-SKR03EU" }; + tie my %dir_h, 'IO::Dir', 'sql/'; + foreach my $item (map { s/-chart\.sql$//; $_ } sort grep { /-chart\.sql\z/ && !/Default-chart.sql\z/ } keys %dir_h) { + push @{ $form->{CHARTS} }, { name => $item, + selected => $item eq "Germany-DATEV-SKR03EU" }; } - closedir SQLDIR; - $form->{ACCOUNTING_METHODS} = []; - foreach my $item ( qw(accrual cash) ) { - push @{ $form->{ACCOUNTING_METHODS} }, { "name" => $item, - "selected" => $item eq "cash" }; - }; + $form->{ACCOUNTING_METHODS} = [ map { { name => $_, selected => $_ eq 'cash' } } qw(accrual cash) ]; + $form->{INVENTORY_SYSTEMS} = [ map { { name => $_, selected => $_ eq 'periodic' } } qw(perpetual periodic) ]; + $form->{PROFIT_DETERMINATIONS} = [ map { { name => $_, selected => $_ eq 'income' } } qw(balance income) ]; - $form->{INVENTORY_SYSTEMS} = []; - foreach my $item ( qw(perpetual periodic) ) { - push @{ $form->{INVENTORY_SYSTEMS} }, { "name" => $item, - "selected" => $item eq "periodic" }; - }; - - $form->{PROFIT_DETERMINATIONS} = []; - foreach my $item ( qw(balance income) ) { - push @{ $form->{PROFIT_DETERMINATIONS} }, { "name" => $item, - "selected" => $item eq "income" }; - }; - - my $default_charset = $::lx_office_conf{system}->{dbcharset}; - $default_charset ||= Common::DEFAULT_CHARSET; + my $default_charset = $::lx_office_conf{system}->{dbcharset} || Common::DEFAULT_CHARSET; my $cluster_encoding = User->dbclusterencoding($form); 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); } $form->{FORCE_DBENCODING} = 'UNICODE'; } else { - $form->{DBENCODINGS} = []; - - foreach my $encoding (@Common::db_encodings) { - push @{ $form->{DBENCODINGS} }, { "dbencoding" => $encoding->{dbencoding}, - "label" => $encoding->{label}, - "selected" => $encoding->{charset} eq $default_charset }; - } + $form->{DBENCODINGS} = [ map { { %{$_}, selected => $_->{charset} eq $default_charset } } @Common::db_encodings ]; } $form->{title} = "kivitendo " . $locale->text('Database Administration') . " / " . $locale->text('Create Dataset'); @@ -805,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); @@ -1192,30 +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})); - } - - opendir TEMPLATEDIR, $::lx_office_conf{paths}->{templates} or $::form->error($::lx_office_conf{paths}->{templates} . " : $ERRNO"); - my @all = readdir(TEMPLATEDIR); - my @alldir = sort grep { -d ($::lx_office_conf{paths}->{templates} . "/$_") && !/^\.\.?$/ } @all; - closedir TEMPLATEDIR; - - @alldir = grep !/\.(html|tex|sty|odt|xml|txb)$/, @alldir; - @alldir = grep !/^(webpages|print|\.svn)$/, @alldir; - - # mastertemplates - opendir TEMPLATEDIR, "$::lx_office_conf{paths}->{templates}/print" or $::form->error("$::lx_office_conf{paths}->{templates}/print" . " : $ERRNO"); - my @allmaster = readdir(TEMPLATEDIR); - closedir TEMPLATEDIR; - - @allmaster = sort grep { -d ("$::lx_office_conf{paths}->{templates}/print" . "/$_") && !/^\.\.?$/ } @allmaster; - @allmaster = reverse grep !/Default/, @allmaster; - push @allmaster, 'Default'; - @allmaster = reverse @allmaster; + my %templates = SL::Template->available_templates; - return \@alldir, \@allmaster; + return ($templates{print_templates}, $templates{master_templates}); } 1;