X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=SL%2FUser.pm;h=fe2152ecea8086317285a7c83570f8257a8509bf;hb=0b33cc602d717933791d06cb64f65dea2a7c2354;hp=37a61c51f416d4f58c8a853ea45d1f84dce76612;hpb=075bd42af8885aee3c18fe055a2c82b8b43f4cea;p=kivitendo-erp.git diff --git a/SL/User.pm b/SL/User.pm index 37a61c51f..fe2152ece 100644 --- a/SL/User.pm +++ b/SL/User.pm @@ -38,14 +38,24 @@ use IO::File; use Fcntl qw(:seek); #use SL::Auth; +use SL::DB::AuthClient; +use SL::DB::Employee; use SL::DBConnect; use SL::DBUpgrade2; use SL::DBUtils; use SL::Iconv; use SL::Inifile; +use SL::System::InstallationLock; +use SL::DefaultManager; use strict; +use constant LOGIN_OK => 0; +use constant LOGIN_BASIC_TABLES_MISSING => -1; +use constant LOGIN_DBUPDATE_AVAILABLE => -2; +use constant LOGIN_AUTH_DBUPDATE_AVAILABLE => -3; +use constant LOGIN_GENERAL_ERROR => -4; + sub new { $main::lxdebug->enter_sub(); @@ -92,95 +102,75 @@ sub country_codes { } sub login { - $main::lxdebug->enter_sub(); - my ($self, $form) = @_; - our $sid; - - local *FH; - - my $rc = -3; - - if ($self->{login}) { - my %myconfig = $main::auth->read_user(login => $self->{login}); - - # check if database is down - my $dbh = SL::DBConnect->connect($myconfig{dbconnect}, $myconfig{dbuser}, $myconfig{dbpasswd}) - or $self->error($DBI::errstr); - # we got a connection, check the version - my $query = qq|SELECT version FROM defaults|; - my $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($query); + return LOGIN_GENERAL_ERROR() if !$self->{login} || !$::auth->client; - my ($dbversion) = $sth->fetchrow_array; - $sth->finish; + my %myconfig = $main::auth->read_user(login => $self->{login}); - $self->create_employee_entry($form, $dbh, \%myconfig); + # Auth DB upgrades available? + my $dbupdater_auth = SL::DBUpgrade2->new(form => $form, auth => 1)->parse_dbupdate_controls; + return LOGIN_AUTH_DBUPDATE_AVAILABLE() if $dbupdater_auth->unapplied_upgrade_scripts($::auth->dbconnect); - $self->create_schema_info_table($form, $dbh); + # check if database is down + my $dbh = $form->dbconnect_noauto; - my $dbupdater_auth = SL::DBUpgrade2->new(form => $form, dbdriver => 'Pg', auth => 1)->parse_dbupdate_controls; - if ($dbupdater_auth->unapplied_upgrade_scripts($::auth->dbconnect)) { - $::lxdebug->leave_sub; - return -3; - } - - $rc = 0; - - my $dbupdater = SL::DBUpgrade2->new(form => $form, dbdriver => $myconfig{dbdriver})->parse_dbupdate_controls; - - map({ $form->{$_} = $myconfig{$_} } qw(dbname dbhost dbport dbdriver dbuser dbpasswd dbconnect dateformat)); - dbconnect_vars($form, $form->{dbname}); - my $update_available = $dbupdater->update_available($dbversion) || $dbupdater->update2_available($dbh); + # we got a connection, check the version + my ($dbversion) = $dbh->selectrow_array(qq|SELECT version FROM defaults|); + if (!$dbversion) { $dbh->disconnect; + return LOGIN_BASIC_TABLES_MISSING(); + } + + $self->create_schema_info_table($form, $dbh); - if ($update_available) { - $form->{"title"} = $main::locale->text("Dataset upgrade"); - $form->header(); - print $form->parse_html_template("dbupgrade/header"); + my $dbupdater = SL::DBUpgrade2->new(form => $form)->parse_dbupdate_controls; + my @unapplied_scripts = $dbupdater->unapplied_upgrade_scripts($dbh); + $dbh->disconnect; - $form->{dbupdate} = "db$myconfig{dbname}"; - $form->{ $form->{dbupdate} } = 1; + if (!@unapplied_scripts) { + SL::DB::Manager::Employee->update_entries_for_authorized_users; + return LOGIN_OK(); + } - if ($form->{"show_dbupdate_warning"}) { - print $form->parse_html_template("dbupgrade/warning"); - ::end_of_request(); - } + $form->{$_} = $::auth->client->{$_} for qw(dbname dbhost dbport dbuser dbpasswd); + $form->{$_} = $myconfig{$_} for qw(datestyle); - # update the tables - if (!open(FH, ">", $::lx_office_conf{paths}->{userspath} . "/nologin")) { - $form->show_generic_error($main::locale->text('A temporary file could not be created. ' . - 'Please verify that the directory "#1" is writeable by the webserver.', - $::lx_office_conf{paths}->{userspath}), - 'back_button' => 1); - } + $form->{"title"} = $main::locale->text("Dataset upgrade"); + $form->header(no_layout => $form->{no_layout}); + print $form->parse_html_template("dbupgrade/header"); - # required for Oracle - $form->{dbdefault} = $sid; + $form->{dbupdate} = "db" . $::auth->client->{dbname}; - # ignore HUP, QUIT in case the webserver times out - $SIG{HUP} = 'IGNORE'; - $SIG{QUIT} = 'IGNORE'; + if ($form->{"show_dbupdate_warning"}) { + print $form->parse_html_template("dbupgrade/warning", { unapplied_scripts => \@unapplied_scripts }); + ::end_of_request(); + } - $self->dbupdate($form); - $self->dbupdate2($form, $dbupdater); - SL::DBUpgrade2->new(form => $::form, dbdriver => 'Pg', auth => 1)->apply_admin_dbupgrade_scripts(0); + # update the tables + SL::System::InstallationLock->lock; - close(FH); + # ignore HUP, QUIT in case the webserver times out + $SIG{HUP} = 'IGNORE'; + $SIG{QUIT} = 'IGNORE'; - # remove lock file - unlink($::lx_office_conf{paths}->{userspath} . "/nologin"); + $self->dbupdate2(form => $form, updater => $dbupdater, database => $::auth->client->{dbname}); - print $form->parse_html_template("dbupgrade/footer"); + # If $self->dbupdate2 returns than this means all upgrade scripts + # have been applied successfully, none required user + # interaction. Otherwise the deeper layers would have called + # ::end_of_request() already, and return would not have returned to + # us. Therefore we can now use RDBO instances because their supposed + # table structures do match the actual structures. So let's ensure + # that the "employee" table contains the appropriate entries for all + # users authorized for the current client. + SL::DB::Manager::Employee->update_entries_for_authorized_users; - $rc = -2; - } - } + SL::System::InstallationLock->unlock; - $main::lxdebug->leave_sub(); + print $form->parse_html_template("dbupgrade/footer"); - return $rc; + return LOGIN_DBUPDATE_AVAILABLE(); } sub dbconnect_vars { @@ -189,48 +179,17 @@ sub dbconnect_vars { my ($form, $db) = @_; my %dboptions = ( - 'Pg' => { 'yy-mm-dd' => 'set DateStyle to \'ISO\'', - 'yyyy-mm-dd' => 'set DateStyle to \'ISO\'', - 'mm/dd/yy' => 'set DateStyle to \'SQL, US\'', - 'dd/mm/yy' => 'set DateStyle to \'SQL, EUROPEAN\'', - 'dd.mm.yy' => 'set DateStyle to \'GERMAN\'' - }, - 'Oracle' => { - 'yy-mm-dd' => 'ALTER SESSION SET NLS_DATE_FORMAT = \'YY-MM-DD\'', - 'yyyy-mm-dd' => 'ALTER SESSION SET NLS_DATE_FORMAT = \'YYYY-MM-DD\'', - 'mm/dd/yy' => 'ALTER SESSION SET NLS_DATE_FORMAT = \'MM/DD/YY\'', - 'dd/mm/yy' => 'ALTER SESSION SET NLS_DATE_FORMAT = \'DD/MM/YY\'', - 'dd.mm.yy' => 'ALTER SESSION SET NLS_DATE_FORMAT = \'DD.MM.YY\'', - }); - - $form->{dboptions} = $dboptions{ $form->{dbdriver} }{ $form->{dateformat} }; - - if ($form->{dbdriver} eq 'Pg') { - $form->{dbconnect} = "dbi:Pg:dbname=$db"; - } - - if ($form->{dbdriver} eq 'Oracle') { - $form->{dbconnect} = "dbi:Oracle:sid=$form->{sid}"; - } - - if ($form->{dbhost}) { - $form->{dbconnect} .= ";host=$form->{dbhost}"; - } - if ($form->{dbport}) { - $form->{dbconnect} .= ";port=$form->{dbport}"; - } - - $main::lxdebug->leave_sub(); -} - -sub dbdrivers { - $main::lxdebug->enter_sub(); + 'yy-mm-dd' => 'set DateStyle to \'ISO\'', + 'yyyy-mm-dd' => 'set DateStyle to \'ISO\'', + 'mm/dd/yy' => 'set DateStyle to \'SQL, US\'', + 'dd/mm/yy' => 'set DateStyle to \'SQL, EUROPEAN\'', + 'dd.mm.yy' => 'set DateStyle to \'GERMAN\'' + ); - my @drivers = DBI->available_drivers(); + $form->{dboptions} = $dboptions{ $form->{dateformat} }; + $form->{dbconnect} = "dbi:Pg:dbname=${db};host=" . ($form->{dbhost} || 'localhost') . ";port=" . ($form->{dbport} || 5432); $main::lxdebug->leave_sub(); - - return (grep { /(Pg|Oracle)/ } @drivers); } sub dbsources { @@ -242,62 +201,42 @@ sub dbsources { my ($sth, $query); $form->{dbdefault} = $form->{dbuser} unless $form->{dbdefault}; - $form->{sid} = $form->{dbdefault}; &dbconnect_vars($form, $form->{dbdefault}); - my $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}) + my $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}, SL::DBConnect->get_options) or $form->dberror; - if ($form->{dbdriver} eq 'Pg') { - $query = - qq|SELECT datname FROM pg_database | . - qq|WHERE NOT datname IN ('template0', 'template1')|; - $sth = $dbh->prepare($query); - $sth->execute() || $form->dberror($query); - - while (my ($db) = $sth->fetchrow_array) { - - if ($form->{only_acc_db}) { - - next if ($db =~ /^template/); - - &dbconnect_vars($form, $db); - my $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}) - or $form->dberror; - - $query = - qq|SELECT tablename FROM pg_tables | . - qq|WHERE (tablename = 'defaults') AND (tableowner = ?)|; - my $sth = $dbh->prepare($query); - $sth->execute($form->{dbuser}) || - $form->dberror($query . " ($form->{dbuser})"); - - if ($sth->fetchrow_array) { - push(@dbsources, $db); - } - $sth->finish; - $dbh->disconnect; - next; - } - push(@dbsources, $db); - } - } + $query = + qq|SELECT datname FROM pg_database | . + qq|WHERE NOT datname IN ('template0', 'template1')|; + $sth = $dbh->prepare($query); + $sth->execute() || $form->dberror($query); + + while (my ($db) = $sth->fetchrow_array) { - if ($form->{dbdriver} eq 'Oracle') { if ($form->{only_acc_db}) { - $query = - qq|SELECT owner FROM dba_objects | . - qq|WHERE object_name = 'DEFAULTS' AND object_type = 'TABLE'|; - } else { - $query = qq|SELECT username FROM dba_users|; - } - $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($query); + next if ($db =~ /^template/); + + &dbconnect_vars($form, $db); + my $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}, SL::DBConnect->get_options) + or $form->dberror; - while (my ($db) = $sth->fetchrow_array) { - push(@dbsources, $db); + $query = + qq|SELECT tablename FROM pg_tables | . + qq|WHERE (tablename = 'defaults') AND (tableowner = ?)|; + my $sth = $dbh->prepare($query); + $sth->execute($form->{dbuser}) || + $form->dberror($query . " ($form->{dbuser})"); + + if ($sth->fetchrow_array) { + push(@dbsources, $db); + } + $sth->finish; + $dbh->disconnect; + next; } + push(@dbsources, $db); } $sth->finish; @@ -308,96 +247,74 @@ sub dbsources { return @dbsources; } -sub dbclusterencoding { - $main::lxdebug->enter_sub(); - - my ($self, $form) = @_; - - $form->{dbdefault} ||= $form->{dbuser}; - - dbconnect_vars($form, $form->{dbdefault}); - - my $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}) || $form->dberror(); - my $query = qq|SELECT pg_encoding_to_char(encoding) FROM pg_database WHERE datname = 'template0'|; - my ($cluster_encoding) = $dbh->selectrow_array($query); - $dbh->disconnect(); - - $main::lxdebug->leave_sub(); - - return $cluster_encoding; -} - sub dbcreate { $main::lxdebug->enter_sub(); my ($self, $form) = @_; - $form->{sid} = $form->{dbdefault}; &dbconnect_vars($form, $form->{dbdefault}); my $dbh = - SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}) + SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}, SL::DBConnect->get_options) or $form->dberror; $form->{db} =~ s/\"//g; - my %dbcreate = ( - 'Pg' => qq|CREATE DATABASE "$form->{db}"|, - 'Oracle' => - qq|CREATE USER "$form->{db}" DEFAULT TABLESPACE USERS | . - qq|TEMPORARY TABLESPACE TEMP IDENTIFIED BY "$form->{db}"| - ); - my %dboptions = ( - 'Pg' => [], - ); + my @dboptions; - push(@{$dboptions{"Pg"}}, "ENCODING = " . $dbh->quote($form->{"encoding"})) - if ($form->{"encoding"}); + push @dboptions, "ENCODING = " . $dbh->quote($form->{"encoding"}) if $form->{"encoding"}; if ($form->{"dbdefault"}) { my $dbdefault = $form->{"dbdefault"}; $dbdefault =~ s/[^a-zA-Z0-9_\-]//g; - push(@{$dboptions{"Pg"}}, "TEMPLATE = $dbdefault"); + push @dboptions, "TEMPLATE = $dbdefault"; } - my $query = $dbcreate{$form->{dbdriver}}; - $query .= " WITH " . join(" ", @{$dboptions{"Pg"}}) if (@{$dboptions{"Pg"}}); + my $query = qq|CREATE DATABASE "$form->{db}"|; + $query .= " WITH " . join(" ", @dboptions) if @dboptions; # Ignore errors if the database exists. $dbh->do($query); - if ($form->{dbdriver} eq 'Oracle') { - $query = qq|GRANT CONNECT, RESOURCE TO "$form->{db}"|; - do_query($form, $dbh, $query); - } $dbh->disconnect; - # setup variables for the new database - if ($form->{dbdriver} eq 'Oracle') { - $form->{dbuser} = $form->{db}; - $form->{dbpasswd} = $form->{db}; - } - &dbconnect_vars($form, $form->{db}); - $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}) - or $form->dberror; + # make a shim myconfig so that rose db connections work + $::myconfig{$_} = $form->{$_} for qw(dbhost dbport dbuser dbpasswd); + $::myconfig{dbname} = $form->{db}; - my $db_charset = $Common::db_encoding_to_charset{$form->{encoding}}; - $db_charset ||= Common::DEFAULT_CHARSET; + $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}, SL::DBConnect->get_options) + or $form->dberror; - my $dbupdater = SL::DBUpgrade2->new(form => $form, dbdriver => $form->{dbdriver}); + my $dbupdater = SL::DBUpgrade2->new(form => $form, return_on_error => 1, silent => 1)->parse_dbupdate_controls; # create the tables - $dbupdater->process_query($dbh, "sql/lx-office.sql", undef, $db_charset); + $dbupdater->process_query($dbh, "sql/lx-office.sql"); + $dbupdater->process_query($dbh, "sql/$form->{chart}-chart.sql"); - # load chart of accounts - $dbupdater->process_query($dbh, "sql/$form->{chart}-chart.sql", undef, $db_charset); + $query = qq|UPDATE defaults SET coa = ?|; + do_query($form, $dbh, $query, map { $form->{$_} } qw(chart)); - $query = "UPDATE defaults SET coa = ?"; - do_query($form, $dbh, $query, $form->{chart}); - $query = "UPDATE defaults SET accounting_method = ?"; - do_query($form, $dbh, $query, $form->{accounting_method}); - $query = "UPDATE defaults SET profit_determination = ?"; - do_query($form, $dbh, $query, $form->{profit_determination}); - $query = "UPDATE defaults SET inventory_system = ?"; - do_query($form, $dbh, $query, $form->{inventory_system}); + $dbh->disconnect; + + # update new database + $self->dbupdate2(form => $form, updater => $dbupdater, database => $form->{db}, silent => 1); + + $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}, SL::DBConnect->get_options) + or $form->dberror; + + $query = "SELECT * FROM currencies WHERE name = ?"; + my $curr = selectfirst_hashref_query($form, $dbh, $query, $form->{defaultcurrency}); + if (!$curr->{id}) { + do_query($form, $dbh, "INSERT INTO currencies (name) VALUES (?)", $form->{defaultcurrency}); + $curr = selectfirst_hashref_query($form, $dbh, $query, $form->{defaultcurrency}); + } + + $query = qq|UPDATE defaults SET accounting_method = ?, profit_determination = ?, inventory_system = ?, precision = ?, currency_id = ?|; + do_query($form, $dbh, $query, + $form->{accounting_method}, + $form->{profit_determination}, + $form->{inventory_system}, + $form->parse_amount(\%::myconfig, $form->{precision_as_number}), + $curr->{id}, + ); $dbh->disconnect; @@ -409,14 +326,11 @@ sub dbdelete { my ($self, $form) = @_; $form->{db} =~ s/\"//g; - my %dbdelete = ('Pg' => qq|DROP DATABASE "$form->{db}"|, - 'Oracle' => qq|DROP USER "$form->{db}" CASCADE|); - $form->{sid} = $form->{dbdefault}; &dbconnect_vars($form, $form->{dbdefault}); - my $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}) + my $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}, SL::DBConnect->get_options) or $form->dberror; - my $query = $dbdelete{$form->{dbdriver}}; + my $query = qq|DROP DATABASE "$form->{db}"|; do_query($form, $dbh, $query); $dbh->disconnect; @@ -424,72 +338,6 @@ sub dbdelete { $main::lxdebug->leave_sub(); } -sub dbsources_unused { - $main::lxdebug->enter_sub(); - - my ($self, $form) = @_; - - $form->{only_acc_db} = 1; - - my %members = $main::auth->read_all_users(); - my %dbexcl = map { $_ => 1 } grep { $_ } map { $_->{dbname} } values %members; - - $dbexcl{$form->{dbdefault}} = 1; - $dbexcl{$main::auth->{DB_config}->{db}} = 1; - - my @dbunused = grep { !$dbexcl{$_} } dbsources("", $form); - - $main::lxdebug->leave_sub(); - - return @dbunused; -} - -sub dbneedsupdate { - $main::lxdebug->enter_sub(); - - my ($self, $form) = @_; - - my %members = $main::auth->read_all_users(); - my $dbupdater = SL::DBUpgrade2->new(form => $form, dbdriver => $form->{dbdriver})->parse_dbupdate_controls; - - my ($query, $sth, %dbs_needing_updates); - - foreach my $login (grep /[a-z]/, keys %members) { - my $member = $members{$login}; - - map { $form->{$_} = $member->{$_} } qw(dbname dbuser dbpasswd dbhost dbport); - dbconnect_vars($form, $form->{dbname}); - - my $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}); - - next unless $dbh; - - my $version; - - $query = qq|SELECT version FROM defaults|; - $sth = prepare_query($form, $dbh, $query); - if ($sth->execute()) { - ($version) = $sth->fetchrow_array(); - } - $sth->finish(); - - $dbh->disconnect and next unless $version; - - my $update_available = $dbupdater->update_available($version) || $dbupdater->update2_available($dbh); - $dbh->disconnect; - - if ($update_available) { - my $dbinfo = {}; - map { $dbinfo->{$_} = $member->{$_} } grep /^db/, keys %{ $member }; - $dbs_needing_updates{$member->{dbhost} . "::" . $member->{dbname}} = $dbinfo; - } - } - - $main::lxdebug->leave_sub(); - - return values %dbs_needing_updates; -} - sub calc_version { $main::lxdebug->enter_sub(2); @@ -512,7 +360,7 @@ sub calc_version { sub cmp_script_version { my ($a_from, $a_to, $b_from, $b_to); my ($i, $res_a, $res_b); - my ($my_a, $my_b) = ($a, $b); + my ($my_a, $my_b) = do { no warnings 'once'; ($a, $b) }; $my_a =~ s/.*-upgrade-//; $my_a =~ s/.sql$//; @@ -552,235 +400,59 @@ sub create_schema_info_table { $main::lxdebug->leave_sub(); } -sub dbupdate { - $main::lxdebug->enter_sub(); - - my ($self, $form) = @_; - - local *SQLDIR; - - $form->{sid} = $form->{dbdefault}; - - my @upgradescripts = (); - my $query; - my $rc = -2; - - if ($form->{dbupdate}) { - - # read update scripts into memory - opendir(SQLDIR, "sql/" . $form->{dbdriver} . "-upgrade") - or &error("", "sql/" . $form->{dbdriver} . "-upgrade : $!"); - @upgradescripts = - sort(cmp_script_version - grep(/$form->{dbdriver}-upgrade-.*?\.(sql|pl)$/, - readdir(SQLDIR))); - closedir(SQLDIR); - } - - my $db_charset = $::lx_office_conf{system}->{dbcharset}; - $db_charset ||= Common::DEFAULT_CHARSET; - - my $dbupdater = SL::DBUpgrade2->new(form => $form, dbdriver => $form->{dbdriver}); - - foreach my $db (split(/ /, $form->{dbupdate})) { - - next unless $form->{$db}; - - # strip db from dataset - $db =~ s/^db//; - &dbconnect_vars($form, $db); - - my $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}) - or $form->dberror; - - $dbh->do($form->{dboptions}) if ($form->{dboptions}); - - # check version - $query = qq|SELECT version FROM defaults|; - my ($version) = selectrow_query($form, $dbh, $query); - - next unless $version; - - $version = calc_version($version); - - foreach my $upgradescript (@upgradescripts) { - my $a = $upgradescript; - $a =~ s/^\Q$form->{dbdriver}\E-upgrade-|\.(sql|pl)$//g; - - my ($mindb, $maxdb) = split /-/, $a; - my $str_maxdb = $maxdb; - $mindb = calc_version($mindb); - $maxdb = calc_version($maxdb); - - next if ($version >= $maxdb); - - # if there is no upgrade script exit - last if ($version < $mindb); - - # apply upgrade - $main::lxdebug->message(LXDebug->DEBUG2(), "Applying Update $upgradescript"); - $dbupdater->process_file($dbh, "sql/" . $form->{"dbdriver"} . "-upgrade/$upgradescript", $str_maxdb, $db_charset); - - $version = $maxdb; - - } - - $rc = 0; - $dbh->disconnect; - - } - - $main::lxdebug->leave_sub(); - - return $rc; -} - sub dbupdate2 { - $main::lxdebug->enter_sub(); - - my ($self, $form, $dbupdater) = @_; - - $form->{sid} = $form->{dbdefault}; - - my $rc = -2; - my $db_charset = $::lx_office_conf{system}->{dbcharset} || Common::DEFAULT_CHARSET; - - map { $_->{description} = SL::Iconv::convert($_->{charset}, $db_charset, $_->{description}) } values %{ $dbupdater->{all_controls} }; - - foreach my $db (split / /, $form->{dbupdate}) { - next unless $form->{$db}; - - # strip db from dataset - $db =~ s/^db//; - &dbconnect_vars($form, $db); - - my $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}) or $form->dberror; - - $dbh->do($form->{dboptions}) if ($form->{dboptions}); + my ($self, %params) = @_; - $self->create_schema_info_table($form, $dbh); + my $form = $params{form}; + my $dbupdater = $params{updater}; + my $db = $params{database}; + my $silent = $params{silent}; - my @upgradescripts = $dbupdater->unapplied_upgrade_scripts($dbh); + map { $_->{description} = SL::Iconv::convert($_->{charset}, 'UTF-8', $_->{description}) } values %{ $dbupdater->{all_controls} }; - $dbh->disconnect and next if !@upgradescripts; + &dbconnect_vars($form, $db); - foreach my $control (@upgradescripts) { - # apply upgrade - $main::lxdebug->message(LXDebug->DEBUG2(), "Applying Update $control->{file}"); - print $form->parse_html_template("dbupgrade/upgrade_message2", $control); + # Flush potentially held database locks. +# $form->get_standard_dbh->commit; - $dbupdater->process_file($dbh, "sql/" . $form->{"dbdriver"} . "-upgrade2/$control->{file}", $control, $db_charset); - } - - $rc = 0; - $dbh->disconnect; - - } - - $main::lxdebug->leave_sub(); - - return $rc; -} - -sub save_member { - $main::lxdebug->enter_sub(); - - my ($self) = @_; - - # format dbconnect and dboptions string - dbconnect_vars($self, $self->{dbname}); - - map { $self->{$_} =~ s/\r//g; } qw(address signature); - - $main::auth->save_user($self->{login}, map { $_, $self->{$_} } config_vars()); - - my $dbh = SL::DBConnect->connect($self->{dbconnect}, $self->{dbuser}, $self->{dbpasswd}); - if ($dbh) { - $self->create_employee_entry($::form, $dbh, $self, 1); - $dbh->disconnect(); - } - - $main::lxdebug->leave_sub(); -} - -sub create_employee_entry { - $main::lxdebug->enter_sub(); - - my $self = shift; - my $form = shift; - my $dbh = shift; - my $myconfig = shift; - my $update_existing = shift; - - if (!does_table_exist($dbh, 'employee')) { - $main::lxdebug->leave_sub(); - return; - } + my $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}, SL::DBConnect->get_options) or $form->dberror; - # add login to employee table if it does not exist - # no error check for employee table, ignore if it does not exist - my ($id) = selectrow_query($form, $dbh, qq|SELECT id FROM employee WHERE login = ?|, $self->{login}); - my ($good_db) = selectrow_query($form, $dbh, qq|select * from pg_tables where tablename = ? and schemaname = ?|, 'schema_info', 'public'); - my $can_delete; - ($can_delete) = selectrow_query($form, $dbh, qq|SELECT tag FROM schema_info WHERE tag = ?|, 'employee_deleted') if $good_db; + $dbh->do($form->{dboptions}) if ($form->{dboptions}); - if (!$id) { - my $query = qq|INSERT INTO employee (login, name, workphone, role) VALUES (?, ?, ?, ?)|; - do_query($form, $dbh, $query, ($self->{login}, $myconfig->{name}, $myconfig->{tel}, "user")); + $self->create_schema_info_table($form, $dbh); - } elsif ($update_existing && $can_delete) { - my $query = qq|UPDATE employee SET name = ?, workphone = ?, role = 'user', deleted = 'f' WHERE id = ?|; - do_query($form, $dbh, $query, $myconfig->{name}, $myconfig->{tel}, $id); - } - - $main::lxdebug->leave_sub(); -} - -sub config_vars { - $main::lxdebug->enter_sub(); - - my @conf = qw(address admin businessnumber company countrycode - currency dateformat dbconnect dbdriver dbhost dbport dboptions - dbname dbuser dbpasswd email fax name numberformat password - printer sid signature stylesheet tel templates vclimit angebote - bestellungen rechnungen anfragen lieferantenbestellungen einkaufsrechnungen - taxnumber co_ustid duns menustyle template_format default_media - default_printer_id copies show_form_details favorites - pdonumber sdonumber hide_cvar_search_options mandatory_departments - sepa_creditor_id taxincluded_checked); - - $main::lxdebug->leave_sub(); - - return @conf; -} - -sub error { - $main::lxdebug->enter_sub(); + my @upgradescripts = $dbupdater->unapplied_upgrade_scripts($dbh); - my ($self, $msg) = @_; - - $main::lxdebug->show_backtrace(); - - if ($ENV{HTTP_USER_AGENT}) { - print qq|Content-Type: text/html - - - -
- -$msg|; + foreach my $control (@upgradescripts) { + # Apply upgrade. Control will only return to us if the upgrade has + # been applied correctly and if the update has not requested user + # interaction. + $main::lxdebug->message(LXDebug->DEBUG2(), "Applying Update $control->{file}"); + print $form->parse_html_template("dbupgrade/upgrade_message2", $control) unless $silent; + $dbupdater->process_file($dbh, "sql/Pg-upgrade2/$control->{file}", $control); } - die "Error: $msg\n"; - - $main::lxdebug->leave_sub(); + $dbh->disconnect; } sub data { +{ %{ $_[0] } } } -1; +sub get_default_myconfig { + my ($self_or_class, %user_config) = @_; + my $defaults = SL::DefaultManager->new($::lx_office_conf{system}->{default_manager}); + + return ( + countrycode => $defaults->language('de'), + css_path => 'css', # Needed for menunew, see SL::Layout::Base::get_stylesheet_for_user + dateformat => $defaults->dateformat('dd.mm.yy'), + numberformat => $defaults->numberformat('1.000,00'), + stylesheet => $defaults->stylesheet('kivitendo.css'), + timeformat => $defaults->timeformat('hh:mm'), + %user_config, + ); +} +1;