X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=modules.php;h=f2d1639a6c88f7e1554c53df40caec2c1f67dcbd;hb=f4c3a7ea1b3a8695e403a665ed2a0ad74246ae67;hp=f6abef2d6d05772d3c14510d715af0532009ea56;hpb=bc72f913ef9ef26f4103d3deddb4d8be5337a1e5;p=mailer.git diff --git a/modules.php b/modules.php index f6abef2d6d..f2d1639a6c 100644 --- a/modules.php +++ b/modules.php @@ -18,6 +18,7 @@ * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * 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 * @@ -56,9 +57,9 @@ require('inc/config-global.php'); setContentType('text/html'); // Fix missing module to 'index' -if (!isGetRequestElementSet('module')) { +if (!isGetRequestParameterSet('module')) { // Set element - setGetRequestElement('module', 'index'); + setGetRequestParameter('module', 'index'); // ... and module setModule('index'); @@ -76,7 +77,7 @@ $check = 'failed'; if ((isExtensionActive('maintenance')) && (getConfig('maintenance') == 'Y') && (!isAdmin()) && (getModule() != 'admin')) { // Maintain mode is active and you are no admin addFatalMessage(__FILE__, __LINE__, getMessage('LANG_DOWN_MAINTAINCE')); -} elseif ((SQL_IS_LINK_UP()) && (getTotalFatalErrors() == '0')) { +} elseif ((SQL_IS_LINK_UP()) && (!ifFatalErrorsDetected())) { // Construct module name $GLOBALS['module_inc'] = sprintf("inc/modules/%s.php", getModule()); @@ -88,10 +89,10 @@ if ((isExtensionActive('maintenance')) && (getConfig('maintenance') == 'Y') && ( case 'mem_only': // Member-only access case 'done': // All fine! // Does the module exists on local file system? - if ((isIncludeReadable($GLOBALS['module_inc'])) && (getTotalFatalErrors() == '0')) { + if ((isIncludeReadable($GLOBALS['module_inc'])) && (!ifFatalErrorsDetected())) { // Module is valid, active and located on the local disc... $isModuleValid = true; - } elseif (getTotalFatalErrors() == '0') { + } elseif (!ifFatalErrorsDetected()) { // Module not found! addFatalMessage(__FILE__, __LINE__, getMaskedMessage('LANG_MOD_REG_404', getModule())); } @@ -116,7 +117,7 @@ if ((isExtensionActive('maintenance')) && (getConfig('maintenance') == 'Y') && ( addFatalMessage(__FILE__, __LINE__, getMaskedMessage('LANG_MOD_REG_UNKNOWN', $check)); break; } // END - switch -} elseif (getTotalFatalErrors() == '0') { +} elseif (!ifFatalErrorsDetected()) { // MySQL problems! addFatalMessage(__FILE__, __LINE__, getMessage('MYSQL_ERRORS')); }