Fix advanced subscription plugin, wrong mails - refs BT#9092

1.10.x
Daniel Barreto 11 years ago
parent 8b73468816
commit 287ab9ca8f
  1. 12
      plugin/advanced_subscription/ajax/advanced_subscription.ajax.php

@ -227,20 +227,20 @@ if ($verified) {
$data['signature'] = api_get_setting('Institution'); $data['signature'] = api_get_setting('Institution');
$data['admin_view_url'] = api_get_path(WEB_PLUGIN_PATH) . 'advanced_subscription/src/admin_view.php?s=' . $data['sessionId']; $data['admin_view_url'] = api_get_path(WEB_PLUGIN_PATH) . 'advanced_subscription/src/admin_view.php?s=' . $data['sessionId'];
// Check if exist and action in data // Check if exist and action in data
if (empty($data['action'])) { if (empty($data['mailAction'])) {
// set action in data by new status // set action in data by new status
switch ($data['newStatus']) { switch ($data['newStatus']) {
case ADVANCED_SUBSCRIPTION_QUEUE_STATUS_BOSS_APPROVED: case ADVANCED_SUBSCRIPTION_QUEUE_STATUS_BOSS_APPROVED:
$data['action'] = ADVANCED_SUBSCRIPTION_ACTION_SUPERIOR_APPROVE; $data['mailAction'] = ADVANCED_SUBSCRIPTION_ACTION_SUPERIOR_APPROVE;
break; break;
case ADVANCED_SUBSCRIPTION_QUEUE_STATUS_BOSS_DISAPPROVED: case ADVANCED_SUBSCRIPTION_QUEUE_STATUS_BOSS_DISAPPROVED:
$data['action'] = ADVANCED_SUBSCRIPTION_ACTION_SUPERIOR_DISAPPROVE; $data['mailAction'] = ADVANCED_SUBSCRIPTION_ACTION_SUPERIOR_DISAPPROVE;
break; break;
case ADVANCED_SUBSCRIPTION_QUEUE_STATUS_ADMIN_APPROVED: case ADVANCED_SUBSCRIPTION_QUEUE_STATUS_ADMIN_APPROVED:
$data['action'] = ADVANCED_SUBSCRIPTION_ACTION_ADMIN_APPROVE; $data['mailAction'] = ADVANCED_SUBSCRIPTION_ACTION_ADMIN_APPROVE;
break; break;
case ADVANCED_SUBSCRIPTION_QUEUE_STATUS_ADMIN_DISAPPROVED: case ADVANCED_SUBSCRIPTION_QUEUE_STATUS_ADMIN_DISAPPROVED:
$data['action'] = ADVANCED_SUBSCRIPTION_ACTION_ADMIN_DISAPPROVE; $data['mailAction'] = ADVANCED_SUBSCRIPTION_ACTION_ADMIN_DISAPPROVE;
break; break;
default: default:
break; break;
@ -253,7 +253,7 @@ if ($verified) {
} }
// Send mails // Send mails
$result['mailIds'] = $plugin->sendMail($data, $data['action']); $result['mailIds'] = $plugin->sendMail($data, $data['mailAction']);
// Check if mails were sent // Check if mails were sent
if (!empty($result['mailIds'])) { if (!empty($result['mailIds'])) {
$result['error'] = false; $result['error'] = false;

Loading…
Cancel
Save