--- loncom/interface/lonsyllabus.pm 2006/03/15 19:41:26 1.48
+++ loncom/interface/lonsyllabus.pm 2008/01/16 17:13:57 1.63
@@ -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.63 2008/01/16 17:13:57 bisitz 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);
-$html
-$head
-<link rel="alternate" type="application/rss+xml" title="Course Announcements" href="$feedurl" />
-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('<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
@@ -157,35 +109,40 @@ 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('<h1>'.$courseenv{'description'}.'</h1><h3>'.
- $Apache::lonnet::domaindescription{$cdom}.'</h3>');
+ 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.'<h1>'.$courseenv{'description'}.'</h1><h3>'.
+ &Apache::lonnet::domain($cdom,'description').'</h3>');
} 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') {
- $r->print('<table border="2">');
+ $r->print(&Apache::loncommon::start_data_table());
} else {
$r->print('\begin{tabular}{|p{0.45\textwidth}|p{0.45\textwidth}|}\hline');
}
foreach my $element (sort keys %coursepersonnel) {
if ($target ne 'tex') {
- $r->print('<tr><td>'.$element.'</td><td>');
+ $r->print(&Apache::loncommon::start_data_table_row().
+ '<td>'.$element.'</td><td>');
} else {
$r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & ');
}
@@ -201,13 +158,13 @@ ENDDOCUMENT
}
}
if ($target ne 'tex') {
- $r->print('</td></tr>');
+ $r->print('</td>'.&Apache::loncommon::end_data_table_row());
} else {
$r->print('\\\\ \hline');
}
}
if ($target ne 'tex') {
- $r->print('</table>');
+ $r->print(&Apache::loncommon::end_data_table());
} else {
$r->print('\end{tabular}\\\\');
}
@@ -220,7 +177,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)) {
@@ -230,9 +189,9 @@ ENDDOCUMENT
}
if ($allowed) {
$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')
+&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('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">'.
@@ -246,26 +205,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;
}
}
@@ -279,7 +241,7 @@ ENDDOCUMENT
$field.=$url."\n";
}
}
- $syllabus{$_}=$field;
+ $syllabus{$syl_field}=$field;
}
}
$syllabus{'uploaded.domain'}=$env{'user.domain'};
@@ -298,74 +260,76 @@ ENDDOCUMENT
$syllabus{'uploaded.domain'});
if ($target ne 'tex') {
$r->print('<table><tr><td>'.&mt('Last updated').':</td><td>'.
- $lastmod.'</td><td>'.&mt('by').' '.$who.
+ $lastmod.'</td><td>'.
+ ($who ? &mt('by').' '.$who
+ : '' ).
'</td></tr></table><p>');
} 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('<form method="post">'.
'<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="'.&mt('Save').'" />');
+ }
+ }
}
if ($allowed) {
$r->print('</form>'.
@@ -374,7 +338,7 @@ ENDDOCUMENT
if ($target ne 'tex') {$r->print('</p>');} else {$r->print('\\\\');}
} else {
if ($target ne 'tex') {$r->print('<p>');} else {$r->print('\par ');}
- $r->print('No syllabus information provided.');
+ $r->print(&mt('No syllabus information provided.'));
if ($target ne 'tex') {$r->print('</p>');}
}
if ($target ne 'tex') {