X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Flogin.php;h=3d6ba4b198abbb7d30596a692caabceb5bee9317;hb=64e19775d4b46488e9805b886dfe4e91d7d3a544;hp=0e04a299d8ee2e96ecc602892a778ee505204045;hpb=e5fe5afb17a5c8106f4c890234dfa39419e70f5d;p=mailer.git

diff --git a/inc/modules/login.php b/inc/modules/login.php
index 0e04a299d8..3d6ba4b198 100644
--- a/inc/modules/login.php
+++ b/inc/modules/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 - 2011 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,9 +39,8 @@
 if (!defined('__SECURITY')) {
 	die();
 } elseif (!isMember()) {
-	$URL = 'modules.php?module=index';
-	if (checkModulePermissions('login') == 'mem_only') $URL .= '&code=' . getCode('MODULE_MEM_ONLY') . '&mod=' . getModule();
-	redirectToUrl($URL);
+	// Redirect to login form with displayed error code
+	redirectToUrl('modules.php?module=index&what=login&code=' . getCode('MODULE_MEMBER_ONLY') . '&mod=' . getModule());
 } // END - if
 
 // Disable block mode by default
@@ -59,22 +57,24 @@ loadTemplate('member_menu_start');
 
 // Adding the main content module here
 if (!isActionSet()) {
-	if (!isWhatSet()) setWhat('welcome');
+	if (!isWhatSet()) {
+		setWhat('welcome');
+	} // END - if
 } else {
 	$action = getAction();
 }
 
 // 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
 enableBlockMode(false);
 
 // Menu -> content
-outputHtml("   </td>
-  <td valign=\"top\" align=\"center\" rowspan=\"3\" class=\"member_content\">");
+outputHtml('   </td>
+  <td valign="top" align="center" rowspan="3" class="member_content">');
 
 $inc = sprintf("inc/modules/member/action-%s.php", $action);
 if ((isIncludeReadable($inc)) && (isMenuActionValid('member', getAction(), getWhat()))) {
@@ -91,10 +91,10 @@ if ((getConfig('member_menu') == 'Y') || (!isExtensionActive('sql_patches', true
 
 	// Some advertising stuff?
 	loadTemplate('member_advert');
-}
+} // END - if
 
-outputHtml("  </td>
-</tr>");
+outputHtml('  </td>
+</tr>');
 
 // Load same template for 'Goto TOP'
 loadTemplate('member_goto_top');
@@ -102,5 +102,5 @@ loadTemplate('member_goto_top');
 // Footer template (Thanx to Mr. Glaus!)
 loadTemplate('member_footer');
 
-//
+// [EOF]
 ?>