[LON-CAPA-cvs] cvs: loncom /interface lonaboutme.pm

albertel lon-capa-cvs@mail.lon-capa.org
Sat, 13 Nov 2004 10:06:17 -0000


albertel		Sat Nov 13 05:06:17 2004 EDT

  Modified files:              
    /loncom/interface	lonaboutme.pm 
  Log:
  - BUG#3577, ability to delete a photo from aboutme page, Edit button when viewing public view
  
  
Index: loncom/interface/lonaboutme.pm
diff -u loncom/interface/lonaboutme.pm:1.31 loncom/interface/lonaboutme.pm:1.32
--- loncom/interface/lonaboutme.pm:1.31	Thu Aug 26 17:42:40 2004
+++ loncom/interface/lonaboutme.pm	Sat Nov 13 05:06:17 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "About Me" Personal Information
 #
-# $Id: lonaboutme.pm,v 1.31 2004/08/26 21:42:40 matthew Exp $
+# $Id: lonaboutme.pm,v 1.32 2004/11/13 10:06:17 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -105,22 +105,20 @@
 
 # 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) {
@@ -133,6 +131,13 @@
           $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.'.$_};
@@ -162,11 +167,15 @@
        }
        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)) {