Diff for /loncom/interface/loncommon.pm between versions 1.1021 and 1.1022

version 1.1021, 2011/10/17 12:41:30 version 1.1022, 2011/10/24 19:36:06
Line 4590  Returns: HTML div with CSTR path and rec Line 4590  Returns: HTML div with CSTR path and rec
 sub CSTR_pageheader {  sub CSTR_pageheader {
     # this is for resources; directories have customtitle, and crumbs      # this is for resources; directories have customtitle, and crumbs
             # and select recent are created in lonpubdir.pm                # and select recent are created in lonpubdir.pm  
     my ($uname,$thisdisfn)=      my ($udom,$uname,$thisdisfn)=
         ($env{'request.filename'} =~ m|^/home/([^/]+)/public_html/(.*)|);          ($env{'request.filename'} =~ m|^/home/httpd/html/priv/([^/]+)/([^/]+)/(.*)$|);
     my $formaction='/priv/'.$uname.'/'.$thisdisfn;      my $formaction='/priv/'.$udom.'/'.$uname.'/'.$thisdisfn;
     $formaction=~s/\/+/\//g;      $formaction=~s/\/+/\//g;
   
     my $parentpath = '';      my $parentpath = '';
Line 8448  sub ask_for_embedded_content { Line 8448  sub ask_for_embedded_content {
         $getpropath = 1;          $getpropath = 1;
     } elsif (($actionurl eq '/adm/upload') || ($actionurl eq '/adm/testbank') ||      } elsif (($actionurl eq '/adm/upload') || ($actionurl eq '/adm/testbank') ||
              ($actionurl eq '/adm/imsimport')) {                ($actionurl eq '/adm/imsimport')) { 
         ($uname,my $rest) = ($args->{'current_path'} =~ m{/priv/($match_username)/?(.*)$});          my ($udom,$uname,$rest) = ($args->{'current_path'} =~ m{/priv/($match_domain)/($match_username)/?(.*)$});
         $url = '/home/'.$uname.'/public_html/';          $url = '/home/httpd/html/priv/'.$udom.'/'.$uname.'/';
         $toplevel = $url;          $toplevel = $url;
         if ($rest ne '') {          if ($rest ne '') {
             $url .= $rest;              $url .= $rest;

Removed from v.1.1021  
changed lines
  Added in v.1.1022


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