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

[interchange-core@icdevgroup.org]

User:      jon
Date:      2003-01-24 04:50:47 GMT
Modified:  lib/Vend Tag: STABLE_4_8-branch UserDB.pm
Log:
Merge from trunk:

	* [userdb function=logout clear=1] will now restore the appropriate
	  ScratchDefault and ValuesDefault values instead of simply
	  deleting the scratches and values under its control.

Revision  Changes    Path
No                   revision



No                   revision



2.0.2.5   +14 -4     interchange/lib/Vend/UserDB.pm


rev 2.0.2.5, prev_rev 2.0.2.4
Index: UserDB.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/UserDB.pm,v
retrieving revision 2.0.2.4
retrieving revision 2.0.2.5
diff -u -u -r2.0.2.4 -r2.0.2.5
--- UserDB.pm	26 Nov 2002 03:21:10 -0000	2.0.2.4
+++ UserDB.pm	24 Jan 2003 04:50:47 -0000	2.0.2.5
@@ -1,6 +1,6 @@
 # Vend::UserDB - Interchange user database functions
 #
-# $Id: UserDB.pm,v 2.0.2.4 2002/11/26 03:21:10 jon Exp $
+# $Id: UserDB.pm,v 2.0.2.5 2003/01/24 04:50:47 jon Exp $
 #
 # Copyright (C) 1996-2002 Red Hat, Inc. and
 # Interchange Development Group, http://www.icdevgroup.org/
@@ -17,7 +17,7 @@
 
 package Vend::UserDB;
 
-$VERSION = substr(q$Revision: 2.0.2.4 $, 10);
+$VERSION = substr(q$Revision: 2.0.2.5 $, 10);
 
 use vars qw!
 	$VERSION
@@ -593,10 +593,20 @@
 
 	for(@fields) {
 		if($scratch{$_}) {
-			delete $::Scratch->{$_};
+			if (exists $Vend::Cfg->{ScratchDefault}->{$_}) {
+				$::Scratch->{$_} = $Vend::Cfg->{ScratchDefault}->{$_};
+			}
+			else {
+				delete $::Scratch->{$_};
+			}
 		}
 		else {
-			delete $::Values->{$_};
+			if (exists $Vend::Cfg->{ValuesDefault}->{$_}) {
+				$::Values->{$_} = $Vend::Cfg->{ValuesDefault}->{$_};
+			}
+			else{
+				delete $::Values->{$_};
+			}
 			delete $CGI::values{$_};
 		}
 	}