diff options
| author | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-06-30 08:17:05 +0000 |
|---|---|---|
| committer | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-06-30 08:17:05 +0000 |
| commit | 0995d62be320ced7c533d805fe887d78741bfbb8 (patch) | |
| tree | abf7c1965af8e3b240fd02b2798ba74e94674a3f /modules/system/system.install | |
| parent | 15bf4681c2111344d688e1323c293a9070cfed0a (diff) | |
| download | brdo-0995d62be320ced7c533d805fe887d78741bfbb8.tar.gz brdo-0995d62be320ced7c533d805fe887d78741bfbb8.tar.bz2 | |
#99011 follow up patch my merlinofchaos: inform users if the settings.php or the settings directory in use is not write protected after installation.
Diffstat (limited to 'modules/system/system.install')
| -rw-r--r-- | modules/system/system.install | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/modules/system/system.install b/modules/system/system.install index 0f4756174..d78e12bec 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -66,12 +66,20 @@ function system_requirements($phase) { // Test settings.php file writability if ($phase == 'runtime') { - if (!drupal_verify_install_file(conf_path() .'/settings.php', FILE_EXIST|FILE_READABLE|FILE_NOT_WRITABLE)) { + $conf_dir = drupal_verify_install_file(conf_path(), FILE_NOT_WRITABLE, 'dir'); + $conf_file = drupal_verify_install_file(conf_path() .'/settings.php', FILE_EXIST|FILE_READABLE|FILE_NOT_WRITABLE); + if (!$conf_dir || !$conf_file) { $requirements['settings.php'] = array( 'value' => $t('Not protected'), 'severity' => REQUIREMENT_ERROR, - 'description' => $t('The file %file is not protected from modifications and poses a security risk. You must change the file\'s permissions to be non-writable.', array('%file' => conf_path() .'/settings.php')), + 'description' => '', ); + if (!$conf_dir) { + $requirements['settings.php']['description'] .= $t('The directory %file is not protected from modifications and poses a security risk. You must change the directory\'s permissions to be non-writable. ', array('%file' => conf_path())); + } + if (!$conf_file) { + $requirements['settings.php']['description'] .= $t('The file %file is not protected from modifications and poses a security risk. You must change the file\'s permissions to be non-writable.', array('%file' => conf_path() .'/settings.php')); + } } else { $requirements['settings.php'] = array( |