--- loncom/interface/lonsyllabus.pm 2002/09/13 19:40:48 1.8
+++ loncom/interface/lonsyllabus.pm 2003/02/10 14:44:36 1.9
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.8 2002/09/13 19:40:48 www Exp $
+# $Id: lonsyllabus.pm,v 1.9 2003/02/10 14:44:36 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -69,7 +69,8 @@ ENDDOCUMENT
'hhh_readings' => 'Readings',
'iii_coursepack' => 'Coursepack',
'jjj_weblinks' => 'Web Links',
- 'kkk_textbook' => 'Textbook');
+ 'kkk_textbook' => 'Textbook',
+ 'lll_includeurl' => 'URLs To Include in Syllabus');
# --------------------------------------------------------------- Force Student
&Apache::loncommon::get_unprocessed_cgi
@@ -106,6 +107,33 @@ ENDDOCUMENT
$field=~s/\\<\;/g;
$field=~s/\>/\>\;/g;
$syllabus{$_}=$field;
+ if ($_ eq 'lll_includeurl') { # clean up included URLs
+ my $field='';
+ foreach (split(/\n/,$syllabus{$_})) {
+ my $url=$_;
+# get rid of leading and trailing spaces
+ $url=~s/^\s+//;
+ $url=~s/\s+$//;
+ if ($url=~/^http\:\/\/([^\/]+)\/(.+)$/) {
+ my $remainder=$2;
+# remove the hostname from internal URLs
+ foreach (keys %Apache::lonnet::hostname) {
+ if ($1=~/$Apache::lonnet::hostname{$_}/i) {
+ $url=$remainder;
+ }
+ }
+ }
+# norm internal URLs
+ unless ($url=~/^http\:/) {
+ $url=&Apache::lonnet::clutter($url);
+ }
+# re-assemble field
+ if ($url) {
+ $field.=$url."\n";
+ }
+ }
+ $syllabus{$_}=$field;
+ }
}
$syllabus{'uploaded.domain'}=$ENV{'user.domain'};
$syllabus{'uploaded.name'}=$ENV{'user.name'};
@@ -132,12 +160,42 @@ ENDDOCUMENT
foreach (sort keys %syllabusfields) {
if (($syllabus{$_}) || ($allowed)) {
my $message=$syllabus{$_};
- $message=~s/\n/\
/g;
- $message
+ if ($_ eq 'lll_includeurl') { # this is the "included" field
+ my $urls=$message;
+ $message='';
+ foreach my $filelink (split(/\n/,$urls)) {
+ my $output='';
+# embed style?
+ my ($curfext)=($filelink=~/\.([^\.]+)$/);
+ my $embstyle=&Apache::loncommon::fileembstyle($curfext);
+ if ($embstyle eq 'ssi') {
+# make ssi call and remove everything but the body contents
+ $output=&Apache::lonnet::ssi($filelink);
+ $output=~s/^.*\
'.$output.'
'; + } + if ($allowed) { + $r->print(''. + "http://www.foo.org/foo.html\n/res/foo/author/foo.html\n". + ''); + } else { + $r->print($message); + } + } else { + $message=~s/\n/\
'. + $message=&Apache::lontexconvert::msgtexconverted($message); + $r->print(''.$syllabusfields{$_}.'
'. $message.''); + } if ($allowed) { $r->print('