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

Diff for /loncom/interface/lonindexer.pm between versions 1.126 and 1.131

version 1.126, 2004/10/20 10:54:08 version 1.131, 2005/03/01 03:20:41
Line 136  sub handler { Line 136  sub handler {
    }     }
   #Hijack lonindexer to verify a title and be close down.    #Hijack lonindexer to verify a title and be close down.
    if ($ENV{'form.launch'} eq '2') {     if ($ENV{'form.launch'} eq '2') {
        $r->content_type('text/html');         &Apache::loncommon::content_type($r,'text/html');
        my $extra='';         my $extra='';
        if (defined($ENV{'form.titleelement'}) &&          if (defined($ENV{'form.titleelement'}) && 
    $ENV{'form.titleelement'} ne '') {     $ENV{'form.titleelement'} ne '') {
Line 145  sub handler { Line 145  sub handler {
    $verify_title=~s/'/\\'/g;     $verify_title=~s/'/\\'/g;
    $extra='window.opener.document.forms["'.$ENV{'form.form'}.'"].elements["'.$ENV{'form.titleelement'}.'"].value=\''.$verify_title.'\';';     $extra='window.opener.document.forms["'.$ENV{'form.form'}.'"].elements["'.$ENV{'form.titleelement'}.'"].value=\''.$verify_title.'\';';
        }         }
          my $html=&Apache::lonxml::xmlbegin();
        $r->print(<<ENDSUBM);         $r->print(<<ENDSUBM);
  <html>     $html
  <script type="text/javascript">       <!-- Generated by lonindexer.pm -->
        <head>
          <script type="text/javascript">
  function load() {   function load() {
  window.opener.document.forms["$ENV{'form.form'}"]   window.opener.document.forms["$ENV{'form.form'}"]
     .elements["$ENV{'form.element'}"]      .elements["$ENV{'form.element'}"]
Line 155  sub handler { Line 158  sub handler {
  $extra   $extra
  window.close();   window.close();
  }   }
     </script>            </script>
     <body onLoad=load();>       </head>
       <body onLoad="load();">
       </body>        </body>
     </html>      </html>
 ENDSUBM  ENDSUBM
Line 174  ENDSUBM Line 178  ENDSUBM
     $colspan=" colspan='2' ";      $colspan=" colspan='2' ";
             my $cl=&mt('Close');              my $cl=&mt('Close');
             $closebutton=<<END;              $closebutton=<<END;
 <input type="button" name="close" value='$cl' onClick="self.close()">  <input type="button" name="close" value='$cl' onClick="self.close()" />
 END  END
         }          }
  elsif ($ENV{'form.catalogmode'} eq 'groupimport') {   elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
Line 185  END Line 189  END
     my $cl=&mt('Close');      my $cl=&mt('Close');
             my $gi=&mt('Import');              my $gi=&mt('Import');
             $closebutton=<<END;              $closebutton=<<END;
 <input type="button" name="close" value='$cl' onClick="self.close()">  <input type="button" name="close" value='$cl' onClick="self.close()" />
 END  END
             $groupimportbutton=<<END;              $groupimportbutton=<<END;
 <input type="button" name="groupimport" value='$gi'  <input type="button" name="groupimport" value='$gi'
 onClick="javascript:select_group()">  onClick="javascript:select_group()" />
 END  END
         }          }
  # Additions made by Matthew to make the browser a little easier to deal   # Additions made by Matthew to make the browser a little easier to deal
Line 343  END Line 347  END
  }   }
   
 # ---------------------------------------------------------------- Print Header  # ---------------------------------------------------------------- Print Header
    my $html=&Apache::lonxml::xmlbegin();
  $r->print(<<ENDHEADER);   $r->print(<<ENDHEADER);
 <html>  $html
 <head>  <head>
 <title>The LearningOnline Network With CAPA Directory Browser</title>  <title>The LearningOnline Network With CAPA Directory Browser</title>
   
   <!-- Generated by lonindexer.pm -->
   
 <script type="text/javascript">  <script type="text/javascript">
 $catalogmodefunctions  $catalogmodefunctions
 function openWindow(url, wdwName, w, h, toolbar,scrollbar,locationbar) {  function openWindow(url, wdwName, w, h, toolbar,scrollbar,locationbar) {
Line 484  END Line 491  END
  (($ENV{'form.catalogmode'} eq 'groupimport')?   (($ENV{'form.catalogmode'} eq 'groupimport')?
  'document.forms.fileattr':'')).   'document.forms.fileattr':'')).
   &Apache::lonhtmlcommon::select_recent('residx','resrecent',    &Apache::lonhtmlcommon::select_recent('residx','resrecent',
 'this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();'));  'window.status=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();'));
 # -------------------------------------------------------- Resource Home Button  # -------------------------------------------------------- Resource Home Button
  my $reshome=$ENV{'course.'.$ENV{'request.course.id'}.'.reshome'};   my $reshome=$ENV{'course.'.$ENV{'request.course.id'}.'.reshome'};
  if ($reshome) {   if ($reshome) {
Line 502  END Line 509  END
  &Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri);   &Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri);
 # ----------------- output starting row to the indexed file/directory hierarchy  # ----------------- output starting row to the indexed file/directory hierarchy
         my $titleclr="#ddffff";          my $titleclr="#ddffff";
 #        $r->print(&initdebug());          #$r->print(&initdebug());
 #        $r->print(&writedebug("Omit:@Omit")) if (@Omit);          #$r->print(&writedebug("Omit:@Omit")) if (@Omit);
 #        $r->print(&writedebug("Only:@Only")) if (@Only);          #$r->print(&writedebug("Only:@Only")) if (@Only);
         $r->print("<table width='100\%' border=0><tr><td bgcolor=#777777>\n");          $r->print('<table width="100%" border="0"><tr><td bgcolor="#777777">'."\n");
  $r->print("<table width='100\%' border=0><tr bgcolor=$titleclr>\n");   $r->print('<table width="100%" border="0"><tr bgcolor="'.$titleclr.'">'."\n");
  $r->print("<td $colspan><b>".&mt('Name')."</b></td>\n");   $r->print("<td $colspan><b>".&mt('Name')."</b></td>\n");
  $r->print("<td><b>".&mt('Title')."</b></td>\n")    $r->print("<td><b>".&mt('Title')."</b></td>\n") 
     if ($hash{'display_attrs_0'} == 1);      if ($hash{'display_attrs_0'} == 1);
Line 584  END Line 591  END
   
 # ---------------------------- embed hidden information useful for group import  # ---------------------------- embed hidden information useful for group import
  $r->print("<form name='fnum'>");   $r->print("<form name='fnum'>");
  $r->print("<input type='hidden' name='fnum' value='$fnum'></form>");   $r->print("<input type='hidden' name='fnum' value='$fnum' /></form>");
   
 # -------------------------------------------------------------- end the tables  # -------------------------------------------------------------- end the tables
  $r->print('</table>');   $r->print('</table>');
Line 714  sub dynmetaread { Line 721  sub dynmetaread {
 }  }
   
 sub initdebug {  sub initdebug {
       my $html=&Apache::lonxml::xmlbegin();
     return <<ENDJS;      return <<ENDJS;
 <script>  <script>
 var debugging = true;  var debugging = true;
Line 726  function output(text) { Line 734  function output(text) {
         debuggingWindow.document.writeln(text);          debuggingWindow.document.writeln(text);
     }      }
 }  }
 output("<html><head><title>Debugging Window</title></head><body><pre>");     output('$html<head><title>Debugging Window</title><!-- for lonindexer.pm --></head><body><pre>');   
 </script>  </script>
 ENDJS  ENDJS
 }  }
Line 816  sub display_line { Line 824  sub display_line {
    'enctype="application/x-www-form-urlencoded"'.     'enctype="application/x-www-form-urlencoded"'.
                    '>'."\n");                     '>'."\n");
  $r->print ('<input type=hidden name=openuri value="'.   $r->print ('<input type=hidden name=openuri value="'.
    $startdir.'">'."\n");     $startdir.'" />'."\n");
  $r->print ('<input type="hidden" name="acts" value="">'."\n");   $r->print ('<input type="hidden" name="acts" value="" />'."\n");
  $r->print ('<input src="'.$iconpath.'arrow_up.gif"');   $r->print ('<input src="'.$iconpath.'arrow_up.gif"');
  $r->print (' name="'.$msg.'" height="22" type="image" border="0">'.   $r->print (' name="'.$msg.'" height="22" type="image" border="0" />'.
    "\n");     "\n");
  $r->print(&mt("Up")." $tabtag</tr></form>\n");   $r->print(&mt("Up")."</form> $tabtag</tr>\n");
  return OK;   return OK;
     }      }
 # Do we have permission to look at this?  # Do we have permission to look at this?
Line 833  sub display_line { Line 841  sub display_line {
   
 # display domain  # display domain
     if ($filecom[1] eq 'domain') {      if ($filecom[1] eq 'domain') {
   $r->print ('<input type="hidden" name="dirPointer" value="on">'."\n")    $r->print ('<input type="hidden" name="dirPointer" value="on" />'."\n")
      if ($ENV{'form.dirPointer'} eq "on");       if ($ENV{'form.dirPointer'} eq "on");
  $r->print("<tr valign='$valign' bgcolor=$fileclr>$extrafield");   $r->print("<tr valign='$valign' bgcolor=$fileclr>$extrafield");
  $r->print("<td>");   $r->print("<td>");
Line 841  sub display_line { Line 849  sub display_line {
  my $anchor = $filecom[0];   my $anchor = $filecom[0];
  $anchor =~ s/\///g;   $anchor =~ s/\///g;
  $r->print ('<a name="'.$anchor.'">');   $r->print ('<a name="'.$anchor.'">');
  $r->print ('<input type="hidden" name="acts" value="">');   $r->print ('<input type="hidden" name="acts" value="" />');
  $r->print ('<input src="'.$iconpath.'folder_pointer_'.   $r->print ('<input src="'.$iconpath.'folder_pointer_'.
    $diropen.'.gif"');      $diropen.'.gif"'); 
  $r->print (' name="'.$msg.'" height="22" type="image" border="0">'.   $r->print (' name="'.$msg.'" height="22" type="image" border="0" />'.
    "\n");     "\n");
  my $quotable_filecom = &javascript_escape($filecom[0]);   my $quotable_filecom = &Apache::loncommon::escape_single($filecom[0]);
  $r->print ('<a href="javascript:gothere(\''.$quotable_filecom.   $r->print ('<a href="javascript:gothere(\''.$quotable_filecom.
    '\')"><img src="'.$iconpath.'server.gif"');     '\')"><img src="'.$iconpath.'server.gif"');
  $r->print (' border="0" /></a>'."\n");   $r->print (' border="0" /></a>'."\n");
Line 855  sub display_line { Line 863  sub display_line {
     $r->print("(".$Apache::lonnet::domaindescription{$listname}.      $r->print("(".$Apache::lonnet::domaindescription{$listname}.
       ")");        ")");
  }   }
  $r->print (" $tabtag</tr></form>\n");   $r->print ("</form> $tabtag</tr>\n");
  return OK;   return OK;
   
 # display user directory  # display user directory
Line 869  sub display_line { Line 877  sub display_line {
  &begin_form ($r,$curdir);   &begin_form ($r,$curdir);
  $r->print ('<a name="'.$anchor.'"><img src="'.$iconpath.   $r->print ('<a name="'.$anchor.'"><img src="'.$iconpath.
    'whitespace1.gif" border="0" />'."\n");     'whitespace1.gif" border="0" />'."\n");
  $r->print ('<input type="hidden" name="acts" value="">');   $r->print ('<input type="hidden" name="acts" value="" />');
  $r->print ('<input src="'.$iconpath.'folder_pointer_'.$diropen.   $r->print ('<input src="'.$iconpath.'folder_pointer_'.$diropen.
    '.gif"');      '.gif"'); 
  $r->print (' name="'.$msg.'" height="22" type="image" border="0">'.   $r->print (' name="'.$msg.'" height="22" type="image" border="0" />'.
    "\n");     "\n");
  my $quotable_curdir = &javascript_escape($curdir);   my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
  $r->print ('<a href="javascript:gothere(\''.$quotable_curdir   $r->print ('<a href="javascript:gothere(\''.$quotable_curdir
    .'\')"><img src='.     .'\')"><img src='.
    $iconpath.'quill.gif border="0" name="'.$msg.     $iconpath.'quill.gif border="0" name="'.$msg.
Line 883  sub display_line { Line 891  sub display_line {
  my $plainname=&Apache::loncommon::plainname($listname,$domain);   my $plainname=&Apache::loncommon::plainname($listname,$domain);
  $r->print ($listname);   $r->print ($listname);
  if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }   if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }
  $r->print ($tabtag.'</tr></form>'."\n");   $r->print ('</form>'.$tabtag.'</tr>'."\n");
  return OK;   return OK;
     }      }
   
Line 902  sub display_line { Line 910  sub display_line {
         }          }
  # Set the icon for the file   # Set the icon for the file
  my $iconname = &Apache::loncommon::icon($listname);   my $iconname = &Apache::loncommon::icon($listname);
  $r->print("<tr valign='$valign' bgcolor=$fileclr><td nowrap='1' align='top'>");   $r->print("<tr valign='$valign' bgcolor=$fileclr><td nowrap='nowrap' valign='top'>");
   
         if ($ENV{'form.catalogmode'} eq 'interactive') {          if ($ENV{'form.catalogmode'} eq 'interactive') {
     my $quotable_filelink = &javascript_escape($filelink);      my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
             $r->print("<a href=\"javascript:select_data(\'",              $r->print("<a href=\"javascript:select_data(\'",
                       $quotable_filelink,"')\">");                        $quotable_filelink,"')\">");
     $r->print("<img src='",$iconpath,"select.gif' border='0' /></a>".      $r->print("<img src='",$iconpath,"select.gif' border='0' /></a>".
Line 919  sub display_line { Line 927  sub display_line {
     if ($hash{'store_'.$filelink}) {      if ($hash{'store_'.$filelink}) {
  $r->print("checked");   $r->print("checked");
     }      }
     $r->print(">\n");      $r->print(" />\n");
     $r->print("</form>\n");      $r->print("</form>\n");
     $r->print("</td><td nowrap>");      $r->print("</td><td nowrap>");
     $hash{"pre_${fnum}_link"}=$filelink;      $hash{"pre_${fnum}_link"}=$filelink;
Line 954  sub display_line { Line 962  sub display_line {
     my $curdir = $startdir.$filecom[0].'/';      my $curdir = $startdir.$filecom[0].'/';
     my $anchor = $curdir;      my $anchor = $curdir;
     $anchor =~ s/\///g;      $anchor =~ s/\///g;
     $r->print ('<input type="hidden" name="acts" value="">');      $r->print ('<input type="hidden" name="acts" value="" />');
     $r->print ('<a name="'.$anchor.'"><input src="'.$iconpath.      $r->print ('<a name="'.$anchor.'"><input src="'.$iconpath.
        'folder_pointer_'.$diropen.'.gif"');         'folder_pointer_'.$diropen.'.gif"');
     $r->print (' name="'.$msg.'" height="22" type="image" border="0">'.      $r->print (' name="'.$msg.'" height="22" type="image" border="0" />'.
        "\n");         "\n");
  }   }
 # Filetype icons  # Filetype icons
Line 966  sub display_line { Line 974  sub display_line {
  if ($filelink=~/\.(page|sequence)$/) {   if ($filelink=~/\.(page|sequence)$/) {
     $r->print('</form>');      $r->print('</form>');
  }   }
  my $quotable_filelink = &javascript_escape($filelink);   my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
   
   
  $r->print (" <a href=\"javascript:openWindow('".$quotable_filelink.   $r->print (" <a href=\"javascript:openWindow('".$quotable_filelink.
Line 1033  sub display_line { Line 1041  sub display_line {
     my $source = &Apache::lonnet::metadata($filelink,'sourceavail');      my $source = &Apache::lonnet::metadata($filelink,'sourceavail');
     if($source eq 'open') {      if($source eq 'open') {
  my $sourcelink = &Apache::lonsource::make_link($filelink,$listname);   my $sourcelink = &Apache::lonsource::make_link($filelink,$listname);
  my $quotable_sourcelink = &javascript_escape($sourcelink);   my $quotable_sourcelink = &Apache::loncommon::escape_single($sourcelink);
  $r->print('<td>'."<a href=\"javascript:openWindow('"   $r->print('<td>'."<a href=\"javascript:openWindow('"
   .$quotable_sourcelink.    .$quotable_sourcelink.
   "', 'previewsource', '700', '700', 'no', 'yes','yes')\";".    "', 'previewsource', '700', '700', 'no', 'yes','yes')\";".
Line 1107  sub display_line { Line 1115  sub display_line {
     $r->print ("<img src=",$iconpath,"whitespace",$rem,      $r->print ("<img src=",$iconpath,"whitespace",$rem,
        ".gif border='0' />\n") if $rem > 0;         ".gif border='0' />\n") if $rem > 0;
  }   }
  $r->print ('<input type="hidden" name="acts" value="">');   $r->print ('<input type="hidden" name="acts" value="" />');
  $r->print ('<a name="'.$anchor.'"><input src="'.$iconpath.   $r->print ('<a name="'.$anchor.'"><input src="'.$iconpath.
    'folder_pointer_'.$diropen.'.gif"');     'folder_pointer_'.$diropen.'.gif"');
  $r->print (' name="'.$msg.'" height="22" type="image" border="0">'.   $r->print (' name="'.$msg.'" height="22" type="image" border="0" />'.
    "\n");     "\n");
  my $quotable_curdir = &javascript_escape($curdir);   my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
  $r->print ('<a href="javascript:gothere(\''   $r->print ('<a href="javascript:gothere(\''
    .$quotable_curdir.'\')"><img src="'.     .$quotable_curdir.'\')"><img src="'.
    $iconpath.'folder_'.$diropen.'.gif" border="0" /></a>'.     $iconpath.'folder_'.$diropen.'.gif" border="0" /></a>'.
Line 1192  sub begin_form { Line 1200  sub begin_form {
        '" onSubmit="return rep_dirpath(\''.$dnum.'\''.         '" onSubmit="return rep_dirpath(\''.$dnum.'\''.
        ',document.forms.fileattr.acts.value)" '.         ',document.forms.fileattr.acts.value)" '.
        'enctype="application/x-www-form-urlencoded">'."\n");         'enctype="application/x-www-form-urlencoded">'."\n");
     $r->print ('<input type="hidden" name="openuri" value="'.$uri.'">'.      $r->print ('<input type="hidden" name="openuri" value="'.$uri.'" />'.
        "\n");         "\n");
     $r->print ('<input type="hidden" name="dirPointer" value="on">'."\n");      $r->print ('<input type="hidden" name="dirPointer" value="on" />'."\n");
     $dnum++;      $dnum++;
 }  }
   
Line 1233  sub cleanup { Line 1241  sub cleanup {
 }  }
   
   
 #  
 #    Escapes strings that may have embedded 's that will be put into  
 #    javascript strings as 'strings'.  
 #    The assumptions are:  
 #       There has been no effort to escape ' with \'  
 #       Any \'s in the string are intended to be there as part of the URL  
 #        and must also be escaped.  
 # Parameters:  
 #     input     - The string to escape.  
 # Returns:  
 #     The escaped string (' replaced by \' and \ replaced by \\).  
 #  
 sub javascript_escape {  
     my ($input) = @_;  
   
     #  I imagine a regexp wizard could combine the two expressions below.  
     #  If you do you might want to comment the result.  
   
     $input =~ s/\\/\\\\/g; # Escape the /'s..(must be first)>  
     $input =~ s/\'/\\\'/g; # Esacpe the 's....  
   
     return $input;  
 }  
   
   
   
Removed from v.1.126  
changed lines
  Added in v.1.131

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