Bug 4320 : Text::CSV::Encoded

[koha.git] / help.pl

diff --git a/help.pl b/help.pl
index 0a76f6e..ff02bd9 100755 (executable)
--- a/help.pl
+++ b/help.pl
@@ -1,27 +1,9 @@
 #!/usr/bin/perl
 
-# Copyright 2006 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
 use strict;
-require Exporter;
-use C4::Output;    # contains gettemplate
-use C4::Output;
+use HTML::Template::Pro;
 
+use C4::Output;    # contains gettemplate
 # use C4::Auth;
 use C4::Context;
 use CGI;
@@ -29,8 +11,7 @@ use CGI;
 my $query = new CGI;
 
 # find the script that called the online help using the CGI referer()
-
-my $refer = $query->referer();
+our $refer = $query->referer();
 
 # workaround for popup not functioning correctly in IE
 my $referurl = $query->param('url');
@@ -39,7 +20,7 @@ if ($referurl) {
 }
 
 $refer =~ /.*koha\/(.*)\.pl.*/;
-my $from = "help/$1.tmpl";
+my $from = "modules/help/$1.tmpl";
 
 my $template = gethelptemplate( $from, "intranet" );
 
@@ -51,12 +32,12 @@ sub gethelptemplate {
 
     my $htdocs;
     $htdocs = C4::Context->config('intrahtdocs');
-    my ( $theme, $lang ) = themelanguage( $htdocs, $tmplbase, "intranet" );
+    my ( $theme, $lang ) = themelanguage( $htdocs, $tmplbase, "intranet", $query );
     unless ( -e "$htdocs/$theme/$lang/$tmplbase" ) {
-        $tmplbase = "help/nohelp.tmpl";
-        ( $theme, $lang ) = themelanguage( $htdocs, $tmplbase, "intranet" );
+        $tmplbase = "modules/help/nohelp.tmpl";
+        ( $theme, $lang ) = themelanguage( $htdocs, $tmplbase, "intranet", $query );
     }
-    my $template = HTML::Template->new(
+    my $template = HTML::Template::Pro->new(
         filename          => "$htdocs/$theme/$lang/$tmplbase",
         die_on_bad_params => 0,
         global_vars       => 1,
@@ -68,7 +49,13 @@ sub gethelptemplate {
         themelang => '/intranet-tmpl' . "/$theme/$lang",
         interface => '/intranet-tmpl',
         theme     => $theme,
-        lang      => $lang
+        lang      => $lang,
+        intranetcolorstylesheet =>
+          C4::Context->preference("intranetcolorstylesheet"),
+        intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+        IntranetNav        => C4::Context->preference("IntranetNav"),
+               yuipath => (C4::Context->preference("yuipath") eq "local"?"/intranet-tmpl/$theme/$lang/lib/yui":C4::Context->preference("yuipath")),
+        referer            => $refer,
     );
     return $template;
 }