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

Diff for /loncom/publisher/lonpubdir.pm between versions 1.93 and 1.102

version 1.93, 2006/06/22 20:49:19 version 1.102, 2007/04/20 01:17:24
Line 41  use Apache::lonlocal; Line 41  use Apache::lonlocal;
 use Apache::lonmsg;  use Apache::lonmsg;
 use Apache::lonmenu;  use Apache::lonmenu;
 use Apache::lonnet;  use Apache::lonnet;
   use LONCAPA;
   
 sub handler {  sub handler {
   
Line 157  sub getEffectiveUrl { Line 158  sub getEffectiveUrl {
  #   #
  $fn=~s/^http\:\/\/[^\/]+\///;   $fn=~s/^http\:\/\/[^\/]+\///;
         $fn=~s/^\///;          $fn=~s/^\///;
         $fn=~s/\~(\w+)/\/home\/$1\/public_html/;          $fn=~s{~($LONCAPA::username_re)}{/home/$1/public_html};
   
  #  Remove trailing / strings (?)    #  Remove trailing / strings (?) 
   
Line 170  sub getEffectiveUrl { Line 171  sub getEffectiveUrl {
     #internal authentication, needs fixup.      #internal authentication, needs fixup.
     $fn = $r->uri(); # non users do not get the full path request      $fn = $r->uri(); # non users do not get the full path request
                              # through SCRIPT_FILENAME                               # through SCRIPT_FILENAME
     $fn=~s|^/~(\w+)|/home/$1/public_html|;      $fn=~s{^/~($LONCAPA::username_re)}{/home/$1/public_html};
  }   }
     }      }
     $fn=~s/\/+/\//g;      $fn=~s/\/+/\//g;
Line 195  sub startpage { Line 196  sub startpage {
   
     my $formaction='/priv/'.$uname.$thisdisfn.'/';      my $formaction='/priv/'.$uname.$thisdisfn.'/';
     $formaction=~s|/+|/|g;      $formaction=~s|/+|/|g;
     my $pagetitle .= &Apache::loncommon::help_open_menu('','','','',3,'Authoring').      my $pagetitle .= &Apache::loncommon::help_open_menu('','',3,'Authoring').
         '<font face="Arial, Helvetica, sans-serif" size="+1"><b>Construction Space</b>:</font>&nbsp;'.          '<font face="Arial, Helvetica, sans-serif" size="+1"><b>Construction Space</b>:</font>&nbsp;'.
         '<form name="dirs" method="post" action="'.$formaction.          '<form name="dirs" method="post" action="'.$formaction.
         '" target="_parent"><tt><b>'.          '" target="_parent"><tt><b>'.
Line 210  sub startpage { Line 211  sub startpage {
  {'body_title' =>   {'body_title' =>
       $pagetitle,}));        $pagetitle,}));
     } else {      } else {
  $r->print(&Apache::loncommon::start_page('Construction Space',undef));   $r->print(&Apache::loncommon::start_page('Construction Space',undef,
    { 'only_body' => 1,}));
  $r->print($pagetitle);   $r->print($pagetitle);
     }      }
   
       my $esc_thisdisfn = &Apache::loncommon::escape_single($thisdisfn);
     my $pubdirscript=(<<ENDPUBDIRSCRIPT);      my $pubdirscript=(<<ENDPUBDIRSCRIPT);
 <script type="text/javascript">  <script type="text/javascript">
 top.document.title = '$thisdisfn/ - LON-CAPA Construction Space';  top.document.title = '$esc_thisdisfn/ - LON-CAPA Construction Space';
 // Store directory location for menu bar to find  // Store directory location for menu bar to find
   
 parent.lastknownpriv='/~$uname$thisdisfn/';  parent.lastknownpriv='/~$uname$esc_thisdisfn/';
   
 // Confirmation dialogues  // Confirmation dialogues
   
Line 309  parent.lastknownpriv='/~$uname$thisdisfn Line 312  parent.lastknownpriv='/~$uname$thisdisfn
       return        return
     }      }
     function changename(theform,activity) {      function changename(theform,activity) {
         var newname=prompt('New Name');          var oldname=theform.dispfilename.value;
         if (newname == "" || !newname)  {          var newname=prompt('New Name',oldname);
           if (newname == "" || !newname || newname == oldname)  {
             return              return
         }          }
         document.moveresource.newfilename.value = newname          document.moveresource.newfilename.value = newname
Line 513  sub putdirectory { Line 517  sub putdirectory {
  %Apache::lonpublisher::metadatafields=();   %Apache::lonpublisher::metadatafields=();
  %Apache::lonpublisher::metadatakeys=();   %Apache::lonpublisher::metadatakeys=();
  my $construct=$here;   my $construct=$here;
  $construct=~s:^/priv/(\w+)$:/home/$1/public_html:;   $construct=~s{^/priv/($LONCAPA::username_re)$}{/home/$1/public_html};
         my $dirpath = $here;          my $dirpath = $here;
         $dirpath=~s:^/priv/:/~:;          $dirpath=~s{^/priv/}{/~};
  &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile(   &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile(
         $construct.'/'.$dirname.'/default.meta'          $construct.'/'.$dirname.'/default.meta'
  ));   ));
Line 571  sub putresource { Line 575  sub putresource {
     my $css_class='LC_browser_file';      my $css_class='LC_browser_file';
     my $title='&nbsp;';      my $title='&nbsp;';
     my $publish_button=&mt('Publish');      my $publish_button=&mt('Publish');
       my $cstr_dir = '/home/'.$uname.'/public_html/'.$thisdisfn.'/';
 #    my $action_buttons=  #    my $action_buttons=
 #        '<br /><a target="_parent" href="/adm/cfile?action=delete&filename=/~'.  #        '<br /><a target="_parent" href="/adm/cfile?action=delete&filename=/~'.
 # $uname.'/'.$thisdisfn.'/'.$filename.'">'.  # $uname.'/'.$thisdisfn.'/'.$filename.'">'.
Line 585  sub putresource { Line 590  sub putresource {
            $same=1;             $same=1;
         } else {          } else {
            if (&Apache::londiff::are_different_files($resdir.'/'.$filename,             if (&Apache::londiff::are_different_files($resdir.'/'.$filename,
                                       '/home/'.$uname.'/public_html/'.$thisdisfn.'/'.$filename)) {       $cstr_dir.'/'.$filename)) {
               $same=0;                $same=0;
            } else {             } else {
               $same=1;                $same=1;
            }             }
         }          }
    my $meta_cmtime = (stat($cstr_dir.'/'.$filename.'.meta'))[9];
    my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9];
    my $meta_same = 1;
    if ($meta_rmtime < $meta_cmtime
       && &Apache::londiff::are_different_files($resdir.'/'.$filename.'.meta',
        $cstr_dir.'/'.$filename.'.meta')) {
       $meta_same = 0;
    }
  $publish_button=&mt('Re-publish');   $publish_button=&mt('Re-publish');
    my $rights_status =
       &mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
       &mt(&getSourceRightString($targetdir.'/'.$filename));
    $title = '<a href="/res/'.$targetdir.'/'.$filename.
       '.meta" target="cat">'.
       &getTitleString($targetdir.'/'.$filename).'</a>';
  if ($same) {   if ($same) {
             $pubstatus = 'published';  
     $status=&mt('Published').'<br />'.  
  &mt(&getCopyRightString($targetdir.'/'.$filename)).' '.  
  &mt(&getSourceRightString($targetdir.'/'.$filename));  
     if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {      if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
                 $pubstatus = 'obsolete';                  $pubstatus = 'obsolete';
  $status=&mt('Obsolete');   $status=&mt('Obsolete');
             }              } else {
    if (!$meta_same) {
       $pubstatus = 'metamodified';
    } else {
       $pubstatus = 'published';
    }
    $status=&mt('Published').
       '<br />'. $rights_status;
       }
 #    } else {  #    } else {
 # $action_buttons='';  # $action_buttons='';
 #    }  #    }
     $title='<a href="/res/'.$targetdir.'/'.$filename.  
  '.meta" target="cat">'.  
  &getTitleString($targetdir.'/'.$filename).'</a>';  
  } else {   } else {
             $pubstatus = 'modified';              $pubstatus = 'modified';
     $status=&mt('Modified').'<br />'.      $status=&mt('Modified').
  &mt(&getCopyRightString($targetdir.'/'.$filename)).' '.   '<br />'. $rights_status;
  &mt(&getSourceRightString($targetdir.'/'.$filename));  
 #    $action_buttons='';  #    $action_buttons='';
     $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target="cat">'.  
  &getTitleString($targetdir.'/'.$filename).'</a>';  
     if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {      if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
  $status.='<br /><a href="/adm/diff?filename=/~'.$uname.   $status.='<br /><a href="/adm/diff?filename=/~'.$uname.
     $thisdisfn.'/'.$filename.      $thisdisfn.'/'.$filename.
     '&amp;versiontwo=priv" target="cat">'.&mt('Diffs').'</a>';      '&amp;versiontwo=priv" target="cat">'.&mt('Diffs').'</a>';
     }      }
  }   } 
   
  $title.="\n".'<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'.    $title.="\n".'<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'. 
     ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" alt="bomb" />':'Edit Metadata').'</a>';      ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" alt="bomb" />':'Edit Metadata').'</a>';
   
    if (!$meta_same) {
       $title = &mt('Metadata Modified').'<br />'.$title.
    '<br /><a href="/adm/diff?filename=/~'.$uname.
    $thisdisfn.'/'.$filename.'.meta'.
    '&amp;versiontwo=priv" target="cat">'.&mt('Metadata Diffs').'</a>';
       $title.="\n".'<br /><a href="/adm/retrieve?filename=/~'.$uname.
    $thisdisfn.'/'.$filename.'.meta" target="_parent">'.&mt('Retrieve Metadata').'</a>';
    }
  $status.="\n".'<br /><a href="/adm/retrieve?filename=/~'.$uname.   $status.="\n".'<br /><a href="/adm/retrieve?filename=/~'.$uname.
     $thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Retrieve').'</a>';      $thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Retrieve').'</a>';
     }      }
Line 688  sub create_pubselect { Line 715  sub create_pubselect {
 '<option value="print">'.&mt('Print').'</option>'.  '<option value="print">'.&mt('Print').'</option>'.
 '</select>  '</select>
 <input type="hidden" name="filename" value="/~'.  <input type="hidden" name="filename" value="/~'.
  &HTML::Entities::encode($uname.$thisdisfn.'/'.$filename,'<>&"').'" /></form>';   &HTML::Entities::encode($uname.$thisdisfn.'/'.$filename,'<>&"').'" />
    <input type="hidden" name="dispfilename" value="'.
    &HTML::Entities::encode($filename).'" /></form>';
     $$numres ++;      $$numres ++;
 }  }
   
Removed from v.1.93  
changed lines
  Added in v.1.102

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