Diff for /loncom/publisher/lonpublisher.pm between versions 1.14 and 1.15

version 1.14, 2000/12/08 23:36:37 version 1.15, 2000/12/23 15:53:26
Line 5 Line 5
 #  #
 # 05/29/00,05/30,10/11 Gerd Kortemeyer)  # 05/29/00,05/30,10/11 Gerd Kortemeyer)
 #  #
 # 11/28,11/29,11/30,12/01,12/02,12/04 Gerd Kortemeyer  # 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer
   
 package Apache::lonpublisher;  package Apache::lonpublisher;
   
Line 618  sub handler { Line 618  sub handler {
      return OK;       return OK;
   }    }
   
   unless ($ENV{'form.pubdir'}) {
 # -------------------------------------------------------------- Check filename  # -------------------------------------------------------------- Check filename
   
   my $fn=$ENV{'form.filename'};    my $fn=$ENV{'form.filename'};
Line 711  unless ($ENV{'form.phase'} eq 'two') { Line 712  unless ($ENV{'form.phase'} eq 'two') {
   $r->send_http_header;    $r->send_http_header;
   
   $r->print('<html><head><title>LON-CAPA Publishing</title></head>');    $r->print('<html><head><title>LON-CAPA Publishing</title></head>');
   $r->print('<body bgcolor="#FFFFFF">');    $r->print(
      '<body bgcolor="#FFFFFF"><img align=right src=/adm/lonIcons/lonlogos.gif>');
   my $thisfn=$fn;    my $thisfn=$fn;
         
 # ------------------------------------------------------------- Individual file  # ------------------------------------------------------------- Individual file
Line 745  unless ($ENV{'form.phase'} eq 'two') { Line 747  unless ($ENV{'form.phase'} eq 'two') {
   
   }    }
   $r->print('</body></html>');    $r->print('</body></html>');
   } else {
   
     my $fn=$ENV{'form.filename'};
   
     $fn=~s/\/[^\/]+$//;
     my $thisprefix=$fn;
     $thisprefix=~s/\/\~/\/priv\//;
   
     $fn=~s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/;
   
     unless ($fn) { 
        $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
            ' trying to publish empty directory', $r->filename); 
        return HTTP_NOT_FOUND;
     } 
   
   # ----------------------------------------------------------- Start page output
   
     $r->content_type('text/html');
     $r->send_http_header;
   
     $r->print('<html><head><title>LON-CAPA Publishing Directory</title></head>');
     $r->print(
      '<body bgcolor="#FFFFFF"><img align=right src=/adm/lonIcons/lonlogos.gif>');
   
     my $thisdisfn=$fn;
     $thisdisfn=~s/^\/home\/$ENV{'user.name'}\/public_html\///;
     
     $r->print('<h1>Publishing directory <tt>'.$thisdisfn.'</tt></h1>');
     my $i=0;
     $r->print('<script>');
       my $filename;
       opendir(DIR,$fn);
          while ($filename=readdir(DIR)) {
              $filename=~/\.(\w+)$/;
              if ((&Apache::lonnet::fileembstyle($1)) && ($1 ne 'meta')) {
         $r->print(<<ENDOPEN);
         pub$i=window.open("$thisprefix/$filename","LONCAPApub$i",
                                   "menubar=no,height=450,width=650");
   ENDOPEN
                 $i++;     
      }
          }
       }
       closedir(DIR);
     $r->print('</script>');
   
     $r->print('</body></html>');
     
   }
   return OK;    return OK;
 }  }
   

Removed from v.1.14  
changed lines
  Added in v.1.15


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