version 1.29, 2006/06/30 03:50:02
|
version 1.32, 2006/07/18 21:55:24
|
Line 58 sub processLabelName {
|
Line 58 sub processLabelName {
|
# Serve out the text |
# Serve out the text |
sub servetext { |
sub servetext { |
my ($r,$text) = @_; |
my ($r,$text) = @_; |
my $bugs=&Apache::loncommon::help_open_bug('Documentation'); |
my $bugs=&Apache::loncommon::help_open_bug('Documentation','Report a documentation bug'); |
|
my $morehelp;#=&Apache::loncommon::help_open_menu(undef,undef,1,undef,undef,undef,undef,'Help and Assistance Menu'); |
my $start_page= |
my $start_page= |
&Apache::loncommon::start_page('LON-CAPA Help',undef, |
&Apache::loncommon::start_page('LON-CAPA Help',undef, |
{'only_body' => 1,}); |
{'only_body' => 1,}); |
Line 68 sub servetext {
|
Line 69 sub servetext {
|
$r->print(<<HEADER); |
$r->print(<<HEADER); |
$start_page |
$start_page |
<h3 style="font: sans-serif"><img align="right" alt="help logo" |
<h3 style="font: sans-serif"><img align="right" alt="help logo" |
src="/adm/help/gif/lonhelpheader.gif"/>$header</h3><hr />$bugs |
src="/adm/help/gif/lonhelpheader.gif"/>$header</h3><hr /> |
<!-- BEGIN --> |
<!-- BEGIN --> |
HEADER |
HEADER |
|
|
Line 76 HEADER
|
Line 77 HEADER
|
|
|
if (&Apache::lonnavmaps::advancedUser()) { |
if (&Apache::lonnavmaps::advancedUser()) { |
my $search=&mt('Search LON-CAPA help'); |
my $search=&mt('Search LON-CAPA help'); |
my $about=&mt('About LON-CAPA help and More Help'); |
|
my $query=&mt('Search'); |
my $query=&mt('Search'); |
my $uri = $r->uri; |
my $uri = $r->uri; |
$r->print(<<FOOTER); |
$r->print(<<FOOTER); |
Line 84 HEADER
|
Line 84 HEADER
|
$search: <input type="text" name="searchterm" size="40" /><input type="submit" value="$query" /> |
$search: <input type="text" name="searchterm" size="40" /><input type="submit" value="$query" /> |
</form> |
</form> |
<br /> |
<br /> |
<a href="/adm/help/abouthelp.html">$about</a> |
$bugs |
|
$morehelp |
FOOTER |
FOOTER |
|
|
} |
} |
Line 111 sub render {
|
Line 112 sub render {
|
# absolute paths for use with help.loncapa.org |
# absolute paths for use with help.loncapa.org |
$tex =~ s| \\ref\{([^}]*)\} |
$tex =~ s| \\ref\{([^}]*)\} |
| |
| |
if (not(exists($fragmentLabels{$1}))) { |
my $label=$1; |
&Apache::lonnet::logthis("ERROR: $1 not a valid help label"); |
if ($1!~/\.hlp$/) { |
}; |
if ((!exists($fragmentLabels{$1})) && ($1!~/\.hlp$/)) { |
|
&Apache::lonnet::logthis("ERROR: $1 not a valid help label"); |
|
$label='Error'; |
|
} else { |
|
$label=substr($fragmentLabels{$1}, 0, -4); |
|
} |
|
} else { |
|
$label=~s/\.hlp$//; |
|
} |
'\\begin{html}<a href="http://' . $serverroot ."/adm/help/". |
'\\begin{html}<a href="http://' . $serverroot ."/adm/help/". |
substr($fragmentLabels{$1}, 0, -4) . |
$label . |
'.hlp#' . &processLabelName($1) . |
'.hlp#' . &processLabelName($1) . |
'"><img src="http://' . $serverroot . '/adm/help/gif/smallHelp.gif" border="0" /></a>' . |
'"><img src="http://' . $serverroot . '/adm/help/gif/smallHelp.gif" border="0" /></a>' . |
'\\end{html}' |
'\\end{html}' |
Line 204 sub handler {
|
Line 213 sub handler {
|
$text=&listmatches($docroot,$env{'form.searchterm'}); |
$text=&listmatches($docroot,$env{'form.searchterm'}); |
} |
} |
} else { |
} else { |
my $filenames = &unescape(substr ($ENV{'REQUEST_URI'} , |
my $filenames = &unescape(substr($ENV{'REQUEST_URI'} , |
rindex($ENV{'REQUEST_URI'}, '/') + 1, -4)); |
rindex($ENV{'REQUEST_URI'}, '/') + 1, -4)); |
|
|
# Security check on the file; the whole filename must consist |
# Security check on the file; the whole filename must consist |
# of nothing but alphanums, ' ,, or ., or the file |
# of nothing but alphanums, ' ,, or ., or the file |