extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-13 17:38:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove code checking since 1.4 not used "file_repository" and "file_store_contents" config vars resulting in not being able to create "files_dir" config

Browse Source
This commit is contained in:
Ralf Becker 2016-06-05 08:58:56 +02:00
parent 2df2beb724
commit 3c3210dba9
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
setup/inc/class.setup_detection.inc.php
View File

@ -404,14 +404,12 @@ class setup_detection
$config_errors[] = lang("Your temporary directory '%1' %2",$config['temp_dir'],$error_msg); $config_errors[] = lang("Your temporary directory '%1' %2",$config['temp_dir'],$error_msg);
} }
if ((!isset($config['file_repository']) || $config['file_repository'] == 'sql') && if (!$this->check_dir($config['files_dir'],$error_msg,true))
(!isset($config['file_store_contents']) || $config['file_store_contents'] == 'filesystem') &&
!$this->check_dir($config['files_dir'],$error_msg,true))
{ {
$config_errors[] = lang("Your files directory '%1' %2",$config['files_dir'],$error_msg); $config_errors[] = lang("Your files directory '%1' %2",$config['files_dir'],$error_msg);
} }
// set and create the default backup_dir // set and create the default backup_dir
if (@is_writeable($config['files_dir']) && !$config['backup_dir'] && $config['file_store_contents'] == 'filesystem') if (@is_writeable($config['files_dir']) && empty($config['backup_dir']))
{ {
$config['backup_dir'] = $config['files_dir'].'/db_backup'; $config['backup_dir'] = $config['files_dir'].'/db_backup';
if (!is_dir($config['backup_dir']) && mkdir($config['backup_dir'])) if (!is_dir($config['backup_dir']) && mkdir($config['backup_dir']))

5
setup/inc/hook_config_validate.inc.php
View File

@ -83,8 +83,7 @@ function temp_dir($settings)
function files_dir($settings) function files_dir($settings)
{ {
$error_msg = null; $error_msg = null;
if ($settings['file_repository'] == 'sql' && $settings['file_store_contents'] == 'filesystem' && if (!setup_detection::check_dir($settings['files_dir'],$error_msg,true))
!setup_detection::check_dir($settings['files_dir'],$error_msg,true))
{ {
$GLOBALS['config_error'] = lang("Your files directory '%1' %2",$settings['files_dir'],$error_msg); $GLOBALS['config_error'] = lang("Your files directory '%1' %2",$settings['files_dir'],$error_msg);
} }
@ -92,7 +91,7 @@ function files_dir($settings)
function backup_dir(&$settings) function backup_dir(&$settings)
{ {
if (@is_writeable($settings['files_dir']) && !$settings['backup_dir'] && $settings['file_store_contents'] == 'filesystem') if (@is_writeable($settings['files_dir']) && empty($settings['backup_dir']))
{ {
$settings['backup_dir'] = $settings['files_dir'].'/db_backup'; $settings['backup_dir'] = $settings['files_dir'].'/db_backup';
} }