Removing executable bit from bin/*.pl

git-svn-id: svn://svn.code.sf.net/p/ledger-smb/code/trunk@1000 4979c152-3d1c-0410-bac9-87ea11338e46
pongraczi · Mar 24, 2007 · 0ba15b2 · 0ba15b2
1 parent 778fffe
commit 0ba15b2
Show file tree

Hide file tree

Showing 27 changed files with 5 additions and 34 deletions.
diff --git a/bin/aa.pl b/bin/aa.pl
diff --git a/bin/admin.pl b/bin/admin.pl
diff --git a/bin/am.pl b/bin/am.pl
diff --git a/bin/ap.pl b/bin/ap.pl
diff --git a/bin/ar.pl b/bin/ar.pl
diff --git a/bin/arap.pl b/bin/arap.pl
diff --git a/bin/arapprn.pl b/bin/arapprn.pl
diff --git a/bin/bp.pl b/bin/bp.pl
diff --git a/bin/ca.pl b/bin/ca.pl
diff --git a/bin/cp.pl b/bin/cp.pl
diff --git a/bin/ct.pl b/bin/ct.pl
diff --git a/bin/gl.pl b/bin/gl.pl
diff --git a/bin/hr.pl b/bin/hr.pl
diff --git a/bin/ic.pl b/bin/ic.pl
diff --git a/bin/io.pl b/bin/io.pl
diff --git a/bin/ir.pl b/bin/ir.pl
diff --git a/bin/is.pl b/bin/is.pl
diff --git a/bin/jc.pl b/bin/jc.pl
diff --git 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
diff --git a/bin/oe.pl b/bin/oe.pl
diff --git a/bin/pe.pl b/bin/pe.pl
diff --git a/bin/pos.pl b/bin/pos.pl
diff --git a/bin/ps.pl b/bin/ps.pl
diff --git a/bin/pw.pl b/bin/pw.pl
diff --git a/bin/rc.pl b/bin/rc.pl
diff --git a/bin/rp.pl b/bin/rp.pl