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

[interchange-cvs at icdevgroup.org]

User:      jon
Date:      2006-12-29 05:43:08 GMT
Modified:  lib/Vend UserDB.pm
Log:
Tolerate leading or trailing whitespace in input of usernames, unless
spaces are allowed. Saves some user frustration.

Revision  Changes    Path
2.50      +9 -2      interchange/lib/Vend/UserDB.pm


rev 2.50, prev_rev 2.49
Index: UserDB.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/UserDB.pm,v
retrieving revision 2.49
retrieving revision 2.50
diff -u -u -r2.49 -r2.50
--- UserDB.pm	25 Aug 2006 17:14:59 -0000	2.49
+++ UserDB.pm	29 Dec 2006 05:43:08 -0000	2.50
@@ -1,6 +1,6 @@
 # Vend::UserDB - Interchange user database functions
 #
-# $Id: UserDB.pm,v 2.49 2006/08/25 17:14:59 mheins Exp $
+# $Id: UserDB.pm,v 2.50 2006/12/29 05:43:08 jon Exp $
 #
 # Copyright (C) 2002-2005 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -17,7 +17,7 @@
 
 package Vend::UserDB;
 
-$VERSION = substr(q$Revision: 2.49 $, 10);
+$VERSION = substr(q$Revision: 2.50 $, 10);
 
 use vars qw!
 	$VERSION
@@ -1163,6 +1163,13 @@
 				if ! $self->{USERNAME};
 			$self->{PASSWORD} = Vend::Util::read_cookie('MV_PASSWORD')
 				if ! $self->{PASSWORD};
+		}
+
+		if ($self->{VALIDCHARS} !~ / /) {
+			# If space isn't a valid character in usernames,
+			# be nice and strip leading and trailing whitespace.
+			$self->{USERNAME} =~ s/^\s+//;
+			$self->{USERNAME} =~ s/\s+$//;
 		}
 
 		if ($self->{OPTIONS}{ignore_case}) {