[BACK]Return to lonpubdir.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / publisher

Diff for /loncom/publisher/lonpubdir.pm between versions 1.114 and 1.114.2.2

version 1.114, 2008/11/20 15:19:28 version 1.114.2.2, 2010/02/12 16:04:18
Line 62  sub handler { Line 62  sub handler {
     &Apache::loncacc::constructaccess(      &Apache::loncacc::constructaccess(
              $fn,$r->dir_config('lonDefDomain'));                $fn,$r->dir_config('lonDefDomain')); 
   unless (($uname) && ($udom)) {    unless (($uname) && ($udom)) {
      $r->log_reason($uname.' at '.$udom.       $r->log_reason($uname.':'.$udom.
          ' trying to list directory '.$env{'form.filename'}.           ' trying to list directory '.$env{'form.filename'}.
          ' ('.$fn.') - not authorized',            ' ('.$fn.') - not authorized', 
          $r->filename);            $r->filename); 
Line 74  sub handler { Line 74  sub handler {
   $fn=~s/\/$//;    $fn=~s/\/$//;
   
   unless ($fn) {     unless ($fn) { 
      $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.       $r->log_reason($env{'user.name'}.':'.$env{'user.domain'}.
          ' trying to list empty directory', $r->filename);            ' trying to list empty directory', $r->filename); 
      return HTTP_NOT_FOUND;       return HTTP_NOT_FOUND;
   }     } 
Line 156  sub getEffectiveUrl { Line 156  sub getEffectiveUrl {
  #   Replace the ~username of the URL with /home/username/public_html   #   Replace the ~username of the URL with /home/username/public_html
  #   so that we don't have to worry about ~ expansion internally.   #   so that we don't have to worry about ~ expansion internally.
  #   #
  $fn=~s/^http\:\/\/[^\/]+\///;          $fn=~s/^https?\:\/\/[^\/]+\///;
   
         $fn=~s/^\///;          $fn=~s/^\///;
         $fn=~s{~($LONCAPA::username_re)}{/home/$1/public_html};          $fn=~s{~($LONCAPA::username_re)}{/home/$1/public_html};
   
Line 330  ENDPUBDIRSCRIPT Line 331  ENDPUBDIRSCRIPT
   
     if ((($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) &&      if ((($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) &&
  $env{'environment.remote'} ne 'off') {   $env{'environment.remote'} ne 'off') {
  $r->print('<h3>'.&mt('Co-Author').': '.$uname.' at '.$udom.          $r->print('<h3>'.&mt('Co-Author [_1]',$uname.':'.$udom).'</h3>');
   '</h3>');  
     }      }
 }  }
   
Line 449  sub pubbuttons { Line 449  sub pubbuttons {
               '<input type="submit" value="'.&mt('Publish Directory').'" /></td><td>'.                '<input type="submit" value="'.&mt('Publish Directory').'" /></td><td>'.
 '<input type="button" onclick="window.location='."'/~".  '<input type="button" onclick="window.location='."'/~".
                $uname.$thisdisfn."/default.meta'".'" value="'.                 $uname.$thisdisfn."/default.meta'".'" value="'.
 &mt('Edit Directory Catalog Information').'" /></td></tr></table></form>');  &mt('Edit Directory Metadata').'" /></td></tr></table></form>');
 }  }
   
 sub resourceactions {  sub resourceactions {
Line 621  sub putresource { Line 621  sub putresource {
     $meta_same = 0;      $meta_same = 0;
  }   }
  $publish_button=&mt('Re-publish');   $publish_button=&mt('Re-publish');
  my $rights_status =  
     &mt(&getCopyRightString($targetdir.'/'.$filename)).' '.          my $rights_status =
     &mt(&getSourceRightString($targetdir.'/'.$filename));              &mt(&getCopyRightString($targetdir.'/'.$filename)).', ';
   
           my %lt_SourceRight = &Apache::lonlocal::texthash(
                  'open'   => 'Source: open',
                  'closed' => 'Source: closed',
           );
           $rights_status .=
               $lt_SourceRight{&getSourceRightString($targetdir.'/'.$filename)};
   
  $title = '<a href="/res/'.$targetdir.'/'.$filename.   $title = '<a href="/res/'.$targetdir.'/'.$filename.
     '.meta" target="cat">'.      '.meta" target="cat">'.
     &getTitleString($targetdir.'/'.$filename).'</a>';      &getTitleString($targetdir.'/'.$filename).'</a>';
Removed from v.1.114  
changed lines
  Added in v.1.114.2.2

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