--- loncom/interface/lonaboutme.pm 2006/12/11 03:46:31 1.60 +++ loncom/interface/lonaboutme.pm 2008/11/20 13:11:36 1.74 @@ -1,7 +1,7 @@ # The LearningOnline Network # "About Me" Personal Information # -# $Id: lonaboutme.pm,v 1.60 2006/12/11 03:46:31 raeburn Exp $ +# $Id: lonaboutme.pm,v 1.74 2008/11/20 13:11:36 jms Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,6 +26,53 @@ # http://www.lon-capa.org/ # +=pod + +=head1 NAME + +pache::lonaboutme + +=head1 SYNOPSIS + +(empty) + +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + +=head1 OVERVIEW + +(empty) + + +=head1 SUBROUTINES + +=over + +=item handler() + +=item in_course() + +=item aboutme_info() + +=item print_portfiles_link() + +=item build_query_string() + +=item display_portfolio_header() + +=item display_portfolio_files() + +=item portfolio_files() + +=item build_hierarchy() + +=item parse_directory() + +=back + +=cut + + package Apache::lonaboutme; use strict; @@ -37,6 +84,7 @@ use Apache::lonfeedback; use Apache::lonrss(); use Apache::lonlocal; use Apache::lonmsgdisplay(); +use Apache::lontemplate; use HTML::Entities(); sub handler { @@ -69,7 +117,7 @@ sub handler { # ------------------------------------------------------------ Get Query String &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['forceedit','forcestudent', - 'register']); + 'register','popup']); # ----------------------------------------------- Available Portfolio file display if (($target ne 'tex') && ($action eq 'portfolio')) { @@ -114,12 +162,15 @@ sub handler { # --------------------------------------- There is such a user, get environment my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); if ($target ne 'tex') { + my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom); + my $args = {'function' => $forcestudent, + 'domain' => $cdom, + 'force_register' => $forceregister}; + if ($env{'form.popup'}) { + $args->{'no_nav_bar'} = 1; + } my $start_page = - &Apache::loncommon::start_page("Personal Information",undef, - {'function' => $forcestudent, - 'domain' => $cdom, - 'force_register' => - $forceregister,}); + &Apache::loncommon::start_page("Personal Information",$rss_link,$args); $r->print($start_page); $r->print('

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

'); } else { @@ -131,10 +182,9 @@ sub handler { '"'); } if ($target ne 'tex') { - $r->print('

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

'. - '

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

'.&Apache::lonrss::advertisefeeds($cnum,$cdom)); + $r->print('

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

');#OLD SendMessage POS } 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; @@ -146,14 +196,14 @@ sub handler { if ($forcestudent or $target eq 'tex') { $allowed=0; } if ($allowed) { - my $query_string = &build_query_string({'forcestudent' => '1',}); + my $query_string = &build_query_string({'forcestudent' => '1','popup' => $env{'form.popup'}}); $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') { - my $query_string = &build_query_string({'forceedit' => '1',}); + my $query_string = &build_query_string({'forceedit' => '1','popup' => $env{'form.popup'}}); $r->print('

'. &mt('Edit').'

'); } @@ -188,33 +238,39 @@ sub handler { &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum); } +my $lastmod; +my $image; # ---------------------------------------------------------------- Get syllabus if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { - my $lastmod=$syllabus{'uploaded.lastmodified'}; + $lastmod=$syllabus{'uploaded.lastmodified'}; $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never')); - $r->print(&mt('Last updated').': '.$lastmod); + # $r->print(&mt('Last updated').': '.$lastmod); #Old Last Modifi Pos if ($syllabus{'uploaded.photourl'}) { &Apache::lonnet::allowuploaded('/adm/aboutme', $syllabus{'uploaded.photourl'}); - my $image= - qq{}; + $image= + qq{}; + if ($target eq 'tex') { $image=&Apache::lonxml::xmlparse($r,'tex',$image); } - $r->print($image); + # $r->print($image); #Print old Image } if ($allowed) { $r->print( '
- +
'. '
'. '

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

'. - ''. - ''. + ''. + ''. + ''. '
'); } + + foreach my $field (sort(keys(%syllabusfields))) { if (($syllabus{$field}) || ($allowed)) { my $message=$syllabus{$field}; @@ -226,21 +282,40 @@ sub handler { } $message=&Apache::lontexconvert::msgtexconverted($message); if ($target ne 'tex') { - $r->print('

'.$syllabusfields{$field}.'

'. - $message.'
'); + + Apache::lontemplate::print_template($r,$syllabusfields{$field},$message); + + + } else { $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'. &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\'); } if ($allowed) { - $r->print('
'); + Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field); } } } + if($target ne 'tex') + { + + &print_portfiles_link($r,$is_course); + + $r->print(''); + $r->print('
'); + $r->print($image); + + $r->print('Kontakt'); + $r->print(&Apache::loncommon::messagewrapper(&mt('Send me a message'),$cnum,$cdom).'

'.&Apache::lonrss::advertisefeeds($cnum,$cdom)); + + + } + if ($allowed) { + if ($env{'form.popup'}) { + $r->print(''); + } $r->print(''); } if ($target ne 'tex') {$r->print('
');} else {$r->print('\\\\');} @@ -249,44 +324,80 @@ sub handler { } if ($target ne 'tex') { - &print_portfiles_link($r,$is_course); + # &print_portfiles_link($r,$is_course); #old Print files + } - 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::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 ($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') { + if ($env{'form.popup'}) { + $r->print('

'.&mt('Close window').''); + } + $r->print('
'.&mt('Last updated').': '.$lastmod); + $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); @@ -300,7 +411,8 @@ sub aboutme_info { 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); + 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( @@ -309,7 +421,10 @@ sub print_portfiles_link { difl => 'Display file listing', ); if ($filecounts->{'both'} > 0) { - $output = '

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

'; + $output = '
'; + $output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'
'; + + #$output = '

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

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

'; @@ -333,6 +448,7 @@ sub print_portfiles_link { $output .= '
  • '.&mt('[quant,_1,file requires,files require] a passphrase for access.',$filecounts->{'withpass'}).'
    • '; } $output .= ''; + $output .='
    '; } $r->print($output); return; @@ -432,7 +548,8 @@ sub display_portfolio_files { &mt('Update display').'" />'; $output .= '

    '; $r->print($output); - my $filecounts = &portfolio_files($r,'listfiles',\%lt,$is_course); + 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('

    ';