Diff for /loncom/lond between versions 1.181 and 1.182

version 1.181, 2004/03/08 21:00:15 version 1.182, 2004/03/09 16:12:26
Line 1827  sub make_new_child { Line 1827  sub make_new_child {
 # -------------------------------------- fetch a user file from a remote server  # -------------------------------------- fetch a user file from a remote server
  } elsif ($userinput =~ /^fetchuserfile/) { # Client clear or enc.   } elsif ($userinput =~ /^fetchuserfile/) { # Client clear or enc.
     if(isClient) {      if(isClient) {
  my ($cmd,$fname)=split(/:/,$userinput);   my ($cmd,$fname,$fpath)=split(/:/,$userinput);
  my ($udom,$uname,$ufile)=split(/\//,$fname);   my ($udom,$uname,$ufile)=split(/\//,$fname);
  my $udir=propath($udom,$uname).'/userfiles';   my $udir=propath($udom,$uname).'/userfiles';
  unless (-e $udir) { mkdir($udir,0770); }   unless (-e $udir) { mkdir($udir,0770); }
  if (-e $udir) {   if (-e $udir) {
                               unless ($fpath eq '') {
                                   my $filepath = $udir;
                                   my @parts=split(/\//,$fpath);
                                   my $count;
                                   for ($count=0;$count<=$#parts;$count++) {
                                       $filepath .="/$parts[$count]";
                                       if ((-e $filepath)!=1) {
                                           mkdir($filepath,0770);
                                       }
                                   }
                               }
     $ufile=~s/^[\.\~]+//;      $ufile=~s/^[\.\~]+//;
     $ufile=~s/\///g;      $ufile=~s/\///g;
     my $destname=$udir.'/'.$ufile;      my $destname=$udir.'/'.$fpath.$ufile;
     my $transname=$udir.'/'.$ufile.'.in.transit';      my $transname=$udir.'/'.$fpath.$ufile.'.in.transit';
     my $remoteurl='http://'.$clientip.'/userfiles/'.$fname;      my $remoteurl='http://'.$clientip.'/userfiles/'.$udom.'/'.$uname.'/'.$fpath.$ufile;
     my $response;      my $response;
     {      {
  my $ua=new LWP::UserAgent;   my $ua=new LWP::UserAgent;
Line 1846  sub make_new_child { Line 1857  sub make_new_child {
     if ($response->is_error()) {      if ($response->is_error()) {
  unlink($transname);   unlink($transname);
  my $message=$response->status_line;   my $message=$response->status_line;
  &logthis("LWP GET: $message for $fname ($remoteurl)");   &logthis("LWP GET: $message for $fpath $fname ($remoteurl)");
  print $client "failed\n";   print $client "failed\n";
     } else {      } else {
  if (!rename($transname,$destname)) {   if (!rename($transname,$destname)) {

Removed from v.1.181  
changed lines
  Added in v.1.182


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