X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=e1df712762f9ea86ceb7691c76a55959b953c2a1;hp=d3a95764bcf77dd162d25ba37e56b149c9d1ffe7;hb=0369c36aaab5af6ed44da1e13a53baef285f79b4;hpb=df8cb42d2d579310d1ccfb562b8f30eafdb2618e;ds=sidebyside diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index d3a95764bc..e1df712762 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -132,13 +132,13 @@ function CHECK_MODULE($mod) { // Check returned values against current access permissions // // Admin access ----- Guest access ----- --- Guest or member? --- - if ((IS_ADMIN()) || (($locked == "N") && ($admin == "N") && (($mem == "N") || (IS_LOGGED_IN())))) { + if ((IS_ADMIN()) || (($locked == "N") && ($admin == "N") && (($mem == "N") || (IS_MEMBER())))) { // If you are admin you are welcome for everything! $ret = "done"; } elseif ($locked == "Y") { // Module is locked $ret = "locked"; - } elseif (($mem == "Y") && (!IS_LOGGED_IN())) { + } elseif (($mem == "Y") && (!IS_MEMBER())) { // You have to login first! $ret = "mem_only"; } elseif (($admin == "Y") && (!IS_ADMIN())) { @@ -148,8 +148,8 @@ function CHECK_MODULE($mod) { // Still no luck or not found? if (($ret == "major") || ($ret == "cache_miss") || (!$found)) { - // ----- Legacy module ----- ---- Module in base folder ---- --- Module with extension's name --- - if ((file_exists(PATH."inc/modules/".$mod.".php")) || (file_exists(PATH.$mod.".php")) || (file_exists(PATH.$extension."/".$mod.".php"))) { + // ----- Legacy module ----- ---- Module in base folder ---- --- Module with extension's name --- + if ((FILE_READABLE(sprintf("%sinc/modules/%s.php", PATH, $mod))) || (FILE_READABLE(sprintf("%s%s.php", PATH, $mod))) || (FILE_READABLE(sprintf("%s%s/%s.php", PATH, $extension, $mod)))) { // Data is missing so we add it if (GET_EXT_VERSION("sql_patches") >= "0.3.6") { // Since 0.3.6 we have a has_menu column, this took me a half hour @@ -168,13 +168,13 @@ function CHECK_MODULE($mod) { if (SQL_AFFECTEDROWS() == 0) { // Something bad happend! return "major"; - } + } // END - if // Destroy cache here if (GET_EXT_VERSION("cache") >= "0.1.2") { if ($cacheInstance->cache_file("mod_reg", true)) $cacheInstance->cache_destroy(); unset($cacheArray['modules']); - } + } // END - if // And reload data $ret = CHECK_MODULE($mod_chk); @@ -182,7 +182,7 @@ function CHECK_MODULE($mod) { // Module not found we don't add it to the database $ret = "404"; } - } + } // END - if // Return the value return $ret; @@ -245,7 +245,7 @@ function ADD_DESCR($ACC_LVL, $file, $return = false, $output = true) { $AND = ""; } if ((!isset($DEPTH)) && (!$return)) { - $DEPTH = "0"; + $DEPTH = 0; $prefix = "
"; + debug_print_backtrace(); + die(""); + } // END - if + // Initialize variables - $uid = "0"; $rid = "0"; $MEM = "N"; $ADMIN = "N"; - if (!empty($GLOBALS['userid'])) - { - // Update member status only when userid is valid - if (($GLOBALS['userid'] > 0) && (IS_LOGGED_IN())) - { - // Is valid user - $uid = $GLOBALS['userid']; - $MEM = "Y"; - } - } - if (IS_ADMIN()) - { + $uid = 0; $rid = 0; $MEM = "N"; $ADMIN = "N"; + + // Valid userid? + if ((!empty($GLOBALS['userid'])) && ($GLOBALS['userid'] > 0) && (IS_MEMBER())) { + // Is valid user + $uid = bigintval($GLOBALS['userid']); + $MEM = "Y"; + } // END - if + + if (IS_ADMIN()) { // Is administrator $ADMIN = "Y"; - } + } // END - if + if (isSessionVariableSet('refid')) { // Check cookie - if (get_session('refid') > 0) $rid = $GLOBALS['refid']; - } + if (get_session('refid') > 0) $rid = bigintval($GLOBALS['refid']); + } // END - if - // Now Read data + // Now search for the user $result = SQL_QUERY_ESC("SELECT timestamp FROM "._MYSQL_PREFIX."_online WHERE sid='%s' LIMIT 1", array($SID), __FILE__, __LINE__); - if (SQL_NUMROWS($result) == 1) - { - SQL_FREERESULT($result); - $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_online SET + // Entry found? + if (SQL_NUMROWS($result) == 1) { + // Then update it + SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_online SET module='%s', action='%s', what='%s', @@ -1239,24 +1245,18 @@ is_member='%s', is_admin='%s', timestamp=UNIX_TIMESTAMP() WHERE sid='%s' LIMIT 1", - array( - $mod, - $act, - $wht, - bigintval($uid), - bigintval($rid), - $MEM, - $ADMIN, - $SID -), __FILE__, __LINE__); - } - else - { + array($mod, $act, $wht, $uid, $rid, $MEM, $ADMIN, $SID), __FILE__, __LINE__ + ); + } else { // No entry does exists so we simply add it! - $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_online (module, action, what, userid, refid, is_member, is_admin, timestamp, sid, ip) VALUES ('%s', '%s', '%s', %s, %s, '%s', '%s', UNIX_TIMESTAMP(), '%s', '%s')", - array($mod, $act, $wht, bigintval($uid), bigintval($rid), $MEM, $ADMIN, $SID, getenv('REMOTE_ADDR')), __FILE__, __LINE__); + SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_online (module, action, what, userid, refid, is_member, is_admin, timestamp, sid, ip) VALUES ('%s', '%s', '%s', %s, %s, '%s', '%s', UNIX_TIMESTAMP(), '%s', '%s')", + array($mod, $act, $wht, $uid, $rid, $MEM, $ADMIN, $SID, getenv('REMOTE_ADDR')), __FILE__, __LINE__ + ); } + // Free result + SQL_FREERESULT($result); + // Purge old entries $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_online WHERE timestamp <= (UNIX_TIMESTAMP() - %s)", array($_CONFIG['online_timeout']), __FILE__, __LINE__); @@ -1355,7 +1355,7 @@ function ADD_OPTION_LINES($table, $id, $name, $default="",$special="",$where="") // Selection from array if (is_array($id) && is_array($name) && sizeof($id) == sizeof($name)) { // Both are arrays - foreach ($id as $idx=>$value) { + foreach ($id as $idx => $value) { $ret .= "