Fixed issue #09174: OPTOUTURL from invitation email not working si Em…

…ailStatuts is not exactly on "OK" Dev: test if emailstatus start by OptOut (allowing to enter some more information) Dev: set OptOut even if email is set to Bounced ?
LimeSurvey · Sep 3, 2014 · 726d755 · 726d755
1 parent fce40b6
commit 726d755
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/application/controllers/OptoutController.php b/application/controllers/OptoutController.php
@@ -73,7 +73,7 @@ function actiontokens()
             }
             else
             {
-                if ($oToken->emailstatus == 'OK')
+                if (substr($oToken->emailstatus, 0, strlen('OptOut')) !== 'OptOut')
                 {
                     $oToken->emailstatus = 'OptOut';
                     $oToken->save();
@@ -148,7 +148,7 @@ function actionparticipants()
             }
             else
             {
-                if ($oToken->emailstatus == 'OK')
+                if (substr($oToken->emailstatus, 0, strlen('OptOut')) !== 'OptOut')
                 {
                     $oToken->emailstatus = 'OptOut';
                     $oToken->save();
@@ -166,7 +166,8 @@ function actionparticipants()
                     {
                         $sMessage .= "<br />";
                         $sMessage .= $clang->gT("You have already been removed from the central participants list for this site");
-                    } else
+                    }
+                    else
                     {
                         $oParticipant->blacklisted='Y';
                         $oParticipant->save();