From 088541742560c1d571f30168498fa2d58e019ee0 Mon Sep 17 00:00:00 2001 From: e107steved Date: Wed, 2 Jan 2008 20:14:13 +0000 Subject: [PATCH] Support TLS options on bounced email account --- e107_admin/mailout.php | 17 ++++++++++---- e107_admin/users.php | 6 ++--- e107_handlers/pop3_class.php | 12 ++++++---- e107_languages/English/admin/help/mailout.php | 23 ++++++++++++------- e107_languages/English/admin/lan_mailout.php | 13 ++++++----- 5 files changed, 45 insertions(+), 26 deletions(-) diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php index e2482a578..ecb728ff2 100644 --- a/e107_admin/mailout.php +++ b/e107_admin/mailout.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/mailout.php,v $ -| $Revision: 1.7 $ -| $Date: 2007-12-22 14:49:21 $ +| $Revision: 1.8 $ +| $Date: 2008-01-02 20:14:05 $ | $Author: e107steved $ | | Work in progress - supplementary mailer plugin @@ -505,6 +505,7 @@ if (isset($_POST['updateprefs']) && getperms("0")) $pref['mail_bounce_pop3'] = $_POST['mail_bounce_pop3']; $pref['mail_bounce_user'] = $_POST['mail_bounce_user']; $pref['mail_bounce_pass'] = $_POST['mail_bounce_pass']; + $pref['mail_bounce_type'] = $_POST['mail_bounce_type']; $pref['mail_bounce_delete'] = $_POST['mail_bounce_delete']; $pref['mailout_enabled'] = implode(',',$_POST['mail_mailer_enabled']); @@ -1133,9 +1134,17 @@ $text = " ".LAN_MAILOUT_31." ".LAN_MAILOUT_32.":
- ".LAN_MAILOUT_33." (POP3):
+ ".LAN_MAILOUT_33.":
".LAN_MAILOUT_34.":
- ".LAN_MAILOUT_35.":
"; + ".LAN_MAILOUT_35.":
+ ".LAN_MAILOUT_120.":
\n + "; $check = ($pref['mail_bounce_delete']==1) ? " checked='checked'" : ""; $text .= LAN_MAILOUT_36.": diff --git a/e107_admin/users.php b/e107_admin/users.php index aeb468eda..0c04f162c 100644 --- a/e107_admin/users.php +++ b/e107_admin/users.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/users.php,v $ -| $Revision: 1.11 $ -| $Date: 2008-01-01 18:18:05 $ +| $Revision: 1.12 $ +| $Date: 2008-01-02 20:14:05 $ | $Author: e107steved $ +----------------------------------------------------------------------------+ */ @@ -1293,7 +1293,7 @@ class users // echo "Check bounces. Action: {$bounce_act}; Entries: {$bounce_arr}
"; - $obj= new receiveMail($pref['mail_bounce_user'],$pref['mail_bounce_pass'],$pref['mail_bounce_email'],$pref['mail_bounce_pop3'],'pop3','110'); + $obj= new receiveMail($pref['mail_bounce_user'],$pref['mail_bounce_pass'],$pref['mail_bounce_email'],$pref['mail_bounce_pop3'],varset($pref['mail_bounce_type'],'pop3')); $del_count = 0; if ($bounce_act !='first_check') { // Must do some deleting diff --git a/e107_handlers/pop3_class.php b/e107_handlers/pop3_class.php index d86408210..f61b3c553 100644 --- a/e107_handlers/pop3_class.php +++ b/e107_handlers/pop3_class.php @@ -1,17 +1,17 @@ server = $strConnect; $this->username = $username; diff --git a/e107_languages/English/admin/help/mailout.php b/e107_languages/English/admin/help/mailout.php index 3279b0393..2782fde82 100644 --- a/e107_languages/English/admin/help/mailout.php +++ b/e107_languages/English/admin/help/mailout.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/help/mailout.php,v $ -| $Revision: 1.2 $ -| $Date: 2007-12-22 14:49:34 $ +| $Revision: 1.3 $ +| $Date: 2008-01-02 20:14:13 $ | $Author: e107steved $ +----------------------------------------------------------------------------+ */ @@ -44,12 +44,19 @@ if (e_QUERY) list($action,$junk) = explode('.',e_QUERY); else $action = 'makemai $text .= 'Any attachment is selected from the list of valid downloads.'; break; case 'prefs' : - $text = 'Configure mailshot options.
'; - $text .= 'A test email is sent using the current method and settings.
'; - $text .= 'Use SMTP to send mail if possible. The settings will depend on your host\'s mail server.
'; - $text .= 'You can specifiy a POP3 account to receive the return response when an email is undeliverable.
'; - $text .= 'If you have additional mail-related plugins, you can select which of them may contribute email addresses to the list.
'; - $text .= 'The logging option creates a text file in the stats plugin\'s log directory. This must be deleted periodically.'; + $text = 'Configure mailshot options.
+ A test email is sent using the current method and settings.

'; + $text .= 'Emailing Method
+ Use SMTP to send mail if possible. The settings will depend on your host\'s mail server.

'; + $text .= 'Bounced Emails
+ You can specify a POP3 account to receive the return response when an email is undeliverable. Normally this will be a standard + POP3 account; use the TLS-related options only if specifically required by your host

'; + $text .= 'Email Address Sources
+ If you have additional mail-related plugins, you can select which of them may contribute email addresses to the list.

'; + $text .= 'Logging
+ The logging option creates a text file in the stats plugin\'s log directory. This must be deleted periodically. The \'logging + only\' options allow you to see exactly who would receive emails if actually sent. The \'with errors\' option fails every + 7th email, primarily for testing'; break; default : $text = 'Undocumented option'; diff --git a/e107_languages/English/admin/lan_mailout.php b/e107_languages/English/admin/lan_mailout.php index 278f07128..391ded20c 100644 --- a/e107_languages/English/admin/lan_mailout.php +++ b/e107_languages/English/admin/lan_mailout.php @@ -4,8 +4,8 @@ | e107 website system - Language File. | | $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_mailout.php,v $ -| $Revision: 1.2 $ -| $Date: 2007-12-22 14:49:34 $ +| $Revision: 1.3 $ +| $Date: 2008-01-02 20:14:13 $ | $Author: e107steved $ +----------------------------------------------------------------------------+ */ @@ -128,10 +128,11 @@ define('LAN_MAILOUT_116','If unsure, leave as php'); define('LAN_MAILOUT_117','complete'); define('LAN_MAILOUT_118','Click on \'proceed\' to start sending emails. Click on \'cancel\' to stop the run. Once complete, select another page. Unsent emails cal be viewed through the \'Mailshot status\' screen'); define('LAN_MAILOUT_119','Logging only, with errors'); -define('LAN_MAILOUT_120',''); - - - +define('LAN_MAILOUT_120','Account type'); +define('LAN_MAILOUT_121','Standard POP3'); +define('LAN_MAILOUT_122','POP3, TLS disabled'); +define('LAN_MAILOUT_123','POP3 with TLS'); +define('LAN_MAILOUT_124','IMAP');