X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=40cde51120f111ed197a6ca82d8301728bc6f98b;hp=96e7cfb9d57cf5ce8a912b67f1c61bd1aa861abc;hb=f7f6e55ee0d90558ad773ce6168767c0af816696;hpb=82d53dfb7f59fa1e37bd500e3db3d10a9d4a78da diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 96e7cfb9d5..40cde51120 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -32,7 +32,7 @@ ************************************************************************/ // Some security stuff... -if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) { +if (!defined('__SECURITY')) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } @@ -44,7 +44,8 @@ function ADD_MODULE_TITLE($mod) { // Is the script installed? if (isBooleanConstantAndTrue('mxchange_installed')) { - if ((GET_EXT_VERSION("cache") >= "0.1.2") && (isset($cacheArray['modules']['module'])) && (is_array($cacheArray['modules']['module'])) && (isset($cacheArray['modules']['module'][$mod]))) { + // Check if cache is valid + if ((GET_EXT_VERSION("cache") >= "0.1.2") && (isset($cacheArray['modules']['module'])) && (in_array($mod, $cacheArray['modules']['module']))) { // Load from cache $name = $cacheArray['modules']['title'][$mod]; @@ -56,7 +57,7 @@ function ADD_MODULE_TITLE($mod) { list($name) = SQL_FETCHROW($result); SQL_FREERESULT($result); } - } + } // END - if // Trim name $name = trim($name); @@ -68,8 +69,10 @@ function ADD_MODULE_TITLE($mod) { if (SQL_NUMROWS($result) == 0) { // Add module to database $dummy = CHECK_MODULE($mod); - } - } + } // END - if + } // END - if + + // Return name return $name; } @@ -156,12 +159,12 @@ function CHECK_MODULE($mod) { // to find a loop here... *sigh* $result = 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), __FILE__, __LINE__); } else { // Wrong/missing sql_patches! $result = 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), __FILE__, __LINE__); } // Everthing is fine? @@ -171,10 +174,7 @@ function CHECK_MODULE($mod) { } // 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 + REBUILD_CACHE("mod_reg", "modreg"); // And reload data $ret = CHECK_MODULE($mod_chk); @@ -254,30 +254,49 @@ function ADD_DESCR($ACC_LVL, $file, $return = false, $output = true) { $prefix .= " -> "; - if (ereg(".php", $search)) { - $search = substr($search, 0, strpos($search, ".php")); - } + // We need to remove .php and the end + 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), __FILE__, __LINE__); + // Menu found? if (SQL_NUMROWS($result) == 1) { + // Load title list($ret) = SQL_FETCHROW($result); - SQL_FREERESULT($result); + + // Shall we return it? if ($return) { // Return title return $ret; } elseif (((GET_EXT_VERSION("sql_patches") >= "0.2.3") && ($_CONFIG['youre_here'] == "Y")) || ((IS_ADMIN()) && ($MOD_CHECK == "admin"))) { // Output HTML code $OUT = $prefix."".$ret."\n"; + + // Can we close the you-are-here navigation? //* DEBUG: */ echo __LINE__."*".$type."/".$GLOBALS['what']."*
\n"; - if (($type == "what") || (($type == "action") && (!isset($_GET['what'])) && ($GLOBALS['what'] != "welcome"))) { + //* DEBUG: */ die("
".print_r($_CONFIG, true)."
"); + if (($type == "what") || (($type == "action") && ((!isset($GLOBALS['what'])) || ($GLOBALS['what'] == "overview")))) { //* DEBUG: */ echo __LINE__."+".$type."+
\n"; $OUT .= "
\n"; $DEPTH="0"; - } + + // Handle failed logins here if not in guest + //* DEBUG: */ echo __FUNCTION__.":type={$type},action={$GLOBALS['action']},what={$GLOBALS['what']},lvl={$ACC_LVL}
\n"; + if ((($type == "what") || ($type == "action") && ((!isset($GLOBALS['what'])) || ($GLOBALS['what'] == "overview") || ($GLOBALS['what'] == $_CONFIG['index_home']))) && ($ACC_LVL != "guest") && ((GET_EXT_VERSION("sql_patches") >= "0.4.7") || (GET_EXT_VERSION("admins") >= "0.7.0"))) { + // Handle failture + $OUT .= HANDLE_LOGIN_FAILTURES($ACC_LVL); + } // END - if + } // END - if } - } + } // END - if + + // Free result + SQL_FREERESULT($result); // Return or output HTML code? if ($output) { @@ -326,7 +345,7 @@ function ADD_MENU($MODE, $act, $wht) { // 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." ORDER BY sort", + $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__); $ctl = SQL_NUMROWS($result_sub); if ($ctl > 0) { @@ -421,12 +440,18 @@ function IS_ADMIN($admin="") //* DEBUG: */ echo __LINE__."ADMIN:".$admin."/".$passCookie."
"; // Search in array for entry - if ((!empty($passCookie)) && (isset($cacheArray['admins']['password'][$admin])) && (!empty($admin))) { + if (isset($cacheArray['admin_hash'])) { + // Use cached string + $valPass = $cacheArray['admin_hash']; + } elseif ((!empty($passCookie)) && (isset($cacheArray['admins']['password'][$admin])) && (!empty($admin))) { // Count cache hits $_CONFIG['cache_hits']++; // Login data is valid or not? $valPass = generatePassString($cacheArray['admins']['password'][$admin]); + + // Cache it away + $cacheArray['admin_hash'] = $valPass; } elseif (!empty($admin)) { // Search for admin $result = SQL_QUERY_ESC("SELECT HIGH_PRIORITY password FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1", @@ -438,9 +463,12 @@ function IS_ADMIN($admin="") // Admin login was found so let's load password from DB list($passDB) = SQL_FETCHROW($result); + // Temporary cache it + $cacheArray['admins']['password'][$admin] = $passDB; + // Generate password hash $valPass = generatePassString($passDB); - } + } // END - if // Free memory SQL_FREERESULT($result); @@ -453,7 +481,7 @@ function IS_ADMIN($admin="") } // Return result of comparision - //* DEBUG: */ if (!$ret) echo __LINE__."OK!
"; + //* DEBUG: */ if (!$ret) echo __LINE__."OK!
"; return $ret; } // @@ -555,12 +583,18 @@ function WHAT_IS_VALID($act, $wht, $type="guest") // function IS_MEMBER() { - global $status, $LAST; + global $status, $LAST, $cacheArray; if (!is_array($LAST)) $LAST = array(); $ret = false; + // is the cache entry there? + if (isset($cacheArray['is_member'])) { + // Then return it + return $cacheArray['is_member']; + } // END - if + // Fix "deleted" cookies first - FIX_DELETED_COOKIES(array('userid', 'u_hash', 'lifetime')); + FIX_DELETED_COOKIES(array('userid','u_hash','lifetime')); // Are cookies set? if ((!empty($GLOBALS['userid'])) && (isSessionVariableSet('u_hash')) && (isSessionVariableSet('lifetime')) && (defined('COOKIE_PATH'))) @@ -580,60 +614,57 @@ function IS_MEMBER() if ((!empty($mod)) && (empty($LAST['module']))) { $LAST['module'] = $mod; $LAST['online'] = $onl; } // So did we now have valid data and an unlocked user? - //* DEBUG: */ echo $valPass."
".get_session('u_hash')."
"; + //* DEBUG: */ echo $valPass."
".get_session('u_hash')."
"; if (($status == "CONFIRMED") && ($valPass == get_session('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__."!!!
"; + //* DEBUG: */ echo __LINE__."!!!
"; destroy_user_session(); - // Remove array elements to prevent errors - unset($GLOBALS['userid']); + // Reset userid + $GLOBALS['userid'] = 0; } } else { // Cookie data is invalid! - //* DEBUG: */ echo __LINE__."***
"; + //* DEBUG: */ echo __LINE__."***
"; - // Remove array elements to prevent errors - unset($GLOBALS['userid']); + // Reset userid + $GLOBALS['userid'] = 0; } // Free memory SQL_FREERESULT($result); - } - else - { + } else { // Cookie data is invalid! - //* DEBUG: */ echo __LINE__."///
"; + //* DEBUG: */ echo __LINE__."///
"; destroy_user_session(); - // Remove array elements to prevent errors - unset($GLOBALS['userid']); + // Reset userid + $GLOBALS['userid'] = 0; } + + // Cache status + $cacheArray['is_member'] = $ret; + + // Return status return $ret; } // -function UPDATE_LOGIN_DATA ($UPDATE=true) { - global $LAST; +function UPDATE_LOGIN_DATA () { + global $LAST, $_CONFIG; if (!is_array($LAST)) $LAST = array(); - // Are the required cookies set? - if ((!isset($GLOBALS['userid'])) || (!isSessionVariableSet('u_hash')) || (!isSessionVariableSet('lifetime'))) { - // Nope, then return here to caller function - return false; - } else { - // Secure user ID - $GLOBALS['userid'] = bigintval(get_session('userid')); - } + // Recheck if logged in + if (!IS_MEMBER()) return false; + + // Secure user ID + $GLOBALS['userid'] = bigintval(get_session('userid')); // Extract last online time (life) and how long is auto-login valid (time) $newl = time() + bigintval(get_session('lifetime')); - // Recheck if logged in - if (!IS_MEMBER()) return false; - // Load last module and last online time $result = SQL_QUERY_ESC("SELECT last_module, last_online FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__); if (SQL_NUMROWS($result) == 1) { @@ -648,10 +679,14 @@ function UPDATE_LOGIN_DATA ($UPDATE=true) { // This will be displayed on welcome page! :-) if (empty($LAST['module'])) { $LAST['module'] = $mod; $LAST['online'] = $onl; - } + } // END - if + + // "what" not set? if (empty($GLOBALS['what'])) { + // Fix it to default $GLOBALS['what'] = "welcome"; - } + if (!empty($_CONFIG['index_home'])) $GLOBALS['what'] = $_CONFIG['index_home']; + } // END - if // Update last module / online time $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET last_module='%s', last_online=UNIX_TIMESTAMP() WHERE userid=%s LIMIT 1", @@ -712,16 +747,29 @@ function VALIDATE_MENU_ACTION ($MODE, $act, $wht, $UPDATE=false) return $ret; } // -function GET_MOD_DESCR($MODE, $wht) +function GET_MOD_DESCR($MODE, $wht, $column="what") { - if (empty($wht)) $wht = "welcome"; + // Fix empty "what" + if (empty($wht)) { + $wht = "welcome"; + if (!empty($_CONFIG['index_home'])) $wht = $_CONFIG['index_home']; + } // END - if + + // Default is not found $ret = "??? (".$wht.")"; - $result = SQL_QUERY_ESC("SELECT title FROM "._MYSQL_PREFIX."_%s_menu WHERE what='%s' LIMIT 1", array($MODE, $wht), __FILE__, __LINE__); - if (SQL_NUMROWS($result) == 1) - { + + // Look for title + $result = SQL_QUERY_ESC("SELECT title FROM "._MYSQL_PREFIX."_%s_menu WHERE %s='%s' LIMIT 1", + array($MODE, $column, $wht), __FILE__, __LINE__); + + // Is there an entry? + if (SQL_NUMROWS($result) == 1) { + // Fetch the title list($ret) = SQL_FETCHROW($result); - SQL_FREERESULT($result); - } + } // END - if + + // Free result + SQL_FREERESULT($result); return $ret; } // @@ -859,47 +907,37 @@ function COUNT_MODULE($mod) // Get action value from mode (admin/guest/member) and what-value function GET_ACTION ($MODE, &$wht) { - global $ret; $ret = ""; - //* DEBUG: */ echo __LINE__."=".$MODE."/".$wht."/".$GLOBALS['action']."=
"; - if ((empty($wht)) && ($MODE != "admin")) - { + global $ret, $_CONFIG; + // @DEPRECATED Init status + $ret = ""; + + //* DEBUG: */ echo __LINE__."=".$MODE."/".$wht."/".$GLOBALS['action']."=
"; + if ((empty($wht)) && ($MODE != "admin")) { $wht = "welcome"; - } - if ($MODE == "admin") - { + if (!empty($_CONFIG['index_home'])) $wht = $_CONFIG['index_home']; + } // END - if + + if ($MODE == "admin") { // Action value for admin area - if (!empty($GLOBALS['action'])) - { + if (!empty($GLOBALS['action'])) { // Get it directly from URL return $GLOBALS['action']; - } - elseif (($wht == "overview") || (empty($GLOBALS['what']))) - { + } elseif (($wht == "overview") || (empty($GLOBALS['what']))) { // Default value for admin area $ret = "login"; } - } - elseif (!empty($GLOBALS['action'])) - { - // Fix welcome value - if (empty($wht)) $wht = "welcome"; + } elseif (!empty($GLOBALS['action'])) { + // Get it directly from URL return $GLOBALS['action']; - } - else - { - // Everything else will be touched after checking the module has a menu assigned } //* DEBUG: */ echo __LINE__."*".$ret."*
\n"; - if (MODULE_HAS_MENU($MODE)) - { + if (MODULE_HAS_MENU($MODE)) { // Rewriting modules to menu - switch ($MODE) - { + switch ($MODE) { case "index": $MODE = "guest"; break; case "login": $MODE = "member"; break; - break; - } + } // END - switch // Guest and member menu is "main" as the default if (empty($ret)) $ret = "main"; @@ -907,15 +945,14 @@ 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), __FILE__, __LINE__); - if (SQL_NUMROWS($result) == 1) - { + if (SQL_NUMROWS($result) == 1) { // Load action value and pray that this one is the right you want... ;-) list($ret) = SQL_FETCHROW($result); - } + } // END - if // Free memory SQL_FREERESULT($result); - } + } // END - if // Return action value return $ret; @@ -926,9 +963,11 @@ function GET_CATEGORY ($cid) { $ret = _CATEGORY_404; // Is the category id set? - if (!empty($cid)) { - - // Lookup the category + if ($cid == "0") { + // No category + $ret = _CATEGORY_NONE; + } elseif ($cid > 0) { + // Lookup the category in database $result = SQL_QUERY_ESC("SELECT cat FROM "._MYSQL_PREFIX."_cats WHERE id=%s LIMIT 1", array(bigintval($cid)), __FILE__, __LINE__); if (SQL_NUMROWS($result) == 1) { @@ -1003,7 +1042,7 @@ function REMOVE_RECEIVER(&$ARRAY, $key, $uid, $pool_id, $stats_id="", $bonus=fal if (SQL_NUMROWS($result) == 0) { // No, so we add one! - $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_links (%s, userid, link_type) VALUES ('%s', '%s', '%s')", + $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_links (%s, userid, link_type) VALUES ('%s','%s','%s')", array($rowName, $stats_id, bigintval($uid), $type), __FILE__, __LINE__); $ret = "done"; } @@ -1021,8 +1060,7 @@ function REMOVE_RECEIVER(&$ARRAY, $key, $uid, $pool_id, $stats_id="", $bonus=fal return $ret; } // -function GET_TOTAL_DATA($search, $tableName, $lookFor, $whereStatement="userid", $onlyRows=false) -{ +function GET_TOTAL_DATA($search, $tableName, $lookFor, $whereStatement="userid", $onlyRows=false) { $ret = 0; if ($onlyRows) { // Count rows @@ -1036,16 +1074,53 @@ function GET_TOTAL_DATA($search, $tableName, $lookFor, $whereStatement="userid", // Load row list($ret) = SQL_FETCHROW($result); - //* DEBUG: */ echo __LINE__."*".$DATA."/".$search."/".$tableName."/".$ret."*
\n"; + + // Free result SQL_FREERESULT($result); - if (empty($ret)) { - if (($lookFor == "counter") || ($lookFor == "id")) { - $ret = 0; - } else { - $ret = "0.00000"; + + // Fix empty values + if ((empty($ret)) && ($lookFor != "counter") && ($lookFor != "id") && ($lookFor != "userid")) { + $ret = "0.00000"; + } // END - if + + // Return value + return $ret; +} +// "Getter fro ref level percents +function GET_REF_LEVEL_PERCENTS ($level) { + global $cacheInstance, $_CONFIG, $cacheArray; + + // Default is zero + $per = 0; + + // Do we have cache? + if ((isset($cacheArray['ref_depths']['level'])) && (EXT_IS_ACTIVE("cache"))) { + // First look for level + $key = array_search($level, $cacheArray['ref_depths']['level']); + if ($key !== false) { + // Entry found! + $per = $cacheArray['ref_depths']['percents'][$key]; + + // Count cache hit + $_CONFIG['cache_hits']++; } + } else { + // Get referal data + $result_lvl = SQL_QUERY_ESC("SELECT percents FROM "._MYSQL_PREFIX."_refdepths WHERE level=%s LIMIT 1", + array(bigintval($level)), __FILE__, __LINE__); + + // Entry found? + if (SQL_NUMROWS($result_lvl) == 1) { + // Get percents + list($per) = SQL_FETCHROW($result_lvl); + } // END - if + + // Free result + SQL_FREERESULT($result_lvl); } - return $ret; + + // Return percent + return $per; } /** * @@ -1057,11 +1132,13 @@ function GET_TOTAL_DATA($search, $tableName, $lookFor, $whereStatement="userid", * rid = inc/modules/guest/what-confirm.php need this * locked = Shall I pay it to normal (false) or locked (true) points ammount? * add_mode = Add points only to $uid or also refs? (WARNING! Changing "ref" to "direct" - * will cause no referral will get points ever!!!) + * for default value will cause no referral will get points ever!!!) */ -function ADD_POINTS_REFSYSTEM($uid, $points, $send_notify=false, $rid="0", $locked=false, $add_mode="ref") -{ - global $DEPTH, $_CONFIG, $DATA; +function ADD_POINTS_REFSYSTEM($uid, $points, $send_notify=false, $rid="0", $locked=false, $add_mode="ref") { + global $DEPTH, $_CONFIG, $DATA, $cacheArray; + + // Convert mode to lower-case + $add_mode = strtolower($add_mode); // Debug message //DEBUG_LOG(__FUNCTION__.": uid={$uid},points={$points}"); @@ -1074,7 +1151,7 @@ function ADD_POINTS_REFSYSTEM($uid, $points, $send_notify=false, $rid="0", $lock } // Count up referral depth - if (empty($DEPTH)) { + if (!isset($DEPTH)) { // Initialialize referral system $DEPTH = 0; } else { @@ -1082,12 +1159,11 @@ function ADD_POINTS_REFSYSTEM($uid, $points, $send_notify=false, $rid="0", $lock $DEPTH++; } - // Percents and table - $percents = "percents"; if (isset($_CONFIG['db_percents'])) $percents = $_CONFIG['db_percents']; - $table = "refdepths"; if (isset($_CONFIG['db_table'])) $table = $_CONFIG['db_table']; + // Default is "normal" points + $data = "points"; // Which points, locked or normal? - $data = "points"; if ($locked) $data = "locked_points"; + if ($locked) $data = "locked_points"; // Check user account $result_user = SQL_QUERY_ESC("SELECT refid, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s AND status='CONFIRMED' LIMIT 1", @@ -1096,26 +1172,33 @@ function ADD_POINTS_REFSYSTEM($uid, $points, $send_notify=false, $rid="0", $lock //* DEBUG */ echo "+".SQL_NUMROWS($result_user).":".$points."+
\n"; if (SQL_NUMROWS($result_user) == 1) { // This is the user and his ref - list ($ref, $email) = SQL_FETCHROW($result_user); + list($ref, $email) = SQL_FETCHROW($result_user); + $cacheArray['add_uid'][$ref] = $uid; // Debug message //DEBUG_LOG(__FUNCTION__.": ref={$ref},email={$email},DEPTH={$DEPTH}"); - // Get referal data - $result_lvl = SQL_QUERY_ESC("SELECT %s FROM "._MYSQL_PREFIX."_%s WHERE level='%s' LIMIT 1", - array($percents, $table, bigintval($DEPTH)), __FILE__, __LINE__); - //* DEBUG */ echo "DEPTH:".$DEPTH."
\n"; - if (SQL_NUMROWS($result_lvl) == 1) { - // Get percents - list($per) = SQL_FETCHROW($result_lvl); + // Get percents + $per = GET_REF_LEVEL_PERCENTS($DEPTH); + //* DEBUG: */ echo __FUNCTION__.":uid={$uid},points={$points},depth={$DEPTH},per={$per},mode={$add_mode}
\n"; + // Some percents found? + if ($per > 0) { // Calculate new points $ref_points = $points * $per / 100; + // Pay refback here if level > 0 and in ref-mode + if (($DEPTH > 0) && ($per < 100) && ($add_mode == "ref")) { + //* DEBUG: */ echo __FUNCTION__.":uid={$uid},data={$cacheArray['add_uid'][$uid]},ref_points={$ref_points},depth={$DEPTH} - BEFORE!
\n"; + $ref_points = ADD_REFBACK_POINTS($cacheArray['add_uid'][$uid], $uid, $ref_points, $DEPTH); + //* DEBUG: */ echo __FUNCTION__.":uid={$uid},data={$cacheArray['add_uid'][$uid]},ref_points={$ref_points},depth={$DEPTH} - AFTER!
\n"; + } // END - if + // Debug message //DEBUG_LOG(__FUNCTION__.": percent={$per},ref_points={$ref_points}"); // Update points... + //* DEBUG: */ echo __FUNCTION__.":data={$data},ref_points={$ref_points},uid={$uid},depth={$DEPTH} - UPDATE!
\n"; SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_points SET %s=%s+%s WHERE userid=%s AND ref_depth=%d LIMIT 1", array($data, $data, $ref_points, bigintval($uid), bigintval($DEPTH)), __FILE__, __LINE__); @@ -1156,8 +1239,14 @@ function ADD_POINTS_REFSYSTEM($uid, $points, $send_notify=false, $rid="0", $lock // Direct payment shall be notified about define('__POINTS_VALUE', $ref_points); + // Prepare content + $content = array( + 'text' => REASON_DIRECT_PAYMENT, + 'points' => TRANSLATE_COMMA($ref_points) + ); + // Load message - $msg = LOAD_EMAIL_TEMPLATE("add-points", REASON_DIRECT_PAYMENT, $uid); + $msg = LOAD_EMAIL_TEMPLATE("add-points", $content, $uid); // And sent it away SEND_EMAIL($email, SUBJECT_DIRECT_PAYMENT, $msg); @@ -1168,55 +1257,254 @@ function ADD_POINTS_REFSYSTEM($uid, $points, $send_notify=false, $rid="0", $lock if (($ref > 0) && ($points > 0) && ($ref != $uid) && ($add_mode == "ref")) { // Then let's credit him here... ADD_POINTS_REFSYSTEM($ref, $points, $send_notify, $ref, $locked); - } - } + } // END - if + } // END - if + } // END - if - // Free result - SQL_FREERESULT($result_lvl); + // Free result + SQL_FREERESULT($result_user); +} +// Payback refback for refid and reduce it for current user +function ADD_REFBACK_POINTS ($uid, $ref, $points) { + global $DEPTH, $cacheArray; + + // Init points + $return = $points; + + // "Walk through all refids + //* DEBUG: */ echo __FUNCTION__.":uid={$uid},ref={$ref},points={$points}
\n"; + foreach (GET_REFBACK_USERID_ARRAY($uid) as $refid) { + // Skip level zero or if both are the same + if ($uid == $refid) continue; + + // Get refback percents + $percents = GET_REFBACK_PERCENTS($uid, $refid); + //* DEBUG: */ echo __FUNCTION__.":uid={$uid},ref={$ref},refid={$refid},points={$points},percents={$percents}
\n"; + + // Some percents given? + if ($percents > 0) { + // Get points for refback + $refback = $points * $percents / 100; + + // Add points again, but only directly + //* DEBUG: */ echo __FUNCTION__.":refback={$refback},depth={$DEPTH}
\n"; + $cacheArray['depth'][$uid][$ref] = $DEPTH; $DEPTH = -1; + ADD_POINTS_REFSYSTEM($uid, $refback, false, "0", false, "direct"); + $DEPTH = $cacheArray['depth'][$uid][$ref]; + //* DEBUG: */ echo __FUNCTION__.":depth={$DEPTH} - RESTORE!
\n"; + + // Reduce points if refid is found + if ($refid == $ref) { + // Reduce points here! + $return = $points - $refback; + //* DEBUG: */ echo __FUNCTION__.":points={$return} - REDUCED
\n"; + } // END - if + } // END - if + } // END foreach + + // Return them + return $return; +} +// "Getter" for refback percents +function GET_REFBACK_PERCENTS ($uid, $ref) { + //* DEBUG: */ echo __FUNCTION__.":uid={$uid},ref={$ref}
\n"; + // Skip identical ids + if ($uid == $ref) return 0; + + // Default is zero + $percents = 0; + + // Get percents from database + $result = SQL_QUERY_ESC("SELECT refback FROM "._MYSQL_PREFIX."_user_refs WHERE userid=%s AND refid=%s LIMIT 1", + array($ref, $uid), __FILE__, __LINE__); + + // Entry found? (Should be!) + if (SQL_NUMROWS($result) == 1) { + // Fetch percents + list($percents) = SQL_FETCHROW($result); + } else { + // Debug log + DEBUG_LOG(__FUNCTION__.": uid={$uid},ref={$ref} - No entry found! :-("); } // Free result - SQL_FREERESULT($result_user); + SQL_FREERESULT($result); + + // Return percents + return $percents; +} +// "Getter" for userid array +function GET_REFBACK_USERID_ARRAY ($rid) { + //* DEBUG: */ echo __FUNCTION__.":rid={$rid}
\n"; + // Init userids + $userIds = array(); + + // Look for all + $result = SQL_QUERY_ESC("SELECT userid +FROM "._MYSQL_PREFIX."_user_refs +WHERE refid=%s +GROUP BY level +ORDER BY userid ASC", + array($rid), __FILE__, __LINE__); + + // Entries found? + if (SQL_NUMROWS($result) > 0) { + // Add all + while (list($userid) = SQL_FETCHROW($result)) { + //* DEBUG: */ echo __FUNCTION__.":rid={$rid},userid={$userid}
\n"; + $userIds[] = $userid; + } // END - while + } // END - if + + // Free result + SQL_FREERESULT($result); + + // Return array + //* DEBUG: */ echo __FUNCTION__.":rid={$rid},count()=".count($userIds)."
\n"; + return $userIds; } // -function UPDATE_REF_COUNTER($uid) -{ - global $REF_LVL, $cacheInstance; +function UPDATE_REF_COUNTER ($uid) { + global $cacheArray, $cacheInstance; // Make it sure referral level zero (member him-/herself) is at least selected - if (empty($REF_LVL)) $REF_LVL = 0; + if (empty($cacheArray['ref_level'][$uid])) $cacheArray['ref_level'][$uid] = 1; + //* DEBUG: */ echo __FUNCTION__.":uid={$uid},level={$cacheArray['ref_level'][$uid]}
\n"; // Update counter - $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_refsystem SET counter=counter+1 WHERE userid=%s AND level='%s' LIMIT 1", - array(bigintval($uid), $REF_LVL), __FILE__, __LINE__); + $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_refsystem SET counter=counter+1 WHERE userid=%s AND level=%s LIMIT 1", + array(bigintval($uid), $cacheArray['ref_level'][$uid]), __FILE__, __LINE__); // When no entry was updated then we have to create it here - if (SQL_AFFECTEDROWS() == 0) - { + //* DEBUG: */ echo __FUNCTION__.":updated=".SQL_AFFECTEDROWS()."
\n"; + if (SQL_AFFECTEDROWS() == 0) { // First count! - $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_refsystem (userid, level, counter) VALUES ('%s', '%s', '1')", - array(bigintval($uid), $REF_LVL), __FILE__, __LINE__); - } + $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_refsystem (userid, level, counter) VALUES (%s,%s,1)", + array(bigintval($uid), $cacheArray['ref_level'][$uid]), __FILE__, __LINE__); + //* DEBUG: */ echo __FUNCTION__.":uid={$uid}
\n"; + } // END - if // Check for his referral $result = SQL_QUERY_ESC("SELECT refid FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1", - array(bigintval($uid)), __FILE__, __LINE__); + array(bigintval($uid)), __FILE__, __LINE__); + + // Load refid list($ref) = SQL_FETCHROW($result); // Free memory SQL_FREERESULT($result); + //* DEBUG: */ echo __FUNCTION__.":uid={$uid},ref={$ref}
\n"; // When he has a referral... - if (($ref > 0) && ($ref != $uid)) - { + if (($ref > 0) && ($ref != $uid)) { // Move to next referral level and count his counter one up! - $REF_LVL++; UPDATE_REF_COUNTER($ref); - } - elseif ((($ref == $uid) || ($ref == 0)) && (GET_EXT_VERSION("cache") >= "0.1.2")) - { + //* DEBUG: */ echo __FUNCTION__.":ref={$ref} - ADVANCE!
\n"; + $cacheArray['ref_level'][$uid]++; UPDATE_REF_COUNTER($ref); + } elseif ((($ref == $uid) || ($ref == 0)) && (GET_EXT_VERSION("cache") >= "0.1.2")) { // Remove cache here + //* DEBUG: */ echo __FUNCTION__.":ref={$ref} - CACHE!
\n"; if ($cacheInstance->cache_file("refsystem", true)) $cacheInstance->cache_destroy(); } + + // "Walk" back here + $cacheArray['ref_level'][$uid]--; + + // Handle refback here + UPDATE_REFBACK_TABLE($uid); +} +// Update "refback table" +function UPDATE_REFBACK_TABLE($uid) +{ + global $cacheArray, $cacheInstance; + + // Make it sure referral level zero (member him-/herself) is at least selected + if (empty($cacheArray['back_level'])) $cacheArray['back_level'] = 1; + //* DEBUG: */ echo __FUNCTION__.":uid={$uid},level={$cacheArray['back_level']}
\n"; + + // Init refid + $cacheArray['up_refid'][$cacheArray['back_level']] = 0; + $old = 0; $minus = 0; + + // Check for his referral + $result_refid = SQL_QUERY_ESC("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE refid=%s ORDER BY userid ASC", + array(bigintval($uid)), __FILE__, __LINE__); + + // When no entry was updated then we have to create it here + //* DEBUG: */ echo __FUNCTION__.":found=".SQL_NUMROWS($result_refid)."
\n"; + if (SQL_NUMROWS($result_refid) > 0) { + // Load all refids + while(list($cacheArray['up_refid'][$cacheArray['back_level']]) = SQL_FETCHROW($result_refid)) { + // Remmber userid + $cacheArray['up_userid'][$cacheArray['up_refid'][$cacheArray['back_level']]] = $uid; + + //* DEBUG: */ echo __FUNCTION__.":uid={$uid},ref={$cacheArray['up_refid'][$cacheArray['back_level']]}
\n"; + // Refid set? + if (($cacheArray['up_refid'][$cacheArray['back_level']] > 0) && ($cacheArray['up_refid'][$cacheArray['back_level']] != $uid) && (!empty($cacheArray['up_refid'][$cacheArray['back_level']]))) { + // New userid? + if ((isset($cacheArray['up_refid'][$cacheArray['back_level']-1])) && (isset($cacheArray['up_userid'][$cacheArray['up_refid'][$cacheArray['back_level']-1]]))) { + // New userid! + $old = $uid; + $uid = $cacheArray['up_userid'][$cacheArray['up_refid'][$cacheArray['back_level']-1]]; + $minus = 1; + //* DEBUG: */ echo __FUNCTION__.":uid={$uid},old={$old},level={$cacheArray['back_level']},ref={$cacheArray['up_refid'][$cacheArray['back_level']]} - NEW UID!
\n"; + } // END - if + + // Check existence + $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_refs WHERE userid=%s AND level=%s AND refid=%s LIMIT 1", + array(bigintval($uid), $cacheArray['back_level'], bigintval($cacheArray['up_refid'][$cacheArray['back_level']])), __FILE__, __LINE__); + + // Do we have no entry? + //* DEBUG: */ echo __FUNCTION__.":uid={$uid},level={$cacheArray['back_level']},ref={$cacheArray['up_refid'][$cacheArray['back_level']]},minus={$minus},numRows=".SQL_NUMROWS($result)." - FOUND!
\n"; + if (SQL_NUMROWS($result) == 0) { + // Insert this level + //* DEBUG: */ echo __FUNCTION__.":uid={$uid},level={$cacheArray['back_level']},ref={$cacheArray['up_refid'][$cacheArray['back_level']]} - ADD!
\n"; + $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_refs (userid, level, refid) VALUES (%s,%s,%s)", + array(bigintval($uid), $cacheArray['back_level'], bigintval($cacheArray['up_refid'][$cacheArray['back_level']])), __FILE__, __LINE__); + + // Move to next referral level and count his counter one up! + $cacheArray['back_level']++; UPDATE_REFBACK_TABLE($cacheArray['up_refid'][($cacheArray['back_level'] - 1)]); + } // END - if + + // Do we have another level here? + if ((($cacheArray['back_level']-$minus) > 0) && ($old > 0)) { + // Restore old one + $uid = $old; + + // Shall we add this as well? + $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_refs WHERE userid=%s AND level=%s AND refid=%s LIMIT 1", + array(bigintval($uid), ($cacheArray['back_level']-$minus), bigintval($cacheArray['up_refid'][$cacheArray['back_level']])), __FILE__, __LINE__); + + // Do we have no entry? + //* DEBUG: */ echo __FUNCTION__.":uid={$uid},level=".($cacheArray['back_level']-$minus).",ref={$cacheArray['up_refid'][$cacheArray['back_level']]},numRows=".SQL_NUMROWS($result)." - BACK!
\n"; + if (SQL_NUMROWS($result) == 0) { + // Insert this level + $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_refs (userid, level, refid) VALUES (%s,%s,%s)", + array(bigintval($uid), ($cacheArray['back_level']-$minus), bigintval($cacheArray['up_refid'][$cacheArray['back_level']])), __FILE__, __LINE__); + //* DEBUG: */ echo __FUNCTION__.":uid={$uid},level=".($cacheArray['back_level']-$minus).",ref={$cacheArray['up_refid'][$cacheArray['back_level']]} - RETURNED!
\n"; + } // END - if + } // END - if + } // END - if + } // END - while + + // Free memory + SQL_FREERESULT($result_refid); + } // END - if + + // When he has a referral... + if ((($cacheArray['up_refid'][$cacheArray['back_level']] == $uid) || ($cacheArray['up_refid'][$cacheArray['back_level']] == 0)) && (GET_EXT_VERSION("cache") >= "0.1.2") && (!isset($cacheArray['back_cached']))) { + // Remove cache here + //* DEBUG: */ echo __FUNCTION__.":uid={$uid},ref={$cacheArray['up_refid'][$cacheArray['back_level']]} - CACHE!
\n"; + if ($cacheInstance->cache_file("refback", true)) $cacheInstance->cache_destroy(); + $cacheArray['back_cached'] = 1; + } // END - if + + // "Walk" back here + $cacheArray['back_level']--; + //* DEBUG: */ echo __FUNCTION__.":uid={$uid},level={$cacheArray['back_level']} - LEVEL!
\n"; + + // Fix empty refid + if (!isset($cacheArray['up_refid'][$cacheArray['back_level']-1])) $cacheArray['up_refid'][$cacheArray['back_level']-1] = 0; + //* DEBUG: */ echo __FUNCTION__.":uid={$uid},level={$cacheArray['back_level']},ref={$cacheArray['up_refid'][$cacheArray['back_level']-1]} - BACK!
\n"; } // Updates/extends the online list function UPDATE_ONLINE_LIST($SID, $mod, $act, $wht) { @@ -1248,7 +1536,7 @@ function UPDATE_ONLINE_LIST($SID, $mod, $act, $wht) { $ADMIN = "Y"; } // END - if - if (isSessionVariableSet('refid')) { + if (isSessionVariableSet('up_refid')) { // Check cookie if (get_session('refid') > 0) $rid = bigintval($GLOBALS['refid']); } // END - if @@ -1275,7 +1563,7 @@ WHERE sid='%s' LIMIT 1", ); } else { // No entry does exists so we simply add it! - 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')", + 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__ ); } @@ -1303,13 +1591,15 @@ function SEND_ADMIN_EMAILS($subj, $msg) { } // Get ID number from administrator's login name function GET_ADMIN_ID($login) { - global $cacheArray; + global $cacheArray, $_CONFIG; $ret = "-1"; if (!empty($cacheArray['admins']['aid'][$login])) { // Check cache $ret = $cacheArray['admins']['aid'][$login]; - if (empty($ret)) $ret = "-1"; - } else { + + // Update cache hits + $_CONFIG['cache_hits']++; + } elseif (!EXT_IS_ACTIVE("cache")) { // Load from database $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1", array($login), __FILE__, __LINE__); @@ -1326,54 +1616,118 @@ function GET_ADMIN_ID($login) { // Get password hash from administrator's login name function GET_ADMIN_HASH($login) { - global $cacheArray; + global $cacheArray, $_CONFIG; $ret = "-1"; - if (!empty($cacheArray['admins']['password'][$login])) - { + if (!empty($cacheArray['admins']['password'][$login])) { // Check cache $ret = $cacheArray['admins']['password'][$login]; - if (empty($ret)) $ret = "-1"; - } - else - { + + // Update cache hits + $_CONFIG['cache_hits']++; + } elseif (!EXT_IS_ACTIVE("cache")) { // Load from database $result = SQL_QUERY_ESC("SELECT password FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1", array($login), __FILE__, __LINE__); - if (SQL_NUMROWS($result) == 1) - { + if (SQL_NUMROWS($result) == 1) { + // Fetch data list($ret) = SQL_FETCHROW($result); - SQL_FREERESULT($result); + + // Set cache + $cacheArray['admins']['password'][$login] = $ret; } + + // Free result + SQL_FREERESULT($result); } return $ret; } // function GET_ADMIN_LOGIN ($aid) { - global $cacheArray; + global $cacheArray, $_CONFIG; $ret = "***"; - if (!empty($cacheArray['admins']['login'])) { - // Check cache - if (!empty($cacheArray['admins']['login'][$aid])) { - $ret = $cacheArray['admins']['login'][$aid]; - } // END - if - if (empty($ret)) $ret = "***"; - } else { + if (!empty($cacheArray['admins']['login'][$aid])) { + // Get cache + $ret = $cacheArray['admins']['login'][$aid]; + + // Update cache hits + $_CONFIG['cache_hits']++; + } elseif (!EXT_IS_ACTIVE("cache")) { // Load from database $result = SQL_QUERY_ESC("SELECT login FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1", - array(bigintval($aid)), __FILE__, __LINE__); + array(bigintval($aid)), __FILE__, __LINE__); if (SQL_NUMROWS($result) == 1) { // Fetch data list($ret) = SQL_FETCHROW($result); // Set cache $cacheArray['admins']['login'][$aid] = $ret; - } + } // END - if // Free memory SQL_FREERESULT($result); } return $ret; } +// Get email address of admin id +function GET_ADMIN_EMAIL ($aid) { + global $cacheArray, $_CONFIG; + + $ret = "***"; + if (!empty($cacheArray['admins']['email'])) { + // Get cache + $ret = $cacheArray['admins']['email'][$aid]; + + // Update cache hits + $_CONFIG['cache_hits']++; + } elseif (!EXT_IS_ACTIVE("cache")) { + // Load from database + $result_aid = SQL_QUERY_ESC("SELECT email FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1", + array(bigintval($ret)), __FILE__, __LINE__); + if (SQL_NUMROWS($result) == 1) { + // Get data + list($ret) = SQL_FETCHROW($result_aid); + + // Set cache + $cacheArray['admins']['email'][$aid] = $ret; + } // END - if + + // Free result + SQL_FREERESULT($result_aid); + } + + // Return email + return $ret; +} +// Get default ACL of admin id +function GET_ADMIN_DEFAULT_ACL ($aid) { + global $cacheArray, $_CONFIG; + + $ret = "***"; + if (!empty($cacheArray['admins']['def_acl'])) { + // Use cache + $ret = $cacheArray['admins']['def_acl'][$aid]; + + // Update cache hits + $_CONFIG['cache_hits']++; + } else { + // Load from database + $result_aid = SQL_QUERY_ESC("SELECT default_acl FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1", + array(bigintval($ret)), __FILE__, __LINE__); + if (SQL_NUMROWS($result) == 1) { + // Fetch data + list($ret) = SQL_FETCHROW($result_aid); + + // Set cache + $cacheArray['admins']['def_acl'][$aid] = $ret; + } + + // Free result + SQL_FREERESULT($result_aid); + } + + // Return email + return $ret; +} // function ADD_OPTION_LINES($table, $id, $name, $default="",$special="",$where="") { $ret = ""; @@ -1385,8 +1739,8 @@ function ADD_OPTION_LINES($table, $id, $name, $default="",$special="",$where="") $ret .= "\n"; - } + } // END - while // Free memory SQL_FREERESULT($result); @@ -1416,7 +1770,7 @@ function ADD_OPTION_LINES($table, $id, $name, $default="",$special="",$where="") // Return - hopefully - the requested data return $ret; } -// Aiut +// Activate exchange (DEPERECATED???) function activateExchange() { global $_CONFIG; $result = SQL_QUERY("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE status='CONFIRMED' AND max_mails > 0", __FILE__, __LINE__); @@ -1478,7 +1832,7 @@ WHERE p.userid=%s", array(bigintval($uid)), __FILE__, __LINE__); } // Now a mail to the user and that's all... - $msg = LOAD_EMAIL_TEMPLATE("del-user", $reason, $uid); + $msg = LOAD_EMAIL_TEMPLATE("del-user", array('text' => $reason), $uid); SEND_EMAIL($uid, ADMIN_DEL_ACCOUNT, $msg); // Ok, delete the account! @@ -1503,7 +1857,7 @@ function ADD_JACKPOT($points) if (SQL_NUMROWS($result) == 0) { // Create line - $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_jackpot (ok, points) VALUES ('ok', '%s')", array($points), __FILE__, __LINE__); + $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_jackpot (ok, points) VALUES ('ok','%s')", array($points), __FILE__, __LINE__); } else { @@ -1585,6 +1939,8 @@ function LOAD_CONFIG($no="0") { } // Gets the matching what name from module function GET_WHAT($MOD_CHECK) { + global $_CONFIG; + $wht = ""; //* DEBUG: */ echo __LINE__."!".$MOD_CHECK."!
\n"; switch ($MOD_CHECK) @@ -1596,6 +1952,7 @@ function GET_WHAT($MOD_CHECK) { case "login": case "index": $wht = "welcome"; + if (($MOD_CHECK == "index") && (!empty($_CONFIG['index_home']))) $wht = $_CONFIG['index_home']; break; default: @@ -1702,14 +2059,8 @@ function UPDATE_CONFIG ($entries, $values, $updateMode="") { $affectedRows = SQL_AFFECTEDROWS(); //* DEBUG: */ echo __FUNCTION__.":entries={$entries},affectedRows={$affectedRows}
\n"; - // Destroy cache? - if ((GET_EXT_VERSION("cache") >= "0.1.2") && ($affectedRows == 1)) { - global $cacheInstance, $_CONFIG, $CSS; - if ($cacheInstance->cache_file("config", true)) $cacheInstance->cache_destroy(); - - // Rebuid the cache - require(PATH."inc/load_cache-config.php"); - } // END - if + // Rebuild cache + REBUILD_CACHE("config", "config"); } // Creates a new task for updated extension function CREATE_EXTENSION_UPDATE_TASK ($admin_id, $subject, $notes) { @@ -1718,7 +2069,7 @@ function CREATE_EXTENSION_UPDATE_TASK ($admin_id, $subject, $notes) { array($subject), __FILE__, __LINE__); if (SQL_NUMROWS($result) == 0) { // Task not created so it's a brand-new extension which we need to register and create a task for! - $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (assigned_admin, userid, status, task_type, subject, text, task_created) VALUES ('%s', '0', 'NEW', 'EXTENSION_UPDATE', '%s', '%s', UNIX_TIMESTAMP())", + $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (assigned_admin, userid, status, task_type, subject, text, task_created) VALUES ('%s','0','NEW','EXTENSION_UPDATE','%s','%s', UNIX_TIMESTAMP())", array($admin_id, $subject, $notes), __FILE__, __LINE__); } // END - if @@ -1744,12 +2095,12 @@ function CREATE_NEW_EXTENSION_TASK ($admin_id, $subject, $ext) { $msg = LOAD_TEMPLATE("ext_".$ext, true); } else { // Load default message - $msg = LOAD_EMAIL_TEMPLATE("admin_new_ext","", 0); + $msg = LOAD_TEMPLATE("admin_new_ext", "", 0); } // Task not created so it's a brand-new extension which we need to register and create a task for! $result_insert = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (assigned_admin, userid, status, task_type, subject, text, task_created) -VALUES (%s, 0, 'NEW', 'EXTENSION', '%s', '%s', UNIX_TIMESTAMP())", +VALUES (%s,0,'NEW','EXTENSION','%s','%s',UNIX_TIMESTAMP())", array( $admin_id, $subject, @@ -1761,5 +2112,6 @@ VALUES (%s, 0, 'NEW', 'EXTENSION', '%s', '%s', UNIX_TIMESTAMP())", // Free memory SQL_FREERESULT($result); } + // ?>