--- loncom/interface/lonaboutme.pm 2004/12/15 20:00:44 1.34 +++ loncom/interface/lonaboutme.pm 2006/04/10 19:59:53 1.42 @@ -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.42 2006/04/10 19:59:53 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,29 +34,25 @@ use Apache::loncommon; use Apache::lonnet; use Apache::lontexconvert; use Apache::lonfeedback; +use Apache::lonrss(); use Apache::lonlocal; +use Apache::lonmsgdisplay(); 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); # 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; } # --------------------------------------------------------- The syllabus fields @@ -68,23 +64,20 @@ ENDDOCUMENT # ------------------------------------------------------------ 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)); - } # --------------------------------------------------------------- Force Student my $forcestudent=''; - if ($ENV{'form.forcestudent'}) { $forcestudent='student'; }; + if ($env{'form.forcestudent'}) { $forcestudent='student'; }; # --------------------------------------- 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' => + $env{'form.register'},}); + $r->print($start_page); $r->print('

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

'); } else { $r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\'); @@ -96,7 +89,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,8 +98,8 @@ 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) { @@ -119,9 +112,9 @@ ENDDOCUMENT $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 +124,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; @@ -180,7 +173,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) { @@ -209,8 +202,8 @@ ENDDOCUMENT } else { $r->print('

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

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

'. @@ -218,25 +211,29 @@ 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'})) { -# $r->print(&Apache::loncommon::track_student_link -# ('View recent activity by this student', -# $cnum,$cdom).(' 'x2)); + $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::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; }