--- loncom/interface/lonaboutme.pm 2004/01/14 22:08:23 1.19 +++ loncom/interface/lonaboutme.pm 2004/08/25 18:08:11 1.30 @@ -1,7 +1,7 @@ # The LearningOnline Network # "About Me" Personal Information # -# $Id: lonaboutme.pm,v 1.19 2004/01/14 22:08:23 www Exp $ +# $Id: lonaboutme.pm,v 1.30 2004/08/25 18:08:11 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -41,13 +41,17 @@ sub handler { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; - + my $target=$ENV{'form.grade_target'}; # ------------------------------------------------------------ Print the screen - $r->print(<print(< The LearningOnline Network with CAPA ENDDOCUMENT + } else { + $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') { @@ -77,18 +81,25 @@ ENDDOCUMENT # --------------------------------------- There is such a user, get environment my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum); - $r->print(''.&Apache::loncommon::bodytag + if ($target ne 'tex') { + $r->print(''.&Apache::loncommon::bodytag ("Personal Information",$forcestudent,$addentries,'',$cdom, $ENV{'form.register'})); - $r->print('

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

'); + $r->print('

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

'); + } else { + $r->print('\noindent{\large\textbf{'.&Apache::loncommon::plainname($cnum,$cdom).'}}\\\\\\\\'); + } if ($courseenv{'nickname'}) { $r->print( '

"'.$courseenv{'nickname'}. '"

'); } - $r->print('

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

'. - '

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

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

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

'. + '

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

'); + } else { + $r->print('\textbf{'.$Apache::lonnet::domaindescription{$cdom}.'}\\\\'); + } my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum); my $allowed=0; @@ -96,20 +107,28 @@ ENDDOCUMENT $allowed=(($ENV{'user.name'} eq $cnum) && ($ENV{'user.domain'} eq $cdom)); - if ($forcestudent) { $allowed=0; } + if ($forcestudent or $target eq 'tex') { $allowed=0; } if ($allowed) { - $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_PublicView').'

'); + if ($target ne 'tex') { + $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_PublicView').'

'); + } else { + $r->print(' \textbf{'.&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.').'\\\\\\\\'); + } } if (($ENV{'form.uploaddoc.filename'}) && ($ENV{'form.storeupl'}) && ($allowed)) { if ($ENV{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { - $syllabus{'uploaded.photourl'}= - &Apache::lonnet::userfileupload('uploaddoc'); + if ($syllabus{'uploaded.photourl'}) { + &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); + } + $syllabus{'uploaded.photourl'}= + &Apache::lonnet::userfileupload('uploaddoc',undef,'aboutme'); } $syllabus{'uploaded.lastmodified'}=time; &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum); @@ -132,9 +151,14 @@ ENDDOCUMENT $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never')); $r->print(&mt('Last updated').': '.$lastmod); if ($syllabus{'uploaded.photourl'}) { - $r->print(''); + &Apache::lonnet::allowuploaded('/adm/aboutme', + $syllabus{'uploaded.photourl'}); + my $image=''; + if ($target eq 'tex') { + $image=&Apache::lonxml::xmlparse($r,'tex',$image); + } + $r->print($image); } if ($allowed) { $r->print( @@ -150,9 +174,17 @@ ENDDOCUMENT $message=~s/\n/\
/g; $message =~s/(http\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; + if ($allowed) { + $message=&Apache::lonspeller::markeduptext($message); + } $message=&Apache::lontexconvert::msgtexconverted($message); - $r->print('

'.$syllabusfields{$_}.'

'. - $message.'
'); + if ($target ne 'tex') { + $r->print('

'.$syllabusfields{$_}.'

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