X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions-functions.php;h=743f97281f7ba3a345559218d5eba0316139385f;hb=79de7fa82ee054465a46784340c891889e9f9275;hp=001aee7e1dc14b8fc9cbb7c2ba23d99f7938679a;hpb=d92a340159ca45047eafc111fcac64933a7babeb;p=mailer.git diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php index 001aee7e1d..743f97281f 100644 --- a/inc/extensions-functions.php +++ b/inc/extensions-functions.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 * @@ -281,7 +282,7 @@ function registerExtension ($ext_name, $task_id, $dry_run = false, $logout = tru } // END - for // Is there no update? - if (countExtensionUpdateDependencies(getCurrentExtensionName()) == '0') { + if (countExtensionUpdateDependencies(getCurrentExtensionName()) == 0) { // Then test is passed! $test = true; } // END - if @@ -960,9 +961,9 @@ function ifModuleHasMenu ($mod, $forceDb = false) { // Check cache and count hit $ret = ($GLOBALS['cache_array']['extension']['ext_menu'][$mod] == 'Y'); incrementStatsEntry('cache_hits'); - } elseif ($mod == 'admin') { - // Admin module has always a menu! - $ret = true; + } else { + // Admin/guest/member/sponsor modules have always a menu! + $ret = in_array($mod, array('admin', 'index', 'login', 'sponsor')); } } elseif ((isExtensionInstalled('sql_patches')) && (getExtensionVersion('sql_patches') >= '0.3.6') && ((!isExtensionActive('cache')) || ($forceDb === true))) { // Check database for entry @@ -984,8 +985,11 @@ function ifModuleHasMenu ($mod, $forceDb = false) { // Free memory SQL_FREERESULT($result); } elseif (!isExtensionInstalled('sql_patches')) { - // No sql_patches installed, so maybe in admin area or no admin registered? - $ret = (((isAdmin()) || (!isAdminRegistered())) && ($mod == 'admin')); // Then there is a menu! + // No sql_patches installed, so maybe in admin/guest/member/sponsor area or no admin registered? + $ret = in_array($mod, array('admin', 'index', 'login', 'sponsor')); // Then there is a menu! + } else { + // Unsupported state! + logDebugMessage(__FUNCTION__, __LINE__, 'This should never be reached.'); } // Return status @@ -1447,7 +1451,7 @@ function getCurrentExtensionVersion () { return $GLOBALS['ext_current_version']; } -// Remove the extension from global cache array +// Remove the extension from cache array function removeExtensionFromArray () { // "Cache" this name $ext_name = getCurrentExtensionName();