From ebb3697a4dc4b14c1956222dcb89bb7809a7b6fe Mon Sep 17 00:00:00 2001 From: Joshua Ferraro Date: Thu, 30 Aug 2007 14:59:05 -0500 Subject: [PATCH] perltidy help.pl Signed-off-by: Chris Cormack --- help.pl | 66 +++++++++++++++++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/help.pl b/help.pl index 7c0743df09..5568207688 100755 --- a/help.pl +++ b/help.pl @@ -2,7 +2,8 @@ use HTML::Template; use strict; require Exporter; -use C4::Output; # contains gettemplate +use C4::Output; # contains gettemplate + # use C4::Auth; use C4::Context; use CGI; @@ -10,45 +11,50 @@ use CGI; my $query = new CGI; # find the script that called the online help using the CGI referer() -my $refer = $query->referer(); +my $refer = $query->referer(); + # workaround for popup not functioning correctly in IE my $referurl = $query->param('url'); -if($referurl){ +if ($referurl) { $refer = $query->param('url'); } $refer =~ /.*koha\/(.*)\.pl.*/; my $from = "help/$1.tmpl"; -my $template = gethelptemplate($from,"intranet"); +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, - intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"), - intranetstylesheet => C4::Context->preference("intranetstylesheet"), - IntranetNav => C4::Context->preference("IntranetNav"), - referer => $refer, - ); - return $template; + 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; } -- 2.39.5