diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-06-07 14:57:06 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-06-07 14:57:06 +0200 |
| commit | bac02a348ee765dd7000108a0933ed03561aaecc (patch) | |
| tree | 5898fcc4258ab312b365dd4f18ceaa67a9dec538 /phpBB/includes/acp/acp_jabber.php | |
| parent | 99d399554866d752b59082a5f4c63ff6f4ae6d54 (diff) | |
| parent | 78b0c938a25316be1228c3e8117ef7dd859821d7 (diff) | |
| download | forums-bac02a348ee765dd7000108a0933ed03561aaecc.tar forums-bac02a348ee765dd7000108a0933ed03561aaecc.tar.gz forums-bac02a348ee765dd7000108a0933ed03561aaecc.tar.bz2 forums-bac02a348ee765dd7000108a0933ed03561aaecc.tar.xz forums-bac02a348ee765dd7000108a0933ed03561aaecc.zip | |
Merge pull request #22 from phpbb/ticket/sec-184
[ticket/sec-184] Do not output passwords to HTML
Diffstat (limited to 'phpBB/includes/acp/acp_jabber.php')
| -rw-r--r-- | phpBB/includes/acp/acp_jabber.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_jabber.php b/phpBB/includes/acp/acp_jabber.php index 8d2e9d41a3..284543acd3 100644 --- a/phpBB/includes/acp/acp_jabber.php +++ b/phpBB/includes/acp/acp_jabber.php @@ -107,7 +107,10 @@ class acp_jabber set_config('jab_host', $jab_host); set_config('jab_port', $jab_port); set_config('jab_username', $jab_username); - set_config('jab_password', $jab_password); + if ($jab_password !== '********') + { + set_config('jab_password', $jab_password); + } set_config('jab_package_size', $jab_package_size); set_config('jab_use_ssl', $jab_use_ssl); @@ -122,7 +125,7 @@ class acp_jabber 'JAB_HOST' => $jab_host, 'JAB_PORT' => ($jab_port) ? $jab_port : '', 'JAB_USERNAME' => $jab_username, - 'JAB_PASSWORD' => $jab_password, + 'JAB_PASSWORD' => $jab_password !== '' ? '********' : '', 'JAB_PACKAGE_SIZE' => $jab_package_size, 'JAB_USE_SSL' => $jab_use_ssl, 'S_CAN_USE_SSL' => jabber::can_use_ssl(), |