mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-15 02:57:15 +02:00
Code Issues Releases Wiki Activity

Issue #70 - update PHPMailer to latest.

Browse Source 
New mail entry point to send templated emails, bulk emails etc
Add option to mass-send templated emails from admin page
'Notify' function uses the new interface.
Sundry detail improvements
Other sources of auto-generated emails need converting - signup etc
Much more testing needed.
Needs competent themer to generate some nice templates.
This commit is contained in:
SteveD
2013-02-20 21:11:17 +00:00
parent be527ea633
commit 384bf407e3
14 changed files with 5393 additions and 3855 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
e107_admin/mailout.php
View File

@@ -2,7 +2,7 @@
/*
* e107 website system
*
* Copyright (C) 2008-2010 e107 Inc (e107.org)
* Copyright (C) 2008-2013 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
@@ -399,6 +399,7 @@ switch ($action)
case 'sent' :
case 'pending' :
case 'held' :
case 'mailshowtemplate' :
if (isset($_POST['etrigger_ecolumns']))
{
$mailAdmin->mailbodySaveColumnPref($action);
@@ -554,6 +555,10 @@ switch ($action)
$mailAdmin->showEmailList($action, -1, -1);
break;
case 'mailshowtemplate' : // Show the templated email
$mailAdmin->showEmailTemplate($mailId);
break;
case 'maildelete' : // NOTE:: need to set previous page in form
$mailAdmin->showDeleteConfirm($mailId, $pageMode);
break;
@@ -679,7 +684,14 @@ function saveMailPrefs(&$emessage)
if (!in_array($_POST['mailer'], array('smtp', 'sendmail', 'php'))) $_POST['mailer'] = 'php';
$temp['mailer'] = $_POST['mailer'];
// Allow qmail as an option as well - works much as sendmail
if ((strpos($_POST['sendmail'],'sendmail') !== FALSE) || (strpos($_POST['sendmail'],'qmail') !== FALSE)) $temp['sendmail'] = $e107->tp->toDB($_POST['sendmail']);
if ((strpos($_POST['sendmail'],'sendmail') !== FALSE) || (strpos($_POST['sendmail'],'qmail') !== FALSE))
{
$temp['sendmail'] = $e107->tp->toDB($_POST['sendmail']);
}
else
{
$temp['sendmail'] = '';
}
$temp['smtp_server'] = $e107->tp->toDB($_POST['smtp_server']);
$temp['smtp_username'] = $e107->tp->toDB($_POST['smtp_username']);
$temp['smtp_password'] = $e107->tp->toDB($_POST['smtp_password']);