X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=6a8a9e43f238e4eaa33ad9acfe43fa395c624d6a;hp=c7c7f1062f18aba61e749cefb5934d77c13edfcb;hb=f97a999e0737c0007ae9c3c26dfef49f75a175ac;hpb=4c83f0cc7459cad9ec9c1c68963f5365155ee935 diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index c7c7f1062f..6a8a9e43f2 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -10,7 +10,12 @@ * -------------------------------------------------------------------- * * Kurzbeschreibung : Alle MySQL-Relevanten Funktionen * * -------------------------------------------------------------------- * - * * + * $Revision:: $ * + * $Date:: $ * + * $Tag:: 0.2.1-FINAL $ * + * $Author:: $ * + * Needs to be in all Files and every File needs "svn propset * + * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2008 by Roland Haeder * * For more information visit: http://www.mxchange.org * @@ -33,29 +38,29 @@ // Some security stuff... if (!defined('__SECURITY')) { - $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; + $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php'; require($INC); } // Returns the title for given module function ADD_MODULE_TITLE ($mod) { // Init variables - $name = ""; + $name = ''; $result = false; // Is the script installed? - if (isBooleanConstantAndTrue('mxchange_installed')) { + if (isInstalled()) { // Check if cache is valid - if ((GET_EXT_VERSION("cache") >= "0.1.2") && (isset($GLOBALS['cache_array']['modules']['module'])) && (in_array($mod, $GLOBALS['cache_array']['modules']['module']))) { + if ((GET_EXT_VERSION('cache') >= '0.1.2') && (isset($GLOBALS['cache_array']['modules']['module'])) && (in_array($mod, $GLOBALS['cache_array']['modules']['module']))) { // Load from cache $name = $GLOBALS['cache_array']['modules']['title'][$mod]; // Update cache hits incrementConfigEntry('cache_hits'); - } elseif (!EXT_IS_ACTIVE("cache")) { + } 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), __FILE__, __LINE__); + $result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_mod_reg` WHERE `module`='%s' LIMIT 1", + array($mod), __FUNCTION__, __LINE__); list($name) = SQL_FETCHROW($result); SQL_FREERESULT($result); } @@ -70,7 +75,7 @@ function ADD_MODULE_TITLE ($mod) { $name = sprintf("%s (%s)", getMessage('LANG_UNKNOWN_MODULE'), $mod); if (SQL_NUMROWS($result) == 0) { // Add module to database - $dummy = CHECK_MODULE($mod); + $dummy = checkModulePermissions($mod); } // END - if } // END - if @@ -79,13 +84,13 @@ function ADD_MODULE_TITLE ($mod) { } // Check validity of a given module name (no file extension) -function CHECK_MODULE ($mod) { +function checkModulePermissions ($mod) { // Filter module name (names with low chars and underlines are fine!) - $mod = preg_replace("/[^a-z_]/", "", $mod); + $mod = preg_replace("/[^a-z_]/", '', $mod); // Check for prefix is a extension... $modSplit = explode("_", $mod); - $extension = ""; $mod_chk = $mod; + $extension = ''; $mod_chk = $mod; //* DEBUG: */ echo __LINE__."*".count($modSplit)."*/".$mod."*
"; if (count($modSplit) == 2) { // Okay, there is a seperator (_) in the name so is the first part a module? @@ -100,7 +105,7 @@ function CHECK_MODULE ($mod) { $ret = "major"; // Check if script is installed if not return a "done" to prevent some errors - if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isInstalling()) || (!isBooleanConstantAndTrue('admin_registered'))) { + if ((!isInstalled()) || (isInstalling()) || (!isAdminRegistered())) { // Not installed or no admin registered or in installation phase return "done"; } // END - if @@ -113,7 +118,13 @@ function CHECK_MODULE ($mod) { $found = false; // Check if cache is latest version - if (GET_EXT_VERSION("cache") >= "0.1.2") { + if (GET_EXT_VERSION('cache') >= '0.1.2') { + // Is the cache there? + if (!isset($GLOBALS['cache_array']['modules'])) { + // This should normally not happen... + debug_report_bug("Cache 'modules' is gone."); + } // END - if + // Is the module cached? if (isset($GLOBALS['cache_array']['modules']['locked'][$mod_chk])) { // Check cache @@ -129,10 +140,10 @@ function CHECK_MODULE ($mod) { // No, then we have to update it! $ret = "cache_miss"; } - } elseif (!EXT_IS_ACTIVE("cache")) { + } 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), __FILE__, __LINE__); + $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 list($locked, $hidden, $admin, $mem) = SQL_FETCHROW($result); @@ -146,16 +157,16 @@ 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_MEMBER())))) { + 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") { + } elseif ($locked == 'Y') { // Module is locked $ret = "locked"; - } elseif (($mem == "Y") && (!IS_MEMBER())) { + } elseif (($mem == 'Y') && (!IS_MEMBER())) { // You have to login first! $ret = "mem_only"; - } elseif (($admin == "Y") && (!IS_ADMIN())) { + } elseif (($admin == 'Y') && (!IS_ADMIN())) { // Only the Admin is allowed to enter this module! $ret = "admin_only"; } else { @@ -174,17 +185,17 @@ function CHECK_MODULE ($mod) { // ----- 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)))) { // Data is missing so we add it - if (GET_EXT_VERSION("sql_patches") >= "0.3.6") { + 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 // 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 -('%s','Y','N','N','N','N')", array($mod_chk), __FILE__, __LINE__); +('%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 -('%s','Y','N','N','N')", array($mod_chk), __FILE__, __LINE__); +('%s','Y','N','N','N')", array($mod_chk), __FUNCTION__, __LINE__); } // Everthing is fine? @@ -194,10 +205,10 @@ function CHECK_MODULE ($mod) { } // END - if // Destroy cache here - REBUILD_CACHE("mod_reg", "modreg"); + rebuildCacheFiles("modreg", "modreg"); // And reload data - $ret = CHECK_MODULE($mod_chk); + $ret = checkModulePermissions($mod_chk); } else { // Module not found we don't add it to the database $ret = "404"; @@ -224,9 +235,9 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) { $file = basename($FQFN); // Init variables - $LINK_ADD = ""; - $OUT = ""; - $AND = ""; + $LINK_ADD = ''; + $OUT = ''; + $AND = ''; // First we have to do some analysis... if (substr($file, 0, 7) == "action-") { @@ -234,29 +245,29 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) { $type = "action"; $search = substr($file, 7); switch ($ACC_LVL) { - case "admin": - $modCheck = "admin"; + case 'admin': + $modCheck = 'admin'; break; - case "sponsor": - case "guest": - case "member": + case 'sponsor': + case 'guest': + case 'member': $modCheck = $GLOBALS['module']; break; } - $AND = " AND (what='' OR `what` IS NULL)"; + $AND = " AND (`what`='' OR `what` IS NULL)"; } elseif (substr($file, 0, 5) == "what-") { // This is an admin what file! $type = "what"; $search = substr($file, 5); - $AND = ""; + $AND = ''; switch ($ACC_LVL) { - case "admin": - $modCheck = "admin"; + case 'admin': + $modCheck = 'admin'; break; - case "guest": - case "member": + case 'guest': + case 'member': $modCheck = $GLOBALS['module']; if (!IS_ADMIN()) { $AND = " AND `visible`='Y' AND `locked`='N'"; @@ -265,18 +276,18 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) { } $dummy = substr($search, 0, -4); $AND .= " AND `action`='".GET_ACTION($ACC_LVL, $dummy)."'"; - } elseif (($ACC_LVL == "sponsor") || ($ACC_LVL == "engine")) { + } elseif (($ACC_LVL == 'sponsor') || ($ACC_LVL == "engine")) { // Sponsor / engine menu $type = "what"; $search = $file; $modCheck = $GLOBALS['module']; - $AND = ""; + $AND = ''; } else { // Other $type = "menu"; $search = $file; $modCheck = $GLOBALS['module']; - $AND = ""; + $AND = ''; } // Begin the navigation line @@ -285,7 +296,7 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) { $prefix = "
{--YOU_ARE_HERE--} Home"; } else { if (!$return) $GLOBALS['nav_depth']++; - $prefix = ""; + $prefix = ''; } $prefix .= " -> "; @@ -298,7 +309,7 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) { // 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), __FILE__, __LINE__); + array($ACC_LVL, $type, $search), __FUNCTION__, __LINE__); // Menu found? if (SQL_NUMROWS($result) == 1) { @@ -306,10 +317,10 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) { list($ret) = SQL_FETCHROW($result); // Shall we return it? - if ($return) { + if ($return === true) { // Return title return $ret; - } elseif (((GET_EXT_VERSION("sql_patches") >= "0.2.3") && (getConfig('youre_here') == "Y")) || ((IS_ADMIN()) && ($modCheck == "admin"))) { + } elseif (((GET_EXT_VERSION('sql_patches') >= '0.2.3') && (getConfig('youre_here') == 'Y')) || ((IS_ADMIN()) && ($modCheck == 'admin'))) { // Output HTML code $OUT = $prefix."".$ret."\n"; @@ -322,7 +333,7 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) { $GLOBALS['nav_depth'] = "0"; // Run the filter chain - $ret = RUN_FILTER('post_youhere_line', array('access_level' => $ACC_LVL, 'type' => $type, 'content' => "")); + $ret = runFilterChain('post_youhere_line', array('access_level' => $ACC_LVL, 'type' => $type, 'content' => "")); $OUT .= $ret['content']; } // END - if } @@ -345,81 +356,90 @@ function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) { function ADD_MENU ($MODE, $act, $wht) { // Init some variables $main_cnt = 0; - $AND = ""; - $main_action = ""; - $sub_what = ""; + $AND = ''; + $main_action = ''; + $sub_what = ''; // is the menu action valid? if (!VALIDATE_MENU_ACTION($MODE, $act, $wht, true)) { - return getMessage('CODE_MENU_NOT_VALID'); + return getCode('MENU_NOT_VALID'); } // END - if // Non-admin shall not see all menus if (!IS_ADMIN()) { $AND = " AND `visible`='Y' AND `locked`='N'"; - } + } // END - if // 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), __FILE__, __LINE__); + $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"; if (SQL_NUMROWS($result_main) > 0) { OUTPUT_HTML(""); // There are menus available, so we simply display them... :) - while (list($main_title, $main_action) = SQL_FETCHROW($result_main)) { - //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*
\n"; + while ($content = SQL_FETCHARRAY($result_main)) { + //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$content['action']."/".$sub_what.":".$GLOBALS['what']."*
\n"; // Init variables - $BLOCK_MODE = false; $act = $main_action; - - // Prepare content - $content = array( - 'action' => $main_action, - 'title' => $main_title - ); + $GLOBALS['block_mode'] = false; + $act = $content['action']; // Load menu header template LOAD_TEMPLATE($MODE."_menu_title", false, $content); - $result_sub = SQL_QUERY_ESC("SELECT title, what FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ".$AND." ORDER BY `sort`", - array($MODE, $main_action), __FILE__, __LINE__); + // 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__); + + // Get number of rows $ctl = SQL_NUMROWS($result_sub); + + // Do we have some entries? if ($ctl > 0) { - $cnt=0; - while (list($sub_title, $sub_what) = SQL_FETCHROW($result_sub)) { + // Init counter + $cnt = 0; + + // Load all sub menus + while ($content2 = SQL_FETCHARRAY($result_sub)) { + // Merge both arrays in one + $content = merge_array($content, $content2); + // Init content - $content = ""; + $OUT = ''; // Full file name for checking menu - //* DEBUG: */ echo __LINE__.":!!!!".$sub_what."!!!
\n"; - $FQFN = sprintf("%sinc/modules/%s/what-%s.php", constant('PATH'), $MODE, $sub_what); - if (FILE_READABLE($FQFN)) { - if ((!empty($wht)) && (($wht == $sub_what))) { - $content = ""; + //* DEBUG: */ echo __LINE__.":!!!!".$content['sub_what']."!!!
\n"; + $INC = sprintf("inc/modules/%s/what-%s.php", $MODE, $content['sub_what']); + if (INCLUDE_READABLE($INC)) { + if ((!empty($wht)) && (($wht == $content['sub_what']))) { + $OUT = ""; } // Navigation link - $content .= ""; + $OUT .= ""; } else { - $content .= ""; + $OUT .= ""; } // Menu title - $content .= getConfig('menu_blur_spacer') . $sub_title; + $OUT .= getConfig('menu_blur_spacer') . $content['sub_title']; - if (FILE_READABLE($FQFN)) { - $content .= ""; + if (INCLUDE_READABLE($INC)) { + $OUT .= ""; } else { - $content .= ""; + $OUT .= ""; } - if ((!empty($wht)) && (($wht == $sub_what))) { - $content .= ""; - } - $wht = $sub_what; $cnt++; - // Prepare array + if ((!empty($wht)) && (($wht == $content['sub_what']))) { + $OUT .= ""; + } // END - if + + // Remember 'what' for next round and count it up + $wht = $content['sub_what']; $cnt++; + + // Rewrite array $content = array( - 'menu' => $content, - 'what' => $sub_what + 'menu' => $OUT, + 'what' => $content['sub_what'] ); // Add regular menu row or bottom row? @@ -431,31 +451,33 @@ function ADD_MENU ($MODE, $act, $wht) { } } else { // This is a menu block... ;-) - $BLOCK_MODE = true; - $INC_BLOCK = sprintf("inc/modules/%s/action-%s.php", $MODE, $main_action); + $GLOBALS['block_mode'] = true; + $INC_BLOCK = sprintf("inc/modules/%s/action-%s.php", $MODE, $content['action']); if (FILE_READABLE($INC_BLOCK)) { // Load include file - if ((!EXT_IS_ACTIVE($main_action)) || ($main_action == "online")) OUTPUT_HTML(" + if ((!EXT_IS_ACTIVE($content['action'])) || ($content['action'] == 'online')) OUTPUT_HTML(" + //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$content['action']."/".$content['sub_what'].":".$GLOBALS['what']."*
\n"; + if ((!EXT_IS_ACTIVE($content['action'])) || ($content['action'] == 'online')) OUTPUT_HTML(" "); } - //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$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."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*
\n"; - if (SQL_NUMROWS($result_main) > $main_cnt) OUTPUT_HTML(""); + //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$content['action']."/".$content['sub_what'].":".$GLOBALS['what']."*
\n"; + if (SQL_NUMROWS($result_main) > $main_cnt) { + OUTPUT_HTML(""); + } // END - if } // Free memory SQL_FREERESULT($result_main); // Close table - //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$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."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*
\n"; + //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$content['action']."/".$content['sub_what'].":".$GLOBALS['what']."*
\n"; LOAD_INC($INC_BLOCK); - //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*
\n"; - if ((!EXT_IS_ACTIVE($main_action)) || ($main_action == "online")) OUTPUT_HTML("
"); } } @@ -463,7 +485,7 @@ function ADD_MENU ($MODE, $act, $wht) { // This patched function will reduce many SELECT queries for the specified or current admin login function IS_ADMIN ($admin="") { // Init variables - $ret = false; $passCookie = ""; $valPass = ""; + $ret = false; $passCookie = ''; $valPass = ''; //* DEBUG: */ echo __LINE__."ADMIN:".$admin."
"; // If admin login is not given take current from cookies... @@ -487,13 +509,13 @@ function IS_ADMIN ($admin="") { // Count cache hits incrementConfigEntry('cache_hits'); - } elseif ((!empty($admin)) && ((!EXT_IS_ACTIVE("cache"))) || (!isset($GLOBALS['cache_array']['admins']['password'][$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), __FILE__, __LINE__); + array($admin), __FUNCTION__, __LINE__); // Is he admin? - $passDB = ""; + $passDB = ''; if (SQL_NUMROWS($result) == 1) { // Admin login was found so let's load password from DB list($passDB) = SQL_FETCHROW($result); @@ -512,7 +534,7 @@ function IS_ADMIN ($admin="") { if (!empty($valPass)) { // Check if password is valid //* DEBUG: */ print __FUNCTION__."*".$valPass."/".$passCookie."*
\n"; - $ret = (($valPass == $passCookie) || ((strlen($valPass) == 32) && ($valPass == md5($passCookie))) || (($valPass == "*FAILED*") && (!EXT_IS_ACTIVE("cache")))); + $ret = (($valPass == $passCookie) || ((strlen($valPass) == 32) && ($valPass == md5($passCookie))) || (($valPass == "*FAILED*") && (!EXT_IS_ACTIVE('cache')))); } // Return result of comparision @@ -522,54 +544,50 @@ function IS_ADMIN ($admin="") { // Generates a list of "max receiveable emails per day" function ADD_MAX_RECEIVE_LIST ($MODE, $default = "", $return = false) { - $OUT = ""; + $OUT = ''; + $result = false; + 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", __FILE__, __LINE__); - if (SQL_NUMROWS($result) > 0) { - $OUT = ""; - while (list($value, $comment) = SQL_FETCHROW($result)) { - $OUT .= " \n"; + $ret = "\n"; } } // Return - hopefully - the requested data return $ret; } -// Activate exchange (DEPERECATED???) -function activateExchange() { +// Activate exchange +function activateExchange () { + // Is the extension 'user' there? + if (!EXT_IS_ACTIVE('user')) { + // Silently abort here + return false; + } // END - if + // Check total amount of users - $totalUsers = GET_TOTAL_DATA("CONFIRMED", "user_data", "userid", "status", true, " AND max_mails > 0"); + $totalUsers = GET_TOTAL_DATA("CONFIRMED", "user_data", 'userid', "status", true, " AND max_mails > 0"); if ($totalUsers >= getConfig('activate_xchange')) { // Activate System - $SQLs = array( - "UPDATE `{!_MYSQL_PREFIX!}_mod_reg` SET `locked`='N', hidden='N', mem_only='Y' WHERE module='order' LIMIT 1", + SET_SQLS(array( + "UPDATE `{!_MYSQL_PREFIX!}_mod_reg` SET `locked`='N', `hidden`='N', `mem_only`='Y' WHERE `module`='order' LIMIT 1", "UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='order' OR `what`='unconfirmed' LIMIT 2", "UPDATE `{!_MYSQL_PREFIX!}_config` SET activate_xchange='0' WHERE config=0 LIMIT 1" - ); + )); // Run SQLs - RUN_FILTER('run_sqls', array('dry_run' => false, 'sqls' => $SQLs)); + runFilterChain('run_sqls'); - // Rebuild cache - REBUILD_CACHE("config", "config"); + // Rebuild caches + rebuildCacheFiles("config", "config"); + rebuildCacheFiles("modreg", "modreg"); } // END - if } // @@ -1528,19 +1580,19 @@ function DELETE_USER_ACCOUNT($uid, $reason) FROM `{!_MYSQL_PREFIX!}_user_points` AS p LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d ON p.userid=d.userid -WHERE p.userid=%s", array(bigintval($uid)), __FILE__, __LINE__); +WHERE p.userid=%s", array(bigintval($uid)), __FUNCTION__, __LINE__); if (SQL_NUMROWS($result) == 1) { // Save his points to add them to the jackpot list($points) = SQL_FETCHROW($result); SQL_FREERESULT($result); // Delete points entries as well - SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_points` WHERE userid=%s", array(bigintval($uid)), __FILE__, __LINE__); + SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_points` WHERE userid=%s", array(bigintval($uid)), __FUNCTION__, __LINE__); // Update mediadata as well - if (GET_EXT_VERSION("mediadata") >= "0.0.4") { + if (GET_EXT_VERSION('mediadata') >= '0.0.4') { // Update database - MEDIA_UPDATE_ENTRY(array("total_points"), "sub", $points); + MEDIA_UPDATE_ENTRY(array('total_points'), 'sub', $points); } // END - if // Now, when we have all his points adds them do the jackpot! @@ -1549,12 +1601,12 @@ WHERE p.userid=%s", array(bigintval($uid)), __FILE__, __LINE__); // Delete category selections as well... SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE userid=%s", - array(bigintval($uid)), __FILE__, __LINE__); + array(bigintval($uid)), __FUNCTION__, __LINE__); // Remove from rallye if found - if (EXT_IS_ACTIVE("rallye")) { + if (EXT_IS_ACTIVE('rallye')) { SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_rallye_users` WHERE userid=%s", - array(bigintval($uid)), __FILE__, __LINE__); + array(bigintval($uid)), __FUNCTION__, __LINE__); } // Now a mail to the user and that's all... @@ -1562,15 +1614,15 @@ WHERE p.userid=%s", array(bigintval($uid)), __FILE__, __LINE__); SEND_EMAIL($uid, getMessage('ADMIN_DEL_ACCOUNT'), $msg); // Ok, delete the account! - SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__); + SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", array(bigintval($uid)), __FUNCTION__, __LINE__); } // function META_DESCRIPTION ($mod, $wht) { // Exclude admin and member's area - if (($mod != "admin") && ($mod != "login")) { + if (($mod != 'admin') && ($mod != "login")) { // Construct dynamic description - $DESCR = "{!MAIN_TITLE!} ".trim(getConfig('title_middle'))." ".ADD_DESCR("guest", "what-".$wht, true); + $DESCR = "{!MAIN_TITLE!} ".trim(getConfig('title_middle'))." ".ADD_DESCR('guest', "what-".$wht, true); // Output it directly OUTPUT_HTML(""); @@ -1581,17 +1633,17 @@ function META_DESCRIPTION ($mod, $wht) { } // function ADD_JACKPOT($points) { - $result = SQL_QUERY("SELECT points FROM `{!_MYSQL_PREFIX!}_jackpot` WHERE ok='ok' LIMIT 1", __FILE__, __LINE__); + $result = SQL_QUERY("SELECT points FROM `{!_MYSQL_PREFIX!}_jackpot` WHERE ok='ok' LIMIT 1", __FUNCTION__, __LINE__); if (SQL_NUMROWS($result) == 0) { // Create line - SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_jackpot` (ok, points) VALUES ('ok','%s')", array($points), __FILE__, __LINE__); + SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_jackpot` (ok, points) VALUES ('ok','%s')", array($points), __FUNCTION__, __LINE__); } else { // Free memory SQL_FREERESULT($result); // Update points SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_jackpot` SET points=points+%s WHERE ok='ok' LIMIT 1", - array($points), __FILE__, __LINE__); + array($points), __FUNCTION__, __LINE__); } } // @@ -1600,17 +1652,17 @@ function SUB_JACKPOT($points) { $ret = "-1"; // Get current points - $result = SQL_QUERY("SELECT points FROM `{!_MYSQL_PREFIX!}_jackpot` WHERE ok='ok' LIMIT 1", __FILE__, __LINE__); + $result = SQL_QUERY("SELECT points FROM `{!_MYSQL_PREFIX!}_jackpot` WHERE ok='ok' LIMIT 1", __FUNCTION__, __LINE__); if (SQL_NUMROWS($result) == 0) { // Create line - SQL_QUERY("INSERT INTO `{!_MYSQL_PREFIX!}_jackpot` (ok, points) VALUES ('ok', 0.00000)", __FILE__, __LINE__); + SQL_QUERY("INSERT INTO `{!_MYSQL_PREFIX!}_jackpot` (ok, points) VALUES ('ok', 0.00000)", __FUNCTION__, __LINE__); } else { // Read points list($jackpot) = SQL_FETCHROW($result); if ($jackpot >= $points) { // Update points when there are enougth points in jackpot SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_jackpot` SET points=points-%s WHERE ok='ok' LIMIT 1", - array($points), __FILE__, __LINE__); + array($points), __FUNCTION__, __LINE__); $ret = $jackpot - $points; } // END - if } @@ -1620,60 +1672,33 @@ function SUB_JACKPOT($points) { } // function IS_DEMO () { - return ((EXT_IS_ACTIVE("demo")) && (get_session('admin_login') == "demo")); + return ((EXT_IS_ACTIVE('demo')) && (get_session('admin_login') == 'demo')); } -// -function LOAD_CONFIG ($no="0") { - $CFG_DUMMY = array(); - - // Check for cache extension, cache-array and if the requested configuration is in cache - if ((is_array($GLOBALS['cache_array'])) && (isset($GLOBALS['cache_array']['config'][$no])) && (is_array($GLOBALS['cache_array']['config'][$no]))) { - // Load config from cache - //* DEBUG: */ echo gettype($GLOBALS['cache_array']['config'][$no])."
\n"; - foreach ($GLOBALS['cache_array']['config'][$no] as $key => $value) { - $CFG_DUMMY[$key] = $value; - } // END - foreach - // Count cache hits if exists - if ((isset($CFG_DUMMY['cache_hits'])) && (EXT_IS_ACTIVE("cache"))) { - $CFG_DUMMY['cache_hits']++; - } // END - if - } elseif ((!EXT_IS_ACTIVE("cache")) || (!isset($GLOBALS['cache_array']['config'][$no]))) { - // Load config from DB - $result_config = SQL_QUERY_ESC("SELECT * FROM `{!_MYSQL_PREFIX!}_config` WHERE config=%d LIMIT 1", - array(bigintval($no)), __FILE__, __LINE__); - - // Get config from database - $CFG_DUMMY = SQL_FETCHARRAY($result_config); - - // Free result - SQL_FREERESULT($result_config); - - // Remember this config in the array - $GLOBALS['cache_array']['config'][$no] = $CFG_DUMMY; - } - - // Return config array - return $CFG_DUMMY; -} // Gets the matching what name from module -function GET_WHAT($modCheck) { - $wht = ""; +function GET_WHAT ($modCheck) { + // Is the request element set? + if (REQUEST_ISSET_GET('what')) { + // Then return this! + return REQUEST_GET('what'); + } // END - if + + $wht = ''; //* DEBUG: */ echo __LINE__."!".$modCheck."!
\n"; switch ($modCheck) { - case "admin": + case 'admin': $wht = "overview"; break; case "login": - case "index": + case 'index': $wht = "welcome"; - if (($modCheck == "index") && (getConfig('index_home') != "")) $wht = getConfig('index_home'); + if (($modCheck == 'index') && (getConfig('index_home') != "")) $wht = getConfig('index_home'); break; default: - $wht = ""; + $wht = ''; break; } @@ -1685,18 +1710,18 @@ function GET_WHAT($modCheck) { function SUB_POINTS ($subject, $uid, $points) { // Add points to used points SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `used_points`=`used_points`+%s WHERE userid=%s LIMIT 1", - array($points, bigintval($uid)), __FILE__, __LINE__); + array($points, bigintval($uid)), __FUNCTION__, __LINE__); // Insert booking record - if (EXT_IS_ACTIVE("booking")) { + if (EXT_IS_ACTIVE('booking')) { // Add record - ADD_BOOKING_RECORD($subject, $uid, $points, "sub"); + ADD_BOOKING_RECORD($subject, $uid, $points, 'sub'); } // END - if // Update mediadata as well - if (GET_EXT_VERSION("mediadata") >= "0.0.4") { + if (GET_EXT_VERSION('mediadata') >= '0.0.4') { // Update database - MEDIA_UPDATE_ENTRY(array("total_points"), "sub", $points); + MEDIA_UPDATE_ENTRY(array('total_points'), 'sub', $points); } // END - if } @@ -1710,7 +1735,7 @@ function UPDATE_CONFIG ($entries, $values, $updateMode="") { // Do we have multiple entries? if (is_array($entries)) { // Walk through all - $all = ""; + $all = ''; foreach ($entries as $idx => $entry) { // Update mode set? if (!empty($updateMode)) { @@ -1731,7 +1756,7 @@ function UPDATE_CONFIG ($entries, $values, $updateMode="") { } } - // Set it in $_CONFIG as well + // Set it in config as well setConfigEntry($entry, $values[$idx]); } // END - foreach @@ -1742,7 +1767,7 @@ function UPDATE_CONFIG ($entries, $values, $updateMode="") { // @TODO Find a way for updating $_CONFIG here $entries .= sprintf("=%s%s%s", $entries, $updateMode, (float)$values); } else { - // Set it in $_CONFIG first + // Set it in config first setConfigEntry($entries, $values); // Regular entry to update @@ -1751,24 +1776,24 @@ function UPDATE_CONFIG ($entries, $values, $updateMode="") { // Run database update //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "entries={$entries}"); - SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_config` SET ".$entries." WHERE config=0 LIMIT 1", __FILE__, __LINE__); + SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_config` SET ".$entries." WHERE config=0 LIMIT 1", __FUNCTION__, __LINE__); // Get affected rows $affectedRows = SQL_AFFECTEDROWS(); //* DEBUG: */ print __FUNCTION__."(".__LINE__."):entries={$entries},affectedRows={$affectedRows}
\n"; // Rebuild cache - REBUILD_CACHE("config", "config"); + rebuildCacheFiles("config", "config"); } // Prepares an SQL statement part for HTML mail and/or holiday depency function PREPARE_SQL_HTML_HOLIDAY ($mode) { // Exclude no users by default - $MORE = ""; + $MORE = ''; // HTML mail? - if ($mode == "html") $MORE = " AND html='Y'"; - if (GET_EXT_VERSION("holiday") >= "0.1.3") { + if ($mode == 'html') $MORE = " AND html='Y'"; + if (GET_EXT_VERSION('holiday') >= '0.1.3') { // Add something for the holiday extension $MORE .= " AND holiday_active='N'"; } // END - if @@ -1778,12 +1803,12 @@ function PREPARE_SQL_HTML_HOLIDAY ($mode) { } // "Getter" for total available receivers -function GET_TOTAL_RECEIVERS ($mode="normal") { +function GET_TOTAL_RECEIVERS ($mode='normal') { // Query database $result_all = SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED' AND receive_mails > 0 ".PREPARE_SQL_HTML_HOLIDAY($mode), - __FILE__, __LINE__); + __FUNCTION__, __LINE__); // Get num rows $numRows = SQL_NUMROWS($result_all); @@ -1799,7 +1824,7 @@ WHERE `status`='CONFIRMED' AND receive_mails > 0 ".PREPARE_SQL_HTML_HOLIDAY($mod function ADD_CATEGORY_OPTIONS ($mode) { // Prepare WHERE statement $whereStatement = " WHERE `visible`='Y'"; - if (IS_ADMIN()) $whereStatement = ""; + if (IS_ADMIN()) $whereStatement = ''; // Initialize array... $CATS = array( @@ -1809,24 +1834,27 @@ function ADD_CATEGORY_OPTIONS ($mode) { ); // Get categories - $result = SQL_QUERY("SELECT id, cat FROM `{!_MYSQL_PREFIX!}_cats`".$whereStatement." ORDER BY `sort`", __FILE__, __LINE__); + $result = SQL_QUERY("SELECT id, cat FROM `{!_MYSQL_PREFIX!}_cats`".$whereStatement." ORDER BY `sort`", __FUNCTION__, __LINE__); if (SQL_NUMROWS($result) > 0) { // ... and begin loading stuff - while (list($id, $cat) = SQL_FETCHROW($result)) { + while ($content = SQL_FETCHARRAY($result)) { // Transfer some data - $CATS['id'][] = $id; - $CATS['name'][] = $cat; + $CATS['id'][] = $content['id']; + $CATS['name'][] = $content['cat']; // Check which users are in this category $result_uids = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE cat_id=%s", - array(bigintval($id)), __FILE__, __LINE__); + array(bigintval($content['id'])), __FUNCTION__, __LINE__); // Start adding all $uid_cnt = 0; + // @TODO Rewrite this to $content = SQL_FETCHARRAY() while (list($ucat) = SQL_FETCHROW($result_uids)) { $result_ver = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND `status`='CONFIRMED' AND receive_mails > 0".PREPARE_SQL_HTML_HOLIDAY($mode)." LIMIT 1", - array(bigintval($ucat)), __FILE__, __LINE__); + array(bigintval($ucat)), __FUNCTION__, __LINE__); + + // Add user count $uid_cnt += SQL_NUMROWS($result_ver); // Free memory @@ -1838,17 +1866,17 @@ WHERE userid=%s AND `status`='CONFIRMED' AND receive_mails > 0".PREPARE_SQL_HTML // Add counter $CATS['uids'][] = $uid_cnt; - } + } // END - while // Free memory SQL_FREERESULT($result); // Generate options - $OUT = ""; + $OUT = ''; foreach ($CATS['id'] as $key => $value) { if (strlen($CATS['name'][$key]) > 20) $CATS['name'][$key] = substr($CATS['name'][$key], 0, 17)."..."; - $OUT .= " \n"; - } + $OUT .= " \n"; + } // END - foreach } else { // No cateogries are defined yet $OUT = "\n"; @@ -1859,18 +1887,18 @@ WHERE userid=%s AND `status`='CONFIRMED' AND receive_mails > 0".PREPARE_SQL_HTML } // Add bonus mail to queue -function ADD_BONUS_MAIL_TO_QUEUE ($subject, $text, $receiverList, $points, $seconds, $url, $cat, $mode="normal", $receiver=0) { +function ADD_BONUS_MAIL_TO_QUEUE ($subject, $text, $receiverList, $points, $seconds, $url, $cat, $mode='normal', $receiver=0) { // Is admin or bonus extension there? if (!IS_ADMIN()) { // Abort here return false; - } elseif (!EXT_IS_ACTIVE("bonus")) { + } elseif (!EXT_IS_ACTIVE('bonus')) { // Abort here return false; } // Calculcate target sent - $target = SELECTION_COUNT(explode(";", $receiverList)); + $target = SELECTION_COUNT(explode(';', $receiverList)); // Receiver is zero? if ($receiver == 0) { @@ -1879,12 +1907,12 @@ function ADD_BONUS_MAIL_TO_QUEUE ($subject, $text, $receiverList, $points, $seco } // END - if // HTML extension active? - if (EXT_IS_ACTIVE("html")) { + if (EXT_IS_ACTIVE('html_mail')) { // No HTML by default $HTML = "N"; // HTML mode? - if ($mode == "html") $HTML = "Y"; + if ($mode == 'html') $HTML = "Y"; // Add HTML mail SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_bonus` @@ -1901,7 +1929,7 @@ VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s','%s $target, bigintval($receiver), $HTML - ), __FILE__, __LINE__); + ), __FUNCTION__, __LINE__); } else { // Add regular mail SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_bonus` @@ -1917,7 +1945,7 @@ VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s')", $cat, $target, bigintval($receiver), - ), __FILE__, __LINE__); + ), __FUNCTION__, __LINE__); } } @@ -1925,8 +1953,9 @@ VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s')", function GENERATE_RECEIVER_LIST ($cat, $receiver, $mode="") { // Init variables $CAT_TABS = "%s"; - $CAT_WHERE = ""; - $receiverList = ""; + $CAT_WHERE = ''; + $receiverList = ''; + $result = false; // Secure data $cat = bigintval($cat); @@ -1946,27 +1975,27 @@ function GENERATE_RECEIVER_LIST ($cat, $receiver, $mode="") { } // END - if // Exclude users in holiday? - if (GET_EXT_VERSION("holiday") >= "0.1.3") { + if (GET_EXT_VERSION('holiday') >= '0.1.3') { // Add something for the holiday extension $CAT_WHERE .= " AND d.holiday_active='N'"; } // END - if - if ((EXT_IS_ACTIVE("html_mail")) && ($mode == "html")) { + if ((EXT_IS_ACTIVE('html_mail')) && ($mode == 'html')) { // Only include HTML receivers $result = SQL_QUERY_ESC("SELECT d.userid FROM `{!_MYSQL_PREFIX!}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED' AND d.html='Y'".$CAT_WHERE." ORDER BY d.%s %s LIMIT %s", - array($cat, getConfig('order_select'), getConfig('order_mode'), $receiver), __FILE__, __LINE__); + array($cat, getConfig('order_select'), getConfig('order_mode'), $receiver), __FUNCTION__, __LINE__); } else { // Include all $result = SQL_QUERY_ESC("SELECT d.userid FROM `{!_MYSQL_PREFIX!}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED'".$CAT_WHERE." ORDER BY d.%s %s LIMIT %s", - array($cat, getConfig('order_select'), getConfig('order_mode'), $receiver), __FILE__, __LINE__); + array($cat, getConfig('order_select'), getConfig('order_mode'), $receiver), __FUNCTION__, __LINE__); } // Entries found? if ((SQL_NUMROWS($result) >= $receiver) && ($receiver > 0)) { // Load all entries - while (list($REC) = SQL_FETCHROW($result)) { + while ($content = SQL_FETCHARRAY($result)) { // Add receiver when not empty - if (!empty($REC)) $receiverList .= $REC.";"; + if (!empty($content['userid'])) $receiverList .= $content['userid'] . ';'; } // END - while // Free memory @@ -1986,12 +2015,12 @@ function USER_STATS_GET_TIMESTAMP ($type, $data, $uid = 0) { $stamp = 0; // User id set? - if ((isset($GLOBALS['userid'])) && ($uid == 0)) { - $uid = $GLOBALS['userid']; + if ((isUserIdSet()) && ($uid == 0)) { + $uid = getUserId(); } // END - if // Is the extension installed and updated? - if ((!EXT_IS_ACTIVE("sql_patches")) || (EXT_VERSION_IS_OLDER("sql_patches", "0.5.6"))) { + if ((!EXT_IS_ACTIVE('sql_patches')) || (EXT_VERSION_IS_OLDER('sql_patches', '0.5.6'))) { // Return zero here return $stamp; } // END - if @@ -2001,7 +2030,7 @@ function USER_STATS_GET_TIMESTAMP ($type, $data, $uid = 0) { FROM `{!_MYSQL_PREFIX!}_user_stats_data` WHERE userid=%s AND stats_type='%s' AND stats_data='%s' LIMIT 1", - array(bigintval($uid), $type, $data), __FILE__, __LINE__); + array(bigintval($uid), $type, $data), __FUNCTION__, __LINE__); // Is the entry there? if (SQL_NUMROWS($result) == 1) { @@ -2019,7 +2048,7 @@ LIMIT 1", // Inserts user stats function USER_STATS_INSERT_RECORD ($uid, $type, $data) { // Is the extension installed and updated? - if ((!EXT_IS_ACTIVE("sql_patches")) || (EXT_VERSION_IS_OLDER("sql_patches", "0.5.6"))) { + if ((!EXT_IS_ACTIVE('sql_patches')) || (EXT_VERSION_IS_OLDER('sql_patches', '0.5.6'))) { // Return zero here return false; } // END - if @@ -2028,7 +2057,7 @@ function USER_STATS_INSERT_RECORD ($uid, $type, $data) { if ((!USER_STATS_GET_TIMESTAMP($type, $data, $uid)) && (!is_array($data))) { // Then insert it! SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_stats_data` (`userid`,`stats_type`,`stats_data`) VALUES (%s,'%s','%s')", - array(bigintval($uid), $type, $data), __FILE__, __LINE__); + array(bigintval($uid), $type, $data), __FUNCTION__, __LINE__); } elseif (is_array($data)) { // Invalid data! DEBUG_LOG(__FUNCTION__, __LINE__, " uid={$uid},type={$type},data={".gettype($data).": Invalid statistics data type!"); @@ -2039,16 +2068,16 @@ function USER_STATS_INSERT_RECORD ($uid, $type, $data) { function GET_USER_REF_POINTS ($uid, $level) { //* DEBUG: */ print "----------------------- ".__FUNCTION__." - ENTRY ------------------------