X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=help.pl;h=9216253955401c44ff5eef0703900f8a2860079a;hb=075ef09f48b66df7766c22e1c9ecf1d3cf7a039a;hp=3994157c9658773de97ac485237f69e21615a7b4;hpb=49c66d7d4e8ea46f6b1bf531cd90986408fb41f9;p=srvgit

diff --git a/help.pl b/help.pl
index 3994157c96..9216253955 100755
--- a/help.pl
+++ b/help.pl
@@ -1,69 +1,47 @@
 #!/usr/bin/perl
 
-# Copyright 2006 Katipo Communications
+# Copyright 2017 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 3 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, see <http://www.gnu.org/licenses>.
 
+use Modern::Perl;
+use CGI qw ( -utf8 );
 
-use strict;
-require Exporter;
-use C4::Output;  # contains gettemplate
-use C4::Interface::CGI::Output;
-# use C4::Auth;
+use C4::Auth qw( get_template_and_user );
 use C4::Context;
-use CGI;
+use Koha::Manual;
 
-my $query = new CGI;
-
-# find the script that called the online help using the CGI referer()
+my $query = CGI->new;
 
-my $refer  = $query->referer();
-# workaround for popup not functioning correctly in IE
-my $referurl = $query->param('url');
-if($referurl){
-    $refer = $query->param('url');
-}
+# We need to call get_template_and_user to let it does the job correctly
+# for the language
+my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
+    {
+        template_name   => "intranet-main.tt", # Just a valid template path
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 1,
+    }
+);
 
-$refer =~ /.*koha\/(.*)\.pl.*/;
-my $from = "help/$1.tmpl";
-
-my $template = gethelptemplate($from,"intranet");
-# my $template
-output_html_with_http_headers $query, "", $template->output;
-
-
-sub gethelptemplate {
-	my ($tmplbase) = @_;
+# 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 $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"]);
+my $language = C4::Languages::getlanguage( $query );
+my $manual_url = Koha::Manual::get_url($refer, $language);
 
-	# XXX temporary patch for Bug 182 for themelang
-	$template->param(themelang => '/intranet-tmpl' . "/$theme/$lang",
-							interface => '/intranet-tmpl',
-							theme => $theme,
-							lang => $lang);
-	return $template;
-}
+print $query->redirect($manual_url);