X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=help.pl;h=58354b0b4329aeb423c1098abb04bc4942f77e33;hb=bbe37ed54f0129eeb8d72eee1328ab24797894ed;hp=b2f74826634c2a7f647e5b619427c051b2eaf311;hpb=a502aa1c76029927d1c3403b2430c86d75acf7c0;p=koha.git

diff --git a/help.pl b/help.pl
index b2f7482663..58354b0b43 100755
--- a/help.pl
+++ b/help.pl
@@ -1,9 +1,26 @@
 #!/usr/bin/perl
-use HTML::Template::Pro;
-use strict;
-require Exporter;
-use C4::Output;    # contains gettemplate
 
+# Copyright 2010 Koha Development team
+#
+# 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.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+use strict;
+use warnings;
+use C4::Templates;
+use C4::Output;
 # use C4::Auth;
 use C4::Context;
 use CGI;
@@ -11,50 +28,18 @@ 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');
-if ($referurl) {
-    $refer = $query->param('url');
-}
+$refer =~ /koha\/(.*)\.pl/;
+my $from = "modules/help/$1.tt";
 
-$refer =~ /.*koha\/(.*)\.pl.*/;
-my $from = "modules/help/$1.tmpl";
-
-my $template = gethelptemplate( $from, "intranet" );
+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 );
+}
+my $template = C4::Templates->new('intranet', "$htdocs/$theme/$lang/$from");
 
-# my $template
 output_html_with_http_headers $query, "", $template->output;
 
-sub gethelptemplate {
-    my ($tmplbase) = @_;
-
-    my $htdocs;
-    $htdocs = C4::Context->config('intrahtdocs');
-    my ( $theme, $lang ) = themelanguage( $htdocs, $tmplbase, "intranet" );
-    unless ( -e "$htdocs/$theme/$lang/$tmplbase" ) {
-        $tmplbase = "modules/help/nohelp.tmpl";
-        ( $theme, $lang ) = themelanguage( $htdocs, $tmplbase, "intranet" );
-    }
-    my $template = HTML::Template->new(
-        filename          => "$htdocs/$theme/$lang/$tmplbase",
-        die_on_bad_params => 0,
-        global_vars       => 1,
-        path              => ["$htdocs/$theme/$lang/includes"]
-    );
-
-    # XXX temporary patch for Bug 182 for themelang
-    $template->param(
-        themelang => '/intranet-tmpl' . "/$theme/$lang",
-        interface => '/intranet-tmpl',
-        theme     => $theme,
-        lang      => $lang,
-        intranetcolorstylesheet =>
-          C4::Context->preference("intranetcolorstylesheet"),
-        intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-        IntranetNav        => C4::Context->preference("IntranetNav"),
-        referer            => $refer,
-    );
-    return $template;
-}