use File::Find;
use File::Spec;
use Cwd;
+use IO::Dir;
use IO::File;
use POSIX qw(strftime);
use Sys::Hostname;
use SL::Inifile;
use SL::DBUpgrade2;
use SL::DBUtils;
+use SL::Template;
require "bin/mozilla/common.pl";
require "bin/mozilla/admin_groups.pl";
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)') },
);
$locale = $::locale;
$auth = $::auth;
- $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->{'{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 {
::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 {
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;
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',
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();
$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');
my $locale = $main::locale;
$form->isblank("db", $locale->text('Dataset missing!'));
+ $form->isblank("defaultcurrency", $locale->text('Default currency missing!'));
User->dbcreate(\%$form);
}
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;
projects / kivitendo-erp.git / blobdiff