Bug 5549 : Fix a couple of date issues from testing

[koha.git] / help.pl

diff --git a/help.pl b/help.pl
index 7c0743d..97f3462 100755 (executable)
--- a/help.pl
+++ b/help.pl
@@ -1,8 +1,26 @@
 #!/usr/bin/perl
-use HTML::Template;
+
+# 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;
-require Exporter;
-use C4::Output;  # contains gettemplate
+use warnings;
+use C4::Templates;
+use C4::Output;
 # use C4::Auth;
 use C4::Context;
 use CGI;
@@ -10,45 +28,16 @@ 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');
-}
-
-$refer =~ /.*koha\/(.*)\.pl.*/;
-my $from = "help/$1.tmpl";
-
-my $template = gethelptemplate($from,"intranet");
-# my $template
-output_html_with_http_headers $query, "", $template->output;
+our $refer = $query->param('url');
+$refer = $query->referer()  if !$refer || $refer eq 'undefined';
 
+$refer =~ /koha\/(.*)\.pl/;
+my $file = $1;
+$file =~ s/[^a-zA-Z0-9_\-\/]*//g;
+my $from = "help/$file.tt";
+
+my $template = C4::Templates::gettemplate($from, 'intranet', $query);
+$template->param( referer => $refer );
+
+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="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;
-}