Diff for /loncom/interface/lonsimplepage.pm between versions 1.16 and 1.17

version 1.16, 2004/02/13 15:01:29 version 1.17, 2004/04/30 23:13:52
Line 128  ENDDOCUMENT Line 128  ENDDOCUMENT
       if (($ENV{'form.uploaddoc.filename'}) &&        if (($ENV{'form.uploaddoc.filename'}) &&
           ($ENV{'form.storeupl'}) && ($allowed)) {            ($ENV{'form.storeupl'}) && ($allowed)) {
    if ($ENV{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) {     if ($ENV{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) {
              $syllabus{'uploaded.photourl'}=        if ($syllabus{'uploaded.photourl'}) {
                  &Apache::lonnet::userfileupload('uploaddoc',1);    &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'});
         }
         $syllabus{'uploaded.photourl'}=
     &Apache::lonnet::userfileupload('uploaddoc',1,'simplepage');
    }     }
           $syllabus{'uploaded.lastmodified'}=time;            $syllabus{'uploaded.lastmodified'}=time;
           &Apache::lonnet::put('smppage_'.$marker,\%syllabus,$dom,$crs);            &Apache::lonnet::put('smppage_'.$marker,\%syllabus,$dom,$crs);
Line 149  ENDDOCUMENT Line 152  ENDDOCUMENT
     if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {      if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
        if ($syllabus{'uploaded.photourl'}) {         if ($syllabus{'uploaded.photourl'}) {
    if ($ENV{'form.grade_target'} ne 'tex') {     if ($ENV{'form.grade_target'} ne 'tex') {
        $r->print('<img src="'.         &Apache::lonnet::allowuploaded('/adm/smppg',
  &Apache::lonnet::tokenwrapper($syllabus{'uploaded.photourl'}).        $syllabus{'uploaded.photourl'});
          $r->print('<img src="'.$syllabus{'uploaded.photourl'}.
  '" align="right" />');   '" align="right" />');
    }     }
        }         }

Removed from v.1.16  
changed lines
  Added in v.1.17


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>