X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FUser.pm;h=68fd2c520ed8971dd88e437d47670e89d22683b1;hb=f1b9dfcd86ce757a4fdb1f9d924dc62deb7998e8;hp=49ba3392432011fbfee03199ba11521b19723708;hpb=8003c3b1db2dd73402977fcfe29653108794099c;p=kivitendo-erp.git diff --git a/SL/User.pm b/SL/User.pm index 49ba33924..68fd2c520 100644 --- a/SL/User.pm +++ b/SL/User.pm @@ -25,7 +25,8 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1335, USA. #===================================================================== # # user related functions @@ -35,26 +36,37 @@ package User; use IO::File; -use Fcntl qw(:seek); +use List::MoreUtils qw(any); +use SL::DB; #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(); - my ($type, $login) = @_; + my ($type, %params) = @_; my $self = {}; - if ($login ne "") { - my %user_data = $main::auth->read_user($login); + if ($params{id} || $params{login}) { + my %user_data = $main::auth->read_user(%params); map { $self->{$_} = $user_data{$_} } keys %user_data; } @@ -91,157 +103,150 @@ sub country_codes { return %cc; } -sub login { - $main::lxdebug->enter_sub(); - +sub _handle_superuser_privileges { my ($self, $form) = @_; - our $sid; - local *FH; + if ($form->{database_superuser_username}) { + $::auth->set_session_value("database_superuser_username" => $form->{database_superuser_username}, "database_superuser_password" => $form->{database_superuser_password}); + } - my $rc = -3; + my %dbconnect_form = %{ $form }; + my ($su_user, $su_password) = map { $::auth->get_session_value("database_superuser_$_") } qw(username password); - if ($self->{login}) { - my %myconfig = $main::auth->read_user($self->{login}); + if ($su_user) { + $dbconnect_form{dbuser} = $su_user; + $dbconnect_form{dbpasswd} = $su_password; + } - # check if database is down - my $dbh = SL::DBConnect->connect($myconfig{dbconnect}, $myconfig{dbuser}, $myconfig{dbpasswd}) - or $self->error($DBI::errstr); + dbconnect_vars(\%dbconnect_form, $form->{dbname}); - # 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 %result = ( + username => $dbconnect_form{dbuser}, + password => $dbconnect_form{dbpasswd}, + ); - my ($dbversion) = $sth->fetchrow_array; - $sth->finish; + $::auth->set_session_value("database_superuser_username" => $dbconnect_form{dbuser}, "database_superuser_password" => $dbconnect_form{dbpasswd}); - $self->create_employee_entry($form, $dbh, \%myconfig); + my $dbh = SL::DBConnect->connect($dbconnect_form{dbconnect}, $dbconnect_form{dbuser}, $dbconnect_form{dbpasswd}, SL::DBConnect->get_options); + return (%result, error => $::locale->text('The credentials (username & password) for connecting database are wrong.')) if !$dbh; - $self->create_schema_info_table($form, $dbh); + my $is_superuser = SL::DBUtils::role_is_superuser($dbh, $dbconnect_form{dbuser}); - 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; - } + $dbh->disconnect; - $rc = 0; + return (%result, have_privileges => 1) if $is_superuser; + return (%result) if !$su_user; # no error message if credentials weren't set by the user + return (%result, error => $::locale->text('The database user \'#1\' does not have superuser privileges.', $dbconnect_form{dbuser})); +} - my $dbupdater = SL::DBUpgrade2->new(form => $form, dbdriver => $myconfig{dbdriver})->parse_dbupdate_controls; +sub login { + my ($self, $form) = @_; - 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; + return LOGIN_GENERAL_ERROR() if !$self->{login} || !$::auth->client; - 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"); + my %myconfig = $main::auth->read_user(login => $self->{login}); - $form->{dbupdate} = "db$myconfig{dbname}"; - $form->{ $form->{dbupdate} } = 1; + # 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); - if ($form->{"show_dbupdate_warning"}) { - print $form->parse_html_template("dbupgrade/warning"); - ::end_of_request(); - } + # check if database is down + my $dbh = SL::DB->client->dbh; - # 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); - } + # 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(); + } - # required for Oracle - $form->{dbdefault} = $sid; + $self->create_schema_info_table($form, $dbh); - # ignore HUP, QUIT in case the webserver times out - $SIG{HUP} = 'IGNORE'; - $SIG{QUIT} = 'IGNORE'; + my $dbupdater = SL::DBUpgrade2->new(form => $form)->parse_dbupdate_controls; + my @unapplied_scripts = $dbupdater->unapplied_upgrade_scripts($dbh); +# $dbh->disconnect; - $self->dbupdate($form); - $self->dbupdate2($form, $dbupdater); - SL::DBUpgrade2->new(form => $::form, dbdriver => 'Pg', auth => 1)->apply_admin_dbupgrade_scripts(0); + if (!@unapplied_scripts) { + SL::DB::Manager::Employee->update_entries_for_authorized_users; + return LOGIN_OK(); + } - close(FH); + # Store the fact that we're applying database upgrades at the + # moment. That way functions called from the layout modules that may + # require updated tables can chose only to use basic features. + $::request->applying_database_upgrades(1); - # remove lock file - unlink($::lx_office_conf{paths}->{userspath} . "/nologin"); + $form->{$_} = $::auth->client->{$_} for qw(dbname dbhost dbport dbuser dbpasswd); + $form->{$_} = $myconfig{$_} for qw(datestyle); - my $menufile = - $self->{"menustyle"} eq "v3" ? "menuv3.pl" : - $self->{"menustyle"} eq "neu" ? "menunew.pl" : - $self->{"menustyle"} eq "js" ? "menujs.pl" : - "menu.pl"; + $form->{"title"} = $main::locale->text("Dataset upgrade"); + $form->header(no_layout => $form->{no_layout}); + print $form->parse_html_template("dbupgrade/header"); - print $form->parse_html_template("dbupgrade/footer", { "menufile" => $menufile }); + $form->{dbupdate} = "db" . $::auth->client->{dbname}; - $rc = -2; - } + my $show_update_warning = $form->{"show_dbupdate_warning"}; + my %superuser = (need_privileges => (any { $_->{superuser_privileges} } @unapplied_scripts)); + + if ($superuser{need_privileges}) { + %superuser = ( + %superuser, + $self->_handle_superuser_privileges($form), + ); + $show_update_warning = 1 if !$superuser{have_privileges}; } - $main::lxdebug->leave_sub(); + if ($show_update_warning) { + print $form->parse_html_template("dbupgrade/warning", { + unapplied_scripts => \@unapplied_scripts, + superuser => \%superuser, + }); + $::dispatcher->end_request; + } - return $rc; -} + # update the tables + SL::System::InstallationLock->lock; -sub dbconnect_vars { - $main::lxdebug->enter_sub(); + # ignore HUP, QUIT in case the webserver times out + $SIG{HUP} = 'IGNORE'; + $SIG{QUIT} = 'IGNORE'; - my ($form, $db) = @_; + $self->dbupdate2(form => $form, updater => $dbupdater, database => $::auth->client->{dbname}); - 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 $self->dbupdate2 returns than this means all upgrade scripts + # have been applied successfully, none required user + # interaction. Otherwise the deeper layers would have called + # $::dispatcher->end_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; - if ($form->{dbdriver} eq 'Oracle') { - $form->{dbconnect} = "dbi:Oracle:sid=$form->{sid}"; - } + SL::System::InstallationLock->unlock; - if ($form->{dbhost}) { - $form->{dbconnect} .= ";host=$form->{dbhost}"; - } - if ($form->{dbport}) { - $form->{dbconnect} .= ";port=$form->{dbport}"; - } + print $form->parse_html_template("dbupgrade/footer"); - $main::lxdebug->leave_sub(); + return LOGIN_DBUPDATE_AVAILABLE(); } -sub dbdrivers { +sub dbconnect_vars { $main::lxdebug->enter_sub(); - my @drivers = DBI->available_drivers(); + my ($form, $db) = @_; - $main::lxdebug->leave_sub(); + my %dboptions = ( + '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\'' + ); - return (grep { /(Pg|Oracle)/ } @drivers); + $form->{dboptions} = $dboptions{ $form->{dateformat} }; + $form->{dbconnect} = "dbi:Pg:dbname=${db};host=" . ($form->{dbhost} || 'localhost') . ";port=" . ($form->{dbport} || 5432); + + $main::lxdebug->leave_sub(); } sub dbsources { @@ -253,62 +258,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/); - while (my ($db) = $sth->fetchrow_array) { - push(@dbsources, $db); + &dbconnect_vars($form, $db); + my $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}, SL::DBConnect->get_options) + 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); } $sth->finish; @@ -319,96 +304,90 @@ 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"); + + $query = qq|UPDATE defaults SET coa = ?|; + do_query($form, $dbh, $query, map { $form->{$_} } qw(chart)); + + $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; - # load chart of accounts - $dbupdater->process_query($dbh, "sql/$form->{chart}-chart.sql", undef, $db_charset); + $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 = "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}); + $query = qq|UPDATE defaults SET + accounting_method = ?, + profit_determination = ?, + inventory_system = ?, + precision = ?, + currency_id = ?, + feature_balance = ?, + feature_datev = ?, + feature_erfolgsrechnung = ?, + feature_eurechnung = ?, + feature_ustva = ? + |; + do_query($form, $dbh, $query, + $form->{accounting_method}, + $form->{profit_determination}, + $form->{inventory_system}, + $form->parse_amount(\%::myconfig, $form->{precision_as_number}), + $curr->{id}, + $form->{feature_balance}, + $form->{feature_datev}, + $form->{feature_erfolgsrechnung}, + $form->{feature_eurechnung}, + $form->{feature_ustva} + ); $dbh->disconnect; @@ -420,14 +399,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; @@ -435,72 +411,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); @@ -523,7 +433,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$//; @@ -563,229 +473,78 @@ 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} }; + my ($self, %params) = @_; - foreach my $db (split / /, $form->{dbupdate}) { - next unless $form->{$db}; + my $form = $params{form}; + my $dbupdater = $params{updater}; + my $db = $params{database}; + my $silent = $params{silent}; - # strip db from dataset - $db =~ s/^db//; - &dbconnect_vars($form, $db); + map { $_->{description} = SL::Iconv::convert($_->{charset}, 'UTF-8', $_->{description}) } values %{ $dbupdater->{all_controls} }; - my $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}) or $form->dberror; + &dbconnect_vars($form, $db); - $dbh->do($form->{dboptions}) if ($form->{dboptions}); + my $dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}, SL::DBConnect->get_options) or $form->dberror; - $self->create_schema_info_table($form, $dbh); + $dbh->do($form->{dboptions}) if ($form->{dboptions}); - my @upgradescripts = $dbupdater->unapplied_upgrade_scripts($dbh); + $self->create_schema_info_table($form, $dbh); - $dbh->disconnect and next if !@upgradescripts; + my @upgradescripts = $dbupdater->unapplied_upgrade_scripts($dbh); + my $need_superuser = (any { $_->{superuser_privileges} } @upgradescripts); + my $superuser_dbh; - foreach my $control (@upgradescripts) { - # apply upgrade - $main::lxdebug->message(LXDebug->DEBUG2(), "Applying Update $control->{file}"); - print $form->parse_html_template("dbupgrade/upgrade_message2", $control); + if ($need_superuser) { + my %dbconnect_form = ( + %{ $form }, + dbuser => $::auth->get_session_value("database_superuser_username"), + dbpasswd => $::auth->get_session_value("database_superuser_password"), + ); - $dbupdater->process_file($dbh, "sql/" . $form->{"dbdriver"} . "-upgrade2/$control->{file}", $control, $db_charset); + if ($dbconnect_form{dbuser} ne $form->{dbuser}) { + dbconnect_vars(\%dbconnect_form, $db); + $superuser_dbh = SL::DBConnect->connect($dbconnect_form{dbconnect}, $dbconnect_form{dbuser}, $dbconnect_form{dbpasswd}, SL::DBConnect->get_options) or $form->dberror; } - - $rc = 0; - $dbh->disconnect; - - } - - $main::lxdebug->leave_sub(); - - return $rc; -} - -sub save_member { - $main::lxdebug->enter_sub(); - - my ($self) = @_; - my $form = \%main::form; - - # 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(); -} + $::lxdebug->log_time("DB upgrades commencing"); -sub create_employee_entry { - $main::lxdebug->enter_sub(); + 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. + my $script_dbh = $control->{superuser_privileges} ? ($superuser_dbh // $dbh) : $dbh; - my $self = shift; - my $form = shift; - my $dbh = shift; - my $myconfig = shift; - my $update_existing = shift; + $::lxdebug->message(LXDebug->DEBUG2(), "Applying Update $control->{file}" . ($control->{superuser_privileges} ? " with superuser privileges" : "")); + print $form->parse_html_template("dbupgrade/upgrade_message2", $control) unless $silent; - if (!does_table_exist($dbh, 'employee')) { - $main::lxdebug->leave_sub(); - return; + $dbupdater->process_file($script_dbh, "sql/Pg-upgrade2/$control->{file}", $control); } - # 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}); + $::lxdebug->log_time("DB upgrades finished"); - 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' WHERE id = ?|; - do_query($form, $dbh, $query, $myconfig->{name}, $myconfig->{tel}, $id); - } - - $main::lxdebug->leave_sub(); + $dbh->disconnect; + $superuser_dbh->disconnect if $superuser_dbh; } -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); - - $main::lxdebug->leave_sub(); - - return @conf; +sub data { + +{ %{ $_[0] } } } -sub error { - $main::lxdebug->enter_sub(); - - my ($self, $msg) = @_; - - $main::lxdebug->show_backtrace(); - - if ($ENV{HTTP_USER_AGENT}) { - print qq|Content-Type: text/html - - - -
- -$msg|; - - } - - die "Error: $msg\n"; - - $main::lxdebug->leave_sub(); +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; -