X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=help.pl;h=fde99d9dda4d1c9a35ac1003f1ae9d4410f7555d;hb=d4ad282e91f034d992e0f726ed256a0ddbf6b20f;hp=0917f9b15d468c7018971b83aaff5f94438c01ce;hpb=100e6a9808ead4ee8d951da59ead1550e75bb4c3;p=koha.git

diff --git a/help.pl b/help.pl
index 0917f9b15d..fde99d9dda 100755
--- a/help.pl
+++ b/help.pl
@@ -1,69 +1,64 @@
 #!/usr/bin/perl
 
-# Copyright 2006 Katipo Communications
+# 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., 59 Temple Place,   
-# Suite 330, Boston, MA  02111-1307 USA
-
+# 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;
 
+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->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 $refer  = $query->referer();
-# workaround for popup not functioning correctly in IE
-my $referurl = $query->param('url');
-if($referurl){
-    $refer = $query->param('url');
+#
+# 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 );
 }
 
-$refer =~ /.*koha\/(.*)\.pl.*/;
-my $from = "help/$1.tmpl";
+my $template = C4::Templates::gettemplate($from, 'intranet', $query);
+$template->param(
+    referer => $refer,
+    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+    intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+);
 
-my $template = gethelptemplate($from,"intranet");
-# 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="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);
-	return $template;
-}