X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Freset%2Freset_daily.php;h=844c5182daae7e13b519d043ffef9b9d19535277;hb=81bfbcd72e424060ea1223b49ad92fcfa150f361;hp=153862788311b2587765fd8aefd73d6281e54d66;hpb=c47144dd555bbab4acdf9085e4623900dedb0e7c;p=mailer.git

diff --git a/inc/reset/reset_daily.php b/inc/reset/reset_daily.php
index 1538627883..844c5182da 100644
--- a/inc/reset/reset_daily.php
+++ b/inc/reset/reset_daily.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Dinge, die beim taeglichen Reset erledigt werden *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $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,18 +38,18 @@
 
 // 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);
-} elseif (!EXT_IS_ACTIVE("sql_patches")) {
+} elseif (!EXT_IS_ACTIVE('sql_patches')) {
 	return;
 }
 
 // Do not execute when script is in CSS mode or no daily reset
-if (($CSS == 1) || (!defined('__DAILY_RESET'))) return;
+if (($GLOBALS['output_mode'] == 1) || (!isResetModeEnabled())) return;
 //* DEBUG: */ echo basename(__FILE__)."<br />\n";
 
 // Update user profiles
-if (GET_EXT_VERSION("order") >= "0.1.1") {
+if (GET_EXT_VERSION('order') >= '0.1.1') {
 	// Latest version
 	$result_daily = SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET receive_mails=max_mails, mail_orders=0 WHERE receive_mails != max_mails", __FILE__, __LINE__);
 } else {
@@ -53,43 +58,48 @@ if (GET_EXT_VERSION("order") >= "0.1.1") {
 }
 
 // Transfer points from locked_points to points
-$result_daily = SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE ref_payout=0 AND `status`='CONFIRMED' ORDER BY userid", __FILE__, __LINE__);
+$result_daily = SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE ref_payout=0 AND `status`='CONFIRMED' ORDER BY `userid` ASC", __FILE__, __LINE__);
 
 //* DEBUG: */ echo basename(__FILE__).":payout=0;daily|numRows=".SQL_NUMROWS($result_daily)."<br />\n";
-if (SQL_NUMROWS($result_daily) > 0)
-{
+if (SQL_NUMROWS($result_daily) > 0) {
+	// Init SQLs
+	INIT_SQLS();
+
 	// Start checking accounts which are on 0 confirmed-to-go mails
-	while (list($uid) = SQL_FETCHROW($result_daily))
-	{
-		//* DEBUG: */ echo basename(__FILE__).":uid={$uid}<br />\n";
+	while ($content = SQL_FETCHARRAY($result_daily)) {
+		//* DEBUG: */ echo basename(__FILE__).":uid={$content['userid']}<br />\n";
 		$result_points = SQL_QUERY_ESC("SELECT ref_depth, locked_points FROM `{!_MYSQL_PREFIX!}_user_points`
 WHERE userid=%s AND locked_points != 0.00000 ORDER BY ref_depth",
-		 array(bigintval($uid)), __FILE__, __LINE__);
+			array(bigintval($content['userid'])), __FILE__, __LINE__);
+
 		//* DEBUG: */ echo basename(__FILE__).":payout=0;points|numRows=".SQL_NUMROWS($result_points)."<br />\n";
-		if (SQL_NUMROWS($result_points) > 0)
-		{
+		if (SQL_NUMROWS($result_points) > 0) {
 			// Ok transfer points
-			while (list($dep, $locked) = SQL_FETCHROW($result_points))
-			{
-				//* DEBUG: */ echo basename(__FILE__).":uid={$uid},depth={$dep},locked={$locked}<br />\n";
-				SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_points` SET points=points+%s, locked_points=0.00000
+			while ($content2 = SQL_FETCHARRAY($result_points)) {
+				// Merge both arrays
+				$content = merge_array($content, $content2);
+
+				//* DEBUG: */ echo basename(__FILE__).":uid={$content['userid']},depth={$content['ref_depth']},locked={$content['locked_points']}<br />\n";
+				ADD_SQL(SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_points` SET points=points+%s, locked_points=0.00000
 WHERE userid=%s AND ref_depth=%d
 LIMIT 1",
-				 array($locked, bigintval($uid), $dep), __FILE__, __LINE__);
+					array($content['locked_points'], bigintval($content['userid']), $content['ref_depth']), __FILE__, __LINE__, false));
 
 				// 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"), "add", $locked);
-				}
-			}
-		}
+					MEDIA_UPDATE_ENTRY(array('total_points'), 'add', $content['locked_points']);
+				} // END - if
+			} // END - while
+		} // END - if
 
 		// Free memory
 		SQL_FREERESULT($result_points);
-	}
-}
+	} // END - while
+
+	// Run all SQLs
+	runFilterChain('run_sqls');
+} // END - if
 
 // Free memory
 SQL_FREERESULT($result_daily);