Allow using SimpleTokens in email sender name and email sender addres…

…s fields (terminal42#40)
dmolineus · Jul 7, 2015 · 1252711 · 1252711
1 parent b5f88e7
commit 1252711
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/config/config.php b/config/config.php
@@ -99,6 +99,8 @@
                  'email_html'           => array('form_*', 'formconfig_*', 'raw_data', 'admin_email'),
                  'file_name'            => array('form_*', 'formconfig_*', 'admin_email'),
                  'file_content'         => array('form_*', 'formconfig_*', 'admin_email'),
+                 'email_sender_name'    => array('admin_email', 'form_*'),
+                 'email_sender_address' => array('admin_email', 'form_*'),
                  'email_recipient_cc'   => array('admin_email', 'form_*'),
                  'email_recipient_bcc'  => array('admin_email', 'form_*'),
                  'email_replyTo'        => array('admin_email', 'form_*'),
@@ -111,6 +113,8 @@
                  'email_html'           => array('domain', 'link', 'member_*', 'admin_email'),
                  'file_name'            => array('domain', 'link', 'member_*', 'admin_email'),
                  'file_content'         => array('domain', 'link', 'member_*', 'admin_email'),
+                 'email_sender_name'    => array('admin_email', 'form_*'),
+                 'email_sender_address' => array('admin_email', 'form_*'),
                  'email_recipient_cc'   => array('admin_email', 'member_*'),
                  'email_recipient_bcc'  => array('admin_email', 'member_*'),
                  'email_replyTo'        => array('admin_email', 'member_*'),
@@ -120,6 +124,8 @@
                  'email_subject'        => array('domain', 'member_*', 'member_old_*', 'recipient_email'),
                  'email_text'           => array('domain', 'member_*', 'member_old_*', 'recipient_email'),
                  'email_html'           => array('domain', 'member_*', 'member_old_*', 'recipient_email'),
+                 'email_sender_name'    => array('admin_email', 'form_*'),
+                 'email_sender_address' => array('admin_email', 'form_*'),
                  'email_recipient_cc'   => array('member_email', 'admin_email'),
                  'email_recipient_bcc'  => array('member_email', 'admin_email'),
                  'email_replyTo'        => array('member_email', 'admin_email'),
@@ -131,6 +137,8 @@
                  'email_html'           => array('domain', 'link', 'member_*', 'recipient_email'),
                  'file_name'            => array('domain', 'link', 'member_*', 'recipient_email'),
                  'file_content'         => array('domain', 'link', 'member_*', 'recipient_email'),
+                 'email_sender_name'    => array('recipient_email'),
+                 'email_sender_address' => array('recipient_email'),
                  'email_recipient_cc'   => array('recipient_email'),
                  'email_recipient_bcc'  => array('recipient_email'),
                  'email_replyTo'        => array('recipient_email'),

diff --git a/dca/tl_nc_language.php b/dca/tl_nc_language.php
@@ -195,15 +195,15 @@
             'label'                   => &$GLOBALS['TL_LANG']['tl_nc_language']['email_sender_name'],
             'exclude'                 => true,
             'inputType'               => 'text',
-            'eval'                    => array('maxlength'=>255, 'tl_class'=>'w50'),
+            'eval'                    => array('rgxp'=>'nc_tokens', 'decodeEntities'=>true, 'maxlength'=>255, 'tl_class'=>'w50'),
             'sql'                     => "varchar(255) NOT NULL default ''",
         ),
         'email_sender_address' => array
         (
             'label'                   => &$GLOBALS['TL_LANG']['tl_nc_language']['email_sender_address'],
             'exclude'                 => true,
             'inputType'               => 'text',
-            'eval'                    => array('maxlength'=>255, 'tl_class'=>'w50'),
+            'eval'                    => array('rgxp'=>'nc_tokens', 'maxlength'=>255, 'decodeEntities'=>true, 'tl_class'=>'w50'),
             'sql'                     => "varchar(255) NOT NULL default ''",
             'save_callback' => array
             (