--- loncom/interface/lonsyllabus.pm 2023/01/23 17:56:58 1.138.2.8.2.3
+++ loncom/interface/lonsyllabus.pm 2016/01/26 14:30:25 1.139
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.138.2.8.2.3 2023/01/23 17:56:58 raeburn Exp $
+# $Id: lonsyllabus.pm,v 1.139 2016/01/26 14:30:25 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) {
@@ -125,13 +125,8 @@ sub handler {
if ($target eq 'tex') {
$r->print($filecontents);
} else {
- my $texengine = $env{'form.texengine'};
- if ($texengine eq '') {
- $texengine = 'tth';
- } elsif (lc($texengine) eq 'jsmath') {
- $texengine = 'MathJax';
- }
- my $result = &Apache::lontexconvert::converted(\$filecontents,$texengine);
+ my $result = &Apache::lontexconvert::converted(\$filecontents,
+ $env{'form.texengine'});
my %args;
&get_breadcrumbs($cdom,$cnum,$crstype,\%args);
if ($env{'form.only_body'}) {
@@ -168,32 +163,14 @@ sub handler {
&mt('Print the syllabus directly from your web browser').
'\end{document}');
} else {
- my $brcrum;
- if ($env{'form.folderpath'} =~ /^supplemental/) {
- &Apache::loncommon::validate_folderpath(1,'',$cnum,$cdom);
- 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'})) {
- my $hostname = $r->hostname();
- unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) {
- &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.' '.
@@ -201,22 +178,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/) {
- &Apache::loncommon::validate_folderpath(1,'',$cnum,$cdom);
- my $title = $env{'form.title'};
- if ($title eq '') {
- $title = &mt('Syllabus');
- }
- $title = &HTML::Entities::encode($title,'\'"<>&');
- $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;
}
@@ -317,8 +284,9 @@ sub handler {
if ($allowed) {
#---------------------------------- Print External URL Syllabus Info if editing
if ($target ne 'tex') {
- my $link = &Apache::lonnet::url_prefix($r,$cdom,$homeserver,'web').
- $r->uri;
+ my $protocol = $Apache::lonnet::protocol{$homeserver};
+ $protocol = 'http' if ($protocol ne 'https');
+ my $link = $protocol.'://'.&Apache::lonnet::hostname($homeserver).$r->uri;
$r->print('<div class="LC_left_float">'
.'<span class="LC_help_open_topic LC_info">'
.'<span class="LC_info">'
@@ -327,7 +295,7 @@ sub handler {
.'</span>'
.'</div><div style="padding:0;clear:both;margin:0;border:0"></div>'."\n");
my $lonhost = $r->dir_config('lonHostID');
- $r->print(&chooser($r,$external,$uploaded,$minimal,$cdom,$cnum,$lonhost,
+ $r->print(&chooser($external,$uploaded,$minimal,$cdom,$cnum,$lonhost,
\%syllabusfields,\%syllabus));
}
} else {
@@ -637,16 +605,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");
}
@@ -754,7 +717,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) {
@@ -766,7 +728,6 @@ sub get_breadcrumbs{
my ($cdom,$cnum,$crstype,$args) = @_;
return unless (ref($args) eq 'HASH');
if ($env{'form.folderpath'} =~ /^supplemental/) {
- &Apache::loncommon::validate_folderpath(1,'',$cnum,$cdom);
my $title = $env{'form.title'};
if ($title eq '') {
$title = &mt('Syllabus');
@@ -791,7 +752,7 @@ sub get_breadcrumbs{
}
sub chooser {
- my ($r,$external,$uploaded,$minimal,$cdom,$cnum,$lonhost,$fields,$values) = @_;
+ my ($external,$uploaded,$minimal,$cdom,$cnum,$lonhost,$fields,$values) = @_;
my %lt = &Apache::lonlocal::texthash(
'type' => 'Syllabus Type',
'url' => 'External URL',
@@ -836,7 +797,6 @@ sub chooser {
$checked{'templatebox'} = $check;
$display{'templatebox'} = 'block';
}
- my $protocol = ($ENV{'SERVER_PORT'} == 443?'https':'http');
my $output =
'<form name="syllabus" method="post" enctype="multipart/form-data" action="">'."\n".
@@ -849,14 +809,14 @@ sub chooser {
$output .= '</fieldset></div>'."\n".
'<div id="url" class="LC_left_float" style="display: '.$display{'url'}.'">'."\n".
'<fieldset><legend>'.$lt{'chourl'}.'</legend><span class="LC_nobreak">'."\n".
- '<a href="javascript:extUrlPreview('."'syllabusurl','$protocol'".');">'.$lt{'pr'}.'</a></span> '."\n".
+ '<a href="javascript:extUrlPreview('."'syllabusurl'".');">'.$lt{'pr'}.'</a></span> '."\n".
'<input type="text" id="syllabusurl" name="externalsyllabus" value="'.$external.'" size="55" />'."\n".
' <input type="submit" name="storeurl" value="'.$lt{'save'}.'" />'."\n".
'</fieldset></div>'."\n".
'<div id="minimal" class="LC_left_float" style="display: '.$display{'minimal'}.'">'."\n".
'<fieldset><legend>'.$lt{'minimal'}.'</legend>';
if ($minimal) {
- my ($absurl,$filename,$depbutton) = &syllabus_file_info($r,$minimal,$cnum,$cdom,$lonhost,'minimal');
+ my ($absurl,$filename,$depbutton) = &syllabus_file_info($minimal,$cnum,$cdom,$lonhost,'minimal');
$output .= '<a href="javascript:extUrlPreview('."'currminimal'".');">'.$lt{'pr'}.'</a>'.
'<input type="hidden" name="minimalfile" value="'.&HTML::Entities::encode($absurl).'?inhibitmenu=yes" id="currminimal" />'.
$depbutton;
@@ -869,7 +829,7 @@ sub chooser {
'<div id="file" class="LC_left_float" style="display: '.$display{'file'}.'">'."\n".
'<fieldset><legend>'.$lt{'file'}.'</legend>';
if ($uploaded) {
- my ($absurl,$filename,$depbutton) = &syllabus_file_info($r,$uploaded,$cnum,$cdom,$lonhost,'file');
+ my ($absurl,$filename,$depbutton) = &syllabus_file_info($uploaded,$cnum,$cdom,$lonhost,'file');
$output .= '<span class="LC_nobreak">'.$lt{'curr'}.' '.
'<input type="hidden" name="uploadedfile" value="'.&HTML::Entities::encode($absurl).'?inhibitmenu=yes" id="currfile" />'.
'<a href="javascript:extUrlPreview('."'currfile'".');">'.$filename.'</a></span>'.$depbutton.
@@ -904,13 +864,10 @@ sub chooser {
}
sub syllabus_file_info {
- my ($r,$item,$cnum,$cdom,$lonhost,$context) = @_;
- my $hostname = &Apache::lonnet::hostname($lonhost);
+ my ($item,$cnum,$cdom,$lonhost,$context) = @_;
my $protocol = $Apache::lonnet::protocol{$lonhost};
$protocol = 'http' if ($protocol ne 'https');
- my $alias = &Apache::lonnet::use_proxy_alias($r,$lonhost);
- $hostname = $alias if ($alias ne '');
- 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);
@@ -1153,10 +1110,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') &&
@@ -1169,7 +1122,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') &&
@@ -1189,7 +1142,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);
}
@@ -1279,7 +1232,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,
@@ -1304,7 +1257,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') {
@@ -1321,7 +1274,6 @@ sub save_changes {
'</div>';
}
}
- $is_ext = $external;
} else {
$output = '<div class="LC_error">'.
&mt('External URL not saved -- invalid URL.').
@@ -1367,7 +1319,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);
@@ -1432,22 +1384,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);
}
@@ -1583,10 +1519,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;
}
@@ -1726,17 +1661,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__