X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FUser.pm;h=0fbd66a398325eef5d947d48417a30c10759cc9b;hb=88e6dce2c094fa468e4397030d2f14289a265e62;hp=102b9382e0a2aa8af6de95c6cd6c70fc00dca045;hpb=684e84d8b410627473b2187c031f0d9143ea1a60;p=kivitendo-erp.git diff --git a/SL/User.pm b/SL/User.pm index 102b9382e..0fbd66a39 100644 --- a/SL/User.pm +++ b/SL/User.pm @@ -34,8 +34,6 @@ package User; -#use strict; - use IO::File; use Fcntl qw(:seek); @@ -45,6 +43,8 @@ use SL::DBUtils; use SL::Iconv; use SL::Inifile; +use strict; + sub new { $main::lxdebug->enter_sub(); @@ -107,7 +107,7 @@ sub login { my $dbh = DBI->connect($myconfig{dbconnect}, $myconfig{dbuser}, $myconfig{dbpasswd}) - or $self->error(DBI::errstr); + or $self->error($DBI::errstr); # we got a connection, check the version my $query = qq|SELECT version FROM defaults|; @@ -445,6 +445,7 @@ sub process_perl_script { $dbh->begin_work(); + # setup dbup_ export vars my %dbup_myconfig = (); map({ $dbup_myconfig{$_} = $form->{$_}; } qw(dbname dbuser dbpasswd dbhost dbport dbconnect)); @@ -802,7 +803,7 @@ sub dbupdate { last if ($version < $mindb); # apply upgrade - $main::lxdebug->message(LXDebug::DEBUG2, "Applying Update $upgradescript"); + $main::lxdebug->message(LXDebug->DEBUG2(), "Applying Update $upgradescript"); if ($file_type eq "sql") { $self->process_query($form, $dbh, "sql/" . $form->{"dbdriver"} . "-upgrade/$upgradescript", $str_maxdb, $db_charset); @@ -886,7 +887,7 @@ sub dbupdate2 { my $file_type = $1; # apply upgrade - $main::lxdebug->message(LXDebug::DEBUG2, "Applying Update $control->{file}"); + $main::lxdebug->message(LXDebug->DEBUG2(), "Applying Update $control->{file}"); print $form->parse_html_template("dbupgrade/upgrade_message2", $control); if ($file_type eq "sql") { @@ -1002,7 +1003,7 @@ sub config_vars { bestellungen rechnungen anfragen lieferantenbestellungen einkaufsrechnungen taxnumber co_ustid duns menustyle template_format default_media default_printer_id copies show_form_details favorites - pdonumber sdonumber); + pdonumber sdonumber hide_cvar_search_options); $main::lxdebug->leave_sub();