From f9f5b196dd0e787bee5a57acc826141f2758e1d2 Mon Sep 17 00:00:00 2001
From: Gabriel Jenik <gabriel.jenik@gmail.com>
Date: Mon, 30 Nov 2015 20:02:01 -0300
Subject: [PATCH 1/2] New Feature: Added ADMINNAME and ADMINEMAIL as
 replacement field for survey texts

---
 application/controllers/admin/limereplacementfields.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/controllers/admin/limereplacementfields.php b/application/controllers/admin/limereplacementfields.php
index b27984f1752..7c238f1cf93 100644
--- 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)
         }
     }
 
-}
\ No newline at end of file
+}

From 63012db8af3f1d4c0ad92c725af12bbd8026f7f2 Mon Sep 17 00:00:00 2001
From: Gabriel Jenik <gabriel.jenik@gmail.com>
Date: Mon, 30 Nov 2015 20:04:36 -0300
Subject: [PATCH 2/2] New Feature: Added ADMINNAME and ADMINEMAIL as
 replacement field for survey texts

---
 application/helpers/replacements_helper.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/helpers/replacements_helper.php b/application/helpers/replacements_helper.php
index 48900470625..b6ef2f150be 100644
--- 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;