[LON-CAPA-cvs] cvs: loncom /interface lonsyllabus.pm
raeburn
raeburn at source.lon-capa.org
Thu May 9 01:43:30 EDT 2013
raeburn Thu May 9 05:43:30 2013 EDT
Modified files:
/loncom/interface lonsyllabus.pm
Log:
- Syllabus.
- code migrated from handler() to new subroutines to facilitate reuse.
- &save_changes() - used to process and store changes to syllabus made
by CC.
- &print_header() - used to call start_page etc., after any updates have
been stored by &save_changes
- &get_personnel() - used to build display of course personnel.
- Templated syllabus page
- checkboxes for fields can be used to hide fields which currently contain
entries (note these fields will still be viewable on pre-LON-CAPA 2.11
servers).
-------------- next part --------------
Index: loncom/interface/lonsyllabus.pm
diff -u loncom/interface/lonsyllabus.pm:1.120 loncom/interface/lonsyllabus.pm:1.121
--- loncom/interface/lonsyllabus.pm:1.120 Mon May 6 16:15:59 2013
+++ loncom/interface/lonsyllabus.pm Thu May 9 05:43:30 2013
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.120 2013/05/06 16:15:59 raeburn Exp $
+# $Id: lonsyllabus.pm,v 1.121 2013/05/09 05:43:30 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -163,352 +163,57 @@
'jjj_weblinks' => 'Web Links',
'kkk_textbook' => 'Textbook',
'lll_includeurl' => 'URLs To Include in Syllabus');
-# ----------------------------------------------------------------- Make header
- if ($target ne 'tex') {
- my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);
- my $js;
- if ($env{'form.backto'} eq 'coursecatalog') {
- $js .= <<"ENDSCRIPT";
-
-<script type="text/javascript">
-// <![CDATA[
-
-function ToCatalog(caller) {
- numidx = getIndexByName('coursenum');
- if (numidx > -1) {
- if (caller != 'details') {
- document.backtocat.elements[numidx].value = '';
- }
- }
- document.backtocat.submit();
-}
-
-function getIndexByName(item) {
- for (var i=0;i<document.backtocat.elements.length;i++) {
- if (document.backtocat.elements[i].name == item) {
- return i;
- }
- }
- return -1;
-}
-
-// ]]>
-</script>
-
-ENDSCRIPT
- }
- if ($allowed && $forceedit) {
- my $check_uncheck = &Apache::loncommon::check_uncheck_jscript();
- my $invurl = &mt('Invalid URL');
- my $urlregexp = <<'ENDREGEXP';
-/^([a-z]([a-z]|\d|\+|-|\.)*):(\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?((\[(|(v[\da-f]{1,}\.(([a-z]|\d|-|\.|_|~)|[!\$&'\(\)\*\+,;=]|:)+))\])|((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=])*)(:\d*)?)(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*|(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|!
@)*)*)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)){0})(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i
-ENDREGEXP
-
- $js .= <<"ENDSCRIPT";
-
-<script type="text/javascript">
-// <![CDATA[
-
-function toggleEditor(pick) {
- var choices = new Array('template','url','file','templatebox');
- for (var i=0; i<choices.length; i++) {
- if (((choices[i] == 'templatebox') && (pick == 'template')) ||
- (choices[i] == pick)) {
- document.getElementById(choices[i]).style.display='block';
- } else {
- document.getElementById(choices[i]).style.display='none';
- }
- }
- return;
-}
-
-var regexp = $urlregexp;
-
-function extUrlPreview(caller) {
- if (document.getElementById(caller)) {
- var url = document.getElementById(caller).value;
- if (regexp.test(url)) {
- openMyModal(url,500,400,'yes');
- } else {
- alert("$invurl");
- }
- }
-}
-
-function toggleBox(name,caller) {
- if (name == 'all') {
- if (document.syllabus.showfield.length > 0) {
- for (var i=0; i<document.syllabus.showfield.length; i++) {
- if (document.syllabus.showfield[i].checked) {
- if (document.getElementById('box_'+document.syllabus.showfield[i].value)) {
- document.getElementById('box_'+document.syllabus.showfield[i].value).style.display='block';
- }
- } else {
- if (document.getElementById('box_'+document.syllabus.showfield[i].value)) {
- document.getElementById('box_'+document.syllabus.showfield[i].value).style.display='none';
- }
- }
- }
- }
- } else {
- if (caller.checked) {
- if (document.getElementById('box_'+caller.value)) {
- document.getElementById('box_'+caller.value).style.display='block';
- }
- } else {
- if (document.getElementById('box_'+caller.value)) {
- document.getElementById('box_'+caller.value).style.display='none';
- }
- }
- }
- return;
-}
-
-$check_uncheck
-
-// ]]>
-</script>
-
-ENDSCRIPT
- }
- my $args = {'function' => undef,
- 'domain' => $cdom};
- my $forcereg;
- if ($env{'form.register'}) {
- $forcereg = 1;
- $args->{'force_register'} = $forcereg;
- }
- if ($env{'form.backto'} eq 'coursecatalog') {
- &Apache::lonhtmlcommon::clear_breadcrumbs();
- my $brcrum = [{href=>"javascript:ToCatalog();",
- text=>&mt('Course/Community Catalog'),
- no_mt=>1}
- ];
- if ($env{'form.coursenum'} ne '') {
- push(@{$brcrum},
- {href=>"javascript:ToCatalog('details')",
- text=>"Course details"});
- }
- push(@{$brcrum},
- {href=>$r->uri,
- text=>"Course syllabus"});
- $args->{'bread_crumbs'} = $brcrum;
- } elsif ($env{'form.folderpath'} =~ /^supplemental/) {
- my $title = $env{'form.title'};
- if ($title eq '') {
- $title = &mt('Syllabus');
- }
- my $brcrum =
- &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
- if (ref($brcrum) eq 'ARRAY') {
- $args->{'bread_crumbs'} = $brcrum;
- }
- }
- my $start_page =
- &Apache::loncommon::start_page("Syllabus", $rss_link.$js,$args);
- $r->print($start_page);
- }
# ---------------------------------------------------------- Load syllabus info
my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum);
- my %displayfields;
+ my ($output,%displayfields,%noshow);
# This handler might be called anonymously ...
# ----------------------------------------------------- Only if not public call
if ($allowed) {
-#store what the user typed in to the template
- if ($env{'form.storesyl'}) {
- foreach my $syl_field (keys(%syllabusfields)) {
- my $field=$env{'form.'.$syl_field};
- chomp($field);
- $field=~s/\s+$//s;
- $field=~s/^\s+//s;
- $field=~s/\<br\s*\/*\>$//s;
- $field=&Apache::lonfeedback::clear_out_html($field,1);
- #here it will be stored
- $syllabus{$syl_field}=$field;
- if ($syl_field eq 'lll_includeurl') { # clean up included URLs
- my $field='';
- foreach my $value (split(/\n/,$syllabus{$syl_field})) {
- my $url=$value;
-# get rid of leading and trailing spaces
- $url=~s/^\s+//;
- $url=~s/\s+$//;
- if ($url=~m|^https?\://([^/]+)/(.+)$|) {
- my $host = $1;
- my $remainder=$2;
-# remove the hostname from internal URLs
- my $hostname = &Apache::lonnet::hostname($host);
- my %all_hostnames = &Apache::lonnet::all_hostnames();
- foreach my $possible_host (keys(%all_hostnames)) {
- if ($possible_host =~ /\Q$hostname\E/i) {
- $url=$remainder;
- }
- }
- }
-# norm internal URLs
- unless ($url=~/^https?\:/) {
- $url=&Apache::lonnet::clutter($url);
- }
-# re-assemble field
- if ($url) {
- $field.=$url."\n";
- }
- }
- $syllabus{$syl_field}=$field;
+ if (($env{'form.choice'} =~ /^(template|url|file)$/) ||
+ ($env{'form.phase'} =~ /^(upload|check)_embedded$/)) {
+ my $earlyout;
+ ($earlyout,$uploaded,$external,$output) =
+ &save_changes($cnum,$cdom,$uploaded,$external,\%syllabus,
+ \%syllabusfields,\%courseenv);
+ if ($earlyout) {
+ if ($target ne 'tex') {
+ &print_header($r,$cnum,$cdom,$crstype,$allowed,$forceedit,
+ \%syllabus,\%syllabusfields);
+ $r->print($output);
}
+ return OK;
}
- $syllabus{'uploaded.domain'}=$env{'user.domain'};
- $syllabus{'uploaded.name'}=$env{'user.name'};
- $syllabus{'uploaded.lastmodified'}=time;
- &Apache::lonnet::put('syllabus',\%syllabus,$cdom,$cnum);
- my %storehash;
- if ($courseenv{'uploadedsyllabus'}) {
- &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.uploadedsyllabus');
- $storehash{'uploadedsyllabus'} = '';
- }
- if ($courseenv{'externalsyllabus'}) {
- &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.externalsyllabus');
- $storehash{'externalsyllabus'} = '';
- }
- if ($courseenv{'externalsyllabus'} || $courseenv{'uploadedsyllabus'}) {
- &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
- undef($uploaded);
- undef($external);
+ }
+ }
+ if ($target ne 'tex') {
+ &print_header($r,$cnum,$cdom,$crstype,$allowed,$forceedit,\%syllabus,
+ \%syllabusfields);
+ $r->print($output);
+ }
+
+# -------------------------------------------- Determine which fields are shown
+
+ if ($syllabus{'uploaded.fields'}) {
+ if ($syllabus{'uploaded.fields'} eq 'none') {
+ foreach my $field (keys(%syllabusfields)) {
+ $displayfields{$field} = ' style="display:none;"';
+ $noshow{$field} = 1;
}
- } elsif ($env{'form.storeurl'}) {
- if ($env{'form.externalsyllabus'} =~ m{^https?://}) {
- if ($env{'form.externalsyllabus'} eq $external) {
- $r->print('<div class="LC_info">'.
- &mt('External URL unchanged.').
- '</div>');
- if ($uploaded) {
- my $prefix;
- my $home=&Apache::lonnet::homeserver($cnum,$cdom);
- if ($home ne 'no_host') {
- my $protocol = $Apache::lonnet::protocol{$home};
- $protocol = 'http' if ($protocol ne 'https');
- $prefix = $protocol.'://'.&Apache::lonnet::hostname($home);
- }
- unless ($external =~ m{^\Q$prefix/uploaded/$cdom/$cnum/portfolio/syllabus\E}) {
- &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.uploadedsyllabus');
- &Apache::lonnet::put('environment',{uploadedsyllabus => ''},
- $cdom,$cnum);
- undef($uploaded);
- }
- }
+ } else {
+ my %included;
+ map { $included{$_} = 1; } split(/,/,$syllabus{'uploaded.fields'});
+ foreach my $field (keys(%syllabusfields)) {
+ my ($prefix) = split(/_/,$field);
+ if ($included{$prefix}) {
+ $displayfields{$field} = ' style="display:block;"';
} else {
- $external=$env{'form.externalsyllabus'};
- $external =~ s/(`)//g;
- my $putres =
- &Apache::lonnet::put('environment',{externalsyllabus=>$external},
- $cdom,$cnum);
- if ($putres eq 'ok') {
- &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.externalsyllabus' => $external});
- $r->print('<div>'.
- &Apache::lonhtmlcommon::confirm_success(&mt('External URL saved.')).
- '</div>');
- if ($uploaded) {
- my $prefix;
- my $home=&Apache::lonnet::homeserver($cnum,$cdom);
- if ($home ne 'no_host') {
- my $protocol = $Apache::lonnet::protocol{$home};
- $protocol = 'http' if ($protocol ne 'https');
- $prefix = $protocol.'://'.&Apache::lonnet::hostname($home);
- }
- unless ($external =~ m{^\Q$prefix/uploaded/$cdom/$cnum/portfolio/syllabus\E}) {
- &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.uploadedsyllabus');
- &Apache::lonnet::put('environment',{uploadedsyllabus => ''},
- $cdom,$cnum);
- undef($uploaded);
- }
- }
- } else {
- $r->print('<div class="LC_error">'.
- &mt('An error occurred storing the external URL: [_1]',$putres).
- '</div>');
- }
- }
- } else {
- $r->print('<div class="LC_error">'.
- &mt('External URL not saved -- invalid URL.').
- '</div>');
- }
- } elsif ($env{'form.storefile'}) {
- # Process file upload - phase one - upload and parse primary file.
- my %allfiles = ();
- my %codebase = ();
- my ($upload_result,$upload_output,$uploadphase);
- if ($env{'form.syllabusfile.filename'}) {
- my ($url,$needlink) = &process_upload(\$upload_output,$cnum,$cdom,
- \%allfiles,\%codebase);
- $r->print($upload_output);
- if ($url =~ m{^/uploaded/\Q$cdom\E/\Q$cnum\E.*/[^/]+$}) {
- my $exturl;
- my $home=&Apache::lonnet::homeserver($cnum,$cdom);
- if ($home ne 'no_host') {
- my $protocol = $Apache::lonnet::protocol{$home};
- $protocol = 'http' if ($protocol ne 'https');
- $exturl = $protocol.'://'.&Apache::lonnet::hostname($home).$url;
- }
- my %storehash = (
- uploadedsyllabus => $url,
- );
- if ($exturl) {
- $storehash{'externalsyllabus'} = $exturl;
- if ($exturl =~ /\.(html?|txt|js|css)$/) {
- $exturl .= '?inhibitmenu=yes';
- }
- } else {
- $storehash{'externalsyllabus'} = '',
- }
- my $putres =
- &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
- if ($putres eq 'ok') {
- &Apache::lonnet::make_public_indefinitely($url);
- foreach my $key (keys(%storehash)) {
- &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.'.$key => $storehash{$key}});
- }
- $uploaded = $url;
- if ($needlink) {
- $r->print(&return_to_editor($cdom,$cnum).
- &Apache::loncommon::end_page());
- return OK;
- }
- }
+ $displayfields{$field} = ' style="display:none;"';
+ $noshow{$field} = 1;
}
}
- } elsif ($env{'form.phase'} eq 'upload_embedded') {
- # Process file upload - phase two - upload embedded objects
- my $uploadphase = 'check_embedded';
- my $primaryurl = &HTML::Entities::encode($env{'form.primaryurl'},'<>&"');
- my $state = &embedded_form_elems($uploadphase,$primaryurl);
- my $url_root = '/uploaded/'.$cdom.'/'.$cnum;
- my $actionurl = "/public/$cdom/$cnum/syllabus";
- my ($result,$flag,$numpathchgs) =
- &Apache::loncommon::upload_embedded('syllabus','portfolio/syllabus',
- $cnum,$cdom,'/userfiles',$url_root,undef,undef,undef,$state,
- $actionurl);
- unless ($numpathchgs) {
- my $modres =
- &Apache::loncommon::modify_html_refs('syllabus','portfolio/syllabus',
- $cnum,$cdom,
- '/userfiles',$env{'form.primaryurl'});
- $result .= $modres;
- }
- $r->print($result.&return_to_editor($cdom,$cnum).
- &Apache::loncommon::end_page());
- return OK;
- } elsif ($env{'form.phase'} eq 'check_embedded') {
- # Process file upload - phase three - modify references in HTML file
- my $uploadphase = 'modified_orightml';
- my $result =
- &Apache::loncommon::modify_html_refs('syllabus','portfolio/syllabus',
- $cnum,$cdom,
- '/userfiles',$env{'form.primaryurl'});
- $r->print($result.&return_to_editor($cdom,$cnum).
- &Apache::loncommon::end_page());
- return OK;
}
+ } else {
foreach my $field (keys(%syllabusfields)) {
if ($syllabus{$field} ne '') {
$displayfields{$field} = ' style="display:block;"';
@@ -530,9 +235,10 @@
.&mt('Public link (no log-in): [_1]','<tt>'.$link.'</tt>')
.' </span>'.&Apache::loncommon::help_open_topic('Syllabus_ExtLink')
.'</span>'
- .'</div><div style="padding:0;clear:both;margin:0;border:0"></div>');
+ .'</div><div style="padding:0;clear:both;margin:0;border:0"></div>'."\n");
my $lonhost = $r->dir_config('lonHostID');
- $r->print(&chooser($external,$uploaded,$cdom,$cnum,$lonhost,\%syllabusfields,\%syllabus));
+ $r->print(&chooser($external,$uploaded,$cdom,$cnum,$lonhost,\%syllabusfields,
+ \%syllabus));
}
} else {
#--------------------------------------------- Print last update unless editing
@@ -577,13 +283,13 @@
$r->print('<div class="LC_Box" id="template" style="display: '.$display.'">'.
'<h2 class="LC_hcell">'.$courseenv{'description'}.'</h2>');
if ($allowed) {
- $r->print('<div style="margin: 0; float:left;">'.
- '<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>'.
- '</div>');
+ $r->print('<div style="margin: 0; float:left;">'.
+ '<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>'.
+ '</div>');
# Print Help Text if editing at right side of screen
- $r->print('<div style="margin: 0; float:right;">'.
- &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).
- '</div><br clear="all" />');
+ $r->print('<div style="margin: 0; float:right;">'.
+ &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).
+ '</div><br clear="all" />');
} else {
$r->print('<h3>'.&Apache::lonnet::domain($cdom,'description').'</h3>');
}
@@ -592,63 +298,54 @@
&Apache::lonnet::domain($cdom,'description').'}\\\\');
}
# -------------------------------------------------------- Get course personnel
- my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
- if ($target ne 'tex') {
- $r->print(&Apache::lonhtmlcommon::start_pick_box());
- } else {
- $r->print('\begin{tabular}{|p{0.45\textwidth}|p{0.45\textwidth}|}\hline');
+ my $hidepersonnel;
+ if (($syllabus{'uploaded.fields'}) &&
+ (($syllabus{'uploaded.fields'} eq 'none') ||
+ ($syllabus{'uploaded.fields'} !~ /000/))) {
+ $hidepersonnel = 1;
}
- my @personnel=sort(keys(%coursepersonnel));
- my $lastpers=$personnel[$#personnel];
- foreach my $element (@personnel) {
- if ($target ne 'tex') {
- $r->print(&Apache::lonhtmlcommon::row_title($element));
- } else {
- $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & ');
- }
- my @coursepersonlist;
- foreach (split(/\,/,$coursepersonnel{$element})) {
- my ($puname,$pudom)=split(/\:/,$_);
- if ($target ne 'tex') {
- my $courseperson = &Apache::loncommon::plainname($puname,$pudom);
- if (($env{'user.name'} eq '') || ($env{'user.name'} eq 'public') ||
- ($env{'user.domain'} eq '') || ($env{'user.domain'} eq 'public')) {
- push(@coursepersonlist,$courseperson);
- } else {
- push(@coursepersonlist,&Apache::loncommon::aboutmewrapper($courseperson,
- $puname,$pudom));
- }
- } else {
- push(@coursepersonlist,&Apache::loncommon::plainname($puname,
- $pudom).' ');
+ if ($target ne 'tex') {
+ if ($allowed) {
+ my $display = ' style="display:block;"';
+ if ($hidepersonnel) {
+ $display = ' style="display:none;"';
}
- }
- $r->print(join(", ", at coursepersonlist));
- if ($target ne 'tex') {
- my $lastclose=$element eq $lastpers?1:0;
- $r->print(&Apache::lonhtmlcommon::row_closure($lastclose));
+ &Apache::lontemplate::print_start_template($r,&mt('Personnel'),'LC_Box',
+ 'box_000_showpeople',$display);
+ $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed));
+ &Apache::lontemplate::print_end_template($r);
} else {
- $r->print('\\\\ \hline');
+ unless ($hidepersonnel) {
+ &Apache::lontemplate::print_start_template($r,&mt('Personnel'),'LC_Box');
+ $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed));
+ &Apache::lontemplate::print_end_template($r);
+ }
}
- }
- if ($target ne 'tex') {
- $r->print(&Apache::lonhtmlcommon::end_pick_box());
} else {
- $r->print('\end{tabular}\\\\');
+ unless ($hidepersonnel) {
+ $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed));
+ }
}
# -------------------------------------------------------------- Announcements?
my $day = &Apache::lonannounce::showday(time,2,
&Apache::lonannounce::readcalendar($cdom.'_'.$cnum));
+ my $hidefeeds;
+ if (($syllabus{'uploaded.fields'}) &&
+ (($syllabus{'uploaded.fields'} eq 'none') ||
+ ($syllabus{'uploaded.fields'} !~ /111/))) {
+ $hidefeeds = 1;
+ }
if ($target ne 'tex') {
if ($allowed) {
my $display = ' style="display:block;"';
- if ($syllabus{'000_showrssfeeds'} eq 'no') {
+ if ($hidefeeds) {
$display = ' style="display:none;"';
}
&Apache::lontemplate::print_start_template($r,&mt('RSS Feeds and Blogs'),'LC_Box',
- 'box_000_showrssfeeds',$display);
+ 'box_111_showrssfeeds',$display);
my ($numfeeds,$hiddenfeeds,$rsslinktext);
- my $feeds=&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit,\$numfeeds,\$hiddenfeeds);
+ my $feeds=&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit,\$numfeeds,
+ \$hiddenfeeds);
if ($numfeeds) {
$r->print($feeds);
$rsslinktext = &mt('New RSS Feed or Blog');
@@ -675,7 +372,7 @@
$r->print( '<a href="'.$editurl.'">'.$rsslinktext.'</a>');
&Apache::lontemplate::print_end_template($r);
} else {
- unless ($syllabus{'000_showrssfeeds'} eq 'no') {
+ unless ($hidefeeds) {
my $feeds = &Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit);
if ($feeds ne '') {
&Apache::lontemplate::print_start_template($r,&mt('RSS Feeds and Blogs'),'LC_Box');
@@ -690,8 +387,7 @@
# ---------------------------------------------------------------- Get syllabus
if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
if ($allowed) {
- $r->print('<form method="post" action="">'.
- '<input type="hidden" name="forceedit" value="'.$env{'form.forceedit'}.'" />');
+ $r->print('<form method="post" action="">');
}
my $url_include_handler = sub {
@@ -738,7 +434,7 @@
my %custom_hash = ( 'lll_includeurl' => $url_include_handler );
&Apache::lontemplate::print_template_fields($r, \%syllabus, \%syllabusfields,
$target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML, \%custom_hash,
- undef,\%displayfields);
+ undef,\%displayfields,\%noshow);
if ($allowed) {
$r->print('</form>'.
&Apache::lonhtmlcommon::htmlareaselectactive());
@@ -749,7 +445,6 @@
if ($target ne 'tex') {$r->print('</p>');}
}
if ($target ne 'tex') {
- $r->print('</div>');
if ($env{'form.backto'} eq 'coursecatalog') {
$r->print('<form name="backtocat" method="post" action="/adm/coursecatalog">'.
&Apache::lonhtmlcommon::echo_form_input(['backto','courseid']).
@@ -762,6 +457,227 @@
return OK;
}
+sub print_header {
+ my ($r,$cnum,$cdom,$crstype,$allowed,$forceedit,$syllabus,$syllabusfields) = @_;
+ return unless ((ref($syllabus) eq 'HASH') || (ref($syllabusfields) eq 'HASH'));
+# ----------------------------------------------------------------- Make header
+ my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);
+ my $js;
+ if ($env{'form.backto'} eq 'coursecatalog') {
+ $js .= <<"ENDSCRIPT";
+
+<script type="text/javascript">
+// <![CDATA[
+
+function ToCatalog(caller) {
+ numidx = getIndexByName('coursenum');
+ if (numidx > -1) {
+ if (caller != 'details') {
+ document.backtocat.elements[numidx].value = '';
+ }
+ }
+ document.backtocat.submit();
+}
+
+function getIndexByName(item) {
+ for (var i=0;i<document.backtocat.elements.length;i++) {
+ if (document.backtocat.elements[i].name == item) {
+ return i;
+ }
+ }
+ return -1;
+}
+
+// ]]>
+</script>
+
+ENDSCRIPT
+ }
+ if ($allowed && $forceedit) {
+ my $check_uncheck = &Apache::loncommon::check_uncheck_jscript();
+ my @fieldnames = sort(keys(%{$syllabusfields}));
+ unshift(@fieldnames,'000_showpeople','111_showrssfeeds');
+ my (@checked, at unchecked);
+ if ($syllabus->{'uploaded.fields'} eq 'none') {
+ my $lastidx = scalar(@fieldnames)-1;
+ @unchecked = (0..$lastidx);
+ } elsif ($syllabus->{'uploaded.fields'}) {
+ my %included;
+ map { $included{$_} = 1; } split(/,/,$syllabus->{'uploaded.fields'});
+ for (my $i=0; $i<@fieldnames; $i++) {
+ my ($prefix) = split(/_/,$fieldnames[$i]);
+ if ($included{$prefix}) {
+ push(@checked,$i);
+ } else {
+ push(@unchecked,$i);
+ }
+ }
+ } else {
+ @checked = (0,1);
+ for (my $i=2; $i<@fieldnames; $i++) {
+ if ($syllabus->{$fieldnames[$i]}) {
+ push(@checked,$i);
+ } else {
+ push(@unchecked,$i);
+ }
+ }
+ }
+ my $fieldstr = "var fields = new Array('".join("','", at fieldnames)."');";
+ my $checkedstr = "var include = new Array('".join("','", at checked)."');";
+ my $uncheckedstr = "var exclude = new Array('".join("','", at unchecked)."');";
+ my $invurl = &mt('Invalid URL');
+ my $urlregexp = <<'ENDREGEXP';
+/^([a-z]([a-z]|\d|\+|-|\.)*):(\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?((\[(|(v[\da-f]{1,}\.(([a-z]|\d|-|\.|_|~)|[!\$&'\(\)\*\+,;=]|:)+))\])|((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=])*)(:\d*)?)(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*|(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|!
@)*)*)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)){0})(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i
+ENDREGEXP
+
+ $js .= <<"ENDSCRIPT";
+
+<script type="text/javascript">
+// <![CDATA[
+
+function toggleEditor(pick) {
+ var choices = new Array('template','url','file','templatebox');
+ for (var i=0; i<choices.length; i++) {
+ if (((choices[i] == 'templatebox') && (pick == 'template')) ||
+ (choices[i] == pick)) {
+ document.getElementById(choices[i]).style.display='block';
+ } else {
+ document.getElementById(choices[i]).style.display='none';
+ }
+ }
+ return;
+}
+
+var regexp = $urlregexp;
+
+function extUrlPreview(caller) {
+ if (document.getElementById(caller)) {
+ var url = document.getElementById(caller).value;
+ if (regexp.test(url)) {
+ openMyModal(url,500,400,'yes');
+ } else {
+ alert("$invurl");
+ }
+ }
+}
+
+function toggleBox(name,caller) {
+ if (name == 'all') {
+ if (document.syllabus.showfield.length > 0) {
+ for (var i=0; i<document.syllabus.showfield.length; i++) {
+ if (document.syllabus.showfield[i].checked) {
+ if (document.getElementById('box_'+document.syllabus.showfield[i].value)) {
+ document.getElementById('box_'+document.syllabus.showfield[i].value).style.display='block';
+ }
+ } else {
+ if (document.getElementById('box_'+document.syllabus.showfield[i].value)) {
+ document.getElementById('box_'+document.syllabus.showfield[i].value).style.display='none';
+ }
+ }
+ }
+ }
+ } else {
+ if (caller.checked) {
+ if (document.getElementById('box_'+caller.value)) {
+ document.getElementById('box_'+caller.value).style.display='block';
+ }
+ } else {
+ if (document.getElementById('box_'+caller.value)) {
+ document.getElementById('box_'+caller.value).style.display='none';
+ }
+ }
+ }
+ return;
+}
+
+function setTemplateBoxes() {
+ $fieldstr
+ $checkedstr
+ $uncheckedstr
+ if (include.length > 0) {
+ for (var i=0; i<include.length; i++) {
+ if (document.getElementById('showfield_'+include[i])) {
+ document.getElementById('showfield_'+include[i]).checked = true;
+ if (document.getElementById('box_'+fields[include[i]])) {
+ document.getElementById('box_'+fields[include[i]]).style.display='block';
+ }
+ }
+ }
+ }
+ if (exclude.length > 0) {
+ for (var i=0; i<exclude.length; i++) {
+ if (document.getElementById('showfield_'+exclude[i])) {
+ document.getElementById('showfield_'+exclude[i]).checked = false;
+ if (document.getElementById('box_'+fields[exclude[i]])) {
+ document.getElementById('box_'+fields[exclude[i]]).style.display='none';
+ }
+ }
+ }
+ }
+ return;
+}
+
+$check_uncheck
+
+// ]]>
+</script>
+
+ENDSCRIPT
+ }
+ my $args = {'function' => undef,
+ 'domain' => $cdom};
+ my $forcereg;
+ if ($env{'form.register'}) {
+ $forcereg = 1;
+ $args->{'force_register'} = $forcereg;
+ }
+ if ($env{'form.backto'} eq 'coursecatalog') {
+ &Apache::lonhtmlcommon::clear_breadcrumbs();
+ my $brcrum = [{href=>"javascript:ToCatalog();",
+ text=>&mt('Course/Community Catalog'),
+ no_mt=>1}
+ ];
+ if ($env{'form.coursenum'} ne '') {
+ push(@{$brcrum},
+ {href=>"javascript:ToCatalog('details')",
+ text=>"Course details"});
+ }
+ push(@{$brcrum},
+ {href=>$r->uri,
+ text=>"Course syllabus"});
+ $args->{'bread_crumbs'} = $brcrum;
+ } elsif ($env{'form.folderpath'} =~ /^supplemental/) {
+ my $title = $env{'form.title'};
+ if ($title eq '') {
+ $title = &mt('Syllabus');
+ }
+ my $brcrum =
+ &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
+ if (ref($brcrum) eq 'ARRAY') {
+ $args->{'bread_crumbs'} = $brcrum;
+ }
+ } else {
+ if ((&Apache::lonnet::is_on_map("public/$cdom/$cnum/syllabus"))
+ && (($env{'form.symb'}) || ($env{'form.register'}))) {
+ &Apache::lonhtmlcommon::clear_breadcrumbs();
+ } else {
+ $args->{'bread_crumbs'} = [
+ {'href' => "/public/$cdom/$cnum/syllabus",
+ 'text' => 'Syllabus'},
+ ];
+ }
+ }
+ if ($allowed) {
+ my %loaditem = (
+ onload => 'setTemplateBoxes();',
+ );
+ $args->{'add_entries'} = \%loaditem;
+ }
+ my $start_page =
+ &Apache::loncommon::start_page("Syllabus", $rss_link.$js,$args);
+ $r->print($start_page);
+}
+
sub chooser {
my ($external,$uploaded,$cdom,$cnum,$lonhost,$fields,$values) = @_;
my %lt = &Apache::lonlocal::texthash(
@@ -876,10 +792,10 @@
'onclick="javascript:uncheckAll('."document.syllabus.showfield".');javascript:toggleBox('."'all'".');" />'.
'</legend>'.
&fields_check_uncheck($fields,$values).
- '</fieldset>'.
+ '</fieldset><br />'.
+ '<input type="submit" name="storesyl" value="'.&mt('Save All').'" />'.
'</div>';
- $output .= '<div style="padding:0;clear:both;margin:0;border:0"></div>'.
- '</form>';
+ $output .= '<div style="padding:0;clear:both;margin:0;border:0"></div>';
return $output;
}
@@ -889,30 +805,61 @@
my $numinrow = 4;
my $table;
my @fieldnames = sort(keys(%{$fields}));
- unshift(@fieldnames,'000_showrssfeeds');
+ unshift(@fieldnames,'000_showpeople','111_showrssfeeds');
my $numfields = scalar(@fieldnames);
+ my %included;
+ if (($values->{'uploaded.fields'}) && ($values->{'uploaded.fields'} ne 'none')) {
+ map { $included{$_} = 1; } split(/,/,$values->{'uploaded.fields'});
+ }
for (my $i=0; $i<$numfields; $i++) {
- my $checked;
- my $name = $fields->{$fieldnames[$i]};
- if ($fieldnames[$i] eq '000_showrssfeeds') {
+ my ($name,$checked);
+ if ($fieldnames[$i] eq '000_showpeople') {
+ $name = &mt('Personnel');
+ } elsif ($fieldnames[$i] eq '111_showrssfeeds') {
$name = &mt('RSS Feeds and Blogs');
- unless ($values->{$fieldnames[$i]} eq 'on') {
+ } else {
+ $name = $fields->{$fieldnames[$i]};
+ }
+ if ($values->{'uploaded.fields'}) {
+ unless ($values->{'uploaded.fields'} eq 'none') {
+ my ($prefix) = split(/_/,$fieldnames[$i]);
+ if ($included{$prefix}) {
+ $checked = ' checked="checked"';
+ }
+ }
+ } else {
+ if ($fieldnames[$i] eq '000_showpeople') {
+ $checked = ' checked="checked"';
+ } elsif ($fieldnames[$i] eq '111_showrssfeeds') {
$checked = ' checked="checked"';
+ } else {
+ if ($values->{$fieldnames[$i]} ne '') {
+ $checked = ' checked="checked"';
+ }
}
- } elsif ($values->{$fieldnames[$i]} ne '') {
- $checked = ' checked="checked"';
}
my $rem = $i%($numinrow);
if ($rem == 0) {
- if (($i > 0) && ($i < $numfields-1)) {
+ if (($i > 0) && ($i < $numfields)) {
$table .= '</tr>';
}
- if ($i < $numfields-1) {
+ if ($i < $numfields) {
$table .= '<tr>';
}
}
+ if ($i == $numfields-1) {
+ my $rem = $numfields%($numinrow);
+ my $colsleft = $numinrow - $rem;
+ if ($colsleft > 1) {
+ $table .= '<td colspan="'.$colsleft.'">';
+ } else {
+ $table .= '</td>';
+ }
+ } else {
+ $table .= '<td>';
+ }
$table .=
- '<td><label><input type="checkbox" name="showfield" value="'.$fieldnames[$i].'" '.
+ '<label><input type="checkbox" name="showfield" value="'.$fieldnames[$i].'" '.
$checked.' id="showfield_'.$i.'" onclick="javascript:toggleBox('."'$fieldnames[$i]',this".');" />'.
$name.'</label></td>'."\n";
}
@@ -929,6 +876,286 @@
return $table;
}
+sub get_personnel {
+ my ($r,$target,$cdom,$cnum,$allowed) = @_;
+ my $output;
+ my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
+ if ($target ne 'tex') {
+ $r->print(&Apache::lonhtmlcommon::start_pick_box());
+ } else {
+ $r->print('\begin{tabular}{|p{0.45\textwidth}|p{0.45\textwidth}|}\hline');
+ }
+ my @personnel=sort(keys(%coursepersonnel));
+ my $lastpers=$personnel[$#personnel];
+ foreach my $element (@personnel) {
+ if ($target ne 'tex') {
+ $r->print(&Apache::lonhtmlcommon::row_title($element));
+ } else {
+ $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & ');
+ }
+ my @coursepersonlist;
+ foreach my $user (split(/\,/,$coursepersonnel{$element})) {
+ my ($puname,$pudom)=split(/\:/,$user);
+ if ($target ne 'tex') {
+ my $courseperson = &Apache::loncommon::plainname($puname,$pudom);
+ if (($env{'user.name'} eq '') || ($env{'user.name'} eq 'public') ||
+ ($env{'user.domain'} eq '') || ($env{'user.domain'} eq 'public')) {
+ push(@coursepersonlist,$courseperson);
+ } else {
+ push(@coursepersonlist,&Apache::loncommon::aboutmewrapper($courseperson,
+ $puname,$pudom));
+ }
+ } else {
+ push(@coursepersonlist,&Apache::loncommon::plainname($puname,
+ $pudom).' ');
+ }
+ }
+ $r->print(join(", ", at coursepersonlist));
+ if ($target ne 'tex') {
+ my $lastclose=$element eq $lastpers?1:0;
+ $r->print(&Apache::lonhtmlcommon::row_closure($lastclose));
+ } else {
+ $r->print('\\\\ \hline');
+ }
+ }
+ if ($target ne 'tex') {
+ $r->print(&Apache::lonhtmlcommon::end_pick_box());
+ } else {
+ $r->print('\end{tabular}\\\\');
+ }
+ return;
+}
+
+sub save_changes {
+ my ($cnum,$cdom,$uploaded,$external,$syllabus,$syllabusfields,$courseenv) = @_;
+ my ($earlyout,$output);
+ unless ((ref($syllabus) eq 'HASH') && (ref($syllabusfields) eq 'HASH')) {
+ return ($earlyout,$uploaded,$external,$output);
+ }
+#store what the user typed in to the template
+ if ($env{'form.choice'} eq 'template') {
+ my @shown = &Apache::loncommon::get_env_multiple('form.showfield');
+ $syllabus->{'uploaded.fields'} = '';
+ if (@shown == 0) {
+ $syllabus->{'uploaded.fields'} = 'none';
+ } else {
+ foreach my $field (sort(@shown)) {
+ if (($field eq '000_showpeople') ||
+ ($field eq '111_showrssfeeds') ||
+ ($syllabusfields->{$field})) {
+ my ($prefix) = split(/_/,$field);
+ $syllabus->{'uploaded.fields'} .= $prefix.',';
+ }
+ }
+ $syllabus->{'uploaded.fields'} =~ s/,$//;
+ }
+ foreach my $syl_field (keys(%{$syllabusfields})) {
+ my $field=$env{'form.'.$syl_field};
+ chomp($field);
+ $field=~s/\s+$//s;
+ $field=~s/^\s+//s;
+ $field=~s/\<br\s*\/*\>$//s;
+ $field=&Apache::lonfeedback::clear_out_html($field,1);
+ #here it will be stored
+ $syllabus->{$syl_field}=$field;
+ if ($syl_field eq 'lll_includeurl') { # clean up included URLs
+ my $field='';
+ foreach my $value (split(/\n/,$syllabus->{$syl_field})) {
+ my $url=$value;
+# get rid of leading and trailing spaces
+ $url=~s/^\s+//;
+ $url=~s/\s+$//;
+ if ($url=~m|^https?\://([^/]+)/(.+)$|) {
+ my $host = $1;
+ my $remainder=$2;
+# remove the hostname from internal URLs
+ my $hostname = &Apache::lonnet::hostname($host);
+ my %all_hostnames = &Apache::lonnet::all_hostnames();
+ foreach my $possible_host (keys(%all_hostnames)) {
+ if ($possible_host =~ /\Q$hostname\E/i) {
+ $url=$remainder;
+ }
+ }
+ }
+# norm internal URLs
+ unless ($url=~/^https?\:/) {
+ $url=&Apache::lonnet::clutter($url);
+ }
+# re-assemble field
+ if ($url) {
+ $field.=$url."\n";
+ }
+ }
+ $syllabus->{$syl_field}=$field;
+ }
+ }
+ my $now = time;
+ $syllabus->{'uploaded.domain'}=$env{'user.domain'};
+ $syllabus->{'uploaded.name'}=$env{'user.name'};
+ $syllabus->{'uploaded.lastmodified'} = $now;
+ my $putres = &Apache::lonnet::put('syllabus',$syllabus,$cdom,$cnum);
+ if ($putres eq 'ok') {
+ my %storehash;
+ if ($courseenv->{'uploadedsyllabus'}) {
+ &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.uploadedsyllabus');
+ $storehash{'uploadedsyllabus'} = '';
+ }
+ if ($courseenv->{'externalsyllabus'}) {
+ &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.externalsyllabus');
+ $storehash{'externalsyllabus'} = '';
+ }
+ $storehash{'updatedsyllabus'} = $now;
+ &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
+ &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.updatedsyllabus' => $now});
+ if ($courseenv->{'externalsyllabus'} || $courseenv->{'uploadedsyllabus'}) {
+ undef($uploaded);
+ undef($external);
+ }
+ $output = '<div>'.
+ &Apache::lonhtmlcommon::confirm_success(&mt('Template saved.')).
+ '</div>';
+ } else {
+ $output = '<div class="LC_error">'.
+ &mt('An error occurred storing the template: [_1]',$putres).
+ '</div>';
+ }
+ } elsif ($env{'form.choice'} eq 'url') {
+ if ($env{'form.externalsyllabus'} =~ m{^https?://}) {
+ if ($env{'form.externalsyllabus'} eq $external) {
+ $output = '<div class="LC_info">'.
+ &mt('External URL unchanged.').
+ '</div>';
+ if ($uploaded) {
+ my $prefix;
+ my $home=&Apache::lonnet::homeserver($cnum,$cdom);
+ if ($home ne 'no_host') {
+ my $protocol = $Apache::lonnet::protocol{$home};
+ $protocol = 'http' if ($protocol ne 'https');
+ $prefix = $protocol.'://'.&Apache::lonnet::hostname($home);
+ }
+ unless ($external =~ m{^\Q$prefix/uploaded/$cdom/$cnum/portfolio/syllabus\E}) {
+ &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.uploadedsyllabus');
+ &Apache::lonnet::put('environment',{uploadedsyllabus => ''},
+ $cdom,$cnum);
+ undef($uploaded);
+ $earlyout = 1;
+ }
+ }
+ } else {
+ $external=$env{'form.externalsyllabus'};
+ $external =~ s/(`)//g;
+ my $putres =
+ &Apache::lonnet::put('environment',{externalsyllabus=>$external},
+ $cdom,$cnum);
+ if ($putres eq 'ok') {
+ &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.externalsyllabus' => $external});
+ $output = '<div>'.
+ &Apache::lonhtmlcommon::confirm_success(&mt('External URL saved.')).
+ '</div>';
+ if ($uploaded) {
+ my $prefix;
+ my $home=&Apache::lonnet::homeserver($cnum,$cdom);
+ if ($home ne 'no_host') {
+ my $protocol = $Apache::lonnet::protocol{$home};
+ $protocol = 'http' if ($protocol ne 'https');
+ $prefix = $protocol.'://'.&Apache::lonnet::hostname($home);
+ }
+ unless ($external =~ m{^\Q$prefix/uploaded/$cdom/$cnum/portfolio/syllabus\E}) {
+ &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.uploadedsyllabus');
+ &Apache::lonnet::put('environment',{uploadedsyllabus => ''},
+ $cdom,$cnum);
+ undef($uploaded);
+ }
+ }
+ } else {
+ $output = '<div class="LC_error">'.
+ &mt('An error occurred storing the external URL: [_1]',$putres).
+ '</div>';
+ }
+ }
+ } else {
+ $output = '<div class="LC_error">'.
+ &mt('External URL not saved -- invalid URL.').
+ '</div>';
+ }
+ } elsif ($env{'form.choice'} eq 'file') {
+ # Process file upload - phase one - upload and parse primary file.
+ my %allfiles = ();
+ my %codebase = ();
+ my ($upload_result,$uploadphase);
+ if ($env{'form.syllabusfile.filename'}) {
+ my ($url,$needlink) = &process_upload(\$output,$cnum,$cdom,
+ \%allfiles,\%codebase);
+ if ($url =~ m{^/uploaded/\Q$cdom\E/\Q$cnum\E.*/[^/]+$}) {
+ my $exturl;
+ my $home=&Apache::lonnet::homeserver($cnum,$cdom);
+ if ($home ne 'no_host') {
+ my $protocol = $Apache::lonnet::protocol{$home};
+ $protocol = 'http' if ($protocol ne 'https');
+ $exturl = $protocol.'://'.&Apache::lonnet::hostname($home).$url;
+ }
+ my %storehash = (
+ uploadedsyllabus => $url,
+ );
+ if ($exturl) {
+ $storehash{'externalsyllabus'} = $exturl;
+ if ($exturl =~ /\.(html?|txt|js|css)$/) {
+ $exturl .= '?inhibitmenu=yes';
+ }
+ } else {
+ $storehash{'externalsyllabus'} = '',
+ }
+ my $putres =
+ &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
+ if ($putres eq 'ok') {
+ &Apache::lonnet::make_public_indefinitely($url);
+ foreach my $key (keys(%storehash)) {
+ &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.'.$key => $storehash{$key}});
+ }
+ $uploaded = $url;
+ if ($needlink) {
+ $output .= &return_to_editor($cdom,$cnum).
+ &Apache::loncommon::end_page();
+ $earlyout = 1;
+ }
+ }
+ }
+ }
+ } elsif ($env{'form.phase'} eq 'upload_embedded') {
+ # Process file upload - phase two - upload embedded objects
+ my $uploadphase = 'check_embedded';
+ my $primaryurl = &HTML::Entities::encode($env{'form.primaryurl'},'<>&"');
+ my $state = &embedded_form_elems($uploadphase,$primaryurl);
+ my $url_root = '/uploaded/'.$cdom.'/'.$cnum;
+ my $actionurl = "/public/$cdom/$cnum/syllabus";
+ my ($result,$flag,$numpathchgs) =
+ &Apache::loncommon::upload_embedded('syllabus','portfolio/syllabus',
+ $cnum,$cdom,'/userfiles',$url_root,undef,undef,undef,$state,
+ $actionurl);
+ unless ($numpathchgs) {
+ my $modres =
+ &Apache::loncommon::modify_html_refs('syllabus','portfolio/syllabus',
+ $cnum,$cdom,
+ '/userfiles',$env{'form.primaryurl'});
+ $result .= $modres;
+ }
+ $output = $result.&return_to_editor($cdom,$cnum).
+ &Apache::loncommon::end_page();
+ $earlyout = 1;
+ } elsif ($env{'form.phase'} eq 'check_embedded') {
+ # Process file upload - phase three - modify references in HTML file
+ my $uploadphase = 'modified_orightml';
+ my $result =
+ &Apache::loncommon::modify_html_refs('syllabus','portfolio/syllabus',
+ $cnum,$cdom,
+ '/userfiles',$env{'form.primaryurl'});
+ $output = $result.&return_to_editor($cdom,$cnum).
+ &Apache::loncommon::end_page();
+ $earlyout = 1;
+ }
+ return ($earlyout,$uploaded,$external,$output);
+}
+
sub process_upload {
my ($upload_output,$cnum,$cdom,$allfiles,$codebase) = @_;
my ($parseaction,$showupload,$mimetype);
More information about the LON-CAPA-cvs
mailing list