Fix for endless loop

[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 84bc8e673f7e29740752a0f93b5d6fe930183f7b..0bf919b65c8b20c2a9509e5ea129cc1dcc580f26 100644 (file)
--- a/inc/modules/member/what-welcome.php
+++ b/inc/modules/member/what-welcome.php
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,39 +38,40 @@
 
 // Some security stuff...
 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');
+       die();
+} elseif (!isMember()) {
+       redirectToIndexMemberOnlyModule();
 }
 
 // Add description as navigation point
-ADD_DESCR ('member', basename(__FILE__));
+addMenuDescription('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']['online']),
+       'last_module' => getModuleDescription('member', $GLOBALS['last_online']['module'])
+);
 
 // Load header template
-LOAD_TEMPLATE("member_welcome_header");
+loadTemplate('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'))) {
+if ((SQL_NUMROWS($result) == 1) && (isExtensionActive('profile'))) {
        // Yes, he is so let's place him his wanted buttons
-       LOAD_TEMPLATE("profile-update");
+       loadTemplate('member_profile_outdated');
 } else {
        // Load the template below this default data
-       LOAD_TEMPLATE("member_welcome");
+       loadTemplate('member_welcome');
 }
 
 // Free memory
 SQL_FREERESULT($result);
 
 // Load footer template
-LOAD_TEMPLATE("member_welcome_footer");
+loadTemplate('member_welcome_footer');
 
-//
+// [EOF]
 ?>