(bug #4487) permit - and . in callnumber plugin

[koha.git] / about.pl

diff --git a/about.pl b/about.pl
index dbd981d..75635a6 100755 (executable)
--- a/about.pl
+++ b/about.pl
@@ -16,7 +16,6 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
-require Exporter;
 
 use C4::Output;    # contains gettemplate
 use C4::Auth;
@@ -24,6 +23,7 @@ use C4::Context;
 use CGI;
 use LWP::Simple;
 use XML::Simple;
+use Config;
 
 my $query = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -32,81 +32,112 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { parameters => 1 },
+        flagsrequired   => { catalogue => 1 },
         debug           => 1,
     }
 );
 
 my $kohaVersion   = C4::Context::KOHAVERSION;
 my $osVersion     = `uname -a`;
+my $perl_path = $^X;
+if ($^O ne 'VMS') {
+    $perl_path .= $Config{_exe} unless $perl_path =~ m/$Config{_exe}$/i;
+}
 my $perlVersion   = $];
 my $mysqlVersion  = `mysql -V`;
 my $apacheVersion = `httpd -v`;
 $apacheVersion = `httpd2 -v` unless $apacheVersion;
+$apacheVersion = (`/usr/sbin/apache2 -V`)[0] unless $apacheVersion;
 my $zebraVersion = `zebraidx -V`;
 
-# $apacheVersion =  (`/usr/sbin/apache2 -V`)[0];
-
 $template->param(
     kohaVersion   => $kohaVersion,
     osVersion     => $osVersion,
+    perlPath      => $perl_path,
     perlVersion   => $perlVersion,
+    perlIncPath   => [ map { perlinc => $_ }, @INC ],
     mysqlVersion  => $mysqlVersion,
     apacheVersion => $apacheVersion,
     zebraVersion  => $zebraVersion,
 );
 my @component_names =
-    qw/CGI
+    qw/
+Algorithm::CheckDigits
+Biblio::EndnoteStyle
+CGI
 CGI::Carp
 CGI::Session
+CGI::Session::Serialize::yaml
 Class::Factory::Util
 Class::Accessor
+Compress::Zlib
 DBD::mysql
 DBI
 Data::Dumper
+Data::ICal
 Date::Calc
+Date::ICal
 Date::Manip
 Digest::MD5
+Email::Date
 File::Temp
+GD
 GD::Barcode::UPCE
 Getopt::Long
 Getopt::Std
 HTML::Template::Pro
 HTTP::Cookies
+HTTP::OAI
 HTTP::Request::Common
+HTML::Scrubber
+IPC::Cmd
+JSON
 LWP::Simple
 LWP::UserAgent
 Lingua::Stem
 List::Util
+List::MoreUtils
 Locale::Language
+MARC::Crosswalk::DublinCore
 MARC::Charset
 MARC::File::XML
 MARC::Record
 MIME::Base64
+MIME::Lite
 MIME::QuotedPrint
 Mail::Sendmail
+Net::LDAP
+Net::LDAP::Filter
 Net::Z3950::ZOOM
 PDF::API2
 PDF::API2::Page
 PDF::API2::Util
 PDF::Reuse
 PDF::Reuse::Barcode
+POE
 POSIX
 Schedule::At
+SMS::Send
 Term::ANSIColor
 Test
 Test::Harness
 Test::More
 Text::CSV
+Text::CSV_XS
+Text::CSV::Encoded
+Text::Iconv
 Text::Wrap
 Time::HiRes
 Time::localtime
 Unicode::Normalize
 XML::Dumper
 XML::LibXML
+XML::LibXSLT
 XML::SAX::ParserFactory
+XML::SAX::Writer
 XML::Simple
 XML::RSS
+YAML::Syck
       /;
 
 my @components = ();
@@ -123,14 +154,12 @@ foreach my $component ( sort @component_names ) {
     else {
         $version = 'module is missing';
     }
-    $counter++;
-    $counter=0 if $counter >3;
     push(
         @components,
         {
             name    => $component,
             version => $version,
-            counter => $counter,
+            newrow  => (++$counter % 4) ? 0 : 1,
         }
     );
 }