--- loncom/interface/lonsimplepage.pm	2004/02/13 15:01:29	1.16
+++ loncom/interface/lonsimplepage.pm	2004/04/30 23:13:52	1.17
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Page Editor
 #
-# $Id: lonsimplepage.pm,v 1.16 2004/02/13 15:01:29 www Exp $
+# $Id: lonsimplepage.pm,v 1.17 2004/04/30 23:13:52 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -128,8 +128,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',1);
+	      if ($syllabus{'uploaded.photourl'}) {
+		  &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'});
+	      }
+	      $syllabus{'uploaded.photourl'}=
+		  &Apache::lonnet::userfileupload('uploaddoc',1,'simplepage');
  	  }
           $syllabus{'uploaded.lastmodified'}=time;
           &Apache::lonnet::put('smppage_'.$marker,\%syllabus,$dom,$crs);
@@ -149,8 +152,9 @@ ENDDOCUMENT
     if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
        if ($syllabus{'uploaded.photourl'}) {
 	   if ($ENV{'form.grade_target'} ne 'tex') {
-	       $r->print('<img src="'.
-			 &Apache::lonnet::tokenwrapper($syllabus{'uploaded.photourl'}).
+	       &Apache::lonnet::allowuploaded('/adm/smppg',
+					      $syllabus{'uploaded.photourl'});
+	       $r->print('<img src="'.$syllabus{'uploaded.photourl'}.
 			 '" align="right" />');
 	   }
        }