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

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

diff --git a/inc/modules/member/what-welcome.php b/inc/modules/member/what-welcome.php
index 129f95ea8369bbc073739fdae3cee258b75500fd..8aa3ff90674f5c2fc2f6746667fb1be608a1531a 100644 (file)
--- a/inc/modules/member/what-welcome.php
+++ b/inc/modules/member/what-welcome.php
@@ -41,21 +41,23 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!IS_MEMBER()) {
-       LOAD_URL('modules.php?module=index');
+       redirectToUrl('modules.php?module=index');
 }
 
 // Add description as navigation point
 ADD_DESCR ('member', basename(__FILE__));
 
 // Export data for template
-define('_LAST_ONLINE_VALUE', MAKE_DATETIME($GLOBALS['last']['online']));
-define('_LAST_MODULE_VALUE', GET_MOD_DESCR('member', $GLOBALS['last']['module']));
+$content = array(
+       'last_online' => generateDateTime($GLOBALS['last']['online']),
+       'last_module' => getModuleDescription('member', $GLOBALS['last']['module'])
+);
 
 // Load header template
-LOAD_TEMPLATE("member_welcome_header");
+LOAD_TEMPLATE("member_welcome_header", false, $content);
 
 // Chedk if he is returning from a profile update notification
-$result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE notified='Y' AND userid=%s LIMIT 1",
+$result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE notified='Y' AND `userid`=%s LIMIT 1",
        array(getUserId()), __FILE__, __LINE__);
 
 if ((SQL_NUMROWS($result) == 1) && (EXT_IS_ACTIVE('profile'))) {