--- loncom/interface/lonaboutme.pm	2002/08/27 20:29:54	1.2
+++ loncom/interface/lonaboutme.pm	2002/12/30 14:10:58	1.9
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "About Me" Personal Information
 #
-# $Id: lonaboutme.pm,v 1.2 2002/08/27 20:29:54 www Exp $
+# $Id: lonaboutme.pm,v 1.9 2002/12/30 14:10:58 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -55,14 +55,9 @@ ENDDOCUMENT
     }
 # --------------------------------------------------------- The syllabus fields
     my %syllabusfields=(
-       'aaa_instructorinfo' => 'Instructor Information',
-       'bbb_description'    => 'Course Description',
-       'ccc_prereq'         => 'Prerequisites',
-       'ddd_officehours'    => 'Office Hours',
-       'eee_helproom'       => 'Helproom Hours',
-       'fff_examinfo'       => 'Exam Information',
-       'ggg_grading'        => 'Grading Information',
-       'hhh_readings'       => 'Readings');
+       'aaa_contactinfo'   => 'Contact Information',
+       'bbb_aboutme'       => 'About Me',
+       'ccc_webreferences' => 'Web References');
 
 # --------------------------------------------------------------- Force Student
     &Apache::loncommon::get_unprocessed_cgi
@@ -74,8 +69,15 @@ ENDDOCUMENT
     my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
     $r->print(&Apache::loncommon::bodytag
                            ("Personal Information",$forcestudent,'','',$cdom));
-    $r->print('<h1>'.&Apache::loncommon::plainname($cnum,$cdom).'</h1><h3>'.
-              $Apache::lonnet::domaindescription{$cdom}.'</h3>');
+    $r->print('<h1>'.&Apache::loncommon::plainname($cnum,$cdom).'</h1>');
+    if ($courseenv{'nickname'}) {
+       $r->print(
+         '<h2>&quot;'.$courseenv{'nickname'}.
+         '&quot;</h2>');
+    }
+    $r->print('<h3>'.$Apache::lonnet::domaindescription{$cdom}.'</h3>'.
+    '<p>'.&Apache::loncommon::messagewrapper('Send me a message',$cnum,$cdom).
+    '</p>');
     my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum);
     my $allowed=0;
 
@@ -86,20 +88,25 @@ ENDDOCUMENT
        if ($forcestudent) { $allowed=0; }
  
        if ($allowed) {
-          $r->print(
-	  '<p><a href="'.$r->uri.'?forcestudent=1">Show Student View</a></p>');
+          $r->print('<p><b>Privacy Note:</b> 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 publically.</p>'.
+	  '<p><a href="'.$r->uri.'?forcestudent=1">Show Public View</a></p>');
       }
+      if (($ENV{'form.uploaddoc.filename'}) &&
+          ($ENV{'form.storeupl'}) && ($allowed)) {
+ 	  if ($ENV{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/) {
+             $syllabus{'uploaded.photourl'}=
+                 &Apache::lonnet::userfileupload('uploaddoc');
+ 	  }
+          $syllabus{'uploaded.lastmodified'}=time;
+          &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum);
+       }
        if (($allowed) && ($ENV{'form.storesyl'})) {
 	   foreach (keys %syllabusfields) {
                my $field=$ENV{'form.'.$_};
                $field=~s/\s+$//s;
                $field=~s/\</\&lt\;/g;
                $field=~s/\>/\&gt\;/g;
-	       if ($field) {
-		   $syllabus{$_}=$field;
-               } else {
-                   delete $syllabus{$_};
-               }
+	       $syllabus{$_}=$field;
            }
            $syllabus{'uploaded.lastmodified'}=time;
            &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum);
@@ -107,10 +114,21 @@ ENDDOCUMENT
 
 # ---------------------------------------------------------------- Get syllabus
     if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
-       $r->print('Last updated:'.
-                     localtime($syllabus{'uploaded.lastmodified'}));
+       my $lastmod=$syllabus{'uploaded.lastmodified'};
+       $lastmod=($lastmod?localtime($lastmod):'never');
+       $r->print('Last updated: '.$lastmod);
+       if ($syllabus{'uploaded.photourl'}) {
+	   $r->print('<img src="'.
+             &Apache::lonnet::tokenwrapper($syllabus{'uploaded.photourl'}).
+             '" align="right" />');
+       }
        if ($allowed) {
-	   $r->print('<form method="post">');
+           $r->print(
+	 '<form method="post" enctype="multipart/form-data">'.
+         '<h3>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)) {
@@ -133,7 +151,14 @@ ENDDOCUMENT
        }
        $r->print('</p>');
     } else {
-       $r->print('<p>No syllabus information provided.</p>');
+       $r->print('<p>No personal information provided.</p>');
+    }
+    if ($ENV{'request.course.id'}) {
+	if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+            $r->print('<hr /><h3>User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course</h3>Shared by course faculty and staff<br />');
+	    &Apache::lonmsg::disfacetoface($r,$cnum,$cdom);
+            $r->print(&Apache::loncommon::noteswrapper('Add Records',$cnum,$cdom));
+        }
     }
     $r->print('</body></html>');
     return OK;