version 1.624, 2017/04/25 22:18:59
|
version 1.625, 2017/05/07 13:57:58
|
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+)/exttool)\:?(.*)$}) { |
$url = $1; |
$url = $1; |
my $marker = $2; |
my $marker = $2; |
my $info = $3; |
my $info = $3; |
Line 677 sub group_import {
|
Line 677 sub group_import {
|
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') { |
Line 1295 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+/exttool$}) { |
$is_exttool = 1; |
$is_exttool = 1; |
} |
} |
if ($folder =~ /^supplemental/) { |
if ($folder =~ /^supplemental/) { |
Line 1506 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+/exttool$})) { |
return 1; |
return 1; |
} |
} |
return; |
return; |
Line 3854 END
|
Line 3851 END
|
|/aboutme$ |
|/aboutme$ |
|/navmaps$ |
|/navmaps$ |
|/bulletinboard$ |
|/bulletinboard$ |
|/exttools?$ |
|/exttool$ |
|\.html$)}x) |
|\.html$)}x) |
|| $isexternal) { |
|| $isexternal) { |
$skip_confirm = 1; |
$skip_confirm = 1; |
Line 4013 END
|
Line 4010 END
|
if (($ENV{'SERVER_PORT'} == 443) && ($exturl !~ /^https:/)) { |
if (($ENV{'SERVER_PORT'} == 443) && ($exturl !~ /^https:/)) { |
$nomodal = 1; |
$nomodal = 1; |
} |
} |
} elsif ($url=~m{^/adm/$coursedom/$coursenum/\d+/exttools?$}) { |
} elsif ($url=~m{^/adm/$coursedom/$coursenum/\d+/exttool$}) { |
$url='/adm/wrapper'.$url; |
$url='/adm/wrapper'.$url; |
} elsif ($url eq "/public/$coursedom/$coursenum/syllabus") { |
} elsif ($url eq "/public/$coursedom/$coursenum/syllabus") { |
if (($ENV{'SERVER_PORT'} == 443) && |
if (($ENV{'SERVER_PORT'} == 443) && |
Line 4188 $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+/exttool$}) { |
$url='/adm/wrapper'.$url; |
$url='/adm/wrapper'.$url; |
$isexttool = 1; |
$isexttool = 1; |
} |
} |
Line 4213 $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+/exttool$}) { |
($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, |