--- loncom/interface/lonaboutme.pm	2004/05/04 14:20:55	1.23
+++ 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.23 2004/05/04 14:20:55 sakharuk Exp $
+# $Id: lonaboutme.pm,v 1.33 2004/12/02 18:53:13 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -105,31 +105,39 @@ 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('<p><b>'.&mt('Privacy Note').':</b> '.
-                         &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.').
-                         '</p>'.
-                         &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'</p><p><a href="'.$r->uri.'?forcestudent=1">Show Public View</a>'.
-                         &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
-	   } 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('<p><b>'.&mt('Privacy Note').':</b> '.
+		     &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.').
+		     '</p>'.
+		     &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'</p><p><a href="'.$r->uri.'?forcestudent=1">Show Public View</a>'.
+		     &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
+       } elsif ($privleged && $target ne 'tex') {
+	   $r->print('<p><a href="'.$r->uri.'?forceedit=1"><font size="+1">'.
+		     &mt('Edit').'</font></a></p>');
+       }
       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.'.$_};
@@ -148,17 +156,26 @@ ENDDOCUMENT
        $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
        $r->print(&mt('Last updated').': '.$lastmod);
        if ($syllabus{'uploaded.photourl'}) {
-	   $r->print('<img src="'.
-             &Apache::lonnet::tokenwrapper($syllabus{'uploaded.photourl'}).
-             '" align="right" />');
+	   &Apache::lonnet::allowuploaded('/adm/aboutme',
+					  $syllabus{'uploaded.photourl'});
+	   my $image=
+               qq{<img src="$syllabus{'uploaded.photourl'}" align="right" />};
+	   if ($target eq 'tex') {
+	       $image=&Apache::lonxml::xmlparse($r,'tex',$image);
+	   }
+	   $r->print($image);
        }
        if ($allowed) {
            $r->print(
+	 '<form method="post">
+               <input type="submit" name="delupl" value="Delete Photo" />
+          </form>'.
 	 '<form method="post" enctype="multipart/form-data">'.
          '<h3>'.&mt('Upload a Photo').'</h3>'.
          '<input type="file" name="uploaddoc" size="50">'.
          '<input type="submit" name="storeupl" value="Upload">'.
 	 '</form><form method="post">');
+
        }
        foreach (sort keys %syllabusfields) {
           if (($syllabus{$_}) || ($allowed)) {
@@ -166,13 +183,16 @@ ENDDOCUMENT
               $message=~s/\n/\<br \/\>/g;
               $message
              =~s/(http\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
+	      if ($allowed) {
+		  $message=&Apache::lonspeller::markeduptext($message);
+	      }
 	      $message=&Apache::lontexconvert::msgtexconverted($message);
 	      if ($target ne 'tex') {
 		  $r->print('<h3>'.$syllabusfields{$_}.'</h3><blockquote>'.
                             $message.'</blockquote>');
 	      } else {
 		     $r->print('\\\\\textbf{'.$syllabusfields{$_}.'}\\\\'.
-			       &Apache::lonxml::xmlparse($r,' ',$message).'\\\\');
+			       &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
 	      }
               if ($allowed) {
                  $r->print('<br /><textarea cols="80" rows="6" name="'.$_.'">'.
@@ -192,13 +212,24 @@ ENDDOCUMENT
     if ($ENV{'request.course.id'}) {
 	if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
 	    if ($target ne 'tex') {
+		$r->print('<a name="coursecomment" />');
 		$r->print('<hr /><h3>'.
                           &mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'</h3>'.
                           &mt('Shared by course faculty and staff').
                           &Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message").
 '<br />');
-	    &Apache::lonmsg::disfacetoface($r,$cnum,$cdom);
-            $r->print(&Apache::loncommon::noteswrapper('Add Records',$cnum,$cdom));
+                &Apache::lonmsg::disfacetoface($r,$cnum,$cdom);
+                $r->print('<hr />');
+                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).('&nbsp;'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);