diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-23 14:42:58 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-23 14:42:58 +0200 |
| commit | 6d3f120d239cd1797cd50de1e2978f64b46f9211 (patch) | |
| tree | b111e059b24bffa7f99df877bb08049aeaec06a8 /settings | |
| parent | 8997d2f0d1e52e051eeafdcf146f1a4fa672b662 (diff) | |
| parent | 35dbef55b5523f84db8674507c430804d3ca0572 (diff) | |
| download | nextcloud-server-6d3f120d239cd1797cd50de1e2978f64b46f9211.tar.gz nextcloud-server-6d3f120d239cd1797cd50de1e2978f64b46f9211.zip | |
Merge pull request #15617 from mmattel/getenv_system_check_and_warning
Checks if getenv returns proper system environment variable results
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/admin.php | 3 | ||||
| -rw-r--r-- | settings/templates/admin.php | 10 |
2 files changed, 13 insertions, 0 deletions
diff --git a/settings/admin.php b/settings/admin.php index 94e48aab14e..f08c3cd53b6 100644 --- a/settings/admin.php +++ b/settings/admin.php @@ -123,6 +123,9 @@ $databaseOverload = (strpos(\OCP\Config::getSystemValue('dbtype'), 'sqlite') !== $template->assign('databaseOverload', $databaseOverload); $template->assign('cronErrors', $appConfig->getValue('core', 'cronErrors')); +// warn if php is not setup properly to get system variables with getenv +$template->assign('getenvServerNotWorking', empty(getenv('PATH'))); + // warn if Windows is used $template->assign('WindowsWarning', OC_Util::runningOnWindows()); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 4f60f7c16d9..587a3b6c66b 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -67,6 +67,16 @@ if ($_['mail_smtpmode'] == 'qmail') { <h2><?php p($l->t('Security & setup warnings'));?></h2> <ul> <?php +// is php setup properly to query system environment variables like getenv('PATH') +if ($_['getenvServerNotWorking']) { +?> + <li> + <?php p($l->t('php does not seem to be setup properly to query system environment variables. The test with getenv("PATH") only returns an empty response.')); ?><br> + <?php p($l->t('Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm.')); ?> + </li> +<?php +} + // is read only config enabled if ($_['readOnlyConfigEnabled']) { ?> |