--- loncom/interface/lonsyllabus.pm 2004/05/03 17:49:11 1.29
+++ loncom/interface/lonsyllabus.pm 2007/03/08 01:58:45 1.58
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.29 2004/05/03 17:49:11 sakharuk Exp $
+# $Id: lonsyllabus.pm,v 1.58 2007/03/08 01:58:45 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,6 +36,9 @@ use Apache::lontexconvert;
use Apache::lonfeedback;
use Apache::lonannounce;
use Apache::lonlocal;
+use Apache::lonhtmlcommon;
+use Apache::lonspeller();
+use HTML::Entities();
sub handler {
my $r = shift;
@@ -43,25 +46,47 @@ sub handler {
$r->send_http_header;
return OK if $r->header_only;
-# ------------------------------------------------------------ Print the screen
- my $target=$ENV{'form.grade_target'};
- &Apache::lonnet::logthis("NOW TARGET IS DEFINIED AS $target");
- if ($target ne 'tex') {
- $r->print(<<ENDDOCUMENT);
-<html>
-<head>
-<title>The LearningOnline Network with CAPA</title>
-ENDDOCUMENT
- } else {
- $r->print(&Apache::lonprintout::print_latex_header($ENV{'form.latex_type'}));
- }
+ my $target=$env{'form.grade_target'};
+# --------------------------------------------------- Get course info from URL
my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri);
-# Is this even a course?
- my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom);
+# ------------------------------------------------------------ Get query string
+ &Apache::loncommon::get_unprocessed_cgi
+ ($ENV{'QUERY_STRING'},['forcestudent','register','forceedit','wrapperdisplay']);
+# ----------------------------------------------------- Is this even a course?
+ my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom);
if ($homeserver eq 'no_host') {
- $r->print('</head><body>'.&mt('No syllabus available').'</body></html>');
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+ &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 $rss_link =
+ &Apache::lonrss::rss_link('http://'.$ENV{'HTTP_HOST'}.'/public/'.$cdom.'/'.$cnum.'/Course_Announcements.rss');
+
+ if ($target eq 'tex') {
+ $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
+ }
+# -------------------------------------------------- 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;
+ }
+
+# ------------------------------ The buck stops here: internal syllabus display
# --------------------------------------------------------- The syllabus fields
my %syllabusfields=&Apache::lonlocal::texthash(
'aaa_instructorinfo' => 'Instructor Information',
@@ -79,51 +104,50 @@ ENDDOCUMENT
'jjj_weblinks' => 'Web Links',
'kkk_textbook' => 'Textbook',
'lll_includeurl' => 'URLs To Include in Syllabus');
-
-# ------------------------------------------------------------ Get query string
- &Apache::loncommon::get_unprocessed_cgi
- ($ENV{'QUERY_STRING'},['forcestudent','register','forceedit']);
-# ----------------------------------------------------- Force menu registration
- my $addentries='';
- if ($ENV{'form.register'}) {
- $addentries=' onLoad="'.&Apache::lonmenu::loadevents().
- '" onUnload="'.&Apache::lonmenu::unloadevents().'"';
- $r->print(&Apache::lonmenu::registerurl(1));
- }
# --------------------------------------------------------------- Force Student
my $forcestudent='';
- if ($ENV{'form.forcestudent'}) { $forcestudent='student'; };
+ if ($env{'form.forcestudent'}) { $forcestudent='student'; };
my $forceedit='';
- if ($ENV{'form.forceedit'}) { $forceedit='edit'; }
+ if ($env{'form.forceedit'}) { $forceedit='edit'; }
-# ------------------------------------- There is such a course, get environment
- my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
+# ----------------------------------------------------------------- Make header
if ($target ne 'tex') {
- $r->print('</head>'.&Apache::loncommon::bodytag
- ("Syllabus",$forcestudent,$addentries,'',$cdom,$ENV{'form.register'}));
- $r->print('<h1>'.$courseenv{'description'}.'</h1><h3>'.
- $Apache::lonnet::domaindescription{$cdom}.'</h3>');
+ 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?
- $r->print(&Apache::lonannounce::showday(time,2,
- &Apache::lonannounce::readcalendar($cdom.'_'.$cnum)));
+ my $day = &Apache::lonannounce::showday(time,2,
+ &Apache::lonannounce::readcalendar($cdom.'_'.$cnum));
+ if ($target ne 'tex') {
+ $r->print($day. &Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
+ } else {
+ $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">');
} else {
- $r->print('\begin{tabular}{|c|c|}\hline');
+ $r->print('\begin{tabular}{|p{0.45\textwidth}|p{0.45\textwidth}|}\hline');
}
- foreach (sort keys %coursepersonnel) {
+ foreach my $element (sort keys %coursepersonnel) {
if ($target ne 'tex') {
- $r->print('<tr><td>'.$_.'</td><td>');
+ $r->print('<tr><td>'.$element.'</td><td>');
} else {
- $r->print(' '.$_.'\\\\ ');
+ $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & ');
}
- foreach (split(/\,/,$coursepersonnel{$_})) {
+ foreach (split(/\,/,$coursepersonnel{$element})) {
my ($puname,$pudom)=split(/\:/,$_);
if ($target ne 'tex') {
$r->print(' '.&Apache::loncommon::aboutmewrapper(
@@ -152,22 +176,25 @@ ENDDOCUMENT
# This handler might be called anonymously ...
# ----------------------------------------------------- Only if not public call
- if ($ENV{'user.environment'}) {
+ if ($env{'user.environment'}) {
# does this user have privileges to post, etc?
- if ($ENV{'request.course.id'}) {
- $allowed=&Apache::lonnet::allowed('mdc',$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)) {
$forcestudent='student';
}
- if ($forcestudent) { $allowed=0; }
+ if ($forcestudent or $target eq 'tex') { $allowed=0; }
}
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')
.' <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">'.
&mt('Show Public View').'</font></a>'.
&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').
@@ -178,24 +205,30 @@ ENDDOCUMENT
&mt('Edit').'</font></a>');
}
}
- if (($allowed) && ($ENV{'form.storesyl'})) {
- foreach (keys %syllabusfields) {
- my $field=$ENV{'form.'.$_};
+ if (($allowed) && ($env{'form.storesyl'})) {
+ foreach my $syl_field (keys(%syllabusfields)) {
+ my $field=$env{'form.'.$syl_field};
+ chomp($field);
$field=~s/\s+$//s;
- $field=&Apache::lonfeedback::clear_out_html($field,1);
- $syllabus{$_}=$field;
- if ($_ eq 'lll_includeurl') { # clean up included URLs
+ $field=~s/^\s+//s;
+ $field=~s/\<br\s*\/*\>$//s;
+ $field=&Apache::lonfeedback::clear_out_html($field,1);
+ $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;
}
}
@@ -209,11 +242,11 @@ ENDDOCUMENT
$field.=$url."\n";
}
}
- $syllabus{$_}=$field;
+ $syllabus{$syl_field}=$field;
}
}
- $syllabus{'uploaded.domain'}=$ENV{'user.domain'};
- $syllabus{'uploaded.name'}=$ENV{'user.name'};
+ $syllabus{'uploaded.domain'}=$env{'user.domain'};
+ $syllabus{'uploaded.name'}=$env{'user.name'};
$syllabus{'uploaded.lastmodified'}=time;
&Apache::lonnet::put('syllabus',\%syllabus,$cdom,$cnum);
}
@@ -239,62 +272,77 @@ ENDDOCUMENT
$r->print('<form method="post">'.
'<input type="hidden" name="forceedit" value="edit" />');
}
- foreach (sort keys %syllabusfields) {
- if (($syllabus{$_}) || ($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='';
+ my @htmlids=();
+ 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.'" />';
- }
- $message.='<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 {
- $message=~s/\n/\<br \/\>/g;
- $message
- =~s/(https*\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
- $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,' ',$message).'\\\\');
- }
- }
- if ($allowed) {
- $r->print('<br /><textarea cols="80" rows="6" name="'.$_.'">'.
- $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>');
+ $r->print('</form>'.
+ &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));
}
if ($target ne 'tex') {$r->print('</p>');} else {$r->print('\\\\');}
} else {
- $r->print('<p>No syllabus information provided.</p>');
+ if ($target ne 'tex') {$r->print('<p>');} else {$r->print('\par ');}
+ $r->print('No syllabus information provided.');
+ if ($target ne 'tex') {$r->print('</p>');}
+ }
+ if ($target ne 'tex') {
+ $r->print(&Apache::loncommon::end_page());
+ } else {
+ $r->print('\end{document}');
}
- if ($target ne 'tex') {$r->print('</body></html>');} else {$r->print('\end{document}');}
return OK;
}