More time() in SQL queries replace with UNIX_TIMESTAMP()

[mailer.git] / inc / modules / member / what-order.php

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index 9bbe6a58f80923476f0780deca018533378001dd..62aec111c7a41d21de796805af0d33448ce3f7dd 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -264,7 +264,7 @@ ORDER BY d.%s %s",
                                {
                                        // Check for his holiday status
                                        $result_holiday = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_holidays
-WHERE userid=%s AND holiday_start < ".time()." AND holiday_end > ".time()." LIMIT 1",
+WHERE userid=%s AND holiday_start < UNIX_TIMESTAMP() AND holiday_end > UNIX_TIMESTAMP() LIMIT 1",
  array(bigintval($REC)), __FILE__, __LINE__);
                                        if (SQL_NUMROWS($result_holiday) == 1) $REC = 0; // Exclude user who are in holiday
 
@@ -497,7 +497,7 @@ array(
 LEFT JOIN "._MYSQL_PREFIX."_user_holidays AS h
 ON d.userid=h.userid
 WHERE d.userid=%s AND d.receive_mails > 0 AND d.status='CONFIRMED' AND d.holiday_active='Y'
-AND h.holiday_start < ".time()." AND h.holiday_end > ".time()."
+AND h.holiday_start < UNIX_TIMESTAMP() AND h.holiday_end > UNIX_TIMESTAMP()
 LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                                if (SQL_NUMROWS($result_holiday) == 1)
                                                {
@@ -573,7 +573,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 
                                        // Finally contruct the message
                                        $MSG = MEMBER_URL_TIME_LOCK."<br />".CONFIG_URL_TLOCK." ".$STD." ".
-                                               HOURS.", ".$MIN." ".MINS." "._AND." ".$SEC." ".SECS."<br />".
+                                               _HOURS.", ".$MIN." "._MINUTES." "._AND." ".$SEC." "._SECONDS."<br />".
                                                MEMBER_LAST_TLOCK.": ".$LORDER;
                                        break;