diff options
| author | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2007-03-24 17:38:32 +0000 |
|---|---|---|
| committer | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2007-03-24 17:38:32 +0000 |
| commit | 4d55c425d6b332832c5e7548e4883ab49716ed38 (patch) | |
| tree | 3d21106258e706f615a1f71387e5a6c84ae5b592 /bin/login.pl | |
| parent | aa5f616d44a84ffb6c0c8d861434663f35d66faf (diff) | |
Removing executable bit from bin/*.pl
git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@1000 4979c152-3d1c-0410-bac9-87ea11338e46
Diffstat (limited to 'bin/login.pl')
| -rw-r--r--[-rwxr-xr-x] | bin/login.pl | 39 |
1 files changed, 5 insertions, 34 deletions
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); |