X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;ds=sidebyside;f=help.pl;h=18d27ddee47f2161f11280f8fe9b19ad0c0091ac;hb=16f1fffdd1f5d1c97db0bf664f83496864b7e24d;hp=39b93d17fb9cf538212eb26ab3d9348e4af2ce1d;hpb=13e77ca7c32bf9dd20fde00aee7b7a3d99f318bb;p=srvgit

diff --git a/help.pl b/help.pl
index 39b93d17fb..18d27ddee4 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,14 @@ use CGI;
 my $query = new CGI;
 
 # find the script that called the online help using the CGI referer()
-my $refer = $query->referer();
-
-# workaround for popup not functioning correctly in IE
-my $referurl = $query->param('url');
-if ($referurl) {
-    $refer = $query->param('url');
-}
+our $refer = $query->param('url');
+$refer = $query->referer()  if !$refer || $refer eq 'undefined';
 
-$refer =~ /.*koha\/(.*)\.pl.*/;
-my $from = "modules/help/$1.tmpl";
+$refer =~ /koha\/(.*)\.pl/;
+my $from = "help/$1.tt";
 
-my $template = gethelptemplate( $from, "intranet" );
+my $template = C4::Templates::gettemplate($from, 'intranet', $query);
+$template->param( referer => $refer );
 
-# 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", $query );
-    unless ( -e "$htdocs/$theme/$lang/$tmplbase" ) {
-        $tmplbase = "modules/help/nohelp.tmpl";
-        ( $theme, $lang ) = themelanguage( $htdocs, $tmplbase, "intranet", $query );
-    }
-    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;
-}