version 1.619, 2017/01/24 15:52:58
|
version 1.626, 2017/05/08 14:20:20
|
Line 654 sub group_import {
|
Line 654 sub group_import {
|
} |
} |
} |
} |
if ($url) { |
if ($url) { |
if ($url =~ m{^(/adm/$coursedom/$coursenum/(\d+)/exttool)s?\:?(.*)$}) { |
if ($url =~ m{^(/adm/$coursedom/$coursenum/(\d+)/ext\.tool)\:?(.*)$}) { |
$url = $1; |
$url = $1; |
my $marker = $2; |
my $marker = $2; |
my $info = $3; |
my $info = $3; |
my ($toolid,%toolhash,%toolsettings); |
my ($toolid,%toolhash,%toolsettings); |
|
my @extras = ('linktext','explanation','crslabel','crstitle'); |
my @toolinfo = split(/:/,$info); |
my @toolinfo = split(/:/,$info); |
if ($residx) { |
if ($residx) { |
%toolsettings=&Apache::lonnet::dump('exttool_'.$marker,$coursedom,$coursenum); |
%toolsettings=&Apache::lonnet::dump('exttool_'.$marker,$coursedom,$coursenum); |
Line 668 sub group_import {
|
Line 669 sub group_import {
|
} |
} |
$toolid =~ s/\D//g; |
$toolid =~ s/\D//g; |
($toolhash{'target'},$toolhash{'width'},$toolhash{'height'}, |
($toolhash{'target'},$toolhash{'width'},$toolhash{'height'}, |
|
$toolhash{'linktext'},$toolhash{'explanation'}, |
$toolhash{'crslabel'},$toolhash{'crstitle'}) = @toolinfo; |
$toolhash{'crslabel'},$toolhash{'crstitle'}) = @toolinfo; |
$toolhash{'crslabel'} = &unescape($toolhash{'crslabel'}); |
foreach my $item (@extras) { |
$toolhash{'crstitle'} = &unescape($toolhash{'crstitle'}); |
$toolhash{$item} = &unescape($toolhash{$item}); |
|
} |
if (ref($ltitoolsref) eq 'HASH') { |
if (ref($ltitoolsref) eq 'HASH') { |
my @deleted; |
my @deleted; |
if (ref($ltitoolsref->{$toolid}) eq 'HASH') { |
if (ref($ltitoolsref->{$toolid}) eq 'HASH') { |
if ($ltitoolsref->{$toolid}->{'url'} =~ m{^https://}) { |
|
$url =~ s/exttool$/exttools/; |
|
} |
|
$toolhash{'id'} = $toolid; |
$toolhash{'id'} = $toolid; |
if (($toolhash{'target'} eq 'iframe') || ($toolhash{'target'} eq 'window')) { |
if (($toolhash{'target'} eq 'iframe') || ($toolhash{'target'} eq 'window')) { |
if ($toolhash{'target'} eq 'window') { |
if ($toolhash{'target'} eq 'window') { |
foreach my $item ('width','height') { |
foreach my $item ('width','height') { |
$toolhash{$item} =~ s/^\s+//; |
$toolhash{$item} =~ s/^\s+//; |
$toolhash{$item} =~ s/\s+$//; |
$toolhash{$item} =~ s/\s+$//; |
|
if ($toolhash{$item} =~ /\D/) { |
|
delete($toolhash{$item}); |
|
if ($residx) { |
|
if ($toolsettings{$item}) { |
|
push(@deleted,$item); |
|
} |
|
} |
|
} |
} |
} |
} |
} |
} elsif ($residx) { |
} elsif ($residx) { |
$toolhash{'target'} = $toolsettings{'target'}; |
$toolhash{'target'} = $toolsettings{'target'}; |
if ($toolhash{'target'} eq 'window') { |
if ($toolhash{'target'} eq 'window') { |
$toolhash{'width'} = $toolsettings{'width'}; |
foreach my $item ('width','height') { |
$toolhash{'height'} = $toolsettings{'height'}; |
$toolhash{$item} = $toolsettings{$item}; |
|
} |
} |
} |
} elsif (ref($ltitoolsref->{$toolid}->{'display'}) eq 'HASH') { |
} elsif (ref($ltitoolsref->{$toolid}->{'display'}) eq 'HASH') { |
$toolhash{'target'} = $ltitoolsref->{$toolid}->{'display'}->{'target'}; |
$toolhash{'target'} = $ltitoolsref->{$toolid}->{'display'}->{'target'}; |
Line 699 sub group_import {
|
Line 708 sub group_import {
|
} |
} |
} |
} |
if ($toolhash{'target'} eq 'iframe') { |
if ($toolhash{'target'} eq 'iframe') { |
delete($toolhash{'width'}); |
foreach my $item ('width','height','linktext','explanation') { |
delete($toolhash{'height'}); |
delete($toolhash{$item}); |
if ($residx) { |
if ($residx) { |
if ($toolsettings{'width'}) { |
if ($toolsettings{$item}) { |
push(@deleted,'width'); |
push(@deleted,$item); |
} |
} |
if ($toolsettings{'height'}) { |
|
push(@deleted,'height'); |
|
} |
} |
} |
} |
} |
} |
if (ref($ltitoolsref->{$toolid}->{'crsconf'}) eq 'HASH') { |
if (ref($ltitoolsref->{$toolid}->{'crsconf'}) eq 'HASH') { |
foreach my $item ('label','title') { |
foreach my $item ('label','title','linktext','explanation') { |
|
my $crsitem; |
|
if (($item eq 'label') || ($item eq 'title')) { |
|
$crsitem = 'crs'.$item; |
|
} else { |
|
$crsitem = $item; |
|
} |
if ($ltitoolsref->{$toolid}->{'crsconf'}->{$item}) { |
if ($ltitoolsref->{$toolid}->{'crsconf'}->{$item}) { |
$toolhash{'crs'.$item} =~ s/^\s+//; |
$toolhash{$crsitem} =~ s/^\s+//; |
$toolhash{'crs'.$item} =~ s/\s+$//; |
$toolhash{$crsitem} =~ s/\s+$//; |
if ($toolhash{'crs'.$item} eq '') { |
if ($toolhash{$crsitem} eq '') { |
delete($toolhash{'crs'.$item}); |
delete($toolhash{$crsitem}); |
} |
} |
} else { |
} else { |
delete($toolhash{'crs'.$item}); |
delete($toolhash{$crsitem}); |
} |
} |
if (($residx) && (exists($toolsettings{'crs'.$item}))) { |
if (($residx) && (exists($toolsettings{$crsitem}))) { |
unless (exists($toolhash{'crs'.$item})) { |
unless (exists($toolhash{$crsitem})) { |
push(@deleted,'crs'.$item); |
push(@deleted,$crsitem); |
} |
} |
} |
} |
} |
} |
Line 920 sub docs_change_log {
|
Line 933 sub docs_change_log {
|
'// <![CDATA['."\n". |
'// <![CDATA['."\n". |
&Apache::loncommon::display_filter_js('docslog')."\n". |
&Apache::loncommon::display_filter_js('docslog')."\n". |
&editing_js($env{'user.domain'},$env{'user.name'},$supplementalflag, |
&editing_js($env{'user.domain'},$env{'user.name'},$supplementalflag, |
$coursedom,$coursenum,'','',$canedit,\$navmap)."\n". |
$coursedom,$coursenum,'','',$canedit,'',\$navmap)."\n". |
&history_tab_js()."\n". |
&history_tab_js()."\n". |
&Apache::lonratedt::editscript('simple')."\n". |
&Apache::lonratedt::editscript('simple')."\n". |
'// ]]>'."\n". |
'// ]]>'."\n". |
Line 1279 sub print_paste_buffer {
|
Line 1292 sub print_paste_buffer {
|
my $extension = (split(/\./,$env{'docs.markedcopy_url_'.$suffix}))[-1]; |
my $extension = (split(/\./,$env{'docs.markedcopy_url_'.$suffix}))[-1]; |
if ($url =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?::|:))//} ) { |
if ($url =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?::|:))//} ) { |
$is_external = 1; |
$is_external = 1; |
} elsif ($url =~ m{^/adm/$match_domain/$match_courseid/\d+/exttools?$}) { |
} elsif ($url =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$}) { |
$is_exttool = 1; |
$is_exttool = 1; |
} |
} |
if ($folder =~ /^supplemental/) { |
if ($folder =~ /^supplemental/) { |
Line 1490 sub supp_pasteable {
|
Line 1503 sub supp_pasteable {
|
($url =~ m{^/uploaded/$match_domain/$match_courseid/(docs|supplemental)/(default|\d+)/\d+/}) || |
($url =~ m{^/uploaded/$match_domain/$match_courseid/(docs|supplemental)/(default|\d+)/\d+/}) || |
($url =~ m{^/adm/$match_domain/$match_username/aboutme}) || |
($url =~ m{^/adm/$match_domain/$match_username/aboutme}) || |
($url =~ m{^/public/$match_domain/$match_courseid/syllabus}) || |
($url =~ m{^/public/$match_domain/$match_courseid/syllabus}) || |
($url =~ m{^/adm/$match_domain/$match_courseid/\d+/exttools?$})) { |
($url =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$})) { |
return 1; |
return 1; |
} |
} |
return; |
return; |
Line 3009 sub handle_edit_cmd {
|
Line 3022 sub handle_edit_cmd {
|
sub editor { |
sub editor { |
my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype, |
my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype, |
$supplementalflag,$orderhash,$iconpath,$pathitem,$ltitoolsref, |
$supplementalflag,$orderhash,$iconpath,$pathitem,$ltitoolsref, |
$canedit,$navmapref,$hiddentop)=@_; |
$canedit,$hostname,$navmapref,$hiddentop)=@_; |
my ($randompick,$ishidden,$isencrypted,$plain,$is_random_order,$container); |
my ($randompick,$ishidden,$isencrypted,$plain,$is_random_order,$container); |
if ($allowed) { |
if ($allowed) { |
(my $breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain, |
(my $breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain, |
Line 3220 sub editor {
|
Line 3233 sub editor {
|
} else { |
} else { |
return $errortxt; |
return $errortxt; |
} |
} |
} elsif ($url =~ m{^/adm/$coursedom/$coursenum/new/exttool}) { |
} elsif ($url =~ m{^/adm/$coursedom/$coursenum/new/ext\.tool}) { |
my ($suffix,$errortxt,$locknotfreed) = |
my ($suffix,$errortxt,$locknotfreed) = |
&new_timebased_suffix($coursedom,$coursenum,'exttool'); |
&new_timebased_suffix($coursedom,$coursenum,'exttool'); |
if ($locknotfreed) { |
if ($locknotfreed) { |
Line 3339 sub editor {
|
Line 3352 sub editor {
|
$output .= &entryline($idx,$name,$url,$folder,$allowed,$res, |
$output .= &entryline($idx,$name,$url,$folder,$allowed,$res, |
$coursenum,$coursedom,$crstype, |
$coursenum,$coursedom,$crstype, |
$pathitem,$supplementalflag,$container, |
$pathitem,$supplementalflag,$container, |
\%filters,\%curr_groups,$ltitoolsref,$canedit,$isencrypted,$navmapref); |
\%filters,\%curr_groups,$ltitoolsref,$canedit, |
|
$isencrypted,$navmapref,$hostname); |
$idx++; |
$idx++; |
$shown++; |
$shown++; |
} |
} |
Line 3720 sub is_supplemental_title {
|
Line 3734 sub is_supplemental_title {
|
sub entryline { |
sub entryline { |
my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom, |
my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom, |
$crstype,$pathitem,$supplementalflag,$container,$filtersref,$currgroups, |
$crstype,$pathitem,$supplementalflag,$container,$filtersref,$currgroups, |
$ltitoolsref,$canedit,$isencrypted,$navmapref)=@_; |
$ltitoolsref,$canedit,$isencrypted,$navmapref,$hostname)=@_; |
my ($foldertitle,$renametitle,$oldtitle); |
my ($foldertitle,$renametitle,$oldtitle); |
if (&is_supplemental_title($title)) { |
if (&is_supplemental_title($title)) { |
($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title); |
($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title); |
Line 3837 END
|
Line 3851 END
|
|/aboutme$ |
|/aboutme$ |
|/navmaps$ |
|/navmaps$ |
|/bulletinboard$ |
|/bulletinboard$ |
|/exttools?$ |
|/ext\.tool$ |
|\.html$)}x) |
|\.html$)}x) |
|| $isexternal) { |
|| $isexternal) { |
$skip_confirm = 1; |
$skip_confirm = 1; |
Line 3969 END
|
Line 3983 END
|
} |
} |
} |
} |
|
|
my ($editlink,$extresform,$anchor,$hiddenres); |
my ($editlink,$extresform,$anchor,$hiddenres,$nomodal); |
my $orig_url = $url; |
my $orig_url = $url; |
$orig_url=~s{http(:|:)//https(:|:)//}{https$2//}; |
$orig_url=~s{http(:|:)//https(:|:)//}{https$2//}; |
$url=~s{^http(|s)(:|:)//}{/adm/wrapper/ext/}; |
$url=~s{^http(|s)(:|:)//}{/adm/wrapper/ext/}; |
Line 3987 END
|
Line 4001 END
|
} elsif ($url!~/\.(sequence|page)$/) { |
} elsif ($url!~/\.(sequence|page)$/) { |
$url='/adm/coursedocs/showdoc'.$url; |
$url='/adm/coursedocs/showdoc'.$url; |
} |
} |
} elsif ($url=~m|^/ext/|) { |
} elsif ($url=~m{^(|/adm/wrapper)/ext/([^#]+)}) { |
$url='/adm/wrapper'.$url; |
my $wrapped = $1; |
} elsif ($url=~m{^/adm/$coursedom/$coursenum/\d+/exttools?$}) { |
my $exturl = $2; |
|
if ($wrapped eq '') { |
|
$url='/adm/wrapper'.$url; |
|
} |
|
if (($ENV{'SERVER_PORT'} == 443) && ($exturl !~ /^https:/)) { |
|
$nomodal = 1; |
|
} |
|
} elsif ($url=~m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) { |
$url='/adm/wrapper'.$url; |
$url='/adm/wrapper'.$url; |
|
} elsif ($url eq "/public/$coursedom/$coursenum/syllabus") { |
|
if (($ENV{'SERVER_PORT'} == 443) && |
|
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { |
|
$url .= '?usehttp=1'; |
|
$nomodal = 1; |
|
} |
} |
} |
if (&Apache::lonnet::symbverify($symb,$url)) { |
if (&Apache::lonnet::symbverify($symb,$url)) { |
my $shownsymb = $symb; |
my $shownsymb = $symb; |
Line 4020 END
|
Line 4047 END
|
if (((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) || |
if (((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) || |
$isencrypted || (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i)) { |
$isencrypted || (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i)) { |
$checkencrypt = 1; |
$checkencrypt = 1; |
} else { |
} elsif (ref($navmapref)) { |
unless (ref($$navmapref)) { |
unless (ref($$navmapref)) { |
$$navmapref = Apache::lonnavmaps::navmap->new(); |
$$navmapref = Apache::lonnavmaps::navmap->new(); |
} |
} |
Line 4048 END
|
Line 4075 END
|
$url=''; |
$url=''; |
} |
} |
} |
} |
} elsif ($supplementalflag) { |
} elsif ($supplementalflag) { |
if ($isexternal) { |
if ($isexternal) { |
if ($url =~ /^([^#]+)#([^#]+)$/) { |
if ($url =~ /^([^#]+)#([^#]+)$/) { |
$url = $1; |
$url = $1; |
$anchor = $2; |
$anchor = $2; |
|
if (($url =~ m{^(|/adm/wrapper)/ext/(?!https:)}) && ($ENV{'SERVER_PORT'} == 443)) { |
|
if ($hostname ne '') { |
|
$url = 'http://'.$hostname.$url; |
|
} |
|
$nomodal = 1; |
|
} |
|
} |
|
} elsif ($url =~ m{^\Q/public/$coursedom/$coursenum/syllabus\E}) { |
|
if (($ENV{'SERVER_PORT'} == 443) && |
|
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { |
|
if ($hostname ne '') { |
|
$url = 'http://'.$hostname.$url; |
|
} |
|
$url .= (($url =~ /\?/) ? '&':'?').'usehttp=1'; |
|
$nomodal = 1; |
} |
} |
} |
} |
} |
} |
Line 4075 END
|
Line 4117 END
|
my $encryptmap = ((&LONCAPA::map::getparameter($orderidx, |
my $encryptmap = ((&LONCAPA::map::getparameter($orderidx, |
'parameter_encrypturl'))[0]=~/^yes$/i); |
'parameter_encrypturl'))[0]=~/^yes$/i); |
unless ($hiddenmap) { |
unless ($hiddenmap) { |
unless (ref($$navmapref)) { |
if (ref($navmapref)) { |
$$navmapref = Apache::lonnavmaps::navmap->new(); |
unless (ref($$navmapref)) { |
} |
$$navmapref = Apache::lonnavmaps::navmap->new(); |
if (ref($$navmapref)) { |
} |
if (lc($$navmapref->get_mapparam(undef,$folderurl,"0.hiddenresource")) eq 'yes') { |
if (ref($$navmapref)) { |
my @resources = $$navmapref->retrieveResources($folderurl,$filterFunc,1,1); |
if (lc($$navmapref->get_mapparam(undef,$folderurl,"0.hiddenresource")) eq 'yes') { |
unless (@resources) { |
my @resources = $$navmapref->retrieveResources($folderurl,$filterFunc,1,1); |
$hiddenmap = 1; |
unless (@resources) { |
unless ($env{'request.role.adv'}) { |
$hiddenmap = 1; |
$url = ''; |
unless ($env{'request.role.adv'}) { |
$hiddenfolder = 1; |
$url = ''; |
|
$hiddenfolder = 1; |
|
} |
} |
} |
} |
} |
} |
} |
} |
} |
} |
} |
unless ($encryptmap) { |
unless ($encryptmap) { |
if (lc($$navmapref->get_mapparam(undef,$folderurl,"0.encrypturl")) eq 'yes') { |
if ((ref($navmapref)) && (ref($$navmapref))) { |
$encryptmap = 1; |
if (lc($$navmapref->get_mapparam(undef,$folderurl,"0.encrypturl")) eq 'yes') { |
|
$encryptmap = 1; |
|
} |
} |
} |
} |
} |
|
|
Line 4139 $form_end;
|
Line 4185 $form_end;
|
} |
} |
} elsif ($supplementalflag && !$allowed) { |
} elsif ($supplementalflag && !$allowed) { |
my $isexttool; |
my $isexttool; |
if ($url=~m{^/adm/$coursedom/$coursenum/\d+/exttools?$}) { |
if ($url=~m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) { |
$url='/adm/wrapper'.$url; |
$url='/adm/wrapper'.$url; |
$isexttool = 1; |
$isexttool = 1; |
} |
} |
Line 4164 $form_end;
|
Line 4210 $form_end;
|
&Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem, |
&Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem, |
undef,undef,undef,undef,undef,undef, |
undef,undef,undef,undef,undef,undef, |
undef,$disabled); |
undef,$disabled); |
} elsif ($orig_url =~ m{^/adm/$coursedom/$coursenum/\d+/exttools?$}) { |
} elsif ($orig_url =~ m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) { |
($editlink,$extresform) = |
($editlink,$extresform) = |
&Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem, |
&Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem, |
undef,undef,undef,'tool',$coursedom, |
undef,undef,undef,'tool',$coursedom, |
Line 4183 $form_end;
|
Line 4229 $form_end;
|
$forceedit, |
$forceedit, |
undef,$symb, |
undef,$symb, |
&escape($env{'form.folderpath'}), |
&escape($env{'form.folderpath'}), |
$renametitle,'','',1,$suppanchor); |
$renametitle,$hostname, |
|
'','',1,$suppanchor); |
if ($jscall) { |
if ($jscall) { |
$editlink = '<a class="LC_docs_ext_edit" href="javascript:'. |
$editlink = '<a class="LC_docs_ext_edit" href="javascript:'. |
$jscall.'" >'.&mt('Edit').'</a> '."\n"; |
$jscall.'" >'.&mt('Edit').'</a> '."\n"; |
Line 4200 $form_end;
|
Line 4247 $form_end;
|
$reinit = &mt('(re-initialize course to access)'); |
$reinit = &mt('(re-initialize course to access)'); |
} |
} |
$line.='<td class="LC_docs_entry_commands"'.$tdalign.'><span class="LC_nobreak">'.$editlink.$renamelink; |
$line.='<td class="LC_docs_entry_commands"'.$tdalign.'><span class="LC_nobreak">'.$editlink.$renamelink; |
|
my $link; |
if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) { |
if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) { |
$line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>'; |
$line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>'; |
} elsif ($url) { |
} elsif ($url) { |
Line 4210 $form_end;
|
Line 4258 $form_end;
|
$anchor = '#'.&HTML::Entities::encode($anchor,'"<>&'); |
$anchor = '#'.&HTML::Entities::encode($anchor,'"<>&'); |
} |
} |
} |
} |
$line.=&Apache::loncommon::modal_link(&js_escape($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes'. |
if ((!$supplementalflag) && ($nomodal) && ($hostname ne '')) { |
(($anchor ne '')?$anchor:'')), |
$link = 'http://'.$hostname.$url; |
'<img src="'.$icon.'" alt="" class="LC_icon" />',600,500); |
} else { |
|
$link = $url; |
|
} |
|
$link = &js_escape($link.(($url=~/\?/)?'&':'?').'inhibitmenu=yes'. |
|
(($anchor ne '')?$anchor:'')); |
|
if ($nomodal) { |
|
$line.='<a href="#" onclick="javascript:window.open('."'$link','syllabuspreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1')".'; return false;" />'. |
|
'<img src="'.$icon.'" alt="" class="LC_icon" border="0" /></a>'; |
|
} else { |
|
$line.=&Apache::loncommon::modal_link($link, |
|
'<img src="'.$icon.'" alt="" class="LC_icon" />',600,500); |
|
} |
} else { |
} else { |
$line.='<img src="'.$icon.'" alt="" class="LC_icon" />'; |
$line.='<img src="'.$icon.'" alt="" class="LC_icon" />'; |
} |
} |
Line 4220 $form_end;
|
Line 4279 $form_end;
|
if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) { |
if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) { |
$line.='<a href="'.$url.'">'.$title.'</a>'; |
$line.='<a href="'.$url.'">'.$title.'</a>'; |
} elsif ($url) { |
} elsif ($url) { |
$line.=&Apache::loncommon::modal_link(&js_escape($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes'. |
if ($nomodal) { |
(($anchor ne '')?$anchor:'')), |
$line.='<a href="#" onclick="javascript:window.open('."'$link','syllabuspreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1')".'; return false;" />'. |
$title,600,500); |
$title.'</a>'; |
|
} else { |
|
$line.=&Apache::loncommon::modal_link($link,$title,600,500); |
|
} |
} elsif (($hiddenfolder) || ($hiddenres)) { |
} elsif (($hiddenfolder) || ($hiddenres)) { |
$line.=$title.' <span class="LC_warning LC_docs_reinit_warn">'.&mt('(Hidden)').'</span>'; |
$line.=$title.' <span class="LC_warning LC_docs_reinit_warn">'.&mt('(Hidden)').'</span>'; |
} else { |
} else { |
Line 4363 sub new_timebased_suffix {
|
Line 4425 sub new_timebased_suffix {
|
$errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new folder/page.'); |
$errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new folder/page.'); |
} elsif ($type eq 'smppg') { |
} elsif ($type eq 'smppg') { |
$errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new simple page.'); |
$errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new simple page.'); |
|
} elsif ($type eq 'exttool') { |
|
$errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new external tool.'); |
} else { |
} else { |
$errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new discussion board.'); |
$errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new discussion board.'); |
} |
} |
Line 4391 sub new_timebased_suffix {
|
Line 4455 sub new_timebased_suffix {
|
} elsif ($type eq 'smppg') { |
} elsif ($type eq 'smppg') { |
$locknotfreed .= |
$locknotfreed .= |
&mt('This will prevent creation of additional simple pages in this course.'); |
&mt('This will prevent creation of additional simple pages in this course.'); |
|
} elsif ($type eq 'exttool') { |
|
$locknotfreed .= |
|
&mt('This will prevent creation of additional external tools in this course.'); |
} else { |
} else { |
$locknotfreed .= |
$locknotfreed .= |
&mt('This will prevent creation of additional discussion boards in this course.'); |
&mt('This will prevent creation of additional discussion boards in this course.'); |
Line 5343 sub handler {
|
Line 5410 sub handler {
|
my $tabidstr = join("','",@tabids); |
my $tabidstr = join("','",@tabids); |
%ltitools = &Apache::lonnet::get_domain_ltitools($coursedom); |
%ltitools = &Apache::lonnet::get_domain_ltitools($coursedom); |
my $posslti = keys(%ltitools); |
my $posslti = keys(%ltitools); |
|
my $hostname = $r->hostname(); |
$script .= &editing_js($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti, |
$script .= &editing_js($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti, |
$londocroot,$canedit,\$navmap). |
$londocroot,$canedit,$hostname,\$navmap). |
&history_tab_js(). |
&history_tab_js(). |
&inject_data_js(). |
&inject_data_js(). |
&Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr,$tid). |
&Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr,$tid). |
Line 5746 HIDDENFORM
|
Line 5814 HIDDENFORM
|
} |
} |
|
|
# |
# |
|
my $hostname = $r->hostname(); |
my $savefolderpath; |
my $savefolderpath; |
|
|
if ($allowed) { |
if ($allowed) { |
Line 6216 unless ($container eq 'page') {
|
Line 6284 unless ($container eq 'page') {
|
unless (($supplementalflag || $toolsflag)) { |
unless (($supplementalflag || $toolsflag)) { |
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, |
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, |
$supplementalflag,\%orderhash,$iconpath,$pathitem, |
$supplementalflag,\%orderhash,$iconpath,$pathitem, |
\%ltitools,$canedit,\$navmap,$hiddentop); |
\%ltitools,$canedit,$hostname,\$navmap,$hiddentop); |
undef($navmap); |
undef($navmap); |
if ($error) { |
if ($error) { |
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
Line 6365 my %suporderhash = (
|
Line 6433 my %suporderhash = (
|
if ($supplementalflag) { |
if ($supplementalflag) { |
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, |
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, |
$supplementalflag,\%suporderhash,$iconpath,$pathitem, |
$supplementalflag,\%suporderhash,$iconpath,$pathitem, |
\%ltitools,$canedit); |
\%ltitools,$canedit,$hostname); |
if ($error) { |
if ($error) { |
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
} else { |
} else { |
Line 6385 my %suporderhash = (
|
Line 6453 my %suporderhash = (
|
} |
} |
} elsif ($supplementalflag) { |
} elsif ($supplementalflag) { |
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, |
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, |
$supplementalflag,'',$iconpath,$pathitem); |
$supplementalflag,'',$iconpath,$pathitem,'','',$hostname); |
if ($error) { |
if ($error) { |
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
} |
} |
Line 6759 END
|
Line 6827 END
|
} |
} |
|
|
sub editing_js { |
sub editing_js { |
my ($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti,$londocroot,$canedit,$navmapref) = @_; |
my ($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti, |
|
$londocroot,$canedit,$hostname,$navmapref) = @_; |
my %js_lt = &Apache::lonlocal::texthash( |
my %js_lt = &Apache::lonlocal::texthash( |
p_mnf => 'Name of New Folder', |
p_mnf => 'Name of New Folder', |
t_mnf => 'New Folder', |
t_mnf => 'New Folder', |
Line 6836 sub editing_js {
|
Line 6905 sub editing_js {
|
} |
} |
$backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($url),'<>&"').'?symb='. |
$backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($url),'<>&"').'?symb='. |
&HTML::Entities::encode($caller,'<>&"'); |
&HTML::Entities::encode($caller,'<>&"'); |
|
if ($backtourl =~ m{^\Q/public/$coursedom/$coursenum/syllabus\E}) { |
|
if (($ENV{'SERVER_PORT'} == 443) && |
|
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { |
|
if ($hostname ne '') { |
|
$backtourl = 'http://'.$hostname.$backtourl; |
|
} |
|
$backtourl .= (($backtourl =~ /\?/) ? '&':'?').'usehttp=1'; |
|
} |
|
} elsif ($backtourl =~ m{^/adm/wrapper/ext/(?!https:)}) { |
|
if (($ENV{'SERVER_PORT'} == 443) && ($hostname ne '')) { |
|
$backtourl = 'http://'.$hostname.$backtourl; |
|
} |
|
} |
if ($anchor ne '') { |
if ($anchor ne '') { |
$backtourl .= '#'.&HTML::Entities::encode($anchor,'<>&"'); |
$backtourl .= '#'.&HTML::Entities::encode($anchor,'<>&"'); |
} |
} |