--- loncom/lond	2004/08/10 11:30:24	1.226
+++ loncom/lond	2004/08/16 10:54:19	1.229
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.226 2004/08/10 11:30:24 foxr Exp $
+# $Id: lond,v 1.229 2004/08/16 10:54:19 foxr 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.226 $'; #' stupid emacs
+my $VERSION='$Revision: 1.229 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -1812,7 +1812,6 @@ sub remove_user_file_handler {
     my ($fname) = split(/:/, $tail); # Get rid of any tailing :'s lonc may have sent.
 
     my ($udom,$uname,$ufile) = ($fname =~ m|^([^/]+)/([^/]+)/(.+)$|);
-    &logthis("$udom - $uname - $ufile");
     if ($ufile =~m|/\.\./|) {
 	# any files paths with /../ in them refuse 
 	# to deal with
@@ -1839,6 +1838,71 @@ sub remove_user_file_handler {
 }
 &register_handler("removeuserfile", \&remove_user_file_handler, 0,1,0);
 
+
+#
+#  Authenticate access to a user file by checking the user's 
+#  session token(?)
+#
+# Parameters:
+#   cmd      - The request keyword that dispatched to tus.
+#   tail     - The tail of the request (colon separated parameters).
+#   client   - Filehandle open on the client.
+# Return:
+#    1.
+
+sub token_auth_user_file_handler {
+    my ($cmd, $tail, $client) = @_;
+
+    my ($fname, $session) = split(/:/, $tail);
+    
+    chomp($session);
+    my $reply='non_auth';
+    if (open(ENVIN,$perlvar{'lonIDsDir'}.'/'.
+	     $session.'.id')) {
+	while (my $line=<ENVIN>) {
+	    if ($line=~ m|userfile\.\Q$fname\E\=|) { $reply='ok'; }
+	}
+	close(ENVIN);
+	&Reply($client, $reply);
+    } else {
+	&Failure($client, "invalid_token\n", "$cmd:$tail");
+    }
+    return 1;
+
+}
+
+&register_handler("tokenauthuserfile", \&token_auth_user_file_handler, 0,1,0);
+
+
+#
+#   Unsubscribe from a resource.
+#
+# Parameters:
+#    $cmd      - The command that got us here.
+#    $tail     - Tail of the command (remaining parameters).
+#    $client   - File descriptor connected to client.
+# Returns
+#     0        - Requested to exit, caller should shut down.
+#     1        - Continue processing.
+#
+sub unsubscribe_handler {
+    my ($cmd, $tail, $client) = @_;
+
+    my $userinput= "$cmd:$tail";
+    
+    my ($fname) = split(/:/,$tail); # Split in case there's extrs.
+
+    &Debug("Unsubscribing $fname");
+    if (-e $fname) {
+	&Debug("Exists");
+	&Reply($client, &unsub($fname,$clientip), $userinput);
+    } else {
+	&Failure($client, "not_found\n", $userinput);
+    }
+    return 1;
+}
+&register_handler("unsub", \&unsubscribe_handler, 0, 1, 0);
+
 #---------------------------------------------------------------
 #
 #   Getting, decoding and dispatching requests:
@@ -1954,42 +2018,9 @@ sub process_request {
 
 
 
-# ------------------------------------------ authenticate access to a user file
 
-    if ($userinput =~ /^tokenauthuserfile/) { # Client only
-	if(isClient) {
-	    my ($cmd,$fname,$session)=split(/:/,$userinput);
-	    chomp($session);
-	    my $reply='non_auth';
-	    if (open(ENVIN,$perlvar{'lonIDsDir'}.'/'.
-		     $session.'.id')) {
-		while (my $line=<ENVIN>) {
-		    if ($line=~ m|userfile\.\Q$fname\E\=|) { $reply='ok'; }
-			    }
-		close(ENVIN);
-		print $client $reply."\n";
-	    } else {
-		print $client "invalid_token\n";
-	    }
-	} else {
-	    Reply($client, "refused\n", $userinput);
-	    
-	}
-# ----------------------------------------------------------------- unsubscribe
-    } elsif ($userinput =~ /^unsub/) {
-	if(isClient) {
-	    my ($cmd,$fname)=split(/:/,$userinput);
-	    if (-e $fname) {
-		print $client &unsub($fname,$clientip);
-	    } else {
-		print $client "not_found\n";
-	    }
-	} else {
-	    Reply($client, "refused\n", $userinput);
-	    
-	}
 # ------------------------------------------------------------------- subscribe
-    } elsif ($userinput =~ /^sub/) {
+   if ($userinput =~ /^sub/) {
 	if(isClient) {
 	    print $client &subscribe($userinput,$clientip);
 	} else {