New naming convention applied to many functions, see #118 for details

[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 f48d6a97fd17dc89ba2fd356f7b24973031a7db4..747ea4078d6bb296024bf6e16c484ab17fbc1ec7 100644 (file)
--- a/inc/modules/member/what-support.php
+++ b/inc/modules/member/what-support.php
@@ -38,24 +38,24 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }  elseif (!IS_MEMBER()){
-       LOAD_URL("modules.php?module=index");
-} elseif ((!EXT_IS_ACTIVE("support")) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "support");
+       redirectToUrl('modules.php?module=index');
+} elseif ((!EXT_IS_ACTIVE('support')) && (!IS_ADMIN())) {
+       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'support'));
        return;
 }
 
 // Add description as navigation point
-ADD_DESCR("member", __FILE__);
+ADD_DESCR('member', __FILE__);
 
 if ((!IS_FORM_SENT()) || (!REQUEST_ISSET_POST(('qsummary')))) {
        // Output form
        LOAD_TEMPLATE("member_support_form");
 } else {
        // Load mail template based on your member's decision
-       if (GET_EXT_VERSION("admins") >= "0.4.1") {
+       if (GET_EXT_VERSION('admins') >= '0.4.1') {
                $a_tpl = "admin_support-".REQUEST_POST('qsummary');
        } else {
                $msg_a = LOAD_EMAIL_TEMPLATE("admin_support-".REQUEST_POST('qsummary'), array('text' => REQUEST_POST('qdetails')), getUserId());
@@ -81,14 +81,14 @@ if ((!IS_FORM_SENT()) || (!REQUEST_ISSET_POST(('qsummary')))) {
        } // END - switch
 
        // Send mail to admin
-       SEND_ADMIN_NOTIFICATION($subj_a, $a_tpl, array('text' => REQUEST_POST('qdetails')), getUserId());
+       sendAdminNotification($subj_a, $a_tpl, array('text' => REQUEST_POST('qdetails')), getUserId());
 
        // Send mail to user
-       SEND_EMAIL(getUserId(), $subj_m, $msg_m);
+       sendEmail(getUserId(), $subj_m, $msg_m);
 
        // Drop a message in the admin's area
        SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (userid, assigned_admin, status, task_type, subject, text, task_created) VALUES ('%s','0','NEW','SUPPORT_MEMBER','%s','%s', UNIX_TIMESTAMP())",
-               array(getUserId(), $subj_a, REQUEST_POST('qsummary').":".array('text' => REQUEST_POST('qdetails'))), __FILE__, __LINE__);
+               array(getUserId(), $subj_a, REQUEST_POST('qsummary').':'.array('text' => REQUEST_POST('qdetails'))), __FILE__, __LINE__);
 
        // Form sent
        LOAD_TEMPLATE("member_support_contcted");