loncom/lond - diff

Return to lond CVS log

Up to [LON-CAPA] / loncom

Diff for /loncom/lond between versions 1.186 and 1.189

-version 1.186, 2004/04/07 10:02:11
+version 1.189, 2004/05/07 17:51:58
  Line 1872  sub make_new_child {
  		    } else {
  			Reply($client, "refused\n", $userinput);
  		    }
+ # --------------------------------------------------------- remove a user file
+ 		} elsif ($userinput =~ /^removeuserfile/) { # Client clear or enc.
+ 		    if(isClient) {
+ 			my ($cmd,$fname)=split(/:/,$userinput);
+ 			my ($udom,$uname,$ufile) = ($fname =~ m|^([^/]+)/([^/]+)/(.+)$|);
+ 			&logthis("$udom - $uname - $ufile");
+ 			if ($ufile =~m|/\.\./|) {
+ 			    # any files paths with /../ in them refuse
+                             # to deal with
+ 			    print $client "refused\n";
+ 			} else {
+ 			    my $udir=propath($udom,$uname);
+ 			    if (-e $udir) {
+ 				my $file=$udir.'/userfiles/'.$ufile;
+ 				if (-e $file) {
+ 				    unlink($file);
+ 				    if (-e $file) {
+ 					print $client "failed\n";
+ 				    } else {
+ 					print $client "ok\n";
+ 				    }
+ 				} else {
+ 				    print $client "not_found\n";
+ 				}
+ 			    } else {
+ 				print $client "not_home\n";
+ 			    }
+ 			}
+ 		    } else {
+ 			Reply($client, "refused\n", $userinput);
+ 		    }
  # ------------------------------------------ authenticate access to a user file
  		} elsif ($userinput =~ /^tokenauthuserfile/) { # Client only
  		    if(isClient) {
- Line 1897  sub make_new_child {
+ Line 1928  sub make_new_child {
  		    if(isClient) {
  			my ($cmd,$fname)=split(/:/,$userinput);
  			if (-e $fname) {
- 			    print $client &unsub($client,$fname,$clientip);
+ 			    print $client &unsub($fname,$clientip);
  			} else {
  			    print $client "not_found\n";
  			}
- Line 2592  sub make_new_child {
+ Line 2623  sub make_new_child {
  				    $qresult.=$key.'='.$descr.'&';
  				} else {
  				    my $unescapeVal = &unescape($descr);
- 				    if (eval('$unescapeVal=~/$description/i')) {
+ 				    if (eval('$unescapeVal=~/\Q$description\E/i')) {
  					$qresult.="$key=$descr&";
  				    }
  				}
- Line 3009  sub chatadd {
+ Line 3040  sub chatadd {
  sub unsub {
      my ($fname,$clientip)=@_;
      my $result;
+     my $unsubs = 0;		# Number of successful unsubscribes:
+     # An old way subscriptions were handled was to have a
+     # subscription marker file:
+     Debug("Attempting unlink of $fname.$clientname");
      if (unlink("$fname.$clientname")) {
- 	$result="ok\n";
+ 	$unsubs++;		# Successful unsub via marker file.
-     } else {
+     }
- 	$result="not_subscribed\n";
-     }
+     # The more modern way to do it is to have a subscription list
+     # file:
      if (-e "$fname.subscription") {
  	my $found=&addline($fname,$clientname,$clientip,'');
- 	if ($found) { $result="ok\n"; }
+ 	if ($found) {
+ 	    $unsubs++;
+ 	}
+     }
+     #  If either or both of these mechanisms succeeded in unsubscribing a
+     #  resource we can return ok:
+     if($unsubs) {
+ 	$result = "ok\n";
      } else {
- 	if ($result != "ok\n") { $result="not_subscribed\n"; }
+ 	$result = "not_subscribed\n";
      }
      return $result;
  }

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.186
changed lines
	Added in v.1.189