From 254afbdb1fa4699a98667bad4e792ad803a0d535 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 21 Sep 2008 15:40:18 +0000 Subject: [PATCH] Fixes for sending pool --- inc/functions.php | 4 ++-- inc/load_extensions.php | 6 +++--- inc/modules/admin.php | 4 ++-- inc/mysql-connect.php | 21 +++++++++++++++++++-- inc/pool-update.php | 37 ++++++++++++++++++++----------------- 5 files changed, 46 insertions(+), 26 deletions(-) diff --git a/inc/functions.php b/inc/functions.php index b888b2779f..892f983c6b 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -2303,9 +2303,9 @@ function merge_array ($array1, $array2) { die(""); } // Debug message logger -function DEBUG_LOG ($message) { +function DEBUG_LOG ($message, $force=false) { // Is debug mode enabled? - if (isBooleanConstantAndTrue('DEBUG_MODE')) { + if ((isBooleanConstantAndTrue('DEBUG_MODE')) || ($force)) { // Log this message away $fp = fopen(PATH."inc/cache/debug.log", 'a') or mxchange_die("Cannot write logfile debug.log!"); fwrite($fp, date("d.m.Y|H:i:s", time())."|{$message}\n"); diff --git a/inc/load_extensions.php b/inc/load_extensions.php index 3fea0700f1..bc9a4a5bb4 100644 --- a/inc/load_extensions.php +++ b/inc/load_extensions.php @@ -275,10 +275,10 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && (($cacheMode == "init") || ($cacheMode == // Load more cache files (like admins) require_once(PATH."inc/load_cache.php"); } // END - if -} -// Free memory -SQL_FREERESULT($res_ext_crt); + // Free memory + SQL_FREERESULT($res_ext_crt); +} // Load include files if (!empty($INC_POOL[0])) { diff --git a/inc/modules/admin.php b/inc/modules/admin.php index 7578e6c7d5..36a322a0c9 100644 --- a/inc/modules/admin.php +++ b/inc/modules/admin.php @@ -397,8 +397,8 @@ if (!defined('admin_registered')) { if (isBooleanConstantAndTrue('admin_registered')) { // Check config.php and inc directory for right access rights - if (is_INCWritable("config")) ADD_FATAL(FATAL_CONFIG_WRITABLE); - if (is_INCWritable("dummy")) ADD_FATAL(FATAL_INC_WRITABLE); + // DEPRECATED: if (is_INCWritable("config")) ADD_FATAL(FATAL_CONFIG_WRITABLE); + // DEPRECATED: if (is_INCWritable("dummy")) ADD_FATAL(FATAL_INC_WRITABLE); } // ?> diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php index 467f21827a..fd24ac4903 100644 --- a/inc/mysql-connect.php +++ b/inc/mysql-connect.php @@ -57,6 +57,23 @@ require_once(PATH."inc/mysql-manager.php"); // Functions which interact with the require_once(PATH."inc/extensions.php"); require_once(PATH."inc/language.php"); +// Init error handler +function __errorHandler ($errno, $errstr, $errfile, $errline) { + $msg = sprintf("errno=%s,errstr=%s,errfile=%s,errline=%s", + $errno, + $errstr, + basename($errfile), + $errline + ); + DEBUG_LOG(__FUNCTION__.":".$msg, true); + print "Please report this error:
";
+	debug_print_backtrace();
+	die("
"); +} + +// Set error handler +//set_error_handler('__errorHandler'); + // Check if the user setups his MySQL stuff... if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!isset($_GET['installing'])) && (isBooleanConstantAndTrue('mxchange_installed'))) { // No login entered and outside installation mode @@ -78,8 +95,8 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT // Check for write-permission for config.php and inc directory if (empty($GLOBALS['module'])) $GLOBALS['module'] = "index"; if (($GLOBALS['module'] != "admin") && (isBooleanConstantAndTrue('admin_registered')) && (!isset($_SERVER['WINDIR']))) { - if (is_INCWritable("config")) ADD_FATAL(FATAL_CONFIG_WRITABLE); - if (is_INCWritable("dummy")) ADD_FATAL(FATAL_INC_WRITABLE); + // DEPRECATED: if (is_INCWritable("config")) ADD_FATAL(FATAL_CONFIG_WRITABLE); + // DEPRECATED: if (is_INCWritable("dummy")) ADD_FATAL(FATAL_INC_WRITABLE); } $EXT_CSS_FILES = array(); diff --git a/inc/pool-update.php b/inc/pool-update.php index 20b4062502..509e04b754 100644 --- a/inc/pool-update.php +++ b/inc/pool-update.php @@ -62,14 +62,14 @@ if (SQL_NUMROWS($result_main) > 0) while ($DATA = SQL_FETCHROW($result_main)) { // Check fetched data for HTML - $HTML = $DATA[10]; if ($HTML == $DATA['id']) $HTML = "N"; + $HTML = $DATA[10]; if ($HTML == $DATA[0]) $HTML = "N"; // Compile URL and subject line $DATA[7] = COMPILE_CODE($DATA[7]); // Set mail order as "active". That means it will be sent out $result_active = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='ACTIVE' WHERE id=%s AND data_type='NEW' LIMIT 1", - array($DATA['id']), __FILE__, __LINE__); + array($DATA[0]), __FILE__, __LINE__); if (SQL_AFFECTEDROWS() == 1) { // "Explode" all receivers into an array @@ -110,7 +110,7 @@ if (SQL_NUMROWS($result_main) > 0) // Do we have a stats entry? $result_stats = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_stats WHERE pool_id=%s AND userid=%s AND timestamp_ordered='%s' LIMIT 1", - array($DATA['id'], $DATA[1], $DATA[6]), __FILE__, __LINE__); + array($DATA[0], $DATA[1], $DATA[6]), __FILE__, __LINE__); // If there's no stats entry add it! //* DEBUG: */ echo "!L:".__LINE__."/".SQL_NUMROWS($result_stats)."!
"; @@ -118,11 +118,11 @@ if (SQL_NUMROWS($result_main) > 0) { // No entry was found, so we add him! $result_stats = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_stats (pool_id , userid, cat_id, payment_id, subject, url , max_rec , timestamp_ordered, timestamp_sstart) VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' , UNIX_TIMESTAMP())", - array(bigintval($DATA['id']), bigintval($DATA[1]), bigintval($DATA[9]), bigintval($DATA[5]), $DATA[2], $DATA[7], $DATA[8], bigintval($DATA[6])), __FILE__, __LINE__); + array(bigintval($DATA[0]), bigintval($DATA[1]), bigintval($DATA[9]), bigintval($DATA[5]), $DATA[2], $DATA[7], $DATA[8], bigintval($DATA[6])), __FILE__, __LINE__); // Receive it's ID for the links table $result_stats = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_stats WHERE pool_id=%s AND userid=%s AND timestamp_ordered='%s' LIMIT 1", - array(bigintval($DATA['id']), bigintval($DATA[1]), bigintval($DATA[6])), __FILE__, __LINE__); + array(bigintval($DATA[0]), bigintval($DATA[1]), bigintval($DATA[6])), __FILE__, __LINE__); } //* DEBUG: */ echo "!L:".__LINE__."/".SQL_NUMROWS($result_stats)."!
"; @@ -133,8 +133,8 @@ if (SQL_NUMROWS($result_main) > 0) SQL_FREERESULT($result_stats); // Mark this user as "spammed" ;-) And place a line for him... - //* DEBUG: */ echo "?L:".__LINE__."/".$dummy."/".$key."/".$uid."(".$DATA[1].")/".$DATA['id']."/".$stats_id."?
"; - switch (REMOVE_RECEIVER($dummy, $key, bigintval($uid), bigintval($DATA['id']), bigintval($stats_id))) + //* DEBUG: */ echo "?L:".__LINE__."/".$dummy."/".$key."/".$uid."(".$DATA[1].")/".$DATA[0]."/".$stats_id."?
"; + switch (REMOVE_RECEIVER($dummy, $key, bigintval($uid), bigintval($DATA[0]), bigintval($stats_id))) { case "done": // Prepare the mail @@ -151,7 +151,7 @@ if (SQL_NUMROWS($result_main) > 0) // Prepare content $content = array( 'id' => $DATA[11], - 'url' => $DATA[3], + 'url' => $DATA[7], 'sender_uid' => $DATA[1], 'category' => GET_CATEGORY($DATA[9]), 'time' => CREATE_FANCY_TIME(GET_PAY_POINTS($DATA[5], "time")), @@ -196,12 +196,15 @@ if (SQL_NUMROWS($result_main) > 0) } // Do we have reached the maximum to send mails? || ($_CONFIG['max_send'] >= $cnt) - //* DEBUG: */ echo "*L:".__LINE__."/".$cnt.">=".$DATA[8]."/".$_CONFIG['max_send'].">=".$cnt."/".$LAST_SENT_ID."!=".$DATA['id']."*
"; - if ((($cnt >= $DATA[8])) && ($LAST_SENT_ID != $DATA['id'])) { + //* DEBUG: */ echo "*L:".__LINE__."/".$cnt.">=".$DATA[8]."/".$_CONFIG['max_send'].">=".$cnt."/".$LAST_SENT_ID."!=".$DATA[0]."*
"; + if ((($cnt >= $DATA[8])) && ($LAST_SENT_ID != $DATA[0])) { // Prepare content $content = array( 'sender_uid' => $DATA[1], - 'category' => GET_CATEGORY($DATA[9]) + 'category' => GET_CATEGORY($DATA[9]), + 'text' => $DATA[3], + 'url' => $DATA[7], + 'expiration' => CREATE_FANCY_TIME(GET_PAY_POINTS($DATA[5], "time")) ); // Yes we do, so we notify admin and sender about fully sent mail! @@ -224,13 +227,13 @@ if (SQL_NUMROWS($result_main) > 0) // Set status to SEND because we completely send it away $result_done = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='SEND', target_send='0', receivers='' WHERE id=%s LIMIT 1", - array(bigintval($DATA['id'])), __FILE__, __LINE__); + array(bigintval($DATA[0])), __FILE__, __LINE__); // Update send-completed-time $result_user = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_stats SET timestamp_send=UNIX_TIMESTAMP() WHERE pool_id=%s LIMIT 1", - array(bigintval($DATA['id'])), __FILE__, __LINE__); + array(bigintval($DATA[0])), __FILE__, __LINE__); - $LAST_SENT_ID = $DATA['id']; $cnt = 0; + $LAST_SENT_ID = $DATA[0]; $cnt = 0; $cnt2 += $cnt; // Update mediadata if version is 0.0.4 or higher @@ -251,7 +254,7 @@ if (SQL_NUMROWS($result_main) > 0) $ADD = ""; if ($cnt <= $DATA[8]) $ADD = ", target_send=target_send-".$cnt; $result_queue = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='NEW', receivers='%s'".$ADD." WHERE id=%s LIMIT 1", - array(implode(";", $dummy), bigintval($DATA['id'])), __FILE__, __LINE__); + array(implode(";", $dummy), bigintval($DATA[0])), __FILE__, __LINE__); //* DEBUG: */ echo"*EXIT/L:".__LINE__."*
"; break; @@ -264,7 +267,7 @@ if (SQL_NUMROWS($result_main) > 0) { // List was empty $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='SEND' WHERE id=%s LIMIT 1", - array(bigintval($DATA['id'])), __FILE__, __LINE__); + array(bigintval($DATA[0])), __FILE__, __LINE__); } else { @@ -293,7 +296,7 @@ if (SQL_NUMROWS($result_main) > 0) // Update receivers $result_queue = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET receivers='%s' WHERE id=%s LIMIT 1", - array(implode(";", $dummy), bigintval($DATA['id'])), __FILE__, __LINE__); + array(implode(";", $dummy), bigintval($DATA[0])), __FILE__, __LINE__); } } } -- 2.39.5