--- loncom/interface/lonsyllabus.pm 2006/03/21 21:50:49 1.50 +++ loncom/interface/lonsyllabus.pm 2007/07/27 00:24:50 1.62 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.50 2006/03/21 21:50:49 albertel Exp $ +# $Id: lonsyllabus.pm,v 1.62 2007/07/27 00:24:50 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; @@ -65,18 +66,9 @@ sub handler { # ------------------------------------------------------------ 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'})); } -# ----------------------------------------------------- Force menu registration - my $addentries=''; - if ($env{'form.register'}) { - $addentries=' onLoad="'.&Apache::lonmenu::loadevents(). - '" onUnload="'.&Apache::lonmenu::unloadevents().'"'; - } # -------------------------------------------------- Let's see who handles this my $externalsyllabus=$courseenv{'externalsyllabus'}; @@ -117,25 +109,25 @@ sub handler { # ----------------------------------------------------------------- Make header if ($target ne 'tex') { + my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom); my $start_page = &Apache::loncommon::start_page("Syllabus", $rss_link, {'function' => $forcestudent, - 'add_entries' => $addentries, 'domain' => $cdom, 'force_register' => $env{'form.register'},}); $r->print($start_page.'

'.$courseenv{'description'}.'

'. - $Apache::lonnet::domaindescription{$cdom}.'

'); + &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($day. &Apache::lonrss::advertisefeeds($cnum,$cdom)); + $r->print($day. &Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit)); } else { $r->print(&Apache::lonxml::xmlparse($r,'tex',$day)); } @@ -143,13 +135,14 @@ sub handler { # -------------------------------------------------------- Get course personnel my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum); if ($target ne 'tex') { - $r->print(''); + $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(''); + $r->print(''.&Apache::loncommon::end_data_table_row()); } else { $r->print('\\\\ \hline'); } } if ($target ne 'tex') { - $r->print('
'.$element.''); + $r->print(&Apache::loncommon::start_data_table_row(). + ''.$element.''); } else { $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & '); } @@ -165,13 +158,13 @@ sub handler { } } if ($target ne 'tex') { - $r->print('
'); + $r->print(&Apache::loncommon::end_data_table()); } else { $r->print('\end{tabular}\\\\'); } @@ -184,7 +177,9 @@ sub handler { # ----------------------------------------------------- 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)) { @@ -196,7 +191,7 @@ sub handler { $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').'').'

'. '

'. @@ -210,26 +205,29 @@ sub handler { } } 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; } } @@ -243,7 +241,7 @@ sub handler { $field.=$url."\n"; } } - $syllabus{$_}=$field; + $syllabus{$syl_field}=$field; } } $syllabus{'uploaded.domain'}=$env{'user.domain'}; @@ -262,74 +260,76 @@ sub handler { $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('

'. ''); } 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=''; - } - if ($target ne 'tex') { - $message.='

'.$output.'

'; - } else { - $message.=' '.&Apache::lonxml::xmlparse($r,'tex','

'.$output.'

').' '; - } - } - if ($allowed) { - $r->print('

'.$syllabusfields{$_}. - &Apache::loncommon::help_open_topic('Syllabus_URLs').'

'. - '

'.&mt('Show Public View').''. - &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'

'); - } else { - $r->print($message); - } - } else { - &Apache::lonfeedback::newline_to_br(\$message); - $message - =~s/(https*\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; - if ($allowed) { - $message=&Apache::lonspeller::markeduptext($message); - } - $message=&Apache::lontexconvert::msgtexconverted($message); - if ($target ne 'tex') { - $r->print('

'.$syllabusfields{$_}.'

'. - $message.'
'); - } else { - $r->print('\\\\\textbf{'.$syllabusfields{$_}.'}\\\\'. - &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\'); - } - push @htmlids,$_; - } - if ($allowed) { - $r->print( - '
'); - } - } + $output=''; + } + if ($target ne 'tex') { + $message.='

'.$output.'

'; + } else { + $message.=' '.&Apache::lonxml::xmlparse($r,'tex','

'.$output.'

').' '; + } + } + if ($allowed) { + $r->print('

'.$syllabusfields{$field}. + &Apache::loncommon::help_open_topic('Syllabus_URLs').'

'. + '

'.&mt('Show Public View').''. + &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'

'); + } else { + $r->print($message); + } + } else { + &Apache::lonfeedback::newline_to_br(\$message); + $message =~s|(https*://[^\s]+)|$1|g; + if ($allowed) { + $message=&Apache::lonspeller::markeduptext($message); + } + $message=&Apache::lontexconvert::msgtexconverted($message); + if ($target ne 'tex') { + $r->print('

'.$syllabusfields{$field}.'

'. + $message.'
'); + } else { + $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'. + &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\'); + } + push(@htmlids,$field); + } + if ($allowed) { + $r->print('
'); + } + } } if ($allowed) { $r->print(''.