[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.184

version 1.178, 2005/06/08 17:42:01 version 1.184, 2005/06/09 20:41:38
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 $url=&Apache::lonnet::userfileupload('uploaddoc',1,'docs/'.$newidx);                my $newidx=&Apache::lonratedt::getresidx();
                 $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 1068  sub editor { Line 1077  sub editor {
                 if ($cmd eq 'del') {                  if ($cmd eq 'del') {
     my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]);      my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]);
     if ($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) {      if ($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) {
  &Apache::lonnet::removeuploadedurl($url);   unless ($url=~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library)$/) {
       &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 1089  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];
Line 1142  sub editor { Line 1155  sub editor {
 # Loading a complete map  # Loading a complete map
    if (($env{'form.importmap'}) && ($env{'form.loadmap'})) {     if (($env{'form.importmap'}) && ($env{'form.loadmap'})) {
        foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) {         foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) {
                    my $idx=$#Apache::lonratedt::resources;     my ($title,$url,$ext,$type)=split(/\:/,$_);
                    $idx++;                     my $idx=&Apache::lonratedt::getresidx($url);
                    $Apache::lonratedt::resources[$idx]=$_;                     $Apache::lonratedt::resources[$idx]=$_;
                    $Apache::lonratedt::order                     $Apache::lonratedt::order
        [$#Apache::lonratedt::order+1]=$idx;         [$#Apache::lonratedt::order+1]=$idx;
Line 1856  sub changewarning { Line 1869  sub changewarning {
     }      }
     $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 name="reinit" method="post" action="/adm/roles" target="loncapaclient">'.
 '<input type="hidden" name="orgurl" value="'.$url.  '<input type="hidden" name="orgurl" value="'.$url.
 '" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'.  '" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'.
 &mt($message,' <input type="hidden" name="'.  &mt($message,' <input type="hidden" name="'.
Line 2149  ENDNEWSCRIPT Line 2162  ENDNEWSCRIPT
                 'upls' => 'Upload a new supplemental course document',                  'upls' => 'Upload a new supplemental course document',
                 'impp' => 'Import a document',                  'impp' => 'Import a document',
                 'pubd' => 'Published documents',                  'pubd' => 'Published documents',
  'copm' => 'All documents out of a published map',   'copm' => 'All documents out of a published map into this folder',
                 'spec' => 'Special documents',                  'spec' => 'Special documents',
                 'upld' => 'Upload Document',                  'upld' => 'Upload Document',
                 'srch' => 'Search',                  'srch' => 'Search',
Line 2255  ENDCOURSEVERIFY Line 2268  ENDCOURSEVERIFY
 </tr>  </tr>
 <tr><td bgcolor="#DDDDDD">  <tr><td bgcolor="#DDDDDD">
 $lt{'file'}:<br />  $lt{'file'}:<br />
 <form action="/adm/coursedocs" method="post" enctype="multipart/form-data">  <form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
 <input type="file" name="uploaddoc" size="40">  <input type="file" name="uploaddoc" size="40">
 <br />  <br />
 $lt{'title'}:<br />  $lt{'title'}:<br />
Line 2279  $help{'Importing_LON-CAPA_Resource'} Line 2292  $help{'Importing_LON-CAPA_Resource'}
 </nobr>  </nobr>
 <p>  <p>
 <hr />  <hr />
 $lt{'copm'}  $lt{'copm'}<br />
 <input type="text" size="20" name="importmap"><br />  <input type="text" size="40" name="importmap"><br />
 <nobr><input type=button   <nobr><input type=button 
 onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"  onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
 value="$lt{'selm'}"> <input type="submit" name="loadmap" value="$lt{'load'}">  value="$lt{'selm'}"> <input type="submit" name="loadmap" value="$lt{'load'}">
Line 2395  $uploadtag Line 2408  $uploadtag
 <input name="newaboutsomeone" type="button" value="$lt{'abou'}"   <input name="newaboutsomeone" type="button" value="$lt{'abou'}" 
 onClick="javascript:makeabout();" />  onClick="javascript:makeabout();" />
 </nobr>  </nobr>
   </form>
 ENDFORM  ENDFORM
        }         }
        if ($env{'form.pagepath'}) {         if ($env{'form.pagepath'}) {
Line 2415  $uploadtag Line 2429  $uploadtag
 onClick="javascript:makeexamupload();" />  onClick="javascript:makeexamupload();" />
 $help{'Score_Upload_Form'}  $help{'Score_Upload_Form'}
 </nobr>  </nobr>
   </form>
 ENDBLOCK  ENDBLOCK
            $r->print('</form>');  
        }         }
        $r->print('</td></tr>'."\n".         $r->print('</td></tr>'."\n".
 '</table>');  '</table>');
Line 2505  ENDSUPFORM Line 2519  ENDSUPFORM
        }         }
     }      }
     if ($allowed) {      if ($allowed) {
  $r->print('<form name="extimport"><input type="hidden" name="title"><input type="hidden" name="url"><input type="hidden" name="useform"></form>');   $r->print('<form method="POST" name="extimport" action="/adm/coursedocs"><input type="hidden" name="title" /><input type="hidden" name="url" /><input type="hidden" name="useform" /></form>');
     }      }
     $r->print('</table>');      $r->print('</table>');
   } else {    } else {
Removed from v.1.178  
changed lines
  Added in v.1.184

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