extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

allow to pass the tab as get parameter and passing config object to final_validation hook too

Browse Source
This commit is contained in:
Ralf Becker 2021-02-26 21:27:57 +02:00
parent 034a8e1611
commit a2efa8069c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,7 +184,7 @@ class admin_config
isset($GLOBALS['egw_info']['server']['found_validation_hook']['final_validation']) && isset($GLOBALS['egw_info']['server']['found_validation_hook']['final_validation']) &&
is_callable($func=$GLOBALS['egw_info']['server']['found_validation_hook']['final_validation'])) is_callable($func=$GLOBALS['egw_info']['server']['found_validation_hook']['final_validation']))
{ {
if (is_string($err=$func($_content['newsettings'])) || ($err=$GLOBALS['config_error'])) if (is_string($err=$func($_content['newsettings'], $c)) || ($err=$GLOBALS['config_error']))
{ {
$errors .= lang($err) . "\n"; $errors .= lang($err) . "\n";
$GLOBALS['config_error'] = False; $GLOBALS['config_error'] = False;
@ -266,8 +266,8 @@ class admin_config
$tmpl = new Api\Etemplate($appname.'.config'); $tmpl = new Api\Etemplate($appname.'.config');
$path = (parse_url($tmpl->rel_path, PHP_URL_SCHEME) !== 'vfs' ? EGW_SERVER_ROOT : '').$tmpl->rel_path; $path = (parse_url($tmpl->rel_path, PHP_URL_SCHEME) !== 'vfs' ? EGW_SERVER_ROOT : '').$tmpl->rel_path;
$content = array( $content = array(
'tabs' => $_content['tabs'], 'tabs' => $_content['tabs'] ?: $_GET['tab'] ?? '',
'tabs2' => $_content['tabs2'], 'tabs2' => $_content['tabs2'] ?: $_GET['tab'] ?? '',
'template' => $appname.'.config', 'template' => $appname.'.config',
'newsettings' => array(), 'newsettings' => array(),
); );