X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=help.pl;h=fde99d9dda4d1c9a35ac1003f1ae9d4410f7555d;hb=54616c37e25b969907f9da2cf021e7e23ced836c;hp=58354b0b4329aeb423c1098abb04bc4942f77e33;hpb=700249eb3cbf765a5a731effd21ba543b74eb334;p=koha.git

diff --git a/help.pl b/help.pl
index 58354b0b43..fde99d9dda 100755
--- a/help.pl
+++ b/help.pl
@@ -25,21 +25,40 @@ use C4::Output;
 use C4::Context;
 use CGI;
 
+sub _help_template_file_of_url {
+    my $url = shift;
+    my $file;
+    if ($url =~ /koha\/(.*)\.pl/) {
+        $file = $1;
+    } else {
+        $file = 'mainpage';
+    }
+    $file =~ s/[^a-zA-Z0-9_\-\/]*//g;
+    return "help/$file.tt";
+}
+
 my $query = new CGI;
 
 # find the script that called the online help using the CGI referer()
-our $refer = $query->referer();
-
-$refer =~ /koha\/(.*)\.pl/;
-my $from = "modules/help/$1.tt";
-
+our $refer = $query->param('url');
+$refer = $query->referer()  if !$refer || $refer eq 'undefined';
+my $from = _help_template_file_of_url($refer);
 my $htdocs = C4::Context->config('intrahtdocs');
-my ( $theme, $lang ) = themelanguage( $htdocs, $from, "intranet", $query );
-unless ( -e "$htdocs/$theme/$lang/$from" ) {
-    $from = "modules/help/nohelp.tt";
-    ( $theme, $lang ) = themelanguage( $htdocs, $from, "intranet", $query );
+
+#
+# checking that the help file exist, otherwise, display nohelp.tt page
+#
+my ( $theme, $lang ) = C4::Templates::themelanguage( $htdocs, $from, "intranet", $query );
+unless ( -e "$htdocs/$theme/$lang/modules/$from" ) {
+    $from = "help/nohelp.tt";
+    ( $theme, $lang ) = C4::Templates::themelanguage( $htdocs, $from, "intranet", $query );
 }
-my $template = C4::Templates->new('intranet', "$htdocs/$theme/$lang/$from");
 
-output_html_with_http_headers $query, "", $template->output;
+my $template = C4::Templates::gettemplate($from, 'intranet', $query);
+$template->param(
+    referer => $refer,
+    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+    intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+);
 
+output_html_with_http_headers $query, "", $template->output;