X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=about.pl;h=daf682950f3992673f632b89a57f3547e6c84574;hb=b932363f7009895c3e756d31716dde65d6bb77c6;hp=7189a229c14b88bbdcc95cef969709a6686b4f76;hpb=e12fca0eb8330adbe230c435a55e88696409bfbd;p=koha.git

diff --git a/about.pl b/about.pl
index 7189a229c1..daf682950f 100755
--- a/about.pl
+++ b/about.pl
@@ -60,6 +60,18 @@ $apacheVersion = `httpd2 -v` unless $apacheVersion;
 $apacheVersion = (`/usr/sbin/apache2 -V`)[0] unless $apacheVersion;
 my $zebraVersion = `zebraidx -V`;
 
+# Additional system information for warnings
+my $prefNoZebra = C4::Context->preference('nozebra');
+my $prefAutoCreateAuthorities = C4::Context->preference('AutoCreateAuthorities');
+my $prefBiblioAddsAuthorities = C4::Context->preference('BiblioAddsAuthorities');
+my $warnPrefBiblioAddsAuthorities = ( $prefAutoCreateAuthorities && ( !$prefBiblioAddsAuthorities) );
+
+my $prefEasyAnalyticalRecords  = C4::Context->preference('EasyAnalyticalRecords');
+my $prefUseControlNumber  = C4::Context->preference('UseControlNumber');
+my $warnPrefEasyAnalyticalRecords  = ( $prefEasyAnalyticalRecords  && $prefUseControlNumber );
+
+my $errZebraConnection = C4::Context->Zconn("biblioserver",0)->errcode();
+
 $template->param(
     kohaVersion   => $kohaVersion,
     osVersion     => $osVersion,
@@ -69,6 +81,12 @@ $template->param(
     mysqlVersion  => $mysqlVersion,
     apacheVersion => $apacheVersion,
     zebraVersion  => $zebraVersion,
+    prefNoZebra   => $prefNoZebra,
+    prefBiblioAddsAuthorities => $prefBiblioAddsAuthorities,
+    prefAutoCreateAuthorities => $prefAutoCreateAuthorities,
+    warnPrefBiblioAddsAuthorities => $warnPrefBiblioAddsAuthorities,
+    warnPrefEasyAnalyticalRecords  => $warnPrefEasyAnalyticalRecords,
+    errZebraConnection => $errZebraConnection,
 );
 
 my @components = ();
@@ -108,6 +126,13 @@ foreach (@components) {
         $row = [];
     }
 }
+# Processing the last line (if there are any modules left)
+if (scalar(@$row) > 0) {
+    # Extending $row to the table size
+    $$row[3] = '';
+    # Pushing the last line
+    push (@$table, {row => $row});
+}
 ## ## $table
 
 $template->param( table => $table );
@@ -131,6 +156,9 @@ shift @lines; #remove header row
 
 foreach (@lines) {
     my ( $date, $desc, $tag ) = split(/\t/);
+    if(!$desc && $date=~ /(?<=\d{4})\s+/) {
+        ($date, $desc)= ($`, $');
+    }
     push(
         @rows2,
         {