Naming convention, more usage of EL, new wrapper function introduced:

[mailer.git] / inc / modules / admin / what-user_contct.php

diff --git a/inc/modules/admin/what-user_contct.php b/inc/modules/admin/what-user_contct.php
index c2dfa2a4fbb46432ab6e69383b2f3e1481eba323..9ea8fa6fcf346e733b07a04c7a41a8b7c365aab8 100644 (file)
--- a/inc/modules/admin/what-user_contct.php
+++ b/inc/modules/admin/what-user_contct.php
@@ -60,17 +60,21 @@ if ((isGetRequestParameterSet('userid')) && (bigintval(getRequestParameter('user
                        // Insert text
                        $content['text'] = trim(secureString(postRequestParameter('text')));
 
+                       // Load email template
+                       $message = loadEmailTemplate('member_contct', $content, getRequestParameter('userid'));
+
                        // Send contact form out
-                       $message = loadEmailTemplate('member_contct', $content);
-                       sendEmail($content['email'], getMessage('ADMIN_CONTACT_USER_SUBJECT'), $message);
-                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_USER_CONTACTED'));
+                       sendEmail($content['email'], '{--ADMIN_CONTACT_USER_SUBJECT--}', $message);
+
+                       // Display message
+                       loadTemplate('admin_settings_saved', false, '{--ADMIN_USER_CONTACTED--}');
                } else {
                        // Load contact form template
                        loadTemplate('admin_contct_user_form', false, $content);
                }
        } else {
                // Not found?
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('USER_ACCOUNT_404', bigintval(getRequestParameter('userid'))));
+               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_USER_ACCOUNT_404', bigintval(getRequestParameter('userid'))));
        }
 } else {
        // Display selection box