X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fholiday_functions.php;h=8ad8cd0dbad0df711979e9fcd0552d67dcb58640;hp=1e74c62d324b27603ebcc0f0f805e48c9a448161;hb=a090e351c49fe021fb3064325694da03402332e0;hpb=5bdeaf8b452206598b6c6cd4f941145b11a0eccc

diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php
index 1e74c62d32..8ad8cd0dba 100644
--- a/inc/libs/holiday_functions.php
+++ b/inc/libs/holiday_functions.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Funktionen fuer die admins-Erweiterung           *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $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                  *
@@ -43,38 +48,45 @@ function HOLIDAY_STOP_HOLIDAYS () {
 	$result_stop = SQL_QUERY("SELECT userid, holiday_start, holiday_end, comments
 FROM `{!_MYSQL_PREFIX!}_user_holidays`
 WHERE holiday_end <= UNIX_TIMESTAMP()
-ORDER BY userid", __FILE__, __LINE__);
+ORDER BY userid", __FUNCTION__, __LINE__);
 	if (SQL_NUMROWS($result_stop) > 0) {
 		// We foud at least one
-		$admin = "";
-		while (list($uid, $start, $end, $comments) = SQL_FETCHROW($result_stop)) {
+		$admin = '';
+		// Init SQLs
+		INIT_SQLS();
+
+		// Process all found entries
+		while ($content = SQL_FETCHARRAY($result_stop)) {
 			// Stop holiday
-			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_holidays` WHERE userid=%s LIMIT 1",
-				array(bigintval($uid)), __FILE__, __LINE__);
+			ADD_SQL(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_holidays` WHERE userid=%s LIMIT 1",
+				array(bigintval($content['userid'])), __FUNCTION__, __LINE__, false));
 
 			// Unlock account
-			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
+			ADD_SQL(SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
 SET holiday_active='N', holiday_activated='0'
-WHERE userid=%s LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
+WHERE userid=%s LIMIT 1", array(bigintval($content['userid'])), __FUNCTION__, __LINE__, false));
 
 			// Prepare array
 			$content = array(
-				'holiday_end'      => MAKE_DATETIME($end  , "3"),
-				'holiday_start'    => MAKE_DATETIME($start, "3"),
-				'holiday_comments' => $comments
+				'holiday_end'      => MAKE_DATETIME($content['holiday_end']  , "3"),
+				'holiday_start'    => MAKE_DATETIME($content['holiday_start'], "3"),
+				'holiday_comments' => $content['comments']
 			);
 
 			// Send mail to user
-			$msg = LOAD_EMAIL_TEMPLATE("member_holiday_unlock", $content, $uid);
-			SEND_EMAIL($uid, HOLIDAY_MEMBER_UNLOCK_SUBJ, $msg);
+			$msg = LOAD_EMAIL_TEMPLATE("member_holiday_unlock", $content, $content['userid']);
+			SEND_EMAIL($content['userid'], getMessage('HOLIDAY_MEMBER_UNLOCK_SUBJ'), $msg);
 
 			// Remember userid for admin
-			$admin .= $uid."\n";
-		}
+			$admin .= $content['userid']."\n";
+		} // END - if
 
 		// Send mail to admins
-		SEND_ADMIN_NOTIFICATION(HOLIDAY_ADMIN_UNLOCK_SUBJ, "admin_holiday_unlock", $admin, "0");
-	}
+		SEND_ADMIN_NOTIFICATION(getMessage('HOLIDAY_ADMIN_UNLOCK_SUBJ'), "admin_holiday_unlock", $admin, "0");
+
+		// Run all SQLs
+		runFilterChain('run_sqls');
+	} // END - if
 
 	// Free memory
 	SQL_FREERESULT($result_stop);