X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fholiday_functions.php;h=340a5abac88052afbc85c42ed1bb3096e61f0f06;hb=e5527fd38a6585c8466dc28d013f12d21eb7c07a;hp=8b5c02d71124dbfad78f178bb7cbb9788a08b3d6;hpb=b941cf55d76e1349c7e9c29e116fbf708664a06b;p=mailer.git

diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php
index 8b5c02d711..340a5abac8 100644
--- a/inc/libs/holiday_functions.php
+++ b/inc/libs/holiday_functions.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 // Stops all expired holidays
 function stopHolidays () {
 	// Let's find some expired holiday requests...
-	$result_stop = SQL_QUERY("SELECT
+	$result_stop = sqlQuery("SELECT
 	`userid`,
 	`holiday_start`,
 	`holiday_end`,
@@ -54,7 +54,7 @@ WHERE
 	`holiday_end` <= UNIX_TIMESTAMP()
 ORDER BY
 	`userid` ASC", __FUNCTION__, __LINE__);
-	if (!SQL_HASZERONUMS($result_stop)) {
+	if (!ifSqlHasZeroNums($result_stop)) {
 		// We foud at least one
 		$admin = '';
 
@@ -62,13 +62,13 @@ ORDER BY
 		initSqls();
 
 		// Process all found entries
-		while ($content = SQL_FETCHARRAY($result_stop)) {
+		while ($content = sqlFetchArray($result_stop)) {
 			// Stop holiday
-			addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_holidays` WHERE `userid`=%s LIMIT 1",
+			addSql(sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_holidays` WHERE `userid`=%s LIMIT 1",
 				array(bigintval($content['userid'])), __FUNCTION__, __LINE__, FALSE));
 
 			// Unlock account
-			addSql(SQL_QUERY_ESC("UPDATE
+			addSql(sqlQueryEscaped("UPDATE
 	`{?_MYSQL_PREFIX?}_user_data`
 SET
 	`holiday_active`='N',
@@ -101,7 +101,7 @@ LIMIT 1",
 	} // END - if
 
 	// Free memory
-	SQL_FREERESULT($result_stop);
+	sqlFreeResult($result_stop);
 }
 
 // ----------------------------------------------------------------------------