X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=302e9d2091f5477de43a17fa60ebe0bedd383968;hp=909b85dd9726e6b14e0ae53154abe221ba031028;hb=30986f637cd3c03951bdbfc880b9a420f7724ce0;hpb=6e008d188bf9c7f8d4edc2a8799c61940eee48e7 diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 909b85dd97..302e9d2091 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -42,8 +42,8 @@ if (!defined('__SECURITY')) { require($INC); } -// Returns the title for given module -function ADD_MODULE_TITLE ($mod) { +// "Getter" for module title +function getModuleTitle ($mod) { // Init variables $name = ''; $result = false; @@ -60,7 +60,7 @@ function ADD_MODULE_TITLE ($mod) { } elseif (!EXT_IS_ACTIVE('cache')) { // Load from database $result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_mod_reg` WHERE `module`='%s' LIMIT 1", - array($mod), __FUNCTION__, __LINE__); + array($mod), __FUNCTION__, __LINE__); list($name) = SQL_FETCHROW($result); SQL_FREERESULT($result); } @@ -83,6 +83,32 @@ function ADD_MODULE_TITLE ($mod) { return $name; } +// "Getter" for module description +function getModuleDescription ($mode, $wht, $column = 'what') { + // Fix empty "what" + if (empty($wht)) { + $wht = "welcome"; + if (getConfig('index_home') != '') $wht = getConfig('index_home'); + } // END - if + + // Default is not found + $ret = "??? (".$wht.')'; + + // Look for title + $result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE %s='%s' LIMIT 1", + array($mode, $column, $wht), __FUNCTION__, __LINE__); + + // Is there an entry? + if (SQL_NUMROWS($result) == 1) { + // Fetch the title + list($ret) = SQL_FETCHROW($result); + } // END - if + + // Free result + SQL_FREERESULT($result); + return $ret; +} + // Check validity of a given module name (no file extension) function checkModulePermissions ($mod) { // Filter module name (names with low chars and underlines are fine!) @@ -104,17 +130,17 @@ function checkModulePermissions ($mod) { // Major error in module registry is the default $ret = "major"; - // Check if script is installed if not return a "done" to prevent some errors + // Check if script is installed if not return a 'done' to prevent some errors if ((!isInstalled()) || (isInstalling()) || (!isAdminRegistered())) { // Not installed or no admin registered or in installation phase - return "done"; + return 'done'; } // END - if // Init variables - $locked = "Y"; - $hidden = "N"; - $admin = "N"; - $mem = "N"; + $locked = 'Y'; + $hidden = 'N'; + $admin = 'N'; + $mem = 'N'; $found = false; // Check if cache is latest version @@ -143,7 +169,7 @@ 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__); + array($mod_chk), __FUNCTION__, __LINE__); if (SQL_NUMROWS($result) == 1) { // Read data list($locked, $hidden, $admin, $mem) = SQL_FETCHROW($result); @@ -159,7 +185,7 @@ function checkModulePermissions ($mod) { // Admin access ----- Guest access ----- --- Guest or member? --- if ((IS_ADMIN()) || (($locked == 'N') && ($admin == 'N') && (($mem == 'N') || (IS_MEMBER())))) { // If you are admin you are welcome for everything! - $ret = "done"; + $ret = 'done'; } elseif ($locked == 'Y') { // Module is locked $ret = "locked"; @@ -172,10 +198,10 @@ function checkModulePermissions ($mod) { } else { // @TODO Nothing helped??? DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("ret=%s,locked=%s,admin=%s,mem=%s", - $ret, - $locked, - $admin, - $mem + $ret, + $locked, + $admin, + $mem )); } } // END - if @@ -183,7 +209,7 @@ function checkModulePermissions ($mod) { // Still no luck or not found? if (($ret == "cache_miss") || (!$found)) { // ----- Legacy module ----- ---- Module in base folder ---- --- Module with extension's name --- - if ((FILE_READABLE(sprintf("%sinc/modules/%s.php", constant('PATH'), $mod))) || (FILE_READABLE(sprintf("%s%s.php", constant('PATH'), $mod))) || (FILE_READABLE(sprintf("%s%s/%s.php", constant('PATH'), $extension, $mod)))) { + 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 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 @@ -211,17 +237,17 @@ function checkModulePermissions ($mod) { $ret = checkModulePermissions($mod_chk); } else { // Module not found we don't add it to the database - $ret = "404"; + $ret = '404'; } } 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 )); } @@ -245,15 +271,15 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) { $type = "action"; $search = substr($file, 7); switch ($ACC_LVL) { - case 'admin': - $modCheck = 'admin'; - break; - - case 'sponsor': - case 'guest': - case 'member': - $modCheck = $GLOBALS['module']; - break; + case 'admin': + $modCheck = 'admin'; + break; + + case 'sponsor': + case 'guest': + case 'member': + $modCheck = $GLOBALS['module']; + break; } $AND = " AND (`what`='' OR `what` IS NULL)"; } elseif (substr($file, 0, 5) == "what-") { @@ -262,20 +288,20 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) { $search = substr($file, 5); $AND = ''; switch ($ACC_LVL) { - case 'admin': - $modCheck = 'admin'; - break; - - case 'guest': - case 'member': - $modCheck = $GLOBALS['module']; - if (!IS_ADMIN()) { - $AND = " AND `visible`='Y' AND `locked`='N'"; - } - break; + case 'admin': + $modCheck = 'admin'; + break; + + case 'guest': + case 'member': + $modCheck = $GLOBALS['module']; + if (!IS_ADMIN()) { + $AND = " AND `visible`='Y' AND `locked`='N'"; + } + break; } $dummy = substr($search, 0, -4); - $AND .= " AND `action`='".GET_ACTION($ACC_LVL, $dummy)."'"; + $AND .= " AND `action`='".getModeAction($ACC_LVL, $dummy)."'"; } elseif (($ACC_LVL == 'sponsor') || ($ACC_LVL == "engine")) { // Sponsor / engine menu $type = "what"; @@ -302,14 +328,14 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) { $prefix .= " -> "; // We need to remove .php and the end - if (substr($search, -4, 4) == ".php") { + if (substr($search, -4, 4) == '.php') { // Remove the .php $search = substr($search, 0, -4); } // END - i // Get the title from menu $result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE %s='%s' ".$AND." LIMIT 1", - array($ACC_LVL, $type, $search), __FUNCTION__, __LINE__); + array($ACC_LVL, $type, $search), __FUNCTION__, __LINE__); // Menu found? if (SQL_NUMROWS($result) == 1) { @@ -322,15 +348,15 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) { return $ret; } elseif (((GET_EXT_VERSION('sql_patches') >= '0.2.3') && (getConfig('youre_here') == 'Y')) || ((IS_ADMIN()) && ($modCheck == 'admin'))) { // Output HTML code - $OUT = $prefix."".$ret."\n"; + $OUT = $prefix."".$ret."\n"; // Can we close the you-are-here navigation? - //* DEBUG: */ echo __LINE__."*".$type."/".$GLOBALS['what']."*
\n"; + //* DEBUG: */ echo __LINE__."*".$type.'/'.$GLOBALS['what']."*
\n"; if (($type == "what") || (($type == "action") && ((!isset($GLOBALS['what'])) || ($GLOBALS['what'] == "overview")))) { - //* DEBUG: */ echo __LINE__."+".$type."+
\n"; + //* DEBUG: */ echo __LINE__.'+'.$type."+
\n"; // Add closing div and br-tag $OUT .= "
\n"; - $GLOBALS['nav_depth'] = "0"; + $GLOBALS['nav_depth'] = '0'; // Run the filter chain $ret = runFilterChain('post_youhere_line', array('access_level' => $ACC_LVL, 'type' => $type, 'content' => "")); @@ -353,7 +379,7 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) { } // -function ADD_MENU ($MODE, $act, $wht) { +function ADD_MENU ($mode, $act, $wht) { // Init some variables $main_cnt = 0; $AND = ''; @@ -361,7 +387,7 @@ function ADD_MENU ($MODE, $act, $wht) { $sub_what = ''; // is the menu action valid? - if (!VALIDATE_MENU_ACTION($MODE, $act, $wht, true)) { + if (!isMenuActionValid($mode, $act, $wht, true)) { return getCode('MENU_NOT_VALID'); } // END - if @@ -372,23 +398,23 @@ function ADD_MENU ($MODE, $act, $wht) { // Load SQL data and add the menu to the output stream... $result_main = SQL_QUERY_ESC("SELECT title, action FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE (`what`='' OR `what` IS NULL)".$AND." ORDER BY `sort`", - array($MODE), __FUNCTION__, __LINE__); - //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*
\n"; + array($mode), __FUNCTION__, __LINE__); + //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$main_action.'/'.$sub_what.':'.$GLOBALS['what']."*
\n"; if (SQL_NUMROWS($result_main) > 0) { - OUTPUT_HTML(""); + OUTPUT_HTML("
"); // There are menus available, so we simply display them... :) while ($content = SQL_FETCHARRAY($result_main)) { - //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$content['action']."/".$sub_what.":".$GLOBALS['what']."*
\n"; + //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$sub_what.':'.$GLOBALS['what']."*
\n"; // Init variables $GLOBALS['block_mode'] = false; $act = $content['action']; // Load menu header template - LOAD_TEMPLATE($MODE."_menu_title", false, $content); + LOAD_TEMPLATE($mode."_menu_title", false, $content); // Sub menu $result_sub = SQL_QUERY_ESC("SELECT title AS sub_title, what AS sub_what FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ".$AND." ORDER BY `sort`", - array($MODE, $content['action']), __FUNCTION__, __LINE__); + array($mode, $content['action']), __FUNCTION__, __LINE__); // Get number of rows $ctl = SQL_NUMROWS($result_sub); @@ -408,14 +434,14 @@ function ADD_MENU ($MODE, $act, $wht) { // Full file name for checking menu //* DEBUG: */ echo __LINE__.":!!!!".$content['sub_what']."!!!
\n"; - $INC = sprintf("inc/modules/%s/what-%s.php", $MODE, $content['sub_what']); - if (INCLUDE_READABLE($INC)) { + $INC = sprintf("inc/modules/%s/what-%s.php", $mode, $content['sub_what']); + if (isIncludeReadable($INC)) { if ((!empty($wht)) && (($wht == $content['sub_what']))) { $OUT = ""; } // Navigation link - $OUT .= ""; + $OUT .= ""; } else { $OUT .= ""; } @@ -423,7 +449,7 @@ function ADD_MENU ($MODE, $act, $wht) { // Menu title $OUT .= getConfig('menu_blur_spacer') . $content['sub_title']; - if (INCLUDE_READABLE($INC)) { + if (isIncludeReadable($INC)) { $OUT .= ""; } else { $OUT .= ""; @@ -444,32 +470,32 @@ function ADD_MENU ($MODE, $act, $wht) { // Add regular menu row or bottom row? if ($cnt < $ctl) { - LOAD_TEMPLATE($MODE."_menu_row", false, $content); + LOAD_TEMPLATE($mode."_menu_row", false, $content); } else { - LOAD_TEMPLATE($MODE."_menu_bottom", false, $content); + LOAD_TEMPLATE($mode."_menu_bottom", false, $content); } } } else { // This is a menu block... ;-) $GLOBALS['block_mode'] = true; - $INC_BLOCK = sprintf("inc/modules/%s/action-%s.php", $MODE, $content['action']); - if (FILE_READABLE($INC_BLOCK)) { + $INC_BLOCK = sprintf("inc/modules/%s/action-%s.php", $mode, $content['action']); + if (isFileReadable($INC_BLOCK)) { // Load include file if ((!EXT_IS_ACTIVE($content['action'])) || ($content['action'] == 'online')) OUTPUT_HTML(" - "); } - //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$content['action']."/".$content['sub_what'].":".$GLOBALS['what']."*
\n"; + //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.$GLOBALS['what']."*
\n"; } $main_cnt++; - //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$content['action']."/".$content['sub_what'].":".$GLOBALS['what']."*
\n"; + //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.$GLOBALS['what']."*
\n"; if (SQL_NUMROWS($result_main) > $main_cnt) { - OUTPUT_HTML(""); + OUTPUT_HTML(""); } // END - if } @@ -477,13 +503,79 @@ function ADD_MENU ($MODE, $act, $wht) { SQL_FREERESULT($result_main); // Close table - //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$content['action']."/".$content['sub_what'].":".$GLOBALS['what']."*
\n"; + //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.$GLOBALS['what']."*
\n"; OUTPUT_HTML("
"); - //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$content['action']."/".$content['sub_what'].":".$GLOBALS['what']."*
\n"; - LOAD_INC($INC_BLOCK); - //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$content['action']."/".$content['sub_what'].":".$GLOBALS['what']."*
\n"; + 		"); + //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.$GLOBALS['what']."*
\n"; + loadInclude($INC_BLOCK); + //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.$GLOBALS['what']."*
\n"; if ((!EXT_IS_ACTIVE($content['action'])) || ($content['action'] == 'online')) OUTPUT_HTML("
"); } } +// Checks wether the current user is a member +function IS_MEMBER () { + // @TODO Why is this global??? #100 + global $status; + + if (!is_array($GLOBALS['last'])) $GLOBALS['last'] = array(); + $ret = false; + + // is the cache entry there? + if (isset($GLOBALS['cache_array']['is_member'])) { + // Then return it + return $GLOBALS['cache_array']['is_member']; + } // END - if + + // Fix "deleted" cookies first + fixDeletedCookies(array('userid', 'u_hash')); + + // Are cookies set? + if ((isUserIdSet()) && (isSessionVariableSet('u_hash'))) { + // Cookies are set with values, but are they valid? + $result = SQL_QUERY_ESC("SELECT password, status, last_module, last_online FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", + array(getUserId()), __FUNCTION__, __LINE__); + if (SQL_NUMROWS($result) == 1) { + // Load data from cookies + list($password, $status, $mod, $onl) = SQL_FETCHROW($result); + + // Validate password by created the difference of it and the secret key + $valPass = generatePassString($password); + + // Transfer last module and online time + if ((!empty($mod)) && (empty($GLOBALS['last']['module']))) { + $GLOBALS['last']['module'] = $mod; + $GLOBALS['last']['online'] = $onl; + } // END - if + + // So did we now have valid data and an unlocked user? + //* DEBUG: */ echo $valPass."
".getSession('u_hash')."
"; + if (($status == 'CONFIRMED') && ($valPass == getSession('u_hash'))) { + // Account is confirmed and all cookie data is valid so he is definely logged in! :-) + $ret = true; + } else { + // Maybe got locked etc. + //* DEBUG: */ echo __LINE__."!!!
"; + destroyUserSession(); + } + } else { + // Cookie data is invalid! + //* DEBUG: */ echo __LINE__."***
"; + destroyUserSession(); + } + + // Free memory + SQL_FREERESULT($result); + } else { + // Cookie data is invalid! + //* DEBUG: */ echo __LINE__."///
"; + destroyUserSession(); + } + + // Cache status + $GLOBALS['cache_array']['is_member'] = $ret; + + // Return status + return $ret; +} + // This patched function will reduce many SELECT queries for the specified or current admin login -function IS_ADMIN ($admin="") { +function IS_ADMIN ($admin = '') { // Init variables $ret = false; $passCookie = ''; $valPass = ''; //* DEBUG: */ echo __LINE__."ADMIN:".$admin."
"; @@ -491,10 +583,10 @@ function IS_ADMIN ($admin="") { // If admin login is not given take current from cookies... if ((empty($admin)) && (isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5'))) { // Get admin login and password from session/cookies - $admin = get_session('admin_login'); - $passCookie = get_session('admin_md5'); + $admin = getSession('admin_login'); + $passCookie = getSession('admin_md5'); } - //* DEBUG: */ echo __LINE__."ADMIN:".$admin."/".$passCookie."
"; + //* DEBUG: */ echo __LINE__."ADMIN:".$admin.'/'.$passCookie."
"; // Search in array for entry if (isset($GLOBALS['cache_array']['admin_hash'])) { @@ -512,7 +604,7 @@ function IS_ADMIN ($admin="") { } elseif ((!empty($admin)) && ((!EXT_IS_ACTIVE('cache'))) || (!isset($GLOBALS['cache_array']['admins']['password'][$admin]))) { // Search for admin $result = SQL_QUERY_ESC("SELECT HIGH_PRIORITY password FROM `{!_MYSQL_PREFIX!}_admins` WHERE login='%s' LIMIT 1", - array($admin), __FUNCTION__, __LINE__); + array($admin), __FUNCTION__, __LINE__); // Is he admin? $passDB = ''; @@ -533,7 +625,7 @@ function IS_ADMIN ($admin="") { if (!empty($valPass)) { // Check if password is valid - //* DEBUG: */ print __FUNCTION__."*".$valPass."/".$passCookie."*
\n"; + //* DEBUG: */ print __FUNCTION__."*".$valPass.'/'.$passCookie."*
\n"; $ret = (($valPass == $passCookie) || ((strlen($valPass) == 32) && ($valPass == md5($passCookie))) || (($valPass == "*FAILED*") && (!EXT_IS_ACTIVE('cache')))); } @@ -543,25 +635,25 @@ function IS_ADMIN ($admin="") { } // Generates a list of "max receiveable emails per day" -function ADD_MAX_RECEIVE_LIST ($MODE, $default = "", $return = false) { +function addMaxReceiveList ($mode, $default = '', $return = false) { $OUT = ''; $result = false; - switch ($MODE) { + switch ($mode) { case 'guest': // Guests (in the registration form) are not allowed to select 0 mails per day. $result = SQL_QUERY("SELECT value, comment FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE value > 0 ORDER BY value", - __FUNCTION__, __LINE__); + __FUNCTION__, __LINE__); break; case 'member': // Members are allowed to set to zero mails per day (we will change this soon!) $result = SQL_QUERY("SELECT value, comment FROM `{!_MYSQL_PREFIX!}_max_receive` ORDER BY value", - __FUNCTION__, __LINE__); + __FUNCTION__, __LINE__); break; default: // Invalid! - DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid mode %s detected.", $MODE)); + DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid mode %s detected.", $mode)); break; } @@ -572,13 +664,13 @@ function ADD_MAX_RECEIVE_LIST ($MODE, $default = "", $return = false) { $OUT .= "