--- loncom/interface/lonsyllabus.pm 2020/01/20 17:21:08 1.138.2.5.2.2
+++ loncom/interface/lonsyllabus.pm 2016/02/20 00:12:40 1.140
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.138.2.5.2.2 2020/01/20 17:21:08 raeburn Exp $
+# $Id: lonsyllabus.pm,v 1.140 2016/02/20 00:12:40 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -116,7 +116,7 @@ sub handler {
}
unless ($allowed && $forceedit) {
my $file=&Apache::lonnet::filelocation("",$item);
- if ($file =~ /\.(tex|x?html?)$/) {
+ if ($file =~ /\.(tex|x?html?)$/) {
my $filetype = $1;
my $filecontents=&Apache::lonnet::getfile($file);
if ($filecontents eq -1) {
@@ -168,30 +168,14 @@ sub handler {
&mt('Print the syllabus directly from your web browser').
'\end{document}');
} else {
- my $brcrum;
- if ($env{'form.folderpath'} =~ /^supplemental/) {
- my $title = $env{'form.title'};
- if ($title eq '') {
- $title = &mt('Syllabus');
- }
- $brcrum =
- &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
- }
- $r->print(&Apache::lonwrapper::wrapper($r,$item,$brcrum,$env{'request.use_absolute'},
- undef,$is_pdf,undef,'','',&mt('Syllabus')));
+ $r->print(&Apache::lonwrapper::wrapper($item,undef,$env{'request.use_absolute'},
+ undef,$is_pdf,undef,&mt('Syllabus')));
}
}
return OK;
}
} elsif ($external=~/\w/) {
unless ($allowed && $forceedit) {
- if (($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public') &&
- ($ENV{'SERVER_PORT'} == 443) && ($external =~ m{^http://}) && !($env{'form.usehttp'})) {
- unless (&Apache::lonnet::uses_sts()) {
- &redirect_to_http($r);
- return OK;
- }
- }
if ($target eq 'tex') {
$r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}).
' \strut \\\\ \textbf{'.&mt('Syllabus').'} \strut \\\\ '.$external.' '.
@@ -199,20 +183,12 @@ sub handler {
'\end{document}');
} else {
my $is_ext = 1;
- my ($is_pdf,$brcrum);
+ my $is_pdf;
if ($external =~ /\.pdf$/i) {
$is_pdf = 1;
}
- if ($env{'form.folderpath'} =~ /^supplemental/) {
- my $title = $env{'form.title'};
- if ($title eq '') {
- $title = &mt('Syllabus');
- }
- $brcrum =
- &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
- }
- $r->print(&Apache::lonwrapper::wrapper($r,$external,$brcrum,$env{'request.use_absolute'},
- $is_ext,$is_pdf,undef,'','',&mt('Syllabus')));
+ $r->print(&Apache::lonwrapper::wrapper($external,undef,$env{'request.use_absolute'},
+ $is_ext,$is_pdf,undef,&mt('Syllabus')));
}
return OK;
}
@@ -313,10 +289,9 @@ sub handler {
if ($allowed) {
#---------------------------------- Print External URL Syllabus Info if editing
if ($target ne 'tex') {
- my $hostname = &Apache::lonnet::hostname($homeserver);
my $protocol = $Apache::lonnet::protocol{$homeserver};
$protocol = 'http' if ($protocol ne 'https');
- my $link = $protocol.'://'.$hostname.$r->uri;
+ my $link = $protocol.'://'.&Apache::lonnet::hostname($homeserver).$r->uri;
$r->print(''
.''
.''
@@ -635,16 +610,11 @@ function toggleEditor(pick) {
var regexp = $urlregexp;
-function extUrlPreview(caller,protocol) {
+function extUrlPreview(caller) {
if (document.getElementById(caller)) {
var url = document.getElementById(caller).value;
if (regexp.test(url)) {
- var http_regex = /^http\:\/\//gi;
- if ((protocol == 'https') && (http_regex.test(url))) {
- window.open(url,"syllabuspreview","height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1");
- } else {
- openMyModal(url,500,400,'yes');
- }
+ openMyModal(url,500,400,'yes');
} else {
alert("$invurl");
}
@@ -752,7 +722,6 @@ ENDSCRIPT
if ($env{'form.only_body'}) {
$args->{'only_body'} = 1;
}
- $args->{'hostname'} = $r->hostname();
my $start_page =
&Apache::loncommon::start_page("Syllabus", $rss_link.$js,$args);
if ($start_page) {
@@ -833,7 +802,6 @@ sub chooser {
$checked{'templatebox'} = $check;
$display{'templatebox'} = 'block';
}
- my $protocol = ($ENV{'SERVER_PORT'} == 443?'https':'http');
my $output =
'
'."\n".
''."\n".
@@ -902,10 +870,9 @@ sub chooser {
sub syllabus_file_info {
my ($item,$cnum,$cdom,$lonhost,$context) = @_;
- my $hostname = &Apache::lonnet::hostname($lonhost);
my $protocol = $Apache::lonnet::protocol{$lonhost};
$protocol = 'http' if ($protocol ne 'https');
- my $absurl = $protocol.'://'.$hostname.$item;
+ my $absurl = $protocol.'://'.&Apache::lonnet::hostname($lonhost).$item;
my ($filename) = ($item =~ m{([^/]+)$});
my $file=&Apache::lonnet::filelocation("",$item);
my ($depbutton,$filetype,$editable);
@@ -1148,10 +1115,6 @@ sub save_changes {
(ref($courseenv) eq 'HASH')) {
return ($earlyout,$uploaded,$external,$minimal,$output);
}
- my ($was_ext,$is_ext,$putres);
- if ($external) {
- $was_ext = $external;
- }
if (($env{'form.deleteuploaded_file'}) || ($env{'form.deleteuploaded_minimal'})) {
my %storehash;
if (($env{'form.choice'} eq 'file') &&
@@ -1164,7 +1127,7 @@ sub save_changes {
&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.externalsyllabus');
$storehash{'uploadedsyllabus'} = '';
$storehash{'externalsyllabus'} = '';
- $putres = &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
+ my $putres = &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
undef($uploaded);
undef($external);
} elsif (($env{'form.choice'} eq 'minimal') &&
@@ -1184,7 +1147,7 @@ sub save_changes {
&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.minimalsyllabus');
$storehash{'externalsyllabus'} = '';
$storehash{'minimalsyllabus'} = '';
- $putres = &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
+ my $putres = &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
undef($external);
undef($minimal);
}
@@ -1274,7 +1237,7 @@ sub save_changes {
$syllabus->{'uploaded.domain'}=$env{'user.domain'};
$syllabus->{'uploaded.name'}=$env{'user.name'};
$syllabus->{'uploaded.lastmodified'} = $now;
- $putres = &Apache::lonnet::put('syllabus',$syllabus,$cdom,$cnum);
+ my $putres = &Apache::lonnet::put('syllabus',$syllabus,$cdom,$cnum);
if ($putres eq 'ok') {
($uploaded,$minimal,$external) =
&update_syllabus_env($cdom,$cnum,$courseenv,$env{'form.choice'},$uploaded,
@@ -1299,7 +1262,7 @@ sub save_changes {
} else {
$external=$env{'form.externalsyllabus'};
$external =~ s/(`)//g;
- $putres =
+ my $putres =
&Apache::lonnet::put('environment',{externalsyllabus=>$external},
$cdom,$cnum);
if ($putres eq 'ok') {
@@ -1315,7 +1278,6 @@ sub save_changes {
&mt('An error occurred storing the external URL: [_1]',$putres).
'';
}
- $is_ext = $external;
}
} else {
$output = ''.
@@ -1362,7 +1324,7 @@ sub save_changes {
} else {
$storehash{'externalsyllabus'} = '',
}
- $putres =
+ my $putres =
&Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
if ($putres eq 'ok') {
&Apache::lonnet::make_public_indefinitely($url);
@@ -1427,22 +1389,6 @@ sub save_changes {
$output = $result.&return_to_editor($cdom,$cnum);
$earlyout = 1;
}
- if ($putres eq 'ok') {
- if ((($is_ext) && ($is_ext ne $was_ext)) || ($was_ext)) {
- my $chome = &Apache::lonnet::homeserver($cnum,$cdom);
- unless ($chome eq 'no_host') {
- my %crsinfo = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',$cnum,undef,undef,'.');
- if (ref($crsinfo{$cdom.'_'.$cnum}) eq 'HASH') {
- if ($external =~ m{^http://}) {
- $crsinfo{$cdom.'_'.$cnum}{'extsyllplain'} = 1;
- } elsif ($crsinfo{$cdom.'_'.$cnum}{'extsyllplain'}) {
- delete($crsinfo{$cdom.'_'.$cnum}{'extsyllplain'});
- }
- &Apache::lonnet::courseidput($cdom,\%crsinfo,$chome,'notime');
- }
- }
- }
- }
return ($earlyout,$uploaded,$external,$minimal,$output);
}
@@ -1578,10 +1524,9 @@ sub home_http_host {
my ($cdom,$cnum) = @_;
my $home=&Apache::lonnet::homeserver($cnum,$cdom);
if ($home ne 'no_host') {
- my $hostname = &Apache::lonnet::hostname($home);
my $protocol = $Apache::lonnet::protocol{$home};
$protocol = 'http' if ($protocol ne 'https');
- return $protocol.'://'.$hostname;
+ return $protocol.'://'.&Apache::lonnet::hostname($home);
}
return;
}
@@ -1721,17 +1666,5 @@ sub editbutton_js {
ENDJS
}
-sub redirect_to_http {
- my ($r) = @_;
- &Apache::loncommon::content_type($r,'text/html');
- &Apache::loncommon::no_cache($r);
- $r->send_http_header;
- my $url = 'http://'.$r->hostname().$r->uri().'?usehttp=1';
- $r->print(&Apache::loncommon::start_page(undef,undef,
- {'redirect' => [0,$url],}).
- &Apache::loncommon::end_page());
- return;
-}
-
1;
__END__