diff --git a/setup/check_install.php b/setup/check_install.php
index 46a358b298..b1466e29a6 100644
--- a/setup/check_install.php
+++ b/setup/check_install.php
@@ -389,13 +389,24 @@
{
echo $error_icon.$msg;
}
- echo '*** '.lang('Please make the following change in your php.ini').': '.($args['safe_mode']?$args['safe_mode']:$args['change'])."\n";
+ echo '*** '.lang('Please make the following change in your php.ini').' ('.get_php_ini().'): '.(@$args['safe_mode']?$args['safe_mode']:$args['change'])."\n";
+ echo '*** '.lang('AND reload your webserver, so the above changes take effect !!!')."\n";
}
}
echo "\n";
return $result;
}
+ function get_php_ini()
+ {
+ ob_start();
+ phpinfo(INFO_GENERAL);
+ $phpinfo = ob_get_contents();
+ ob_end_clean();
+
+ return preg_match('/\(php.ini\).*<\/td>
]*>([^ <]+)/',$phpinfo,$found) ? $found[1] : False;
+ }
+
if ($run_by_webserver)
{
//echo "\n\nChecking the eGroupWare install\n\n\n";
diff --git a/setup/lang/phpgw_de.lang b/setup/lang/phpgw_de.lang
index 8de538cb0e..ae1d1343d0 100644
--- a/setup/lang/phpgw_de.lang
+++ b/setup/lang/phpgw_de.lang
@@ -23,6 +23,7 @@ all applications setup de Alle Applikationen
all core tables and the admin and preferences applications setup de Sie alle Kern-Tabellen und die Anwendungen Admin und Einstellungen
all users setup de Alle Benutzer
analysis setup de Analyse
+and reload your webserver, so the above changes take effect !!! setup de UND reloaden Sie ihren Webserver, damit die obigen Änderungen in Kraft treten !!!
app details setup de Details der Anwendung
app install/remove/upgrade setup de Anwendung installierenn/entfernen/aktualisieren
app process setup de Anwendung bearbeiten
@@ -274,6 +275,7 @@ passwords did not match, please re-enter setup de Passworte stimmten nicht
path information setup de Pfadinformationen
path to user and group files has to be outside of the webservers document-root!!! setup de Pfad zu Benutzer und Gruppen Dateien MUSS AUSSERHALB des Wurzelverzeichnisses (document root) des Webservers sein!!!
persistent connections setup de Permanente Verbindungen
+please check for sql scripts within the application's directory setup de Bitte suchen Sie ein SQL Skript im Verzeichnis der Anwendung
please check read/write permissions on directories, or back up and use another option. setup de Bitte überprüfen Sie die Lese/Schreib-Rechte der Verzeichnisse oder gehen Sie zurück und benutzen eine andere Option.
please configure egroupware for your environment setup de Bitte konfigurieren Sie eGroupWare für Ihre Umgebung
please consult the %1. setup de Bitte konsultieren Sie das %1.
diff --git a/setup/lang/phpgw_en.lang b/setup/lang/phpgw_en.lang
index 2d2cd91810..76e587734d 100644
--- a/setup/lang/phpgw_en.lang
+++ b/setup/lang/phpgw_en.lang
@@ -22,6 +22,7 @@ after retrieving the file, put it into place as the header.inc.php. then, click
all core tables and the admin and preferences applications setup en all core tables and the admin and preferences applications
all users setup en All Users
analysis setup en Analysis
+and reload your webserver, so the above changes take effect !!! setup en AND reload your webserver, so the above changes take effect !!!
app details setup en App details
app install/remove/upgrade setup en App install/remove/upgrade
app process setup en App process
@@ -270,6 +271,7 @@ passwords did not match, please re-enter setup en Passwords did not match, pleas
path information setup en Path information
path to user and group files has to be outside of the webservers document-root!!! setup en Path to user and group files HAS TO BE OUTSIDE of the webservers document-root!!!
persistent connections setup en Persistent connections
+please check for sql scripts within the application's directory setup en Please check for sql scripts within the application's directory
please check read/write permissions on directories, or back up and use another option. setup en Please check read/write permissions on directories, or back up and use another option.
please configure egroupware for your environment setup en Please configure eGroupWare for your environment
please consult the %1. setup en Please consult the %1.
|