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

show full database url in setup, not just driver-name and show used IP in "Invalid IP address" message

Browse Source
This commit is contained in:
Ralf Becker 2015-05-03 12:04:21 +00:00
parent d06a8f1a77
commit 9319954d39
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup/inc/class.setup.inc.php
View File

@ -416,7 +416,7 @@ class setup
return True; // match return True; // match
} }
} }
$GLOBALS['egw_info']['setup']['ConfigLoginMSG'] = lang('Invalid IP address'); $GLOBALS['egw_info']['setup']['ConfigLoginMSG'] = lang('Invalid IP address').' '.$remoteip;
error_log(__METHOD__.'-> checking IP failed:'.print_r($remoteip,true)); error_log(__METHOD__.'-> checking IP failed:'.print_r($remoteip,true));
return False; return False;
} }

6
setup/index.php
View File

@ -70,7 +70,11 @@ $GLOBALS['egw_setup']->html->show_header(
$GLOBALS['egw_info']['setup']['header_msg'], $GLOBALS['egw_info']['setup']['header_msg'],
False, False,
'config', 'config',
$GLOBALS['egw_setup']->ConfigDomain . '(' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'] . ')' $GLOBALS['egw_setup']->ConfigDomain . ' (' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'].'://'.
$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_user'].'@'.
$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_host'].':'.
$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_port'].'/'.
$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_name'] . ')'
); );
/* Add cleaning of app_sessions per skeeter, but with a check for the table being there, just in case */ /* Add cleaning of app_sessions per skeeter, but with a check for the table being there, just in case */
/* $GLOBALS['egw_setup']->clear_session_cache(); */ /* $GLOBALS['egw_setup']->clear_session_cache(); */