version 1.109, 2008/07/29 10:06:27
|
version 1.110.2.1, 2008/12/21 04:36:58
|
Line 156 sub getEffectiveUrl {
|
Line 156 sub getEffectiveUrl {
|
# Replace the ~username of the URL with /home/username/public_html |
# Replace the ~username of the URL with /home/username/public_html |
# so that we don't have to worry about ~ expansion internally. |
# so that we don't have to worry about ~ expansion internally. |
# |
# |
$fn=~s/^http\:\/\/[^\/]+\///; |
$fn=~s/^https?\:\/\/[^\/]+\///; |
$fn=~s/^\///; |
$fn=~s/^\///; |
$fn=~s{~($LONCAPA::username_re)}{/home/$1/public_html}; |
$fn=~s{~($LONCAPA::username_re)}{/home/$1/public_html}; |
|
|
Line 656 sub putresource {
|
Line 656 sub putresource {
|
} |
} |
|
|
$title.="\n".'<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'. |
$title.="\n".'<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'. |
($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" alt="bomb" />':'Edit Metadata').'</a>'; |
($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" alt="'.&mt('bomb').'" />':&mt('Edit Metadata')).'</a>'; |
|
|
if (!$meta_same) { |
if (!$meta_same) { |
$title = &mt('Metadata Modified').'<br />'.$title. |
$title = &mt('Metadata Modified').'<br />'.$title. |