More misc fixes and rewrites (sorry, lame description)

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

diff --git a/inc/modules/login.php b/inc/modules/login.php
index f06e6bac8f27d1f8e133a96a5b33d4a31630786d..e703758342811ceb64eba13e204561b11302b16f 100644 (file)
--- a/inc/modules/login.php
+++ b/inc/modules/login.php
@@ -38,76 +38,79 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $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 .= "&msg=".getCode('MODULE_MEM_ONLY')."&mod=".$GLOBALS['module'];
-       LOAD_URL($URL);
+       $URL = 'modules.php?module=index';
+       if (checkModulePermissions('login') == 'mem_only') $URL .= '&msg=' . 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
-       $errorCode = GEN_ERROR_CODE_FROM_ACCOUNT_STATUS($status);
+       $errorCode = generateErrorCodeFromUserStatus($GLOBALS['status']);
 
        // Load URL
-       LOAD_URL("modules.php?module=index&what=login&login=".$errorCode);
+       redirectToUrl('modules.php?module=index&what=login&login=' . $errorCode);
 } // END - if
 
 // Load adverstising template
-define('__MEMBER_ADVERT', LOAD_TEMPLATE("member_banner", true));
+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");
+LOAD_TEMPLATE('member_header');
 
 // Begin menu block here
 OUTPUT_HTML("<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']);
+       $act = getAction();
 }
 
 // Add the member's menu here...
-if ((getConfig('member_menu') == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) {
-       ADD_MENU("member", GET_ACTION("member", $GLOBALS['what']), $GLOBALS['what']);
+if ((getConfig('member_menu') == 'Y') || (!EXT_IS_ACTIVE('sql_patches', true))) {
+       ADD_MENU('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\">");
 
 $INC = sprintf("inc/modules/member/action-%s.php", $act);
-if ((INCLUDE_READABLE($INC)) && (VALIDATE_MENU_ACTION("member", $GLOBALS['action'], $GLOBALS['what']))) {
+if ((isIncludeReadable($INC)) && (isMenuActionValid('member', getAction(), getWhat()))) {
        // Requested module is available so we load it
-       LOAD_INC($INC);
+       loadInclude($INC);
 } else {
        // Invalid module specified or not found...
-       LOAD_URL("modules.php?module=login");
+       redirectToUrl('modules.php?module=login');
 }
 
-if ((getConfig('member_menu') == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) {
+if ((getConfig('member_menu') == 'Y') || (!EXT_IS_ACTIVE('sql_patches', true))) {
        // Right side of content (hint: a good place for 120x600 skyscraper banner!)
-       LOAD_TEMPLATE("member_content_right");
+       LOAD_TEMPLATE('member_content_right');
 
        // Some advertising stuff?
-       LOAD_TEMPLATE("member_advert");
+       LOAD_TEMPLATE('member_advert');
 }
 
 OUTPUT_HTML("  </td>
 </tr>");
 
-// Load same template for "Goto TOP"
-LOAD_TEMPLATE("member_goto_top");
+// Load same template for 'Goto TOP'
+LOAD_TEMPLATE('member_goto_top');
 
 // Footer template (Thanx to Mr. Glaus!)
-LOAD_TEMPLATE("member_footer");
+LOAD_TEMPLATE('member_footer');
 
 //
 ?>