More queries now depends on UNIX_TIMESTAMP() SQL function, wrong index in autopurge...

[mailer.git] / inc / libs / holiday_functions.php

diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php
index 5e10287d2f9b267d072c740c707f8da50232a933..61ce6ab20470f0e7bb54218fd44d28eebe3deb94 100644 (file)
--- a/inc/libs/holiday_functions.php
+++ b/inc/libs/holiday_functions.php
@@ -32,18 +32,18 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
+
 //
 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 <= ".time()."
+WHERE holiday_end <= UNIX_TIMESTAMP()
 ORDER BY userid", __FILE__, __LINE__);
        if (SQL_NUMROWS($result_stop) > 0)
        {
@@ -52,13 +52,13 @@ ORDER BY userid", __FILE__, __LINE__);
                while (list($uid, $start, $end, $comments) = SQL_FETCHROW($result_stop))
                {
                        // Stop holiday
-                       $result_del = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_holidays WHERE userid=%d LIMIT 1",
+                       $result_del = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_holidays WHERE userid=%s LIMIT 1",
                         array(bigintval($uid)), __FILE__, __LINE__);
 
                        // Unlock account
                        $result_del = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data
 SET holiday_active='N', holiday_activated='0'
-WHERE userid=%d LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
+WHERE userid=%s LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
 
                        // Prepare array
                        $content = array(
@@ -76,17 +76,7 @@ WHERE userid=%d LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
                }
 
                // Send mail to admins
-               if (GET_EXT_VERSION("admins") >= "0.4.1")
-               {
-                       // Use new system
-                       SEND_ADMIN_EMAILS_PRO(HOLIDAY_ADMIN_UNLOCK_SUBJ, "admin_holiday_unlock", $admin, "0");
-               }
-                else
-               {
-                       // Use old system
-                       $msg = LOAD_EMAIL_TEMPLATE("admin_holiday_unlock", $admin, "0");
-                       SEND_ADMIN_EMAILS(HOLIDAY_ADMIN_UNLOCK_SUBJ, $msg);
-               }
+               SEND_ADMIN_NOTIFICATION(HOLIDAY_ADMIN_UNLOCK_SUBJ, "admin_holiday_unlock", $admin, "0");
        }
 
        // Free memory