[LON-CAPA-cvs] cvs: loncom / LONCAPA.pm lond

[albertel]

albertel		Mon Nov 27 11:34:39 2006 EDT

  Modified files:              
    /loncom	lond LONCAPA.pm 
  Log:
  - switch to using the cleaning routines for controlling what is valid in a db name
  
  
Index: loncom/lond
diff -u loncom/lond:1.349 loncom/lond:1.350
--- loncom/lond:1.349	Mon Nov 27 11:33:38 2006
+++ loncom/lond	Mon Nov 27 11:34:38 2006
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.349 2006/11/27 16:33:38 albertel Exp $
+# $Id: lond,v 1.350 2006/11/27 16:34:38 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,7 +60,7 @@
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.349 $'; #' stupid emacs
+my $VERSION='$Revision: 1.350 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -3053,7 +3053,7 @@
     my ($cmd, $tail, $client) = @_;
 
     my $userinput = "$cmd:$tail";	# Only used for logging purposes.
-    $namespace=~s/\W//g;
+    $namespace = &LONCAPA::clean_username($namespace);
     my ($udom,$uname,$namespace,$rid) = split(/:/,$tail);
     $namespace=~s/\//\_/g;
 
Index: loncom/LONCAPA.pm
diff -u loncom/LONCAPA.pm:1.14 loncom/LONCAPA.pm:1.15
--- loncom/LONCAPA.pm:1.14	Wed Nov 22 14:58:29 2006
+++ loncom/LONCAPA.pm	Mon Nov 27 11:34:38 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Base routines
 #
-# $Id: LONCAPA.pm,v 1.14 2006/11/22 19:58:29 albertel Exp $
+# $Id: LONCAPA.pm,v 1.15 2006/11/27 16:34:38 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -201,10 +201,9 @@
 sub tie_user_hash {
     my ($domain,$user,$namespace,$how,$loghead,$what) = @_;
 
-    $namespace=~s/\//\_/g;	# / -> _
-    $namespace=~s/\W//g;		# whitespace eliminated.
-    my $proname     = &propath($domain, $user);
-
+    $namespace=~s{/}{_}g;	# / -> _
+    $namespace     = &clean_username($namespace);
+    my $proname    = &propath($domain, $user);
     my $file_prefix="$proname/$namespace";
     return &_locking_hash_tie($file_prefix,$namespace,$how,$loghead,$what);
 }