Compilation time added, some compileCode() calles removed, ADMIN_WHAT_404 added

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

diff --git a/inc/modules/login.php b/inc/modules/login.php
index 3ce8c164ac0da36fab055c5cfcb68bf56bbff089..82ef10b897e54205f670010f4370414b267bfb70 100644 (file)
--- a/inc/modules/login.php
+++ b/inc/modules/login.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,76 +38,69 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
-} elseif (!IS_MEMBER()) {
+       die();
+} elseif (!isMember()) {
        $URL = 'modules.php?module=index';
-       if ($check == 'mem_only') $URL .= '&msg='.getCode('MODULE_MEM_ONLY') . '&mod='.getModule();
+       if (checkModulePermissions('login') == 'mem_only') $URL .= '&code=' . getCode('MODULE_MEM_ONLY') . '&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&what=login&login=' . $errorCode);
 } // END - if
 
-// Load adverstising template
-define('__MEMBER_ADVERT', LOAD_TEMPLATE('member_banner', true));
-
 // Disable block mode by default
 enableBlockMode(false);
 
 // Generate a tableset for the menu title and content
-LOAD_TEMPLATE('member_header');
+loadTemplate('member_header', false, array('date_time' => generateDateTime(time(), 1)));
+
+// Add code-message here
+handleCodeMessage();
 
 // Begin menu block here
-OUTPUT_HTML("<tr>
-  <td class=\"member_menu\">");
+loadTemplate('member_menu_start');
 
 // Adding the main content module here
 if (!isActionSet()) {
        if (!isWhatSet()) setWhat('welcome');
 } else {
-       $act = getAction();
+       $action = getAction();
 }
 
 // Add the member's menu here...
-if ((getConfig('member_menu') == 'Y') || (!EXT_IS_ACTIVE('sql_patches', true))) {
-       ADD_MENU('member', getModeAction('member', getWhat()), getWhat());
+if ((getConfig('member_menu') == 'Y') || (!isExtensionActive('sql_patches', true))) {
+       addMenu('member', getModeAction('member', getWhat()), getWhat());
 } // END - if
 
+// Disable block-mode again
+enableBlockMode(false);
+
 // Menu -> content
-OUTPUT_HTML("   </td>
+outputHtml("   </td>
   <td valign=\"top\" align=\"center\" rowspan=\"3\" class=\"member_content\">");
 
-$INC = sprintf("inc/modules/member/action-%s.php", $act);
-if ((isIncludeReadable($INC)) && (isMenuActionValid('member', getAction(), getWhat()))) {
+$inc = sprintf("inc/modules/member/action-%s.php", $action);
+if ((isIncludeReadable($inc)) && (isMenuActionValid('member', getAction(), getWhat()))) {
        // Requested module is available so we load it
-       loadInclude($INC);
+       loadInclude($inc);
 } else {
        // Invalid module specified or not found...
        redirectToUrl('modules.php?module=login');
 }
 
-if ((getConfig('member_menu') == 'Y') || (!EXT_IS_ACTIVE('sql_patches', true))) {
+if ((getConfig('member_menu') == 'Y') || (!isExtensionActive('sql_patches', true))) {
        // Right side of content (hint: a good place for 120x600 skyscraper banner!)
-       LOAD_TEMPLATE('member_content_right');
+       loadTemplate('member_content_right');
 
        // Some advertising stuff?
-       LOAD_TEMPLATE('member_advert');
+       loadTemplate('member_advert');
 }
 
-OUTPUT_HTML("  </td>
+outputHtml("  </td>
 </tr>");
 
 // Load same template for 'Goto TOP'
-LOAD_TEMPLATE('member_goto_top');
+loadTemplate('member_goto_top');
 
 // Footer template (Thanx to Mr. Glaus!)
-LOAD_TEMPLATE('member_footer');
+loadTemplate('member_footer');
 
 //
 ?>