X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Flogin.php;h=a37888155c6c1c87cc674cdf27dafea8d025126a;hb=82d72ce0fd29e2714e62bd11997272eaf6110fd6;hp=4252eaf76cb982100b2b258ad6321315c4e685d3;hpb=3e2e8ea82079f4e76b8add38efccf6c24afda507;p=mailer.git

diff --git a/inc/modules/login.php b/inc/modules/login.php
index 4252eaf76c..a37888155c 100644
--- a/inc/modules/login.php
+++ b/inc/modules/login.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/15/2003 *
- * ===============                              Last change: 04/18/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 10/15/2003 *
+ * ===================                          Last change: 04/18/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : login.php                                        *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -40,31 +41,22 @@
 if (!defined('__SECURITY')) {
 	die();
 } elseif (!isMember()) {
-	$URL = 'modules.php?module=index';
-	if (checkModulePermissions('login') == 'mem_only') $URL .= '&amp;code=' . getCode('MODULE_MEM_ONLY') . '&amp;mod=' . getModule();
-	redirectToUrl($URL);
-}
-
-if ($GLOBALS['status'] != 'CONFIRMED') {
-	// If the status is different than confirmed move the user away from here
-	$errorCode = generateErrorCodeFromUserStatus($GLOBALS['status']);
-
-	// Load URL
-	redirectToUrl('modules.php?module=index&amp;what=login&amp;login=' . $errorCode);
+	$url = 'modules.php?module=index';
+	if (checkModulePermissions('login') == 'mem_only') $url .= '&amp;code=' . getCode('MODULE_MEMBER_ONLY') . '&amp;mod=' . getModule();
+	redirectToUrl($url);
 } // END - if
 
 // Disable block mode by default
 enableBlockMode(false);
 
 // Generate a tableset for the menu title and content
-loadTemplate('member_header');
+loadTemplate('member_header', false, array('date_time' => generateDateTime(time(), 1)));
 
 // Add code-message here
 handleCodeMessage();
 
 // Begin menu block here
-outputHtml("<tr>
-  <td class=\"member_menu\">");
+loadTemplate('member_menu_start');
 
 // Adding the main content module here
 if (!isActionSet()) {
@@ -75,7 +67,7 @@ if (!isActionSet()) {
 
 // Add the member's menu here...
 if ((getConfig('member_menu') == 'Y') || (!isExtensionActive('sql_patches', true))) {
-	addMenu('member', getModeAction('member', getWhat()), getWhat());
+	addMenu('member', getActionFromModuleWhat('member', getWhat()), getWhat());
 } // END - if
 
 // Disable block-mode again