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

More Admin->Mail Fixes.

Browse Source
This commit is contained in:
Cameron
2014-10-11 12:54:16 -07:00
parent 5d894149bb
commit 4fca7b7f12
3 changed files with 1119 additions and 904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
e107_admin/mailout.php
View File

@@ -357,7 +357,7 @@ class mailout_main_ui extends e_admin_ui
$ret['mail_create_date'] = time(); $ret['mail_create_date'] = time();
$ret['mail_creator'] = USERID; $ret['mail_creator'] = USERID;
$ret['mail_create_app'] = 'core'; $ret['mail_create_app'] = 'core';
$ret['mail_content_status'] = 20; // Default status is 'Saved'; $ret['mail_content_status'] = 22; // Default status is 'Saved';
return $ret; return $ret;
@@ -408,11 +408,6 @@ class mailout_main_ui extends e_admin_ui
} }
private function checkForId()
{
}
private function emailSendNow($mailId) private function emailSendNow($mailId)
{ {
@@ -423,12 +418,14 @@ class mailout_main_ui extends e_admin_ui
private function emailSend($mailId) private function emailSend($mailId)
{ {
$log = e107::getAdminLog(); $log = e107::getAdminLog();
$notify = isset($_POST['mail_notify_complete']) ? 3 : 2; $notify = isset($_POST['mail_notify_complete']) ? 3 : 2;
$first = 0; $first = 0;
$last = 0; // Set defaults for earliest and latest send times. $last = 0; // Set defaults for earliest and latest send times.
// TODO: Save these fields
if (isset($_POST['mail_earliest_time'])) if (isset($_POST['mail_earliest_time']))
{ {
$first = e107::getDateConvert()->decodeDateTime($_POST['mail_earliest_time'], 'datetime', CORE_DATE_ORDER, FALSE); $first = e107::getDateConvert()->decodeDateTime($_POST['mail_earliest_time'], 'datetime', CORE_DATE_ORDER, FALSE);
@@ -437,6 +434,7 @@ class mailout_main_ui extends e_admin_ui
{ {
$last = e107::getDateConvert()->decodeDateTime($_POST['mail_earliest_time'], 'datetime', CORE_DATE_ORDER, TRUE); $last = e107::getDateConvert()->decodeDateTime($_POST['mail_earliest_time'], 'datetime', CORE_DATE_ORDER, TRUE);
} }
if ($this->mailAdmin->activateEmail($mailId, FALSE, $notify, $first, $last)) if ($this->mailAdmin->activateEmail($mailId, FALSE, $notify, $first, $last))
{ {
e107::getMessage()->addSuccess(LAN_MAILOUT_185); e107::getMessage()->addSuccess(LAN_MAILOUT_185);
@@ -544,7 +542,11 @@ class mailout_main_ui extends e_admin_ui
return ''; return '';
} }
return $this->mailAdmin->sendEmailCircular($mailData, $fromHold); $fromHold = false;
$mailData = $this->mailAdmin->dbToMail($mailData);
return $this->mailAdmin->sendEmailCircular($mailData, $fromHold);
} }

12
e107_handlers/mail_manager_class.php
View File

@@ -262,8 +262,8 @@ class e107MailManager
$res[$f] = ''; $res[$f] = '';
} }
} }
// $array = new ArrayData;
$res['mail_other'] = e107::serialize($res1, TRUE); // Ready to write to DB $res['mail_other'] = e107::serialize($res1,false); // Ready to write to DB
return $res; return $res;
} }
@@ -348,8 +348,7 @@ class e107MailManager
} }
if (isset($data['mail_target_info']) && is_array($data['mail_target_info'])) if (isset($data['mail_target_info']) && is_array($data['mail_target_info']))
{ {
$array = new ArrayData; $tmp = e107::serialize($data['mail_target_info'], TRUE);
$tmp = $array->WriteArray($data['mail_target_info'], TRUE);
$res['mail_target_info'] = $tmp; $res['mail_target_info'] = $tmp;
} }
return $res; return $res;
@@ -896,9 +895,10 @@ class e107MailManager
$this->checkDB(2); // Make sure we have a DB object to use $this->checkDB(2); // Make sure we have a DB object to use
$dbData = $this->mailToDB($emailData, FALSE); // Convert array formats $dbData = $this->mailToDB($emailData, FALSE); // Convert array formats
// print_a($dbData); // print_a($dbData);
if ($isNew)
if ($isNew === true)
{ {
unset($dbData['mail_source_id']); // Just in case - there are circumstances where might be set unset($dbData['mail_source_id']); // Just in case - there are circumstances where might be set
$result = $this->db2->db_Insert('mail_content', array('data' => $dbData, $result = $this->db2->db_Insert('mail_content', array('data' => $dbData,

1985
e107_handlers/mailout_admin_class.php
View File

File diff suppressed because it is too large Load Diff