Since these are keyed by IMAP and NNTP URIs which can never
conflict, it simplifies our internals to keep them in one big
hash since we'll add POP3 and JMAP client support.
my $err;
if ($mic->login && $mic->IsAuthenticated) {
# success! keep IMAPClient->new arg in case we get disconnected
my $err;
if ($mic->login && $mic->IsAuthenticated) {
# success! keep IMAPClient->new arg in case we get disconnected
- $self->{mic_arg}->{$sec} = $mic_arg;
+ $self->{net_arg}->{$sec} = $mic_arg;
if ($cred) {
$uri->user($cred->{username}) if !defined($uri->user);
} elsif ($mic_arg->{Authmechanism} eq 'ANONYMOUS') {
if ($cred) {
$uri->user($cred->{username}) if !defined($uri->user);
} elsif ($mic_arg->{Authmechanism} eq 'ANONYMOUS') {
- $self->{nn_arg}->{$sec} = $nn_arg;
+ $self->{net_arg}->{$sec} = $nn_arg;
$cred->run($nn ? 'approve' : 'reject') if $cred && $cred->{filled};
$nn;
}
$cred->run($nn ? 'approve' : 'reject') if $cred && $cred->{filled};
$nn;
}
}
}
# make sure we can connect and cache the credentials in memory
}
}
# make sure we can connect and cache the credentials in memory
- $self->{mic_arg} = {}; # schema://authority => IMAPClient->new args
my $mics = {}; # schema://authority => IMAPClient obj
for my $orig_uri (@{$self->{imap_order}}) {
my $sec = uri_section($orig_uri);
my $mics = {}; # schema://authority => IMAPClient obj
for my $orig_uri (@{$self->{imap_order}}) {
my $sec = uri_section($orig_uri);
}
}
# make sure we can connect and cache the credentials in memory
}
}
# make sure we can connect and cache the credentials in memory
- $self->{nn_arg} = {}; # schema://authority => Net::NNTP->new args
my %nn; # schema://authority => Net::NNTP object
for my $uri (@{$self->{nntp_order}}) {
my $sec = uri_section($uri);
my %nn; # schema://authority => Net::NNTP object
for my $uri (@{$self->{nntp_order}}) {
my $sec = uri_section($uri);
return $mic if $mic && $mic->IsConnected;
delete $cached->{$sec};
}
return $mic if $mic && $mic->IsConnected;
delete $cached->{$sec};
}
- my $mic_arg = $self->{mic_arg}->{$sec} or
+ my $mic_arg = $self->{net_arg}->{$sec} or
die "BUG: no Mail::IMAPClient->new arg for $sec";
if (defined(my $cb_name = $mic_arg->{Authcallback})) {
if (ref($cb_name) ne 'CODE') {
die "BUG: no Mail::IMAPClient->new arg for $sec";
if (defined(my $cb_name = $mic_arg->{Authcallback})) {
if (ref($cb_name) ne 'CODE') {
my $cached = $self->{nn_cached} // {};
my $nn;
$nn = delete($cached->{$sec}) and return $nn;
my $cached = $self->{nn_cached} // {};
my $nn;
$nn = delete($cached->{$sec}) and return $nn;
- my $nn_arg = $self->{nn_arg}->{$sec} or
+ my $nn_arg = $self->{net_arg}->{$sec} or
die "BUG: no Net::NNTP->new arg for $sec";
my $nntp_cfg = $self->{cfg_opt}->{$sec};
$nn = nn_new($nn_arg, $nntp_cfg, $uri) or return;
die "BUG: no Net::NNTP->new arg for $sec";
my $nntp_cfg = $self->{cfg_opt}->{$sec};
$nn = nn_new($nn_arg, $nntp_cfg, $uri) or return;
sub watch_imap_idle_1 ($$$) {
my ($self, $uri, $intvl) = @_;
my $sec = uri_section($uri);
sub watch_imap_idle_1 ($$$) {
my ($self, $uri, $intvl) = @_;
my $sec = uri_section($uri);
- my $mic_arg = $self->{mic_arg}->{$sec} or
+ my $mic_arg = $self->{net_arg}->{$sec} or
die "BUG: no Mail::IMAPClient->new arg for $sec";
my $mic;
local $0 = $uri->mailbox." $sec";
die "BUG: no Mail::IMAPClient->new arg for $sec";
my $mic;
local $0 = $uri->mailbox." $sec";