[BACK]Return to lonnet.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / lonnet / perl

Diff for /loncom/lonnet/perl/lonnet.pm between versions 1.955 and 1.956

version 1.955, 2008/04/16 22:59:36 version 1.956, 2008/04/21 15:58:12
Line 6264  sub dirlist { Line 6264  sub dirlist {
     if($udom) {      if($udom) {
         if($uname) {          if($uname) {
             $listing = &reply('ls3:'.&escape('/'.$uri).':'.$getpropath.':'              $listing = &reply('ls3:'.&escape('/'.$uri).':'.$getpropath.':'
                               .$getuserdir.':'.&escape($alternateRoot)                                .$getuserdir.':'.&escape($dirRoot)
                               .':'.&escape($uname).':'.&escape($udom),                                .':'.&escape($uname).':'.&escape($udom),
                               &homeserver($uname,$udom));                                &homeserver($uname,$udom));
             if ($listing eq 'unknown_cmd') {              if ($listing eq 'unknown_cmd') {
Line 6371  sub stat_file { Line 6371  sub stat_file {
  # unable to handle the uri   # unable to handle the uri
  return ();   return ();
     }      }
       my $getpropath;
     my $getpropath = 1;      if ($file =~ /^userfiles\//) {
           $getpropath = 1;
       }
     my ($result) = &dirlist($file,$udom,$uname,$getpropath);      my ($result) = &dirlist($file,$udom,$uname,$getpropath);
     my @stats = split('&', $result);      my @stats = split('&', $result);
           
Line 8118  sub filelocation { Line 8120  sub filelocation {
     } elsif ($file=~m{^/home/$match_username/public_html/}) {      } elsif ($file=~m{^/home/$match_username/public_html/}) {
  # is a correct contruction space reference   # is a correct contruction space reference
         $location = $file;          $location = $file;
       } elsif ($file =~ m-^\Q$Apache::lonnet::perlvar{'lonTabDir'}\E/-) {
           $location = $file;
     } elsif ($file=~/^\/*(uploaded|editupload)/) { # is an uploaded file      } elsif ($file=~/^\/*(uploaded|editupload)/) { # is an uploaded file
         my ($udom,$uname,$filename)=          my ($udom,$uname,$filename)=
      ($file=~m -^/+(?:uploaded|editupload)/+($match_domain)/+($match_name)/+(.*)$-);       ($file=~m -^/+(?:uploaded|editupload)/+($match_domain)/+($match_name)/+(.*)$-);
Removed from v.1.955  
changed lines
  Added in v.1.956

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