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

[interchange-core@icdevgroup.org]

User:      kwalsh
Date:      2002-11-05 17:00:04 GMT
Modified:  lib/Vend UserDB.pm
Log:
	* [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
2.11      +14 -4     interchange/lib/Vend/UserDB.pm


rev 2.11, prev_rev 2.10
Index: UserDB.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/UserDB.pm,v
retrieving revision 2.10
retrieving revision 2.11
diff -u -r2.10 -r2.11
--- UserDB.pm	16 Sep 2002 23:06:31 -0000	2.10
+++ UserDB.pm	5 Nov 2002 17:00:04 -0000	2.11
@@ -1,6 +1,6 @@
 # Vend::UserDB - Interchange user database functions
 #
-# $Id: UserDB.pm,v 2.10 2002/09/16 23:06:31 mheins Exp $
+# $Id: UserDB.pm,v 2.11 2002/11/05 17:00:04 kwalsh Exp $
 #
 # Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -16,7 +16,7 @@
 
 package Vend::UserDB;
 
-$VERSION = substr(q$Revision: 2.10 $, 10);
+$VERSION = substr(q$Revision: 2.11 $, 10);
 
 use vars qw!
 	$VERSION
@@ -592,10 +592,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{$_};
 		}
 	}