X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FInstallationCheck.pm;h=d8d058bc583b7d7bb531394230b5dbf46c00ca10;hb=6f2893dcf199d5e5147cc2020c2ab6984f4274dc;hp=2c92136a337ba4fda9c4e32670d7664339626469;hpb=bf3cc4b6658497e7f7d15bbe16d1795fefb7cf05;p=kivitendo-erp.git

diff --git a/SL/InstallationCheck.pm b/SL/InstallationCheck.pm
index 2c92136a3..d8d058bc5 100644
--- a/SL/InstallationCheck.pm
+++ b/SL/InstallationCheck.pm
@@ -1,32 +1,57 @@
 package SL::InstallationCheck;
 
-use vars qw(@required_modules);
+use English '-no_match_vars';
+use IO::File;
 
+use vars qw(@required_modules @optional_modules);
+
+use strict;
+
+BEGIN {
 @required_modules = (
-  { "name" => "Class::Accessor", "url" => "http://search.cpan.org/~kasei/" },
-  { "name" => "CGI", "url" => "http://search.cpan.org/~lds/" },
-  { "name" => "CGI::Ajax", "url" => "http://search.cpan.org/~bct/" },
-  { "name" => "DBI", "url" => "http://search.cpan.org/~timb/" },
-  { "name" => "DBD::Pg", "url" => "http://search.cpan.org/~dbdpg/" },
-  { "name" => "HTML::Template", "url" => "http://search.cpan.org/~samtregar/" },
-  { "name" => "Archive::Zip", "url" => "http://search.cpan.org/~adamk/" },
-  { "name" => "Text::Iconv", "url" => "http://search.cpan.org/~mpiotr/" },
-  { "name" => "Time::HiRes", "url" => "http://search.cpan.org/~jhi/" },
-  { "name" => "YAML", "url" => "http://search.cpan.org/~ingy/" },
-  { "name" => "IO::Wrap", "url" => "http://search.cpan.org/~dskoll/" },
-  { "name" => "Text::CSV_XS", "url" => "http://search.cpan.org/~hmbrand/" },
-  { "name" => "List::Util", "url" => "http://search.cpan.org/~gbarr/" },
-  { "name" => "Template", "url" => "http://search.cpan.org/~abw/" },
-  );
+  { name => "parent",                              url => "http://search.cpan.org/~corion/" },
+  { name => "Archive::Zip",    version => '1.16',  url => "http://search.cpan.org/~adamk/" },
+  { name => "Class::Accessor", version => '0.30',  url => "http://search.cpan.org/~kasei/" },
+  { name => "CGI::Ajax",       version => '0.697', url => "http://search.cpan.org/~bct/" },
+  { name => "DateTime",                            url => "http://search.cpan.org/~drolsky/" },
+  { name => "DBI",             version => '1.50',  url => "http://search.cpan.org/~timb/" },
+  { name => "DBD::Pg",         version => '1.49',  url => "http://search.cpan.org/~dbdpg/" },
+  { name => "Email::Address",                      url => "http://search.cpan.org/~rjbs/" },
+  { name => "FCGI",                                url => "http://search.cpan.org/~mstrout/" },
+  { name => "IO::Wrap",        version => '2.110', url => "http://search.cpan.org/~dskoll/" },
+  { name => "List::MoreUtils", version => '0.21',  url => "http://search.cpan.org/~vparseval/" },
+  { name => "PDF::API2",       version => '2.000', url => "http://search.cpan.org/~areibens/" },
+  { name => "Template",        version => '2.18',  url => "http://search.cpan.org/~abw/" },
+  { name => "Text::CSV_XS",    version => '0.23',  url => "http://search.cpan.org/~hmbrand/" },
+  { name => "Text::Iconv",     version => '1.2',   url => "http://search.cpan.org/~mpiotr/" },
+  { name => "URI",             version => '1.35',  url => "http://search.cpan.org/~gaas/" },
+  { name => "XML::Writer",     version => '0.602', url => "http://search.cpan.org/~josephw/" },
+  { name => "YAML",            version => '0.62',  url => "http://search.cpan.org/~ingy/" },
+);
+
+@optional_modules = ();
+
+$_->{fullname} = join ' ', grep $_, @$_{qw(name version)}
+  for @required_modules, @optional_modules;
+}
 
 sub module_available {
-  my ($module) = @_;
+  my $module  = $_[0];
+  my $version = $_[1] || '' ;
+
+  return eval "use $module $version; 1";
+}
+
+my %conditional_dependencies;
+
+sub check_for_conditional_dependencies {
+  return if $conditional_dependencies{net_ldap}++;
+
+  my $self = {};
+  eval do { local (@ARGV, $/) = 'config/authentication.pl'; <> } or return;
 
-  if (!defined(eval("require $module;"))) {
-    return 0;
-  } else {
-    return 1;
-  }
+  push @required_modules, { 'name' => 'Net::LDAP', 'url' => 'http://search.cpan.org/~gbarr/' }
+    if $self->{module} && ($self->{module} eq 'LDAP');
 }
 
 sub test_all_modules {