X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=about.pl;h=ae2d0dc3acd3e9c94f32394514e97df668fe9d40;hb=dc1d934c8f966dfbb824613f9ef034519acd2f05;hp=ffe16ce5a4213f9a1beb2b27c575dfb774c5bd10;hpb=49c66d7d4e8ea46f6b1bf531cd90986408fb41f9;p=koha_gimpoz

diff --git a/about.pl b/about.pl
index ffe16ce5a4..ae2d0dc3ac 100755
--- a/about.pl
+++ b/about.pl
@@ -1,5 +1,10 @@
 #!/usr/bin/perl
 
+# Copyright Pat Eyler 2003
+# Copyright Biblibre 2006
+# Parts Copyright Liblime 2008
+# Parts Copyright Chris Nighswonger 2010
+#
 # This file is part of Koha.
 #
 # Koha is free software; you can redistribute it and/or modify it under the
@@ -15,81 +20,93 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-
 use strict;
-require Exporter;
+use warnings;
 
-use C4::Output;  # contains gettemplate
-use C4::Interface::CGI::Output;
-use C4::Auth;
-use C4::Context;
 use CGI;
 use LWP::Simple;
 use XML::Simple;
+use Config;
+
+use C4::Output;
+use C4::Auth;
+use C4::Context;
+use C4::Installer;
 
 my $query = new CGI;
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "about.tmpl",
-			     query => $query,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
-			     debug => 1,
-			     });
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => "about.tmpl",
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { catalogue => 1 },
+        debug           => 1,
+    }
+);
 
-my $kohaVersion = C4::Context->config("kohaversion");
-my $osVersion = `uname -a`;
-my $perlVersion = $];
-my $mysqlVersion = `mysql -V`;
-my $apacheVersion =  `httpd -v`;
-$apacheVersion =  `httpd2 -v` unless $apacheVersion;
+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,
-					perlVersion        => $perlVersion,
-					mysqlVersion       => $mysqlVersion,
-					apacheVersion      => $apacheVersion,
-                                        zebraVersion       => $zebraVersion,
-		);
-
-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
-      /;
+    kohaVersion   => $kohaVersion,
+    osVersion     => $osVersion,
+    perlPath      => $perl_path,
+    perlVersion   => $perlVersion,
+    perlIncPath   => [ map { perlinc => $_ }, @INC ],
+    mysqlVersion  => $mysqlVersion,
+    apacheVersion => $apacheVersion,
+    zebraVersion  => $zebraVersion,
+);
 
 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'},
+            }
+        );
     }
+}
+
+@components = sort {$a->{'name'} cmp $b->{'name'}} @components;
 
-    push (
-        @components,
-        {
-            name    => $component,
-            version => $version,
-        }
-    );
+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;