View | Details | Raw Unified | Return to bug 7038
Collapse All | Expand All

(-)a/edithelp.pl (-6 / +4 lines)
Lines 97-110 elsif ( $type eq 'modify' ) { Link Here
97
	} else {
97
	} else {
98
		(-w $file) or $error = 
98
		(-w $file) or $error = 
99
			"WARNING: You will not be able save, because your webserver cannot write to '$file'. Contact your admin about help file permissions.";
99
			"WARNING: You will not be able save, because your webserver cannot write to '$file'. Contact your admin about help file permissions.";
100
    	open (INFILE, $file) or die "Cannot read file '$file'";		# unlikely death, since we just checked
100
    	open (my $fh, '<', $file) or die "Cannot read file '$file'";		# unlikely death, since we just checked
101
		my $help = '';
101
		my $help = '';
102
		while ( my $inp = <INFILE> ) {
102
        while ( <$fh> ) {
103
			unless ( $inp =~ /INCLUDE/ ) {
103
            $help .= /\[% INCLUDE .* %\](.*)$/ ? $1 : $_;
104
				$help .= $inp;
105
			}
106
		}
104
		}
107
		close INFILE;
105
		close $fh;
108
    	$template->param( 'help' => $help );
106
    	$template->param( 'help' => $help );
109
		$type = 'save';
107
		$type = 'save';
110
	}
108
	}
(-)a/help.pl (-10 / +3 lines)
Lines 32-46 our $refer = $query->param('url'); Link Here
32
$refer = $query->referer()  if !$refer || $refer eq 'undefined';
32
$refer = $query->referer()  if !$refer || $refer eq 'undefined';
33
33
34
$refer =~ /koha\/(.*)\.pl/;
34
$refer =~ /koha\/(.*)\.pl/;
35
my $from = "modules/help/$1.tt";
35
my $from = "help/$1.tt";
36
36
37
my $htdocs = C4::Context->config('intrahtdocs');
37
my $template = C4::Templates::gettemplate($from, 'intranet', $query);
38
my ( $theme, $lang ) = C4::Templates::themelanguage( $htdocs, $from, "intranet", $query );
39
unless ( -e "$htdocs/$theme/$lang/$from" ) {
40
    $from = "modules/help/nohelp.tt";
41
    ( $theme, $lang ) = C4::Templates::themelanguage( $htdocs, $from, "intranet", $query );
42
}
43
my $template = C4::Templates->new('intranet', "$htdocs/$theme/$lang/$from");
44
$template->param( referer => $refer );
38
$template->param( referer => $refer );
45
39
46
output_html_with_http_headers $query, "", $template->output;
40
output_html_with_http_headers $query, "", $template->output;
47
- 

Return to bug 7038