holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stop Chrome from autofilling passwords and do NOT display a password for OAuth when editing an account

Browse Source
This commit is contained in:
ralf 2023-03-14 10:18:46 +01:00
parent 84d067d2b9
commit 0c13bc863a
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/inc/class.admin_mail.inc.php
View File

@ -886,7 +886,7 @@ class admin_mail
{ {
$content['acc_id'] = key($content['accounts']); $content['acc_id'] = key($content['accounts']);
//error_log(__METHOD__.__LINE__.'.'.array2string($content['acc_id'])); //error_log(__METHOD__.__LINE__.'.'.array2string($content['acc_id']));
// test if the "to be selected" acccount is imap or not // test if the "to be selected" account is imap or not
if (is_array($content['accounts']) && count($content['accounts'])>1 && Mail\Account::is_multiple($content['acc_id'])) if (is_array($content['accounts']) && count($content['accounts'])>1 && Mail\Account::is_multiple($content['acc_id']))
{ {
try { try {
@ -930,6 +930,13 @@ class admin_mail
$content['called_for'] : $GLOBALS['egw_info']['user']['account_id']); $content['called_for'] : $GLOBALS['egw_info']['user']['account_id']);
$account->getUserData(); // quota, aliases, forwards etc. $account->getUserData(); // quota, aliases, forwards etc.
$content += $account->params; $content += $account->params;
foreach(['acc_imap_password', 'acc_smtp_password'] as $n)
{
if (isset($content['acc_oauth_username']) && $content[$n] === Mail\Credentials::UNAVAILABLE)
{
unset($content[$n]);
}
}
$content['acc_sieve_enabled'] = (string)($content['acc_sieve_enabled']); $content['acc_sieve_enabled'] = (string)($content['acc_sieve_enabled']);
$content['notify_use_default'] = !$content['notify_account_id']; $content['notify_use_default'] = !$content['notify_account_id'];
self::fix_account_id_0($content['account_id']); self::fix_account_id_0($content['account_id']);

8
admin/templates/default/mailaccount.xet
View File

@ -66,7 +66,7 @@
</row> </row>
<row> <row>
<et2-description for="acc_imap_password" value="Password"></et2-description> <et2-description for="acc_imap_password" value="Password"></et2-description>
<et2-password id="acc_imap_password" maxlength="128" autocomplete="off" placeholder="Leave empty to use OAuth, if supported"></et2-password> <et2-password id="acc_imap_password" maxlength="128" autocomplete="new-password" placeholder="Leave empty to use OAuth, if supported"></et2-password>
<et2-description id="acc_imap_account_id" class="emailadmin_diagnostic"></et2-description> <et2-description id="acc_imap_account_id" class="emailadmin_diagnostic"></et2-description>
<et2-description></et2-description> <et2-description></et2-description>
</row> </row>
@ -97,7 +97,7 @@
</row> </row>
<row> <row>
<et2-description for="acc_imap_admin_password" value="Password"></et2-description> <et2-description for="acc_imap_admin_password" value="Password"></et2-description>
<et2-password id="acc_imap_admin_password" maxlength="128" autocomplete="off"></et2-password> <et2-password id="acc_imap_admin_password" maxlength="128" autocomplete="new-password"></et2-password>
</row> </row>
<row> <row>
<et2-description></et2-description> <et2-description></et2-description>
@ -218,7 +218,7 @@
<row class="@manual_class"> <row class="@manual_class">
<et2-description for="acc_smtp_password" value="Password"></et2-description> <et2-description for="acc_smtp_password" value="Password"></et2-description>
<et2-hbox> <et2-hbox>
<et2-password id="acc_smtp_password" maxlength="128" autocomplete="off" placeholder="Leave empty to use OAuth, if supported"></et2-password> <et2-password id="acc_smtp_password" maxlength="128" autocomplete="new-password" placeholder="Leave empty to use OAuth, if supported"></et2-password>
<et2-description id="acc_smtp_account_id" class="emailadmin_diagnostic"></et2-description> <et2-description id="acc_smtp_account_id" class="emailadmin_diagnostic"></et2-description>
</et2-hbox> </et2-hbox>
</row> </row>
@ -239,7 +239,7 @@
</row> </row>
<row> <row>
<et2-description for="acc_spam_password" value="API Token"></et2-description> <et2-description for="acc_spam_password" value="API Token"></et2-description>
<et2-password id="acc_spam_password" width="95%" suggest="24" placeholder="@spamtitan_blur"></et2-password> <et2-password id="acc_spam_password" width="95%" suggest="24" autocomplete="new-password" placeholder="@spamtitan_blur"></et2-password>
</row> </row>
</rows> </rows>
</grid> </grid>

2
api/src/Mail/Credentials.php
View File

@ -251,7 +251,7 @@ class Credentials
if (empty($results[$pre.'username'])) if (empty($results[$pre.'username']))
{ {
$results[$pre.'username'] = $row['cred_username']; $results[$pre.'username'] = $row['cred_username'];
$results[$pre.'password'] = '**oauth**'; $results[$pre.'password'] = self::UNAVAILABLE;
} }
} }
} }