mirror of
https://github.com/e107inc/e107.git
synced 2025-09-08 21:30:54 +02:00
First cut of updated bulk mail handling, including support for provision of email addresses by plugins. Still very much a work in progress, but should send some sort of email if treated nicely.
This commit is contained in:
e107steved
@@ -11,15 +11,17 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/help/mailout.php,v $
|
||||
| $Revision: 1.3 $
|
||||
| $Date: 2008-01-02 20:14:13 $
|
||||
| $Revision: 1.4 $
|
||||
| $Date: 2009-11-15 17:38:05 $
|
||||
| $Author: e107steved $
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
|
||||
if (!defined('e107_INIT')) { exit; }
|
||||
|
||||
if (e_QUERY) list($action,$junk) = explode('.',e_QUERY); else $action = 'makemail';
|
||||
|
||||
$e107 = e107::getInstance();
|
||||
$action = $e107->tp->toDB(varset($_GET['mode'],'makemail'));
|
||||
|
||||
switch ($action)
|
||||
{
|
||||
@@ -27,22 +29,31 @@ if (e_QUERY) list($action,$junk) = explode('.',e_QUERY); else $action = 'makemai
|
||||
$text = 'Send mail with constraints specified by an optional plugin';
|
||||
break;
|
||||
case 'debug' :
|
||||
$text = 'For devs only. A second query parameter matches the gen_type field in the \'generic\' table. Ignore the column headings';
|
||||
$text = 'For devs only. Not used at present';
|
||||
break;
|
||||
case 'list' :
|
||||
case 'saved' :
|
||||
$text = 'Select and use a saved email template to send a mailshot. Delete any template no longer required';
|
||||
break;
|
||||
case 'mailouts' :
|
||||
$text = 'List of stored mailshots. Allows you to see whether they have been sent, and re-send any emails which failed.<br />';
|
||||
$text .= 'You can also view some detail of the email, including the error reason for some of those that failed.<br />';
|
||||
$text .= 'To retry outstanding emails, click on the \'resend\' icon. Then click on \'Proceed\', which will open a progress window.';
|
||||
$text .= ' To abort a mailshot, click on the \'Cancel\' button in the main screen.';
|
||||
case 'pending' :
|
||||
$text = 'List of mailshots released for sending, together with current status.';
|
||||
break;
|
||||
case 'held' :
|
||||
$text = 'List of emails which have been prepared for sending, but not yet released';
|
||||
break;
|
||||
case 'sent' :
|
||||
$text = 'List of completed mailshots. Allows you to see the sending results.<br />';
|
||||
break;
|
||||
case 'savedmail' :
|
||||
case 'makemail' :
|
||||
$text = 'Create an email, and select the list of recipients. You can save the email text as a template for later, or send immediately.<br />';
|
||||
$text .= 'Any attachment is selected from the list of valid downloads.';
|
||||
$text = 'Create an email, give it a meaningful title, and select the list of recipients. You can save everything as a template for later, or send immediately.<br />';
|
||||
$text .= 'Email addresses may be contributed by plugins (such as newsletter), and duplicates are removed when the mail is sent<br />';
|
||||
$text .= 'Any attachment is selected from the list of valid downloads.<br />';
|
||||
$text .= 'Mail may be sent as plain text (most universal, and least at risk of being classed as spam), or as HTML (in which case a plain text alternative is automatically generated). The theme style
|
||||
may optionally be added to the email';
|
||||
break;
|
||||
case 'recipients' :
|
||||
$text = 'Shows all recipients or potential recipients of an email, together with current status';
|
||||
break;
|
||||
case 'prefs' :
|
||||
$text = '<b>Configure mailshot options.</b><br />
|
||||
A test email is sent using the current method and settings.<br /><br />';
|
||||
@@ -54,13 +65,16 @@ if (e_QUERY) list($action,$junk) = explode('.',e_QUERY); else $action = 'makemai
|
||||
$text .= '<b>Email Address Sources</b><br />
|
||||
If you have additional mail-related plugins, you can select which of them may contribute email addresses to the list.<br /><br />';
|
||||
$text .= '<b>Logging</b><br />
|
||||
The logging option creates a text file in the stats plugin\'s log directory. This must be deleted periodically. The \'logging
|
||||
The logging option creates a text file in the system 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;
|
||||
case 'maint' :
|
||||
$text = 'Maintenance functions for the mail database';
|
||||
break;
|
||||
default :
|
||||
$text = 'Undocumented option';
|
||||
}
|
||||
|
||||
$ns -> tablerender("Mail Help", $text);
|
||||
$ns -> tablerender('Mail Help', $text);
|
||||
?>
|
||||
@@ -1,13 +1,18 @@
|
||||
<?php
|
||||
/*
|
||||
+ ----------------------------------------------------------------------------+
|
||||
| e107 website system - Language File.
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_mailout.php,v $
|
||||
| $Revision: 1.6 $
|
||||
| $Date: 2009-09-01 19:53:08 $
|
||||
| $Author: e107steved $
|
||||
+----------------------------------------------------------------------------+
|
||||
* e107 website system
|
||||
*
|
||||
* Copyright (C) 2001-2009 e107 Inc (e107.org)
|
||||
* Released under the terms and conditions of the
|
||||
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
|
||||
*
|
||||
* Administration - Site Maintenance
|
||||
*
|
||||
* $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_mailout.php,v $
|
||||
* $Revision: 1.7 $
|
||||
* $Date: 2009-11-15 17:38:05 $
|
||||
* $Author: e107steved $
|
||||
*
|
||||
*/
|
||||
define('LAN_MAILOUT_01','From Name');
|
||||
define('LAN_MAILOUT_02','From Email');
|
||||
@@ -17,17 +22,17 @@ define('LAN_MAILOUT_05','Bcc');
|
||||
define('LAN_MAILOUT_06','Subject');
|
||||
define('LAN_MAILOUT_07','Attachment');
|
||||
define('LAN_MAILOUT_08','Send Email');
|
||||
define('LAN_MAILOUT_09','Use Theme Style');
|
||||
define('LAN_MAILOUT_09','Send format');
|
||||
define('LAN_MAILOUT_10','User Subscribed');
|
||||
define('LAN_MAILOUT_11','Insert Variables');
|
||||
define('LAN_MAILOUT_12','All Members');
|
||||
define('LAN_MAILOUT_13','All Unverified Members ');
|
||||
//define("MAILAN_14","It is recommended that you enable SMTP for sending large numbers of emails - set in preferences below.");
|
||||
define('LAN_MAILOUT_15','Mail-Out');
|
||||
define('LAN_MAILOUT_14','Display Name');
|
||||
define('LAN_MAILOUT_15','Mailout');
|
||||
define('LAN_MAILOUT_16','username');
|
||||
define('LAN_MAILOUT_17','signup link');
|
||||
define('LAN_MAILOUT_18','user id');
|
||||
define('LAN_MAILOUT_19','There is no email address for site-admin. Please check your preferences and try again.');
|
||||
define('LAN_MAILOUT_19','No target email address specified');
|
||||
define('LAN_MAILOUT_20','Sendmail-path');
|
||||
define('LAN_MAILOUT_21','Bulk mailing Entries');
|
||||
define('LAN_MAILOUT_22','There are currently no saved entries');
|
||||
@@ -38,7 +43,7 @@ define('LAN_MAILOUT_26', 'Pause bulk mailing every');
|
||||
define('LAN_MAILOUT_27', 'emails for ');
|
||||
define('LAN_MAILOUT_28', 'Save Changes');
|
||||
define('LAN_MAILOUT_29', 'seconds');
|
||||
define('LAN_MAILOUT_30', 'More than 30 seconds may cause the browser to time-out');
|
||||
define('LAN_MAILOUT_30', 'Used mostly with SMTP keepalive. A pause of more than 30 seconds may cause the browser to time-out');
|
||||
define('LAN_MAILOUT_31', 'Bounced Email Processing');
|
||||
define('LAN_MAILOUT_32', 'Email address');
|
||||
define('LAN_MAILOUT_33', 'Incoming Mail server');
|
||||
@@ -64,17 +69,17 @@ define('LAN_MAILOUT_52', 'Last mod');
|
||||
define('LAN_MAILOUT_53', 'Admins');
|
||||
define('LAN_MAILOUT_54', 'Self');
|
||||
define('LAN_MAILOUT_55', 'Userclass');
|
||||
define('LAN_MAILOUT_56','Send Mail');
|
||||
define('LAN_MAILOUT_57','Send bulk SMTP emails in blocks'); // SMTP KeepAlive option
|
||||
define('LAN_MAILOUT_58', 'There is a problem with the attachment:');
|
||||
define('LAN_MAILOUT_59', 'Mailing Progress');
|
||||
define('LAN_MAILOUT_60', 'Sending...');
|
||||
define('LAN_MAILOUT_61', 'There are no remaining emails to be sent.');
|
||||
define('LAN_MAILOUT_62', 'Emails sent:');
|
||||
define('LAN_MAILOUT_63', 'Emails failed:');
|
||||
define('LAN_MAILOUT_64', 'Total time elapsed:');
|
||||
define('LAN_MAILOUT_65', 'seconds');
|
||||
define('LAN_MAILOUT_66', 'Cancelled Successfully');
|
||||
define('LAN_MAILOUT_56', 'Last Visit (dd-mm-yy)');
|
||||
define('LAN_MAILOUT_57', 'Send bulk SMTP emails in blocks'); // SMTP KeepAlive option
|
||||
//define('LAN_MAILOUT_58', 'There is a problem with the attachment:');
|
||||
//define('LAN_MAILOUT_59', 'Mailing Progress');
|
||||
//define('LAN_MAILOUT_60', 'Sending...');
|
||||
//define('LAN_MAILOUT_61', 'There are no remaining emails to be sent.');
|
||||
//define('LAN_MAILOUT_62', 'Emails sent:');
|
||||
//define('LAN_MAILOUT_63', 'Emails failed:');
|
||||
//define('LAN_MAILOUT_64', 'Total time elapsed:');
|
||||
//define('LAN_MAILOUT_65', 'seconds');
|
||||
//define('LAN_MAILOUT_66', 'Cancelled Successfully');
|
||||
define('LAN_MAILOUT_67', 'The email could not be sent. Please review your SMTP settings, or select another mailing method and try again.');
|
||||
define('LAN_MAILOUT_68','Include from registered users');
|
||||
define('LAN_MAILOUT_69','matches, after ');
|
||||
@@ -90,8 +95,8 @@ define('LAN_MAILOUT_78','Mailshot Status');
|
||||
define('LAN_MAILOUT_79','No mailshots to display');
|
||||
define('LAN_MAILOUT_80','Date');
|
||||
define('LAN_MAILOUT_81','The email has been successfully sent, please check your inbox.');
|
||||
define('LAN_MAILOUT_82','Original count');
|
||||
define('LAN_MAILOUT_83','Left to go');
|
||||
define('LAN_MAILOUT_82','Mails sent');
|
||||
define('LAN_MAILOUT_83','Mails to go');
|
||||
define('LAN_MAILOUT_84','Mail ID');
|
||||
define('LAN_MAILOUT_85','Originator');
|
||||
define('LAN_MAILOUT_86','Re-send');
|
||||
@@ -105,7 +110,7 @@ define('LAN_MAILOUT_93','TLS');
|
||||
define('LAN_MAILOUT_94','(Use SSL for gmail/googlemail)');
|
||||
define('LAN_MAILOUT_95','Use VERP for bulk mailing');
|
||||
define('LAN_MAILOUT_96','none');
|
||||
define('LAN_MAILOUT_97','Saved emails');
|
||||
define('LAN_MAILOUT_97','Mailer Results');
|
||||
define('LAN_MAILOUT_98','Orphaned entries');
|
||||
define('LAN_MAILOUT_99','Confirm retry mailshot');
|
||||
define('LAN_MAILOUT_100','Message');
|
||||
@@ -119,7 +124,7 @@ define('LAN_MAILOUT_107','at');
|
||||
define('LAN_MAILOUT_108','Result');
|
||||
define('LAN_MAILOUT_109','Show detail');
|
||||
define('LAN_MAILOUT_110','Send test email');
|
||||
//define('LAN_MAILOUT_111','Clicking button will send test email to main admin email address');
|
||||
define('LAN_MAILOUT_111','Email Title (not sent)');
|
||||
define('LAN_MAILOUT_112','Click to send email to');
|
||||
define('LAN_MAILOUT_113','Test email from');
|
||||
define('LAN_MAILOUT_114',"This is a test email, it appears that your email settings are working ok!\n\nRegards\nfrom the e107 website system.");
|
||||
@@ -133,8 +138,121 @@ 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');
|
||||
define('LAN_MAILOUT_125', 'Test address');
|
||||
define('LAN_MAILOUT_125', 'Text only');
|
||||
define('LAN_MAILOUT_126', 'Text and HTML');
|
||||
define('LAN_MAILOUT_127', 'Include theme');
|
||||
define('LAN_MAILOUT_128', 'Send Error');
|
||||
define('LAN_MAILOUT_129', 'Expiry Date');
|
||||
define('LAN_MAILOUT_130', 'Creation Date');
|
||||
define('LAN_MAILOUT_131', 'Sending Started');
|
||||
define('LAN_MAILOUT_132', 'Sending Complete');
|
||||
define('LAN_MAILOUT_133', 'Source');
|
||||
define('LAN_MAILOUT_134', 'Priority');
|
||||
define('LAN_MAILOUT_135', 'Title');
|
||||
define('LAN_MAILOUT_136', 'Mailout Status');
|
||||
define('LAN_MAILOUT_137', 'Mail Ref');
|
||||
define('LAN_MAILOUT_138', 'Email status');
|
||||
define('LAN_MAILOUT_139', 'Date active');
|
||||
define('LAN_MAILOUT_140', 'Recipient Email');
|
||||
define('LAN_MAILOUT_141', 'Recipient Name');
|
||||
define('LAN_MAILOUT_142', 'Recipient User ID');
|
||||
define('LAN_MAILOUT_143', 'Email ref.');
|
||||
define('LAN_MAILOUT_144', 'Bounced');
|
||||
define('LAN_MAILOUT_145', 'New email saved');
|
||||
define('LAN_MAILOUT_146', 'Error saving email');
|
||||
define('LAN_MAILOUT_147', 'Email updated');
|
||||
define('LAN_MAILOUT_148', 'User values');
|
||||
define('LAN_MAILOUT_149', 'Sender Email');
|
||||
define('LAN_MAILOUT_150', 'Sender Name');
|
||||
define('LAN_MAILOUT_151', 'Copy to');
|
||||
define('LAN_MAILOUT_152', 'Blind copy to');
|
||||
define('LAN_MAILOUT_153', 'Attachments');
|
||||
define('LAN_MAILOUT_154', 'Send Format');
|
||||
define('LAN_MAILOUT_155', 'Selectors');
|
||||
define('LAN_MAILOUT_156', 'Maximum number of emails to send per cron tick');
|
||||
define('LAN_MAILOUT_157', 'Value will depend on a number of factors, including how often your mail queue cron job is triggered and the rate at which your ISP will accept outgoing mail. Zero to clear queue each time');
|
||||
define('LAN_MAILOUT_158', 'Send now');
|
||||
define('LAN_MAILOUT_159', 'Hold email');
|
||||
define('LAN_MAILOUT_160', 'Cancel send');
|
||||
define('LAN_MAILOUT_161', 'IMPORTANT! This file appears to not exist');
|
||||
define('LAN_MAILOUT_162', 'IMPORTANT! You need to make this file executable');
|
||||
define('LAN_MAILOUT_163', 'Edit/Send Mail');
|
||||
define('LAN_MAILOUT_164', 'Email information not found');
|
||||
define('LAN_MAILOUT_165', 'Confirm delete the following stored email, including any recipient records');
|
||||
define('LAN_MAILOUT_166', 'General error deleting mail ref: --ID--');
|
||||
define('LAN_MAILOUT_167', 'Error deleting mail content ref: --ID--');
|
||||
define('LAN_MAILOUT_168', 'Mail content deleted ref: --ID--');
|
||||
define('LAN_MAILOUT_169', 'Error deleting mail recipients ref: --ID--');
|
||||
define('LAN_MAILOUT_170', 'Deleted --NUM-- recipients for mail ref: --ID--');
|
||||
define('LAN_MAILOUT_171', 'Confirm email delete');
|
||||
define('LAN_MAILOUT_172', 'Mail Type/Status');
|
||||
define('LAN_MAILOUT_173', 'Recipients');
|
||||
define('LAN_MAILOUT_174', 'Security check fail: --ID-- --CHECK--');
|
||||
define('LAN_MAILOUT_175', 'Before');
|
||||
define('LAN_MAILOUT_176', 'Equal to');
|
||||
define('LAN_MAILOUT_177', 'After');
|
||||
define('LAN_MAILOUT_178', 'Last site visit');
|
||||
define('LAN_MAILOUT_179', 'Confirm email send');
|
||||
define('LAN_MAILOUT_180', 'Selection criteria:');
|
||||
define('LAN_MAILOUT_181', 'Show recipients');
|
||||
define('LAN_MAILOUT_182', 'Tidy database tables');
|
||||
define('LAN_MAILOUT_183', 'Error tidying database');
|
||||
define('LAN_MAILOUT_184', 'Database tidied');
|
||||
define('LAN_MAILOUT_185', 'Emails added to send queue');
|
||||
define('LAN_MAILOUT_186', 'General error putting mail ref: --ID-- on hold');
|
||||
define('LAN_MAILOUT_187', 'Email --ID-- put on hold');
|
||||
define('LAN_MAILOUT_188', 'General error sending mail ref: --ID--');
|
||||
define('LAN_MAILOUT_189', 'Test address');
|
||||
|
||||
// Admin menu text
|
||||
define('LAN_MAILOUT_190', 'Create/Send Mail');
|
||||
define('LAN_MAILOUT_191', 'Saved emails');
|
||||
define('LAN_MAILOUT_192', 'Completed Mailshots');
|
||||
define('LAN_MAILOUT_193', 'Pending Mailshots');
|
||||
define('LAN_MAILOUT_194', 'Held Mailshots');
|
||||
define('LAN_MAILOUT_195', '');
|
||||
define('LAN_MAILOUT_196', '');
|
||||
|
||||
// Block of error messages kept together
|
||||
define('LAN_MAILOUT_200', 'No subject specified');
|
||||
define('LAN_MAILOUT_201', 'No meaningful data for email');
|
||||
define('LAN_MAILOUT_202', 'No text in email body');
|
||||
define('LAN_MAILOUT_203', 'No sender name specified');
|
||||
define('LAN_MAILOUT_204', 'No sender email address specified');
|
||||
define('LAN_MAILOUT_205', 'Email send format error');
|
||||
define('LAN_MAILOUT_206', 'Invalid mail ID (--ID--) specified');
|
||||
define('LAN_MAILOUT_207', '');
|
||||
define('LAN_MAILOUT_208', '');
|
||||
define('LAN_MAILOUT_209', '');
|
||||
define('LAN_MAILOUT_210', '');
|
||||
|
||||
// Block of status messages kept together
|
||||
define('LAN_MAILOUT_211', 'Sent');
|
||||
define('LAN_MAILOUT_212', 'Failed');
|
||||
define('LAN_MAILOUT_213', 'Bounced');
|
||||
define('LAN_MAILOUT_214', 'To send');
|
||||
define('LAN_MAILOUT_215', 'Saved');
|
||||
define('LAN_MAILOUT_216', 'Code error');
|
||||
define('LAN_MAILOUT_217', 'Held');
|
||||
define('LAN_MAILOUT_218', 'Cancelled');
|
||||
define('LAN_MAILOUT_219', '');
|
||||
|
||||
// General messages continued
|
||||
define('LAN_MAILOUT_220', 'Email ID --ID-- cancelled');
|
||||
define('LAN_MAILOUT_221', 'Error cancelling email with ID --ID--');
|
||||
define('LAN_MAILOUT_222', 'Default email format');
|
||||
define('LAN_MAILOUT_223', '(Used for some non-bulk emails)');
|
||||
define('LAN_MAILOUT_224', '');
|
||||
define('LAN_MAILOUT_225', '');
|
||||
define('LAN_MAILOUT_226', '');
|
||||
define('LAN_MAILOUT_227', '');
|
||||
define('LAN_MAILOUT_228', '');
|
||||
define('LAN_MAILOUT_229', '');
|
||||
define('LAN_MAILOUT_230', '');
|
||||
|
||||
|
||||
define('LAN_SEND', 'Send');
|
||||
define('LAN_HOLD', 'Hold');
|
||||
define('LAN_SUBMIT', 'Do it!');
|
||||
|
||||
?>
|
||||
Reference in New Issue
Block a user