extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

do NOT save config, if there is an error, also let config hook know if it is called initially or after an apply

Browse Source
This commit is contained in:
Ralf Becker 2019-07-17 11:15:32 +02:00
parent 0f8e678524
commit 8520b0ba15
1 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
admin/inc/class.admin_config.inc.php
View File

@ -142,7 +142,7 @@ class admin_config
$this->remove_anon_images(array_diff((array)$c->config_data['login_background_file'], $_content['newsettings']['login_background_file'])); $this->remove_anon_images(array_diff((array)$c->config_data['login_background_file'], $_content['newsettings']['login_background_file']));
/* Load hook file with functions to validate each config (one/none/all) */ /* Load hook file with functions to validate each config (one/none/all) */
Api\Hooks::single(array( $errors = Api\Hooks::single(array(
'location' => 'config_validate', 'location' => 'config_validate',
)+(array)$_content['newsettings'], $appname); )+(array)$_content['newsettings'], $appname);
@ -179,32 +179,33 @@ class admin_config
unset($GLOBALS['egw_info']['server']['found_validation_hook']); unset($GLOBALS['egw_info']['server']['found_validation_hook']);
} }
// compute real changes and their old values (null for removals) // do not allow to save config, if there are errors
$modifications = array_udiff_assoc($c->config_data, $old, function($a, $b)
{
return (int)($a != $b); // necessary to kope with arrays
});
$removals = array_diff(array_udiff_assoc($old, $c->config_data, function($a, $b)
{
return (int)(!empty($a) && $a != $b);
}), array(null, ''));
$set = array_merge(array_fill_keys(array_keys($removals), null), $modifications);
$old = array_filter($old, function($key) use ($set)
{
return array_key_exists($key, $set);
}, ARRAY_FILTER_USE_KEY);
if ($set)
{
$cmd = new admin_cmd_config($_appname, $set, $old,
(array)$_content['admin_cmd'], $config_appname === 'phpgwapi');
$msg = $cmd->run();
}
else
{
$msg = lang('Nothing to save.');
}
if (!$errors) if (!$errors)
{ {
// compute real changes and their old values (null for removals)
$modifications = array_udiff_assoc($c->config_data, $old, function($a, $b)
{
return (int)($a != $b); // necessary to kope with arrays
});
$removals = array_diff(array_udiff_assoc($old, $c->config_data, function($a, $b)
{
return (int)(!empty($a) && $a != $b);
}), array(null, ''));
$set = array_merge(array_fill_keys(array_keys($removals), null), $modifications);
$old = array_filter($old, function($key) use ($set)
{
return array_key_exists($key, $set);
}, ARRAY_FILTER_USE_KEY);
if ($set)
{
$cmd = new admin_cmd_config($_appname, $set, $old,
(array)$_content['admin_cmd'], $config_appname === 'phpgwapi');
$msg = $cmd->run();
}
else
{
$msg = lang('Nothing to save.');
}
// allow apps to hook into configuration dialog to eg. save some stuff outside configuration // allow apps to hook into configuration dialog to eg. save some stuff outside configuration
$_content['location'] = 'config_after_save'; $_content['location'] = 'config_after_save';
Api\Hooks::single($_content, $_appname); Api\Hooks::single($_content, $_appname);
@ -224,18 +225,24 @@ class admin_config
Api\Framework::message(lang('Error') . ': ' . $errors, 'error'); Api\Framework::message(lang('Error') . ': ' . $errors, 'error');
unset($errors); unset($errors);
unset($GLOBALS['config_error']); unset($GLOBALS['config_error']);
// keep old content on error
$config = $_content['newsettings'];
} }
elseif ($_content['apply']) else
{ {
Api\Framework::message($msg, 'success'); if ($_content['apply'])
{
Api\Framework::message($msg, 'success');
}
$config = $c->read_repository();
} }
$sel_options = $readonlys = array(); $sel_options = $readonlys = array();
$config = $c->read_repository();
// call "config" hook, allowing apps to overwrite config, eg. set default values, // call "config" hook, allowing apps to overwrite config, eg. set default values,
// or return options in "sel_options" keys // or return options in "sel_options" keys
$config['location'] = 'config'; $config['location'] = 'config';
// let config hook know, this is an inital call and not one after user hits [Apply] button
$config['initial-call'] = is_null($_content);
$ret = Api\Hooks::single($config, $appname); $ret = Api\Hooks::single($config, $appname);
if (is_array($ret)) if (is_array($ret))
{ {