Merge pull request #392 from gabrieljenik/patch-24

New Feature: Added ADMINNAME and ADMINEMAIL as replacement field for survey texts
LimeSurvey · Dec 1, 2015 · d81264b · d81264b
2 parents 9b21a0d + 63012db
commit d81264b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/application/controllers/admin/limereplacementfields.php b/application/controllers/admin/limereplacementfields.php
@@ -216,6 +216,8 @@ private function _getReplacementFields($fieldtype, $surveyid)
                     $replFields[] = array('TOKEN:' . strtoupper($attributefield), sprintf(gT("Token attribute: %s"), $attributedescription['description']));
                 }
                 $replFields[] = array('EXPIRY', gT("Survey expiration date"));
+                $replFields[] = array('ADMINNAME', gT("Name of the survey administrator"));
+                $replFields[] = array('ADMINEMAIL', gT("Email address of the survey administrator"));
                 return array($replFields, false);
 
             case 'email-admin_notification':
@@ -337,4 +339,4 @@ private function _getReplacementFields($fieldtype, $surveyid)
         }
     }
 
-}
+}
diff --git a/application/helpers/replacements_helper.php b/application/helpers/replacements_helper.php
@@ -535,6 +535,8 @@ function templatereplace($line, $replacements = array(), &$redata = array(), $de
     $coreReplacements['DATESTAMP'] = $_datestamp;
     $coreReplacements['ENDTEXT'] = $_endtext;
     $coreReplacements['EXPIRY'] = $_dateoutput;
+    $coreReplacements['ADMINNAME'] = $thissurvey['admin'];
+    $coreReplacements['ADMINEMAIL'] = $thissurvey['adminemail'];
     $coreReplacements['GID'] = Yii::app()->getConfig('gid','');// Use the gid of the question, except if we are not in question (Randomization group name)
     $coreReplacements['GOOGLE_ANALYTICS_API_KEY'] = $_googleAnalyticsAPIKey;
     $coreReplacements['GOOGLE_ANALYTICS_JAVASCRIPT'] = $_googleAnalyticsJavaScript;