--- loncom/interface/lonaboutme.pm	2004/05/04 14:20:55	1.23
+++ loncom/interface/lonaboutme.pm	2004/07/27 23:35:34	1.29
@@ -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.29 2004/07/27 23:35:34 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -124,8 +124,11 @@ ENDDOCUMENT
       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);
@@ -148,9 +151,14 @@ 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='<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(
@@ -166,13 +174,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="'.$_.'">'.
@@ -191,6 +202,7 @@ ENDDOCUMENT
     }
     if ($ENV{'request.course.id'}) {
 	if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+            $r->print('<a name="coursecomment" />');
 	    if ($target ne 'tex') {
 		$r->print('<hr /><h3>'.
                           &mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'</h3>'.