From ed273e9802a2243a87e65a6fc5f6ead244153ff3 Mon Sep 17 00:00:00 2001
From: Patrick Teichmann <patrick.teichmann@limesurvey.org>
Date: Tue, 30 Aug 2022 13:04:20 +0200
Subject: [PATCH] Dev: FailedEmail fix wrong variable applied for id searched
 with admin_responses(detailed email notifications)

Dev: adjusted Text intention when checking whether to delete emails after a successfully sending them
---
 .../controllers/FailedEmailController.php      |  4 ++--
 application/helpers/frontend_helper.php        | 18 +++++++++---------
 .../failedEmail/partials/modal/resend_body.php |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/application/controllers/FailedEmailController.php b/application/controllers/FailedEmailController.php
index bc0b65fb74b..d52e13eae7f 100644
--- a/application/controllers/FailedEmailController.php
+++ b/application/controllers/FailedEmailController.php
@@ -78,8 +78,8 @@ public function actionResend()
             App()->user->setFlash('error', gT("You do not have permission to access this page."));
             $this->redirect(['failedEmail/index/', 'surveyid' => $surveyId]);
         }
-        $preserveResend = App()->request->getParam('preserveResend');
-        $preserveResend = !is_null($preserveResend);
+        $deleteAfterResend = App()->request->getParam('deleteAfterResend');
+        $preserveResend = is_null($deleteAfterResend);
         $item = [App()->request->getParam('item')];
         $items = json_decode(App()->request->getParam('sItems'));
         $selectedItems = $items ?? $item;
diff --git a/application/helpers/frontend_helper.php b/application/helpers/frontend_helper.php
index c2e83d93bc4..01fadb80a65 100644
--- a/application/helpers/frontend_helper.php
+++ b/application/helpers/frontend_helper.php
@@ -518,11 +518,11 @@ function sendSubmitNotifications($surveyid, array $emails = [], bool $preserveRe
         $mailer = \LimeMailer::getInstance();
         $mailer->setTypeWithRaw('admin_notification', $emailLanguage);
         foreach ($aEmailNotificationTo as $sRecipient) {
-            $notificationId = null;
+            $failedNotificationId = null;
             $notificationRecipient = $sRecipient;
             /** set mailer params for @see FailedEmailController::actionResend() */
             if (!empty($emails)) {
-                $notificationId = $sRecipient['id'];
+                $failedNotificationId = $sRecipient['id'];
                 $responseId = $sRecipient['responseId'];
                 $notificationRecipient = $sRecipient['recipient'];
                 $emailLanguage = $sRecipient['language'];
@@ -531,7 +531,7 @@ function sendSubmitNotifications($surveyid, array $emails = [], bool $preserveRe
             $mailer->setTo($notificationRecipient);
             if (!$mailer->SendMessage()) {
                 $failedEmailCount++;
-                saveFailedEmail($notificationId, $notificationRecipient, $surveyid, $responseId, 'admin_notification', $emailLanguage, $mailer->getError());
+                saveFailedEmail($failedNotificationId, $notificationRecipient, $surveyid, $responseId, 'admin_notification', $emailLanguage, $mailer->getError());
                 if (empty($emails) && $debug > 0 && Permission::model()->hasSurveyPermission($surveyid, 'surveysettings', 'update')) {
                     /* Find a better way to show email error … */
                     echo CHtml::tag("div",
@@ -541,7 +541,7 @@ function sendSubmitNotifications($surveyid, array $emails = [], bool $preserveRe
             } elseif ($preserveResend) {
                 $successfullEmailCount++;
                 //preserve failedEmail if it exists
-                preserveSuccessFailedEmail($notificationId);
+                preserveSuccessFailedEmail($failedNotificationId);
             } else {
                 $successfullEmailCount++;
             }
@@ -550,7 +550,7 @@ function sendSubmitNotifications($surveyid, array $emails = [], bool $preserveRe
 
     if (count($aEmailResponseTo) > 0) {
         // there was no token used so lets remove the token field from insertarray
-        if (isset($_SESSION['survey_' . $surveyid])) {
+        if (isset($_SESSION['survey_' . $surveyid]['insertarray'][0])) {
             if (!isset($_SESSION['survey_' . $surveyid]['token']) && $_SESSION['survey_' . $surveyid]['insertarray'][0] === 'token') {
                 unset($_SESSION['survey_' . $surveyid]['insertarray'][0]);
             }
@@ -558,11 +558,11 @@ function sendSubmitNotifications($surveyid, array $emails = [], bool $preserveRe
         $mailer = \LimeMailer::getInstance();
         $mailer->setTypeWithRaw('admin_responses', $emailLanguage);
         foreach ($aEmailResponseTo as $sRecipient) {
-            $notificationId = null;
+            $failedNotificationId = null;
             $responseRecipient = $sRecipient;
             /** set mailer params for @see FailedEmailController::actionResend() */
             if (!empty($emails)) {
-                $notificationId = $sRecipient['id'];
+                $failedNotificationId = $sRecipient['id'];
                 $responseId = $sRecipient['responseId'];
                 $responseRecipient = $sRecipient['recipient'];
                 $emailLanguage = $sRecipient['language'];
@@ -595,7 +595,7 @@ function sendSubmitNotifications($surveyid, array $emails = [], bool $preserveRe
             $mailer->setTo($responseRecipient);
             if (!$mailer->SendMessage()) {
                 $failedEmailCount++;
-                saveFailedEmail($notificationId, $responseRecipient, $surveyid, $responseId, 'admin_responses', $emailLanguage, $mailer->getError());
+                saveFailedEmail($failedNotificationId, $responseRecipient, $surveyid, $responseId, 'admin_responses', $emailLanguage, $mailer->getError());
                 if (empty($emails) && $debug > 0 && Permission::model()->hasSurveyPermission($surveyid, 'surveysettings', 'update')) {
                     /* Find a better way to show email error … */
                     echo CHtml::tag("div",
@@ -605,7 +605,7 @@ function sendSubmitNotifications($surveyid, array $emails = [], bool $preserveRe
             } elseif ($preserveResend) {
                 $successfullEmailCount++;
                 //preserve failedEmail if it exists
-                preserveSuccessFailedEmail($responseId);
+                preserveSuccessFailedEmail($failedNotificationId);
             } else {
                 $successfullEmailCount++;
             }
diff --git a/application/views/failedEmail/partials/modal/resend_body.php b/application/views/failedEmail/partials/modal/resend_body.php
index e2eb1b7830d..e3127be590c 100644
--- a/application/views/failedEmail/partials/modal/resend_body.php
+++ b/application/views/failedEmail/partials/modal/resend_body.php
@@ -1,6 +1,6 @@
 <?php
 ?>
-<label class="control-label" for="preserveResend"><?= gT('Preserve successful emails?') ?></label>
+<label class="control-label" for="deleteAfterResend"><?= gT('Delete email(s) from list after sending was successful') ?></label>
 <div>
-    <input class="custom-data" type="checkbox" name="preserveResend" id="preserveResend" checked/>
+    <input class="custom-data" type="checkbox" name="deleteAfterResend" id="deleteAfterResend" checked/>
 </div>
\ No newline at end of file