';
- $actionpanel .= '| '.$GLOBALS['I18N']->get('For subscriber with email').' | |
';
+ list($msgDetails, $userDetails, $furtherDetails) = array('', '', '');
+ if (preg_match("#bounced list message ([\d]+)#", $bounce['status'], $regs))
+ $msgDetails = s('Campaign') . ' ' . PageLink2('message&id='.$regs[1], shortenTextDisplay(campaignTitle($regs[1]), 30));
+ if (isset($guessedid)) {
+ $userDetails = Sql_Fetch_Assoc_Query(sprintf('select confirmed from %s where id = %d', $tables['user'], $guessedid));
+ if ($userDetails['confirmed'] && !isBlackListed(htmlspecialchars($guessedemail)))
+ $ls_confirmed = $GLOBALS['img_tick'];
+ else
+ $ls_confirmed = $GLOBALS['img_cross'];
+ $userDetails = s('User') . ' ' . PageLink2('user&id='.$guessedid, $guessedid) . ' ' . $ls_confirmed . '
(' . s('Subscribers with a red icon are either unconfirmed or blacklisted or both') . ')';
+ }
+ if (!empty($msgDetails) || !empty($userDetails))
+ $furtherDetails = '
' . $msgDetails . (empty($msgDetails) ? '' : ' ') . $userDetails;
+ $actionpanel .= '| '.s('For subscriber with email').$furtherDetails.' | |
';
$actionpanel .= ''.$GLOBALS['I18N']->get('Increase bouncecount with').'
'.$GLOBALS['I18N']->get('(use negative numbers to decrease)').' | |
';
- $actionpanel .= ''.$GLOBALS['I18N']->get('Mark subscriber as unconfirmed').'
'.$GLOBALS['I18N']->get('(so you can resend the request for confirmation)').' | |
';
+ $actionpanel .= ''.s('Mark subscriber as unconfirmed').'
'.s('(so you can resend the request for confirmation)').'
'.s('or confirmed').'
'.s('(so you can revert possible auto unconfirmation)'). ' | '.s('unconfirmed').''.s('confirmed').' |
';
$actionpanel .= '| '.$GLOBALS['I18N']->get('Set subscriber to receive text instead of HTML').' | |
';
$actionpanel .= '| '.$GLOBALS['I18N']->get('Delete subscriber').' | |
';
if (ALLOW_DELETEBOUNCE) {
diff --git a/public_html/lists/admin/bouncemgt.php b/public_html/lists/admin/bouncemgt.php
index d27dcd7b5..734661f1a 100755
--- a/public_html/lists/admin/bouncemgt.php
+++ b/public_html/lists/admin/bouncemgt.php
@@ -14,6 +14,7 @@
echo $spb.PageLink2('checkbouncerules', s('Check Current Bounce Rules')).$spe;
echo $spb.PageLink2('processbounces', s('Process Bounces')).$spe;
+echo $spb.PageLink2('processbounces&justexisting=true', s('Reprocess Only Existing Bounces'), '', false, s('Reprocess Only Existing Bounces')).$spe;
echo '
';
@@ -24,3 +25,4 @@
echo ''.s('You have already defined bounce rules in your system. Be careful with generating new ones, because these may interfere with the ones that exist.').'
';
}
echo '
'.PageLink2('generatebouncerules', s('Generate Bounce Rules')).'
';
+
diff --git a/public_html/lists/admin/bounces.php b/public_html/lists/admin/bounces.php
index 95bda2cd4..e7442b6f5 100644
--- a/public_html/lists/admin/bounces.php
+++ b/public_html/lists/admin/bounces.php
@@ -162,7 +162,8 @@
break;
}
-}
+} elseif ($status == 'processed')
+ echo s('Subscribers with a red icon are either unconfirmed or blacklisted or both');
$ls = new WebblerListing(s($status).' '.s('bounces'));
$ls->setElementHeading('Bounce ID');
@@ -195,7 +196,13 @@
preg_match("#([\d]+) bouncecount increased#", $bounce['comment'], $regs)
OR preg_match("#([\d]+) marked unconfirmed#", $bounce['comment'], $regs)
) {
- $userIdLink = PageLink2('user&id='.$regs[1], getUserEmail($regs[1]));
+ $userIdLink = PageLink2('user&id='.$regs[1], ($regs[1]));
+ $userDetails = Sql_Fetch_Assoc_Query(sprintf('select email, confirmed from %s where id = %d', $tables['user'], $regs[1]));
+ if ($userDetails['confirmed'] && !isBlackListed(htmlspecialchars($userDetails['email'])))
+ $ls_confirmed = $GLOBALS['img_tick'];
+ else
+ $ls_confirmed = $GLOBALS['img_cross'];
+ $userIdLink .= ' ' . $ls_confirmed;
} elseif ($bounce['comment'] == 'not processed') {
$userIdLink = $GLOBALS['I18N']->get('Unknown');
} else {
diff --git a/public_html/lists/admin/connect.php b/public_html/lists/admin/connect.php
index f63b7cba9..6dc9900c5 100644
--- a/public_html/lists/admin/connect.php
+++ b/public_html/lists/admin/connect.php
@@ -1262,10 +1262,10 @@ function PageLinkDialogOnly($name, $desc = '', $url = '', $extraclass = '')
return $link;
}
-function PageLinkAjax($name, $desc = '', $url = '', $extraclass = '')
+function PageLinkAjax($name, $desc = '', $url = '', $extraclass = '', $title = '')
{
//# as PageLink2, but add the option to ajax it in a popover window
- $link = PageLink2($name, $desc, $url);
+ $link = PageLink2($name, $desc, $url, false, $title ?: $desc);
if ($link) {
$link = str_replace('