X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fadmin.pl;h=7f0b80de85dd3d59628a0c337f5d86f82b2f6b12;hb=8b8d484882dae49244fd69856d7969eca5434c22;hp=6f3d70904a93130bcf786b971acb6ec16b19f67d;hpb=dfeaf8fb10513660b70b48b155436277f5d1266b;p=kivitendo-erp.git diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl index 6f3d70904..7f0b80de8 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; @@ -73,13 +74,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 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)') }, ); @@ -91,20 +91,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 +147,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(); @@ -197,7 +198,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}; @@ -378,16 +379,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 +702,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 +743,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->{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" }; - }; + $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) ]; - 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'); @@ -1197,23 +1172,17 @@ sub _search_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; + tie my %dir_h, 'IO::Dir', $::lx_office_conf{paths}->{templates}; - # 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; + my @alldir = sort grep { + -d ($::lx_office_conf{paths}->{templates} . "/$_") + && !/^\.\.?$/ + && !m/\.(?:html|tex|sty|odt|xml|txb)$/ + && !m/^(?:webpages$|print$|mail$|\.)/ + } keys %dir_h; - @allmaster = sort grep { -d ("$::lx_office_conf{paths}->{templates}/print" . "/$_") && !/^\.\.?$/ } @allmaster; - @allmaster = reverse grep !/Default/, @allmaster; - push @allmaster, 'Default'; - @allmaster = reverse @allmaster; + 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); return \@alldir, \@allmaster; }