X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Flogin.php;h=fca747b2badeb4f810bcf4945186028a5ff78c96;hp=1c796983da8fd78f216d6af68b833c1993f33ca1;hb=e8ca54fe91872ab95a6ffdc4f1268bf18889021d;hpb=81bfbcd72e424060ea1223b49ad92fcfa150f361

diff --git a/inc/modules/login.php b/inc/modules/login.php
index 1c796983da..fca747b2ba 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                                        *
@@ -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 - 2008 by Roland Haeder                           *
+ * 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 *
@@ -38,76 +37,68 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-} elseif (!IS_MEMBER()) {
-	$URL = 'modules.php?module=index';
-	if ($check == 'mem_only') $URL .= '&amp;msg='.getCode('MODULE_MEM_ONLY') . '&amp;mod='.$GLOBALS['module'];
-	redirectToUrl($URL);
-}
-
-if ($status != 'CONFIRMED') {
-	// If the status is different than confirmed move the user away from here
-	$errorCode = generateErrorCodeFromUserStatus($status);
-
-	// Load URL
-	redirectToUrl('modules.php?module=index&amp;what=login&amp;login=' . $errorCode);
+	die();
+} elseif (!isMember()) {
+	// 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
 
-// Load adverstising template
-define('__MEMBER_ADVERT', LOAD_TEMPLATE('member_banner', true));
-
 // Disable block mode by default
-$GLOBALS['block_mode'] = false;
+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 (empty($GLOBALS['action'])) {
-	if (empty($GLOBALS['what'])) $GLOBALS['what'] = 'welcome';
+if (!isActionSet()) {
+	if (!isWhatSet()) setWhat('welcome');
 } else {
-	$act = SQL_ESCAPE($GLOBALS['action']);
+	$action = getAction();
 }
 
 // Add the member's menu here...
-if ((getConfig('member_menu') == 'Y') || (!EXT_IS_ACTIVE('sql_patches', true))) {
-	ADD_MENU('member', getModeAction('member', $GLOBALS['what']), $GLOBALS['what']);
+if ((getConfig('member_menu') == 'Y') || (!isExtensionActive('sql_patches', true))) {
+	addMenu('member', getActionFromModuleWhat('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', $GLOBALS['action'], $GLOBALS['what']))) {
+$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');
 
 //
 ?>