--- loncom/interface/lonaboutme.pm 2004/05/12 19:00:20 1.26 +++ loncom/interface/lonaboutme.pm 2004/12/02 18:53:13 1.33 @@ -1,7 +1,7 @@ # The LearningOnline Network # "About Me" Personal Information # -# $Id: lonaboutme.pm,v 1.26 2004/05/12 19:00:20 sakharuk Exp $ +# $Id: lonaboutme.pm,v 1.33 2004/12/02 18:53:13 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -105,22 +105,20 @@ ENDDOCUMENT # does this user have privileges to post, etc? - $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) { - 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.').'\\\\\\\\'); - } - } + $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) { @@ -133,6 +131,13 @@ ENDDOCUMENT $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.'.$_}; @@ -153,21 +158,24 @@ ENDDOCUMENT if ($syllabus{'uploaded.photourl'}) { &Apache::lonnet::allowuploaded('/adm/aboutme', $syllabus{'uploaded.photourl'}); - if ($target ne 'tex') { - $r->print(''); - } else { - $r->print(&Apache::lonxml::xmlparse($r,'tex','')); + my $image= + qq{}; + if ($target eq 'tex') { + $image=&Apache::lonxml::xmlparse($r,'tex',$image); } + $r->print($image); } if ($allowed) { $r->print( + '
+ +
'. '
'. '

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

'. ''. ''. '
'); + } foreach (sort keys %syllabusfields) { if (($syllabus{$_}) || ($allowed)) { @@ -175,6 +183,9 @@ 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); if ($target ne 'tex') { $r->print('

'.$syllabusfields{$_}.'

'. @@ -201,13 +212,24 @@ ENDDOCUMENT 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::lonmsg::disfacetoface($r,$cnum,$cdom); - $r->print(&Apache::loncommon::noteswrapper('Add Records',$cnum,$cdom)); + &Apache::lonmsg::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::lonmsg::disfacetoface($r,$cnum,$cdom);