--- loncom/interface/lonaboutme.pm 2004/12/15 20:00:44 1.34 +++ loncom/interface/lonaboutme.pm 2008/01/16 12:24:01 1.67 @@ -1,7 +1,7 @@ # The LearningOnline Network # "About Me" Personal Information # -# $Id: lonaboutme.pm,v 1.34 2004/12/15 20:00:44 matthew Exp $ +# $Id: lonaboutme.pm,v 1.67 2008/01/16 12:24:01 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,31 +34,32 @@ use Apache::loncommon; use Apache::lonnet; use Apache::lontexconvert; use Apache::lonfeedback; +use Apache::lonrss(); use Apache::lonlocal; +use Apache::lonmsgdisplay(); +use HTML::Entities(); sub handler { my $r = shift; &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; - my $target=$ENV{'form.grade_target'}; + my $target=$env{'form.grade_target'}; # ------------------------------------------------------------ Print the screen - if ($target ne 'tex') { - $r->print(< - -The LearningOnline Network with CAPA -ENDDOCUMENT - } else { - $r->print(&Apache::lonprintout::print_latex_header($ENV{'form.latex_type'})); + if ($target eq 'tex') { + $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); } - my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri); + my (undef,undef,$cdom,$cnum,undef,$action)=split(/\//,$r->uri); + my $is_course; # Is this even a user? if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') { - $r->print(''. - &mt('No user information available').''); + &Apache::loncommon::simple_error_page($r,'No info', + 'No user information available'); return OK; + } else { + $is_course = &Apache::lonnet::is_course($cdom,$cnum); } + # --------------------------------------------------------- The syllabus fields my %syllabusfields=&Apache::lonlocal::texthash( 'aaa_contactinfo' => 'Contact Information', @@ -66,25 +67,61 @@ ENDDOCUMENT 'ccc_webreferences' => 'Web References'); # ------------------------------------------------------------ Get Query String - &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'},['forcestudent','register']); -# ----------------------------------------------------- Force menu registration - my $addentries=''; - if ($ENV{'form.register'}) { - $addentries=' onLoad="'.&Apache::lonmenu::loadevents(). - '" onUnload="'.&Apache::lonmenu::unloadevents().'"'; - $r->print(&Apache::lonmenu::registerurl(1)); + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['forceedit','forcestudent', + 'register']); + +# ----------------------------------------------- Available Portfolio file display + if (($target ne 'tex') && ($action eq 'portfolio')) { + &display_portfolio_header($r,$is_course); + my ($blocked,$blocktext) = + &Apache::loncommon::blocking_status('port',$cnum,$cdom); + if (!$blocked) { + &display_portfolio_files($r,$is_course); + } else { + $r->print($blocktext); + } + $r->print(&Apache::loncommon::end_page()); + return OK; + } + + if ($is_course) { + if ($target ne 'tex') { + my $start_page = + &Apache::loncommon::start_page( + "Course Information", + undef, + {'function' => $env{'forcestudent'}, + 'domain' => $cdom, + 'force_register' => $env{'forceregister'},}); + $r->print($start_page); + $r->print('

'.&mt('Group files').'

'); + &print_portfiles_link($r,$is_course); + $r->print(&Apache::loncommon::end_page()); + } + return OK; } + # --------------------------------------------------------------- Force Student my $forcestudent=''; - if ($ENV{'form.forcestudent'}) { $forcestudent='student'; }; + if ($env{'form.forcestudent'}) { $forcestudent='student'; }; + + my $forceregister = ''; + if ($forcestudent eq '') { + $forceregister = $env{'form.register'}; + } # --------------------------------------- There is such a user, get environment my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); if ($target ne 'tex') { - $r->print(''.&Apache::loncommon::bodytag - ("Personal Information",$forcestudent,$addentries,'',$cdom, - $ENV{'form.register'})); + my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom); + my $start_page = + &Apache::loncommon::start_page("Personal Information", $rss_link, + {'function' => $forcestudent, + 'domain' => $cdom, + 'force_register' => + $forceregister,}); + $r->print($start_page); $r->print('

'.&Apache::loncommon::plainname($cnum,$cdom).'

'); } else { $r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\'); @@ -95,33 +132,35 @@ ENDDOCUMENT '"'); } if ($target ne 'tex') { - $r->print('

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

'. - '

'.&Apache::loncommon::messagewrapper('Send me a message',$cnum,$cdom).'

'); + $r->print('

'.&Apache::lonnet::domain($cdom,'description').'

'. + '

'.&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom).'

'.&Apache::lonrss::advertisefeeds($cnum,$cdom)); } else { - $r->print('\textbf{'.$Apache::lonnet::domaindescription{$cdom}.'}\\\\'); + $r->print('\textbf{'.&Apache::lonnet::domain($cdom,'description').'}\\\\'); } my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum); my $allowed=0; # does this user have privileges to post, etc? - my $privleged=$allowed=(($ENV{'user.name'} eq $cnum) && - ($ENV{'user.domain'} eq $cdom)); + my $privleged=$allowed=(($env{'user.name'} eq $cnum) && + ($env{'user.domain'} eq $cdom)); if ($forcestudent or $target eq 'tex') { $allowed=0; } if ($allowed) { + my $query_string = &build_query_string({'forcestudent' => '1',}); $r->print('

'.&mt('Privacy Note').': '. &mt('The information you submit can be viewed by anybody who is logged into LON-CAPA. Do not provide information that you are not ready to share publicly.'). '

'. - &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'

Show Public View'. + &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'

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

'); } elsif ($privleged && $target ne 'tex') { - $r->print('

'. + my $query_string = &build_query_string({'forceedit' => '1',}); + $r->print('

'. &mt('Edit').'

'); } - if (($ENV{'form.uploaddoc.filename'}) && - ($ENV{'form.storeupl'}) && ($allowed)) { - if ($ENV{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { + if (($env{'form.uploaddoc.filename'}) && + ($env{'form.storeupl'}) && ($allowed)) { + if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { if ($syllabus{'uploaded.photourl'}) { &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); } @@ -131,20 +170,20 @@ ENDDOCUMENT $syllabus{'uploaded.lastmodified'}=time; &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum); } - if ($allowed && $ENV{'form.delupl'}) { + if ($allowed && $env{'form.delupl'}) { if ($syllabus{'uploaded.photourl'}) { &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); delete($syllabus{'uploaded.photourl'}); &Apache::lonnet::del('aboutme',['uploaded.photourl'],$cdom,$cnum); } } - 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}; $field=~s/\s+$//s; $field=&Apache::lonfeedback::clear_out_html($field, - $ENV{'user.adv'}); - $syllabus{$_}=$field; + $env{'user.adv'}); + $syllabus{$syl_field}=$field; } $syllabus{'uploaded.lastmodified'}=time; &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum); @@ -168,19 +207,19 @@ ENDDOCUMENT if ($allowed) { $r->print( '
- +
'. '
'. '

'.&mt('Upload a Photo').'

'. ''. - ''. + ''. '
'); } - foreach (sort keys %syllabusfields) { - if (($syllabus{$_}) || ($allowed)) { - my $message=$syllabus{$_}; - $message=~s/\n/\
/g; + foreach my $field (sort(keys(%syllabusfields))) { + if (($syllabus{$field}) || ($allowed)) { + my $message=$syllabus{$field}; + &Apache::lonfeedback::newline_to_br(\$message); $message =~s/(http\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; if ($allowed) { @@ -188,57 +227,442 @@ ENDDOCUMENT } $message=&Apache::lontexconvert::msgtexconverted($message); if ($target ne 'tex') { - $r->print('

'.$syllabusfields{$_}.'

'. + $r->print('

'.$syllabusfields{$field}.'

'. $message.'
'); } else { - $r->print('\\\\\textbf{'.$syllabusfields{$_}.'}\\\\'. + $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'. &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\'); } if ($allowed) { - $r->print('
'); + &mt('Save').'" />'); } } } if ($allowed) { $r->print(''); } - if ($target ne 'tex') {$r->print('

');} else {$r->print('\\\\');} + if ($target ne 'tex') {$r->print('
');} else {$r->print('\\\\');} } else { $r->print('

'.&mt('No personal information provided').'.

'); } - if ($ENV{'request.course.id'}) { - if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) { - if ($target ne 'tex') { - $r->print('
'); - $r->print('

'. - &mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'

'. - &mt('Shared by course faculty and staff'). - &Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message"). -'
'); - &Apache::lonmsg::disfacetoface($r,$cnum,$cdom); - $r->print('
'); - if (&Apache::lonnet::allowed('vsa', - $ENV{'request.course.id'}) || - &Apache::lonnet::allowed('vsa', - $ENV{'request.course.id'}.'/'. - $ENV{'request.course.sec'})) { -# $r->print(&Apache::loncommon::track_student_link -# ('View recent activity by this student', -# $cnum,$cdom).(' 'x2)); + + if ($target ne 'tex') { + &print_portfiles_link($r,$is_course); + } + + if ($env{'request.course.id'} + && &Apache::lonnet::allowed('srm',$env{'request.course.id'}) + && &in_course($cdom,$cnum)) { + if ($target ne 'tex') { + $r->print('
'); + $r->print('

'. + &mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'

'. + &mt('Shared by course faculty and staff'). + &Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message"). + '
'); + &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom); + $r->print('
'); + if (&Apache::lonnet::allowed('vsa', + $env{'request.course.id'}) || + &Apache::lonnet::allowed('vsa', + $env{'request.course.id'}.'/'. + $env{'request.course.sec'})) { + $r->print(&Apache::loncommon::track_student_link + ('View recent activity by this student', + $cnum,$cdom).(' 'x2)); + } + $r->print(&Apache::loncommon::noteswrapper('Add Records',$cnum,$cdom)); + } else { + $r->print('\\\\\textbf{'.&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'}\\\\'.&mt('Shared by course faculty and staff').'\\\\\\\\'); + &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom); + } + } + if ($target ne 'tex') { + $r->print(&Apache::loncommon::end_page()); + } else { + $r->print('\end{document}'); + } + return OK; +} + +sub in_course { + my ($udom,$uname,$cdom,$cnum,$type) = @_; + $type ||= 'any'; + if (!defined($cdom) || !defined($cnum)) { + my $cid = $env{'request.course.id'}; + $cdom = $env{'course.'.$cid.'.domain'}; + $cnum = $env{'course.'.$cid.'.num'}; + } + my %roles = &Apache::lonnet::dump('roles',$udom,$uname); + my @course_roles = grep(m{^/\Q$cdom\E/\Q$cnum\E[/_]}, keys(%roles)); + return 0 if (!@course_roles); + return 1 if ($type eq 'any'); + my $now = time(); + foreach my $role (@course_roles) { + my (undef,$role_end,$role_start)=split(/\_/,$roles{$role}); + my $status = 'active'; + if ($role_start > 0 && $now < $role_start) { + $status = 'future'; + } + if ($role_end > 0 && $now > $role_end) { + $status = 'previous'; + } + return 1 if ($status eq $type); + } + return 0; +} + +sub aboutme_info { + my ($r,$is_course) = @_; + my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri); + my $name; + if (!$is_course) { + $name = &Apache::loncommon::plainname($cnum,$cdom); + } + return ($cdom,$cnum,$name); +} + +sub print_portfiles_link { + my ($r,$is_course) = @_; + my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course); + my $filecounts = &portfolio_files($r,'showlink',undef,$is_course, + $cdom,$cnum,$name); + my $query_string = &build_query_string(); + my $output; + my %lt = &Apache::lonlocal::texthash( + vpfi => 'Viewable portfolio files', + vgpf => 'Viewable group portfolio files', + difl => 'Display file listing', + ); + if ($filecounts->{'both'} > 0) { + $output = '

'.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'

'; + $output .= '
'.$lt{'difl'}. + '

'; + if ($filecounts->{'both'} == 1) { + if ($is_course) { + $output .= &mt('One group portfolio file is available.').'
    '; + } else { + $output .= &mt('One portfolio file owned by [_1] is available.',$name).'
      '; + } + } else { + if ($is_course) { + $output .= &mt('A total of [_1] group portfolio files are available.',$filecounts->{'both'}).'
        '; + } else { + $output .= &mt('A total of [_1] portfolio files owned by [_2] are available.',$filecounts->{'both'},$name).'
          '; + } + } + if ($filecounts->{'withoutpass'}) { + $output .= '
        • '.&mt('[quant,_1,file is,files are] publicly accessible.',$filecounts->{'withoutpass'}).'
        • '; + } + if ($filecounts->{'withpass'}) { + $output .= '
        • '.&mt('[quant,_1,file requires,files require] a passphrase for access.',$filecounts->{'withpass'}).'
        • '; + } + $output .= '
        '; + } + $r->print($output); + return; +} + +sub build_query_string { + my ($new_items) = @_; + my $query_string; + my @formelements = ('register'); + my $new = 0; + if (ref($new_items) eq 'HASH') { + $new = 1; + if (!defined($new_items->{'forceedit'}) && + !defined($new_items->{'forcestudent'})) { + push(@formelements,('forceedit','forcestudent')); + } + } else { + push(@formelements,('forceedit','forcestudent')); + } + foreach my $element (@formelements) { + if (exists($env{'form.'.$element})) { + if ((!$new) || (!defined($new_items->{$element}))) { + $query_string .= '&'.$element.'='.$env{'form.'.$element}; + } + } + } + if ($new) { + foreach my $key (keys(%{$new_items})) { + $query_string .= '&'.$key.'='.$new_items->{$key}; + } + } + $query_string =~ s/^\&/\?/; + return $query_string; +} + +sub display_portfolio_header { + my ($r,$is_course) = @_; + my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course); + my $query_string = &build_query_string(); + &Apache::lonhtmlcommon::clear_breadcrumbs(); + my $forcestudent=''; + if ($env{'form.forcestudent'}) { $forcestudent='student'; }; + + my $output; + if ($is_course) { + $output = + &Apache::loncommon::start_page('Viewable group portfolio files',undef, + {'function' => $forcestudent, + 'domain' => $cdom,}); + $output .= '

        '.&mt('Group Portfolio files').'

        '; + } else { + $output = + &Apache::loncommon::start_page('Viewable portfolio files',undef, + {'function' => $forcestudent, + 'domain' => $cdom,}); + if (!($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public')) { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/$cdom/$cnum/aboutme".$query_string, + text=>"Personal information - $name", + title=>"Go to personal information page for $name"}, {href=>"/adm/$cdom/$cnum/aboutme/portfolio", + text=>"Viewable files - $name", + title=>"Viewable portfolio files for $name"} + ); + $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('Viewable portfolio files.')); + } + $output .= '

        '.&mt('Portfolio files for [_1]',$name).'

        '; + } + $r->print($output); + return; +} + +sub display_portfolio_files { + my ($r,$is_course) = @_; + my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course); + my %lt = ( withoutpass => 'passphrase not required', + withpass => 'passphrase protected', + both => 'all access types ',); + %lt = &Apache::lonlocal::texthash(%lt); + + my $portaccess = 'withoutpass'; + if (exists($env{'form.portaccess'})) { + $portaccess = $env{'form.portaccess'}; + } + + my $output = '
        '. + &mt('File access type: ').''."\n". + ''; + $output .= '


        '; + $r->print($output); + my $filecounts = &portfolio_files($r,'listfiles',\%lt,$is_course, + $cdom,$cnum,$name); + if (!($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public')) { + my $query_string = &build_query_string(); + $r->print('

        '); + if ($is_course) { + $r->print(&mt('Course Information page')); + } else { + $r->print(&mt('Information about [_1]',$name)); + } + $r->print(''); + } + return; +} + +sub portfolio_files { + my ($r,$mode,$lt,$is_course,$cdom,$cnum,$name) = @_; + my $filecounts = { + withpass => 0, + withoutpass => 0, + both => 0, + }; + my $current_permissions = + &Apache::lonnet::get_portfile_permissions($cdom,$cnum); + my %access_controls = + &Apache::lonnet::get_access_controls($current_permissions); + my $portaccess; + if ($mode eq 'showlink') { + $portaccess = 'both'; + } else { + $portaccess = 'withoutpass'; + if (exists($env{'form.portaccess'})) { + $portaccess = $env{'form.portaccess'}; + } + } + + my $diroutput; + if ($is_course) { + my %files_by_group; + foreach my $filename (sort(keys(%access_controls))) { + my ($group,$path) = split('/',$filename,2); + $files_by_group{$group}{$path} = $access_controls{$filename}; + } + foreach my $group (sort(keys(%files_by_group))) { + my %fileshash; + my $grpout .= &build_hierarchy($r,$cdom,$cnum,$portaccess, + $is_course,$filecounts,$mode, + $files_by_group{$group}, + \%fileshash,$group); + if ($grpout) { + $diroutput .= '

        '.$group.'

        '.$grpout.'
        '; + } + } + } else { + my %allfileshash; + $diroutput = &build_hierarchy($r,$cdom,$cnum,$portaccess,$is_course, + $filecounts,$mode,\%access_controls, + \%allfileshash); + } + if ($mode eq 'listfiles') { + if ($filecounts->{'both'}) { + $r->print($diroutput); + } else { + my $access_text; + if (ref($lt) eq 'HASH') { + $access_text = $lt->{$portaccess}; + } + $r->print(&mt('There are no available files of the specified access type: [_1]',$access_text)); + } + } + return $filecounts; +} + +{ + my $count=0; + sub portfolio_table_start { + $count=0; + return ''; + } + sub portfolio_row_start { + $count++; + my $class = ($count%2)?'LC_odd_row' + :'LC_even_row'; + return ''; + } +} + +sub build_hierarchy { + my ($r,$cdom,$cnum,$portaccess,$is_course,$filecounts,$mode,$access_info, + $allfileshash,$group) = @_; + foreach my $filename (sort(keys(%{$access_info}))) { + my $access_status = + &Apache::lonnet::get_portfolio_access($cdom,$cnum,$filename,$group, $$access_info{$filename}); + if ($portaccess eq 'both') { + if (($access_status ne 'ok') && + ($access_status !~ /^[^:]+:guest_/)) { + next; + } + } elsif ($portaccess eq 'withoutpass') { + if ($access_status ne 'ok') { + next; + } + } elsif ($portaccess eq 'withpass') { + if ($access_status !~ /^[^:]+:guest_/) { + next; + } + } + if ($mode eq 'listfiles') { + $filename =~ s/^\///; + my @pathitems = split('/',$filename); + my $lasthash = $allfileshash; + while (@pathitems > 1) { + my $newlevel = shift(@pathitems); + if (!exists($lasthash->{$newlevel})) { + $lasthash->{$newlevel} = {}; } - $r->print(&Apache::loncommon::noteswrapper('Add Records',$cnum,$cdom)); + $lasthash = $lasthash->{$newlevel}; + } + $lasthash->{$pathitems[0]} = $filename; + } + if ($access_status eq 'ok') { + $filecounts->{'withoutpass'} ++; + } elsif ($access_status =~ /^[^:]+:guest_/) { + $filecounts->{'withpass'} ++; + } + } + $filecounts->{'both'} = $filecounts->{'withoutpass'} + + $filecounts->{'withpass'}; + my $output; + if ($mode eq 'listfiles') { + if ($filecounts->{'both'} > 0) { + $output = &portfolio_table_start(); + $output .= &parse_directory($r,0,$allfileshash,'',$is_course, + $group); + $output .= '
        '; + } + } + return $output; +} + +sub parse_directory { + my ($r,$depth,$currhash,$path,$is_course,$group) = @_; + my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course); + $depth++; + my $output; + + my $portfolio_root = &Apache::portfolio::get_portfolio_root($cdom,$cnum, + $group); + my %dirlist = map { + ((split('&',$_,2))[0],1) + } &Apache::lonnet::dirlist($path,$cdom,$cnum,$portfolio_root); + foreach my $item (sort(keys(%{$currhash}))) { + $output .= &portfolio_row_start(); + $output .= ''; + if (ref($currhash->{$item}) eq 'HASH') { + my $title=&HTML::Entities::encode($item,'<>&"'); + $output .= ''.&mt('Folder').' '.$title.' '.$title; + $output .= ''; + $output .= &parse_directory($r,$depth,$currhash->{$item}, + $path.'/'.$item,$is_course,$group); + } else { + my $file_name; + if ($currhash->{$item} =~ m|/([^/]+)$|) { + $file_name = $1; } else { - $r->print('\\\\\textbf{'.&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'}\\\\'.&mt('Shared by course faculty and staff').'\\\\\\\\'); - &Apache::lonmsg::disfacetoface($r,$cnum,$cdom); + $file_name = $currhash->{$item}; + } + my $have_meta = exists($dirlist{$file_name.'.meta'}); + my $url; + if ($is_course) { + $url = '/uploaded/'.$cdom.'/'.$cnum.'/groups/'.$group. + '/portfolio/'.$currhash->{$item}; + } else { + $url = '/uploaded/'.$cdom.'/'.$cnum.'/portfolio/'. + $currhash->{$item}; + } + my $showname; + if ($have_meta) { + $showname = &Apache::lonnet::metadata($url,'title'); } + if ($showname eq '') { + $showname = $file_name; + } else { + $showname = $file_name.' ('.$showname.')'; + } + + $showname=&HTML::Entities::encode($showname,'<>&"'); + $output .= ''. + ''. + ' '.$showname.''; + $output.=''; + if ($have_meta) { + $output.= ''.&mt('Catalog Information').''; + } + $output .= ''; } } - if ($target ne 'tex') {$r->print('');} else {$r->print('\end{document}');} - return OK; -} + return $output; +} 1; __END__