--- loncom/lond	2004/08/24 10:59:50	1.239
+++ loncom/lond	2004/08/29 04:12:18	1.245
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.239 2004/08/24 10:59:50 foxr Exp $
+# $Id: lond,v 1.245 2004/08/29 04:12:18 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -57,7 +57,7 @@ my $DEBUG = 0;		       # Non zero to ena
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.239 $'; #' stupid emacs
+my $VERSION='$Revision: 1.245 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -1282,7 +1282,36 @@ sub push_file_handler {
 }
 &register_handler("pushfile", \&push_file_handler, 1, 0, 1);
 
+#
+#   du  - list the disk usuage of a directory recursively. 
+#    
+#   note: stolen code from the ls file handler
+#   under construction by Rick Banghart 
+#    .
+# Parameters:
+#    $cmd        - The command that dispatched us (du).
+#    $ududir     - The directory path to list... I'm not sure what this
+#                  is relative as things like ls:. return e.g.
+#                  no_such_dir.
+#    $client     - Socket open on the client.
+# Returns:
+#     1 - indicating that the daemon should not disconnect.
+# Side Effects:
+#   The reply is written to  $client.
+#
 
+sub du_handler {
+    my ($cmd, $ududir, $client) = @_;
+    if ($ududir=~/\.\./ || $ududir!~m|^/home/httpd/|) {
+	&Failure($client,"refused\n","$cmd:$ududir");
+	return 1;
+    }
+    my $duout = `du -ks $ududir 2>/dev/null`;
+    $duout=~s/[^\d]//g; #preserve only the numbers
+    &Reply($client,"$duout\n","$cmd:$ududir");
+    return 1;
+}
+&register_handler("du", \&du_handler, 0, 1, 0);
 
 
 #
@@ -1349,6 +1378,8 @@ sub ls_handler {
 &register_handler("ls", \&ls_handler, 0, 1, 0);
 
 
+
+
 #   Process a reinit request.  Reinit requests that either
 #   lonc or lond be reinitialized so that an updated 
 #   host.tab or domain.tab can be processed.
@@ -1908,7 +1939,11 @@ sub remove_user_file_handler {
 	if (-e $udir) {
 	    my $file=$udir.'/userfiles/'.$ufile;
 	    if (-e $file) {
-		unlink($file);
+	        if (-f $file){
+		    unlink($file);
+		} elsif(-d $file) {
+		    rmdir($file);
+		}
 		if (-e $file) {
 		    &Failure($client, "failed\n", "$cmd:$tail");
 		} else {
@@ -2173,7 +2208,7 @@ sub put_user_profile_entry {
 
     my $userinput = "$cmd:$tail";
     
-    my ($udom,$uname,$namespace,$what) =split(/:/,$tail);
+    my ($udom,$uname,$namespace,$what) =split(/:/,$tail,4);
     if ($namespace ne 'roles') {
 	chomp($what);
 	my $hashref = &tie_user_hash($udom, $uname, $namespace,