Fixed issue #16901: @@SURVEYURL@@ not replaced when register

LimeSurvey · Dec 11, 2020 · adf5a10 · adf5a10
1 parent ade1dcb
commit adf5a10
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -1445,7 +1445,6 @@ public function email($iSurveyId)
                 $mail->setSurvey($iSurveyId);
                 $mail->emailType = $sSubAction;
                 $mail->replaceTokenAttributes = true;
-                $mail->addUrlsPlaceholders(array('OPTOUT', 'OPTIN', 'SURVEY'));
                 foreach ($emresult as $emrow) {
                     $mail = \LimeMailer::getInstance();
                     if ($this->tokenIsSetInEmailCache($iSurveyId, $emrow['tid'],$bIsInvitation)) {

diff --git a/application/core/LimeMailer.php b/application/core/LimeMailer.php
@@ -37,7 +37,7 @@ class LimeMailer extends \PHPMailer\PHPMailer\PHPMailer
     /* @var string[] Array for barebone url and url */
     public $aUrlsPlaceholders = [];
 
-    /*  @var string[] Array of replacements */
+    /*  @var string[] Array of replacements key was replaced by value */
     public $aReplacements = [];
 
     /**
@@ -280,7 +280,7 @@ public function addUrlsPlaceholders($aUrlsPlaceholders)
         if (is_string($aUrlsPlaceholders)) {
             $aUrlsPlaceholders = [$aUrlsPlaceholders];
         }
-        $this->aUrlsPlaceholders = array_merge($this->aUrlsPlaceholders, $aUrlsPlaceholders);
+        $this->aUrlsPlaceholders = array_unique(array_merge($this->aUrlsPlaceholders, $aUrlsPlaceholders));
     }
 
     /**
@@ -630,13 +630,16 @@ public function getTokenReplacements()
                 $aTokenReplacements[strtoupper($attribute)] = $value;
             }
         }
-        /* Did we need to check if each url are in $this->aUrlsPlaceholders ? */
+        /* Set the minimal url and add it to Placeholders */
         $aTokenReplacements["OPTOUTURL"] = App()->getController()
             ->createAbsoluteUrl("/optout/tokens", array("surveyid"=>$this->surveyId, "token"=>$token,"langcode"=>$language));
+        $this->addUrlsPlaceholders("OPTOUT");
         $aTokenReplacements["OPTINURL"] = App()->getController()
             ->createAbsoluteUrl("/optin/tokens", array("surveyid"=>$this->surveyId, "token"=>$token,"langcode"=>$language));
+        $this->addUrlsPlaceholders("OPTIN");
         $aTokenReplacements["SURVEYURL"] = App()->getController()
             ->createAbsoluteUrl("/survey/index", array("sid"=>$this->surveyId, "token"=>$token,"lang"=>$language));
+        $this->addUrlsPlaceholders("SURVEY");
         return $aTokenReplacements;
     }
 

diff --git a/application/helpers/admin/token_helper.php b/application/helpers/admin/token_helper.php
@@ -30,7 +30,6 @@ function emailTokens($iSurveyID, $aResultTokens, $sType)
     $mail->setSurvey($iSurveyID);
     $mail->emailType = $sType;
     $mail->replaceTokenAttributes = true;
-    $mail->addUrlsPlaceholders(array('OPTOUT', 'OPTIN', 'SURVEY'));
     foreach ($aResultTokens as $aTokenRow) {
         $mail = \LimeMailer::getInstance();
         $mail->setToken($aTokenRow['token']);