Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

[kivitendo-erp.git] / bin / mozilla / installationcheck.pl

diff --git a/bin/mozilla/installationcheck.pl b/bin/mozilla/installationcheck.pl
index 6e1dfc6..4741443 100644 (file)
--- a/bin/mozilla/installationcheck.pl
+++ b/bin/mozilla/installationcheck.pl
@@ -1,16 +1,23 @@
 use SL::InstallationCheck;
 
+use strict;
+
 sub verify_installation {
   my $script = $0;
   $script =~ s|.*/||;
 
-  return unless ($form{"action"} && ($script eq "login.pl"));
+  my $form     = $main::form;
+
+  return unless ($form->{"action"} && ($script eq "login.pl"));
+
+  SL::InstallationCheck::check_for_conditional_dependencies();
 
   my @missing_modules = SL::InstallationCheck::test_all_modules();
   return if (scalar(@missing_modules) == 0);
 
   use SL::Locale;
-  my $locale = new Locale($language, "installationcheck");
+
+  my $locale = new Locale($::lx_office_conf{system}->{language}, "installationcheck");
 
   print(qq|content-type: text/html
 
@@ -69,7 +76,7 @@ sub verify_installation {
         " " .
         $locale->text("Here's an example command line:") . qq|</p>
 
-  <p><code>perl -MCPAN -e &quot;install CGI::Ajax&quot;</code></p>
+  <p><code>perl -MCPAN -e &quot;install Config::Std&quot;</code></p>
 
   <p>| . $locale->text("The third way is to download the module from the " .
                        "above mentioned URL and to install the module " .
@@ -79,7 +86,8 @@ sub verify_installation {
  </body>
 </html>
 |);
-  exit(0);
+
+  ::end_of_request();
 }
 
 1;