X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=help.pl;h=9216253955401c44ff5eef0703900f8a2860079a;hb=7c9760f82e3584bec6ee5ecc8460cd55997a43f7;hp=f36e9d2708bf39dce6946b1854b817908d47f19c;hpb=a6c9bd0eb55c32d5632625144775271f20aa15f7;p=koha-ffzg.git

diff --git a/help.pl b/help.pl
index f36e9d2708..9216253955 100755
--- a/help.pl
+++ b/help.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright 2010 Koha Development team
+# Copyright 2017 Koha Development team
 #
 # This file is part of Koha.
 #
@@ -17,57 +17,31 @@
 # You should have received a copy of the GNU General Public License
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-use warnings;
-use C4::Templates;
-use C4::Output;
-# use C4::Auth;
-use C4::Context;
+use Modern::Perl;
 use CGI qw ( -utf8 );
 
-sub _help_template_file_of_url {
-    my $url = shift;
-    my $file;
-    if ($url =~ /koha\/(.*)\.pl/) {
-        $file = $1;
-    } else {
-        $file = 'mainpage';
+use C4::Auth qw( get_template_and_user );
+use C4::Context;
+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,
-    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-    intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-);
 
-my $help_version = C4::Context->preference("Version");
-if ( $help_version =~ m|^(\d+)\.(\d{2}).*$| ) {
-    my $version = $1;
-    my $major = $2;
-    if ( $major % 2 ) { $major-- };
-    $help_version = "$version.$major";
-}
-$template->param( helpVersion => $help_version );
+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);