projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Versteckte Felder in Lieferscheinen besser beibehalten
[kivitendo-erp.git]
/
bin
/
mozilla
/
installationcheck.pl
diff --git
a/bin/mozilla/installationcheck.pl
b/bin/mozilla/installationcheck.pl
index
6e1dfc6
..
869177b
100644
(file)
--- a/
bin/mozilla/installationcheck.pl
+++ b/
bin/mozilla/installationcheck.pl
@@
-1,30
+1,37
@@
use SL::InstallationCheck;
use SL::InstallationCheck;
+use strict;
+
sub verify_installation {
my $script = $0;
$script =~ s|.*/||;
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 @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
<html>
<head>
<link rel="stylesheet" href="css/lx-office-erp.css" type="text/css"
print(qq|content-type: text/html
<html>
<head>
<link rel="stylesheet" href="css/lx-office-erp.css" type="text/css"
- title="
Lx-Office
stylesheet">
+ title="
kivitendo
stylesheet">
<title>| . $locale->text("One or more Perl modules missing") . qq|</title>
</head>
<body>
<h1>| . $locale->text("One or more Perl modules missing") . qq|</h1>
<title>| . $locale->text("One or more Perl modules missing") . qq|</title>
</head>
<body>
<h1>| . $locale->text("One or more Perl modules missing") . qq|</h1>
- <p>| . $locale->text("At least one Perl module that
Lx-Office
ERP " .
+ <p>| . $locale->text("At least one Perl module that
kivitendo
ERP " .
"requires for running is not installed on your " .
"system.") .
" " .
"requires for running is not installed on your " .
"system.") .
" " .
@@
-69,7
+76,7
@@
sub verify_installation {
" " .
$locale->text("Here's an example command line:") . qq|</p>
" " .
$locale->text("Here's an example command line:") . qq|</p>
- <p><code>perl -MCPAN -e "install C
GI::Ajax
"</code></p>
+ <p><code>perl -MCPAN -e "install C
onfig::Std
"</code></p>
<p>| . $locale->text("The third way is to download the module from the " .
"above mentioned URL and to install the module " .
<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>
|);
</body>
</html>
|);
- exit(0);
+
+ ::end_of_request();
}
1;
}
1;