X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fholiday_functions.php;h=e23f772dd42fda387cad593560c43d5627de682f;hp=fb901880261242ff57ed676adf1c55c5f0ab7f59;hb=f928ad2bed60fa256d0641eaf6d2c027a2944688;hpb=9d3b6045b267bd17eb017f458f24122918df132c;ds=sidebyside diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php index fb90188026..e23f772dd4 100644 --- a/inc/libs/holiday_functions.php +++ b/inc/libs/holiday_functions.php @@ -45,10 +45,14 @@ if (!defined('__SECURITY')) { // function HOLIDAY_STOP_HOLIDAYS () { // Let's find some expired holiday requests... - $result_stop = SQL_QUERY("SELECT userid, holiday_start, holiday_end, comments -FROM `{!_MYSQL_PREFIX!}_user_holidays` -WHERE holiday_end <= UNIX_TIMESTAMP() -ORDER BY `userid` ASC", __FUNCTION__, __LINE__); + $result_stop = SQL_QUERY("SELECT + `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) { // We foud at least one $admin = ''; @@ -58,14 +62,18 @@ ORDER BY `userid` ASC", __FUNCTION__, __LINE__); // Process all found entries 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)); + 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 - 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)); + 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)); // Prepare array $content = array( @@ -75,7 +83,7 @@ LIMIT 1", array(bigintval($content['userid'])), __FUNCTION__, __LINE__, false)); ); // Send mail to user - $message = LOAD_EMAIL_TEMPLATE("member_holiday_unlock", $content, $content['userid']); + $message = LOAD_EMAIL_TEMPLATE('member_holiday_unlock', $content, $content['userid']); sendEmail($content['userid'], getMessage('HOLIDAY_MEMBER_UNLOCK_SUBJ'), $message); // Remember userid for admin @@ -83,7 +91,7 @@ LIMIT 1", array(bigintval($content['userid'])), __FUNCTION__, __LINE__, false)); } // END - if // Send mail to admins - sendAdminNotification(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');