X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=help.pl;h=9216253955401c44ff5eef0703900f8a2860079a;hb=17e20f4ec4a1674a2faac9df9ad5231ffd9ddaf1;hp=f641fe6aff9710c83a3050b31956e612baa9e19b;hpb=b764c1ee81728ce5007b89e28b8703742d202375;p=koha-ffzg.git

diff --git a/help.pl b/help.pl
index f641fe6aff..9216253955 100755
--- a/help.pl
+++ b/help.pl
@@ -1,60 +1,47 @@
 #!/usr/bin/perl
 
-# Copyright 2010 Koha Development team
+# 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 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.
+# 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;
+# 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 C4::Auth qw( get_template_and_user );
 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';
+use Koha::Manual;
+
+my $query = CGI->new;
+
+# 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,
     }
-    $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');
-
-#
-# 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 );
-}
 
-my $template = C4::Templates::gettemplate($from, 'intranet', $query);
-$template->param( referer => $refer );
+my $language = C4::Languages::getlanguage( $query );
+my $manual_url = Koha::Manual::get_url($refer, $language);
 
-output_html_with_http_headers $query, "", $template->output;
+print $query->redirect($manual_url);