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

Diff for /loncom/interface/londocs.pm between versions 1.69.2.1 and 1.74

version 1.69.2.1, 2003/07/24 22:06:07 version 1.74, 2003/09/08 18:56:09
Line 35  use Apache::loncommon; Line 35  use Apache::loncommon;
 use Apache::lonratedt;  use Apache::lonratedt;
 use Apache::lonratsrv;  use Apache::lonratsrv;
 use Apache::lonxml;  use Apache::lonxml;
   use Apache::loncreatecourse;
 use HTML::Entities;  use HTML::Entities;
 use GDBM_File;  use GDBM_File;
   
Line 72  sub storemap { Line 73  sub storemap {
                                 $map,1);                                  $map,1);
 }  }
   
   # ----------------------------------------- Return hash with valid author names
   
   sub authorhosts {
       my %outhash=();
       my $home=0;
       my $other=0;
       foreach (keys %ENV) {
    if ($_=~/^user\.role\.(au|ca)\.(.+)$/) {
       my $role=$1;
       my $realm=$2;
       my ($start,$end)=split(/\./,$ENV{$_});
       if (($start) && ($start>time)) { next; }
       if (($end) && (time>$end)) { next; }
       my $ca; my $cd;
       if ($1 eq 'au') {
    $ca=$ENV{'user.name'};
    $cd=$ENV{'user.domain'};
       } else {
    ($cd,$ca)=($realm=~/^\/(\w+)\/(\w+)$/);
       }
       if (&Apache::lonnet::homeserver($ca,$cd) eq 
    $Apache::lonnet::perlvar{'lonHostID'}) {
    $home++;
    $outhash{'home_'.$ca.'@'.$cd}=1;
       } else {
    $outhash{'otherhome_'.$ca.'@'.$cd}=
       &Apache::lonnet::homeserver($ca,$cd);
    $other++;
       }
    }
       }
       return ($home,$other,%outhash);
   }
   # ------------------------------------------------------ Generate "dump" button
   
   sub dumpbutton {
       my ($home,$other,%outhash)=&authorhosts();
       if ($home+$other==0) { return ''; }
       my $output='</td><td bgcolor="#DDDDCC">';
       if ($home) {
    return '</td><td bgcolor="#DDDDCC">'.
       '<input type="submit" name="dumpcourse" value="Dump Course DOCS to Construction Space" />';
       } else {
    return'</td><td bgcolor="#DDDDCC">'.
         'Dump Course DOCS to Construction Space: available on other servers';
       }
   }
   
   # -------------------------------------------------------- Actually dump course
   
   sub dumpcourse {
       my ($home,$other,%outhash)=&authorhosts();
       unless ($outhash{'home_'.$ENV{'form.authorspace'}}) { return ''; }
       my ($ca,$cd)=split(/\@/,$ENV{'form.authorspace'});
   
   }
   
   # Imports the given (name, url) resources into the course
   # coursenum, coursedom, and folder must precede the list
   sub group_import {
       my $coursenum = shift;
       my $coursedom = shift;
       my $folder = shift;
       while (@_) {
    my $name = shift;
    my $url = shift;
    if ($url) {
       my $idx = $#Apache::lonratedt::resources + 1;
       $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=$idx;
       my $ext = 'false';
       if ($url=~/^http:\/\//) { $ext = 'true'; }
       $url =~ s/:/\&colon;/g;
       $name =~ s/:/\&colon;/g;
       $Apache::lonratedt::resources[$idx] = 
    join ':', ($name, $url, $ext, 'normal', 'res');
    }
       }
       &storemap($coursenum, $coursedom, $folder);
   }
   
 sub editor {  sub editor {
     my ($r,$coursenum,$coursedom,$folder,$allowed)=@_;      my ($r,$coursenum,$coursedom,$folder,$allowed)=@_;
     if ($ENV{'form.foldername'}) {      if ($ENV{'form.foldername'}) {
Line 158  sub editor { Line 239  sub editor {
             }              }
 # Group import/search  # Group import/search
     if ($ENV{'form.importdetail'}) {      if ($ENV{'form.importdetail'}) {
                foreach (split(/\&/,$ENV{'form.importdetail'})) {   my @imports;
                   if (defined($_)) {   foreach (split(/\&/,$ENV{'form.importdetail'})) {
              my ($name,$url)=split(/\=/,$_);      if (defined($_)) {
                      $name=&Apache::lonnet::unescape($name);   my ($name,$url)=split(/\=/,$_);
                      $url=&Apache::lonnet::unescape($url);   $name=&Apache::lonnet::unescape($name);
                      if ($url) {   $url=&Apache::lonnet::unescape($url);
                 my $idx=$#Apache::lonratedt::resources+1;   push @imports, $name, $url;
                         $Apache::lonratedt::order      }
                            [$#Apache::lonratedt::order+1]=$idx;   }
                         my $ext='false';  
                         if ($url=~/^http\:\/\//) { $ext='true'; }  
                         $url=~s/\:/\&colon;/g;  
                         $name=~s/\:/\&colon;/g;  
                         $Apache::lonratedt::resources[$idx]=  
                            $name.':'.$url.':'.$ext.':normal:res';  
              }  
                  }  
       }  
 # Store the changed version  # Store the changed version
  &storemap($coursenum,$coursedom,$folder.'.sequence');   group_import($coursenum, $coursedom, $folder, @imports);
             }              }
 # Loading a complete map  # Loading a complete map
    if (($ENV{'form.importmap'}) && ($ENV{'form.loadmap'})) {     if (($ENV{'form.importmap'}) && ($ENV{'form.loadmap'})) {
Line 265  END Line 337  END
        }          } 
     }      }
     $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;      $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
     if ($residx) {      if (($residx) && ($folder!~/supplemental/)) {
        $url.=(($url=~/\?/)?'&':'?').'symb='.         $url.=(($url=~/\?/)?'&':'?').'symb='.
        &Apache::lonnet::escape(&Apache::lonnet::symbclean(         &Apache::lonnet::escape(&Apache::lonnet::symbclean(
           &Apache::lonnet::declutter('uploaded/'.            &Apache::lonnet::declutter('uploaded/'.
Line 411  sub handler { Line 483  sub handler {
        }         }
    }     }
    &untiehash();     &untiehash();
      $r->print('<h1>Done.</h1>');
   } elsif ($ENV{'form.versions'}) {    } elsif ($ENV{'form.versions'}) {
     $r->print('<html><head><title>Check Versions</title></head>'.      $r->print('<html><head><title>Check Versions</title></head>'.
               &Apache::loncommon::bodytag('Check Course Document Versions'));                &Apache::loncommon::bodytag('Check Course Document Versions'));
Line 498  ENDHEADERS Line 571  ENDHEADERS
           }            }
        }         }
        $r->print('</table>');         $r->print('</table>');
          $r->print('<h1>Done.</h1>');
    } else {     } else {
        $r->print('<p>No content modifications yet.</p>');         $r->print('<p>No content modifications yet.</p>');
    }     }
Line 511  ENDHEADERS Line 585  ENDHEADERS
     my $script='';      my $script='';
     my $allowed;      my $allowed;
     my $events='';      my $events='';
     my $buttons='';  
     my $showdoc=0;      my $showdoc=0;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
        ['folder','foldername']);         ['folder','foldername']);
Line 533  ENDHEADERS Line 606  ENDHEADERS
        $script='</script>'.&Apache::lonmenu::registerurl(1,undef).'<script>';         $script='</script>'.&Apache::lonmenu::registerurl(1,undef).'<script>';
        $events='onLoad="'.&Apache::lonmenu::loadevents.         $events='onLoad="'.&Apache::lonmenu::loadevents.
            '" onUnload="'.&Apache::lonmenu::unloadevents.'"';             '" onUnload="'.&Apache::lonmenu::unloadevents.'"';
        $buttons=&Apache::lonmenu::menubuttons(1,undef);  
     }      }
   
 # get course data  # get course data
Line 646  ENDNEWSCRIPT Line 718  ENDNEWSCRIPT
   }    }
 # -------------------------------------------------------------------- Body tag  # -------------------------------------------------------------------- Body tag
   $r->print('</head>'.    $r->print('</head>'.
             &Apache::loncommon::bodytag('Course Documents','',$events).              &Apache::loncommon::bodytag('Course Documents','',$events,
             $buttons);   '','',$showdoc));
   unless ($showdoc) {    unless ($showdoc) {
     if ($allowed) {      if ($allowed) {
        $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',         my $dumpbut=&dumpbutton();
      'Editing the Table of Contents for your Course'));  
        $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" />
Line 663  ENDNEWSCRIPT Line 734  ENDNEWSCRIPT
 <input type="hidden" name="folder" />  <input type="hidden" name="folder" />
 </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">
   <tr><td bgcolor="#DDDDCC">
 <input type="submit" name="verify" value="Verify Content" />  <input type="submit" name="verify" value="Verify Content" />
   </td><td bgcolor="#DDDDCC">
 <input type="submit" name="versions" value="Check Resource Versions" />  <input type="submit" name="versions" value="Check Resource Versions" />
   $dumpbut
   </td></tr></table>
 </form>  </form>
 ENDCOURSEVERIFY  ENDCOURSEVERIFY
          $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
        'Editing the Table of Contents for your Course'));
     }      }
 # --------------------------------------------------------- Standard documents  # --------------------------------------------------------- Standard documents
     $r->print('<table border=2 cellspacing=4 cellpadding=4>');      $r->print('<table border=2 cellspacing=4 cellpadding=4>');
Line 785  $help{'Navigate_Content'} Line 863  $help{'Navigate_Content'}
 onClick="javascript:makesmppage();" /> $help{'Simple Page'}  onClick="javascript:makesmppage();" /> $help{'Simple Page'}
 </nobr>  </nobr>
 </form>  </form>
   <form action="/adm/coursedocs" method="post" name="newsmpproblem">
   <input type="hidden" name="folder" value="$folder">
   <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
   <input type=hidden name="importdetail" value="">
   <nobr>
   <input name="newsmpproblem" type="button" value="Simple Problem"
   onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
   </nobr>
   </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="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">  <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
Removed from v.1.69.2.1  
changed lines
  Added in v.1.74

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