--- loncom/interface/lonaboutme.pm 2003/09/21 21:40:06 1.17 +++ loncom/interface/lonaboutme.pm 2004/12/23 20:42:50 1.35 @@ -1,7 +1,7 @@ # The LearningOnline Network # "About Me" Personal Information # -# $Id: lonaboutme.pm,v 1.17 2003/09/21 21:40:06 www Exp $ +# $Id: lonaboutme.pm,v 1.35 2004/12/23 20:42:50 matthew 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,43 +81,63 @@ 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; # does this user have privileges to post, etc? - $allowed=(($ENV{'user.name'} eq $cnum) && - ($ENV{'user.domain'} eq $cdom)); - if ($forcestudent) { $allowed=0; } + my $privleged=$allowed=(($ENV{'user.name'} eq $cnum) && + ($ENV{'user.domain'} eq $cdom)); + 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').'

'); - } + $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').'

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

'. + &mt('Edit').'

'); + } 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); } + 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.'.$_}; @@ -129,20 +153,29 @@ ENDDOCUMENT # ---------------------------------------------------------------- Get syllabus if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { my $lastmod=$syllabus{'uploaded.lastmodified'}; - $lastmod=($lastmod?localtime($lastmod):'never'); - $r->print('Last updated: '.$lastmod); + $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= + qq{}; + if ($target eq 'tex') { + $image=&Apache::lonxml::xmlparse($r,'tex',$image); + } + $r->print($image); } if ($allowed) { $r->print( + '
+ +
'. '
'. - '

Upload a Photo

'. + '

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

'. ''. ''. '
'); + } foreach (sort keys %syllabusfields) { if (($syllabus{$_}) || ($allowed)) { @@ -150,9 +183,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('