--- loncom/lond	2002/05/11 21:24:56	1.80
+++ loncom/lond	2002/08/01 18:44:19	1.85
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.80 2002/05/11 21:24:56 harris41 Exp $
+# $Id: lond,v 1.85 2002/08/01 18:44:19 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -105,9 +105,10 @@ sub timeout {
 $SIG{'QUIT'}=\&catchexception;
 $SIG{__DIE__}=\&catchexception;
 
-# ------------------------------------------- Read access.conf and loncapa.conf
-&status("Read access.conf and loncapa.conf");
-my $perlvarref=LONCAPA::Configuration::read_conf('access.conf','loncapa.conf');
+# ---------------------------------- Read loncapa_apache.conf and loncapa.conf
+&status("Read loncapa_apache.conf and loncapa.conf");
+my $perlvarref=LONCAPA::Configuration::read_conf('loncapa_apache.conf',
+                                                 'loncapa.conf');
 my %perlvar=%{$perlvarref};
 undef $perlvarref;
 
@@ -946,48 +947,23 @@ sub make_new_child {
 		       } else {
 			print $client "rejected\n";
                        }
+# -------------------------------------- fetch a user file from a remote server
+                   } elsif ($userinput =~ /^fetchuserfile/) {
+                       my ($cmd,$fname)=split(/:/,$userinput);
+# ------------------------------------------ authenticate access to a user file
+                   } elsif ($userinput =~ /^authuserfile/) {
+                       my ($cmd,$fname,$session)=split(/:/,$userinput);
 # ----------------------------------------------------------------- unsubscribe
                    } elsif ($userinput =~ /^unsub/) {
                        my ($cmd,$fname)=split(/:/,$userinput);
                        if (-e $fname) {
-                           if (unlink("$fname.$hostid{$clientip}")) {
-                              print $client "ok\n";
-			   } else {
-                              print $client "not_subscribed\n";
-			   }
+			   print $client &unsub($client,$fname,$clientip);
                        } else {
 			   print $client "not_found\n";
                        }
 # ------------------------------------------------------------------- subscribe
                    } elsif ($userinput =~ /^sub/) {
-                       my ($cmd,$fname)=split(/:/,$userinput);
-                       my $ownership=ishome($fname);
-                       if ($ownership eq 'owner') {
-                        if (-e $fname) {
-			 if (-d $fname) {
-			   print $client "directory\n";
-                         } else {
-                           $now=time;
-                           { 
-			    my $sh;
-                            if ($sh=
-                             IO::File->new(">$fname.$hostid{$clientip}")) {
-                               print $sh "$clientip:$now\n";
-			    }
-			   }
-                           unless ($fname=~/\.meta$/) {
-			       unlink("$fname.meta.$hostid{$clientip}");
-                           }
-                           $fname=~s/\/home\/httpd\/html\/res/raw/;
-                           $fname="http://$thisserver/".$fname;
-                           print $client "$fname\n";
-		         }
-                        } else {
-		      	   print $client "not_found\n";
-                        }
-		       } else {
-                        print $client "rejected\n";
-		       }
+		       print $client &subscribe($userinput,$clientip);
 # ------------------------------------------------------------------------- log
                    } elsif ($userinput =~ /^log/) {
                        my ($cmd,$udom,$uname,$what)=split(/:/,$userinput);
@@ -1291,17 +1267,11 @@ sub make_new_child {
 # ------------------------------------------------------------------- querysend
                    } elsif ($userinput =~ /^querysend/) {
                        my ($cmd,$query,
-			   $custom,$customshow)=split(/:/,$userinput);
+			   $arg1,$arg2,$arg3)=split(/\:/,$userinput);
 		       $query=~s/\n*$//g;
-		       unless ($custom or $customshow) {
-			   print $client "".
-			       sqlreply("$hostid{$clientip}\&$query")."\n";
-		       }
-		       else {
-			   print $client "".
+		       print $client "".
 			       sqlreply("$hostid{$clientip}\&$query".
-					"\&$custom"."\&$customshow")."\n";
-		       }
+					"\&$arg1"."\&$arg2"."\&$arg3")."\n";
 # ------------------------------------------------------------------ queryreply
                    } elsif ($userinput =~ /^queryreply/) {
                        my ($cmd,$id,$reply)=split(/:/,$userinput); 
@@ -1407,14 +1377,20 @@ sub make_new_child {
                        my $ulsout='';
                        my $ulsfn;
                        if (-e $ulsdir) {
-			if (opendir(LSDIR,$ulsdir)) {
-                          while ($ulsfn=readdir(LSDIR)) {
-			     my @ulsstats=stat($ulsdir.'/'.$ulsfn);
-                             $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
-                          }
-                          closedir(LSDIR);
-		        }
-		       } else {
+                           if(-d $ulsdir) {
+                               if (opendir(LSDIR,$ulsdir)) {
+                                   while ($ulsfn=readdir(LSDIR)) {
+                                       my @ulsstats=stat($ulsdir.'/'.$ulsfn);
+                                       $ulsout.=$ulsfn.'&'.
+                                                join('&',@ulsstats).':';
+                                   }
+                                   closedir(LSDIR);
+                               }
+                           } else {
+                               my @ulsstats=stat($ulsdir);
+                               $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
+                           }
+                       } else {
                           $ulsout='no_such_dir';
                        }
                        if ($ulsout eq '') { $ulsout='empty'; }
@@ -1519,9 +1495,75 @@ sub GetAuthType
 	Debug("Returning nouser");
 	return "nouser";
     }
-    
 }
 
+sub addline {
+    my ($fname,$hostid,$ip,$newline)=@_;
+    my $contents;
+    my $found=0;
+    my $expr='^'.$hostid.':'.$ip.':';
+    $expr =~ s/\./\\\./g;
+    if ($sh=IO::File->new("$fname.subscription")) {
+	while (my $subline=<$sh>) {
+	    if ($subline !~ /$expr/) {$contents.= $subline;} else {$found=1;}
+	}
+	$sh->close();
+    }
+    $sh=IO::File->new(">$fname.subscription");
+    if ($contents) { print $sh $contents; }
+    if ($newline) { print $sh $newline; }
+    $sh->close();
+    return $found;
+}
+
+sub unsub {
+    my ($fname,$clientip)=@_;
+    my $result;
+    if (unlink("$fname.$hostid{$clientip}")) {
+	$result="ok\n";
+    } else {
+	$result="not_subscribed\n";
+    }
+    if (-e "$fname.subscription") {
+	my $found=&addline($fname,$hostid{$clientip},$clientip,'');
+	if ($found) { $result="ok\n"; }
+    } else {
+	if ($result != "ok\n") { $result="not_subscribed\n"; }
+    }
+    return $result;
+}
+
+sub subscribe {
+    my ($userinput,$clientip)=@_;
+    my $result;
+    my ($cmd,$fname)=split(/:/,$userinput);
+    my $ownership=&ishome($fname);
+    if ($ownership eq 'owner') {
+	if (-e $fname) {
+	    if (-d $fname) {
+		$result="directory\n";
+	    } else {
+		if (-e "$fname.$hostid{$clientip}") {&unsub($fname,$clientip);}
+		$now=time;
+		my $found=&addline($fname,$hostid{$clientip},$clientip,
+				   "$hostid{$clientip}:$clientip:$now\n");
+		if ($found) { $result="$fname\n"; }
+		# if they were subscribed to only meta data, delete that
+                # subscription, when you subscribe to a file you also get
+                # the metadata
+		unless ($fname=~/\.meta$/) { &unsub("$fname.meta",$clientip); }
+		$fname=~s/\/home\/httpd\/html\/res/raw/;
+		$fname="http://$thisserver/".$fname;
+		$result="$fname\n";
+	    }
+	} else {
+	    $result="not_found\n";
+	}
+    } else {
+	$result="rejected\n";
+    }
+    return $result;
+}
 # ----------------------------------- POD (plain old documentation, CPAN style)
 
 =head1 NAME