diff --git a/bin/aa.pl b/bin/aa.pl old mode 100755 new mode 100644 diff --git a/bin/admin.pl b/bin/admin.pl old mode 100755 new mode 100644 diff --git a/bin/am.pl b/bin/am.pl old mode 100755 new mode 100644 diff --git a/bin/ap.pl b/bin/ap.pl old mode 100755 new mode 100644 diff --git a/bin/ar.pl b/bin/ar.pl old mode 100755 new mode 100644 diff --git a/bin/arap.pl b/bin/arap.pl old mode 100755 new mode 100644 diff --git a/bin/arapprn.pl b/bin/arapprn.pl old mode 100755 new mode 100644 diff --git a/bin/bp.pl b/bin/bp.pl old mode 100755 new mode 100644 diff --git a/bin/ca.pl b/bin/ca.pl old mode 100755 new mode 100644 diff --git a/bin/cp.pl b/bin/cp.pl old mode 100755 new mode 100644 diff --git a/bin/ct.pl b/bin/ct.pl old mode 100755 new mode 100644 diff --git a/bin/gl.pl b/bin/gl.pl old mode 100755 new mode 100644 diff --git a/bin/hr.pl b/bin/hr.pl old mode 100755 new mode 100644 diff --git a/bin/ic.pl b/bin/ic.pl old mode 100755 new mode 100644 diff --git a/bin/io.pl b/bin/io.pl old mode 100755 new mode 100644 diff --git a/bin/ir.pl b/bin/ir.pl old mode 100755 new mode 100644 diff --git a/bin/is.pl b/bin/is.pl old mode 100755 new mode 100644 diff --git a/bin/jc.pl b/bin/jc.pl old mode 100755 new mode 100644 diff --git a/bin/login.pl b/bin/login.pl old mode 100755 new mode 100644 index 8ddcdb411f..1df03b42b4 --- a/bin/login.pl +++ b/bin/login.pl @@ -236,41 +236,12 @@ sub login { $form->error(__FILE__.':'.__LINE__.': '.$locale->text('You did not enter a name!')) unless ($form->{login}); - #this needs to be done via db - #if (! $form->{beenthere}) { - # open(FH, '<', "${LedgerSMB::Sysconfig::memberfile}") or $form->error(__FILE__.':'.__LINE__.": $memberfile : $!"); - # @a = ; - # close(FH); - # - # foreach $item (@a) { - # - # if ($item =~ /^\[(.*?)\]/) { - # $login = $1; - # $found = 1; - # } - # - # if ($item =~ /^company=/) { - # if ($login =~ /$form->{login}\@/ && $found) { - # ($null, $name) = split /=/, $item, 2; - # $login{$login} = $name; - # } - # $found = 0; - # } - # } - # - # if (keys %login > 1) { - # &selectdataset(\%login); - # exit; - # } - #} - if (!${LedgerSMB::Sysconfig::GLOBALDBH}){ $locale->text("No GlobalDBH Configured or Could not Connect"); } $user = LedgerSMB::User->new($form->{login}); - # if we get an error back, bale out if (($errno = $user->login(\%$form)) <= -1) { $errno *= -1; @@ -280,9 +251,11 @@ sub login { if ($errno == 4) { # upgrade dataset and log in again - - #locking needs to be done via db function - #open FH, '>', "${LedgerSMB::Sysconfig::userspath}/nologin" or $form->error($!); + if (!$LedgerSMB::Sysconfig::db_autoupdate){ + $form->error( + $locale->text("Dabase Version too Old") + ); + } for (qw(dbname dbhost dbport dbdriver dbuser dbpasswd)) { $form->{$_} = $user->{$_} } @@ -295,8 +268,6 @@ sub login { print qq||; print $locale->text('Upgrading to Version [_1] ...', $form->{version}); - # required for Oracle - $form->{dbdefault} = $sid; $user->dbupdate(\%$form); diff --git a/bin/menu.pl b/bin/menu.pl old mode 100755 new mode 100644 diff --git a/bin/oe.pl b/bin/oe.pl old mode 100755 new mode 100644 diff --git a/bin/pe.pl b/bin/pe.pl old mode 100755 new mode 100644 diff --git a/bin/pos.pl b/bin/pos.pl old mode 100755 new mode 100644 diff --git a/bin/ps.pl b/bin/ps.pl old mode 100755 new mode 100644 diff --git a/bin/pw.pl b/bin/pw.pl old mode 100755 new mode 100644 diff --git a/bin/rc.pl b/bin/rc.pl old mode 100755 new mode 100644 diff --git a/bin/rp.pl b/bin/rp.pl old mode 100755 new mode 100644