/*
- * Copyright (C) 2000-3 Brendan Cully <brendan@kublai.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
- */
+ * Copyright notice from original mutt:
+ * 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,
+ * please see the file GPL in the top level source directory.
+ */
/* remote host account manipulation (POP/IMAP) */
+#include <lib-lib/lib-lib.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/lib-ui.h>
+
#include "mutt.h"
#include "account.h"
-#include "url.h"
-/* mutt_account_match: compare account info (host/port/user) */
-int mutt_account_match (const ACCOUNT* a1, const ACCOUNT* a2)
+/* 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(mod_core.username);
- if (a1->type != a2->type)
- return 0;
- if (ascii_strcasecmp (a1->host, a2->host))
- return 0;
- if (a1->port != a2->port)
- return 0;
+ if (a1->type != a2->type)
+ return 0;
+ if (ascii_strcasecmp (a1->host, a2->host))
+ return 0;
+ if (a1->port != a2->port)
+ return 0;
-#ifdef USE_IMAP
- if (a1->type == M_ACCT_TYPE_IMAP && ImapUser)
- user = ImapUser;
-#endif
-
-#ifdef USE_POP
- if (a1->type == M_ACCT_TYPE_POP && PopUser)
- user = PopUser;
-#endif
-
-#ifdef USE_NNTP
- if (a1->type == M_ACCT_TYPE_NNTP && NntpUser)
- user = NntpUser;
-#endif
-
- if (a1->flags & a2->flags & M_ACCT_USER)
- return (!strcmp (a1->user, a2->user));
- if (a1->flags & M_ACCT_USER)
- return (!strcmp (a1->user, user));
- if (a2->flags & M_ACCT_USER)
- return (!strcmp (a2->user, user));
-
- return 1;
+ if (a1->type == M_ACCT_TYPE_IMAP && !m_strisempty(ImapUser))
+ user = ImapUser;
+
+ if (a1->type == M_ACCT_TYPE_POP && !m_strisempty(PopUser))
+ user = PopUser;
+
+ if (a1->has_user && a2->has_user)
+ return !m_strcmp(a1->user, a2->user);
+ if (a1->has_user)
+ return !m_strcmp(a1->user, user);
+ if (a2->has_user)
+ return !m_strcmp(a2->user, user);
+
+ return 1;
}
/* mutt_account_fromurl: fill account with information from url. */
-int mutt_account_fromurl (ACCOUNT* account, ciss_url_t* url)
+int mutt_account_fromurl(ACCOUNT *account, ciss_url_t *url)
{
- /* must be present */
- if (url->host)
- strfcpy (account->host, url->host, sizeof (account->host));
- else
- return -1;
-
- if (url->user)
- {
- strfcpy (account->user, url->user, sizeof (account->user));
- account->flags |= M_ACCT_USER;
- }
- if (url->pass)
- {
- strfcpy (account->pass, url->pass, sizeof (account->pass));
- account->flags |= M_ACCT_PASS;
- }
- if (url->port)
- {
- account->port = url->port;
- account->flags |= M_ACCT_PORT;
- }
-
- return 0;
+ /* must be present */
+ if (!url->host)
+ return -1;
+ m_strcpy(account->host, sizeof(account->host), url->host);
+
+ if (url->user) {
+ m_strcpy(account->user, sizeof(account->user), url->user);
+ account->has_user = 1;
+ }
+ if (url->pass) {
+ m_strcpy(account->pass, sizeof(account->pass), url->pass);
+ account->has_pass = 1;
+ }
+ if (url->port) {
+ account->port = url->port;
+ account->has_port = 1;
+ }
+
+ return 0;
}
/* mutt_account_tourl: fill URL with info from account. The URL information
* is a set of pointers into account - don't free or edit account until
* you've finished with url (make a copy of account if you need it for
* a while). */
-void mutt_account_tourl (ACCOUNT* account, ciss_url_t* url)
+void mutt_account_tourl(ACCOUNT *account, ciss_url_t *url)
{
- url->scheme = U_UNKNOWN;
- url->user = NULL;
- url->pass = NULL;
- url->port = 0;
-
-#ifdef USE_IMAP
- if (account->type == M_ACCT_TYPE_IMAP)
- {
- if (account->flags & M_ACCT_SSL)
- url->scheme = U_IMAPS;
- else
- url->scheme = U_IMAP;
- }
-#endif
-
-#ifdef USE_POP
- if (account->type == M_ACCT_TYPE_POP)
- {
- if (account->flags & M_ACCT_SSL)
- url->scheme = U_POPS;
- else
- url->scheme = U_POP;
- }
-#endif
-
-#ifdef USE_NNTP
- if (account->type == M_ACCT_TYPE_NNTP)
- {
- if (account->flags & M_ACCT_SSL)
- url->scheme = U_NNTPS;
- else
- url->scheme = U_NNTP;
- }
-#endif
-
- url->host = account->host;
- if (account->flags & M_ACCT_PORT)
- url->port = account->port;
- if (account->flags & M_ACCT_USER)
- url->user = account->user;
- if (account->flags & M_ACCT_PASS)
- url->pass = account->pass;
+ url->scheme = U_UNKNOWN;
+ url->user = NULL;
+ url->pass = NULL;
+ url->port = 0;
+
+ if (account->type == M_ACCT_TYPE_IMAP) {
+ url->scheme = account->has_ssl ? U_IMAPS : U_IMAP;
+ }
+
+ if (account->type == M_ACCT_TYPE_POP) {
+ url->scheme = account->has_ssl ? U_POPS : U_POP;
+ }
+
+ url->host = account->host;
+ if (account->has_port)
+ url->port = account->port;
+ if (account->has_user)
+ url->user = account->user;
+ if (account->has_pass)
+ url->pass = account->pass;
}
-/* mutt_account_getuser: retrieve username into ACCOUNT, if neccessary */
-int mutt_account_getuser (ACCOUNT* account)
+/* mutt_account_getuser: retrieve username into ACCOUNT, if necessary */
+int mutt_account_getuser (ACCOUNT * account)
{
- char prompt[SHORT_STRING];
+ char prompt[STRING];
+
+ /* already set */
+ if (account->has_user)
+ return 0;
+ else if ((account->type == M_ACCT_TYPE_IMAP) && !m_strisempty(ImapUser))
+ m_strcpy(account->user, sizeof(account->user), ImapUser);
+ else if ((account->type == M_ACCT_TYPE_POP) && !m_strisempty(PopUser))
+ m_strcpy(account->user, sizeof(account->user), PopUser);
+ /* prompt (defaults to unix username), copy into account->user */
+ else {
+ snprintf(prompt, sizeof(prompt), _("Username at %s: "), account->host);
+ m_strcpy(account->user, sizeof(account->user), NONULL(mod_core.username));
+ if (mutt_get_field_unbuffered(prompt, account->user,
+ sizeof(account->user), 0))
+ return -1;
+ }
+
+ account->has_user = 1;
- /* already set */
- if (account->flags & M_ACCT_USER)
return 0;
-#ifdef USE_IMAP
- else if ((account->type == M_ACCT_TYPE_IMAP) && ImapUser)
- strfcpy (account->user, ImapUser, sizeof (account->user));
-#endif
-#ifdef USE_POP
- else if ((account->type == M_ACCT_TYPE_POP) && PopUser)
- strfcpy (account->user, PopUser, sizeof (account->user));
-#endif
-#ifdef USE_NNTP
- else if ((account->type == M_ACCT_TYPE_NNTP) && NntpUser)
- strfcpy (account->user, NntpUser, sizeof (account->user));
-#endif
- /* prompt (defaults to unix username), copy into account->user */
- 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))
- return -1;
- }
-
- account->flags |= M_ACCT_USER;
-
- return 0;
}
-/* mutt_account_getpass: fetch password into ACCOUNT, if neccessary */
-int mutt_account_getpass (ACCOUNT* account)
+int mutt_account_getlogin (ACCOUNT* account)
{
- char prompt[SHORT_STRING];
+ /* already set */
+ if (account->has_login)
+ return 0;
+
+ if (account->type == M_ACCT_TYPE_IMAP && !m_strisempty(ImapLogin)) {
+ m_strcpy(account->login, sizeof(account->login), ImapLogin);
+ account->has_login = 1;
+ } else {
+ mutt_account_getuser (account);
+ m_strcpy(account->login, sizeof(account->login), account->user);
+ }
+
+ account->has_login = 1;
- if (account->flags & M_ACCT_PASS)
return 0;
-#ifdef USE_IMAP
- else if ((account->type == M_ACCT_TYPE_IMAP) && ImapPass)
- strfcpy (account->pass, ImapPass, sizeof (account->pass));
-#endif
-#ifdef USE_POP
- else if ((account->type == M_ACCT_TYPE_POP) && PopPass)
- strfcpy (account->pass, PopPass, sizeof (account->pass));
-#endif
-#ifdef USE_NNTP
- else if ((account->type == M_ACCT_TYPE_NNTP) && NntpPass)
- strfcpy (account->pass, NntpPass, sizeof (account->pass));
-#endif
- else
- {
- snprintf (prompt, sizeof (prompt), _("Password for %s@%s: "),
- account->user, account->host);
- account->pass[0] = '\0';
- if (mutt_get_password (prompt, account->pass, sizeof (account->pass)))
- return -1;
- }
-
- account->flags |= M_ACCT_PASS;
-
- return 0;
}
-void mutt_account_unsetpass (ACCOUNT* account)
+/* mutt_account_getpass: fetch password into ACCOUNT, if neccessary */
+int mutt_account_getpass (ACCOUNT * account)
{
- account->flags &= !M_ACCT_PASS;
+ char prompt[STRING];
+
+ if (account->has_pass)
+ return 0;
+ else if ((account->type == M_ACCT_TYPE_IMAP) && !m_strisempty(ImapPass))
+ m_strcpy(account->pass, sizeof(account->pass), ImapPass);
+ else if ((account->type == M_ACCT_TYPE_POP) && !m_strisempty(PopPass))
+ m_strcpy(account->pass, sizeof(account->pass), PopPass);
+ else {
+ snprintf(prompt, sizeof(prompt), _("Password for %s@%s: "),
+ account->has_login ? account->login : account->user,
+ account->host);
+ account->pass[0] = '\0';
+ if (mutt_get_field_unbuffered(prompt, account->pass,
+ sizeof(account->pass), M_PASS))
+ return -1;
+ }
+
+ account->has_pass = 1;
+
+ return 0;
}
projects / apps / madmutt.git / blobdiff