#======================================================================
use DBI;
-use CGI;
+use Encode;
use English qw(-no_match_vars);
use Fcntl;
use File::Copy;
+use File::Find;
+use File::Spec;
+use Cwd;
use IO::File;
use POSIX qw(strftime);
use Sys::Hostname;
use SL::Auth;
+use SL::Auth::PasswordPolicy;
use SL::Form;
+use SL::Iconv;
use SL::Mailer;
use SL::User;
use SL::Common;
require "bin/mozilla/common.pl";
require "bin/mozilla/admin_groups.pl";
+require "bin/mozilla/admin_printer.pl";
use strict;
+# parserhappy(R):
+
+# $locale->text('periodic')
+# $locale->text('income')
+# $locale->text('perpetual')
+# $locale->text('balance')
+
our $cgi;
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_numberformats = ('1,000.00', '1000.00', '1.000,00', '1000,00');
+my @all_stylesheets = qw(lx-office-erp.css Win2000.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)') },
+);
+
sub run {
$::lxdebug->enter_sub;
my $session_result = shift;
- $cgi = $::cgi;
$form = $::form;
$locale = $::locale;
$auth = $::auth;
- $::auth->set_session_value('rpw', $::form->{rpw}) if $session_result == SL::Auth->SESSION_OK;
+ $::auth->store_root_credentials_in_session($form->{rpw}) if $session_result == SL::Auth->SESSION_OK;
$form->{stylesheet} = "lx-office-erp.css";
$form->{favicon} = "favicon.ico";
if ($form->{action}) {
- if ($auth->authenticate_root($form->{rpw}, 0) != $auth->OK()) {
+ if ($auth->authenticate_root($form->{rpw}) != $auth->OK()) {
$form->{error_message} = $locale->text('Incorrect Password!');
+ $auth->delete_session_value('rpw');
adminlogin();
} else {
- $auth->create_or_refresh_session() if ($auth->session_tables_present());
+ if ($auth->session_tables_present()) {
+ $::auth->store_root_credentials_in_session($::form->{rpw});
+ delete $::form->{rpw};
+ _apply_dbupgrade_scripts();
+ }
+
call_sub($locale->findsub($form->{action}));
}
- } elsif ($auth->authenticate_root($form->{rpw}, 0) == $auth->OK()) {
-
- $auth->create_or_refresh_session() if ($auth->session_tables_present());
-
- login();
} else {
# if there are no drivers bail out
$form->error($locale->text('No Database Drivers available!'))
}
sub adminlogin {
- my $form = $main::form;
- my $locale = $main::locale;
+ my $form = $main::form;
+ my $locale = $main::locale;
- $form->{title} = qq|Lx-Office ERP $form->{version} | . $locale->text('Administration');
+ $form->{title} = qq|kivitendo $form->{version} | . $locale->text('Administration');
$form->header();
print $form->parse_html_template('admin/adminlogin');
}
sub check_auth_db_and_tables {
- my $form = $main::form;
- my $locale = $main::locale;
+ my $form = $main::form;
+ my $locale = $main::locale;
my %params;
::end_of_request();
}
- if (-f $main::memberfile) {
+ my $memberfile = $::lx_office_conf{paths}->{memberfile};
+ if (-f $memberfile) {
my $memberdir = "";
- if ($main::memberfile =~ m|^.*/|) {
+ if ($memberfile =~ m|^.*/|) {
$memberdir = $&;
}
$form->{title} = $locale->text('User data migration');
$form->header();
- print $form->parse_html_template('admin/user_migration', { 'memberfile' => $main::memberfile,
+ print $form->parse_html_template('admin/user_migration', { 'memberfile' => $memberfile,
'backupdir' => $backupdir });
::end_of_request();
}
sub create_auth_db {
- my $form = $main::form;
+ my $form = $main::form;
$main::auth->create_database('superuser' => $form->{db_superuser},
- 'superuser_password' => $form->{db_superuser_password},
- 'template' => $form->{db_template});
+ 'superuser_password' => $form->{db_superuser_password},
+ 'template' => $form->{db_template});
login();
}
sub create_auth_tables {
- my $form = $main::form;
- my $locale = $main::locale;
+ my $form = $main::form;
+ my $locale = $main::locale;
$main::auth->create_tables();
$main::auth->set_session_value('rpw', $form->{rpw});
$main::auth->create_or_refresh_session();
- if (!-f $main::memberfile) {
+ my $memberfile = $::lx_office_conf{paths}->{memberfile};
+ if (!-f $memberfile) {
# New installation -- create a standard group with full access
my %members;
my $group = {
$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 $form = $main::form;
+ my $locale = $main::locale;
my $memberdir = "";
- if ($main::memberfile =~ m|^.*/|) {
+ my $memberfile = $::lx_office_conf{paths}->{memberfile};
+ if ($memberfile =~ m|^.*/|) {
$memberdir = $&;
}
$form->error(sprintf($locale->text('The directory "%s" could not be created:\n%s'), $backupdir, $!));
}
- copy $main::memberfile, "users/member-file-migration/members";
+ copy $memberfile, "users/member-file-migration/members";
- my $in = IO::File->new($main::memberfile, "r");
+ my $in = IO::File->new($memberfile, "r");
$form->error($locale->text('Could not open the old memberfile.')) if (!$in);
}
}
- unlink $main::memberfile;
+ unlink $memberfile;
my @member_list = sort { lc $a->{login} cmp lc $b->{login} } values %members;
}
sub create_standard_group_ask {
- my $form = $main::form;
- my $locale = $main::locale;
+ my $form = $main::form;
+ my $locale = $main::locale;
$form->{title} = $locale->text('Create a standard group');
}
sub create_standard_group {
- my $form = $main::form;
- my $locale = $main::locale;
+ my $form = $main::form;
+ my $locale = $main::locale;
my %members = $main::auth->read_all_users();
- my $groups = $main::auth->read_groups();
+ my $groups = $main::auth->read_groups();
foreach my $group (values %{$groups}) {
if (($form->{group_id} != $group->{id})
sub user_migration_complete {
my $standard_group_created = shift;
- my $form = $main::form;
- my $locale = $main::locale;
+ my $form = $main::form;
+ my $locale = $main::locale;
$form->{title} = $locale->text('User migration complete');
$form->header();
}
sub list_users {
- my $form = $main::form;
- my $locale = $main::locale;
+ my $form = $main::form;
+ my $locale = $main::locale;
my %members = $main::auth->read_all_users();
delete $members{"root login"};
- map { $_->{templates} =~ s|.*/||; } values %members;
+ for (values %members) {
+ $_->{templates} =~ s|.*/||;
+ $_->{login_url} = $::locale->is_utf8 ? Encode::encode('utf-8-strict', $_->{login}) : $_->{login_url};
+ }
- $form->{title} = "Lx-Office ERP " . $locale->text('Administration');
- $form->{LOCKED} = -e "$main::userspath/nologin";
+ $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();
}
sub add_user {
+ $::form->{title} = "kivitendo " . $::locale->text('Administration') . " / " . $::locale->text('Add User');
- my $form = $main::form;
- my $locale = $main::locale;
-
- $form->{title} =
- "Lx-Office ERP "
- . $locale->text('Administration') . " / "
- . $locale->text('Add User');
-
- my $myconfig = {
+# 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
+ my $user = bless {
"vclimit" => 200,
"countrycode" => "de",
"numberformat" => "1.000,00",
"dateformat" => "dd.mm.yy",
"stylesheet" => "lx-office-erp.css",
- "menustyle" => "v3",
- };
+ "menustyle" => "old",
+ dbport => $::auth->{DB_config}->{port} || 5432,
+ dbuser => $::auth->{DB_config}->{user} || 'lxoffice',
+ dbhost => $::auth->{DB_config}->{host} || 'localhost',
+ }, 'User';
- edit_user_form($myconfig);
+ edit_user_form($user);
}
sub edit_user {
- my $form = $main::form;
- my $locale = $main::locale;
-
-
- $form->{title} =
- "Lx-Office ERP "
- . $locale->text('Administration') . " / "
- . $locale->text('Edit User');
- $form->{edit} = 1;
-
- $form->isblank("login", $locale->text("The login is missing."));
+ $::form->{title} = "kivitendo " . $::locale->text('Administration') . " / " . $::locale->text('Edit User');
+ $::form->{edit} = 1;
# get user
- my $myconfig = new User($form->{login});
+ my $user = User->new(id => $::form->{user}{id});
# strip basedir from templates directory
- $myconfig->{templates} =~ s|.*/||;
+ $user->{templates} =~ s|.*/||;
- edit_user_form($myconfig);
+ edit_user_form($user);
}
sub edit_user_form {
- my ($myconfig) = @_;
-
- my $form = $main::form;
- my $locale = $main::locale;
-
- my @valid_dateformats = qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd);
- $form->{ALL_DATEFORMATS} = [ map { { "format" => $_, "selected" => $_ eq $myconfig->{dateformat} } } @valid_dateformats ];
-
- my @valid_numberformats = ('1,000.00', '1000.00', '1.000,00', '1000,00');
- $form->{ALL_NUMBERFORMATS} = [ map { { "format" => $_, "selected" => $_ eq $myconfig->{numberformat} } } @valid_numberformats ];
-
- my %countrycodes = User->country_codes;
- $form->{ALL_COUNTRYCODES} = [];
- foreach my $countrycode (sort { $countrycodes{$a} cmp $countrycodes{$b} } keys %countrycodes) {
- push @{ $form->{ALL_COUNTRYCODES} }, { "value" => $countrycode,
- "name" => $countrycodes{$countrycode},
- "selected" => $countrycode eq $myconfig->{countrycode} };
- }
-
- # is there a templates basedir
- if (!-d "$main::templates") {
- $form->error(sprintf($locale->text("The directory %s does not exist."), $main::templates));
- }
-
- opendir TEMPLATEDIR, "$main::templates/." or $form->error("$main::templates : $ERRNO");
- my @all = readdir(TEMPLATEDIR);
- my @alldir = sort grep { -d "$main::templates/$_" && !/^\.\.?$/ } @all;
- my @allhtml = sort grep { -f "$main::templates/$_" && /\.html$/ } @all;
- closedir TEMPLATEDIR;
-
- @alldir = grep !/\.(html|tex|sty|odt|xml|txb)$/, @alldir;
- @alldir = grep !/^(webpages|\.svn)$/, @alldir;
-
- @allhtml = reverse grep !/Default/, @allhtml;
- push @allhtml, 'Default';
- @allhtml = reverse @allhtml;
-
- $form->{ALL_TEMPLATES} = [ map { { "name", => $_, "selected" => $_ eq $myconfig->{templates} } } @alldir ];
-
- my $lastitem = $allhtml[0];
- $lastitem =~ s/-.*//g;
- $form->{ALL_MASTER_TEMPLATES} = [ { "name" => $lastitem, "selected" => $lastitem eq "German" } ];
- foreach my $item (@allhtml) {
- $item =~ s/-.*//g;
- next if ($item eq $lastitem);
-
- push @{ $form->{ALL_MASTER_TEMPLATES} }, { "name" => $item, "selected" => $item eq "German" };
- $lastitem = $item;
- }
-
- # css dir has styles that are not intended as general layouts.
- # reverting to hardcoded list
- $form->{ALL_STYLESHEETS} = [ map { { "name" => $_, "selected" => $_ eq $myconfig->{stylesheet} } } qw(lx-office-erp.css Win2000.css) ];
-
- $form->{"menustyle_" . $myconfig->{menustyle} } = 1;
-
- map { $form->{"myc_${_}"} = $myconfig->{$_} } keys %{ $myconfig };
+ my ($user) = @_;
+ my %cc = $user->country_codes;
+ my @all_countrycodes = map { id => $_, title => $cc{$_} }, sort { $cc{$a} cmp $cc{$b} } keys %cc;
+ my ($all_dir, $all_master) = _search_templates();
my $groups = [];
- if ($form->{edit}) {
- my $user_id = $main::auth->get_user_id($form->{login});
- my $all_groups = $main::auth->read_groups();
+ if ($::form->{edit}) {
+ my $user_id = $::auth->get_user_id($user->{login});
+ my $all_groups = $::auth->read_groups();
- foreach my $group (values %{ $all_groups }) {
+ for my $group (values %{ $all_groups }) {
push @{ $groups }, $group if (grep { $user_id == $_ } @{ $group->{members} });
}
$groups = [ sort { lc $a->{name} cmp lc $b->{name} } @{ $groups } ];
}
- $form->{CAN_CHANGE_PASSWORD} = $main::auth->can_change_password();
-
- $form->header();
- print $form->parse_html_template("admin/edit_user", { 'GROUPS' => $groups });
+ $::form->header;
+ print $::form->parse_html_template("admin/edit_user", {
+ GROUPS => $groups,
+ CAN_CHANGE_PASSWORD => $::auth->can_change_password,
+ user => $user->data,
+ all_stylesheets => \@all_stylesheets,
+ all_numberformats => \@valid_numberformats,
+ all_dateformats => \@valid_dateformats,
+ all_countrycodes => \@all_countrycodes,
+ all_menustyles => \@all_menustyles,
+ all_templates => $all_dir,
+ all_master_templates => $all_master,
+ });
}
sub save_user {
- my $form = $main::form;
- my $locale = $main::locale;
+ my $form = $main::form;
+ my $locale = $main::locale;
- $form->{dbdriver} = 'Pg';
+ my $user = $form->{user};
+
+ $user->{dbdriver} = 'Pg';
- # no spaces allowed in login name
- $form->{login} =~ s|\s||g;
- $form->isblank("login", $locale->text('Login name missing!'));
+ if (!$::form->{edit}) {
+ # no spaces allowed in login name
+ $user->{login} =~ s/\s//g;
+ $::form->show_generic_error($::locale->text('Login name missing!')) unless $user->{login};
- # check for duplicates
- if (!$form->{edit}) {
- my %members = $main::auth->read_all_users();
- if ($members{$form->{login}}) {
- $form->show_generic_error($locale->text('Another user with the login #1 does already exist.', $form->{login}), 'back_button' => 1);
+ # check for duplicates
+ my %members = $::auth->read_all_users;
+ if ($members{$user->{login}}) {
+ $::form->show_generic_error($locale->text('Another user with the login #1 does already exist.', $user->{login}), 'back_button' => 1);
}
}
# no spaces allowed in directories
- ($form->{newtemplates}) = split / /, $form->{newtemplates};
-
- if ($form->{newtemplates}) {
- $form->{templates} = $form->{newtemplates};
- } else {
- $form->{templates} =
- ($form->{usetemplates}) ? $form->{usetemplates} : $form->{login};
- }
+ ($::form->{newtemplates}) = split / /, $::form->{newtemplates};
+ $user->{templates} = $::form->{newtemplates} || $::form->{usetemplates} || $user->{login};
# is there a basedir
- if (!-d "$main::templates") {
- $form->error(sprintf($locale->text("The directory %s does not exist."), $main::templates));
+ if (!-d $::lx_office_conf{paths}->{templates}) {
+ $::form->error(sprintf($::locale->text("The directory %s does not exist."), $::lx_office_conf{paths}->{templates}));
}
# add base directory to $form->{templates}
- $form->{templates} =~ s|.*/||;
- $form->{templates} = "$main::templates/$form->{templates}";
+ $user->{templates} =~ s|.*/||;
+ $user->{templates} = $::lx_office_conf{paths}->{templates} . "/$user->{templates}";
- my $myconfig = new User($form->{login});
+ my $myconfig = new User(id => $user->{id});
- $form->isblank("dbname", $locale->text('Dataset missing!'));
- $form->isblank("dbuser", $locale->text('Database User missing!'));
+ $::form->show_generic_error($::locale->text('Dataset missing!')) unless $user->{dbname};
+ $::form->show_generic_error($::locale->text('Database User missing!')) unless $user->{dbuser};
- foreach my $item (keys %{$form}) {
- $myconfig->{$item} = $form->{$item};
+ foreach my $item (keys %{$user}) {
+ $myconfig->{$item} = $user->{$item};
}
- delete $myconfig->{stylesheet};
- if ($form->{userstylesheet}) {
- $myconfig->{stylesheet} = $form->{userstylesheet};
- }
+ $myconfig->save_member;
- $myconfig->save_member();
-
- if ($main::auth->can_change_password()
- && defined $form->{new_password}
- && ($form->{new_password} ne '********')) {
- $main::auth->change_password($form->{login}, $form->{new_password});
- }
-
- $form->{templates} =~ s|.*/||;
- $form->{templates} = "$main::templates/$form->{templates}";
- $form->{mastertemplates} =~ s|.*/||;
+ $user->{templates} =~ s|.*/||;
+ $user->{templates} = $::lx_office_conf{paths}->{templates} . "/$user->{templates}";
+ $::form->{mastertemplates} =~ s|.*/||;
# create user template directory and copy master files
- if (!-d "$form->{templates}") {
+ if (!-d "$user->{templates}") {
umask(002);
- if (mkdir "$form->{templates}", oct("771")) {
+ if (mkdir "$user->{templates}", oct("771")) {
umask(007);
# copy templates to the directory
- opendir TEMPLATEDIR, "$main::templates/." or $form->error("$main::templates : $ERRNO");
- my @templates = grep /$form->{mastertemplates}.*?\.(html|tex|sty|odt|xml|txb)$/,
- readdir TEMPLATEDIR;
- closedir TEMPLATEDIR;
-
- foreach my $file (@templates) {
- open(TEMP, "$main::templates/$file")
- or $form->error("$main::templates/$file : $ERRNO");
-
- $file =~ s/\Q$form->{mastertemplates}\E-//;
- open(NEW, ">$form->{templates}/$file")
- or $form->error("$form->{templates}/$file : $ERRNO");
-
- while (my $line = <TEMP>) {
- print NEW $line;
- }
- close(TEMP);
- close(NEW);
+
+ my $oldcurrdir = getcwd();
+ if (!chdir("$::lx_office_conf{paths}->{templates}/print/$::form->{mastertemplates}")) {
+ $form->error("$ERRNO: chdir $::lx_office_conf{paths}->{templates}/print/$::form->{mastertemplates}");
}
+
+ my $newdir = File::Spec->catdir($oldcurrdir, $user->{templates});
+
+ find(
+ sub
+ {
+ next if ($_ eq ".");
+
+ if (-d $_) {
+ if (!mkdir (File::Spec->catdir($newdir, $File::Find::name))) {
+ chdir($oldcurrdir);
+ $form->error("$ERRNO: mkdir $File::Find::name");
+ }
+ } elsif (-l $_) {
+ if (!symlink (readlink($_),
+ File::Spec->catfile($newdir, $File::Find::name))) {
+ chdir($oldcurrdir);
+ $form->error("$ERRNO: symlink $File::Find::name");
+ }
+ } elsif (-f $_) {
+ if (!copy($_, File::Spec->catfile($newdir, $File::Find::name))) {
+ chdir($oldcurrdir);
+ $form->error("$ERRNO: cp $File::Find::name");
+ }
+ }
+ }, "./");
+
+ chdir($oldcurrdir);
+
} else {
- $form->error("$ERRNO: $form->{templates}");
+ $form->error("$ERRNO: $user->{templates}");
}
}
# Add new user to his groups.
if (ref $form->{new_user_group_ids} eq 'ARRAY') {
my $all_groups = $main::auth->read_groups();
- my %user = $main::auth->read_user($form->{login});
+ my %user = $main::auth->read_user(login => $myconfig->{login});
foreach my $group_id (@{ $form->{new_user_group_ids} }) {
my $group = $all_groups->{$group_id};
}
}
- $form->redirect($locale->text('User saved!'));
+ if ($main::auth->can_change_password()
+ && defined $::form->{new_password}
+ && ($::form->{new_password} ne '********')) {
+ my $verifier = SL::Auth::PasswordPolicy->new;
+ my $result = $verifier->verify($::form->{new_password}, 1);
+
+ if ($result != SL::Auth::PasswordPolicy->OK()) {
+ $form->error($::locale->text('The settings were saved, but the password was not changed.') . ' ' . join(' ', $verifier->errors($result)));
+ }
+ $main::auth->change_password($myconfig->{login}, $::form->{new_password});
+ }
+
+ $::form->redirect($::locale->text('User saved!'));
}
sub save_user_as_new {
- my $form = $main::form;
+ my $form = $main::form;
- $form->{login} = $form->{new_user_login};
- delete @{$form}{qw(edit new_user_login)};
+ $form->{user}{login} = $::form->{new_user_login};
+ delete $form->{user}{id};
+ delete @{$form}{qw(id edit new_user_login)};
save_user();
}
sub delete_user {
- my $form = $main::form;
- my $locale = $main::locale;
+ my $form = $main::form;
+ my $locale = $main::locale;
+
+ my $user = $::form->{user} || {};
+
+ $::form->show_generic_error($::locale->text('Missing user id!')) unless $user->{id};
+
+ my $loaded_user = User->new(id => $user->{id});
my %members = $main::auth->read_all_users();
- my $templates = $members{$form->{login}}->{templates};
+ my $templates = $members{$loaded_user->{login}}->{templates};
- $main::auth->delete_user($form->{login});
+ $main::auth->delete_user($loaded_user->{login});
if ($templates) {
my $templates_in_use = 0;
foreach my $login (keys %members) {
- next if $form->{login} eq $login;
+ next if $loaded_user->{login} eq $login;
next if $members{$login}->{templates} ne $templates;
$templates_in_use = 1;
last;
}
sub get_value {
- my $line = shift;
-
- my $form = $main::form;
-
+ my $line = shift;
my ($null, $value) = split(/=/, $line, 2);
# remove comments
}
sub pg_database_administration {
- my $form = $main::form;
+ my $form = $main::form;
$form->{dbdriver} = 'Pg';
dbselect_source();
}
sub dbselect_source {
- my $form = $main::form;
- my $locale = $main::locale;
+ my $form = $main::form;
+ my $locale = $main::locale;
- $form->{dbport} = '5432';
- $form->{dbuser} = 'postgres';
+ $form->{dbport} = $::auth->{DB_config}->{port} || 5432;
+ $form->{dbuser} = $::auth->{DB_config}->{user} || 'lxoffice';
$form->{dbdefault} = 'template1';
- $form->{dbhost} = 'localhost';
+ $form->{dbhost} = $::auth->{DB_config}->{host} || 'localhost';
- $form->{title} = "Lx-Office ERP / " . $locale->text('Database Administration');
+ $form->{title} = "kivitendo / " . $locale->text('Database Administration');
# Intentionnaly disabled unless fixed to work with the authentication DB.
$form->{ALLOW_DBBACKUP} = 0; # "$pg_dump_exe" ne "DISABLED";
}
sub test_db_connection {
- my $form = $main::form;
- my $locale = $main::locale;
+ my $form = $main::form;
+ my $locale = $main::locale;
$form->{dbdriver} = 'Pg';
User::dbconnect_vars($form, $form->{dbname});
}
sub update_dataset {
- my $form = $main::form;
- my $locale = $main::locale;
+ my $form = $main::form;
+ my $locale = $main::locale;
- $form->{title} =
- "Lx-Office ERP "
- . $locale->text('Database Administration') . " / "
- . $locale->text('Update Dataset');
+ $form->{title} = "kivitendo " . $locale->text('Database Administration') . " / " . $locale->text('Update Dataset');
my @need_updates = User->dbneedsupdate($form);
$form->{NEED_UPDATES} = \@need_updates;
}
sub dbupdate {
- my $form = $main::form;
- my $locale = $main::locale;
+ my $form = $main::form;
+ my $locale = $main::locale;
$form->{stylesheet} = "lx-office-erp.css";
$form->{title} = $locale->text("Dataset upgrade");
foreach my $i (@update_rows) {
restore_form($saved_form);
- map { $form->{$_} = $form->{"${_}_${i}"} } qw(dbname dbdriver dbhost dbport dbuser dbpasswd);
-
- my $controls = parse_dbupdate_controls($form, $form->{dbdriver});
+ %::myconfig = ();
+ map { $form->{$_} = $::myconfig{$_} = $form->{"${_}_${i}"} } qw(dbname dbdriver dbhost dbport dbuser dbpasswd);
print $form->parse_html_template("admin/dbupgrade_header");
$form->{$form->{dbname}} = 1;
User->dbupdate($form);
- User->dbupdate2($form, $controls);
+ User->dbupdate2($form, SL::DBUpgrade2->new(form => $form, dbdriver => $form->{dbdriver})->parse_dbupdate_controls);
print $form->parse_html_template("admin/dbupgrade_footer");
}
}
sub create_dataset {
- my $form = $main::form;
- my $locale = $main::locale;
+ my $form = $main::form;
+ my $locale = $main::locale;
$form->{dbsources} = join " ", map { "[${_}]" } sort User->dbsources($form);
- $form->{CHARTS} = [];
+ $form->{CHARTS} = [];
opendir SQLDIR, "sql/." or $form->error($ERRNO);
foreach my $item (sort grep /-chart\.sql\z/, readdir SQLDIR) {
}
closedir SQLDIR;
- my $default_charset = $main::dbcharset;
+ $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" };
+ };
+
+ my $default_charset = $::lx_office_conf{system}->{dbcharset};
$default_charset ||= Common::DEFAULT_CHARSET;
my $cluster_encoding = User->dbclusterencoding($form);
if ($cluster_encoding && ($cluster_encoding =~ m/^(?:UTF-?8|UNICODE)$/i)) {
- if ($main::dbcharset !~ m/^UTF-?8$/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.'),
'back_button' => 1);
}
}
- $form->{title} =
- "Lx-Office ERP "
- . $locale->text('Database Administration') . " / "
- . $locale->text('Create Dataset');
+ $form->{title} = "kivitendo " . $locale->text('Database Administration') . " / " . $locale->text('Create Dataset');
$form->header();
print $form->parse_html_template("admin/create_dataset");
}
sub dbcreate {
- my $form = $main::form;
- my $locale = $main::locale;
+ my $form = $main::form;
+ my $locale = $main::locale;
$form->isblank("db", $locale->text('Dataset missing!'));
User->dbcreate(\%$form);
- $form->{title} =
- "Lx-Office ERP "
- . $locale->text('Database Administration') . " / "
- . $locale->text('Create Dataset');
+ $form->{title} = "kivitendo " . $locale->text('Database Administration') . " / " . $locale->text('Create Dataset');
$form->header();
print $form->parse_html_template("admin/dbcreate");
}
sub delete_dataset {
- my $form = $main::form;
- my $locale = $main::locale;
+ my $form = $main::form;
+ my $locale = $main::locale;
my @dbsources = User->dbsources_unused($form);
$form->error($locale->text('Nothing to delete!')) unless @dbsources;
- $form->{title} =
- "Lx-Office ERP "
- . $locale->text('Database Administration') . " / "
- . $locale->text('Delete Dataset');
+ $form->{title} = "kivitendo " . $locale->text('Database Administration') . " / " . $locale->text('Delete Dataset');
$form->{DBSOURCES} = [ map { { "name", $_ } } sort @dbsources ];
$form->header();
}
sub dbdelete {
- my $form = $main::form;
- my $locale = $main::locale;
+ my $form = $main::form;
+ my $locale = $main::locale;
if (!$form->{db}) {
$form->error($locale->text('No Dataset selected!'));
User->dbdelete(\%$form);
- $form->{title} =
- "Lx-Office ERP "
- . $locale->text('Database Administration') . " / "
- . $locale->text('Delete Dataset');
+ $form->{title} = "kivitendo " . $locale->text('Database Administration') . " / " . $locale->text('Delete Dataset');
$form->header();
print $form->parse_html_template("admin/dbdelete");
}
sub backup_dataset {
- my $form = $main::form;
- my $locale = $main::locale;
+ my $form = $main::form;
+ my $locale = $main::locale;
- $form->{title} =
- "Lx-Office ERP "
- . $locale->text('Database Administration') . " / "
- . $locale->text('Backup Dataset');
+ $form->{title} = "kivitendo " . $locale->text('Database Administration') . " / " . $locale->text('Backup Dataset');
- if ("$main::pg_dump_exe" eq "DISABLED") {
- $form->error($locale->text('Database backups and restorations are disabled in lx-erp.conf.'));
+ if ($::lx_office_conf{applications}->{pg_dump} eq "DISABLED") {
+ $form->error($locale->text('Database backups and restorations are disabled in the configuration.'));
}
my @dbsources = sort User->dbsources($form);
my $username = getpwuid $UID || "unknown-user";
my $hostname = hostname() || "unknown-host";
- $form->{from} = "Lx-Office Admin <${username}\@${hostname}>";
+ $form->{from} = "kivitendo Admin <${username}\@${hostname}>";
$form->header();
print $form->parse_html_template("admin/backup_dataset");
}
sub backup_dataset_start {
- my $form = $main::form;
- my $locale = $main::locale;
+ my $form = $main::form;
+ my $locale = $main::locale;
- $form->{title} =
- "Lx-Office ERP "
- . $locale->text('Database Administration') . " / "
- . $locale->text('Backup Dataset');
+ $form->{title} = "kivitendo " . $locale->text('Database Administration') . " / " . $locale->text('Backup Dataset');
- $main::pg_dump_exe ||= "pg_dump";
+ my $pg_dump_exe = $::lx_office_conf{applications}->{pg_dump} || "pg_dump";
- if ("$main::pg_dump_exe" eq "DISABLED") {
- $form->error($locale->text('Database backups and restorations are disabled in lx-erp.conf.'));
+ if ("$pg_dump_exe" eq "DISABLED") {
+ $form->error($locale->text('Database backups and restorations are disabled in the configuration.'));
}
$form->isblank("dbname", $locale->text('The dataset name is missing.'));
push @args, ("-p", $form->{dbport}) if ($form->{dbport});
push @args, $form->{dbname};
- my $cmd = "$main::pg_dump_exe " . join(" ", map { s/\\/\\\\/g; s/\"/\\\"/g; $_ } @args);
+ my $cmd = "$pg_dump_exe " . join(" ", map { s/\\/\\\\/g; s/\"/\\\"/g; $_ } @args);
my $name = "dataset_backup_$form->{dbname}_" . strftime("%Y%m%d", localtime()) . ".tar";
if ($form->{destination} ne "email") {
map { $mail->{$_} = $form->{$_} } qw(from to cc subject message);
- $mail->{charset} = $main::dbcharset ? $main::dbcharset : Common::DEFAULT_CHARSET;
+ $mail->{charset} = $::lx_office_conf{system}->{dbcharset} || Common::DEFAULT_CHARSET;
$mail->{attachments} = [ { "filename" => $tmp, "name" => $name } ];
$mail->send();
unlink "${tmpdir}/.pgpass", $tmp;
rmdir $tmpdir;
- $form->{title} =
- "Lx-Office ERP "
- . $locale->text('Database Administration') . " / "
- . $locale->text('Backup Dataset');
+ $form->{title} = "kivitendo " . $locale->text('Database Administration') . " / " . $locale->text('Backup Dataset');
$form->header();
print $form->parse_html_template("admin/backup_dataset_email_done");
}
sub restore_dataset {
- my $form = $main::form;
- my $locale = $main::locale;
+ my $form = $main::form;
+ my $locale = $main::locale;
- $form->{title} =
- "Lx-Office ERP "
- . $locale->text('Database Administration') . " / "
- . $locale->text('Restore Dataset');
+ $form->{title} = "kivitendo " . $locale->text('Database Administration') . " / " . $locale->text('Restore Dataset');
- if ("$main::pg_restore_exe" eq "DISABLED") {
- $form->error($locale->text('Database backups and restorations are disabled in lx-erp.conf.'));
+ if ($::lx_office_conf{applications}->{pg_restore} eq "DISABLED") {
+ $form->error($locale->text('Database backups and restorations are disabled in the configuration.'));
}
- my $default_charset = $main::dbcharset;
+ my $default_charset = $::lx_office_conf{system}->{dbcharset};
$default_charset ||= Common::DEFAULT_CHARSET;
$form->{DBENCODINGS} = [];
}
sub restore_dataset_start {
- my $form = $main::form;
- my $locale = $main::locale;
+ my $form = $main::form;
+ my $locale = $main::locale;
- $form->{title} =
- "Lx-Office ERP "
- . $locale->text('Database Administration') . " / "
- . $locale->text('Restore Dataset');
+ $form->{title} = "kivitendo " . $locale->text('Database Administration') . " / " . $locale->text('Restore Dataset');
- $main::pg_restore_exe ||= "pg_restore";
+ my $pg_restore_exe = $::lx_office_conf{applications}->{pg_restore} || "pg_restore";
- if ("$main::pg_restore_exe" eq "DISABLED") {
- $form->error($locale->text('Database backups and restorations are disabled in lx-erp.conf.'));
+ if ("$pg_restore_exe" eq "DISABLED") {
+ $form->error($locale->text('Database backups and restorations are disabled in the configuration.'));
}
$form->isblank("new_dbname", $locale->text('The dataset name is missing.'));
push @args, ("-p", $form->{dbport}) if ($form->{dbport});
push @args, $tmp;
- my $cmd = "$main::pg_restore_exe " . join(" ", map { s/\\/\\\\/g; s/\"/\\\"/g; $_ } @args);
+ my $cmd = "$pg_restore_exe " . join(" ", map { s/\\/\\\\/g; s/\"/\\\"/g; $_ } @args);
my $in = IO::File->new("$cmd 2>&1 |");
}
sub unlock_system {
- my $form = $main::form;
- my $locale = $main::locale;
+ my $form = $main::form;
+ my $locale = $main::locale;
- unlink "$main::userspath/nologin";
+ unlink _nologin_file_name();;
$form->{callback} = "admin.pl?action=list_users";
}
sub lock_system {
- my $form = $main::form;
- my $locale = $main::locale;
+ my $form = $main::form;
+ my $locale = $main::locale;
- open(FH, ">$main::userspath/nologin")
+ open(FH, ">", _nologin_file_name())
or $form->error($locale->text('Cannot create Lock!'));
close(FH);
}
sub edit {
- my $form = $main::form;
+ my $form = $main::form;
$form->{edit_nextsub} ||= 'edit_user';
}
sub save {
- my $form = $main::form;
+ my $form = $main::form;
$form->{save_nextsub} ||= 'save_user';
}
sub dispatcher {
- my $form = $main::form;
- my $locale = $main::locale;
+ my $form = $main::form;
+ my $locale = $main::locale;
foreach my $action (qw(create_standard_group dont_create_standard_group
save_user delete_user save_user_as_new)) {
$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}));
+ }
+
+ 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;
+
+ return \@alldir, \@allmaster;
+}
+
1;
projects / kivitendo-erp.git / blobdiff