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

diff --git a/inc/modules/login.php b/inc/modules/login.php
index 971a7c0309..4252eaf76c 100644
--- a/inc/modules/login.php
+++ b/inc/modules/login.php
@@ -10,9 +10,14 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Login-Bereich fuer Mitglieder                    *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -33,95 +38,78 @@
 
 // Some security stuff...
 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);
-	LOAD_URL($URL);
+	die();
+} elseif (!isMember()) {
+	$URL = 'modules.php?module=index';
+	if (checkModulePermissions('login') == 'mem_only') $URL .= '&code=' . getCode('MODULE_MEM_ONLY') . '&mod=' . getModule();
+	redirectToUrl($URL);
 }
 
-if ($status != "CONFIRMED") {
+if ($GLOBALS['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;
-	}
-	$URL = URL."/modules.php?module=index&login=".$ERROR;
-	LOAD_URL($URL);
-} // END - if
+	$errorCode = generateErrorCodeFromUserStatus($GLOBALS['status']);
 
-// Recheck if he got logged out because bad cookies
-if (!IS_MEMBER()) {
-	$URL = URL."/modules.php?module=index";
-	LOAD_URL($URL);
+	// 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
-$BLOCK_MODE = false;
+enableBlockMode(false);
 
 // Generate a tableset for the menu title and content
-LOAD_TEMPLATE("member_header");
+loadTemplate('member_header');
+
+// Add code-message here
+handleCodeMessage();
 
 // Begin menu block here
-OUTPUT_HTML("<TR>
-  <TD class=\"member_menu\">");
+outputHtml("<tr>
+  <td class=\"member_menu\">");
 
 // 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 (($_CONFIG['member_menu'] == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) {
-	ADD_MENU("member", GET_ACTION("member", $GLOBALS['what']), $GLOBALS['what']);
+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>
-  <TD valign=\"top\" align=\"center\" rowspan=\"3\" class=\"member_content\">");
+outputHtml("   </td>
+  <td valign=\"top\" align=\"center\" rowspan=\"3\" class=\"member_content\">");
 
-$INC_ACTION = sprintf("%sinc/modules/member/action-%s.php", PATH, $act);
-if ((FILE_READABLE($INC_ACTION)) && (VALIDATE_MENU_ACTION("member", GET_ACTION("member", $GLOBALS['what']), $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
-	include ($INC_ACTION);
+	loadInclude($inc);
 } else {
 	// Invalid module specified or not found...
-	LOAD_URL("modules.php?module=login");
+	redirectToUrl('modules.php?module=login');
 }
 
-if (($_CONFIG['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>
-</TR>");
+outputHtml("  </td>
+</tr>");
 
-// Load same template for "Goto TOP"
-LOAD_TEMPLATE("member_goto_top");
+// Load same template for 'Goto TOP'
+loadTemplate('member_goto_top');
 
 // Footer template (Thanx to Mr. Glaus!)
-LOAD_TEMPLATE("member_footer");
+loadTemplate('member_footer');
 
 //
 ?>