version 1.286, 2007/07/04 00:21:42
|
version 1.287, 2007/07/07 00:53:24
|
Line 908 sub group_import {
|
Line 908 sub group_import {
|
my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_; |
my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_; |
|
|
while (@files) { |
while (@files) { |
my $name = shift(@files); |
my ($name, $url, $residx) = @{ shift(@files) }; |
my $url = shift(@files); |
|
#FIXME check if file exists before overwriting, might be restoring it |
|
if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) |
if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) |
&& ($caller eq 'londocs') |
&& ($caller eq 'londocs') |
&& (!&Apache::lonnet::stat_file($url))) { |
&& (!&Apache::lonnet::stat_file($url))) { |
Line 934 sub group_import {
|
Line 932 sub group_import {
|
} |
} |
} |
} |
if ($url) { |
if ($url) { |
my $idx = &LONCAPA::map::getresidx($url); |
if (!$residx) { |
$LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx; |
$residx = &LONCAPA::map::getresidx($url); |
|
$LONCAPA::map::order[$#LONCAPA::map::order+1]=$residx; |
|
} |
my $ext = 'false'; |
my $ext = 'false'; |
if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; } |
if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; } |
$url = &LONCAPA::map::qtunescape($url); |
$url = &LONCAPA::map::qtunescape($url); |
$name = &LONCAPA::map::qtunescape($name); |
$name = &LONCAPA::map::qtunescape($name); |
$LONCAPA::map::resources[$idx] = |
$LONCAPA::map::resources[$residx] = |
join ':', ($name, $url, $ext, 'normal', 'res'); |
join(':', ($name, $url, $ext, 'normal', 'res')); |
} |
} |
} |
} |
return &storemap($coursenum, $coursedom, $folder.'.'.$container); |
return &storemap($coursenum, $coursedom, $folder.'.'.$container); |
Line 1199 sub update_paste_buffer {
|
Line 1199 sub update_paste_buffer {
|
if (&is_supplemental_title($title)) { |
if (&is_supplemental_title($title)) { |
($title) = &parse_supplemental_title($title); |
($title) = &parse_supplemental_title($title); |
} |
} |
|
$url=~s{http(:|:)//https(:|:)//}{https$2//}; |
|
|
&Apache::lonnet::appenv('docs.markedcopy_title' => $title, |
&Apache::lonnet::appenv('docs.markedcopy_title' => $title, |
'docs.markedcopy_url' => $url); |
'docs.markedcopy_url' => $url); |
delete($env{'form.markcopy'}); |
delete($env{'form.markcopy'}); |
Line 1214 ENDPASTE
|
Line 1216 ENDPASTE
|
$r->print('<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> '); |
$r->print('<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> '); |
|
|
my $type; |
my $type; |
if ($env{'docs.markedcopy_url'} =~ m{^/adm/wrapper/ext}) { |
if ($env{'docs.markedcopy_url'} =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?::|:))//} ) { |
$type = &mt('External Resource'); |
$type = &mt('External Resource'); |
$r->print($type.': '.&Apache::map::qtescape($env{'docs.markedcopy_title'})); |
$r->print($type.': '. |
|
&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}).' ('. |
|
&LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')'); |
} else { |
} else { |
my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1]; |
my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1]; |
my $type = &Apache::loncommon::filedescription($extension); |
my $type = &Apache::loncommon::filedescription($extension); |
my $icon = '<img src="'.&Apache::loncommon::icon($extension). |
my $icon = '<img src="'.&Apache::loncommon::icon($extension). |
'" alt="" class="LC_icon" />'; |
'" alt="" class="LC_icon" />'; |
$r->print($icon.$type.': '. &parse_supplemental_title($env{'docs.markedcopy_title'})); |
$r->print($icon.$type.': '. &parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}))); |
} |
} |
if ($container eq 'page') { |
if ($container eq 'page') { |
$r->print(' |
$r->print(' |
Line 1344 sub editor {
|
Line 1348 sub editor {
|
|
|
if ($env{'form.pastemarked'}) { |
if ($env{'form.pastemarked'}) { |
# paste resource to end of list |
# paste resource to end of list |
my $url=$env{'docs.markedcopy_url'}; |
my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'}); |
my $title=$env{'docs.markedcopy_title'}; |
my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}); |
# Maps need to be copied first |
# Maps need to be copied first |
if (($url=~/\.(page|sequence)$/) || ($url=~/^\/uploaded\//)) { |
if (($url=~/\.(page|sequence)$/) || ($url=~/^\/uploaded\//)) { |
$title=&mt('Copy of').' '.$title; |
$title=&mt('Copy of').' '.$title; |
Line 1361 sub editor {
|
Line 1365 sub editor {
|
} |
} |
$title = &LONCAPA::map::qtunescape($title); |
$title = &LONCAPA::map::qtunescape($title); |
my $ext='false'; |
my $ext='false'; |
if ($url=~/^http\:\/\//) { $ext='true'; } |
if ($url=~m{^http(|s)://}) { $ext='true'; } |
$url = &LONCAPA::map::qtunescape($url); |
$url = &LONCAPA::map::qtunescape($url); |
# Now insert the URL at the bottom |
# Now insert the URL at the bottom |
my $newidx=&LONCAPA::map::getresidx($url); |
my $newidx=&LONCAPA::map::getresidx($url); |
Line 1435 sub editor {
|
Line 1439 sub editor {
|
# Group import/search |
# Group import/search |
if ($env{'form.importdetail'}) { |
if ($env{'form.importdetail'}) { |
my @imports; |
my @imports; |
# &Apache::lonnet::logthis("imp detail ".$env{'form.importdetail'}); |
|
foreach (split(/\&/,$env{'form.importdetail'})) { |
foreach (split(/\&/,$env{'form.importdetail'})) { |
if (defined($_)) { |
if (defined($_)) { |
my ($name,$url)=split(/\=/,$_); |
my ($name,$url,$residx)= |
$name=&unescape($name); |
map {&unescape($_)} split(/\=/,$_); |
$url=&unescape($url); |
push(@imports, [$name, $url, $residx]); |
push @imports, $name, $url; |
|
} |
} |
} |
} |
# Store the changed version |
# Store the changed version |
Line 1556 sub process_file_upload {
|
Line 1558 sub process_file_upload {
|
$parseaction,$allfiles, |
$parseaction,$allfiles, |
$codebase); |
$codebase); |
my $ext='false'; |
my $ext='false'; |
if ($url=~/^http\:\/\//) { $ext='true'; } |
if ($url=~m{^http://}) { $ext='true'; } |
$url = &LONCAPA::map::qtunescape($url); |
$url = &LONCAPA::map::qtunescape($url); |
my $comment=$env{'form.comment'}; |
my $comment=$env{'form.comment'}; |
$comment = &LONCAPA::map::qtunescape($comment); |
$comment = &LONCAPA::map::qtunescape($comment); |
Line 1856 END
|
Line 1858 END
|
&Apache::lonnet::allowuploaded('/adm/coursedoc',$url); |
&Apache::lonnet::allowuploaded('/adm/coursedoc',$url); |
} |
} |
} |
} |
$url=~s-^http(\&colon\;|:)//-/adm/wrapper/ext/-; |
|
|
my $orig_url = $url; |
|
my $external = ($url=~s{^http(|s)(:|:)//}{/adm/wrapper/ext/}); |
if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) { |
if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) { |
my $symb=&Apache::lonnet::symbclean( |
my $symb=&Apache::lonnet::symbclean( |
&Apache::lonnet::declutter('uploaded/'. |
&Apache::lonnet::declutter('uploaded/'. |
Line 1879 END
|
Line 1883 END
|
} |
} |
} elsif ($url=~m|^/ext/|) { |
} elsif ($url=~m|^/ext/|) { |
$url='/adm/wrapper'.$url; |
$url='/adm/wrapper'.$url; |
|
$external = 1; |
} |
} |
if (&Apache::lonnet::symbverify($symb,$url)) { |
if (&Apache::lonnet::symbverify($symb,$url)) { |
$url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb); |
$url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb); |
Line 1932 END
|
Line 1937 END
|
$url.='pagepath='.&escape($pagepath). |
$url.='pagepath='.&escape($pagepath). |
'&pagesymb='.&escape($symb).$cpinfo; |
'&pagesymb='.&escape($symb).$cpinfo; |
} |
} |
|
if ($external) { |
|
my $form = ($folder =~ /^default/)? 'newext' : 'supnewext'; |
|
$external = ' <a class="LC_docs_ext_edit" href="javascript:edittext(\''.$form.'\',\''.$residx.'\',\''.&escape($title).'\',\''.&escape($orig_url).'\');" >'.&mt('Edit').'</a>'; |
|
} else { |
|
undef($external); |
|
} |
$line.=' |
$line.=' |
<td class="LC_docs_entry_icon"> |
<td class="LC_docs_entry_icon"> |
<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a> |
'.($url?'<a href="'.$url.'">':'').'<img src="'.$icon.'" alt="" class="LC_icon" />'.($url?'</a>':'').' |
</td> |
</td> |
<td class="LC_docs_entry_title"> |
<td class="LC_docs_entry_title"> |
'.($url?"<a href=\"$url\">":'').$title.($url?'</a>':' <span class="LC_docs_reinit_warn">'.&mt('(re-initialize course to access)').'</span>')." |
'.($url?"<a href=\"$url\">":'').$title.($url?'</a>':' <span class="LC_docs_reinit_warn">'.&mt('(re-initialize course to access)').'</span>').$external." |
</td>"; |
</td>"; |
if (($allowed) && ($folder!~/^supplemental/)) { |
if (($allowed) && ($folder!~/^supplemental/)) { |
my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
Line 3068 ENDSUPFORM
|
Line 3079 ENDSUPFORM
|
} |
} |
$r->print('</table>'); |
$r->print('</table>'); |
if ($allowed) { |
if ($allowed) { |
$r->print('<form method="post" name="extimport" action="/adm/coursedocs"><input type="hidden" name="title" /><input type="hidden" name="url" /><input type="hidden" name="useform" /></form>'); |
$r->print(' |
|
<form method="post" name="extimport" action="/adm/coursedocs"> |
|
<input type="hidden" name="title" /> |
|
<input type="hidden" name="url" /> |
|
<input type="hidden" name="useform" /> |
|
<input type="hidden" name="residx" /> |
|
</form>'); |
} |
} |
} else { |
} else { |
unless ($upload_result eq 'phasetwo') { |
unless ($upload_result eq 'phasetwo') { |
Line 3108 function makenewpage(targetform,folderse
|
Line 3125 function makenewpage(targetform,folderse
|
|
|
function makenewext(targetname) { |
function makenewext(targetname) { |
this.document.forms.extimport.useform.value=targetname; |
this.document.forms.extimport.useform.value=targetname; |
|
this.document.forms.extimport.title.value=''; |
|
this.document.forms.extimport.url.value=''; |
|
this.document.forms.extimport.residx.value=''; |
|
window.open('/adm/rat/extpickframe.html'); |
|
} |
|
|
|
function edittext(targetname,residx,title,url) { |
|
this.document.forms.extimport.useform.value=targetname; |
|
this.document.forms.extimport.residx.value=residx; |
|
this.document.forms.extimport.url.value=url; |
|
this.document.forms.extimport.title.value=title; |
window.open('/adm/rat/extpickframe.html'); |
window.open('/adm/rat/extpickframe.html'); |
} |
} |
|
|
Line 3187 function finishpick() {
|
Line 3215 function finishpick() {
|
var title=this.document.forms.extimport.title.value; |
var title=this.document.forms.extimport.title.value; |
var url=this.document.forms.extimport.url.value; |
var url=this.document.forms.extimport.url.value; |
var form=this.document.forms.extimport.useform.value; |
var form=this.document.forms.extimport.useform.value; |
eval |
var residx=this.document.forms.extimport.residx.value; |
('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+ |
eval('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+'='+residx+'";this.document.forms.'+form+'.submit();'); |
'";this.document.forms.'+form+'.submit();'); |
|
} |
} |
|
|
function changename(folderpath,index,oldtitle,container,pagesymb) { |
function changename(folderpath,index,oldtitle,container,pagesymb) { |