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

Diff for /loncom/publisher/lonpubdir.pm between versions 1.70 and 1.95

version 1.70, 2004/12/07 22:35:34 version 1.95, 2006/09/13 21:43:26
Line 36  use Apache::Constants qw(:common :http : Line 36  use Apache::Constants qw(:common :http :
 use Apache::loncacc;  use Apache::loncacc;
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonhtmlcommon();  use Apache::lonhtmlcommon();
   use Apache::londiff();
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonmsg;  use Apache::lonmsg;
 use Apache::lonmenu;  use Apache::lonmenu;
Line 61  sub handler { Line 62  sub handler {
              $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.' at '.$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); 
      return HTTP_NOT_ACCEPTABLE;       return HTTP_NOT_ACCEPTABLE;
Line 72  sub handler { Line 73  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'}.' at '.$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 91  sub handler { Line 92  sub handler {
   my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);    my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);
   
   &startpage($r, $uname, $udom, $thisdisfn);   # Put out the start of page.    &startpage($r, $uname, $udom, $thisdisfn);   # Put out the start of page.
   if ($ENV{'environment.remote'} eq 'off') {    if ($env{'environment.remote'} eq 'off') {
       &dircontrols($r,$uname,$udom,$thisdisfn);    # Put out actions for directory,         &dircontrols($r,$uname,$udom,$thisdisfn);    # Put out actions for directory, 
                                                # browse/upload + new file page.                                                 # browse/upload + new file page.
     } else {
         &pubbuttons($r,$uname,$thisdisfn);
   }    }
   &resourceactions($r,$uname,$udom,$thisdisfn); #Put out form used for printing/deletion etc.    &resourceactions($r,$uname,$udom,$thisdisfn); #Put out form used for printing/deletion etc.
   
Line 102  sub handler { Line 105  sub handler {
       
   # Start off the directory table.    # Start off the directory table.
   $r->print('<h3>Directory Contents:</h3>');    $r->print('<h3>Directory Contents:</h3>');
   $r->print('<table border="0" cellspacing="2" cellpadding="2"><tr>'.    $r->print('<table id="LC_browser"><tr>'.
             '<th bgcolor="#DDDDDD">'.&mt('Type').'</th>'.              '<th>'.&mt('Type').'</th>'.
             '<th bgcolor="#DDDDDD">'.&mt('Actions').'</th>'.              '<th>'.&mt('Actions').'</th>'.
             '<th bgcolor="#DDDDDD">'.&mt('Name').'</th>'.              '<th>'.&mt('Name').'</th>'.
             '<th bgcolor="#DDDDDD">'.&mt('Title').'</th>'.              '<th>'.&mt('Title').'</th>'.
     '<th bgcolor="#DDDDDD">'.&mt('Status').'</th>'.      '<th>'.&mt('Status').'</th>'.
             '<th bgcolor="#DDDDDD">'.&mt('Last Modified').              '<th>'.&mt('Last Modified').
     '</th></tr>');      '</th></tr>'."\n");
   
   my $filename;    my $filename;
   my $dirptr=16384; # Mask indicating a directory in stat.cmode.    my $dirptr=16384; # Mask indicating a directory in stat.cmode.
Line 135  sub handler { Line 138  sub handler {
   }    }
   closedir(DIR);    closedir(DIR);
   
   $r->print('</table></body></html>');    $r->print('</table>'.&Apache::loncommon::end_page());
   return OK;      return OK;  
 }  }
 #  #
Line 146  sub getEffectiveUrl { Line 149  sub getEffectiveUrl {
     my $r = shift;      my $r = shift;
     my $fn;      my $fn;
           
     if ($ENV{'form.filename'}) { # If a form filename is defined.      if ($env{'form.filename'}) { # If a form filename is defined.
  $fn=$ENV{'form.filename'};   $fn=$env{'form.filename'};
  #   #
  #   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.
Line 190  sub startpage { Line 193  sub startpage {
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;      $r->send_http_header;
   
     $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');  
   
     my $pagetitle;  
     my $formaction='/priv/'.$uname.$thisdisfn.'/';      my $formaction='/priv/'.$uname.$thisdisfn.'/';
     $formaction=~s/\/+/\//g;      $formaction=~s|/+|/|g;
     $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 204  sub startpage { Line 204  sub startpage {
                  'this.form.action=this.form.recent.value;this.form.submit()').                   'this.form.action=this.form.recent.value;this.form.submit()').
               '</form>';                '</form>';
     &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);      &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);
     if ($ENV{'environment.remote'} eq 'off') {      if ($env{'environment.remote'} eq 'off') {
  $ENV{'request.noversionuri'}=$currdir.'/';   $env{'request.noversionuri'}=$currdir.'/';
  $r->print(&Apache::loncommon::bodytag('Construction Space',undef,undef,undef,undef,undef,$pagetitle));   $r->print(&Apache::loncommon::start_page('Construction Space',undef,
    {'body_title' =>
         $pagetitle,}));
     } else {      } else {
    $r->print(&Apache::loncommon::start_page('Construction Space',undef));
  $r->print($pagetitle);   $r->print($pagetitle);
     }      }
   
     my $pubdirscript=(<<ENDPUBDIRSCRIPT);      my $pubdirscript=(<<ENDPUBDIRSCRIPT);
 <script>  <script type="text/javascript">
   top.document.title = '$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$thisdisfn/';
Line 220  parent.lastknownpriv='/~$uname$thisdisfn Line 225  parent.lastknownpriv='/~$uname$thisdisfn
   
     function currdiract(theform) {      function currdiract(theform) {
         if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'publish') {          if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'publish') {
             document.publishdir.filename.value = theform.filename.value              document.publishdir.filename.value = theform.filename.value;
             pubdir(document.publishdir)      document.publishdir.submit();
         }  
         if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'publishsub') {  
             document.publishdir.filename.value = theform.filename.value  
             pubrecdir(document.publishdir)  
         }          }
         if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'editcat') {          if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'editcat') {
             top.location=theform.filename.value+'default.meta'              top.location=theform.filename.value+'default.meta'
Line 234  parent.lastknownpriv='/~$uname$thisdisfn Line 235  parent.lastknownpriv='/~$uname$thisdisfn
             document.printdir.postdata.value=theform.filename.value              document.printdir.postdata.value=theform.filename.value
             document.printdir.submit();              document.printdir.submit();
         }          }
     }          if (theform.dirtask.options[theform.dirtask.selectedIndex].value == "delete") {
                   var delform = document.delresource
     function pubdir(theform) {                delform.filename.value = theform.filename.value
  if (confirm('Publish complete directory?')) {                delform.submit()
             forcepub(theform)  
     theform.submit();  
         }  
     }  
     function pubrecdir(theform) {  
  if (confirm('Publish directory and all subdirectories?')) {  
             forcepub(theform);  
             theform.pubrec.value='1';  
     theform.submit();  
         }          }
     }      }
     
     function forcepub(theform) {  
         if (confirm('Force publication of unmodified files? - OK=yes; Cancel=No.')) {  
             theform.forcerepub.value="ON";  
         }   
     }  
   
     function checkUpload(theform) {      function checkUpload(theform) {
         if (theform.file == '') {          if (theform.file == '') {
             alert("Please use 'Browse..' to choose a file first, before uploading")              alert("Please use 'Browse..' to choose a file first, before uploading")
Line 266  parent.lastknownpriv='/~$uname$thisdisfn Line 252  parent.lastknownpriv='/~$uname$thisdisfn
   
     function SetPubDir(theform,printForm) {      function SetPubDir(theform,printForm) {
         if (theform.diraction.options[theform.diraction.selectedIndex].value == "open") {          if (theform.diraction.options[theform.diraction.selectedIndex].value == "open") {
             top.location = theform.filename.value              top.location = theform.openname.value
             return              return
         }          }
         if (theform.diraction.options[theform.diraction.selectedIndex].value == "publish") {          if (theform.diraction.options[theform.diraction.selectedIndex].value == "publish") {
             pubdir(theform)              theform.submit();
         }  
         if (theform.diraction.options[theform.diraction.selectedIndex].value == "publishsub") {  
             pubrecdir(theform)  
         }          }
         if (theform.diraction.options[theform.diraction.selectedIndex].value == "editcat") {          if (theform.diraction.options[theform.diraction.selectedIndex].value == "editcat") {
             top.location=theform.filename.value+'default.meta'              top.location=theform.filename.value+'default.meta'
Line 283  parent.lastknownpriv='/~$uname$thisdisfn Line 266  parent.lastknownpriv='/~$uname$thisdisfn
             theform.postdata.value = theform.filename.value              theform.postdata.value = theform.filename.value
             theform.submit()              theform.submit()
         }          }
           if (theform.diraction.options[theform.diraction.selectedIndex].value == "delete") {
                 var delform = document.delresource
                 delform.filename.value = theform.filename.value
                 delform.submit()
           }
         return          return
     }      }
     function SetResChoice(theform) {      function SetResChoice(theform) {
Line 298  parent.lastknownpriv='/~$uname$thisdisfn Line 286  parent.lastknownpriv='/~$uname$thisdisfn
       if (activity == 'delete') {        if (activity == 'delete') {
           var delform = document.delresource            var delform = document.delresource
           delform.filename.value = theform.filename.value            delform.filename.value = theform.filename.value
           if (confirm("Are you sure you want to delete "+theform.filename.value+"?")) {            delform.submit()
               delform.submit()  
           }  
       }        }
       if (activity == 'obsolete') {        if (activity == 'obsolete') {
           var pubform = document.pubresource            var pubform = document.pubresource
           pubform.filename.value = theform.filename.value            pubform.filename.value = theform.filename.value
           alert("You will be taken to the publication page.\\nCheck the 'Obsolete' checkbox at the bottom of the page, and click 'Finalize Publication'.")            pubform.makeobsolete.value=1;
           pubform.submit()            pubform.submit()
       }        }
       if (activity == 'print') {        if (activity == 'print') {
Line 316  parent.lastknownpriv='/~$uname$thisdisfn Line 302  parent.lastknownpriv='/~$uname$thisdisfn
           document.retrieveres.filename.value = theform.filename.value            document.retrieveres.filename.value = theform.filename.value
           document.retrieveres.submit()            document.retrieveres.submit()
       }        }
         if (activity == 'cleanup') {
             document.cleanup.filename.value = theform.filename.value
             document.cleanup.submit()
         }
       return        return
     }      }
     function changename(theform,activity) {      function changename(theform,activity) {
Line 332  parent.lastknownpriv='/~$uname$thisdisfn Line 322  parent.lastknownpriv='/~$uname$thisdisfn
 ENDPUBDIRSCRIPT  ENDPUBDIRSCRIPT
     $r->print($pubdirscript);      $r->print($pubdirscript);
   
     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') {
  $r->print('<h3>'.&mt('Co-Author').': '.$uname.' at '.$udom.   $r->print('<h3>'.&mt('Co-Author').': '.$uname.' at '.$udom.
   '</h3>');    '</h3>');
     }      }
Line 340  ENDPUBDIRSCRIPT Line 331  ENDPUBDIRSCRIPT
   
 sub dircontrols {  sub dircontrols {
     my ($r,$uname,$udom,$thisdisfn) = @_;      my ($r,$uname,$udom,$thisdisfn) = @_;
       my %lt=&Apache::lonlocal::texthash(
                                          cnpd => 'Cannot publish directory',
                                          cnrd => 'Cannot retrieve directory',
                                          mcdi => 'Must create new subdirectory inside a directory',
                                          pubr => 'Publish this Resource',
                                          pubd => 'Publish this Directory',
                                          dedr => 'Delete Directory',
                                          rtrv => 'Retrieve Old Version',
                                          list => 'List Directory',
                                          uplo => 'Upload file',  
                                          dele => 'Delete',
                                          edit => 'Edit Catalog Information', 
                                          sela => 'Select Action',
                                          nfil => 'New file',
                                          nhtm => 'New HTML file',
                                          nprb => 'New problem',
                                          npag => 'New assembled page',
                                          nseq => 'New assembled sequence',
                                          ncrf => 'New custom rights file',
                                          nsty => 'New style file',
                                          nlib => 'New library file',
                                          nsub => 'New subdirectory',
                                          renm => 'Rename current file to',
                                          move => 'Move current file to',
                                          copy => 'Copy current file to',
                                          type => 'Type Name Here',
                                          go => 'Go',
                                          prnt => 'Print contents of directory',
                                          crea => 'Create a new directory or LON-CAPA document',
          acti => 'Actions for current directory',
          updc => 'Upload a new document'
                                         );
     $r->print(<<END);      $r->print(<<END);
         <table cellspacing="4" cellpadding="4" width="100%">          <table id="LC_cstr_controls">
          <tr>           <tr>
           <td bgcolor="#DDDDDD" align="middle"><font face="Arial, Helvetica, sans-serif" size="-1"><b>Actions for current directory</b></font></td>            <th>$lt{'acti'}</th>
           <td bgcolor="#DDDDDD" align="middle"><font face="Arial, Helvetica, sans-serif" size="-1"><b>Upload a new document</b></font></td>            <th>$lt{'updc'}</th>
           <td bgcolor="#DDDDDD" align="middle"><font face="Arial, Helvetica, sans-serif" size="-1"><b>Create a new directory or LON-CAPA document</b></font></td>            <th>$lt{'crea'}</th>
         </tr>          </tr>
         <tr>          <tr>
          <td bgcolor="#ccddaa" valign="top" align="center">           <td>
           <form name="curractions" method="post" action="">            <form name="curractions" method="post" action="">
            <select name="dirtask" onChange="currdiract(this.form)">             <select name="dirtask" onchange="currdiract(this.form)">
             <option>Select action</option>              <option>$lt{'sela'}</option>
             <option value="publish">Publish directory</option>              <option value="publish">$lt{'pubd'}</option>
             <option value="publishsub">Publish with subdirectories</option>              <option value="editcat">$lt{'edit'}</option>
             <option value="editcat">Edit catalog information</option>              <option value="printdir">$lt{'prnt'}</option>
             <option value="printdir">Print contents of directory</option>              <option value="delete">$lt{'dedr'}</option>
            </select>             </select>
            <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />             <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
           </form>            </form>
           <form name="publishdir" method="post" action="/adm/publish" target="_parent">            <form name="publishdir" method="post" action="/adm/publish" target="_parent">
            <input type="hidden" name="pubrec" value="" />             <input type="hidden" name="pubrec" value="" />
            <input type="hidden" name="filename" value="" />             <input type="hidden" name="filename" value="" />
            <input type="hidden" name="forcerepub" value="NO" />  
           </form>            </form>
           <form name="printdir" method="post" action="/adm/printout" target="_parent">            <form name="printdir" method="post" action="/adm/printout" target="_parent">
            <input type="hidden" name="postdata" value="" />             <input type="hidden" name="postdata" value="" />
           </form>            </form>
          </td>           </td>
          <td bgcolor="#ccddaa" valign="top" align="center">           <td>
     <form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload" target="_parent">      <form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload" target="_parent">
       <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />        <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
       <input type="file" name="upfile" size="20" />        <input type="file" name="upfile" size="20" />
       <input type="button" value="Upload file"  onclick="checkUpload(this.form)" />        <input type="button" value="$lt{'uplo'}"  onclick="checkUpload(this.form)" />
     </form>      </form>
  </td>   </td>
  <td bgcolor="#ccddaa" align="center">   <td>
     <form name="fileaction" method="post" action="/adm/cfile" target="_parent">      <form name="fileaction" method="post" action="/adm/cfile" target="_parent">
       <nobr>        <span style="white-space: nowrap">
  <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />   <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
   <select name="action">    <select name="action">
     <option>Select Action</option>      <option value="Select Action">$lt{'sela'}</option>
     <option value="newfile">New file:</option>      <option value="newfile">$lt{'nfil'}:</option>
     <option value="newhtmlfile">New HTML file:</option>      <option value="newhtmlfile">$lt{'nhtm'}:</option>
     <option value="newproblemfile">New problem:</option>      <option value="newproblemfile">$lt{'nprb'}:</option>
                     <option value="newpagefile">New assembled page:</option>                              <option value="newpagefile">$lt{'npag'}:</option>
                     <option value="newsequencefile">New assembled sequence:</option>                              <option value="newsequencefile">$lt{'nseq'}:</option>
                     <option value="newrightsfile">New custom rights file:</option>                              <option value="newrightsfile">$lt{'ncrf'}:</option>
                     <option value="newstyfile">New style file:</option>                              <option value="newstyfile">$lt{'nsty'}:</option>
     <option value="newdir">New subdirectory:</option>                              <option value="newlibraryfile">$lt{'nlib'}:</option>
       <option value="newdir">$lt{'nsub'}:</option>
   </select>&nbsp;<input type="text" name="newfilename" value="Type Name Here" onfocus="if (this.value == 'Type Name Here') this.value=''" />&nbsp;<input type="button" value="Go" onclick="document.fileaction.submit()" />    </select>&nbsp;<input type="text" name="newfilename" value="Type Name Here" onfocus="if (this.value == 'Type Name Here') this.value=''" />&nbsp;<input type="button" value="Go" onclick="document.fileaction.submit()" />
  </nobr>   </span>
  </form>   </form>
   </td>    </td>
          </tr>           </tr>
Line 398  sub dircontrols { Line 421  sub dircontrols {
 END  END
 }  }
   
   sub pubbuttons {
       my ($r,$uname,$thisdisfn) = @_;
       $r->print('<form method="post" action="/adm/publish" target="_parent">'.
                 '<table><tr><td><input type="hidden" name="filename" value="/~'.
                  $uname.$thisdisfn.'/" />'.
                 '<input type="submit" value="'.&mt('Publish Directory').'" /></td><td>'.
   '<input type="button" onclick="window.location='."'/~".
                  $uname.$thisdisfn."/default.meta'".'" value="'.
   &mt('Edit Directory Catalog Information').'" /></td></tr></table></form>');
   }
   
 sub resourceactions {  sub resourceactions {
     my ($r,$uname,$udom,$thisdisfn) = @_;      my ($r,$uname,$udom,$thisdisfn) = @_;
     $r->print(<<END);      $r->print(<<END);
Line 411  sub resourceactions { Line 445  sub resourceactions {
          <input type="hidden" name="action" value="delete" />           <input type="hidden" name="action" value="delete" />
        </form>         </form>
        <form name="pubresource" action="/adm/publish" target="_parent" method="post">         <form name="pubresource" action="/adm/publish" target="_parent" method="post">
          <input type="hidden" name="pubrec" value="" />  
          <input type="hidden" name="filename" value="" />           <input type="hidden" name="filename" value="" />
          <input type="hidden" name="forcerepub" value="NO" />           <input type="hidden" name="makeobsolete" value="0" />
        </form>         </form>
        <form name="printresource" action="/adm/printout" target="_parent" method="post">         <form name="printresource" action="/adm/printout" target="_parent" method="post">
            <input type="hidden" name="postdata" value="" />             <input type="hidden" name="postdata" value="" />
Line 421  sub resourceactions { Line 454  sub resourceactions {
        <form name="retrieveres" action="/adm/retrieve" target="_parent" method="post">         <form name="retrieveres" action="/adm/retrieve" target="_parent" method="post">
            <input type="hidden" name="filename" value="" />             <input type="hidden" name="filename" value="" />
        </form>         </form>
          <form name="cleanup" action="/adm/cleanup" target="_parent" method="post">
              <input type="hidden" name="filename" value="" />
          </form>
 END  END
 }  }
   
Line 490  sub putdirectory { Line 526  sub putdirectory {
             $actionitem =               $actionitem = 
                     '<form name="dirselect_'.$$numdir.                      '<form name="dirselect_'.$$numdir.
                     '" action="/adm/publish" target="_parent">'.                      '" action="/adm/publish" target="_parent">'.
                     '<select name="diraction" onChange="SetPubDir(this.form,document)">'.                      '<select name="diraction" onchange="SetPubDir(this.form,document)">'.
                       '<option selected="selected">'.&mt('Select action').'</option>'.                        '<option selected="selected">'.&mt('Select action').'</option>'.
                       '<option value="open">'.&mt('Open').'</option>'.                        '<option value="open">'.&mt('Open').'</option>'.
                       '<option value="publish">'.&mt('Publish').'</option>'.                        '<option value="publish">'.&mt('Publish').'</option>'.
                       '<option value="publishsub">'.&mt('Publish with subdirectories').'</option>'.  
                       '<option value="editcat">'.&mt('Edit catalog information').'</option>'.                        '<option value="editcat">'.&mt('Edit catalog information').'</option>'.
                       '<option value="printdir">'.&mt('Print directory').                        '<option value="printdir">'.&mt('Print directory').'</option>'.
                         '<option value="delete">'.&mt('Delete directory').'</option>'.
                     '</select>'.                      '</select>'.
                      '<input type="hidden" name="filename" value="'.$dirpath.'/'.$dirname.'/" />'.                       '<input type="hidden" name="filename" value="'.&HTML::Entities::encode($dirpath.'/'.$dirname,'<>&"').'/" />'.
                      '<input type="hidden" name="pubrec" value="" />'.                       '<input type="hidden" name="openname" value="'.$here.'/'.$dirname.'/" />'.
                      '<input type="hidden" name="forcerepub" value="" />'.  
                      '<input type="hidden" name="postdata" value="" />'.                       '<input type="hidden" name="postdata" value="" />'.
                    '</form>';                     '</form>';
             $$numdir ++;              $$numdir ++;
         }          }
  $r->print('<tr bgcolor="#CCCCFF">'.   $r->print('<tr class="LC_browser_folder">'.
   '<td><img src="'.    '<td><img src="'.
   $Apache::lonnet::perlvar{'lonIconsURL'}.'/folder_closed.gif" /></td>'.    $Apache::lonnet::perlvar{'lonIconsURL'}.'/folder_closed.gif" alt="folder" /></td>'.
   '<td>'.$actionitem.'</td>'.    '<td>'.$actionitem.'</td>'.
   '<td><font face="arial"><a href="'.$here.'/'.$dirname.'/" target="_parent">'.    '<td><span class="LC_filename"><a href="'.&HTML::Entities::encode($here.'/'.$dirname,'<>&"').'/" target="_parent">'.
   $disfilename.'</a></font></td>'.    $disfilename.'</a></span></td>'.
         '<td colspan="2">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'}.' <i>'.          '<td colspan="2">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'});
   $Apache::lonpublisher::metadatafields{'subject'}.'</i> '.   if ($Apache::lonpublisher::metadatafields{'subject'} ne '') {
   $Apache::lonpublisher::metadatafields{'keywords'}.'</td>'.      $r->print(' <i>'.
         $Apache::lonpublisher::metadatafields{'subject'}.
         '</i> ');
    }
    $r->print($Apache::lonpublisher::metadatafields{'keywords'}.'</td>'.
   '<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'.    '<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'.
   "</tr>\n");    "</tr>\n");
     }      }
Line 526  sub putresource { Line 565  sub putresource {
     my ($r, $udom, $uname, $filename, $thisdisfn,       my ($r, $udom, $uname, $filename, $thisdisfn, 
  $resdir, $targetdir, $linkdir,   $resdir, $targetdir, $linkdir,
  $cmtime,$bombs,$numres) = @_;   $cmtime,$bombs,$numres) = @_;
       &Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename);
     my $pubstatus = 'unpublished';      my $pubstatus = 'unpublished';
     my $status=&mt('Unpublished');      my $status=&mt('Unpublished');
     my $bgcolor='#FFAA99';      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.'">'.
 # &mt('Delete').'</a>';  # &mt('Delete').'</a>';
     if (-e $resdir.'/'.$filename) {      if (-e $resdir.'/'.$filename) {
           my $same=0;
  my ($rdev,$rino,$rmode,$rnlink,   my ($rdev,$rino,$rmode,$rnlink,
     $ruid,$rgid,$rrdev,$rsize,      $ruid,$rgid,$rrdev,$rsize,
     $ratime,$rmtime,$rctime,      $ratime,$rmtime,$rctime,
     $rblksize,$rblocks)=stat($resdir.'/'.$filename);      $rblksize,$rblocks)=stat($resdir.'/'.$filename);
           if ($rmtime>=$cmtime) {
              $same=1;
           } else {
              if (&Apache::londiff::are_different_files($resdir.'/'.$filename,
        $cstr_dir.'/'.$filename)) {
                 $same=0;
              } else {
                 $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');
  if ($rmtime>=$cmtime) {   my $rights_status =
             $pubstatus = 'published';      &mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
     $status=&mt('Published').'<br />'.      &mt(&getSourceRightString($targetdir.'/'.$filename));
  &mt(&getCopyRightString($targetdir.'/'.$filename)).' '.   $title = '<a href="/res/'.$targetdir.'/'.$filename.
  &mt(&getSourceRightString($targetdir.'/'.$filename));      '.meta" target="cat">'.
     $bgcolor='#CCFF88';      &getTitleString($targetdir.'/'.$filename).'</a>';
    &Apache::lonnet::logthis("same $same meta $meta_same");
    if ($same) {
     if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {      if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
                 $pubstatus = 'obsolete';                  $pubstatus = 'obsolete';
  $status=&mt('Obsolete');   $status=&mt('Obsolete');
                 $bgcolor='#AAAAAA';              } 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));  
             $bgcolor='#FFFF77';  
 #    $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.
     '&versiontwo=priv" target=cat>'.&mt('Diffs').'</a>';      '&amp;versiontwo=priv" target="cat">'.&mt('Diffs').'</a>';
     }      }
    } 
   
    $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>';
   
    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>';
  }   }
  $title.='<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'.    $status.="\n".'<br /><a href="/adm/retrieve?filename=/~'.$uname.
     ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" />':'Edit Metadata').'</a>';  
  $status.='<br><a href="/adm/retrieve?filename=/~'.$uname.  
     $thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Retrieve').'</a>';      $thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Retrieve').'</a>';
     }      }
     my $editlink='';      my $editlink='';
Line 587  sub putresource { Line 659  sub putresource {
  $editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_parent">'.&mt('EditXML').'</a>)';   $editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_parent">'.&mt('EditXML').'</a>)';
  $editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?forceColoredit=1" target="_parent">'.&mt('Edit').'</a>)';   $editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?forceColoredit=1" target="_parent">'.&mt('Edit').'</a>)';
     }      }
       if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm|sty)$/) {
    $editlink.=' (<a href="/adm/cleanup?filename=/~'.$uname.
       $thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Clean Up').')</a>';
       }
     if ($filename=~/\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) {      if ($filename=~/\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) {
  $editlink=' (<a target="_parent" href="/adm/cfile?decompress=/~'.   $editlink=' (<a target="_parent" href="/adm/cfile?decompress=/~'.
       $uname.$thisdisfn.'/'.$filename.'">'.&mt('Decompress').'</a>)';        $uname.$thisdisfn.'/'.$filename.'">'.&mt('Decompress').'</a>)';
     }      }
     my $pub_select = '';      my $pub_select = '';
     &create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres);      &create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres);
     $r->print('<tr bgcolor="'.$bgcolor.'">'.      $r->print('<tr class="LC_browser_file_'.$pubstatus.'">'.
       '<td>'.($filename=~/[\#\~]$/?'&nbsp;':        '<td>'.($filename=~/[\#\~]$/?'&nbsp;':
       '<img src="'.&Apache::loncommon::icon($filename).'" /></td>').        '<img src="'.&Apache::loncommon::icon($filename).'" alt="" />').'</td>'.
               '<td>'.$pub_select.'</td>'.                '<td>'.$pub_select.'</td>'.
       '<td><font face="arial">'.        '<td><span class="LC_filename"> '.
       '<a href="'.$linkdir.'/'.$filename.'" target="_parent">'.        '<a href="'.$linkdir.'/'.$filename.'" target="_parent">'.
                $filename.'</a></font>'.$editlink2.$editlink.                 $filename.'</a></span>'.$editlink2.$editlink.
       '</td>'.        '</td>'.
       '<td>'.$title.'</td>'.        '<td>'.$title.'</td>'.
       '<td>'.$status.'</td>'.        '<td>'.$status.'</td>'.
Line 612  sub create_pubselect { Line 688  sub create_pubselect {
     my ($r,$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres) = @_;      my ($r,$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres) = @_;
     $$pub_select = '      $$pub_select = '
 <form name="resselect_'.$$numres.'" action="">  <form name="resselect_'.$$numres.'" action="">
 <select name="reschoice"  onChange="SetResChoice(this.form)">  <select name="reschoice"  onchange="SetResChoice(this.form)">
 <option>'.&mt('Select action').  <option>'.&mt('Select action').'</option>'.
 '<option value="copy"/>'.&mt('Copy');  '<option value="copy">'.&mt('Copy').'</option>';
     if ($pubstatus eq 'obsolete' || $pubstatus eq 'unpublished') {      if ($pubstatus eq 'obsolete' || $pubstatus eq 'unpublished') {
         $$pub_select .=           $$pub_select .= 
 '<option value="rename"/>'.&mt('Rename').  '<option value="rename">'.&mt('Rename').'</option>'.
 '<option value="move"/>'.&mt('Move').  '<option value="move">'.&mt('Move').'</option>'.
 '<option value="delete"/>'.&mt('Delete');  '<option value="delete">'.&mt('Delete').'</option>';
     } else {      } else {
         $$pub_select .= '          $$pub_select .= '
 <option value="obsolete"/>'.&mt('Mark obsolete');  <option value="obsolete">'.&mt('Mark obsolete').'</option>';
     }      }
 # check for versions  # check for versions
     my $versions = &check_for_versions($r,'/'.$filename,$udom,$uname);      my $versions = &check_for_versions($r,'/'.$filename,$udom,$uname);
     if ($versions > 0) {      if ($versions > 0) {
         $$pub_select .='          $$pub_select .='
 <option value="retrieve"/>'.&mt('Retrieve old version');  <option value="retrieve">'.&mt('Retrieve old version').'</option>';
     }      }
     $$pub_select .= '      $$pub_select .= '
 <option value="publish"/>'.$publish_button.  <option value="publish">'.$publish_button.'</option>'.
 '<option value="print"/>'.&mt('Print').  '<option value="cleanup">'.&mt('Clean up').'</option>'.
   '<option value="print">'.&mt('Print').'</option>'.
 '</select>  '</select>
 <input type="hidden" name="filename" value="/~'.  <input type="hidden" name="filename" value="/~'.
  $uname.$thisdisfn.'/'.$filename.'"></form>';   &HTML::Entities::encode($uname.$thisdisfn.'/'.$filename,'<>&"').'" /></form>';
     $$numres ++;      $$numres ++;
 }  }
   
Removed from v.1.70  
changed lines
  Added in v.1.95

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