[interchange-cvs] interchange - racke modified lib/Vend/UserDB.pm

[interchange-cvs at icdevgroup.org]

User:      racke
Date:      2005-08-11 22:55:06 GMT
Modified:  lib/Vend UserDB.pm
Log:
Reverted last patch to make indirect_login work with auto-created users.

Justification:
Breaks usage of indirect_login with existing users.

Example configuration:
UserDB default database company_contact
UserDB default indirect_login email
UserDB default user_field idf

Revision  Changes    Path
2.38      +2 -1      interchange/lib/Vend/UserDB.pm


rev 2.38, prev_rev 2.37
Index: UserDB.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/UserDB.pm,v
retrieving revision 2.37
retrieving revision 2.38
diff -u -r2.37 -r2.38
--- UserDB.pm	19 Jul 2005 14:30:26 -0000	2.37
+++ UserDB.pm	11 Aug 2005 22:55:06 -0000	2.38
@@ -1,6 +1,6 @@
 # Vend::UserDB - Interchange user database functions
 #
-# $Id: UserDB.pm,v 2.37 2005/07/19 14:30:26 jonc Exp $
+# $Id: UserDB.pm,v 2.38 2005/08/11 22:55:06 racke Exp $
 #
 # Copyright (C) 2002-2003 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -17,7 +17,7 @@
 
 package Vend::UserDB;
 
-$VERSION = substr(q$Revision: 2.37 $, 10);
+$VERSION = substr(q$Revision: 2.38 $, 10);
 
 use vars qw!
 	$VERSION
@@ -1090,7 +1090,7 @@
 		my $foreign = $self->{OPTIONS}{indirect_login};
 
 		if($foreign) {
-			my $uname = ($self->{PASSED_USERNAME} ||= $::Values->{$foreign});
+			my $uname = ($self->{PASSED_USERNAME} ||= $self->{USERNAME});
 			my $ufield = $self->{LOCATION}{USERNAME};
 			$uname = $udb->quote($uname);
 			my $q = "select $ufield from $self->{DB_ID} where $foreign = $uname";
@@ -1532,6 +1532,7 @@
 			$Vend::Session->{auto_created_user} = $self->{USERNAME};
 		}
 		else {
+			$self->{USERNAME} = $foreign if $foreign;
 			username_cookies($self->{USERNAME}, $pw) 
 				if $Vend::Cfg->{CookieLogin};