X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=about.pl;h=be5e0ab35d77167281f121a418e89e8ddbcafd0e;hb=fcdf50af6ef3321ce9373d41871f74bcc9b633df;hp=ef39f384855f3e31bc6f04003fbcc9870b9940bc;hpb=4ce43414f861c6f3269281563236c5d9427e4eaa;p=koha.git

diff --git a/about.pl b/about.pl
index ef39f38485..be5e0ab35d 100755
--- a/about.pl
+++ b/about.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
- 
+
 # This file is part of Koha.
 #
 # Koha is free software; you can redistribute it and/or modify it under the
@@ -16,14 +16,17 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
-require Exporter;
+use warnings;
 
-use C4::Output;    # contains gettemplate
-use C4::Auth;
-use C4::Context;
 use CGI;
 use LWP::Simple;
 use XML::Simple;
+use Config;
+
+use C4::Output;    # contains gettemplate
+use C4::Auth;
+use C4::Context;
+use C4::Installer;
 
 my $query = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -32,74 +35,73 @@ 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->config("kohaversion");
+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,
 );
 
-<<<<<<< HEAD:about.pl
-my @component_names =
-    qw/MARC::File::XML   MARC::Charset     Class::Accessor
-       LWP::Simple       XML::Simple       Net::Z3950
-       Event             Net::LDAP         PDF::API2
-       Mail::Sendmail    MARC::Record      Digest::MD5
-       HTML::Template    DBD::mysql        Date::Manip
-       DBI               Net::Z3950::ZOOM
-       Date::Calc
-      /;
-=======
-my @component_names = qw/MARC::File::XML   MARC::Charset     Class::Accessor
-  LWP::Simple       XML::Simple       Net::Z3950
-  Event             Net::LDAP         PDF::API2
-  Mail::Sendmail    MARC::Record      Digest::MD5
-  HTML::Template    DBD::mysql        Date::Manip
-  DBI               Smart::Comments   Net::Z3950::ZOOM
-  Date::Calc
-  /;
->>>>>>> perltidy:about.pl
-
 my @components = ();
 
-foreach my $component ( sort @component_names ) {
-    my $version;
-    if ( eval "require $component" ) {
-        $version = $component->VERSION;
-        if ( $version eq '' ) {
-            $version = 'unknown';
-        }
-    }
-    else {
-        $version = 'module is missing';
+my $perl_modules = C4::Installer::PerlModules->new;
+$perl_modules->version_info;
+
+my @pm_types = qw(missing_pm upgrade_pm current_pm);
+
+foreach my $pm_type(@pm_types) {
+    my $modules = $perl_modules->get_attr($pm_type);
+    foreach (@$modules) {
+        my ($module, $stats) = each %$_;
+        push(
+            @components,
+            {
+                name    => $module,
+                version => $stats->{'cur_ver'},
+                missing => ($pm_type eq 'missing_pm' ? 1 : 0),
+                upgrade => ($pm_type eq 'upgrade_pm' ? 1 : 0),
+                current => ($pm_type eq 'current_pm' ? 1 : 0),
+                require => $stats->{'required'},
+            }
+        );
     }
+}
 
-    push(
-        @components,
-        {
-            name    => $component,
-            version => $version,
-        }
-    );
+@components = sort {$a->{'name'} cmp $b->{'name'}} @components;
+
+my $counter=0;
+my $row = [];
+my $table = [];
+foreach (@components) {
+    push (@$row, $_);
+    unless (++$counter % 4) {
+        push (@$table, {row => $row});
+        $row = [];
+    }
 }
 
-$template->param( components => \@components );
+$template->param( table => $table );
 
 output_html_with_http_headers $query, $cookie, $template->output;