gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Perltidy and conflict resolve

This commit is contained in:
Chris Cormack 2007-08-03 17:23:05 -05:00
parent 34d82eda22
commit ff16357698
2 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
about.pl
View File

@ -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

79
help.pl
View File

@ -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;
}