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

Diff for /loncom/interface/londocs.pm between versions 1.178 and 1.180

version 1.178, 2005/06/08 17:42:01 version 1.180, 2005/06/08 19:36:54
Line 1020  sub editor { Line 1020  sub editor {
  if ($url=~/^http\:\/\//) { $ext='true'; }   if ($url=~/^http\:\/\//) { $ext='true'; }
  $url=~s/\:/\:/g;   $url=~s/\:/\:/g;
 # Now insert the URL at the bottom  # Now insert the URL at the bottom
                 my $newidx=1+$#Apache::lonratedt::resources;                  my $newidx=&Apache::lonratedt::getresidx($url);
  $Apache::lonratedt::resources[$newidx]=   $Apache::lonratedt::resources[$newidx]=
     $title.':'.$url.':'.$ext.':normal:res';      $title.':'.$url.':'.$ext.':normal:res';
  $Apache::lonratedt::order[1+$#Apache::lonratedt::order]=$newidx;   $Apache::lonratedt::order[1+$#Apache::lonratedt::order]=$newidx;
Line 1036  sub editor { Line 1036  sub editor {
            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') ) {
               my $destination = 'docs/';
               if ($folder eq 'default') {
                  $destination .= 'default/';
                   } elsif ($folder =~ /^default_(\d+)$/) {
                       $destination .=  $1.'/';
                   }
 # 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 $newidx=$#Apache::lonratedt::resources+1;                my $newidx=$#Apache::lonratedt::resources+1;
       my $url=&Apache::lonnet::userfileupload('uploaddoc',1,'docs/'.$newidx);                $destination .= $newidx;
         my $url=&Apache::lonnet::userfileupload('uploaddoc',1,$destination);
               my $ext='false';                my $ext='false';
               if ($url=~/^http\:\/\//) { $ext='true'; }                if ($url=~/^http\:\/\//) { $ext='true'; }
               $url=~s/\:/\:/g;                $url=~s/\:/\:/g;
Line 1070  sub editor { Line 1077  sub editor {
     if ($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) {      if ($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) {
  &Apache::lonnet::removeuploadedurl($url);   &Apache::lonnet::removeuploadedurl($url);
     }      }
       &Apache::lonratedt::makezombie($Apache::lonratedt::order[$idx]);
     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 1077  sub editor { Line 1085  sub editor {
                     $#Apache::lonratedt::order--;                      $#Apache::lonratedt::order--;
                 } elsif ($cmd eq 'cut') {                  } elsif ($cmd eq 'cut') {
     my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]);      my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]);
       &Apache::lonratedt::makezombie($Apache::lonratedt::order[$idx]);
     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];
Removed from v.1.178  
changed lines
  Added in v.1.180

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