diff options
Diffstat (limited to 'bin')
| -rw-r--r--[-rwxr-xr-x] | bin/aa.pl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bin/admin.pl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bin/am.pl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bin/ap.pl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bin/ar.pl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bin/arap.pl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bin/arapprn.pl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bin/bp.pl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bin/ca.pl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bin/cp.pl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bin/ct.pl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bin/gl.pl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bin/hr.pl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bin/ic.pl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bin/io.pl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bin/ir.pl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bin/is.pl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bin/jc.pl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bin/login.pl | 39 | ||||
| -rw-r--r--[-rwxr-xr-x] | bin/menu.pl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bin/oe.pl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bin/pe.pl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bin/pos.pl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bin/ps.pl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bin/pw.pl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bin/rc.pl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | bin/rp.pl | 0 |
27 files changed, 5 insertions, 34 deletions
diff --git a/bin/aa.pl b/bin/aa.pl index e1f346f3..e1f346f3 100755..100644 --- a/bin/aa.pl +++ b/bin/aa.pl diff --git a/bin/admin.pl b/bin/admin.pl index 38c51c20..38c51c20 100755..100644 --- a/bin/admin.pl +++ b/bin/admin.pl diff --git a/bin/am.pl b/bin/am.pl index ea125c97..ea125c97 100755..100644 --- a/bin/am.pl +++ b/bin/am.pl diff --git a/bin/ap.pl b/bin/ap.pl index c3ce73cf..c3ce73cf 100755..100644 --- a/bin/ap.pl +++ b/bin/ap.pl diff --git a/bin/ar.pl b/bin/ar.pl index dd08ee71..dd08ee71 100755..100644 --- a/bin/ar.pl +++ b/bin/ar.pl diff --git a/bin/arap.pl b/bin/arap.pl index e210d0d8..e210d0d8 100755..100644 --- a/bin/arap.pl +++ b/bin/arap.pl diff --git a/bin/arapprn.pl b/bin/arapprn.pl index 5eb138d9..5eb138d9 100755..100644 --- a/bin/arapprn.pl +++ b/bin/arapprn.pl diff --git a/bin/bp.pl b/bin/bp.pl index 16fb2996..16fb2996 100755..100644 --- a/bin/bp.pl +++ b/bin/bp.pl diff --git a/bin/ca.pl b/bin/ca.pl index 9554914d..9554914d 100755..100644 --- a/bin/ca.pl +++ b/bin/ca.pl diff --git a/bin/cp.pl b/bin/cp.pl index 95a19254..95a19254 100755..100644 --- a/bin/cp.pl +++ b/bin/cp.pl diff --git a/bin/ct.pl b/bin/ct.pl index 252c36be..252c36be 100755..100644 --- a/bin/ct.pl +++ b/bin/ct.pl diff --git a/bin/gl.pl b/bin/gl.pl index 2db8611d..2db8611d 100755..100644 --- a/bin/gl.pl +++ b/bin/gl.pl diff --git a/bin/hr.pl b/bin/hr.pl index 160b4c87..160b4c87 100755..100644 --- a/bin/hr.pl +++ b/bin/hr.pl diff --git a/bin/ic.pl b/bin/ic.pl index c1a5b27d..c1a5b27d 100755..100644 --- a/bin/ic.pl +++ b/bin/ic.pl diff --git a/bin/io.pl b/bin/io.pl index 46e30120..46e30120 100755..100644 --- a/bin/io.pl +++ b/bin/io.pl diff --git a/bin/ir.pl b/bin/ir.pl index f05fb764..f05fb764 100755..100644 --- a/bin/ir.pl +++ b/bin/ir.pl diff --git a/bin/is.pl b/bin/is.pl index d34419d7..d34419d7 100755..100644 --- a/bin/is.pl +++ b/bin/is.pl diff --git a/bin/jc.pl b/bin/jc.pl index 6af0f84a..6af0f84a 100755..100644 --- a/bin/jc.pl +++ b/bin/jc.pl diff --git a/bin/login.pl b/bin/login.pl index 8ddcdb41..1df03b42 100755..100644 --- 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 = <FH>; - # 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|<body>|; 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 index 9b426b5f..9b426b5f 100755..100644 --- a/bin/menu.pl +++ b/bin/menu.pl diff --git a/bin/oe.pl b/bin/oe.pl index 320a7fa8..320a7fa8 100755..100644 --- a/bin/oe.pl +++ b/bin/oe.pl diff --git a/bin/pe.pl b/bin/pe.pl index acfaa784..acfaa784 100755..100644 --- a/bin/pe.pl +++ b/bin/pe.pl diff --git a/bin/pos.pl b/bin/pos.pl index 9f414d1d..9f414d1d 100755..100644 --- a/bin/pos.pl +++ b/bin/pos.pl diff --git a/bin/ps.pl b/bin/ps.pl index f3df4c98..f3df4c98 100755..100644 --- a/bin/ps.pl +++ b/bin/ps.pl diff --git a/bin/pw.pl b/bin/pw.pl index 9bb2c3ba..9bb2c3ba 100755..100644 --- a/bin/pw.pl +++ b/bin/pw.pl |