[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.2.1 and 1.79

version 1.69.2.1.2.1, 2003/08/07 19:12:13 version 1.79, 2003/09/15 17:58:21
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 $r=shift;
       $r->print('<html><head><title>Dump DOCS</title></head>'.
           &Apache::loncommon::bodytag('Dump Course DOCS to Construction Space').
         '<form name="dumpdoc" method="post">');
       my ($home,$other,%outhash)=&authorhosts();
       unless ($home) { return ''; }
       my $origcrsid=$ENV{'request.course.id'};
       my %origcrsdata=&Apache::lonnet::coursedescription($origcrsid);
       if (($ENV{'form.authorspace'}) && ($ENV{'form.authorfolder'}=~/\w/)) {
   # Do the dumping
    unless ($outhash{'home_'.$ENV{'form.authorspace'}}) { return ''; }
    my ($ca,$cd)=split(/\@/,$ENV{'form.authorspace'});
    $r->print('<h3>Copying Files</h3>');
    my $title=$ENV{'form.authorfolder'};
    $title=~s/[^\w\/]+/\_/g;
    my %replacehash=();
    foreach (keys %ENV) {
       if ($_=~/^form\.namefor\_(.+)/) {
    $replacehash{$1}=$ENV{$_};
       }
    }
    my $crs='/uploaded/'.$ENV{'request.course.id'}.'/';
    $crs=~s/\_/\//g;
    foreach (keys %replacehash) {
       my $newfilename=$title.'/'.$replacehash{$_};
       $newfilename=~s/[^\w\/\.]+/\_/g;
       my @dirs=split(/\//,$newfilename);
       my $path='/home/'.$ca.'/public_html';
       my $makepath=$path;
       my $fail=0;
       for (my $i=0;$i<$#dirs;$i++) {
    $makepath.='/'.$dirs[$i];
    unless (-e $makepath) { 
       unless(mkdir($makepath,0777)) { $fail=1; } 
    }
       }
       $r->print('<br /><tt>'.$_.'</tt> => <tt>'.$newfilename.'</tt>: ');
       if (my $fh=Apache::File->new('>'.$path.'/'.$newfilename)) {
    if ($_=~/\.(sequence|page|html|htm|xml|xhtml)$/) {
       print $fh &Apache::loncreatecourse::rewritefile(
            &Apache::loncreatecourse::readfile($ENV{'request.course.id'},$_),
        (%replacehash,$crs => '')
       );
    } else {
       print $fh
            &Apache::loncreatecourse::readfile($ENV{'request.course.id'},$_);
          }
    $fh->close();
       } else {
    $fail=1;
       }
       if ($fail) {
    $r->print('<font color="red">fail</font>');
       } else {
    $r->print('<font color="green">ok</font>');
       }
    }
       } else {
   # Input form
    unless ($home==1) {
       $r->print(
         '<h3>Select the Construction Space</h3><select name="authorspace">');
    }
    foreach (sort keys %outhash) {
       if ($_=~/^home_(.+)$/) {
    if ($home==1) {
       $r->print(
     '<input type="hidden" name="authorspace" value="'.$1.'" />');
    } else {
       $r->print('<option value="'.$1.'">'.$_.'</option>');
    }
       }
    }
    unless ($home==1) {
       $r->print('</select>');
    }
    my $title=$origcrsdata{'description'};
    $title=~s/\s+/\_/gs;
    $title=~s/\W//gs;
    $r->print('<h3>Folder in Construction Space</h3><input type="text" size="50" name="authorfolder" value="'.$title.'" /><br />');
    &tiehash();
    $r->print('<h3>Filenames in Construction Space</h3><table border="2"><tr><th>Internal Filename</th><th>Title</th><th>Save as ...</th></tr>');
    foreach (&Apache::loncreatecourse::crsdirlist($origcrsid,'userfiles')) {
       $r->print('<tr><td>'.$_.'</td>');
       my ($ext)=($_=~/\.(\w+)$/);
       my $title=$hash{'title_'.$hash{
    'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$_}};
       $r->print('<td>'.($title?$title:'&nbsp;').'</td>');
       unless ($title) {
    $title=$_;
       }
       $title=~s/\.(\w+)$//;
       $title=~s/\W+/\_/gs;
       $title.='.'.$ext;
       $r->print("\n<td><input type='text' size='60' name='namefor_".$_."' value='".$title."' /></td></tr>\n");
    }
    $r->print("</table>\n");
    &untiehash();
    $r->print(
     '<p><input type="submit" name="dumpcourse" value="Dump Course DOCS" /></p></form>');
       }
   }
   
   
   # 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 337  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 435  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 368  sub checkonthis { Line 538  sub checkonthis {
    }     }
 }  }
   
 # ================================================================ Main Handler  
 sub handler {  
     my $r = shift;  
     $r->content_type('text/html');  
     $r->send_http_header;  
     return OK if $r->header_only;  
   
 # --------------------------------------------- Initialize help topics for this  #
   foreach ('Adding_Course_Doc','Main_Course_Documents',  # -------------------------------------------------------------- Verify Content
            'Adding_External_Resource','Navigate_Content',  # 
            'Adding_Folders','Docs_Overview', 'Load_Map',  sub verifycontent {
            'Supplemental', 'Score_Upload_Form',     my $r=shift; 
            'Importing_LON-CAPA_Resource','Uploading_From_Harddrive') {  
       $help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_);  
   }  
     # Composite help files  
     $help{'Syllabus'} = &Apache::loncommon::help_open_topic(  
     'Docs_About_Syllabus,Docs_Editing_Templated_Pages');  
     $help{'Simple Page'} = &Apache::loncommon::help_open_topic(  
     'Docs_About_Simple_Page,Docs_Editing_Templated_Pages');  
     $help{'Bulletin Board'} = &Apache::loncommon::help_open_topic(  
     'Docs_About_Bulletin_Board,Docs_Editing_Templated_Pages');  
     $help{'My Personal Info'} = &Apache::loncommon::help_open_topic(  
   'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages');  
     $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');  
    
   if ($ENV{'form.verify'}) {  
    
    my $loaderror=&Apache::lonnet::overloaderror($r);     my $loaderror=&Apache::lonnet::overloaderror($r);
    if ($loaderror) { return $loaderror; }     if ($loaderror) { return $loaderror; }
   
Line 412  sub handler { Line 560  sub handler {
    }     }
    &untiehash();     &untiehash();
    $r->print('<h1>Done.</h1>');     $r->print('<h1>Done.</h1>');
   } elsif ($ENV{'form.versions'}) {  }
     $r->print('<html><head><title>Check Versions</title></head>'.  
   # -------------------------------------------------------------- Check Versions
   
   sub checkversions {
       my $r=shift;
      $r->print('<html><head><title>Check Versions</title></head>'.
               &Apache::loncommon::bodytag('Check Course Document Versions'));                &Apache::loncommon::bodytag('Check Course Document Versions'));
    $hashtied=0;     $hashtied=0;
    &tiehash();     &tiehash();
Line 446  sub handler { Line 599  sub handler {
            $seltext='since yesterday ('.localtime($starttime).')';             $seltext='since yesterday ('.localtime($starttime).')';
            $daysel='selected';             $daysel='selected';
        }         }
    
        $r->print(<<ENDHEADERS);         $r->print(<<ENDHEADERS);
 <form action="/adm/coursedocs" method="post">  <form action="/adm/coursedocs" method="post">
 <select name="timerange">  <select name="timerange">
Line 504  ENDHEADERS Line 657  ENDHEADERS
        $r->print('<p>No content modifications yet.</p>');         $r->print('<p>No content modifications yet.</p>');
    }     }
    &untiehash();     &untiehash();
   }
   
   # ================================================================ Main Handler
   sub handler {
       my $r = shift;
       $r->content_type('text/html');
       $r->send_http_header;
       return OK if $r->header_only;
   
   # --------------------------------------------- Initialize help topics for this
     foreach ('Adding_Course_Doc','Main_Course_Documents',
              'Adding_External_Resource','Navigate_Content',
              'Adding_Folders','Docs_Overview', 'Load_Map',
              'Supplemental', 'Score_Upload_Form',
              'Importing_LON-CAPA_Resource','Uploading_From_Harddrive') {
         $help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_);
     }
       # Composite help files
       $help{'Syllabus'} = &Apache::loncommon::help_open_topic(
       'Docs_About_Syllabus,Docs_Editing_Templated_Pages');
       $help{'Simple Page'} = &Apache::loncommon::help_open_topic(
       'Docs_About_Simple_Page,Docs_Editing_Templated_Pages');
       $help{'Bulletin Board'} = &Apache::loncommon::help_open_topic(
       'Docs_About_Bulletin_Board,Docs_Editing_Templated_Pages');
       $help{'My Personal Info'} = &Apache::loncommon::help_open_topic(
     'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages');
       $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');
    
     if ($ENV{'form.verify'}) {
         &verifycontent($r);
     } elsif ($ENV{'form.versions'}) {
         &checkversions($r);
     } elsif ($ENV{'form.dumpcourse'}) {
         &dumpcourse($r);
   } else {    } else {
 # is this a standard course?  # is this a standard course?
   
Line 513  ENDHEADERS Line 700  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 525  ENDHEADERS Line 711  ENDHEADERS
        $forcesupplement=($ENV{'form.folder'}=~/^supplemental_/);         $forcesupplement=($ENV{'form.folder'}=~/^supplemental_/);
   
 # does this user have privileges to post, etc?  # does this user have privileges to post, etc?
        $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'});         $allowed=&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'});
        if ($allowed) {          if ($allowed) { 
          &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']);           &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']);
          $script=&Apache::lonratedt::editscript('simple');            $script=&Apache::lonratedt::editscript('simple'); 
Line 535  ENDHEADERS Line 721  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 648  ENDNEWSCRIPT Line 833  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 665  ENDNEWSCRIPT Line 849  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 787  $help{'Navigate_Content'} Line 978  $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.2.1  
changed lines
  Added in v.1.79

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