diff options
| author | root <martin.mattel@diemattels.at> | 2015-04-23 10:58:13 +0200 |
|---|---|---|
| committer | root <martin.mattel@diemattels.at> | 2015-04-23 10:58:13 +0200 |
| commit | 35dbef55b5523f84db8674507c430804d3ca0572 (patch) | |
| tree | 98c5ed707a42b17136b89e6f49e639c90914253e | |
| parent | 4f0437fbdef8e729167c1a8078e790c7983f69ef (diff) | |
| download | nextcloud-server-35dbef55b5523f84db8674507c430804d3ca0572.tar.gz nextcloud-server-35dbef55b5523f84db8674507c430804d3ca0572.zip | |
Checks if getenv returns proper system variable results
Updated texts and changed the variable name to match the query
Updated text + info which path for php config is used
removed the term ownCloud and squashed the commits
Updated text
| -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 976d0a5c3f1..bc9224f3998 100644 --- a/settings/admin.php +++ b/settings/admin.php @@ -118,6 +118,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 4bc497df764..4b373891a65 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']) { ?> |