--- loncom/interface/lonaboutme.pm 2004/11/13 10:06:17 1.32 +++ loncom/interface/lonaboutme.pm 2006/09/21 15:50:10 1.56 @@ -1,7 +1,7 @@ # The LearningOnline Network # "About Me" Personal Information # -# $Id: lonaboutme.pm,v 1.32 2004/11/13 10:06:17 albertel Exp $ +# $Id: lonaboutme.pm,v 1.56 2006/09/21 15:50:10 albertel 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 = &check_for_course($cdom,$cnum); } + # --------------------------------------------------------- The syllabus fields my %syllabusfields=&Apache::lonlocal::texthash( 'aaa_contactinfo' => 'Contact Information', @@ -66,25 +67,54 @@ 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); + &display_portfolio_files($r,$is_course); + $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 $start_page = + &Apache::loncommon::start_page("Personal Information",undef, + {'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).'}}\\\\\\\\'); @@ -96,7 +126,7 @@ ENDDOCUMENT } if ($target ne 'tex') { $r->print('

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

'. - '

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

'); + '

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

'.&Apache::lonrss::advertisefeeds($cnum,$cdom)); } else { $r->print('\textbf{'.$Apache::lonnet::domaindescription{$cdom}.'}\\\\'); } @@ -105,23 +135,25 @@ ENDDOCUMENT # 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','Help with filling in text boxes').'

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,19 +163,19 @@ 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'})) { + if (($allowed) && ($env{'form.storesyl'})) { foreach (keys %syllabusfields) { - my $field=$ENV{'form.'.$_}; + my $field=$env{'form.'.$_}; $field=~s/\s+$//s; $field=&Apache::lonfeedback::clear_out_html($field, - $ENV{'user.adv'}); + $env{'user.adv'}); $syllabus{$_}=$field; } $syllabus{'uploaded.lastmodified'}=time; @@ -158,8 +190,8 @@ ENDDOCUMENT if ($syllabus{'uploaded.photourl'}) { &Apache::lonnet::allowuploaded('/adm/aboutme', $syllabus{'uploaded.photourl'}); - my $image=''; + my $image= + qq{}; if ($target eq 'tex') { $image=&Apache::lonxml::xmlparse($r,'tex',$image); } @@ -180,7 +212,7 @@ ENDDOCUMENT foreach (sort keys %syllabusfields) { if (($syllabus{$_}) || ($allowed)) { my $message=$syllabus{$_}; - $message=~s/\n/\
/g; + &Apache::lonfeedback::newline_to_br(\$message); $message =~s/(http\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; if ($allowed) { @@ -196,7 +228,7 @@ ENDDOCUMENT } if ($allowed) { $r->print('
'); } @@ -205,12 +237,17 @@ ENDDOCUMENT 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') { + &print_portfiles_link($r,$is_course); + } + + if ($env{'request.course.id'}) { + if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})) { if ($target ne 'tex') { $r->print(''); $r->print('

'. @@ -218,13 +255,13 @@ ENDDOCUMENT &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); + &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom); $r->print('
'); if (&Apache::lonnet::allowed('vsa', - $ENV{'request.course.id'}) || + $env{'request.course.id'}) || &Apache::lonnet::allowed('vsa', - $ENV{'request.course.id'}.'/'. - $ENV{'request.course.sec'})) { + $env{'request.course.id'}.'/'. + $env{'request.course.sec'})) { $r->print(&Apache::loncommon::track_student_link ('View recent activity by this student', $cnum,$cdom).(' 'x2)); @@ -232,13 +269,375 @@ ENDDOCUMENT $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::lonmsg::disfacetoface($r,$cnum,$cdom); + &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom); } } } - if ($target ne 'tex') {$r->print('');} else {$r->print('\end{document}');} + if ($target ne 'tex') { + $r->print(&Apache::loncommon::end_page()); + } else { + $r->print('\end{document}'); + } return OK; -} +} + +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); + 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.').'