From ff163576983f44e6e06c48a8bdfec361380acddb Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Fri, 3 Aug 2007 17:23:05 -0500 Subject: [PATCH] Perltidy and conflict resolve --- about.pl | 2 -- help.pl | 79 ++++++++++++++++++++++++++++++-------------------------- 2 files changed, 42 insertions(+), 39 deletions(-) diff --git a/about.pl b/about.pl index 35a1a95ff8..99b9fd55d5 100755 --- a/about.pl +++ b/about.pl @@ -55,8 +55,6 @@ $template->param( apacheVersion => $apacheVersion, zebraVersion => $zebraVersion, ); - - my @component_names = qw/MARC::File::XML MARC::Charset Class::Accessor LWP::Simple XML::Simple Net::Z3950 diff --git a/help.pl b/help.pl index 0917f9b15d..0a76f6eb17 100755 --- a/help.pl +++ b/help.pl @@ -2,26 +2,26 @@ # Copyright 2006 Katipo Communications # -# 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, +# 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 - use strict; require Exporter; -use C4::Output; # contains gettemplate +use C4::Output; # contains gettemplate use C4::Output; + # use C4::Auth; use C4::Context; use CGI; @@ -30,40 +30,45 @@ 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 ($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"]); + 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; + # XXX temporary patch for Bug 182 for themelang + $template->param( + themelang => '/intranet-tmpl' . "/$theme/$lang", + interface => '/intranet-tmpl', + theme => $theme, + lang => $lang + ); + return $template; } -- 2.39.5