Fixed issue #08683: Unique custom token values fail to merge in invit…

…e/reminder emails Dev: replace {TOKEN:ATTRIBUTE} by {ATTRIBUTE} else take 'actual' token information from $_SESSION
LimeSurvey · Feb 24, 2014 · 55f8b48 · 55f8b48
1 parent 5d6c80e
commit 55f8b48
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/application/controllers/RegisterController.php b/application/controllers/RegisterController.php
@@ -173,8 +173,8 @@ function actionIndex($iSurveyID = null)
         $token=$oToken->token;
 
 
-        $message=$thissurvey['email_register'];
-        $subject=$thissurvey['email_register_subj'];
+        $message=preg_replace("/{TOKEN:([A-Z0-9_]+)}/","{"."$1"."}",$thissurvey['email_register']);
+        $subject=preg_replace("/{TOKEN:([A-Z0-9_]+)}/","{"."$1"."}",$thissurvey['email_register_subj']);
 
 
         $from = "{$thissurvey['adminname']} <{$thissurvey['adminemail']}>";

diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -1343,8 +1343,11 @@ function email($iSurveyId, $tokenids = null)
 
             foreach ($aSurveyLangs as $language)
             {
+                // See #08683 : this allow use of {TOKEN:ANYTHING}, directly replaced by {ANYTHING}
+                $sSubject[$language]=preg_replace("/{TOKEN:([A-Z0-9_]+)}/","{"."$1"."}",Yii::app()->request->getPost('subject_' . $language));
+                $sMessage[$language]=preg_replace("/{TOKEN:([A-Z0-9_]+)}/","{"."$1"."}",Yii::app()->request->getPost('message_' . $language));
                 if ($bHtml)
-                    $_POST['message_' . $language] = html_entity_decode(Yii::app()->request->getPost('message_' . $language), ENT_QUOTES, Yii::app()->getConfig("emailcharset"));
+                    $sMessage[$language] = html_entity_decode($sMessage[$language], ENT_QUOTES, Yii::app()->getConfig("emailcharset"));
             }
 
             $attributes = array_keys(getTokenFieldsAndNames($iSurveyId,true));
@@ -1400,8 +1403,8 @@ function email($iSurveyId, $tokenids = null)
                     $customheaders = array('1' => "X-surveyid: " . $iSurveyId,
                     '2' => "X-tokenid: " . $fieldsarray["{TOKEN}"]);
                     global $maildebug;
-                    $modsubject = Replacefields(Yii::app()->request->getPost('subject_' . $emrow['language']), $fieldsarray);
-                    $modmessage = Replacefields(Yii::app()->request->getPost('message_' . $emrow['language']), $fieldsarray);
+                    $modsubject = Replacefields($sSubject[$emrow['language']], $fieldsarray);
+                    $modmessage = Replacefields($sMessage[$emrow['language']], $fieldsarray);
 
                     if (isset($barebone_link))
                     {