New feature #09904 : allow to use EXPIRY in expression when sending e…

…mail Dev: Think SURVEYNAME/ADMINNAM etc ... don't have to be used Dev: maybe adding it when have same function for GUI and for RC
LimeSurvey · Dec 9, 2015 · e30ac92 · e30ac92
1 parent 7e3b798
commit e30ac92
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -1418,7 +1418,8 @@ function email($iSurveyId, $tokenids = null)
                                                       ->createAbsoluteUrl("/optin/tokens",array("surveyid"=>$iSurveyId,"langcode"=>trim($emrow['language']),"token"=>$emrow['token']));
                     $fieldsarray["{SURVEYURL}"] = $this->getController()
                                                        ->createAbsoluteUrl("/survey/index",array("sid"=>$iSurveyId,"token"=>$emrow['token'],"lang"=>trim($emrow['language'])));
-
+                    // Add some var for expression : actually only EXPIRY because : it's used in limereplacement field and have good reason to have it.
+                    $fieldsarray["{EXPIRY}"]=$aData['thissurvey']["expires"];
                     $customheaders = array('1' => "X-surveyid: " . $iSurveyId,
                     '2' => "X-tokenid: " . $fieldsarray["{TOKEN}"]);
                     global $maildebug;

diff --git a/application/helpers/admin/token_helper.php b/application/helpers/admin/token_helper.php
@@ -78,6 +78,7 @@ function emailTokens($iSurveyID,$aResultTokens,$sType)
 
 		$fieldsarray["{ADMINNAME}"] = $oSurvey->admin;
 		$fieldsarray["{ADMINEMAIL}"] = $oSurvey->adminemail;
+		$fieldsarray["{EXPIRY}"]=$oSurvey->expires;
 		if(empty($fieldsarray["{ADMINEMAIL}"] ))
 			$fieldsarray["{ADMINEMAIL}"] = Yii::app()->getConfig('siteadminemail');
 		$from = $fieldsarray["{ADMINNAME}"] . ' <' . $fieldsarray["{ADMINEMAIL}"] . '>';