X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmysql-manager.php;h=a50e4e23fa8707ca9bd448082fc1cd1a6363cb18;hb=de5ae633b5cafff852eb6d58505d609c87c5a803;hp=84c5fd08fc1c74fe8b5656de27f63356d148cace;hpb=7297440d795390abd70ddc339b1a81d34f76c953;p=mailer.git diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 84c5fd08fc..a50e4e23fa 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -87,12 +87,12 @@ function getModuleTitle ($mod) { function getModuleDescription ($mode, $wht, $column = 'what') { // Fix empty 'what' if (empty($wht)) { - $wht = "welcome"; + $wht = 'welcome'; if (getConfig('index_home') != '') $wht = getConfig('index_home'); } // END - if // Default is not found - $ret = "??? (".$wht.')'; + $ret = '??? (' . $wht . ')'; // Look for title $result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE %s='%s' LIMIT 1", @@ -146,6 +146,7 @@ function checkModulePermissions ($mod) { // Check if cache is latest version if (GET_EXT_VERSION('cache') >= '0.1.2') { // Is the cache there? + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, 'Using cache.'); if (!isset($GLOBALS['cache_array']['modules'])) { // This happens when a new extension is registered while ext-cache is installed $ret = 'cache_miss'; @@ -154,6 +155,7 @@ function checkModulePermissions ($mod) { // Is the module cached? if (isset($GLOBALS['cache_array']['modules']['locked'][$mod_chk])) { // Check cache + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, 'Cache found.'); $locked = $GLOBALS['cache_array']['modules']['locked'][$mod_chk]; $hidden = $GLOBALS['cache_array']['modules']['hidden'][$mod_chk]; $admin = $GLOBALS['cache_array']['modules']['admin_only'][$mod_chk]; @@ -168,15 +170,23 @@ function checkModulePermissions ($mod) { } } elseif (!EXT_IS_ACTIVE('cache')) { // Check for module in database - $result = SQL_QUERY_ESC("SELECT locked, hidden, admin_only, mem_only FROM `{!_MYSQL_PREFIX!}_mod_reg` WHERE `module`='%s' LIMIT 1", - array($mod_chk), __FUNCTION__, __LINE__); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, 'Using database.'); + $result = SQL_QUERY_ESC("SELECT `locked`, `hidden`, `admin_only`, `mem_only` FROM `{!_MYSQL_PREFIX!}_mod_reg` WHERE `module`='%s' LIMIT 1", + array($mod_chk), __FUNCTION__, __LINE__); if (SQL_NUMROWS($result) == 1) { // Read data + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, 'Entry found.'); list($locked, $hidden, $admin, $mem) = SQL_FETCHROW($result); - SQL_FREERESULT($result); $found = true; + } elseif (isDebugModeEnabled()) { + // Debug message only in debug-mode... + DEBUG_LOG(__FUNCTION__, __LINE__, 'Module ' . $mod_chk . ' not found!'); } + + // Free result + SQL_FREERESULT($result); } + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, 'ret=' . $ret); // Is the module found? if ($found === true) { @@ -207,7 +217,7 @@ function checkModulePermissions ($mod) { } // END - if // Still no luck or not found? - if (($ret == 'cache_miss') || (!$found)) { + if ((($ret == 'cache_miss') || ($found === false)) && (getOutputMode() == '0')) { // ----- Legacy module ----- ---- Module in base folder ---- --- Module with extension's name --- if ((isFileReadable(sprintf("%sinc/modules/%s.php", constant('PATH'), $mod))) || (isFileReadable(sprintf("%s%s.php", constant('PATH'), $mod))) || (isFileReadable(sprintf("%s%s/%s.php", constant('PATH'), $extension, $mod)))) { // Data is missing so we add it @@ -215,12 +225,12 @@ function checkModulePermissions ($mod) { // Since 0.3.6 we have a has_menu column, this took me a half hour // to find a loop here... *sigh* SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_mod_reg` -(module, locked, hidden, mem_only, admin_only, has_menu) VALUES +(`module`, `locked`, `hidden`, `mem_only`, `admin_only`, `has_menu`) VALUES ('%s','Y','N','N','N','N')", array($mod_chk), __FUNCTION__, __LINE__); } else { // Wrong/missing sql_patches! SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_mod_reg` -(module, locked, hidden, mem_only, admin_only) VALUES +(`module`, `locked`, `hidden`, `mem_only`, `admin_only`) VALUES ('%s','Y','N','N','N')", array($mod_chk), __FUNCTION__, __LINE__); } @@ -231,6 +241,7 @@ function checkModulePermissions ($mod) { } // END - if // Destroy cache here + // @TODO Rewrite this to a filter rebuildCacheFiles('modreg', 'modreg'); // And reload data @@ -242,21 +253,22 @@ function checkModulePermissions ($mod) { } elseif (!$found) { // Problem with module detected DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Problem in module %s detected. ret=%s, locked=%s, hidden=%s, mem=%s, admin=%s", - $mod, - $ret, - $locked, - $hidden, - $mem, - $admin + $mod, + $ret, + $locked, + $hidden, + $mem, + $admin )); } // Return the value + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, 'ret=' . $ret); return $ret; } // Add menu description pending on given file name (without path!) -function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) { +function ADD_DESCR ($accessLevel, $FQFN, $return = false, $output = true) { // Use only filename of the FQFN... $file = basename($FQFN); @@ -270,7 +282,7 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) { // This is an action file! $type = 'action'; $search = substr($file, 7); - switch ($ACC_LVL) { + switch ($accessLevel) { case 'admin': $modCheck = 'admin'; break; @@ -278,7 +290,7 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) { case 'sponsor': case 'guest': case 'member': - $modCheck = $GLOBALS['module']; + $modCheck = getModule(); break; } $AND = " AND (`what`='' OR `what` IS NULL)"; @@ -287,45 +299,46 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) { $type = 'what'; $search = substr($file, 5); $AND = ''; - switch ($ACC_LVL) { + switch ($accessLevel) { case 'admin': $modCheck = 'admin'; break; case 'guest': case 'member': - $modCheck = $GLOBALS['module']; + $modCheck = getModule(); if (!IS_ADMIN()) { $AND = " AND `visible`='Y' AND `locked`='N'"; } break; } + $dummy = substr($search, 0, -4); - $AND .= " AND `action`='".getModeAction($ACC_LVL, $dummy)."'"; - } elseif (($ACC_LVL == 'sponsor') || ($ACC_LVL == "engine")) { + $AND .= " AND `action`='".getModeAction($accessLevel, $dummy)."'"; + } elseif (($accessLevel == 'sponsor') || ($accessLevel == "engine")) { // Sponsor / engine menu $type = 'what'; $search = $file; - $modCheck = $GLOBALS['module']; + $modCheck = getModule(); $AND = ''; } else { // Other - $type = "menu"; + $type = 'menu'; $search = $file; - $modCheck = $GLOBALS['module']; + $modCheck = getModule(); $AND = ''; } // Begin the navigation line if ((!isset($GLOBALS['nav_depth'])) && (!$return)) { $GLOBALS['nav_depth'] = 0; - $prefix = "