X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fholiday_functions.php;h=4e82a02ce4535f24dbc9fafc87b7fc02e0d0d171;hb=ccc4a69ce9b17aa8d7b1554a3b2b017db091821b;hp=2f2ccaca3044186aeabff04a93aa85f764eb38e2;hpb=fb7120ffa230b62b54895bcf95952e1cf30f8594;p=mailer.git

diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php
index 2f2ccaca30..4e82a02ce4 100644
--- a/inc/libs/holiday_functions.php
+++ b/inc/libs/holiday_functions.php
@@ -38,7 +38,7 @@
 
 // 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);
 }
 
@@ -48,10 +48,10 @@ 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", __FUNCTION__, __LINE__);
+ORDER BY `userid` ASC", __FUNCTION__, __LINE__);
 	if (SQL_NUMROWS($result_stop) > 0) {
 		// We foud at least one
-		$admin = "";
+		$admin = '';
 		// Init SQLs
 		INIT_SQLS();
 
@@ -59,30 +59,31 @@ ORDER BY userid", __FUNCTION__, __LINE__);
 		while ($content = SQL_FETCHARRAY($result_stop)) {
 			// Stop holiday
 			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));
+			array(bigintval($content['userid'])), __FUNCTION__, __LINE__, false));
 
 			// Unlock account
 			ADD_SQL(SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
-SET holiday_active='N', holiday_activated='0'
-WHERE userid=%s LIMIT 1", array(bigintval($content['userid'])), __FUNCTION__, __LINE__, false));
+SET `holiday_active`='N', `holiday_activated`=0
+WHERE `userid`=%s
+LIMIT 1", array(bigintval($content['userid'])), __FUNCTION__, __LINE__, false));
 
 			// Prepare array
 			$content = array(
-				'holiday_end'      => MAKE_DATETIME($content['holiday_end']  , "3"),
-				'holiday_start'    => MAKE_DATETIME($content['holiday_start'], "3"),
+				'holiday_end'      => generateDateTime($content['holiday_end']  , '3'),
+				'holiday_start'    => generateDateTime($content['holiday_start'], '3'),
 				'holiday_comments' => $content['comments']
 			);
 
 			// Send mail to user
 			$msg = LOAD_EMAIL_TEMPLATE("member_holiday_unlock", $content, $content['userid']);
-			SEND_EMAIL($content['userid'], getMessage('HOLIDAY_MEMBER_UNLOCK_SUBJ'), $msg);
+			sendEmail($content['userid'], getMessage('HOLIDAY_MEMBER_UNLOCK_SUBJ'), $msg);
 
 			// Remember userid for admin
 			$admin .= $content['userid']."\n";
 		} // END - if
 
 		// Send mail to admins
-		SEND_ADMIN_NOTIFICATION(getMessage('HOLIDAY_ADMIN_UNLOCK_SUBJ'), "admin_holiday_unlock", $admin, "0");
+		sendAdminNotification(getMessage('HOLIDAY_ADMIN_UNLOCK_SUBJ'), "admin_holiday_unlock", $admin, '0');
 
 		// Run all SQLs
 		runFilterChain('run_sqls');