--- loncom/interface/lonsyllabus.pm 2006/03/21 21:25:33 1.49
+++ loncom/interface/lonsyllabus.pm 2007/03/02 23:17:58 1.57
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.49 2006/03/21 21:25:33 albertel Exp $
+# $Id: lonsyllabus.pm,v 1.57 2007/03/02 23:17:58 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -38,6 +38,7 @@ use Apache::lonannounce;
use Apache::lonlocal;
use Apache::lonhtmlcommon;
use Apache::lonspeller();
+use HTML::Entities();
sub handler {
my $r = shift;
@@ -71,59 +72,18 @@ sub handler {
if ($target eq 'tex') {
$r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
}
-# ----------------------------------------------------- Force menu registration
- my $addentries='';
- if ($env{'form.register'}) {
- $addentries=' onLoad="'.&Apache::lonmenu::loadevents().
- '" onUnload="'.&Apache::lonmenu::unloadevents().'"';
- $r->print(&Apache::lonmenu::registerurl(1));
- }
# -------------------------------------------------- Let's see who handles this
my $externalsyllabus=$courseenv{'externalsyllabus'};
if ($externalsyllabus=~/\w/) {
- $r->print(&Apache::loncommon::endheadtag());
+
if ($env{'form.wrapperdisplay'} eq 'menu') {
-#
-# Producing the menu buttons
-#
- $r->print('<body bgcolor="#FFFFFF">'.
- &Apache::lonmenu::menubuttons(1,'web',1).
- &Apache::loncommon::end_page());
- } else {
- if ($env{'browser.interface'} eq 'textual') {
-#
-# ssi-based rendering for text-based interface
-#
- $r->print('<body bgcolor="#FFFFFF">'.
- &Apache::lonmenu::menubuttons(1).
- &Apache::lonnet::ssi_body($externalsyllabus).
- &Apache::loncommon::end_page());
- } elsif ($env{'environment.remote'} eq 'off') {
-#
-# This is inline remote
-#
- $r->print(<<ENDDOCUMENTINL);
-<frameset rows="180,*" border="0" $addentries>
-<frame src="/public/$cdom/$cnum/syllabus?wrapperdisplay=menu">
-<frame src="$externalsyllabus">
-</frameset>
-</html>
-ENDDOCUMENTINL
- } else {
-#
-# frame-based rendering for graphical interface
-#
- $r->print(<<ENDDOCUMENT);
-<frameset rows="1,*" border="0" $addentries>
-<frame src="/adm/rat/empty.html">
-<frame src="$externalsyllabus">
-</frameset>
-</html>
-ENDDOCUMENT
- }
- }
- return OK;
+ $r->print(&Apache::lonwrapper::simple_menu());
+ } else {
+ $r->print(&Apache::lonwrapper::wrapper("/public/$cdom/$cnum/syllabus?wrapperdisplay=menu",
+ $externalsyllabus));
+ }
+ return OK;
}
# ------------------------------ The buck stops here: internal syllabus display
@@ -155,7 +115,6 @@ ENDDOCUMENT
my $start_page =
&Apache::loncommon::start_page("Syllabus", $rss_link,
{'function' => $forcestudent,
- 'add_entries' => $addentries,
'domain' => $cdom,
'force_register' =>
$env{'form.register'},});
@@ -170,7 +129,7 @@ ENDDOCUMENT
my $day = &Apache::lonannounce::showday(time,2,
&Apache::lonannounce::readcalendar($cdom.'_'.$cnum));
if ($target ne 'tex') {
- $r->print($day. &Apache::lonrss::advertisefeeds($cnum,$cdom));
+ $r->print($day. &Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
} else {
$r->print(&Apache::lonxml::xmlparse($r,'tex',$day));
}
@@ -219,7 +178,9 @@ ENDDOCUMENT
# ----------------------------------------------------- Only if not public call
if ($env{'user.environment'}) {
# does this user have privileges to post, etc?
- if ($env{'request.course.id'}) {
+ 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 (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) {
@@ -231,7 +192,7 @@ ENDDOCUMENT
$r->print('<p>'.
&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'</p><p>'.&mt('This syllabus can be publicly viewed at')
.' <tt>http://'.
- $Apache::lonnet::hostname{$homeserver}.$r->uri.'</tt>'.
+ &Apache::lonnet::hostname($homeserver).$r->uri.'</tt>'.
&Apache::loncommon::help_open_topic('Syllabus_ExtLink').'</p>'.
'<p>'.&mt('You can specify an external URL as Syllabus in the [_1].','<a href="/adm/parmset?action=crsenv">'.&mt('Course Parameters').'</a>').'</p>'.
'<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">'.
@@ -245,26 +206,29 @@ ENDDOCUMENT
}
}
if (($allowed) && ($env{'form.storesyl'})) {
- foreach (keys %syllabusfields) {
- my $field=$env{'form.'.$_};
+ 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);
- $syllabus{$_}=$field;
- if ($_ eq 'lll_includeurl') { # clean up included URLs
+ $syllabus{$syl_field}=$field;
+ if ($syl_field eq 'lll_includeurl') { # clean up included URLs
my $field='';
- foreach (split(/\n/,$syllabus{$_})) {
- my $url=$_;
+ 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=~/^http\:\/\/([^\/]+)\/(.+)$/) {
+ if ($url=~m|^http://([^/]+)/(.+)$|) {
+ my $host = $1;
my $remainder=$2;
# remove the hostname from internal URLs
- foreach (keys %Apache::lonnet::hostname) {
- if ($1=~/$Apache::lonnet::hostname{$_}/i) {
+ 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;
}
}
@@ -278,7 +242,7 @@ ENDDOCUMENT
$field.=$url."\n";
}
}
- $syllabus{$_}=$field;
+ $syllabus{$syl_field}=$field;
}
}
$syllabus{'uploaded.domain'}=$env{'user.domain'};
@@ -309,62 +273,60 @@ ENDDOCUMENT
'<input type="hidden" name="forceedit" value="edit" />');
}
my @htmlids=();
- foreach (sort keys %syllabusfields) {
- if (($syllabus{$_}=~/\w/) || ($allowed)) {
- my $message=$syllabus{$_};
- if ($_ eq 'lll_includeurl') { # this is the "included" field
- my $urls=$message;
- $message='';
- foreach my $filelink (split(/\n/,$urls)) {
- my $output='';
+ foreach my $field (sort(keys(%syllabusfields))) {
+ if (($syllabus{$field}=~/\w/) || ($allowed)) {
+ my $message=$syllabus{$field};
+ if ($field 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') || ($curfext=~/\/$/)) {
+ my ($curfext)=($filelink=~/\.([^\.]+)$/);
+ my $embstyle=&Apache::loncommon::fileembstyle($curfext);
+ if (($embstyle eq 'ssi') || ($curfext=~/\/$/)) {
# make ssi call and remove everything but the body contents
- $output=&Apache::lonnet::ssi_body($filelink);
- } elsif ($embstyle eq 'img') {
+ $output=&Apache::lonnet::ssi_body($filelink);
+ } elsif ($embstyle eq 'img') {
# embed as an image
- $output='<img src="'.$filelink.'" />';
- }
- if ($target ne 'tex') {
- $message.='<p>'.$output.'</p>';
- } else {
- $message.=' '.&Apache::lonxml::xmlparse($r,'tex','<p>'.$output.'</p>').' ';
- }
- }
- if ($allowed) {
- $r->print('<h3>'.$syllabusfields{$_}.
- &Apache::loncommon::help_open_topic('Syllabus_URLs').'</h3>'.
- '<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">'.&mt('Show Public View').'</font></a>'.
- &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
- } else {
- $r->print($message);
- }
- } else {
- &Apache::lonfeedback::newline_to_br(\$message);
- $message
- =~s/(https*\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
- if ($allowed) {
- $message=&Apache::lonspeller::markeduptext($message);
- }
- $message=&Apache::lontexconvert::msgtexconverted($message);
- if ($target ne 'tex') {
- $r->print('<h3>'.$syllabusfields{$_}.'</h3><blockquote>'.
- $message.'</blockquote>');
- } else {
- $r->print('\\\\\textbf{'.$syllabusfields{$_}.'}\\\\'.
- &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
- }
- push @htmlids,$_;
- }
- if ($allowed) {
- $r->print(
- '<br /><textarea cols="80" rows="12" name="'.$_.'" id="'.$_.'">'.
- $syllabus{$_}.
- '</textarea> <input type="submit" name="storesyl" value="Store" />');
- }
- }
+ $output='<img src="'.$filelink.'" />';
+ }
+ if ($target ne 'tex') {
+ $message.='<p>'.$output.'</p>';
+ } else {
+ $message.=' '.&Apache::lonxml::xmlparse($r,'tex','<p>'.$output.'</p>').' ';
+ }
+ }
+ if ($allowed) {
+ $r->print('<h3>'.$syllabusfields{$field}.
+ &Apache::loncommon::help_open_topic('Syllabus_URLs').'</h3>'.
+ '<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">'.&mt('Show Public View').'</font></a>'.
+ &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
+ } else {
+ $r->print($message);
+ }
+ } else {
+ &Apache::lonfeedback::newline_to_br(\$message);
+ $message =~s|(https*://[^\s]+)|<a href="$1"><tt>$1</tt></a>|g;
+ if ($allowed) {
+ $message=&Apache::lonspeller::markeduptext($message);
+ }
+ $message=&Apache::lontexconvert::msgtexconverted($message);
+ if ($target ne 'tex') {
+ $r->print('<h3>'.$syllabusfields{$field}.'</h3><blockquote>'.
+ $message.'</blockquote>');
+ } else {
+ $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
+ &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
+ }
+ push(@htmlids,$field);
+ }
+ if ($allowed) {
+ $r->print('<br /><textarea cols="80" rows="12" name="'.$field.'" id="'.$field.'">'.
+ &HTML::Entities::encode($syllabus{$field},'"&<>').
+ '</textarea> <input type="submit" name="storesyl" value="Store" />');
+ }
+ }
}
if ($allowed) {
$r->print('</form>'.