--- loncom/interface/lonsyllabus.pm 2010/02/15 20:28:51 1.106.2.3
+++ loncom/interface/lonsyllabus.pm 2013/05/06 16:15:59 1.120
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.106.2.3 2010/02/15 20:28:51 faziophi Exp $
+# $Id: lonsyllabus.pm,v 1.120 2013/05/06 16:15:59 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -40,16 +40,6 @@ use Apache::lonlocal;
use Apache::lonhtmlcommon;
use Apache::lonspeller();
use HTML::Entities();
-use Digest::MD5 qw(md5_hex);
-use Storable qw(freeze thaw);
-
-# These are strings representing types of fields
-# that will used to parse/display a field correctly
-use constant {
- TYPE_TEXT_HTML => 'html', #<-- default
- TYPE_TEXT_PLAIN => 'text',
- TYPE_URL_INCLUDE => 'include-url',
-};
sub handler {
my $r = shift;
@@ -62,7 +52,8 @@ sub handler {
my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri);
# ------------------------------------------------------------ Get query string
&Apache::loncommon::get_unprocessed_cgi
- ($ENV{'QUERY_STRING'},['delete', 'rename', 'field', 'forcestudent','register','forceedit','forceflush','wrapperdisplay']);
+ ($ENV{'QUERY_STRING'},['register','forceedit','todocs',
+ 'folderpath','title']);
# ----------------------------------------------------- Is this even a course?
my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom);
if ($homeserver eq 'no_host') {
@@ -71,28 +62,91 @@ sub handler {
&Apache::loncommon::simple_error_page($r,'No syllabus available',
'No syllabus available');
return OK;
+ } elsif (!&Apache::lonnet::is_course($cdom,$cnum)) {
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+ &Apache::loncommon::simple_error_page($r,'No syllabus available',
+ 'The course/community for which the syllabus was requested does not exist.');
+ return OK;
}
# ------------------------------------- There is such a course, get environment
my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
# ------------------------------------------------------------ Print the screen
+
if ($target eq 'tex') {
$r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
}
-
+
+# --------------------------------------------------------------- Force Student
+ my ($forceedit,$forcestudent);
+ if ($env{'form.forceedit'}) { $forceedit=1; }
+ if (!$forceedit) {
+ $forcestudent=1;
+ }
+
+# --------------------------------------------------------------- Check Privileges
+ my $allowed = 0;
+ if ($env{'user.environment'}) {
+# does this user have privileges to post, etc?
+ if ($env{'request.course.id'}
+ && $cdom eq $env{'course.'.$env{'request.course.id'}.'.domain'}
+ && $cnum eq $env{'course.'.$env{'request.course.id'}.'.num'}) {
+ $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});
+ if ($forcestudent or $target eq 'tex') { $allowed=0; }
+ }
+ }
+
# -------------------------------------------------- Let's see who handles this
- my $externalsyllabus=$courseenv{'externalsyllabus'};
- if ($externalsyllabus=~/\w/) {
- if ($env{'form.wrapperdisplay'} eq 'menu') {
- $r->print(&Apache::lonwrapper::simple_menu());
- } else {
- $r->print(&Apache::lonwrapper::wrapper("/public/$cdom/$cnum/syllabus?wrapperdisplay=menu",
- $externalsyllabus));
- }
- return OK;
+ my $external=$courseenv{'externalsyllabus'};
+ my $uploaded=$courseenv{'uploadedsyllabus'};
+
+ if ($uploaded =~/\w/) {
+ if ($external =~ m{\Q$uploaded\E$}) {
+ undef($external);
+ }
+ unless ($allowed && $forceedit) {
+ my $file=&Apache::lonnet::filelocation("",$uploaded);
+ if ($file =~ /\.(sty|css|js|txt|tex|html?)$/) {
+ my $filetype;
+ if ($file =~ /\.(sty|css|js|txt|tex)$/) {
+ $filetype=$1;
+ } else {
+ $filetype='html';
+ }
+ my $result = '';
+ my $filecontents=&Apache::lonnet::getfile($file);
+ if ($filecontents eq -1) {
+ $r->print(&mt('Syllabus file unavailable'));
+ } elsif ($filetype eq 'html') {
+ my %mystyle;
+ &Apache::structuretags::reset_problem_globals();
+ my $oldfile = $env{'request.filename'};
+ $env{'request.filename'} = $uploaded;
+ $result = &Apache::lonxml::xmlparse($r,'web',$filecontents,
+ '',%mystyle);
+ &Apache::structuretags::reset_problem_globals();
+ &Apache::lonhomework::finished_parsing();
+ $env{'request.filename'} = $oldfile;
+ &Apache::lonxml::add_messages(\$result);
+ $r->print($result);
+ }
+ } else {
+ $r->print(&Apache::lonwrapper::wrapper($uploaded));
+ }
+ return OK;
+ }
+ } elsif ($external=~/\w/) {
+ unless ($allowed && $forceedit) {
+ $r->print(&Apache::lonwrapper::wrapper($external));
+ return OK;
+ }
}
-# --------------------------------------------------------- The old syllabus fields
+ my $crstype = &Apache::loncommon::course_type();
+
+# ------------------------------ The buck stops here: internal syllabus display
+# --------------------------------------------------------- The syllabus fields
my %syllabusfields=&Apache::lonlocal::texthash(
'aaa_instructorinfo' => 'Instructor Information',
'bbb_description' => 'Course Description',
@@ -109,13 +163,6 @@ sub handler {
'jjj_weblinks' => 'Web Links',
'kkk_textbook' => 'Textbook',
'lll_includeurl' => 'URLs To Include in Syllabus');
-
-# --------------------------------------------------------------- Force Student
- my $forcestudent='';
- if ($env{'form.forcestudent'}) { $forcestudent='student'; };
- my $forceedit='';
- if ($env{'form.forceedit'}) { $forceedit='edit'; }
-
# ----------------------------------------------------------------- Make header
if ($target ne 'tex') {
my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);
@@ -124,6 +171,8 @@ sub handler {
$js .= <<"ENDSCRIPT";
ENDSCRIPT
}
- $js .= <<'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";
-ENDSCRIPT
- my $start_page =
- &Apache::loncommon::start_page("Syllabus", $rss_link.$js,
- {'function' => undef,
- 'domain' => $cdom,
- 'force_register' =>
- $env{'form.register'},});
- $r->print($start_page);
+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();
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:ToCatalog()",
- text=>"Course/Community Catalog"});
+ my $brcrum = [{href=>"javascript:ToCatalog();",
+ text=>&mt('Course/Community Catalog'),
+ no_mt=>1}
+ ];
if ($env{'form.coursenum'} ne '') {
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:ToCatalog('details')",
- text=>"Course details"});
- }
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>$r->uri,
- text=>"Course syllabus"});
- $r->print(&Apache::lonhtmlcommon::breadcrumbs());
+ 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); # load db
- my $allowed=0; # can we edit this page?
- my $privileged=0;
- my %data;
- if ($env{'form.forceflush'}) {
- delete $syllabus{'data.fields'};
- &Apache::lonnet::del('syllabus', ['data.fields'], $cdom, $cnum);
- delete $syllabus{'properties.v2_conflict'};
- &Apache::lonnet::del('syllabus', ['properties.v2_conflict'], $cdom, $cnum);
- delete $syllabus{'properties.v2_conflict_fail'};
- &Apache::lonnet::del('syllabus', ['properties.v2_conflict_fail'], $cdom, $cnum);
- delete $syllabus{'properties.last_modified'};
- &Apache::lonnet::del('syllabus', ['properties.last_modified'], $cdom, $cnum);
- delete $syllabus{'properties.v2_converted'};
- &Apache::lonnet::del('syllabus', ['properties.v2_converted'], $cdom, $cnum);
- delete $syllabus{'data.old_new_map'};
- &Apache::lonnet::del('syllabus', ['data.old_new_map'], $cdom, $cnum);
- delete $syllabus{'data.deleted_fields'};
- &Apache::lonnet::del('syllabus', ['data.deleted_fields'], $cdom, $cnum);
- %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum); # load db
- $r->print("Flushed syllabus DB file.
");
- $r->print("Syllabus conflict: ".$syllabus{'properties.v2_conflict'}."
");
- }
- #$r->print("Existing fields: ".$syllabus{'data.fields'}."
");
- #$r->print("Old-new map: ".$syllabus{'data.old_new_map'}."
");
- #$r->print("Deleted fields: ".$syllabus{'data.deleted_fields'}."
");
- if (!exists($syllabus{'data.fields'})) {
- # convert existing 2.x data to new DB fields
- # which become new primary data source for document
- %data = %{convert_from_v2($r, \%syllabus, \%syllabusfields, 0)};
- #$r->print("New fields order: ".$data{'data.fields'}."
");
- &Apache::lonnet::put('syllabus',\%data,$cdom,$cnum);
- } elsif ( !exists($syllabus{'properties.v2_converted'}) &&
- exists($syllabus{'uploaded.lastmodified'}) &&
- exists($syllabus{'properties.last_modified'}) &&
- ($syllabus{'uploaded.lastmodified'} !=
- $syllabus{'properties.last_modified'})) {
- # if the document has been saved in 3.x and later edited in
- # 2.x, reconvert the existing document, with extra warning
- %data = %{convert_from_v2($r, \%syllabus, \%syllabusfields, 1)};
- delete $data{'properties.v2_converted'};
- &Apache::lonnet::del('syllabus', ['properties.v2_converted'], $cdom, $cnum);
- $data{'properties.v2_conflict'} = 1;
- &Apache::lonnet::put('syllabus',\%data,$cdom,$cnum);
- } else {
- %data = %syllabus;
-
- }
+ my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum);
+ my %displayfields;
+# This handler might be called anonymously ...
# ----------------------------------------------------- Only if not public call
- if ($env{'user.environment'}) { # does this user have privileges to post, etc?
- if ($env{'request.course.id'}
- && $cdom eq $env{'course.'.$env{'request.course.id'}.'.domain'}
- && $cnum eq $env{'course.'.$env{'request.course.id'}.'.num'}) {
- $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});
- $privileged=$allowed;
- if (($data{'uploaded.lastmodified'}) && (!$forceedit)) {
- $forcestudent='student';
+ 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/\
$//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 ($forcestudent or $target eq 'tex') { $allowed=0; }
+ $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);
+ }
+ } elsif ($env{'form.storeurl'}) {
+ if ($env{'form.externalsyllabus'} =~ m{^https?://}) {
+ if ($env{'form.externalsyllabus'} eq $external) {
+ $r->print('
' - .&mt('This syllabus can be publicly viewed at [_1]' - ,''.$protocol.'://'.&Apache::lonnet::hostname($homeserver).$r->uri.'') - .' '.&Apache::loncommon::help_open_topic('Syllabus_ExtLink') - .'
' - .'' - .&mt('Instead of using this template you can specify an external URL as Syllabus in the [_1]Course Configuration[_2].' - ,'','') - .'
' - ); - #-Print Help Text - $r->print(&Apache::loncommon::help_open_topic( - 'Uploaded_Templates_TextBoxes', - &mt('Help with filling in text boxes'))); - } - -#----------Print last update - my $lastmod=$syllabus{'uploaded.lastmodified'}; - $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never')); - my $who = &Apache::loncommon::aboutmewrapper( - &Apache::loncommon::plainname($syllabus{'uploaded.name'}, - $syllabus{'uploaded.domain'}),$syllabus{'uploaded.name'}, - $syllabus{'uploaded.domain'}); - if ($target ne 'tex') { - $r->print(''. + &mt('All feeds currently hidden'). + $msg. + '
'); + } else { + $r->print(''. + &mt('No current feeds'). + $msg. + '
'); + } + $rsslinktext = &mt('Manage Course RSS Feeds/Blogs'); + if ($crstype eq 'Community') { + $rsslinktext = &mt('Manage Communiity RSS Feeds/Blogs'); + } + } + my $editurl= &Apache::lonnet::absolute_url().'/adm/'.$cdom.'/'.$cnum.'/_rss.html'; + $r->print( ''.$rsslinktext.''); + &Apache::lontemplate::print_end_template($r); + } else { + unless ($syllabus{'000_showrssfeeds'} eq 'no') { + my $feeds = &Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit); + if ($feeds ne '') { + &Apache::lontemplate::print_start_template($r,&mt('RSS Feeds and Blogs'),'LC_Box'); + $r->print($feeds); + &Apache::lontemplate::print_end_template($r); + } + } } - $r->print("');} - if ($allowed) { - &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_Box'); - $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit)); - my $editurl= &Apache::lonnet::absolute_url().'/adm/'.$cdom.'/'.$cnum.'/_rss.html'; - $r->print( ''.&mt('New RSS Feed or Blog').''); - &Apache::lontemplate::print_end_template($r); - } elsif (&Apache::lonrss::advertisefeeds($cnum,$cdom) ne '') { - &Apache::lontemplate::print_start_template($r,'RSS Feeds and Blogs','LC_Box'); - $r->print(&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit)); - &Apache::lontemplate::print_end_template($r); + &Apache::lonhtmlcommon::htmlareaselectactive()); } } else { - if ($target ne 'tex') {$r->print('
');} else {$r->print('\par ');} + if ($target ne 'tex') {$r->print('
');} else {$r->print('\par ');} $r->print(&mt('No syllabus information provided.')); if ($target ne 'tex') {$r->print('
');} } if ($target ne 'tex') { + $r->print(''.&mt('Uploaded [_1]', + ''.$stored.''). + '
'; + } else { + my ($filename) = ($env{'form.syllabusfile.filename'} =~ m{([^/]+)$}); + $$upload_output = ''.&mt('This file contains embedded multimedia objects, which need to be uploaded.').'
'.$embedded; + } elsif ($numpathchanges) { + $$upload_output .= $embedded; + } else { + $$upload_output .= $embedded; + &Apache::loncommon::modify_html_refs('syllabus','portfolio/syllabus', + $cnum,$cdom,'/userfiles',$url); + } + } else { + $$upload_output .= &mt('Embedded item(s) already present, so no additional upload(s) required').'