Attachment #10454 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 (+15 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
63	$template->param(	73	$template->param(
64	kohaVersion => $kohaVersion,	74	kohaVersion => $kohaVersion,
65	osVersion => $osVersion,	75	osVersion => $osVersion,
Lines 69-74 $template->param( Link Here
69	mysqlVersion => $mysqlVersion,	79	mysqlVersion => $mysqlVersion,
70	apacheVersion => $apacheVersion,	80	apacheVersion => $apacheVersion,
71	zebraVersion => $zebraVersion,	81	zebraVersion => $zebraVersion,
		82	prefNoZebra => $prefNoZebra,
		83	prefBiblioAddsAuthorities => $prefBiblioAddsAuthorities,
		84	prefAutoCreateAuthorities => $prefAutoCreateAuthorities,
		85	warnPrefBiblioAddsAuthorities => $warnPrefBiblioAddsAuthorities,
		86	warnPrefEasyAnalyticalRecords => $warnPrefEasyAnalyticalRecords,
72	);	87	);
73		88
74	my @components = ();	89	my @components = ();




        <ul>
        <li><a href="#about">Server Information</a></li>
        <li><a href="#perl">Perl modules</a></li>
        <li><a href="#sysinfo">System information</a></li>
        <li><a href="#team">Koha Team</a></li>
        <li><a href="#licenses">Licenses</a></li>
        <li><a href="#translations">Translations</a></li>

                [% END %]
            </table>
        </div>

        <div id="sysinfo">
            <h2>Warnings regarding the system configuration</h2>
        [% IF ( (prefNoZebra) || (warnPrefBiblioAddsAuthorities) || warnPrefEasyAnalyticalRecords ) %]
        <table>
            <caption>Preferences</caption>
            [% IF (prefNoZebra) %]
            <tr><th scope="row"><b>Warning</b> </th><td>System preference 'nozebra' set. Deprectated!</td></tr>
            [% END %]
            [% IF (warnPrefBiblioAddsAuthorities) %]
            <tr><th scope="row"><b>Warning</b> </th><td>System preference 'AutoCreateAuthorities' set, but needs 'BiblioAddsAuthorities' set as well.</td></tr>
            [% END %]
            [% IF (warnPrefEasyAnalyticalRecords) %]
            <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>
            [% END %]
        </table>
        [% ELSE %]
            <p>No warnings</p>
        [% END %]
        </div>

        <div id="team">
            <h2>Special thanks to the following organizations</h2>
            <ul>
- 

Return to bug 8301

Lines 26-31 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt (-1 / +22 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 83-88 Link Here
83	[% END %]	84	[% END %]
84	</table>	85	</table>
85	</div>	86	</div>
		87
		88	<div id="sysinfo">
		89	<h2>Warnings regarding the system configuration</h2>
		90	[% IF ( (prefNoZebra) \|\| (warnPrefBiblioAddsAuthorities) \|\| warnPrefEasyAnalyticalRecords ) %]
		91	<table>
		92	<caption>Preferences</caption>
		93	[% IF (prefNoZebra) %]
		94	<tr><th scope="row"><b>Warning</b> </th><td>System preference 'nozebra' set. Deprectated!</td></tr>
		95	[% END %]
		96	[% IF (warnPrefBiblioAddsAuthorities) %]
		97	<tr><th scope="row"><b>Warning</b> </th><td>System preference 'AutoCreateAuthorities' set, but needs 'BiblioAddsAuthorities' set as well.</td></tr>
		98	[% END %]
		99	[% IF (warnPrefEasyAnalyticalRecords) %]
		100	<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>
		101	[% END %]
		102	</table>
		103	[% ELSE %]
		104	<p>No warnings</p>
		105	[% END %]
		106	</div>
		107
86	<div id="team">	108	<div id="team">
87	<h2>Special thanks to the following organizations</h2>	109	<h2>Special thanks to the following organizations</h2>
88	<ul>	110	<ul>
89	-