X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Freset%2Freset_holiday.php;h=33689d69dec2932dd7ea432183153a087bb04fe3;hb=3767eef30a9e514e95625e6da22418ab297b204d;hp=6e7116e2c1c9bd23e6bbbe1ca64d830a60757e97;hpb=5dc48c7ca2416a0893a34a2e049827a4b4ce68b9;p=mailer.git

diff --git a/inc/reset/reset_holiday.php b/inc/reset/reset_holiday.php
index 6e7116e2c1..33689d69de 100644
--- a/inc/reset/reset_holiday.php
+++ b/inc/reset/reset_holiday.php
@@ -14,8 +14,6 @@
  * $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 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -40,7 +38,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-} elseif ((getScriptOutputMode() != 0) || ((!isResetModeEnabled()) && (getConfig('holiday_mode') == 'RESET'))) {
+} elseif ((!isHtmlOutputMode()) || ((!isResetModeEnabled()) && (getConfig('holiday_mode') == 'RESET'))) {
 	// Do not execute when script is in CSS mode or no daily reset
 	return;
 } elseif (!isExtensionActive('holiday')) {
@@ -62,7 +60,7 @@ ORDER BY
 __FILE__, __LINE__);
 
 // Entries found?
-if (SQL_NUMROWS($result_main) > 0) {
+if (!SQL_HASZERONUMS($result_main)) {
 	// Init SQLs
 	initSqls();
 
@@ -94,7 +92,7 @@ LIMIT 1",
 
 			// Send email to user
 			$message = loadEmailTemplate('member_holiday_activated', $content, $content['userid']);
-			sendEmail($content['userid'], '{--HOLIDAY_MEMBER_ACTIVATED_SUBJECT--}', $message);
+			sendEmail($content['userid'], '{--MEMBER_HOLIDAY_ACTIVATED_SUBJECT--}', $message);
 
 			// Update account
 			addSql(SQL_QUERY_ESC("UPDATE