--- loncom/lond	2004/08/23 11:24:45	1.234
+++ loncom/lond	2004/08/24 07:26:04	1.237
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.234 2004/08/23 11:24:45 foxr Exp $
+# $Id: lond,v 1.237 2004/08/24 07:26:04 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.234 $'; #' stupid emacs
+my $VERSION='$Revision: 1.237 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -1860,6 +1860,91 @@ sub remove_user_file_handler {
 }
 &register_handler("removeuserfile", \&remove_user_file_handler, 0,1,0);
 
+#
+#   make a directory in a user's home directory userfiles subdirectory.
+# Parameters:
+#    cmd   - the Lond request keyword that got us here.
+#    tail  - the part of the command past the keyword.
+#    client- File descriptor connected with the client.
+#
+# Returns:
+#    1    - Continue processing.
+
+sub mkdir_user_file_handler {
+    my ($cmd, $tail, $client) = @_;
+
+    my ($dir) = split(/:/, $tail); # Get rid of any tailing :'s lonc may have sent.
+    $dir=&unescape($dir);
+    my ($udom,$uname,$ufile) = ($dir =~ m|^([^/]+)/([^/]+)/(.+)$|);
+    if ($ufile =~m|/\.\./|) {
+	# any files paths with /../ in them refuse 
+	# to deal with
+	&Failure($client, "refused\n", "$cmd:$tail");
+    } else {
+	my $udir = &propath($udom,$uname);
+	if (-e $udir) {
+	    my $newdir=$udir.'/userfiles/'.$ufile;
+	    if (!-e $newdir) {
+		mkdir($newdir);
+		if (!-e $newdir) {
+		    &Failure($client, "failed\n", "$cmd:$tail");
+		} else {
+		    &Reply($client, "ok\n", "$cmd:$tail");
+		}
+	    } else {
+		&Failure($client, "not_found\n", "$cmd:$tail");
+	    }
+	} else {
+	    &Failure($client, "not_home\n", "$cmd:$tail");
+	}
+    }
+    return 1;
+}
+&register_handler("mkdiruserfile", \&mkdir_user_file_handler, 0,1,0);
+
+#
+#   rename a file in a user's home directory userfiles subdirectory.
+# Parameters:
+#    cmd   - the Lond request keyword that got us here.
+#    tail  - the part of the command past the keyword.
+#    client- File descriptor connected with the client.
+#
+# Returns:
+#    1    - Continue processing.
+
+sub rename_user_file_handler {
+    my ($cmd, $tail, $client) = @_;
+
+    my ($udom,$uname,$old,$new) = split(/:/, $tail);
+    $old=&unescape($old);
+    $new=&unescape($new);
+    if ($new =~m|/\.\./| || $old =~m|/\.\./|) {
+	# any files paths with /../ in them refuse to deal with
+	&Failure($client, "refused\n", "$cmd:$tail");
+    } else {
+	my $udir = &propath($udom,$uname);
+	if (-e $udir) {
+	    my $oldfile=$udir.'/userfiles/'.$old;
+	    my $newfile=$udir.'/userfiles/'.$new;
+	    if (-e $newfile) {
+		&Failure($client, "exists\n", "$cmd:$tail");
+	    } elsif (! -e $oldfile) {
+		&Failure($client, "not_found\n", "$cmd:$tail");
+	    } else {
+		if (!rename($oldfile,$newfile)) {
+		    &Failure($client, "failed\n", "$cmd:$tail");
+		} else {
+		    &Reply($client, "ok\n", "$cmd:$tail");
+		}
+	    }
+	} else {
+	    &Failure($client, "not_home\n", "$cmd:$tail");
+	}
+    }
+    return 1;
+}
+&register_handler("renameuserfile", \&rename_user_file_handler, 0,1,0);
+
 
 #
 #  Authenticate access to a user file by checking the user's 
@@ -3225,24 +3310,6 @@ sub process_request {
 	    Reply($client, "refused\n", $userinput);
 	    
 	}
-# ----------------------------------------- portfolio directory list (portls)
-    } elsif ($userinput =~ /^portls/) {
-	if(isClient) {
-	    my ($cmd,$uname,$udom)=split(/:/,$userinput);
-	    my $udir=propath($udom,$uname).'/userfiles/portfolio';
-	    my $dirLine='';
-	    my $dirContents='';
-	    if (opendir(LSDIR,$udir.'/')){
-		while ($dirLine = readdir(LSDIR)){
-		    $dirContents = $dirContents.$dirLine.'<br />';
-		}
-	    } else {
-		$dirContents = "No directory found\n";
-	    }
-	    print $client $dirContents."\n";
-	} else {
-	    Reply($client, "refused\n", $userinput);
-	}
 # -------------------------------------------------------------------------- ls
     } elsif ($userinput =~ /^ls/) {
 	if(isClient) {