/*
* Copyright notice from original mutt:
- * Copyright (C) 2000-3 Brendan Cully <brendan@kublai.com>
+ * Copyright (C) 2000-5 Brendan Cully <brendan@kublai.com>
*
* This file is part of mutt-ng, see http://www.muttng.org/.
* It's licensed under the GNU General Public License,
#endif
#include "mutt.h"
+#include "enter.h"
+#include "ascii.h"
#include "account.h"
#include "url.h"
#include "lib/intl.h"
#include "lib/str.h"
-/* mutt_account_match: compare account info (host/port/user) */
+/* mutt_account_match: compare account info (host/port/user/login) */
int mutt_account_match (const ACCOUNT * a1, const ACCOUNT * a2)
{
- const char *user = NONULL (Username);
+ const char* user = NONULL (Username);
+ const char* login = NONULL (Username);
if (a1->type != a2->type)
return 0;
return 0;
#ifdef USE_IMAP
- if (a1->type == M_ACCT_TYPE_IMAP && ImapUser)
- user = ImapUser;
+ if (a1->type == M_ACCT_TYPE_IMAP) {
+ if (ImapUser)
+ user = ImapUser;
+ if (ImapLogin)
+ login = ImapLogin;
+ }
#endif
#ifdef USE_POP
#endif
if (a1->flags & a2->flags & M_ACCT_USER)
- return (!safe_strcmp (a1->user, a2->user));
+ return (!str_cmp (a1->user, a2->user));
if (a1->flags & M_ACCT_USER)
- return (!safe_strcmp (a1->user, user));
+ return (!str_cmp (a1->user, user));
if (a2->flags & M_ACCT_USER)
- return (!safe_strcmp (a2->user, user));
+ return (!str_cmp (a2->user, user));
return 1;
}
url->pass = account->pass;
}
-/* mutt_account_getuser: retrieve username into ACCOUNT, if neccessary */
+/* mutt_account_getuser: retrieve username into ACCOUNT, if necessary */
int mutt_account_getuser (ACCOUNT * account)
{
char prompt[SHORT_STRING];
else {
snprintf (prompt, sizeof (prompt), _("Username at %s: "), account->host);
strfcpy (account->user, NONULL (Username), sizeof (account->user));
- if (mutt_get_field (prompt, account->user, sizeof (account->user), 0))
+ if (mutt_get_field_unbuffered (prompt, account->user,
+ sizeof (account->user), 0))
return -1;
}
return 0;
}
+int mutt_account_getlogin (ACCOUNT* account)
+{
+ /* already set */
+ if (account->flags & M_ACCT_LOGIN)
+ return 0;
+#ifdef USE_IMAP
+ else if (account->type == M_ACCT_TYPE_IMAP)
+ {
+ if (ImapLogin) {
+ strfcpy (account->login, ImapLogin, sizeof (account->login));
+ account->flags |= M_ACCT_LOGIN;
+ }
+ }
+#endif
+
+ if (!(account->flags & M_ACCT_LOGIN)) {
+ mutt_account_getuser (account);
+ strfcpy (account->login, account->user, sizeof (account->login));
+ }
+
+ account->flags |= M_ACCT_LOGIN;
+
+ return 0;
+}
+
/* mutt_account_getpass: fetch password into ACCOUNT, if neccessary */
int mutt_account_getpass (ACCOUNT * account)
{
#endif
else {
snprintf (prompt, sizeof (prompt), _("Password for %s@%s: "),
- account->user, account->host);
+ account->flags & M_ACCT_LOGIN ? account->login : account->user,
+ account->host);
account->pass[0] = '\0';
- if (mutt_get_password (prompt, account->pass, sizeof (account->pass)))
+ if (mutt_get_field_unbuffered (prompt, account->pass,
+ sizeof (account->pass), M_PASS))
return -1;
}