Attachment #10455 for bug #8301

View | Details | Raw Unified | Return to bug 8301
Collapse All | Expand All

Lines 60-65 $apacheVersion = `httpd2 -v` unless $apacheVersion; Link Here

(-)a/about.pl (+18 lines)
60	$apacheVersion = (`/usr/sbin/apache2 -V`)[0] unless $apacheVersion;	60	$apacheVersion = (`/usr/sbin/apache2 -V`)[0] unless $apacheVersion;
61	my $zebraVersion = `zebraidx -V`;	61	my $zebraVersion = `zebraidx -V`;
62		62
		63	# Additional system information for warnings
		64	my $prefNoZebra = C4::Context->preference('nozebra');
		65	my $prefAutoCreateAuthorities = C4::Context->preference('AutoCreateAuthorities');
		66	my $prefBiblioAddsAuthorities = C4::Context->preference('BiblioAddsAuthorities');
		67	my $warnPrefBiblioAddsAuthorities = ( $prefAutoCreateAuthorities && ( !$prefBiblioAddsAuthorities) );
		68
		69	my $prefEasyAnalyticalRecords = C4::Context->preference('EasyAnalyticalRecords');
		70	my $prefUseControlNumber = C4::Context->preference('UseControlNumber');
		71	my $warnPrefEasyAnalyticalRecords = ( $prefEasyAnalyticalRecords && $prefUseControlNumber );
		72
		73	my $errZebraConnection = C4::Context->Zconn("biblioserver",0)->errcode();
		74
63	$template->param(	75	$template->param(
64	kohaVersion => $kohaVersion,	76	kohaVersion => $kohaVersion,
65	osVersion => $osVersion,	77	osVersion => $osVersion,
Lines 69-74 $template->param( Link Here
69	mysqlVersion => $mysqlVersion,	81	mysqlVersion => $mysqlVersion,
70	apacheVersion => $apacheVersion,	82	apacheVersion => $apacheVersion,
71	zebraVersion => $zebraVersion,	83	zebraVersion => $zebraVersion,
		84	prefNoZebra => $prefNoZebra,
		85	prefBiblioAddsAuthorities => $prefBiblioAddsAuthorities,
		86	prefAutoCreateAuthorities => $prefAutoCreateAuthorities,
		87	warnPrefBiblioAddsAuthorities => $warnPrefBiblioAddsAuthorities,
		88	warnPrefEasyAnalyticalRecords => $warnPrefEasyAnalyticalRecords,
		89	errZebraConnection => $errZebraConnection,
72	);	90	);
73		91
74	my @components = ();	92	my @components = ();

Lines 26-31 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt (-1 / +27 lines)
26	<ul>	26	<ul>
27	<li><a href="#about">Server Information</a></li>	27	<li><a href="#about">Server Information</a></li>
28	<li><a href="#perl">Perl modules</a></li>	28	<li><a href="#perl">Perl modules</a></li>
		29	<li><a href="#sysinfo">System information</a></li>
29	<li><a href="#team">Koha Team</a></li>	30	<li><a href="#team">Koha Team</a></li>
30	<li><a href="#licenses">Licenses</a></li>	31	<li><a href="#licenses">Licenses</a></li>
31	<li><a href="#translations">Translations</a></li>	32	<li><a href="#translations">Translations</a></li>
Lines 48-53 Link Here
48	<tr><th scope="row">MySQL version: </th><td>[% mysqlVersion \|html %]</td></tr>	49	<tr><th scope="row">MySQL version: </th><td>[% mysqlVersion \|html %]</td></tr>
49	<tr><th scope="row">Apache version: </th><td>[% apacheVersion \|html %]</td></tr>	50	<tr><th scope="row">Apache version: </th><td>[% apacheVersion \|html %]</td></tr>
50	<tr><th scope="row">Zebra version: </th><td>[% zebraVersion \|html %]</td></tr>	51	<tr><th scope="row">Zebra version: </th><td>[% zebraVersion \|html %]</td></tr>
		52	[% IF (errZebraConnection == 10000) %]
		53	<tr><th scope="row"><b>Error</b> </th><td>Zebra server seems not to be available. Is it started?</td></tr>
		54	[% ELSIF (errZebraConnection) %]
		55	<tr><th scope="row"><b>Warning</b> </th><td>Error message from Zebra: [% ( errZebraConnection ) %] </td></tr>
		56	[% END %]
51	</table>	57	</table>
52	</div>	58	</div>
53	<div id="perl">	59	<div id="perl">
Lines 83-88 Link Here
83	[% END %]	89	[% END %]
84	</table>	90	</table>
85	</div>	91	</div>
		92
		93	<div id="sysinfo">
		94	<h2>Warnings regarding the system configuration</h2>
		95	[% IF ( (prefNoZebra) \|\| (warnPrefBiblioAddsAuthorities) \|\| warnPrefEasyAnalyticalRecords ) %]
		96	<table>
		97	<caption>Preferences</caption>
		98	[% IF (prefNoZebra) %]
		99	<tr><th scope="row"><b>Warning</b> </th><td>System preference 'nozebra' set. Deprectated!</td></tr>
		100	[% END %]
		101	[% IF (warnPrefBiblioAddsAuthorities) %]
		102	<tr><th scope="row"><b>Warning</b> </th><td>System preference 'AutoCreateAuthorities' set, but needs 'BiblioAddsAuthorities' set as well.</td></tr>
		103	[% END %]
		104	[% IF (warnPrefEasyAnalyticalRecords) %]
		105	<tr><th scope="row"><b>Warning</b> </th><td>System preference 'EasyAnalyticalRecords' set, but UseControlNumber preference is set to 'Use'. Set it to 'Don't use' or else the 'Show analytics' links in the staff client and the OPAC will be broken.</td></tr>
		106	[% END %]
		107	</table>
		108	[% ELSE %]
		109	<p>No warnings</p>
		110	[% END %]
		111	</div>
		112
86	<div id="team">	113	<div id="team">
87	<h2>Special thanks to the following organizations</h2>	114	<h2>Special thanks to the following organizations</h2>
88	<ul>	115	<ul>
89	-

Return to bug 8301