Renamed function so it might be more understandable

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

diff --git a/inc/modules/login.php b/inc/modules/login.php
index bc46bfb49ed382b61664941351060b63f1b73c08..fca747b2badeb4f810bcf4945186028a5ff78c96 100644 (file)
--- 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                                        *
@@ -14,10 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * 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,28 +39,21 @@
 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);
+       // Redirect to login form with displayed error code
+       redirectToUrl('modules.php?module=index&amp;what=login&amp;code=' . getCode('MODULE_MEMBER_ONLY') . '&amp;mod=' . getModule());
 } // 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()) {
@@ -72,7 +64,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