Diff for /loncom/interface/londocs.pm between versions 1.117 and 1.122

version 1.117, 2004/04/08 21:10:25 version 1.122, 2004/04/26 17:50:37
Line 298  sub editor { Line 298  sub editor {
    $r->print('<p><font color="red">'.$errtext.'</font></p>');     $r->print('<p><font color="red">'.$errtext.'</font></p>');
     } else {      } else {
 # ------------------------------------------------------------ Process commands  # ------------------------------------------------------------ Process commands
   
 # ---------------- if they are for this folder and user allowed to make changes  # ---------------- if they are for this folder and user allowed to make changes
  if (($allowed) && ($ENV{'form.folder'} eq $folder)) {   if (($allowed) && ($ENV{'form.folder'} eq $folder)) {
   # set parameters
       if (defined($ENV{'form.setparms'})) {
    my $idx=$ENV{'form.setparms'};
    if ($ENV{'form.randpick_'.$idx}) {
       &Apache::lonratedt::storeparameter($idx,'parameter_randompick',$ENV{'form.randpick_'.$idx},'int_pos');
    } else {
       &Apache::lonratedt::delparameter($idx,'parameter_randompick');
    }
    if ($ENV{'form.hidprs_'.$idx}) {
       &Apache::lonratedt::storeparameter($idx,'parameter_hiddenresource','yes','string_yesno');
    } else {
       &Apache::lonratedt::delparameter($idx,'parameter_hiddenresource');
    }
    if ($ENV{'form.encprs_'.$idx}) {
       &Apache::lonratedt::storeparameter($idx,'parameter_encrypturl','yes','string_yesno');
    } else {
       &Apache::lonratedt::delparameter($idx,'parameter_encrypturl');
    }
   
    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.sequence');
    if ($fatal) {
       $r->print('<p><font color="red">'.$errtext.'</font></p>');
       return;
    }
       }
 # upload a file, if present  # upload a file, if present
            if (($ENV{'form.uploaddoc.filename'}) &&             if (($ENV{'form.uploaddoc.filename'}) &&
                ($ENV{'form.cmd'}=~/^upload_(\w+)/)) {                 ($ENV{'form.cmd'}=~/^upload_(\w+)/)) {
Line 437  sub entryline { Line 463  sub entryline {
      &Apache::lonnet::unescape($title)),'"<>&\'');       &Apache::lonnet::unescape($title)),'"<>&\'');
     my $renametitle=$title;      my $renametitle=$title;
     my $foldertitle=$title;      my $foldertitle=$title;
       my $orderidx=$Apache::lonratedt::order[$index];
     if ($title=~ /^(\d+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(.*)$/ ) {       if ($title=~ /^(\d+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(.*)$/ ) { 
  $foldertitle=&Apache::lontexconvert::msgtexconverted($4);   $foldertitle=&Apache::lontexconvert::msgtexconverted($4);
  $renametitle=$4;   $renametitle=$4;
Line 447  sub entryline { Line 474  sub entryline {
     $renametitle=~s/\&quot\;/\\\"/g;      $renametitle=~s/\&quot\;/\\\"/g;
     my $line='<tr>';      my $line='<tr>';
 # Edit commands  # Edit commands
       my $folderpath;
       if ($ENV{'form.folderpath'}) {
    $folderpath=&Apache::lonnet::escape($ENV{'form.folderpath'});
    # $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');
       }
     if ($allowed) {      if ($allowed) {
  my %lt=('up' => 'Move Up',   my %lt=&Apache::lonlocal::texthash(
                   'up' => 'Move Up',
  'dw' => 'Move Down',   'dw' => 'Move Down',
  'rm' => 'Remove',   'rm' => 'Remove',
  'rn' => 'Rename');   'rn' => 'Rename');
  my $folderpath;  
  if ($ENV{'form.folderpath'}) {  
     $folderpath=&Apache::lonnet::escape($ENV{'form.folderpath'});  
    # $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');  
  }  
  $line.=(<<END);   $line.=(<<END);
   <form name="entry_$index" action="/adm/coursedocs" method="post">
   <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
   <input type="hidden" name="setparms" value="$orderidx" />
 <td><table border='0' cellspacing='2' cellpadding='0'>  <td><table border='0' cellspacing='2' cellpadding='0'>
 <tr><td bgcolor="#DDDDDD">  <tr><td bgcolor="#DDDDDD">
 <a href='/adm/coursedocs?cmd=up_$index&folderpath=$folderpath'>  <a href='/adm/coursedocs?cmd=up_$index&folderpath=$folderpath'>
Line 485  END Line 516  END
           $url='/adm/coursedocs?';            $url='/adm/coursedocs?';
   $folderarg=$1;    $folderarg=$1;
           $isfolder=1;            $isfolder=1;
        } else {         }
   $url=&Apache::lonnet::tokenwrapper($url);  
        }   
     }      }
     $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;      $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
     if ((!$isfolder) && ($residx) && ($folder!~/supplemental/)) {      if ((!$isfolder) && ($residx) && ($folder!~/supplemental/)) {
Line 502  END Line 531  END
  $url=&Apache::lonnet::clutter($url);   $url=&Apache::lonnet::clutter($url);
  $url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);   $url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);
     }      }
       my $parameterset='&nbsp;';
     if ($isfolder) {      if ($isfolder) {
  my $foldername=&Apache::lonnet::escape($foldertitle);   my $foldername=&Apache::lonnet::escape($foldertitle);
  my $folderpath=$ENV{'form.folderpath'};   my $folderpath=$ENV{'form.folderpath'};
  if ($folderpath) { $folderpath.='&' };   if ($folderpath) { $folderpath.='&' };
  $folderpath.=$folderarg.'&'.$foldername;   $folderpath.=$folderarg.'&'.$foldername;
  $url.='folderpath='.&Apache::lonnet::escape($folderpath);   $url.='folderpath='.&Apache::lonnet::escape($folderpath);
    $parameterset=&mt('Randomly Pick: ').
       '<input type="text" size="4" name="randpick_'.$orderidx.'" value="'.
       (&Apache::lonratedt::getparameter($orderidx,'parameter_randompick'))[0].'" />';
     }      }
     $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.      $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.
  '" border="0"></a></td>'.   '" border="0"></a></td>'.
         "<td bgcolor='#FFFFBB'><a href='$url'>$title</a></td></tr>";          "<td bgcolor='#FFFFBB'><a href='$url'>$title</a></td>";
       if (($allowed) && ($folder!~/^supplemental/)) {
     my %lt=&Apache::lonlocal::texthash(
          'hd' => 'Hidden',
          'ec' => 'URL hidden',
          'sp' => 'Store Parameters');
    my $enctext=
       ((&Apache::lonratedt::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="1"':'');
    my $hidtext=
       ((&Apache::lonratedt::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');
    $line.=(<<ENDPARMS);
   <td bgcolor="#BBBBFF"><font size='-2'>
   <input type="checkbox" name="hidprs_$orderidx" $hidtext/> $lt{'hd'}</td>
   <td bgcolor="#BBBBFF"><font size='-2'>
   <input type="checkbox" name="encprs_$orderidx" $enctext/> $lt{'ec'}</td>
   <td bgcolor="#BBBBFF"><font size="-2">$parameterset</font></td>
   <td bgcolor="#BBBBFF"><font size='-2'>
   <input type="submit" value="$lt{'sp'}" />
   </font></td>
   ENDPARMS
       }
       $line.="</form></tr>";
     return $line;      return $line;
 }  }
   
Line 1084  function removeres(folderpath,index,oldt Line 1138  function removeres(folderpath,index,oldt
         this.document.forms.renameform.submit();          this.document.forms.renameform.submit();
     }      }
 }  }
   
 </script>  </script>
   
 ENDNEWSCRIPT  ENDNEWSCRIPT
Line 1128  ENDNEWSCRIPT Line 1183  ENDNEWSCRIPT
  'vc' => 'Verify Content',   'vc' => 'Verify Content',
  'cv' => 'Check/Set Resource Versions',   'cv' => 'Check/Set Resource Versions',
   );    );
   
          my $folderpath=$ENV{'form.folderpath'};
          if (!$folderpath) {
      if ($ENV{'form.folder'} eq '' ||
          $ENV{'form.folder'} eq 'supplemental') {
          $folderpath='default&'.
      &Apache::lonnet::escape(&mt('Main Course Documents'));
      }
          }
        $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 1136  ENDNEWSCRIPT Line 1200  ENDNEWSCRIPT
 </form>  </form>
 <form name="simpleedit" method="post" action="/adm/coursedocs">  <form name="simpleedit" method="post" action="/adm/coursedocs">
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />  <input type="hidden" name="folderpath" value="$folderpath" />
 </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">  <table bgcolor="#AAAAAA" width="100%" cellspacing="4" cellpadding="4">
Line 1301  onClick="javascript:makeabout();" /> Line 1365  onClick="javascript:makeabout();" />
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/imsimportdocs" method="post" name="ims">  <form action="/adm/imsimportdocs" method="post" name="ims">
 <input type="hidden" name="folder" value="$ENV{'form.folder'}" />  <input type="hidden" name="folder" value="$folder" />
 <input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />  <input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
 </nobr>  </nobr>
 </form>  </form>

Removed from v.1.117  
changed lines
  Added in v.1.122


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