X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=e4ef99b7002818d881166f91de7c301e61aa6422;hb=1b81b91b621b59df17d1e3e1e2a1d12529697806;hp=909b85dd9726e6b14e0ae53154abe221ba031028;hpb=6e008d188bf9c7f8d4edc2a8799c61940eee48e7;p=mailer.git diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 909b85dd97..e4ef99b700 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -353,7 +353,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 +361,7 @@ function ADD_MENU ($MODE, $act, $wht) { $sub_what = ''; // is the menu action valid? - if (!VALIDATE_MENU_ACTION($MODE, $act, $wht, true)) { + if (!VALIDATE_MENU_ACTION($mode, $act, $wht, true)) { return getCode('MENU_NOT_VALID'); } // END - if @@ -372,10 +372,10 @@ 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__); + 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"; @@ -384,11 +384,11 @@ function ADD_MENU ($MODE, $act, $wht) { $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,7 +408,7 @@ 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']); + $INC = sprintf("inc/modules/%s/what-%s.php", $mode, $content['sub_what']); if (INCLUDE_READABLE($INC)) { if ((!empty($wht)) && (($wht == $content['sub_what']))) { $OUT = ""; @@ -444,20 +444,20 @@ 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']); + $INC_BLOCK = sprintf("inc/modules/%s/action-%s.php", $mode, $content['action']); if (FILE_READABLE($INC_BLOCK)) { // Load include file if ((!EXT_IS_ACTIVE($content['action'])) || ($content['action'] == 'online')) OUTPUT_HTML(" - "); + OUTPUT_HTML(""); } // END - if } @@ -543,11 +543,11 @@ function IS_ADMIN ($admin="") { } // Generates a list of "max receiveable emails per day" -function ADD_MAX_RECEIVE_LIST ($MODE, $default = "", $return = false) { +function ADD_MAX_RECEIVE_LIST ($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", @@ -561,7 +561,7 @@ function ADD_MAX_RECEIVE_LIST ($MODE, $default = "", $return = false) { break; default: // Invalid! - DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid mode %s detected.", $MODE)); + DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid mode %s detected.", $mode)); break; } @@ -578,7 +578,7 @@ function ADD_MAX_RECEIVE_LIST ($MODE, $default = "", $return = false) { define('__MAX_RECEIVE_OPTIONS', $OUT); // Load template - $OUT = LOAD_TEMPLATE($MODE."_receive_table", true); + $OUT = LOAD_TEMPLATE($mode."_receive_table", true); } else { // Maybe the admin has to setup some maximum values? debug_report_bug("Nothing is being done here?"); @@ -679,14 +679,14 @@ function IS_MEMBER () { } // Validate the given menu action -function VALIDATE_MENU_ACTION ($MODE, $act, $wht, $UPDATE=false) { +function VALIDATE_MENU_ACTION ($mode, $act, $wht, $UPDATE=false) { // Is the cache entry there and we shall not update? - if ((isset($GLOBALS['cache_array']['action_valid'][$MODE][$act][$wht])) && ($UPDATE === false)) { + if ((isset($GLOBALS['cache_array']['action_valid'][$mode][$act][$wht])) && ($UPDATE === false)) { // Count cache hit incrementConfigEntry('cache_hits'); // Then use this cache - return $GLOBALS['cache_array']['action_valid'][$MODE][$act][$wht]; + return $GLOBALS['cache_array']['action_valid'][$mode][$act][$wht]; } // END - if // By default nothing is valid @@ -694,21 +694,21 @@ function VALIDATE_MENU_ACTION ($MODE, $act, $wht, $UPDATE=false) { // Look in all menus or only unlocked $add = ''; - if ((!IS_ADMIN()) && ($MODE != 'admin')) $add = " AND `locked`='N'"; + if ((!IS_ADMIN()) && ($mode != 'admin')) $add = " AND `locked`='N'"; - //* DEBUG: */ echo __LINE__.":".$MODE."/".$act."/".$wht."*
\n"; - if (($MODE != 'admin') && ($UPDATE === true)) { + //* DEBUG: */ echo __LINE__.":".$mode."/".$act."/".$wht."*
\n"; + if (($mode != 'admin') && ($UPDATE === true)) { // Update guest or member menu $sql = SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_%s_menu` SET counter=counter+1 WHERE `action`='%s' AND `what`='%s'".$add." LIMIT 1", - array($MODE, $act, $wht), __FUNCTION__, __LINE__, false); + array($mode, $act, $wht), __FUNCTION__, __LINE__, false); } elseif (($wht != "overview") && (!empty($wht))) { // Other actions $sql = SQL_QUERY_ESC("SELECT id, what FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `action`='%s' AND `what`='%s'".$add." ORDER BY action DESC LIMIT 1", - array($MODE, $act, $wht), __FUNCTION__, __LINE__, false); + array($mode, $act, $wht), __FUNCTION__, __LINE__, false); } else { // Admin login overview $sql = SQL_QUERY_ESC("SELECT id, what FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `action`='%s' AND (`what`='' OR `what` IS NULL)".$add." ORDER BY action DESC LIMIT 1", - array($MODE, $act), __FUNCTION__, __LINE__, false); + array($mode, $act), __FUNCTION__, __LINE__, false); } // Run SQL command @@ -725,14 +725,14 @@ function VALIDATE_MENU_ACTION ($MODE, $act, $wht, $UPDATE=false) { SQL_FREERESULT($result); // Set cache entry - $GLOBALS['cache_array']['action_valid'][$MODE][$act][$wht] = $ret; + $GLOBALS['cache_array']['action_valid'][$mode][$act][$wht] = $ret; // Return result return $ret; } // -function GET_MOD_DESCR($MODE, $wht, $column="what") { +function GET_MOD_DESCR($mode, $wht, $column="what") { // Fix empty "what" if (empty($wht)) { $wht = "welcome"; @@ -744,7 +744,7 @@ function GET_MOD_DESCR($MODE, $wht, $column="what") { // 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__); + array($mode, $column, $wht), __FUNCTION__, __LINE__); // Is there an entry? if (SQL_NUMROWS($result) == 1) { @@ -890,17 +890,17 @@ function countModuleHit($mod) { } // Get action value from mode (admin/guest/member) and what-value -function GET_ACTION ($MODE, &$wht) { +function GET_ACTION ($mode, &$wht) { // Init status $ret = ''; - //* DEBUG: */ echo __LINE__."=".$MODE."/".$wht."/".$GLOBALS['action']."=
"; - if ((empty($wht)) && ($MODE != 'admin')) { + //* DEBUG: */ echo __LINE__."=".$mode."/".$wht."/".$GLOBALS['action']."=
"; + if ((empty($wht)) && ($mode != 'admin')) { $wht = "welcome"; if (getConfig('index_home') != "") $wht = getConfig('index_home'); } // END - if - if ($MODE == 'admin') { + if ($mode == 'admin') { // Action value for admin area if (REQUEST_ISSET_GET('action')) { // Use from request! @@ -919,11 +919,11 @@ function GET_ACTION ($MODE, &$wht) { //* DEBUG: */ echo __FUNCTION__."(".__LINE__."): ret=".$ret."
\n"; // Does the module have a menu? - if (MODULE_HAS_MENU($MODE)) { + if (MODULE_HAS_MENU($mode)) { // Rewriting modules to menu - switch ($MODE) { - case 'index': $MODE = 'guest'; break; - case "login": $MODE = 'member'; break; + switch ($mode) { + case 'index': $mode = 'guest'; break; + case "login": $mode = 'member'; break; } // END - switch // Guest and member menu is "main" as the default @@ -931,7 +931,7 @@ function GET_ACTION ($MODE, &$wht) { // Load from database $result = SQL_QUERY_ESC("SELECT action FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `what`='%s' LIMIT 1", - array($MODE, $wht), __FUNCTION__, __LINE__); + array($mode, $wht), __FUNCTION__, __LINE__); if (SQL_NUMROWS($result) == 1) { // Load action value and pray that this one is the right you want... ;-) list($ret) = SQL_FETCHROW($result); @@ -939,7 +939,7 @@ function GET_ACTION ($MODE, &$wht) { // Free memory SQL_FREERESULT($result); - } elseif ((GET_EXT_VERSION('sql_patches') == "") && ($MODE != 'admin')) { + } elseif ((GET_EXT_VERSION('sql_patches') == "") && ($mode != 'admin')) { // No sql_patches installed, but maybe we need to register an admin? if (isAdminRegistered()) { // Redirect
"); + "); //* 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"; @@ -469,7 +469,7 @@ function ADD_MENU ($MODE, $act, $wht) { $main_cnt++; //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$content['action']."/".$content['sub_what'].":".$GLOBALS['what']."*
\n"; if (SQL_NUMROWS($result_main) > $main_cnt) { - OUTPUT_HTML("