X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fholiday_functions.php;h=b38e212039cee991efd5e0c25804a36f24b5f93e;hb=e3934352dffa6eb9da59a137ae1a9414e5b4d80b;hp=0b07bf1a30863cde01c1b1bb40f966f3532f0a62;hpb=d0db163274524c1ac548146db60d4543abcec4a9;p=mailer.git

diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php
index 0b07bf1a30..b38e212039 100644
--- a/inc/libs/holiday_functions.php
+++ b/inc/libs/holiday_functions.php
@@ -14,12 +14,10 @@
  * $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                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -46,14 +44,14 @@ if (!defined('__SECURITY')) {
 function stopHolidays () {
 	// Let's find some expired holiday requests...
 	$result_stop = SQL_QUERY("SELECT
-	`userid`, `holiday_start`, `holiday_end`, `comments`
+	`userid`,`holiday_start`,`holiday_end`,`comments`
 FROM
 	`{?_MYSQL_PREFIX?}_user_holidays`
 WHERE
 	`holiday_end` <= UNIX_TIMESTAMP()
 ORDER BY
 	`userid` ASC", __FUNCTION__, __LINE__);
-	if (SQL_NUMROWS($result_stop) > 0) {
+	if (!SQL_HASZERONUMS($result_stop)) {
 		// We foud at least one
 		$admin = '';
 
@@ -70,7 +68,8 @@ ORDER BY
 			addSql(SQL_QUERY_ESC("UPDATE
 	`{?_MYSQL_PREFIX?}_user_data`
 SET
-	`holiday_active`='N', `holiday_activated`=0
+	`holiday_active`='N',
+	`holiday_activated`=0
 WHERE
 	`userid`=%s
 LIMIT 1",
@@ -85,14 +84,14 @@ LIMIT 1",
 
 			// Send mail to user
 			$message = loadEmailTemplate('member_holiday_unlock', $content, $content['userid']);
-			sendEmail($content['userid'], getMessage('HOLIDAY_MEMBER_UNLOCK_SUBJ'), $message);
+			sendEmail($content['userid'], '{--MEMBER_HOLIDAY_UNLOCK_SUBJECT--}', $message);
 
 			// Remember userid for admin
 			$admin .= $content['userid']."\n";
 		} // END - if
 
 		// Send mail to admins
-		sendAdminNotification(getMessage('HOLIDAY_ADMIN_UNLOCK_SUBJ'), 'admin_holiday_unlock', $admin);
+		sendAdminNotification('{--ADMIN_HOLIDAY_UNLOCK_SUBJECT--}', 'admin_holiday_unlock', $admin);
 
 		// Run all SQLs
 		runFilterChain('run_sqls');