X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FUser.pm;h=7f4ec1a5623c470b49a634a22a239c9dfcf55782;hb=6f398b352e3b28af6b00852da08193727f803aee;hp=7ae2eb8506eb17fe97d820e4acf0c975e89e0719;hpb=2ee0204efeafb90ac85240c7d6d4057260006870;p=kivitendo-erp.git
diff --git a/SL/User.pm b/SL/User.pm
index 7ae2eb850..7f4ec1a56 100644
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -43,6 +43,7 @@ use SL::DBUpgrade2;
use SL::DBUtils;
use SL::Iconv;
use SL::Inifile;
+use SL::System::InstallationLock;
use strict;
@@ -92,102 +93,61 @@ 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);
- my ($dbversion) = $sth->fetchrow_array;
- $sth->finish;
+ return -3 if !$self->{login} || !$::auth->client;
- $self->create_employee_entry($form, $dbh, \%myconfig);
+ my %myconfig = $main::auth->read_user(login => $self->{login});
- $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;
- }
+ # we got a connection, check the version
+ my ($dbversion) = $dbh->selectrow_array(qq|SELECT version FROM defaults|);
- $rc = 0;
+ $self->create_schema_info_table($form, $dbh);
- my $dbupdater = SL::DBUpgrade2->new(form => $form, dbdriver => $myconfig{dbdriver})->parse_dbupdate_controls;
+ # Auth DB upgrades available?
+ my $dbupdater_auth = SL::DBUpgrade2->new(form => $form, auth => 1)->parse_dbupdate_controls;
+ return -3 if $dbupdater_auth->unapplied_upgrade_scripts($::auth->dbconnect);
- 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);
- $dbh->disconnect;
+ my $dbupdater = SL::DBUpgrade2->new(form => $form)->parse_dbupdate_controls;
- if ($update_available) {
- $form->{"stylesheet"} = "lx-office-erp.css";
- $form->{"title"} = $main::locale->text("Dataset upgrade");
- $form->header();
- print $form->parse_html_template("dbupgrade/header");
-
- $form->{dbupdate} = "db$myconfig{dbname}";
- $form->{ $form->{dbupdate} } = 1;
-
- if ($form->{"show_dbupdate_warning"}) {
- print $form->parse_html_template("dbupgrade/warning");
- ::end_of_request();
- }
+ my $update_available = $dbupdater->update_available($dbversion) || $dbupdater->update2_available($dbh);
+ $dbh->disconnect;
- # 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);
- }
+ return 0 if !$update_available;
- # required for Oracle
- $form->{dbdefault} = $sid;
+ $form->{$_} = $::auth->client->{$_} for qw(dbname dbhost dbport dbuser dbpasswd);
+ $form->{$_} = $myconfig{$_} for qw(datestyle);
- # ignore HUP, QUIT in case the webserver times out
- $SIG{HUP} = 'IGNORE';
- $SIG{QUIT} = 'IGNORE';
+ $form->{"title"} = $main::locale->text("Dataset upgrade");
+ $form->header(no_layout => $form->{no_layout});
+ print $form->parse_html_template("dbupgrade/header");
- $self->dbupdate($form);
- $self->dbupdate2($form, $dbupdater);
- SL::DBUpgrade2->new(form => $::form, dbdriver => 'Pg', auth => 1)->apply_admin_dbupgrade_scripts(0);
+ $form->{dbupdate} = "db" . $::auth->client->{dbname};
- close(FH);
+ if ($form->{"show_dbupdate_warning"}) {
+ print $form->parse_html_template("dbupgrade/warning");
+ ::end_of_request();
+ }
- # remove lock file
- unlink($::lx_office_conf{paths}->{userspath} . "/nologin");
+ # update the tables
+ SL::System::InstallationLock->lock;
- my $menufile =
- $self->{"menustyle"} eq "v3" ? "menuv3.pl" :
- $self->{"menustyle"} eq "neu" ? "menunew.pl" :
- $self->{"menustyle"} eq "js" ? "menujs.pl" :
- "menu.pl";
+ # ignore HUP, QUIT in case the webserver times out
+ $SIG{HUP} = 'IGNORE';
+ $SIG{QUIT} = 'IGNORE';
- print $form->parse_html_template("dbupgrade/footer", { "menufile" => $menufile });
+ $self->dbupdate($form);
+ $self->dbupdate2(form => $form, updater => $dbupdater, database => $::auth->client->{dbname});
+ SL::DBUpgrade2->new(form => $::form, auth => 1)->apply_admin_dbupgrade_scripts(0);
- $rc = -2;
- }
- }
+ SL::System::InstallationLock->unlock;
- $main::lxdebug->leave_sub();
+ print $form->parse_html_template("dbupgrade/footer");
- return $rc;
+ return -2;
}
sub dbconnect_vars {
@@ -196,52 +156,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\'',
- 'mm-dd-yy' => 'set DateStyle to \'POSTGRES, US\'',
- 'dd/mm/yy' => 'set DateStyle to \'SQL, EUROPEAN\'',
- 'dd-mm-yy' => 'set DateStyle to \'POSTGRES, 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\'',
- '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\'',
- '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 {
@@ -253,62 +178,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;
@@ -328,7 +233,7 @@ sub dbclusterencoding {
dbconnect_vars($form, $form->{dbdefault});
- my $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}) || $form->dberror();
+ my $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}, SL::DBConnect->get_options) || $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();
@@ -343,58 +248,38 @@ sub dbcreate {
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})
+ $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}, SL::DBConnect->get_options)
or $form->dberror;
my $db_charset = $Common::db_encoding_to_charset{$form->{encoding}};
$db_charset ||= Common::DEFAULT_CHARSET;
- my $dbupdater = SL::DBUpgrade2->new(form => $form, dbdriver => $form->{dbdriver});
+ my $dbupdater = SL::DBUpgrade2->new(form => $form);
# create the tables
$dbupdater->process_query($dbh, "sql/lx-office.sql", undef, $db_charset);
@@ -409,6 +294,8 @@ sub dbcreate {
do_query($form, $dbh, $query, $form->{profit_determination});
$query = "UPDATE defaults SET inventory_system = ?";
do_query($form, $dbh, $query, $form->{inventory_system});
+ $query = "UPDATE defaults SET curr = ?";
+ do_query($form, $dbh, $query, $form->{defaultcurrency});
$dbh->disconnect;
@@ -420,14 +307,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;
@@ -461,7 +345,7 @@ sub dbneedsupdate {
my ($self, $form) = @_;
my %members = $main::auth->read_all_users();
- my $dbupdater = SL::DBUpgrade2->new(form => $form, dbdriver => $form->{dbdriver})->parse_dbupdate_controls;
+ my $dbupdater = SL::DBUpgrade2->new(form => $form)->parse_dbupdate_controls;
my ($query, $sth, %dbs_needing_updates);
@@ -471,7 +355,7 @@ sub dbneedsupdate {
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});
+ my $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}, SL::DBConnect->get_options);
next unless $dbh;
@@ -570,8 +454,6 @@ sub dbupdate {
local *SQLDIR;
- $form->{sid} = $form->{dbdefault};
-
my @upgradescripts = ();
my $query;
my $rc = -2;
@@ -579,11 +461,11 @@ sub dbupdate {
if ($form->{dbupdate}) {
# read update scripts into memory
- opendir(SQLDIR, "sql/" . $form->{dbdriver} . "-upgrade")
- or &error("", "sql/" . $form->{dbdriver} . "-upgrade : $!");
+ opendir(SQLDIR, "sql/Pg-upgrade")
+ or &error("", "sql/Pg-upgrade : $!");
@upgradescripts =
sort(cmp_script_version
- grep(/$form->{dbdriver}-upgrade-.*?\.(sql|pl)$/,
+ grep(/Pg-upgrade-.*?\.(sql|pl)$/,
readdir(SQLDIR)));
closedir(SQLDIR);
}
@@ -591,7 +473,7 @@ sub dbupdate {
my $db_charset = $::lx_office_conf{system}->{dbcharset};
$db_charset ||= Common::DEFAULT_CHARSET;
- my $dbupdater = SL::DBUpgrade2->new(form => $form, dbdriver => $form->{dbdriver});
+ my $dbupdater = SL::DBUpgrade2->new(form => $form);
foreach my $db (split(/ /, $form->{dbupdate})) {
@@ -601,7 +483,7 @@ sub dbupdate {
$db =~ s/^db//;
&dbconnect_vars($form, $db);
- 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;
$dbh->do($form->{dboptions}) if ($form->{dboptions});
@@ -616,7 +498,7 @@ sub dbupdate {
foreach my $upgradescript (@upgradescripts) {
my $a = $upgradescript;
- $a =~ s/^\Q$form->{dbdriver}\E-upgrade-|\.(sql|pl)$//g;
+ $a =~ s/^Pg-upgrade-|\.(sql|pl)$//g;
my ($mindb, $maxdb) = split /-/, $a;
my $str_maxdb = $maxdb;
@@ -630,7 +512,7 @@ sub dbupdate {
# apply upgrade
$main::lxdebug->message(LXDebug->DEBUG2(), "Applying Update $upgradescript");
- $dbupdater->process_file($dbh, "sql/" . $form->{"dbdriver"} . "-upgrade/$upgradescript", $str_maxdb, $db_charset);
+ $dbupdater->process_file($dbh, "sql/Pg-upgrade/$upgradescript", $str_maxdb, $db_charset);
$version = $maxdb;
@@ -649,141 +531,42 @@ sub dbupdate {
sub dbupdate2 {
$main::lxdebug->enter_sub();
- my ($self, $form, $dbupdater) = @_;
+ my ($self, %params) = @_;
- $form->{sid} = $form->{dbdefault};
-
- my $rc = -2;
- my $db_charset = $::lx_office_conf{system}->{dbcharset} || Common::DEFAULT_CHARSET;
+ my $form = $params{form};
+ my $dbupdater = $params{updater};
+ my $db = $params{database};
+ 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};
+ &dbconnect_vars($form, $db);
- # strip db from dataset
- $db =~ s/^db//;
- &dbconnect_vars($form, $db);
+ my $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}, SL::DBConnect->get_options) or $form->dberror;
- my $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}) or $form->dberror;
+ $dbh->do($form->{dboptions}) if ($form->{dboptions});
- $dbh->do($form->{dboptions}) if ($form->{dboptions});
-
- $self->create_schema_info_table($form, $dbh);
-
- my @upgradescripts = $dbupdater->unapplied_upgrade_scripts($dbh);
-
- $dbh->disconnect and next if !@upgradescripts;
-
- foreach my $control (@upgradescripts) {
- # apply upgrade
- $main::lxdebug->message(LXDebug->DEBUG2(), "Applying Update $control->{file}");
- print $form->parse_html_template("dbupgrade/upgrade_message2", $control);
-
- $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) = @_;
+ $self->create_schema_info_table($form, $dbh);
- # format dbconnect and dboptions string
- dbconnect_vars($self, $self->{dbname});
+ my @upgradescripts = $dbupdater->unapplied_upgrade_scripts($dbh);
- map { $self->{$_} =~ s/\r//g; } qw(address signature);
+ $dbh->disconnect and next if !@upgradescripts;
- $main::auth->save_user($self->{login}, map { $_, $self->{$_} } config_vars());
+ foreach my $control (@upgradescripts) {
+ # apply upgrade
+ $main::lxdebug->message(LXDebug->DEBUG2(), "Applying Update $control->{file}");
+ print $form->parse_html_template("dbupgrade/upgrade_message2", $control);
- my $dbh = SL::DBConnect->connect($self->{dbconnect}, $self->{dbuser}, $self->{dbpasswd});
- if ($dbh) {
- $self->create_employee_entry($::form, $dbh, $self, 1);
- $dbh->disconnect();
+ $dbupdater->process_file($dbh, "sql/Pg-upgrade2/$control->{file}", $control, $db_charset);
}
- $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;
- }
-
- # 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});
-
- 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"));
-
- } elsif ($update_existing) {
- 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);
+ $rc = 0;
+ $dbh->disconnect;
$main::lxdebug->leave_sub();
- return @conf;
-}
-
-sub error {
- $main::lxdebug->enter_sub();
-
- my ($self, $msg) = @_;
-
- $main::lxdebug->show_backtrace();
-
- if ($ENV{HTTP_USER_AGENT}) {
- print qq|Content-Type: text/html
-
-
-
-
-
-Error!
-$msg|;
-
- }
-
- die "Error: $msg\n";
-
- $main::lxdebug->leave_sub();
+ return $rc;
}
sub data {
@@ -791,4 +574,3 @@ sub data {
}
1;
-