Some functions rewritten to hungarian notation, handling of array rewritten

[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 9dc7e4c6cbb716c205f2ad281314fff4d10101cd..005babea71f788ff8ebc2ef273743b53ccbf6c90 100644 (file)
--- a/inc/modules/member/what-welcome.php
+++ b/inc/modules/member/what-welcome.php
@@ -32,19 +32,15 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-}
- elseif (!IS_LOGGED_IN())
-{
-       LOAD_URL(URL."/modules.php?module=index");
+} elseif (!IS_MEMBER()) {
+       LOAD_URL("modules.php?module=index");
 }
 
 // Add description as navigation point
 ADD_DESCR ("member", basename(__FILE__));
-OUTPUT_HTML ("</FONT><BR>");
 
 // Export data for template
 define('_LAST_ONLINE_VALUE', MAKE_DATETIME($LAST['online']));
@@ -54,16 +50,13 @@ define('_LAST_MODULE_VALUE', GET_MOD_DESCR("member", $LAST['module']));
 LOAD_TEMPLATE("member_welcome_header");
 
 // 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=%d LIMIT 1",
- array($GLOBALS['userid']), __FILE__, __LINE__);
+$result = SQL_QUERY_ESC("SELECT userid FROM `"._MYSQL_PREFIX."_user_data` WHERE notified='Y' AND userid=%s LIMIT 1",
+       array($GLOBALS['userid']), __FILE__, __LINE__);
 
-if ((SQL_NUMROWS($result) == 1) && (EXT_IS_ACTIVE("profile")))
-{
+if ((SQL_NUMROWS($result) == 1) && (EXT_IS_ACTIVE("profile"))) {
        // Yes, he is so let's place him his wanted buttons
        LOAD_TEMPLATE("profile-update");
-}
- else
-{
+} else {
        // Load the template below this default data
        LOAD_TEMPLATE("member_welcome");
 }