diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-03-26 23:35:57 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-03-26 23:35:57 -0400 |
| commit | 02c4d4ee7ec1e135397003e6685af4503e9ce40d (patch) | |
| tree | abce268dc2a15f152e2674f93726b71b9fbb88a3 /phpBB | |
| parent | 5e688f9540ebb5b32a22202257d5ca36e8e3e254 (diff) | |
| parent | 47ab801440ff51cda270c6dbe5dc487a8e68e55d (diff) | |
| download | forums-02c4d4ee7ec1e135397003e6685af4503e9ce40d.tar forums-02c4d4ee7ec1e135397003e6685af4503e9ce40d.tar.gz forums-02c4d4ee7ec1e135397003e6685af4503e9ce40d.tar.bz2 forums-02c4d4ee7ec1e135397003e6685af4503e9ce40d.tar.xz forums-02c4d4ee7ec1e135397003e6685af4503e9ce40d.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/12310] Don't autocomplete SMTP user/pass on install
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/install/index.php | 3 | ||||
| -rw-r--r-- | phpBB/install/install_install.php | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php index b18a9dce1b..66c8559e98 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -720,8 +720,9 @@ class module $size = (int) $tpl_type[1]; $maxlength = (int) $tpl_type[2]; + $autocomplete = (isset($options['autocomplete']) && $options['autocomplete'] == 'off') ? ' autocomplete="off"' : ''; - $tpl = '<input id="' . $name . '" type="' . $tpl_type[0] . '"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="' . $name . '" value="' . $value . '" />'; + $tpl = '<input id="' . $name . '" type="' . $tpl_type[0] . '"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="' . $name . '"' . $autocomplete . ' value="' . $value . '" />'; break; case 'textarea': diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 72e6f6affa..009f0dfa33 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -2017,8 +2017,8 @@ class install_install extends module 'smtp_delivery' => array('lang' => 'USE_SMTP', 'type' => 'radio:yes_no', 'explain' => true), 'smtp_host' => array('lang' => 'SMTP_SERVER', 'type' => 'text:25:50', 'explain' => false), 'smtp_auth' => array('lang' => 'SMTP_AUTH_METHOD', 'type' => 'select', 'options' => '$this->module->mail_auth_select(\'{VALUE}\')', 'explain' => true), - 'smtp_user' => array('lang' => 'SMTP_USERNAME', 'type' => 'text:25:255', 'explain' => true), - 'smtp_pass' => array('lang' => 'SMTP_PASSWORD', 'type' => 'password:25:255', 'explain' => true), + 'smtp_user' => array('lang' => 'SMTP_USERNAME', 'type' => 'text:25:255', 'explain' => true, 'options' => array('autocomplete' => 'off')), + 'smtp_pass' => array('lang' => 'SMTP_PASSWORD', 'type' => 'password:25:255', 'explain' => true, 'options' => array('autocomplete' => 'off')), 'legend2' => 'SERVER_URL_SETTINGS', 'cookie_secure' => array('lang' => 'COOKIE_SECURE', 'type' => 'radio:enabled_disabled', 'explain' => true), |