Naming convention applied, more cleanups, more EL

[mailer.git] / inc / modules / member / what-support.php

diff --git a/inc/modules/member/what-support.php b/inc/modules/member/what-support.php
index f24de73545bacf9bd6c99590f9215555d334e832..ec24516530a5749f4813d56eff190c7db0ce6ff8 100644 (file)
--- a/inc/modules/member/what-support.php
+++ b/inc/modules/member/what-support.php
@@ -52,12 +52,12 @@ if ((!isExtensionActive('support')) && (!isAdmin())) {
        return;
 } // END - if
 
-if ((!isFormSent()) || (!isPostRequestParameterSet(('qsummary')))) {
+if ((!isFormSent()) || (!isPostRequestParameterSet('qsummary'))) {
        // Output form
        loadTemplate('member_support_form', false, getUserDataArray());
 } else {
        // Load mail template based on your member's decision
-       if (getExtensionVersion('admins') >= '0.4.1') {
+       if (isExtensionInstalledAndNewer('admins', '0.4.1')) {
                $a_tpl = 'admin_support-' . postRequestParameter('qsummary');
        } else {
                $message_a = loadEmailTemplate('admin_support-' . postRequestParameter('qsummary'), array('text' => postRequestParameter('qdetails')), getMemberId());
@@ -67,18 +67,18 @@ if ((!isFormSent()) || (!isPostRequestParameterSet(('qsummary')))) {
        // Select right subject
        switch (postRequestParameter('qsummary')) {
                case 'ordr':
-                       $subj_a = getMessage('SUPPORT_SUBJ_ADMIN_ORDER');
-                       $subj_m = getMessage('SUPPORT_SUBJ_MEMBER_ORDER');
+                       $subj_a = '{--ADMIN_SUPPORT_ORDER_SUBJECT--}';
+                       $subj_m = '{--MEMBER_SUPPORT_ORDER_SUBJECT--}';
                        break;
 
                case 'reflink':
-                       $subj_a = getMessage('SUPPORT_SUBJ_ADMIN_REFLINK');
-                       $subj_m = getMessage('SUPPORT_SUBJ_MEMBER_REFLINK');
+                       $subj_a = '{--ADMIN_SUPPORT_REFERAL_LINK_SUBJECT--}';
+                       $subj_m = '{--MEMBER_SUPPORT_REFERAL_LINK_SUBJECT--}';
                        break;
 
                case 'unconfirmed':
-                       $subj_a = getMessage('SUPPORT_SUBJ_ADMIN_UNCONFIRMED');
-                       $subj_m = getMessage('SUPPORT_SUBJ_MEMBER_UNCONFIRMED');
+                       $subj_a = '{--ADMIN_SUPPORT_UNCONFIRMED_SUBJECT--}';
+                       $subj_m = '{--MEMBER_SUPPORT_UNCONFIRMED_SUBJECT--}';
                        break;
        } // END - switch
 
@@ -88,8 +88,8 @@ if ((!isFormSent()) || (!isPostRequestParameterSet(('qsummary')))) {
        // Send mail to user
        sendEmail(getMemberId(), $subj_m, $message_m);
 
-       // Drop a message in the admin's area
-       createNewTask($subj_a, postRequestParameter('qsummary') . ' : ' . postRequestParameter('qdetails'), 'SUPPORT_MEMBER', getMemberId());
+       // Drop a message in the admin's area (we ignore the task id here)
+       createNewTask($subj_a, postRequestParameter('qsummary') . ' : ' . postRequestParameter('qdetails'), 'MEMBER_SUPPORT', getMemberId());
 
        // Form sent
        loadTemplate('member_support_contcted');