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

Diff for /loncom/interface/londocs.pm between versions 1.293.2.1 and 1.316

version 1.293.2.1, 2007/07/19 00:08:04 version 1.316, 2008/11/18 19:14:22
Line 26 Line 26
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
   
   
   =head1 NAME
   
   Apache::londocs.pm
   
   =head1 SYNOPSIS
   
   This is part of the LearningOnline Network with CAPA project
   described at http://www.lon-capa.org.
   
   =head1 SUBROUTINES
   
   =over
   
   =cut
   
 package Apache::londocs;  package Apache::londocs;
   
 use strict;  use strict;
Line 53  my %alreadyseen=(); Line 69  my %alreadyseen=();
   
 my $hadchanges;  my $hadchanges;
   
 # Available help topics  
   =pod
   
   =item %help=()
   
    Available help topics
   
   =cut
   
 my %help=();  my %help=();
   
 # Mapread read maps into LONCAPA::map:: global arrays   =pod
 # @order and @resources, determines status  
 # sets @order - pointer to resources in right order  =item mapread()
 # sets @resources - array with the resources with correct idx  
 #  Mapread read maps into LONCAPA::map:: global arrays 
   @order and @resources, determines status
   sets @order - pointer to resources in right order
   sets @resources - array with the resources with correct idx
   
   =cut
   
 sub mapread {  sub mapread {
     my ($coursenum,$coursedom,$map)=@_;      my ($coursenum,$coursedom,$map)=@_;
Line 81  sub storemap { Line 109  sub storemap {
     return ($errtext,0);      return ($errtext,0);
 }  }
   
 # ----------------------------------------- Return hash with valid author names  
   =pod
   
   =item authorhosts()
   
       Return hash with valid author names
   
   =cut
   
 sub authorhosts {  sub authorhosts {
     my %outhash=();      my %outhash=();
Line 116  sub authorhosts { Line 151  sub authorhosts {
     }      }
     return ($home,$other,%outhash);      return ($home,$other,%outhash);
 }  }
 # ------------------------------------------------------ Generate "dump" button  =pod
   
   =item dumpbutton()
   
       Generate "dump" button
   
   =cut
   
 sub dumpbutton {  sub dumpbutton {
     my ($home,$other,%outhash)=&authorhosts();      my ($home,$other,%outhash)=&authorhosts();
Line 141  sub clean { Line 182  sub clean {
     $title=~s/[^\w\/\!\$\%\^\*\-\_\=\+\;\:\,\\\|\`\~]+/\_/gs;      $title=~s/[^\w\/\!\$\%\^\*\-\_\=\+\;\:\,\\\|\`\~]+/\_/gs;
     return $title;      return $title;
 }  }
 # -------------------------------------------------------- Actually dump course  
   =pod
   
   =item dumpcourse()
   
       Actually dump course
   
   =cut
   
 sub dumpcourse {  sub dumpcourse {
     my ($r) = @_;      my ($r) = @_;
Line 228  sub dumpcourse { Line 276  sub dumpcourse {
  my $title=$origcrsdata{'description'};   my $title=$origcrsdata{'description'};
  $title=~s/[\/\s]+/\_/gs;   $title=~s/[\/\s]+/\_/gs;
  $title=&clean($title);   $title=&clean($title);
  $r->print('<h3>'.&mt('Folder in Construction Space').'</h3><input type="text" size="50" name="authorfolder" value="'.$title.'" /><br />');   $r->print('<h3>'.&mt('Folder in Construction Space').'</h3>'
                    .'<input type="text" size="50" name="authorfolder" value="'.$title.'" /><br />');
  &tiehash();   &tiehash();
  $r->print('<h3>'.&mt('Filenames in Construction Space').'</h3><table border="2"><tr><th>'.&mt('Internal Filename').'</th><th>'.&mt('Title').'</th><th>'.&mt('Save as ...').'</th></tr>');   $r->print('<h3>'.&mt('Filenames in Construction Space').'</h3>'
                    .&Apache::loncommon::start_data_table()
                    .&Apache::loncommon::start_data_table_header_row()
                    .'<th>'.&mt('Internal Filename').'</th>'
                    .'<th>'.&mt('Title').'</th>'
                    .'<th>'.&mt('Save as ...').'</th>'
                    .&Apache::loncommon::end_data_table_header_row());
  foreach (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) {   foreach (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) {
     $r->print('<tr><td>'.$_.'</td>');      $r->print(&Apache::loncommon::start_data_table_row()
                        .'<td>'.$_.'</td>');
     my ($ext)=($_=~/\.(\w+)$/);      my ($ext)=($_=~/\.(\w+)$/);
     my $title=$hash{'title_'.$hash{      my $title=$hash{'title_'.$hash{
  'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$_}};   'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$_}};
Line 245  sub dumpcourse { Line 301  sub dumpcourse {
     $title=~s/\.(\w+)$//;      $title=~s/\.(\w+)$//;
     $title=&clean($title);      $title=&clean($title);
     $title.='.'.$ext;      $title.='.'.$ext;
     $r->print("\n<td><input type='text' size='60' name='namefor_".$_."' value='".$title."' /></td></tr>\n");      $r->print("\n<td><input type='text' size='60' name='namefor_".$_."' value='".$title."' /></td>"
                        .&Apache::loncommon::end_data_table_row());
  }   }
  $r->print("</table>\n");   $r->print(&Apache::loncommon::end_data_table());
  &untiehash();   &untiehash();
  $r->print(   $r->print(
   '<p><input type="submit" name="dumpcourse" value="'.&mt('Dump [_1] DOCS',$type).'" /></p></form>');    '<p><input type="submit" name="dumpcourse" value="'.&mt("Dump $type DOCS").'" /></p></form>');
     }      }
 }  }
   
 # ------------------------------------------------------ Generate "export" button  =pod
   
   =item exportbutton()
   
       Generate "export" button
   
   =cut
   
 sub exportbutton {  sub exportbutton {
     my $type = &Apache::loncommon::course_type();      my $type = &Apache::loncommon::course_type();
Line 264  sub exportbutton { Line 327  sub exportbutton {
     &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'</div>';      &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'</div>';
 }  }
   
   =pod
   
   =item exportcourse()
   
   =cut
   
 sub exportcourse {  sub exportcourse {
     my $r=shift;      my $r=shift;
     my $type = &Apache::loncommon::course_type();      my $type = &Apache::loncommon::course_type();
Line 309  sub exportcourse { Line 378  sub exportcourse {
                 chdir $cwd;                  chdir $cwd;
                 $outcome .= &mt('Download the zip file from <a href="[_1]">IMS '.lc($type).' archive</a><br />',$imszipfile,);                  $outcome .= &mt('Download the zip file from <a href="[_1]">IMS '.lc($type).' archive</a><br />',$imszipfile,);
                 if ($copyresult) {                  if ($copyresult) {
                     $outcome .= 'The following errors occurred during export - '.$copyresult;                      $outcome .= &mt('The following errors occurred during export - [_1]',$copyresult);
                 }                  }
             } else {              } else {
                 $outcome = '<br />Unfortunately you will not be able to retrieve an IMS archive of this posts at this time, because there was a problem creating a manifest file.<br />';                  $outcome = '<br />'.&mt('Unfortunately you will not be able to retrieve an IMS archive of this posts at this time, because there was a problem creating a manifest file.').'<br />';
             }              }
         }          }
         $r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package'));          $r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package'));
Line 818  sub extract_media { Line 887  sub extract_media {
         $dirpath = $url;          $dirpath = $url;
         $container = '';          $container = '';
     }      }
     &Apache::lonnet::extract_embedded_items(undef,undef,\%allfiles,\%codebase,$content);      &Apache::lonnet::extract_embedded_items(undef,\%allfiles,\%codebase,$content);
     foreach my $embed_file (keys(%allfiles)) {      foreach my $embed_file (keys(%allfiles)) {
         my $filename;          my $filename;
         if ($embed_file =~ m#([^/]+)$#) {          if ($embed_file =~ m#([^/]+)$#) {
Line 902  sub store_template { Line 971  sub store_template {
     }      }
 }  }
   
 # Imports the given (name, url) resources into the course  =pod
 # coursenum, coursedom, and folder must precede the list  
   =item group_import()
   
       Imports the given (name, url) resources into the course
       coursenum, coursedom, and folder must precede the list
   
   =cut
   
 sub group_import {  sub group_import {
     my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_;      my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_;
   
Line 924  sub group_import { Line 1000  sub group_import {
             my $result=&Apache::lonnet::finishuserfileupload($coursenum,$coursedom,              my $result=&Apache::lonnet::finishuserfileupload($coursenum,$coursedom,
                                                 'output',$1.$2);                                                  'output',$1.$2);
             if ($result != m|^/uploaded/|) {              if ($result != m|^/uploaded/|) {
                 $errtext.='Map not saved: A network error occured when trying to save the new map. ';                  $errtext.='Map not saved: A network error occurred when trying to save the new map. ';
                 $fatal = 2;                  $fatal = 2;
             }              }
             if ($fatal) {              if ($fatal) {
Line 949  sub group_import { Line 1025  sub group_import {
 }  }
   
 sub breadcrumbs {  sub breadcrumbs {
     my ($where)=@_;      my ($where,$allowed,$type)=@_;
     &Apache::lonhtmlcommon::clear_breadcrumbs();      &Apache::lonhtmlcommon::clear_breadcrumbs();
     my (@folders);      my (@folders);
     if ($env{'form.pagepath'}) {      if ($env{'form.pagepath'}) {
Line 966  sub breadcrumbs { Line 1042  sub breadcrumbs {
     my $is_random_order=0;      my $is_random_order=0;
     while (@folders) {      while (@folders) {
  my $folder=shift(@folders);   my $folder=shift(@folders);
  my $foldername=shift(@folders);      my $foldername=shift(@folders);
  if ($folderpath) {$folderpath.='&';}   if ($folderpath) {$folderpath.='&';}
  $folderpath.=$folder.'&'.$foldername;   $folderpath.=$folder.'&'.$foldername;
  my $url='/adm/coursedocs?folderpath='.   my $url='/adm/coursedocs?folderpath='.
Line 982  sub breadcrumbs { Line 1058  sub breadcrumbs {
             if ($2) { $ishidden=1; }              if ($2) { $ishidden=1; }
             if ($3) { $isencrypted=1; }              if ($3) { $isencrypted=1; }
     if ($4 ne '') { $is_random_order = 1; }      if ($4 ne '') { $is_random_order = 1; }
               if ($folder eq 'supplemental') {
                   if ($allowed) {
                       $name = &mt('Supplemental '.$type.' Documents');
                   } else {
                       $name = &mt($type.' Documents');
                   }
               }
     &Apache::lonhtmlcommon::add_breadcrumb(      &Apache::lonhtmlcommon::add_breadcrumb(
       {'href'=>$url.$cpinfo,        {'href'=>$url.$cpinfo,
        'title'=>$name,         'title'=>$name,
Line 1057  sub log_docs { Line 1140  sub log_docs {
     }      }
 }  }
   
   =pod
   
   =item docs_change_log()
   
   =cut
   
 #  
 # Docs Change Log  
 #  
 sub docs_change_log {  sub docs_change_log {
     my ($r)=@_;      my ($r)=@_;
     my $folder=$env{'form.folder'};      my $folder=$env{'form.folder'};
Line 1201  sub update_paste_buffer { Line 1286  sub update_paste_buffer {
 # Mark for copying  # Mark for copying
     my ($title,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$env{'form.markcopy'}]]);      my ($title,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$env{'form.markcopy'}]]);
     if (&is_supplemental_title($title)) {      if (&is_supplemental_title($title)) {
           &Apache::lonnet::appenv({'docs.markedcopy_supplemental' => $title});
  ($title) = &parse_supplemental_title($title);   ($title) = &parse_supplemental_title($title);
       } elsif ($env{'docs.markedcopy_supplemental'}) {
           &Apache::lonnet::delenv('docs\\.markedcopy_supplemental');
     }      }
     $url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};      $url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
   
     &Apache::lonnet::appenv('docs.markedcopy_title' => $title,      &Apache::lonnet::appenv({'docs.markedcopy_title' => $title,
     'docs.markedcopy_url'   => $url);      'docs.markedcopy_url'   => $url});
     delete($env{'form.markcopy'});      delete($env{'form.markcopy'});
 }  }
   
Line 1227  ENDPASTE Line 1315  ENDPASTE
   &LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')');    &LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')');
     }  else {      }  else {
  my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1];   my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1];
  my $type = &Apache::loncommon::filedescription($extension);   my $icon = &Apache::loncommon::icon($extension);
  my $icon = '<img src="'.&Apache::loncommon::icon($extension).   if ($extension eq 'sequence' &&
     '" alt="" class="LC_icon" />';      $env{'docs.markedcopy_url'} =~ m{/default_\d+\.sequence$ }x) {
       $icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
       $icon .= '/folder_closed.gif';
    }
    $icon = '<img src="'.$icon.'" alt="" class="LC_icon" />';
  $r->print($icon.$type.': '.  &parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'})));   $r->print($icon.$type.': '.  &parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'})));
     }      }
     if ($container eq 'page') {      if ($container eq 'page') {
Line 1246  ENDPASTE Line 1338  ENDPASTE
 }  }
   
 sub do_paste_from_buffer {  sub do_paste_from_buffer {
     my ($coursenum,$coursedom) = @_;      my ($coursenum,$coursedom,$folder) = @_;
   
     return 0 if (!$env{'form.pastemarked'});      return 0 if (!$env{'form.pastemarked'});
   
Line 1288  sub do_paste_from_buffer { Line 1380  sub do_paste_from_buffer {
     $url       = &LONCAPA::map::qtunescape($url);      $url       = &LONCAPA::map::qtunescape($url);
 # Now insert the URL at the bottom  # Now insert the URL at the bottom
     my $newidx = &LONCAPA::map::getresidx($url);      my $newidx = &LONCAPA::map::getresidx($url);
       if ($env{'docs.markedcopy_supplemental'}) {
           if ($folder =~ /^supplemental/) {
               $title = $env{'docs.markedcopy_supplemental'};
           } else {
               (undef,undef,$title) = 
                   &parse_supplemental_title($env{'docs.markedcopy_supplemental'});
           }
       } else {
           if ($folder=~/^supplemental/) {
              $title=time.'___&&&___'.$env{'user.name'}.'___&&&___'.
                     $env{'user.domain'}.'___&&&___'.$title;
           }
       }
   
     $LONCAPA::map::resources[$newidx]= $title.':'.$url.':'.$ext.':normal:res';      $LONCAPA::map::resources[$newidx]= $title.':'.$url.':'.$ext.':normal:res';
     push(@LONCAPA::map::order, $newidx);      push(@LONCAPA::map::order, $newidx);
 # Store the result  # Store the result
Line 1366  sub handle_edit_cmd { Line 1472  sub handle_edit_cmd {
 }  }
   
 sub editor {  sub editor {
     my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$which)=@_;      my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$type)=@_;
   
     my $container= ($env{'form.pagepath'}) ? 'page'      my $container= ($env{'form.pagepath'}) ? 'page'
                            : 'sequence';                             : 'sequence';
Line 1383  sub editor { Line 1489  sub editor {
     }      }
           
     my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order)=      my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order)=
  &breadcrumbs($folder);   &breadcrumbs($folder,$allowed,$type);
     $r->print($breadcrumbtrail);      $r->print($breadcrumbtrail);
           
 # ------------------------------------------------------------ Process commands  # ------------------------------------------------------------ Process commands
Line 1408  sub editor { Line 1514  sub editor {
  }   }
           
  if ($env{'form.pastemarked'}) {   if ($env{'form.pastemarked'}) {
     &do_paste_from_buffer($coursenum,$coursedom);      &do_paste_from_buffer($coursenum,$coursedom,$folder);
     ($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container);      ($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container);
     return $errtext if ($fatal);      return $errtext if ($fatal);
  }   }
Line 1467  sub editor { Line 1573  sub editor {
  $r->print('<p>'.&mt('Caution: this folder is set to randomly pick a subset of resources. Adding or removing resources from this folder will change the set of resources that the students see, resulting in spurious or missing credit for completed problems, not limited to ones you modify. Do not modify the contents of this folder if it is in active student use.').'</p>');   $r->print('<p>'.&mt('Caution: this folder is set to randomly pick a subset of resources. Adding or removing resources from this folder will change the set of resources that the students see, resulting in spurious or missing credit for completed problems, not limited to ones you modify. Do not modify the contents of this folder if it is in active student use.').'</p>');
     }      }
     if ($is_random_order) {      if ($is_random_order) {
  $r->print('<p>'.&mt('Caution: this folder is set to randomly order its contents. Adding or removing resources from this folder will change the order of resources shown. Do not modify the contents of this folder if it is in active student use.').'</p>');   $r->print('<p>'.&mt('Caution: this folder is set to randomly order its contents. Adding or removing resources from this folder will change the order of resources shown.').'</p>');
     }      }
     $r->print('<table class="LC_docs_editor">');      $r->print('<table class="LC_docs_editor">');
     foreach my $res (@LONCAPA::map::order) {      foreach my $res (@LONCAPA::map::order) {
Line 1485  sub editor { Line 1591  sub editor {
  $r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');   $r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');
     }      }
     $r->print("\n</table>\n");      $r->print("\n</table>\n");
           if ($allowed) {
     &print_paste_buffer($r,$container);          &print_paste_buffer($r,$container);
       }
     return;      return;
 }  }
   
Line 1567  sub process_file_upload { Line 1674  sub process_file_upload {
   
                     $$upload_output .=                       $$upload_output .= 
  'This file contains embedded multimedia objects, which need to be uploaded to LON-CAPA.<br />'.   'This file contains embedded multimedia objects, which need to be uploaded to LON-CAPA.<br />'.
  &ask_for_embedded_content('/adm/coursedocs',   &Apache::loncommon::ask_for_embedded_content(
   $state,$allfiles,$codebase);                              '/adm/coursedocs',$state,$allfiles,$codebase);
                 } else {                  } else {
                     $$upload_output .= 'No embedded items identified<br />';                      $$upload_output .= 'No embedded items identified<br />';
                 }                  }
Line 1578  sub process_file_upload { Line 1685  sub process_file_upload {
     return $phase_status;      return $phase_status;
 }  }
   
 sub ask_for_embedded_content {  
     my ($actionurl,$state,$allfiles,$codebase,$args)=@_;  
     my $upload_output = '  
    <form name="upload_embedded" action="'.$actionurl.'"  
                   method="post" enctype="multipart/form-data">';  
     $upload_output .= $state;  
     $upload_output .= '<b>Upload embedded files</b>:<br />'.  
  &Apache::loncommon::start_data_table();  
   
     my $num = 0;  
     foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%{$allfiles})) {  
  $upload_output .= &Apache::loncommon::start_data_table_row().  
     '<td>'.$embed_file.'</td><td>';  
  if ($args->{'ignore_remote_references'}  
     && $embed_file =~ m{^\w+://}) {  
     $upload_output.='<span class="LC_warning">'.&mt("URL points to other server.").'</span>';  
  } elsif ($args->{'error_on_invalid_names'}  
     && $embed_file ne &Apache::lonnet::clean_filename($embed_file,{'keep_path' => 1,})) {  
       
     $upload_output.='<span class="LC_warning">'.&mt("Invalid characters").'</span>';  
       
  } else {  
   
     $upload_output .='  
            <input name="embedded_item_'.$num.'" type="file" value="bob" />  
            <input name="embedded_orig_'.$num.'" type="hidden" value="'.&escape($embed_file).'" />';  
     my $attrib = join(':',@{$$allfiles{$embed_file}});  
     $upload_output .=  
  "\n\t\t".  
  '<input name="embedded_attrib_'.$num.'" type="hidden" value="'.  
  $attrib.'" />';  
     if (exists($$codebase{$embed_file})) {  
  $upload_output .=   
     "\n\t\t".  
     '<input name="codebase_'.$num.'" type="hidden" value="'.  
     &escape($$codebase{$embed_file}).'" />';  
     }  
  }  
  $upload_output .= '</td>'.&Apache::loncommon::end_data_table_row();  
  $num++;  
     }  
     $upload_output .= &Apache::loncommon::end_data_table().'<br />  
    <input type ="hidden" name="number_embedded_items" value="'.$num.'" />  
    <input type ="submit" value="'.&mt('Upload Listed Files').'" />  
    '.&mt('(only files for which a location has been provided will be uploaded)').'  
    </form>';  
     return $upload_output;  
 }  
   
 sub process_secondary_uploads {  sub process_secondary_uploads {
     my ($upload_output,$coursedom,$coursenum,$formname,$num,$newidx) = @_;      my ($upload_output,$coursedom,$coursenum,$formname,$num,$newidx) = @_;
     my $folder=$env{'form.folder'};      my $folder=$env{'form.folder'};
Line 1698  sub entryline { Line 1756  sub entryline {
     my $line='<tr>';      my $line='<tr>';
     my ($form_start,$form_end);      my ($form_start,$form_end);
 # Edit commands  # Edit commands
     my $container;  
     my ($container, $type, $esc_path, $path, $symb);      my ($container, $type, $esc_path, $path, $symb);
     if ($env{'form.folderpath'}) {      if ($env{'form.folderpath'}) {
  $type = 'folder';   $type = 'folder';
Line 1751  sub entryline { Line 1808  sub entryline {
  # no copy for published maps   # no copy for published maps
  $nocopy = 1;   $nocopy = 1;
     } else {      } else {
  foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url))) {   foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url),1)) {
     my ($title,$url,$ext,$type)=split(/\:/,$_);      my ($title,$url,$ext,$type)=split(/\:/,$_);
     if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) {      if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) {
  $nocopy=1;   $nocopy=1;
Line 1976  ENDPARMS Line 2033  ENDPARMS
     return $line;      return $line;
 }  }
   
 # ---------------------------------------------------------------- tie the hash  =pod
   
   =item tiehash()
   
   tie the hash
   
   =cut
   
 sub tiehash {  sub tiehash {
     my ($mode)=@_;      my ($mode)=@_;
Line 2002  sub untiehash { Line 2065  sub untiehash {
     return OK;      return OK;
 }  }
   
 # --------------------------------------------------------------- check on this  
   =pod
   
   =item checkonthis()
   
   check on this
   
   =cut
   
   
 sub checkonthis {  sub checkonthis {
     my ($r,$url,$level,$title)=@_;      my ($r,$url,$level,$title)=@_;
Line 2011  sub checkonthis { Line 2082  sub checkonthis {
     $r->rflush();      $r->rflush();
     if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) {      if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) {
        $r->print("\n<br />");         $r->print("\n<br />");
          if ($level==0) {
              $r->print("<br />");
          }
        for (my $i=0;$i<=$level*5;$i++) {         for (my $i=0;$i<=$level*5;$i++) {
            $r->print('&nbsp;');             $r->print('&nbsp;');
        }         }
Line 2020  sub checkonthis { Line 2094  sub checkonthis {
   my $result=&Apache::lonnet::repcopy(    my $result=&Apache::lonnet::repcopy(
                               &Apache::lonnet::filelocation('',$url));                                &Apache::lonnet::filelocation('',$url));
           if ($result eq 'ok') {            if ($result eq 'ok') {
              $r->print('<font color="green">'.&mt('ok').'</font>');               $r->print('<span class="LC_success">'.&mt('ok').'</span>');
              $r->rflush();               $r->rflush();
              &Apache::lonnet::countacc($url);               &Apache::lonnet::countacc($url);
              $url=~/\.(\w+)$/;               $url=~/\.(\w+)$/;
Line 2030  sub checkonthis { Line 2104  sub checkonthis {
                  for (my $i=0;$i<=$level*5;$i++) {                   for (my $i=0;$i<=$level*5;$i++) {
                      $r->print('&nbsp;');                       $r->print('&nbsp;');
                  }                   }
                  $r->print('- '.&mt('Rendering').': ');                   $r->print('- '.&mt('Rendering:').' ');
  my ($errorcount,$warningcount)=split(/:/,   my ($errorcount,$warningcount)=split(/:/,
        &Apache::lonnet::ssi_body($url,         &Apache::lonnet::ssi_body($url,
        ('grade_target'=>'web',         ('grade_target'=>'web',
Line 2039  sub checkonthis { Line 2113  sub checkonthis {
                      ($warningcount)) {                       ($warningcount)) {
      if ($errorcount) {       if ($errorcount) {
                         $r->print('<img src="/adm/lonMisc/bomb.gif" /><span class="LC_error">'.                          $r->print('<img src="/adm/lonMisc/bomb.gif" /><span class="LC_error">'.
   $errorcount.' '.                            &mt('[quant,_1,error]',$errorcount).'</span>');
   &mt('error(s)').'</span> ');  
                      }                       }
      if ($warningcount) {       if ($warningcount) {
                         $r->print('<span class="LC_warning">'.                          $r->print('<span class="LC_warning">'.
   $warningcount.' '.                            &mt('[quant,_1,warning]',$warningcount).'</span>');
   &mt('warning(s)').'</span>');  
                      }                       }
                  } else {                   } else {
                      $r->print('<span class="LC_success">'.&mt('ok').'</span>');                       $r->print('<span class="LC_success">'.&mt('ok').'</span>');
Line 2063  sub checkonthis { Line 2135  sub checkonthis {
              $r->print('<span class="LC_error">'.&mt('connection down').'</span>');               $r->print('<span class="LC_error">'.&mt('connection down').'</span>');
           } elsif ($result eq 'not_found') {            } elsif ($result eq 'not_found') {
       unless ($url=~/\$/) {        unless ($url=~/\$/) {
   $r->print('<span class="LC_error">'.&mt('not found').'</b></font>');    $r->print('<span class="LC_error">'.&mt('not found').'</b></span>');
       } else {        } else {
   $r->print('<span class="LC_unknown">'.&mt('unable to verify variable URL').'</span>');    $r->print('<span class="LC_unknown">'.&mt('unable to verify variable URL').'</span>');
       }        }
           } else {            } else {
              $r->print('<span class="LC_error">'.&mt('access denied').'</span>');               $r->print('<span class="LC_error">'.&mt('access denied').'</span>');
           }            }
       }         }
    }      }
 }  }
   
   
 #  
 # ----------------------------------------------------------------- List Symbs  =pod
 #   
   =item list_symbs()
   
   List Symbs
   
   =cut
   
 sub list_symbs {  sub list_symbs {
     my ($r) = @_;      my ($r) = @_;
   
Line 2093  sub list_symbs { Line 2171  sub list_symbs {
 }  }
   
   
 #  =pod
 # -------------------------------------------------------------- Verify Content  
 #   =item verifycontent()
   
   Verify Content
   
   =cut
   
 sub verifycontent {  sub verifycontent {
     my ($r) = @_;      my ($r) = @_;
     my $type = &Apache::loncommon::course_type();      my $type = &Apache::loncommon::course_type();
Line 2125  sub verifycontent { Line 2208  sub verifycontent {
      &mt('Return to DOCS').'</a>');       &mt('Return to DOCS').'</a>');
 }  }
   
   =pod
   
 # -------------------------------------------------------------- Check Versions  =item devalidateversioncache() & checkversions()
   
   Check Versions
   
   =cut
   
 sub devalidateversioncache {  sub devalidateversioncache {
     my $src=shift;      my $src=shift;
Line 2430  sub changewarning { Line 2518  sub changewarning {
 $help{'Caching'}.'</span></h3></form>'."\n\n");  $help{'Caching'}.'</span></h3></form>'."\n\n");
 }  }
   
 # =========================================== Breadcrumbs for special functions  =pod
   
   =item init_breadcrumbs()
   
   Breadcrumbs for special functions
   
   =cut
   
 sub init_breadcrumbs {  sub init_breadcrumbs {
     my ($form,$text)=@_;      my ($form,$text)=@_;
     &Apache::lonhtmlcommon::clear_breadcrumbs();      &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs",      &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs",
     text=>&Apache::loncommon::course_type()." Documents",      text=>"Edit ".&Apache::loncommon::course_type(),
     faq=>273,      faq=>273,
     bug=>'Instructor Interface',      bug=>'Instructor Interface',
                                             help => 'Docs_Adding_Course_Doc'});                                              help => 'Docs_Adding_Course_Doc'});
Line 2446  sub init_breadcrumbs { Line 2540  sub init_breadcrumbs {
     bug=>'Instructor Interface'});      bug=>'Instructor Interface'});
 }  }
   
 # ================================================================ Main Handler  
   =pod
   
   =item handler()
   
   Main Handler
   
   =cut
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
Line 2510  sub handler { Line 2612  sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
     ['folderpath','pagepath',      ['folderpath','pagepath',
      'pagesymb']);       'pagesymb']);
   # No folderpath, no pagepath, see if we have something stored
       if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'})) {
           &Apache::loncommon::restore_course_settings('docs_folderpath',
                                                 {'folderpath' => 'scalar'});
       }
       if (!$env{'form.folderpath'}) {
           &Apache::loncommon::restore_course_settings('docs_folderpath',
                                                 {'pagepath' => 'scalar'});
       }
       if ($env{'form.pagepath'}) {
          $env{'form.folderpath'}='';
       }
       if ($env{'form.folderpath'} =~ /^supplemental_\d+/) {
           $env{'form.folderpath'} = 'supplemental&'.
                                     &escape(&mt('Supplemental '.$type.' Documents')).'&'.
                                     $env{'form.folderpath'};
       }
       &Apache::loncommon::store_course_settings('docs_folderpath',
                                                   {'pagepath' => 'scalar',
                                                    'folderpath' => 'scalar'});
     if ($env{'form.folderpath'}) {      if ($env{'form.folderpath'}) {
  my (@folderpath)=split('&',$env{'form.folderpath'});   my (@folderpath)=split('&',$env{'form.folderpath'});
  $env{'form.foldername'}=&unescape(pop(@folderpath));   $env{'form.foldername'}=&unescape(pop(@folderpath));
Line 2571  sub handler { Line 2693  sub handler {
       if (($env{'form.uploaddoc.filename'}) &&        if (($env{'form.uploaddoc.filename'}) &&
   ($env{'form.cmd'}=~/^upload_(\w+)/)) {    ($env{'form.cmd'}=~/^upload_(\w+)/)) {
 # Process file upload - phase one - upload and parse primary file.    # Process file upload - phase one - upload and parse primary file.  
     undef($hadchanges);
           $upload_result = &process_file_upload(\$upload_output,$coursenum,            $upload_result = &process_file_upload(\$upload_output,$coursenum,
  $coursedom,\%allfiles,   $coursedom,\%allfiles,
  \%codebase,$1);   \%codebase,$1);
     if ($hadchanges) {
         &mark_hash_old();
     }
           if ($upload_result eq 'phasetwo') {            if ($upload_result eq 'phasetwo') {
               $r->print($upload_output);                $r->print($upload_output);
           }            }
Line 2675  sub handler { Line 2801  sub handler {
                 'bull' => 'Bulletin Board',                  'bull' => 'Bulletin Board',
                 'mypi' => 'My Personal Info',                  'mypi' => 'My Personal Info',
                 'grpo' => 'Group Files',                  'grpo' => 'Group Files',
                   'rost' => 'Course Roster',
  'abou' => 'About User',   'abou' => 'About User',
                 'imsf' => 'Import IMS package',                  'imsf' => 'Import IMS package',
                 'file' =>  'File',                  'file' =>  'File',
Line 2766  ENDCOURSEVERIFY Line 2893  ENDCOURSEVERIFY
        }         }
        $hadchanges=0;         $hadchanges=0;
        my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,         my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,
    $upload_output);     $upload_output,$type);
        if ($error) {         if ($error) {
    $r->print('<p><span class="LC_error">'.$error.'</span></p>');     $r->print('<p><span class="LC_error">'.$error.'</span></p>');
        }         }
Line 2803  $uploadtag Line 2930  $uploadtag
 <br />  <br />
 <span class="LC_nobreak">  <span class="LC_nobreak">
 <label>$lt{'parse'}?  <label>$lt{'parse'}?
 <input type="checkbox" name="parserflag" />  <input type="checkbox" name="parserflag" checked="checked" />
 </label>  </label>
 </span>  </span>
 <br />  <br />
Line 2883  value="$lt{'newp'}" />$help{'Adding_Page Line 3010  value="$lt{'newp'}" />$help{'Adding_Page
 <br /><form action="/adm/coursedocs" method="post" name="newsyl">  <br /><form action="/adm/coursedocs" method="post" name="newsyl">
 $uploadtag  $uploadtag
 <input type="hidden" name="importdetail"   <input type="hidden" name="importdetail" 
 value="Syllabus=/public/$coursedom/$coursenum/syllabus" />  value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" />
 <span class="LC_nobreak">  <span class="LC_nobreak">
 <input name="newsyl" type="submit" value="$lt{'syll'}" />   <input name="newsyl" type="submit" value="$lt{'syll'}" /> 
  $help{'Syllabus'}   $help{'Syllabus'}
Line 2892  value="Syllabus=/public/$coursedom/$cour Line 3019  value="Syllabus=/public/$coursedom/$cour
 <br /><form action="/adm/coursedocs" method="post" name="newnav">  <br /><form action="/adm/coursedocs" method="post" name="newnav">
 $uploadtag  $uploadtag
 <input type="hidden" name="importdetail"   <input type="hidden" name="importdetail" 
 value="Navigate Content=/adm/navmaps" />  value="$lt{'navc'}=/adm/navmaps" />
 <span class="LC_nobreak">  <span class="LC_nobreak">
 <input name="newnav" type="submit" value="$lt{'navc'}" />  <input name="newnav" type="submit" value="$lt{'navc'}" />
 $help{'Navigate_Content'}  $help{'Navigate_Content'}
Line 2960  onClick="javascript:makeabout();" /> Line 3087  onClick="javascript:makeabout();" />
 <br /><form action="/adm/coursedocs" method="post" name="newgroupfiles">  <br /><form action="/adm/coursedocs" method="post" name="newgroupfiles">
 $uploadtag  $uploadtag
 <input type="hidden" name="importdetail"  <input type="hidden" name="importdetail"
 value="Group Files=/adm/$coursedom/$coursenum/aboutme" />  value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />
 <span class="LC_nobreak">  <span class="LC_nobreak">
 <input name="newgroupfiles" type="submit" value="$lt{'grpo'}" />  <input name="newgroupfiles" type="submit" value="$lt{'grpo'}" />
 $help{'Group Files'}  $help{'Group Files'}
 </span>  </span>
 </form>  </form>
   <br /><form action="/adm/coursedocs" method="post" name="newroster">
   $uploadtag
   <input type="hidden" name="importdetail" 
   value="$lt{'rost'}=/adm/viewclasslist" />
   <span class="LC_nobreak">
   <input name="newroster" type="submit" value="$lt{'rost'}" />
   $help{'Course Roster'}
   </span>
   </form>
 ENDFORM  ENDFORM
        }         }
        if ($env{'form.pagepath'}) {         if ($env{'form.pagepath'}) {
Line 3003  ENDBLOCK Line 3139  ENDBLOCK
    $folder='supplemental';     $folder='supplemental';
        }         }
        if ($folder =~ /^supplemental$/ &&         if ($folder =~ /^supplemental$/ &&
    $env{'form.folderpath'} =~ /^default\&/) {     (($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) {
    $env{'form.folderpath'}='supplemental&'.            $env{'form.folderpath'} = 'supplemental&'.
        &escape(&mt('Supplemental '.$type.' Documents'));                                      &escape(&mt('Supplemental '.$type.' Documents'));
        }         }
        my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed);         my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
        if ($error) {         if ($error) {
    $r->print('<p><span class="LC_error">'.$error.'</span></p>');     $r->print('<p><span class="LC_error">'.$error.'</span></p>');
        }         }
Line 3115  ENDSUPFORM Line 3251  ENDSUPFORM
 sub editing_js {  sub editing_js {
     my ($udom,$uname) = @_;      my ($udom,$uname) = @_;
     my $now = time();      my $now = time();
       my %lt = &Apache::lonlocal::texthash(
                                             p_mnf => 'Name of New Folder',
                                             t_mnf => 'New Folder',
                                             p_mnp => 'Name of New Page',
                                             t_mnp => 'New Page',
                                             p_mxu => 'Title for the Uploaded Score',
                                             p_msp => 'Title for the Page',
                                             p_msb => 'Title for the Problem',
                                             p_mdb => 'Title for the Drop Box',
                                             p_mbb => 'Title for the Bulletin Board',
                                             p_mab => "Enter user:domain for User's 'About Me' Page",
                                             p_mab2 => "About [_99]",
                                             p_mab_alrt1 => 'Not a valid user:domain',
                                             p_mab_alrt2 => 'Please enter both user and domain in the format user:domain',
                                             p_chn => 'New Title',
                                             p_rmr1 => 'WARNING: Removing a resource makes associated grades and scores inaccessible!',
                                             p_rmr2a => 'Remove[_99]',
                                             p_rmr2b => '?[_99]',
                                             p_ctr1a => 'WARNING: Cutting a resource makes associated grades and scores inaccessible!',
                                             p_ctr1b => 'Grades remain inaccessible if resource is pasted into another folder.',
                                             p_ctr2a => 'Cut[_98]',
                                             p_ctr2b => '?[_98]'
                                           );
   
     return <<ENDNEWSCRIPT;      return <<ENDNEWSCRIPT;
 function makenewfolder(targetform,folderseq) {  function makenewfolder(targetform,folderseq) {
     var foldername=prompt('Name of New Folder','New Folder');      var foldername=prompt('$lt{"p_mnf"}','$lt{"t_mnf"}');
     if (foldername) {      if (foldername) {
        targetform.importdetail.value=escape(foldername)+"="+folderseq;         targetform.importdetail.value=escape(foldername)+"="+folderseq;
         targetform.submit();          targetform.submit();
Line 3126  function makenewfolder(targetform,folder Line 3285  function makenewfolder(targetform,folder
 }  }
   
 function makenewpage(targetform,folderseq) {  function makenewpage(targetform,folderseq) {
     var pagename=prompt('Name of New Page','New Page');      var pagename=prompt('$lt{"p_mnp"}','$lt{"t_mnp"}');
     if (pagename) {      if (pagename) {
         targetform.importdetail.value=escape(pagename)+"="+folderseq;          targetform.importdetail.value=escape(pagename)+"="+folderseq;
         targetform.submit();          targetform.submit();
Line 3150  function edittext(targetname,residx,titl Line 3309  function edittext(targetname,residx,titl
 }  }
   
 function makeexamupload() {  function makeexamupload() {
    var title=prompt('Listed Title for the Uploaded Score');     var title=prompt('$lt{"p_mxu"}');
    if (title) {      if (title) { 
     this.document.forms.newexamupload.importdetail.value=      this.document.forms.newexamupload.importdetail.value=
  escape(title)+'=/res/lib/templates/examupload.problem';   escape(title)+'=/res/lib/templates/examupload.problem';
Line 3159  function makeexamupload() { Line 3318  function makeexamupload() {
 }  }
   
 function makesmppage() {  function makesmppage() {
    var title=prompt('Listed Title for the Page');     var title=prompt('$lt{"p_msp"}');
    if (title) {      if (title) { 
     this.document.forms.newsmppg.importdetail.value=      this.document.forms.newsmppg.importdetail.value=
  escape(title)+'=/adm/$udom/$uname/$now/smppg';   escape(title)+'=/adm/$udom/$uname/$now/smppg';
Line 3168  function makesmppage() { Line 3327  function makesmppage() {
 }  }
   
 function makesmpproblem() {  function makesmpproblem() {
    var title=prompt('Listed Title for the Problem');     var title=prompt('$lt{"p_msb"}');
    if (title) {      if (title) { 
     this.document.forms.newsmpproblem.importdetail.value=      this.document.forms.newsmpproblem.importdetail.value=
  escape(title)+'=/res/lib/templates/simpleproblem.problem';   escape(title)+'=/res/lib/templates/simpleproblem.problem';
Line 3177  function makesmpproblem() { Line 3336  function makesmpproblem() {
 }  }
   
 function makedropbox() {  function makedropbox() {
    var title=prompt('Listed Title for the Drop Box');     var title=prompt('$lt{"p_mdb"}');
    if (title) {      if (title) { 
     this.document.forms.newdropbox.importdetail.value=      this.document.forms.newdropbox.importdetail.value=
         escape(title)+'=/res/lib/templates/DropBox.problem';          escape(title)+'=/res/lib/templates/DropBox.problem';
Line 3186  function makedropbox() { Line 3345  function makedropbox() {
 }  }
   
 function makebulboard() {  function makebulboard() {
    var title=prompt('Listed Title for the Bulletin Board');     var title=prompt('$lt{"p_mbb"}');
    if (title) {     if (title) {
     this.document.forms.newbul.importdetail.value=      this.document.forms.newbul.importdetail.value=
  escape(title)+'=/adm/$udom/$uname/$now/bulletinboard';   escape(title)+'=/adm/$udom/$uname/$now/bulletinboard';
Line 3195  function makebulboard() { Line 3354  function makebulboard() {
 }  }
   
 function makeabout() {  function makeabout() {
    var user=prompt("Enter user:domain for User's 'About Me' Page");     var user=prompt("$lt{'p_mab'}");
    if (user) {     if (user) {
        var comp=new Array();         var comp=new Array();
        comp=user.split(':');         comp=user.split(':');
        if ((typeof(comp[0])!=undefined) && (typeof(comp[1])!=undefined)) {         if ((typeof(comp[0])!=undefined) && (typeof(comp[1])!=undefined)) {
    if ((comp[0]) && (comp[1])) {     if ((comp[0]) && (comp[1])) {
        this.document.forms.newaboutsomeone.importdetail.value=         this.document.forms.newaboutsomeone.importdetail.value=
    'About '+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';     '$lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
        this.document.forms.newaboutsomeone.submit();         this.document.forms.newaboutsomeone.submit();
    } else {     } else {
                alert("Not a valid user:domain");                 alert("$lt{'p_mab_alrt1'}");
            }             }
        } else {         } else {
            alert("Please enter both user and domain in the format user:domain");              alert("$lt{'p_mab_alrt2'}");
        }         }
    }     }
 }  }
Line 3230  function finishpick() { Line 3389  function finishpick() {
 }  }
   
 function changename(folderpath,index,oldtitle,container,pagesymb) {  function changename(folderpath,index,oldtitle,container,pagesymb) {
     var title=prompt('New Title',oldtitle);      var title=prompt('$lt{"p_chn"}',oldtitle);
     if (title) {      if (title) {
  this.document.forms.renameform.markcopy.value=-1;   this.document.forms.renameform.markcopy.value=-1;
  this.document.forms.renameform.title.value=title;   this.document.forms.renameform.title.value=title;
Line 3247  function changename(folderpath,index,old Line 3406  function changename(folderpath,index,old
 }  }
   
 function removeres(folderpath,index,oldtitle,container,pagesymb,skip_confirm) {  function removeres(folderpath,index,oldtitle,container,pagesymb,skip_confirm) {
     if (skip_confirm || confirm('WARNING: Removing a resource makes associated grades and scores inaccessible!\\nRemove "'+oldtitle+'"?')) {      if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {
  this.document.forms.renameform.markcopy.value=-1;   this.document.forms.renameform.markcopy.value=-1;
  this.document.forms.renameform.cmd.value='del_'+index;   this.document.forms.renameform.cmd.value='del_'+index;
         if (container == 'sequence') {          if (container == 'sequence') {
Line 3262  function removeres(folderpath,index,oldt Line 3421  function removeres(folderpath,index,oldt
 }  }
   
 function cutres(folderpath,index,oldtitle,container,pagesymb,folder,skip_confirm) {  function cutres(folderpath,index,oldtitle,container,pagesymb,folder,skip_confirm) {
     if (skip_confirm || confirm('WARNING: Cutting a resource makes associated grades and scores inaccessible!\\nGrades remain inaccessible if resource is pasted into another folder.\\nCut "'+oldtitle+'"?')) {      if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {
  this.document.forms.renameform.cmd.value='cut_'+index;   this.document.forms.renameform.cmd.value='cut_'+index;
  this.document.forms.renameform.markcopy.value=index;   this.document.forms.renameform.markcopy.value=index;
  this.document.forms.renameform.copyfolder.value=folder+'.'+container;   this.document.forms.renameform.copyfolder.value=folder+'.'+container;
Line 3294  ENDNEWSCRIPT Line 3453  ENDNEWSCRIPT
 }  }
 1;  1;
 __END__  __END__
   
   =pod
   
   =back
   
   =cut
Removed from v.1.293.2.1  
changed lines
  Added in v.1.316

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