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

Diff for /loncom/interface/londocs.pm between versions 1.122 and 1.128

version 1.122, 2004/04/26 17:50:37 version 1.128, 2004/05/11 06:45:35
Line 301  sub editor { Line 301  sub editor {
   
 # ---------------- 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  # set parameters and change order
     if (defined($ENV{'form.setparms'})) {      if (defined($ENV{'form.setparms'})) {
  my $idx=$ENV{'form.setparms'};   my $idx=$ENV{'form.setparms'};
   # set parameters
  if ($ENV{'form.randpick_'.$idx}) {   if ($ENV{'form.randpick_'.$idx}) {
     &Apache::lonratedt::storeparameter($idx,'parameter_randompick',$ENV{'form.randpick_'.$idx},'int_pos');      &Apache::lonratedt::storeparameter($idx,'parameter_randompick',$ENV{'form.randpick_'.$idx},'int_pos');
  } else {   } else {
Line 320  sub editor { Line 321  sub editor {
     &Apache::lonratedt::delparameter($idx,'parameter_encrypturl');      &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');   ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.sequence');
  if ($fatal) {   if ($fatal) {
     $r->print('<p><font color="red">'.$errtext.'</font></p>');      $r->print('<p><font color="red">'.$errtext.'</font></p>');
     return;      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 360  sub editor { Line 399  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 480  sub entryline { Line 523  sub entryline {
  # $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');   # $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');
     }      }
     if ($allowed) {      if ($allowed) {
    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(   my %lt=&Apache::lonlocal::texthash(
                 'up' => 'Move Up',                  'up' => 'Move Up',
  'dw' => 'Move Down',   'dw' => 'Move Down',
Line 496  sub entryline { Line 554  sub entryline {
 <tr><td bgcolor="#DDDDDD">  <tr><td bgcolor="#DDDDDD">
 <a href='/adm/coursedocs?cmd=down_$index&folderpath=$folderpath'>  <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>
   <td>$selectbox
   </td><td bgcolor="#DDDDDD">
 <a href='javascript:removeres("$folderpath","$index","$renametitle");'>  <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("$folderpath","$index","$renametitle");'>  <a href='javascript:changename("$folderpath","$index","$renametitle");'>
Line 529  END Line 589  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;';      my $parameterset='&nbsp;';
Line 992  sub handler { Line 1063  sub handler {
  $ENV{'form.folder'}=pop(@folderpath);   $ENV{'form.folder'}=pop(@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_/);
Removed from v.1.122  
changed lines
  Added in v.1.128

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