New feature: @@OPTOUTURL@@ & @@OPTINURL@@ placeholders for invitation…

…/reminder emails
LimeSurvey · Dec 11, 2017 · 2f018f2 · 2f018f2 · Shnoulle · Dec 11, 2017
1 parent d0ce70e
commit 2f018f2
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/application/helpers/admin/token_helper.php b/application/helpers/admin/token_helper.php
@@ -100,10 +100,7 @@ function emailTokens($iSurveyID,$aResultTokens,$sType)
 			{
 				$url = $fieldsarray["{{$key}URL}"];
 				$fieldsarray["{{$key}URL}"] = "<a href='{$url}'>" . htmlspecialchars($url) . '</a>';
-				if ($key == 'SURVEY')
-				{
-					$barebone_link = $url;
-				}
+                $aBareboneURLs['@@'.$key.'URL@@']=$fieldsarray["{{$key}URL}"];
 			}
 		}
 
@@ -137,10 +134,9 @@ function emailTokens($iSurveyID,$aResultTokens,$sType)
 		$modsubject = $sSubject;
 		$modmessage = $sMessage;
 
-		if (isset($barebone_link))
-		{
-			$modsubject = str_replace("@@SURVEYURL@@", $barebone_link, $modsubject);
-			$modmessage = str_replace("@@SURVEYURL@@", $barebone_link, $modmessage);
+        foreach ($aBareboneURLs as $sSearch=>$sReplace) {
+            $modsubject = str_replace($sSearch, $sReplace, $modsubject);
+            $modmessage = str_replace($sSearch, $sReplace, $modmessage);
 		}
 
 		$modsubject = ReplaceFields($modsubject, $fieldsarray);