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

Diff for /loncom/interface/londocs.pm between versions 1.114 and 1.136

version 1.114, 2004/04/07 20:36:54 version 1.136, 2004/08/03 20:44:33
Line 121  sub dumpbutton { Line 121  sub dumpbutton {
     if ($home) {      if ($home) {
  return '</td><td bgcolor="#DDDDCC">'.   return '</td><td bgcolor="#DDDDCC">'.
     '<input type="submit" name="dumpcourse" value="'.      '<input type="submit" name="dumpcourse" value="'.
     &mt('Dump Course DOCS to Construction Space').'" />';      &mt('Dump Course DOCS to Construction Space').'" />'.
       &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs');
     } else {      } else {
  return'</td><td bgcolor="#DDDDCC">'.   return'</td><td bgcolor="#DDDDCC">'.
      &mt('Dump Course DOCS to Construction Space: available on other servers');       &mt('Dump Course DOCS to Construction Space: available on other servers');
Line 156  sub dumpcourse { Line 157  sub dumpcourse {
  $crs=~s/\_/\//g;   $crs=~s/\_/\//g;
  foreach (keys %replacehash) {   foreach (keys %replacehash) {
     my $newfilename=$title.'/'.$replacehash{$_};      my $newfilename=$title.'/'.$replacehash{$_};
     $newfilename=~s/[^\w\/\.]+/\_/g;      $newfilename=~s/[^\w\/\.\/]+/\_/g;
     my @dirs=split(/\//,$newfilename);      my @dirs=split(/\//,$newfilename);
     my $path='/home/'.$ca.'/public_html';      my $path='/home/'.$ca.'/public_html';
     my $makepath=$path;      my $makepath=$path;
Line 200  sub dumpcourse { Line 201  sub dumpcourse {
     $r->print(      $r->print(
   '<input type="hidden" name="authorspace" value="'.$1.'" />');    '<input type="hidden" name="authorspace" value="'.$1.'" />');
  } else {   } else {
     $r->print('<option value="'.$1.'">'.$_.'</option>');      $r->print('<option value="'.$1.'">'.$1.' - '.
         &Apache::loncommon::plainname(split(/\@/,$1)).'</option>');
  }   }
     }      }
  }   }
Line 223  sub dumpcourse { Line 225  sub dumpcourse {
  $title=$_;   $title=$_;
     }      }
     $title=~s/\.(\w+)$//;      $title=~s/\.(\w+)$//;
     $title=~s/\W+/\_/gs;      $title=~s/[^\w\/]+/\_/gs;
     $title.='.'.$ext;      $title.='.'.$ext;
     $r->print("\n<td><input type='text' size='60' name='namefor_".$_."' value='".$title."' /></td></tr>\n");      $r->print("\n<td><input type='text' size='60' name='namefor_".$_."' value='".$title."' /></td></tr>\n");
  }   }
Line 261  sub group_import { Line 263  sub group_import {
 sub breadcrumbs {  sub breadcrumbs {
     my ($where)=@_;      my ($where)=@_;
     &Apache::lonhtmlcommon::clear_breadcrumbs();      &Apache::lonhtmlcommon::clear_breadcrumbs();
     if ($where =~ /^default/) {      my (@folders)=split('&',$ENV{'form.folderpath'});
  &Apache::lonhtmlcommon::add_breadcrumb({'href'=>'/adm/coursedocs',      my $folderpath;
     'title'=>'Main Course Documents',      while (@folders) {
     'text' =>'Main Course Documents'});   my $folder=shift(@folders);
     } elsif ($where =~ /^supplemental/) {   my $foldername=shift(@folders);
  &Apache::lonhtmlcommon::add_breadcrumb({'href'=>'/adm/coursedocs',   if ($folderpath) {$folderpath.='&';}
     'title'=>'Supplemental Course Documents',   $folderpath.=$folder.'&'.$foldername;
     'text' =>'Supplemental Course Documents'});   my $url='/adm/coursedocs?folderpath='.
       &Apache::lonnet::escape($folderpath);
     } else {  
  &Apache::lonhtmlcommon::add_breadcrumb({'href'=>'/adm/coursedocs',  
  'title'=>$where,  
  'text' =>$where});  
     }  
     if ($ENV{'form.foldername'}) {  
  my @folders;  
  if (defined($ENV{'form.folders'})) {  
     @folders=@{$ENV{'form.folders'}};  
  }  
  @folders=(@folders,$ENV{'form.folder'},  
   &Apache::lonnet::escape($ENV{'form.foldername'}));  
   
  my $folderpath;  
  while (@folders) {  
     my $folder=shift(@folders);  
     my $foldername=shift(@folders);  
     if ($folderpath) {$folderpath.='&';}  
     $folderpath.=$folder.'&'.$foldername;  
     my $url='/adm/coursedocs?folderpath='.  
  &Apache::lonnet::escape($folderpath);  
     &Apache::lonhtmlcommon::add_breadcrumb(      &Apache::lonhtmlcommon::add_breadcrumb(
       {'href'=>$url,        {'href'=>$url,
        'title'=>&Apache::lonnet::unescape($foldername),         'title'=>&Apache::lonnet::unescape($foldername),
        'text'=>&Apache::lonnet::unescape($foldername)});         'text'=>'<font size="+1">'.
      &Apache::lonnet::unescape($foldername).'</font>'
          });
                 
       
  }  
     }      }
     return &Apache::lonhtmlcommon::breadcrumbs();      return &Apache::lonhtmlcommon::breadcrumbs(undef,undef,undef,undef,undef,0);
 }  }
   
 sub editor {  sub editor {
Line 318  sub editor { Line 300  sub editor {
    $r->print('<p><font color="red">'.$errtext.'</font></p>');     $r->print('<p><font color="red">'.$errtext.'</font></p>');
     } else {      } else {
 # ------------------------------------------------------------ Process commands  # ------------------------------------------------------------ Process commands
   
 # ---------------- if they are for this folder and user allowed to make changes  # ---------------- if they are for this folder and user allowed to make changes
  if (($allowed) && ($ENV{'form.folder'} eq $folder)) {   if (($allowed) && ($ENV{'form.folder'} eq $folder)) {
   # set parameters and change order
       if (defined($ENV{'form.setparms'})) {
    my $idx=$ENV{'form.setparms'};
   # set parameters
    if ($ENV{'form.randpick_'.$idx}) {
       &Apache::lonratedt::storeparameter($idx,'parameter_randompick',$ENV{'form.randpick_'.$idx},'int_pos');
    } else {
       &Apache::lonratedt::delparameter($idx,'parameter_randompick');
    }
    if ($ENV{'form.hidprs_'.$idx}) {
       &Apache::lonratedt::storeparameter($idx,'parameter_hiddenresource','yes','string_yesno');
    } else {
       &Apache::lonratedt::delparameter($idx,'parameter_hiddenresource');
    }
    if ($ENV{'form.encprs_'.$idx}) {
       &Apache::lonratedt::storeparameter($idx,'parameter_encrypturl','yes','string_yesno');
    } else {
       &Apache::lonratedt::delparameter($idx,'parameter_encrypturl');
    }
   
    if ($ENV{'form.newpos'}) {
   # change order
   
       my $newpos=$ENV{'form.newpos'}-1;
       my $currentpos=$ENV{'form.currentpos'}-1;
       my $i;
       my @neworder=();
       if ($newpos>$currentpos) {
   # moving stuff up
    for ($i=0;$i<$currentpos;$i++) {
       $neworder[$i]=$Apache::lonratedt::order[$i];
    }
    for ($i=$currentpos;$i<$newpos;$i++) {
       $neworder[$i]=$Apache::lonratedt::order[$i+1];
    }
                           $neworder[$newpos]=$Apache::lonratedt::order[$currentpos];
    for ($i=$newpos+1;$i<=$#Apache::lonratedt::order;$i++) {
       $neworder[$i]=$Apache::lonratedt::order[$i];
    }
       } else {
   # moving stuff down
    for ($i=0;$i<$newpos;$i++) {
       $neworder[$i]=$Apache::lonratedt::order[$i];
    }
    $neworder[$newpos]=$Apache::lonratedt::order[$currentpos];
    for ($i=$newpos+1;$i<$currentpos+1;$i++) {
       $neworder[$i]=$Apache::lonratedt::order[$i-1];
    }
    for ($i=$currentpos+1;$i<=$#Apache::lonratedt::order;$i++) {
       $neworder[$i]=$Apache::lonratedt::order[$i];
    }
       }
       @Apache::lonratedt::order=@neworder;
    }
   # store the changed version
   
    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.sequence');
    if ($fatal) {
       $r->print('<p><font color="red">'.$errtext.'</font></p>');
       return;
    }
   
       }
   
 # upload a file, if present  # upload a file, if present
            if (($ENV{'form.uploaddoc.filename'}) &&             if (($ENV{'form.uploaddoc.filename'}) &&
                ($ENV{'form.cmd'}=~/^upload_(\w+)/)) {                 ($ENV{'form.cmd'}=~/^upload_(\w+)/)) {
     if ( ($folder=~/^$1/) || ($1 eq 'default') ) {      if ( ($folder=~/^$1/) || ($1 eq 'default') ) {
 # this is for a course, not a user, so set coursedoc flag  # this is for a course, not a user, so set coursedoc flag
 # probably the only place in the system where this should be "1"  # probably the only place in the system where this should be "1"
       my $url=&Apache::lonnet::userfileupload('uploaddoc',1);        my $url=&Apache::lonnet::userfileupload('uploaddoc',1,'docs');
               my $ext='false';                my $ext='false';
               if ($url=~/^http\:\/\//) { $ext='true'; }                if ($url=~/^http\:\/\//) { $ext='true'; }
               $url=~s/\:/\&colon;/g;                $url=~s/\:/\&colon;/g;
Line 354  sub editor { Line 401  sub editor {
     if ($ENV{'form.cmd'}) {      if ($ENV{'form.cmd'}) {
                 my ($cmd,$idx)=split(/\_/,$ENV{'form.cmd'});                  my ($cmd,$idx)=split(/\_/,$ENV{'form.cmd'});
                 if ($cmd eq 'del') {                  if ($cmd eq 'del') {
       my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]);
       if ($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) {
    &Apache::lonnet::removeuploadedurl($url);
       }
     for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) {      for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) {
                         $Apache::lonratedt::order[$i]=                          $Apache::lonratedt::order[$i]=
                           $Apache::lonratedt::order[$i+1];                            $Apache::lonratedt::order[$i+1];
Line 444  sub editor { Line 495  sub editor {
            $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_,$coursenum));             $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_,$coursenum));
            $idx++;             $idx++;
         }          }
    unless ($idx) {
       $r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');
    }
         $r->print('</table>');          $r->print('</table>');
     }      }
 }  }
Line 457  sub entryline { Line 511  sub entryline {
      &Apache::lonnet::unescape($title)),'"<>&\'');       &Apache::lonnet::unescape($title)),'"<>&\'');
     my $renametitle=$title;      my $renametitle=$title;
     my $foldertitle=$title;      my $foldertitle=$title;
       my $orderidx=$Apache::lonratedt::order[$index];
     if ($title=~ /^(\d+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(.*)$/ ) {       if ($title=~ /^(\d+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(.*)$/ ) { 
  $foldertitle=&Apache::lontexconvert::msgtexconverted($4);   $foldertitle=&Apache::lontexconvert::msgtexconverted($4);
  $renametitle=$4;   $renametitle=$4;
Line 467  sub entryline { Line 522  sub entryline {
     $renametitle=~s/\&quot\;/\\\"/g;      $renametitle=~s/\&quot\;/\\\"/g;
     my $line='<tr>';      my $line='<tr>';
 # Edit commands  # Edit commands
       my $folderpath;
       if ($ENV{'form.folderpath'}) {
    $folderpath=&Apache::lonnet::escape($ENV{'form.folderpath'});
    # $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');
       }
     if ($allowed) {      if ($allowed) {
  my %lt=('up' => 'Move Up',   my $incindex=$index+1;
    my $selectbox='';
    if ($folder!~/^supplemental/) {
       $selectbox=
    '<input type="hidden" name="currentpos" value="'.$incindex.'" />'.
    '<select name="newpos" onChange="this.form.submit()">';
       for (my $i=1;$i<=$#Apache::lonratedt::order+1;$i++) {
    if ($i==$incindex) {
       $selectbox.='<option value="" selected="1">('.$i.')</option>';
    } else {
       $selectbox.='<option value="'.$i.'">'.$i.'</option>';
    }
       }
       $selectbox.='</select>';
    }
    my %lt=&Apache::lonlocal::texthash(
                   'up' => 'Move Up',
  'dw' => 'Move Down',   'dw' => 'Move Down',
  'rm' => 'Remove',   'rm' => 'Remove',
  'rn' => 'Rename');   'rn' => 'Rename');
  my ($foldername,$htmlfoldername);  
  if ($ENV{'form.foldername'}) {  
     $foldername='&foldername='.  
  &Apache::lonnet::escape($ENV{'form.foldername'});  
     $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');  
  }  
  $line.=(<<END);   $line.=(<<END);
   <form name="entry_$index" action="/adm/coursedocs" method="post">
   <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
   <input type="hidden" name="setparms" value="$orderidx" />
 <td><table border='0' cellspacing='2' cellpadding='0'>  <td><table border='0' cellspacing='2' cellpadding='0'>
 <tr><td bgcolor="#DDDDDD">  <tr><td bgcolor="#DDDDDD">
 <a href='/adm/coursedocs?folder=$folder&cmd=up_$index$foldername'>  <a href='/adm/coursedocs?cmd=up_$index&folderpath=$folderpath'>
 <img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr>  <img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr>
 <tr><td bgcolor="#DDDDDD">  <tr><td bgcolor="#DDDDDD">
 <a href='/adm/coursedocs?folder=$folder&cmd=down_$index$foldername'>  <a href='/adm/coursedocs?cmd=down_$index&folderpath=$folderpath'>
 <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>  <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>
 </table></td><td bgcolor="#DDDDDD">  </table></td>
 <a href='javascript:removeres("$folder","$index","$renametitle","$htmlfoldername");'>  <td>$selectbox
   </td><td bgcolor="#DDDDDD">
   <a href='javascript:removeres("$folderpath","$index","$renametitle");'>
 <font size="-2" color="#990000">$lt{'rm'}</font></a>  <font size="-2" color="#990000">$lt{'rm'}</font></a>
 <a href='javascript:changename("$folder","$index","$renametitle","$htmlfoldername");'>  <a href='javascript:changename("$folderpath","$index","$renametitle");'>
 <font size="-2" color="#009900">$lt{'rn'}</font></a></td>  <font size="-2" color="#009900">$lt{'rn'}</font></a></td>
 END  END
     }      }
Line 500  END Line 575  END
     my $isfolder=0;      my $isfolder=0;
     my $folderarg;      my $folderarg;
     if ($uploaded) {      if ($uploaded) {
        if ($extension eq 'sequence') {   if ($extension eq 'sequence') {
   $icon=$iconpath.'/folder_closed.gif';      $icon=$iconpath.'/folder_closed.gif';
           $url=~/$coursenum\/([\/\w]+)\.sequence$/;      $url=~/$coursenum\/([\/\w]+)\.sequence$/;
           $url='/adm/coursedocs?';      $url='/adm/coursedocs?';
   $folderarg=$1;      $folderarg=$1;
           $isfolder=1;      $isfolder=1;
        } else {   } else {
   $url=&Apache::lonnet::tokenwrapper($url);      &Apache::lonnet::allowuploaded('/adm/coursedoc',$url);
        }    }
     }      }
     $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;      $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
     if ((!$isfolder) && ($residx) && ($folder!~/supplemental/)) {      if ((!$isfolder) && ($residx) && ($folder!~/supplemental/)) {
Line 521  END Line 596  END
    &Apache::lonnet::declutter($url));     &Apache::lonnet::declutter($url));
  (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);   (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
  $url=&Apache::lonnet::clutter($url);   $url=&Apache::lonnet::clutter($url);
    if ($url=~/^\/*uploaded\//) {
       $url=~/\.(\w+)$/;
       my $embstyle=&Apache::loncommon::fileembstyle($1);
       if (($embstyle eq 'img') || ($embstyle eq 'emb')) {
    $url='/adm/wrapper'.$url;
       } elsif ($embstyle eq 'ssi') {
    #do nothing with these
       } elsif ($url!~/\.(sequence|page)$/) {
    $url='/adm/coursedocs/showdoc'.$url;
       }
    }
  $url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);   $url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);
     }      }
       my $parameterset='&nbsp;';
     if ($isfolder) {      if ($isfolder) {
  my $foldername=&Apache::lonnet::escape($foldertitle);   my $foldername=&Apache::lonnet::escape($foldertitle);
  my $folderpath=$ENV{'form.folderpath'};   my $folderpath=$ENV{'form.folderpath'};
  if ($folderpath) { $folderpath.='&' };   if ($folderpath) { $folderpath.='&' };
  $folderpath.=$folderarg.'&'.$foldername;   $folderpath.=$folderarg.'&'.$foldername;
  $url.='folderpath='.&Apache::lonnet::escape($folderpath);   $url.='folderpath='.&Apache::lonnet::escape($folderpath);
    $parameterset=&mt('Randomly Pick: ').
       '<input type="text" size="4" name="randpick_'.$orderidx.'" value="'.
       (&Apache::lonratedt::getparameter($orderidx,'parameter_randompick'))[0].'" />';
     }      }
     $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.      $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.
  '" border="0"></a></td>'.   '" border="0"></a></td>'.
         "<td bgcolor='#FFFFBB'><a href='$url'>$title</a></td></tr>";          "<td bgcolor='#FFFFBB'><a href='$url'>$title</a></td>";
       if (($allowed) && ($folder!~/^supplemental/)) {
     my %lt=&Apache::lonlocal::texthash(
          'hd' => 'Hidden',
          'ec' => 'URL hidden',
          'sp' => 'Store Parameters');
    my $enctext=
       ((&Apache::lonratedt::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="1"':'');
    my $hidtext=
       ((&Apache::lonratedt::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');
    $line.=(<<ENDPARMS);
   <td bgcolor="#BBBBFF"><font size='-2'>
   <input type="checkbox" name="hidprs_$orderidx" $hidtext/> $lt{'hd'}</td>
   <td bgcolor="#BBBBFF"><font size='-2'>
   <input type="checkbox" name="encprs_$orderidx" $enctext/> $lt{'ec'}</td>
   <td bgcolor="#BBBBFF"><font size="-2">$parameterset</font></td>
   <td bgcolor="#BBBBFF"><font size='-2'>
   <input type="submit" value="$lt{'sp'}" />
   </font></td>
   ENDPARMS
       }
       $line.="</form></tr>";
     return $line;      return $line;
 }  }
   
 # ---------------------------------------------------------------- tie the hash  # ---------------------------------------------------------------- tie the hash
   
 sub tiehash {  sub tiehash {
       my ($mode)=@_;
     $hashtied=0;      $hashtied=0;
     if ($ENV{'request.course.fn'}) {      if ($ENV{'request.course.fn'}) {
         if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db",   if ($mode eq 'write') {
             &GDBM_READER(),0640)) {      if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db",
       &GDBM_WRCREAT(),0640)) {
                   $hashtied=2;
       }
    } else {
       if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db",
       &GDBM_READER(),0640)) {
                 $hashtied=1;                  $hashtied=1;
         }      }
    }
     }          }    
 }  }
   
Line 696  sub checkversions { Line 815  sub checkversions {
  foreach (keys %ENV) {   foreach (keys %ENV) {
     if ($_=~/^form\.set_version_(.+)$/) {      if ($_=~/^form\.set_version_(.+)$/) {
  my $src=$1;   my $src=$1;
  &Apache::lonnet::logthis('Found: '.$1.' '.$ENV{$_});  
  if (($ENV{$_}) && ($ENV{$_} ne $setversions{$src})) {   if (($ENV{$_}) && ($ENV{$_} ne $setversions{$src})) {
     $newsetversions{$src}=$ENV{$_};      $newsetversions{$src}=$ENV{$_};
  }   }
Line 711  sub checkversions { Line 829  sub checkversions {
  } else {   } else {
     $r->print('<h1><font color="red">'.&mt('An Error Occured while Attempting to Store your Version Settings').'</font></h1>');      $r->print('<h1><font color="red">'.&mt('An Error Occured while Attempting to Store your Version Settings').'</font></h1>');
  }   }
  &changewarning($r,'');   &mark_hash_old();
     }      }
       &changewarning($r,'');
     if ($ENV{'form.timerange'} eq 'all') {      if ($ENV{'form.timerange'} eq 'all') {
 # show all documents  # show all documents
  $header=&mt('All Documents in Course');   $header=&mt('All Documents in Course');
Line 832  ENDHEADERS Line 951  ENDHEADERS
 # Set version  # Set version
     $r->print(&Apache::loncommon::select_form($setversions{$linkurl},      $r->print(&Apache::loncommon::select_form($setversions{$linkurl},
       'set_version_'.$linkurl,        'set_version_'.$linkurl,
       ('' => '',        ('select_form_order' =>
          ['',1..$currentversion,'mostrecent'],
          '' => '',
        'mostrecent' => 'most recent',         'mostrecent' => 'most recent',
        map {$_,$_} (1..$currentversion))));         map {$_,$_} (1..$currentversion))));
     $r->print('</nobr></td></tr><tr><td></td>');      $r->print('</nobr></td></tr><tr><td></td>');
Line 893  ENDHEADERS Line 1014  ENDHEADERS
     &untiehash();      &untiehash();
 }  }
   
   sub mark_hash_old {
       my $retie_hash=0;
       if ($hashtied) {
    $retie_hash=1;
    &untiehash();
       }
       &tiehash('write');
       $hash{'old'}=1;
       &untiehash();
       if ($retie_hash) { &tiehash(); }
   }
   
   sub is_hash_old {
       my $untie_hash=0;
       if (!$hashtied) {
    $untie_hash=1;
    &tiehash();
       }
       my $return=$hash{'old'};
       if ($untie_hash) { &untiehash(); }
       return $return;
   }
   
 sub changewarning {  sub changewarning {
     my ($r,$postexec)=@_;      my ($r,$postexec)=@_;
       if (!&is_hash_old()) { return; }
     $r->print(      $r->print(
 '<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'.   '<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'. 
 '<form method="post" action="/adm/roles" target="loncapaclient">'.  '<form method="post" action="/adm/roles" target="loncapaclient">'.
 '<input type="hidden" name="orgurl" value="/adm/coursedocs" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'.  '<input type="hidden" name="orgurl" value="/adm/coursedocs?folderpath='.
   &Apache::lonnet::escape($ENV{'form.folderpath'}).
   '" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'.
 &mt('Changes will become active for your current session after').  &mt('Changes will become active for your current session after').
 ' <input type="hidden" name="'.  ' <input type="hidden" name="'.
 $ENV{'request.role'}.'" value="1" /><input type="button" value="'.  $ENV{'request.role'}.'" value="1" /><input type="button" value="'.
Line 918  sub handler { Line 1065  sub handler {
            'Adding_External_Resource','Navigate_Content',             'Adding_External_Resource','Navigate_Content',
            'Adding_Folders','Docs_Overview', 'Load_Map',             'Adding_Folders','Docs_Overview', 'Load_Map',
            'Supplemental', 'Score_Upload_Form',             'Supplemental', 'Score_Upload_Form',
            'Importing_LON-CAPA_Resource','Uploading_From_Harddrive') {             'Importing_LON-CAPA_Resource','Uploading_From_Harddrive',
      'Check_Resource_Versions','Verify_Content') {
       $help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_);        $help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_);
   }    }
     # Composite help files      # Composite help files
Line 956  sub handler { Line 1104  sub handler {
  my (@folderpath)=split('&',$ENV{'form.folderpath'});   my (@folderpath)=split('&',$ENV{'form.folderpath'});
  $ENV{'form.foldername'}=&Apache::lonnet::unescape(pop(@folderpath));   $ENV{'form.foldername'}=&Apache::lonnet::unescape(pop(@folderpath));
  $ENV{'form.folder'}=pop(@folderpath);   $ENV{'form.folder'}=pop(@folderpath);
  $ENV{'form.folders'}=\@folderpath;      } 
     }  
     if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {      if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
        $showdoc=$1;         $showdoc='/'.$1;
     }      }
     unless ($showdoc) { # got called from remote      unless ($showdoc) { # got called from remote
        $forcestandard=($ENV{'form.folder'}=~/^default_/);         $forcestandard=($ENV{'form.folder'}=~/^default_/);
Line 1088  function finishpick() { Line 1235  function finishpick() {
     '";this.document.forms.'+form+'.submit();');      '";this.document.forms.'+form+'.submit();');
 }  }
   
 function changename(folder,index,oldtitle,foldername) {  function changename(folderpath,index,oldtitle) {
     var title=prompt('New Title',oldtitle);      var title=prompt('New Title',oldtitle);
     if (title) {      if (title) {
  this.document.forms.renameform.title.value=title;   this.document.forms.renameform.title.value=title;
  this.document.forms.renameform.cmd.value='rename_'+index;   this.document.forms.renameform.cmd.value='rename_'+index;
  this.document.forms.renameform.folder.value=folder;   this.document.forms.renameform.folderpath.value=folderpath;
  this.document.forms.renameform.foldername.value=foldername;  
         this.document.forms.renameform.submit();          this.document.forms.renameform.submit();
     }      }
 }  }
   
 function removeres(folder,index,oldtitle,foldername) {  function removeres(folderpath,index,oldtitle) {
     if (confirm('Remove "'+oldtitle+'"?')) {      if (confirm('Remove "'+oldtitle+'"?')) {
  this.document.forms.renameform.cmd.value='del_'+index;   this.document.forms.renameform.cmd.value='del_'+index;
  this.document.forms.renameform.folder.value=folder;   this.document.forms.renameform.folderpath.value=folderpath;
  this.document.forms.renameform.foldername.value=foldername;  
         this.document.forms.renameform.submit();          this.document.forms.renameform.submit();
     }      }
 }  }
   
 </script>  </script>
   
 ENDNEWSCRIPT  ENDNEWSCRIPT
Line 1115  ENDNEWSCRIPT Line 1261  ENDNEWSCRIPT
   $r->print('</head>'.    $r->print('</head>'.
             &Apache::loncommon::bodytag('Course Documents','',$events,              &Apache::loncommon::bodytag('Course Documents','',$events,
  '','',$showdoc).   '','',$showdoc).
     &Apache::loncommon::help_open_faq(273).      &Apache::loncommon::help_open_menu('','','','',273,'RAT'));
     &Apache::loncommon::help_open_bug('RAT'));  
   unless ($showdoc) {    unless ($showdoc) {
 # -----------------------------------------------------------------------------  # -----------------------------------------------------------------------------
        my %lt=&Apache::lonlocal::texthash(         my %lt=&Apache::lonlocal::texthash(
Line 1151  ENDNEWSCRIPT Line 1296  ENDNEWSCRIPT
  'vc' => 'Verify Content',   'vc' => 'Verify Content',
  'cv' => 'Check/Set Resource Versions',   'cv' => 'Check/Set Resource Versions',
   );    );
   
          my $folderpath=$ENV{'form.folderpath'};
          if (!$folderpath) {
      if ($ENV{'form.folder'} eq '' ||
          $ENV{'form.folder'} eq 'supplemental') {
          $folderpath='default&'.
      &Apache::lonnet::escape(&mt('Main Course Documents'));
      }
          }
        $r->print(<<ENDCOURSEVERIFY);         $r->print(<<ENDCOURSEVERIFY);
 <form name="renameform" method="post" action="/adm/coursedocs">  <form name="renameform" method="post" action="/adm/coursedocs">
 <input type="hidden" name="title" />  <input type="hidden" name="title" />
 <input type="hidden" name="cmd" />  <input type="hidden" name="cmd" />
 <input type="hidden" name="folder" />  <input type="hidden" name="folderpath" />
 <input type="hidden" name="foldername" />  
 </form>  </form>
 <form name="simpleedit" method="post" action="/adm/coursedocs">  <form name="simpleedit" method="post" action="/adm/coursedocs">
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <input type="hidden" name="folder" />  <input type="hidden" name="folderpath" value="$folderpath" />
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">  
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="courseverify">  <form action="/adm/coursedocs" method="post" name="courseverify">
 <table bgcolor="#AAAAAA" width="100%" cellspacing="4" cellpadding="4">  <table bgcolor="#AAAAAA" width="100%" cellspacing="4" cellpadding="4">
 <tr><td bgcolor="#DDDDCC">  <tr><td bgcolor="#DDDDCC">
 <input type="submit" name="verify" value="$lt{'vc'}" />  <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}
 </td><td bgcolor="#DDDDCC">  </td><td bgcolor="#DDDDCC">
 <input type="submit" name="versions" value="$lt{'cv'}" />      <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
 $dumpbut  $dumpbut
 </td></tr></table>  </td></tr></table>
 </form>  </form>
Line 1177  ENDCOURSEVERIFY Line 1329  ENDCOURSEVERIFY
      &mt('Editing the Table of Contents for your Course')));       &mt('Editing the Table of Contents for your Course')));
     }      }
 # --------------------------------------------------------- Standard documents  # --------------------------------------------------------- Standard documents
     my $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');  
     $r->print('<table border=2 cellspacing=4 cellpadding=4>');      $r->print('<table border=2 cellspacing=4 cellpadding=4>');
     if (($standard) && ($allowed) && (!$forcesupplement)) {      if (($standard) && ($allowed) && (!$forcesupplement)) {
        $r->print('<tr><td bgcolor="#BBBBBB"><h2>'.&mt('Main Course Documents').   $r->print('<tr><td bgcolor="#BBBBBB">');
   ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');  #  '<h2>'.&mt('Main Course Documents').
   #  ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');
        my $folder=$ENV{'form.folder'};         my $folder=$ENV{'form.folder'};
        if ($folder eq '') {         if ($folder eq '' || $folder eq 'supplemental') {
            $folder='default';             $folder='default';
      $ENV{'form.folderpath'}='default&'.&Apache::lonnet::escape(&mt('Main Course Documents'));
        }         }
        my $postexec='';         my $postexec='';
        if ($folder eq 'default') {         if ($folder eq 'default') {
    $r->print('<script>this.window.name="loncapaclient";</script>');     $r->print('<script>this.window.name="loncapaclient";</script>');
        } else {         } else {
            $postexec='self.close();';             #$postexec='self.close();';
        }         }
        $hadchanges=0;         $hadchanges=0;
        &editor($r,$coursenum,$coursedom,$folder,$allowed);         &editor($r,$coursenum,$coursedom,$folder,$allowed);
        if ($hadchanges) {         if ($hadchanges) {
    &changewarning($r,$postexec);     &mark_hash_old()
        }         }
          &changewarning($r,$postexec);
        my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.         my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.sequence';                       '.sequence';
        $r->print(<<ENDFORM);         $r->print(<<ENDFORM);
Line 1212  $lt{'file'}:<br /> Line 1366  $lt{'file'}:<br />
 <br />  <br />
 $lt{'title'}:<br />  $lt{'title'}:<br />
 <input type="text" size="50" name="comment">  <input type="text" size="50" name="comment">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="foldername" value="$htmlfoldername">  
 <input type="hidden" name="cmd" value="upload_default">  <input type="hidden" name="cmd" value="upload_default">
 <input type="submit" value="$lt{'upld'}">  
 <nobr>  <nobr>
   <input type="submit" value="$lt{'upld'}">
  $help{'Uploading_From_Harddrive'}   $help{'Uploading_From_Harddrive'}
 </nobr>  </nobr>
 </form>  </form>
 </td>  </td>
 <td bgcolor="#DDDDDD">  <td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="simpleeditdefault">  <form action="/adm/coursedocs" method="post" name="simpleeditdefault">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="foldername" value="$htmlfoldername">  <input type=button onClick="javascript:groupsearch()" value="$lt{'srch'}">
 <input type=button onClick=  
 "javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="$lt{'srch'}">  
 <nobr>  <nobr>
 <input type=button onClick=  <input type=button onClick="javascript:groupimport();" value="$lt{'impo'}">
 "javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="$lt{'impo'}">  
 $help{'Importing_LON-CAPA_Resource'}  $help{'Importing_LON-CAPA_Resource'}
 </nobr>  </nobr>
 <p>  <p>
Line 1243  $help{'Load_Map'}</nobr> Line 1393  $help{'Load_Map'}</nobr>
 </form>  </form>
 </td><td bgcolor="#DDDDDD">  </td><td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="newfolder">  <form action="/adm/coursedocs" method="post" name="newfolder">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="foldername" value="$htmlfoldername">  
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <nobr>  <nobr>
 <input name="newfolder" type="button"  <input name="newfolder" type="button"
Line 1253  value="$lt{'newf'}" />$help{'Adding_Fold Line 1402  value="$lt{'newf'}" />$help{'Adding_Fold
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newext">  <form action="/adm/coursedocs" method="post" name="newext">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="foldername" value="$htmlfoldername">  
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <nobr>  <nobr>
 <input name="newext" type="button" onClick="javascript:makenewext('newext');"  <input name="newext" type="button" onClick="javascript:makenewext('newext');"
Line 1262  value="$lt{'extr'}" /> $help{'Adding_Ext Line 1410  value="$lt{'extr'}" /> $help{'Adding_Ext
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newsyl">  <form action="/adm/coursedocs" method="post" name="newsyl">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="foldername" value="$htmlfoldername">  
 <input type=hidden name="importdetail"   <input type=hidden name="importdetail" 
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">  value="Syllabus=/public/$coursedom/$coursenum/syllabus">
 <nobr>  <nobr>
Line 1272  value="Syllabus=/public/$coursedom/$cour Line 1419  value="Syllabus=/public/$coursedom/$cour
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newnav">  <form action="/adm/coursedocs" method="post" name="newnav">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="foldername" value="$htmlfoldername">  
 <input type=hidden name="importdetail"   <input type=hidden name="importdetail" 
 value="Navigate Content=/adm/navmaps">  value="Navigate Content=/adm/navmaps">
 <nobr>  <nobr>
Line 1282  $help{'Navigate_Content'} Line 1428  $help{'Navigate_Content'}
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newsmppg">  <form action="/adm/coursedocs" method="post" name="newsmppg">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="foldername" value="$htmlfoldername">  
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <nobr>  <nobr>
 <input name="newsmppg" type="button" value="$lt{'sipa'}"  <input name="newsmppg" type="button" value="$lt{'sipa'}"
Line 1291  onClick="javascript:makesmppage();" /> $ Line 1436  onClick="javascript:makesmppage();" /> $
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newsmpproblem">  <form action="/adm/coursedocs" method="post" name="newsmpproblem">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="foldername" value="$htmlfoldername">  
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <nobr>  <nobr>
 <input name="newsmpproblem" type="button" value="$lt{'sipr'}"  <input name="newsmpproblem" type="button" value="$lt{'sipr'}"
Line 1300  onClick="javascript:makesmpproblem();" / Line 1444  onClick="javascript:makesmpproblem();" /
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newexamupload">  <form action="/adm/coursedocs" method="post" name="newexamupload">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="foldername" value="$htmlfoldername">  
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <nobr>  <nobr>
 <input name="newexamupload" type="button" value="$lt{'scuf'}"  <input name="newexamupload" type="button" value="$lt{'scuf'}"
Line 1310  $help{'Score_Upload_Form'} Line 1453  $help{'Score_Upload_Form'}
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newbul">  <form action="/adm/coursedocs" method="post" name="newbul">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="foldername" value="$htmlfoldername">  
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <nobr>  <nobr>
 <input name="newbulletin" type="button" value="$lt{'bull'}"  <input name="newbulletin" type="button" value="$lt{'bull'}"
Line 1320  $help{'Bulletin Board'} Line 1462  $help{'Bulletin Board'}
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newaboutme">  <form action="/adm/coursedocs" method="post" name="newaboutme">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="foldername" value="$htmlfoldername">  
 <input type=hidden name="importdetail"   <input type=hidden name="importdetail" 
 value="$plainname=/adm/$udom/$uname/aboutme">  value="$plainname=/adm/$udom/$uname/aboutme">
 <nobr>  <nobr>
Line 1330  $help{'My Personal Info'} Line 1471  $help{'My Personal Info'}
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newaboutsomeone">  <form action="/adm/coursedocs" method="post" name="newaboutsomeone">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="foldername" value="$htmlfoldername">  
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <nobr>  <nobr>
 <input name="newaboutsomeone" type="button" value="$lt{'abou'}"   <input name="newaboutsomeone" type="button" value="$lt{'abou'}" 
Line 1350  ENDFORM Line 1490  ENDFORM
     }      }
 # ----------------------------------------------------- Supplemental documents  # ----------------------------------------------------- Supplemental documents
     if (!$forcestandard) {      if (!$forcestandard) {
        $r->print(         $r->print('<tr><td bgcolor="#BBBBBB">');
   '<tr><td bgcolor="#BBBBBB"><h2>'.&mt('Supplemental Course Documents').  # '<h2>'.&mt('Supplemental Course Documents').
   ($allowed?' '.$help{'Supplemental'}:'').'</h2>');  #  ($allowed?' '.$help{'Supplemental'}:'').'</h2>');
        my $folder=$ENV{'form.folder'};         my $folder=$ENV{'form.folder'};
        unless ($folder=~/supplemental/) { $folder='supplemental'; }         unless ($folder=~/^supplemental/) {
      $folder='supplemental';
          }
          if ($folder =~ /^supplemental$/ &&
      $ENV{'form.folderpath'} =~ /^default\&/) {
      $ENV{'form.folderpath'}='supplemental&'.
          &Apache::lonnet::escape(&mt('Supplemental Course Documents'));
          }
        &editor($r,$coursenum,$coursedom,$folder,$allowed);         &editor($r,$coursenum,$coursedom,$folder,$allowed);
        if ($allowed) {         if ($allowed) {
        my $folderseq=         my $folderseq=
Line 1372  ENDFORM Line 1519  ENDFORM
 <br />$lt{'comment'}:<br />  <br />$lt{'comment'}:<br />
 <textarea cols=50 rows=4 name='comment'>  <textarea cols=50 rows=4 name='comment'>
 </textarea>  </textarea>
 <input type="hidden" name="folder" value="$folder">  <br />
 <input type="hidden" name="foldername" value="$htmlfoldername">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="cmd" value="upload_supplemental">  <input type="hidden" name="cmd" value="upload_supplemental">
 <nobr>  <nobr>
 <input type="submit" value="$lt{'upld'}">  <input type="submit" value="$lt{'upld'}">
Line 1383  ENDFORM Line 1530  ENDFORM
 </td>  </td>
 <td bgcolor="#DDDDDD">  <td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="supnewfolder">  <form action="/adm/coursedocs" method="post" name="supnewfolder">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="foldername" value="$htmlfoldername">  
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <nobr>  <nobr>
 <input name="newfolder" type="button"  <input name="newfolder" type="button"
Line 1393  value="$lt{'newf'}" /> $help{'Adding_Fol Line 1539  value="$lt{'newf'}" /> $help{'Adding_Fol
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="supnewext">  <form action="/adm/coursedocs" method="post" name="supnewext">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="foldername" value="$htmlfoldername">  
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <nobr>  <nobr>
 <input name="newext" type="button"   <input name="newext" type="button" 
Line 1403  value="$lt{'extr'}" /> $help{'Adding_Ext Line 1548  value="$lt{'extr'}" /> $help{'Adding_Ext
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="supnewsyl">  <form action="/adm/coursedocs" method="post" name="supnewsyl">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="foldername" value="$htmlfoldername">  
 <input type=hidden name="importdetail"   <input type=hidden name="importdetail" 
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">  value="Syllabus=/public/$coursedom/$coursenum/syllabus">
 <nobr>  <nobr>
Line 1413  $help{'Syllabus'} Line 1557  $help{'Syllabus'}
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="subnewaboutme">  <form action="/adm/coursedocs" method="post" name="subnewaboutme">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="foldername" value="$htmlfoldername">  
 <input type=hidden name="importdetail"   <input type=hidden name="importdetail" 
 value="$plainname=/adm/$udom/$uname/aboutme">  value="$plainname=/adm/$udom/$uname/aboutme">
 <nobr>  <nobr>
Removed from v.1.114  
changed lines
  Added in v.1.136

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