Cookie code removed, rewritten, internal URLs are now relative (see LOAD_URL()),...

[mailer.git] / inc / modules / login.php

diff --git a/inc/modules/login.php b/inc/modules/login.php
index b308473f7579acab6ae4ff056e11c125a5d282e3..ba29320e8878d742310f5cf2eb60558a5cb84b0a 100644 (file)
--- a/inc/modules/login.php
+++ b/inc/modules/login.php
@@ -36,31 +36,17 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!IS_MEMBER()) {
-       $URL = URL."/modules.php?module=index";
-       if ($check == "mem_only") $URL .= "&msg=".urlencode(LANG_MEM_ONLY_1.$GLOBALS['module'].LANG_MEM_ONLY_2);
+       $URL = "modules.php?module=index";
+       if ($check == "mem_only") $URL .= "&msg=".urlencode(LANG_MEM_ONLY_1.$GLOBALS['module'].LANG_MEM_ONLY_2);
        LOAD_URL($URL);
 }
 
 if ($status != "CONFIRMED") {
        // If the status is different than confirmed move the user away from here
-       switch ($status)
-       {
-       case "LOCKED":
-               $ERROR = CODE_ID_LOCKED;
-               break;
-
-       case "UNCONFIRMED":
-               $ERROR = CODE_ID_UNCONFIRMED;
-               break;
-
-       default:
-               DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s detected.", $status));
-               $ERROR = CODE_UNKNOWN_STATUS;
-               break;
-       }
+       $ERROR = GEN_ERROR_CODE_FROM_ACCOUNT_STATUS($status);
 
        // Load URL
-       LOAD_URL(URL."/modules.php?module=index&login=".$ERROR);
+       LOAD_URL("modules.php?module=index&what=login&login=".$ERROR);
 } // END - if
 
 // Load adverstising template