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

More mailout - proper API for setting user bans, use sent email as basis for new email, and other fixes

Browse Source
This commit is contained in:
e107steved
2009-11-30 20:40:03 +00:00
parent bed15a72f2
commit ddc0383efa
10 changed files with 224 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
e107_admin/mailout.php
View File

@@ -9,8 +9,8 @@
* Administration - Site Maintenance
*
* $Source: /cvs_backup/e107_0.8/e107_admin/mailout.php,v $
* $Revision: 1.30 $
* $Date: 2009-11-27 21:42:46 $
* $Revision: 1.31 $
* $Date: 2009-11-30 20:40:02 $
* $Author: e107steved $
*
*/
@@ -18,7 +18,6 @@
/*
TODO:
1. Improve maintenance page
2. Option to copy completed email to saved email page
*/
/*
@@ -122,6 +121,7 @@ $errors = array();
$subAction = '';
$midAction = '';
$fromHold = FALSE;
if (isset($_POST['mailaction']))
@@ -195,6 +195,20 @@ switch ($action)
}
break;
case 'mailcopy' : // Copy existing email and go to edit screen
if (isset($_POST['mailaction']))
{
$action = 'makemail';
$mailData = $mailAdmin->retrieveEmail($mailId);
if ($mailData === FALSE)
{
$emessage->add(LAN_MAILOUT_164.':'.$mailId, E_MESSAGE_ERROR);
break;
}
unset($mailData['mail_source_id']);
}
break;
case 'mailedit' : // Edit existing mail
if (isset($_POST['mailaction']))
{
@@ -325,9 +339,12 @@ switch ($action)
}
break;
case 'mailsendnow' : // Send mail previously on 'held' list.
$midAction = 'midMoveToSend';
$action = 'pending';
case 'mailsendnow' : // Send mail previously on 'held' list. Need to give opportunity to change time/date etc
// $midAction = 'midMoveToSend';
// $action = 'pending';
$action = 'marksend'; // This shows the email details for confirmation
$fromHold = TRUE;
$mailData['mail_source_id'] = $mailId;
break;
case 'maildeleteconfirm' :
@@ -501,7 +518,7 @@ switch ($action)
break;
case 'marksend' : // Show the send confirmation page
$mailAdmin->sendEmailCircular($mailData);
$mailAdmin->sendEmailCircular($mailData, $fromHold);
break;
case 'recipients' :