version 1.138.2.1, 2016/08/05 20:56:42
|
version 1.142, 2017/02/18 23:39:16
|
Line 116 sub handler {
|
Line 116 sub handler {
|
} |
} |
unless ($allowed && $forceedit) { |
unless ($allowed && $forceedit) { |
my $file=&Apache::lonnet::filelocation("",$item); |
my $file=&Apache::lonnet::filelocation("",$item); |
if ($file =~ /\.(tex|x?html?)$/) { |
if ($file =~ /\.(tex|x?html?)$/) { |
my $filetype = $1; |
my $filetype = $1; |
my $filecontents=&Apache::lonnet::getfile($file); |
my $filecontents=&Apache::lonnet::getfile($file); |
if ($filecontents eq -1) { |
if ($filecontents eq -1) { |
Line 168 sub handler {
|
Line 168 sub handler {
|
&mt('Print the syllabus directly from your web browser'). |
&mt('Print the syllabus directly from your web browser'). |
'\end{document}'); |
'\end{document}'); |
} else { |
} else { |
$r->print(&Apache::lonwrapper::wrapper($item,undef,$env{'request.use_absolute'}, |
my $brcrum; |
undef,$is_pdf,&mt('Syllabus'))); |
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($item,$brcrum,$env{'request.use_absolute'}, |
|
undef,$is_pdf,undef,&mt('Syllabus'))); |
} |
} |
} |
} |
return OK; |
return OK; |
Line 183 sub handler {
|
Line 192 sub handler {
|
'\end{document}'); |
'\end{document}'); |
} else { |
} else { |
my $is_ext = 1; |
my $is_ext = 1; |
my $is_pdf; |
my ($is_pdf,$brcrum); |
if ($external =~ /\.pdf$/i) { |
if ($external =~ /\.pdf$/i) { |
$is_pdf = 1; |
$is_pdf = 1; |
} |
} |
$r->print(&Apache::lonwrapper::wrapper($external,undef,$env{'request.use_absolute'}, |
if ($env{'form.folderpath'} =~ /^supplemental/) { |
$is_ext,$is_pdf,&mt('Syllabus'))); |
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($external,$brcrum,$env{'request.use_absolute'}, |
|
$is_ext,$is_pdf,undef,&mt('Syllabus'))); |
} |
} |
return OK; |
return OK; |
} |
} |
Line 292 sub handler {
|
Line 309 sub handler {
|
my $protocol = $Apache::lonnet::protocol{$homeserver}; |
my $protocol = $Apache::lonnet::protocol{$homeserver}; |
$protocol = 'http' if ($protocol ne 'https'); |
$protocol = 'http' if ($protocol ne 'https'); |
my $link = $protocol.'://'.&Apache::lonnet::hostname($homeserver).$r->uri; |
my $link = $protocol.'://'.&Apache::lonnet::hostname($homeserver).$r->uri; |
|
if (($protocol eq 'https') && ($external =~ m{^http://})) { |
|
$link .= '?usehttp=1'; |
|
} |
$r->print('<div class="LC_left_float">' |
$r->print('<div class="LC_left_float">' |
.'<span class="LC_help_open_topic LC_info">' |
.'<span class="LC_help_open_topic LC_info">' |
.'<span class="LC_info">' |
.'<span class="LC_info">' |
Line 610 function toggleEditor(pick) {
|
Line 630 function toggleEditor(pick) {
|
|
|
var regexp = $urlregexp; |
var regexp = $urlregexp; |
|
|
function extUrlPreview(caller) { |
function extUrlPreview(caller,protocol) { |
if (document.getElementById(caller)) { |
if (document.getElementById(caller)) { |
var url = document.getElementById(caller).value; |
var url = document.getElementById(caller).value; |
if (regexp.test(url)) { |
if (regexp.test(url)) { |
openMyModal(url,500,400,'yes'); |
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'); |
|
} |
} else { |
} else { |
alert("$invurl"); |
alert("$invurl"); |
} |
} |
Line 802 sub chooser {
|
Line 827 sub chooser {
|
$checked{'templatebox'} = $check; |
$checked{'templatebox'} = $check; |
$display{'templatebox'} = 'block'; |
$display{'templatebox'} = 'block'; |
} |
} |
|
my $protocol = ($ENV{'SERVER_PORT'} == 443?'https':'http'); |
|
|
my $output = |
my $output = |
'<form name="syllabus" method="post" enctype="multipart/form-data" action="">'."\n". |
'<form name="syllabus" method="post" enctype="multipart/form-data" action="">'."\n". |
Line 814 sub chooser {
|
Line 840 sub chooser {
|
$output .= '</fieldset></div>'."\n". |
$output .= '</fieldset></div>'."\n". |
'<div id="url" class="LC_left_float" style="display: '.$display{'url'}.'">'."\n". |
'<div id="url" class="LC_left_float" style="display: '.$display{'url'}.'">'."\n". |
'<fieldset><legend>'.$lt{'chourl'}.'</legend><span class="LC_nobreak">'."\n". |
'<fieldset><legend>'.$lt{'chourl'}.'</legend><span class="LC_nobreak">'."\n". |
'<a href="javascript:extUrlPreview('."'syllabusurl'".');">'.$lt{'pr'}.'</a></span> '."\n". |
'<a href="javascript:extUrlPreview('."'syllabusurl','$protocol'".');">'.$lt{'pr'}.'</a></span> '."\n". |
'<input type="text" id="syllabusurl" name="externalsyllabus" value="'.$external.'" size="55" />'."\n". |
'<input type="text" id="syllabusurl" name="externalsyllabus" value="'.$external.'" size="55" />'."\n". |
' <input type="submit" name="storeurl" value="'.$lt{'save'}.'" />'."\n". |
' <input type="submit" name="storeurl" value="'.$lt{'save'}.'" />'."\n". |
'</fieldset></div>'."\n". |
'</fieldset></div>'."\n". |
Line 1115 sub save_changes {
|
Line 1141 sub save_changes {
|
(ref($courseenv) eq 'HASH')) { |
(ref($courseenv) eq 'HASH')) { |
return ($earlyout,$uploaded,$external,$minimal,$output); |
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'})) { |
if (($env{'form.deleteuploaded_file'}) || ($env{'form.deleteuploaded_minimal'})) { |
my %storehash; |
my %storehash; |
if (($env{'form.choice'} eq 'file') && |
if (($env{'form.choice'} eq 'file') && |
Line 1127 sub save_changes {
|
Line 1157 sub save_changes {
|
&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.externalsyllabus'); |
&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.externalsyllabus'); |
$storehash{'uploadedsyllabus'} = ''; |
$storehash{'uploadedsyllabus'} = ''; |
$storehash{'externalsyllabus'} = ''; |
$storehash{'externalsyllabus'} = ''; |
my $putres = &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum); |
$putres = &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum); |
undef($uploaded); |
undef($uploaded); |
undef($external); |
undef($external); |
} elsif (($env{'form.choice'} eq 'minimal') && |
} elsif (($env{'form.choice'} eq 'minimal') && |
Line 1147 sub save_changes {
|
Line 1177 sub save_changes {
|
&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.minimalsyllabus'); |
&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.minimalsyllabus'); |
$storehash{'externalsyllabus'} = ''; |
$storehash{'externalsyllabus'} = ''; |
$storehash{'minimalsyllabus'} = ''; |
$storehash{'minimalsyllabus'} = ''; |
my $putres = &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum); |
$putres = &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum); |
undef($external); |
undef($external); |
undef($minimal); |
undef($minimal); |
} |
} |
Line 1237 sub save_changes {
|
Line 1267 sub save_changes {
|
$syllabus->{'uploaded.domain'}=$env{'user.domain'}; |
$syllabus->{'uploaded.domain'}=$env{'user.domain'}; |
$syllabus->{'uploaded.name'}=$env{'user.name'}; |
$syllabus->{'uploaded.name'}=$env{'user.name'}; |
$syllabus->{'uploaded.lastmodified'} = $now; |
$syllabus->{'uploaded.lastmodified'} = $now; |
my $putres = &Apache::lonnet::put('syllabus',$syllabus,$cdom,$cnum); |
$putres = &Apache::lonnet::put('syllabus',$syllabus,$cdom,$cnum); |
if ($putres eq 'ok') { |
if ($putres eq 'ok') { |
($uploaded,$minimal,$external) = |
($uploaded,$minimal,$external) = |
&update_syllabus_env($cdom,$cnum,$courseenv,$env{'form.choice'},$uploaded, |
&update_syllabus_env($cdom,$cnum,$courseenv,$env{'form.choice'},$uploaded, |
Line 1262 sub save_changes {
|
Line 1292 sub save_changes {
|
} else { |
} else { |
$external=$env{'form.externalsyllabus'}; |
$external=$env{'form.externalsyllabus'}; |
$external =~ s/(`)//g; |
$external =~ s/(`)//g; |
my $putres = |
$putres = |
&Apache::lonnet::put('environment',{externalsyllabus=>$external}, |
&Apache::lonnet::put('environment',{externalsyllabus=>$external}, |
$cdom,$cnum); |
$cdom,$cnum); |
if ($putres eq 'ok') { |
if ($putres eq 'ok') { |
Line 1279 sub save_changes {
|
Line 1309 sub save_changes {
|
'</div>'; |
'</div>'; |
} |
} |
} |
} |
|
$is_ext = $external; |
} else { |
} else { |
$output = '<div class="LC_error">'. |
$output = '<div class="LC_error">'. |
&mt('External URL not saved -- invalid URL.'). |
&mt('External URL not saved -- invalid URL.'). |
Line 1324 sub save_changes {
|
Line 1355 sub save_changes {
|
} else { |
} else { |
$storehash{'externalsyllabus'} = '', |
$storehash{'externalsyllabus'} = '', |
} |
} |
my $putres = |
$putres = |
&Apache::lonnet::put('environment',\%storehash,$cdom,$cnum); |
&Apache::lonnet::put('environment',\%storehash,$cdom,$cnum); |
if ($putres eq 'ok') { |
if ($putres eq 'ok') { |
&Apache::lonnet::make_public_indefinitely($url); |
&Apache::lonnet::make_public_indefinitely($url); |
Line 1389 sub save_changes {
|
Line 1420 sub save_changes {
|
$output = $result.&return_to_editor($cdom,$cnum); |
$output = $result.&return_to_editor($cdom,$cnum); |
$earlyout = 1; |
$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); |
return ($earlyout,$uploaded,$external,$minimal,$output); |
} |
} |
|
|