--- loncom/interface/lonsyllabus.pm 2006/03/15 19:41:26 1.48
+++ loncom/interface/lonsyllabus.pm 2007/07/27 00:21:39 1.61
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.48 2006/03/15 19:41:26 albertel Exp $
+# $Id: lonsyllabus.pm,v 1.61 2007/07/27 00:21:39 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;
@@ -56,79 +57,30 @@ sub handler {
if ($homeserver eq 'no_host') {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
- $r->print(&Apache::loncommon::startpage('No syllabus available').
- &mt('No syllabus available').
- &Apache::loncommon::end_page());
+ &Apache::loncommon::simple_error_page($r,'No syllabus available',
+ 'No syllabus available');
return OK;
}
# ------------------------------------- There is such a course, get environment
my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
# ------------------------------------------------------------ Print the screen
- my $feedurl='http://'.$ENV{'HTTP_HOST'}.'/public/'.$cdom.'/'.$cnum.'/Course_Announcements.rss';
- if ($target ne 'tex') {
- my $html=&Apache::lonxml::xmlbegin();
- my $head=&Apache::loncommon::headtag('The LearningOnline Network with CAPA');
- $r->print(<
-ENDDOCUMENT
- } else {
+
+ 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('
'.
- &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(''.
- &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
- } else {
-#
-# frame-based rendering for graphical interface
-#
- $r->print(<
-
-
-
-
-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
@@ -157,25 +109,29 @@ ENDDOCUMENT
# ----------------------------------------------------------------- Make header
if ($target ne 'tex') {
- $r->print(&Apache::lonhtmlcommon::htmlareaheaders().
- &Apache::loncommon::endheadtag().
- &Apache::loncommon::bodytag("Syllabus",$forcestudent,$addentries,'',$cdom,$env{'form.register'}));
- $r->print(''.$courseenv{'description'}.'
'.
- $Apache::lonnet::domaindescription{$cdom}.'
');
+ my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);
+ my $start_page =
+ &Apache::loncommon::start_page("Syllabus", $rss_link,
+ {'function' => $forcestudent,
+ 'domain' => $cdom,
+ 'force_register' =>
+ $env{'form.register'},});
+
+ $r->print($start_page.''.$courseenv{'description'}.'
'.
+ &Apache::lonnet::domain($cdom,'description').'
');
} else {
$r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'.
- $Apache::lonnet::domaindescription{$cdom}.'}\\\\');
+ &Apache::lonnet::domain($cdom,'description').'}\\\\');
}
# -------------------------------------------------------------- Announcements?
+ my $day = &Apache::lonannounce::showday(time,2,
+ &Apache::lonannounce::readcalendar($cdom.'_'.$cnum));
if ($target ne 'tex') {
- $r->print(&Apache::lonannounce::showday(time,2,
- &Apache::lonannounce::readcalendar($cdom.'_'.$cnum)).
- &Apache::lonrss::advertisefeeds($cnum,$cdom));
+ $r->print($day. &Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
} else {
- $r->print(&Apache::lonxml::xmlparse($r,'tex',
- &Apache::lonannounce::showday(time,2,
- &Apache::lonannounce::readcalendar($cdom.'_'.$cnum))));
+ $r->print(&Apache::lonxml::xmlparse($r,'tex',$day));
}
+
# -------------------------------------------------------- Get course personnel
my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
if ($target ne 'tex') {
@@ -220,7 +176,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)) {
@@ -232,7 +190,7 @@ ENDDOCUMENT
$r->print(''.
&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'
'.&mt('This syllabus can be publicly viewed at')
.' http://'.
- $Apache::lonnet::hostname{$homeserver}.$r->uri.''.
+ &Apache::lonnet::hostname($homeserver).$r->uri.''.
&Apache::loncommon::help_open_topic('Syllabus_ExtLink').'
'.
''.&mt('You can specify an external URL as Syllabus in the [_1].',''.&mt('Course Parameters').'').'
'.
''.
@@ -246,26 +204,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/\
$//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;
}
}
@@ -279,7 +240,7 @@ ENDDOCUMENT
$field.=$url."\n";
}
}
- $syllabus{$_}=$field;
+ $syllabus{$syl_field}=$field;
}
}
$syllabus{'uploaded.domain'}=$env{'user.domain'};
@@ -298,74 +259,76 @@ ENDDOCUMENT
$syllabus{'uploaded.domain'});
if ($target ne 'tex') {
$r->print(''.&mt('Last updated').': | '.
- $lastmod.' | '.&mt('by').' '.$who.
+ $lastmod.' | '.
+ ($who ? &mt('by').' '.$who
+ : '' ).
' |
');
} else {
- $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '.&mt('by').'\\\\ '.
- &Apache::loncommon::plainname($syllabus{'uploaded.name'},
- $syllabus{'uploaded.domain'}).'\\\\');
+ $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '.
+ ($who? &mt('by').'\\\\ '.
+ &Apache::loncommon::plainname($syllabus{'uploaded.name'},$syllabus{'uploaded.domain'})
+ :'')
+ .'\\\\');
}
if ($allowed) {
$r->print('
'.