A lot while() conditions rewritten to SQL_FETCHARRAY(), see bug #107, @TODO tags...

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

diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php
index 61ce6ab20470f0e7bb54218fd44d28eebe3deb94..a706bc1b31ee0e78f67e03eea2b68d9c12a651c2 100644 (file)
--- a/inc/libs/holiday_functions.php
+++ b/inc/libs/holiday_functions.php
@@ -38,46 +38,50 @@ if (!defined('__SECURITY')) {
 }
 
 //
-function HOLIDAY_STOP_HOLIDAYS()
-{
+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
+FROM `{!_MYSQL_PREFIX!}_user_holidays`
 WHERE holiday_end <= UNIX_TIMESTAMP()
-ORDER BY userid", __FILE__, __LINE__);
-       if (SQL_NUMROWS($result_stop) > 0)
-       {
+ORDER BY userid", __FUNCTION__, __LINE__);
+       if (SQL_NUMROWS($result_stop) > 0) {
                // We foud at least one
                $admin = "";
-               while (list($uid, $start, $end, $comments) = SQL_FETCHROW($result_stop))
-               {
+               // Init SQLs
+               INIT_SQLS();
+
+               // Process all found entries
+               while ($content = SQL_FETCHARRAY($result_stop)) {
                        // Stop holiday
-                       $result_del = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_holidays WHERE userid=%s LIMIT 1",
-                        array(bigintval($uid)), __FILE__, __LINE__);
+                       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
-                       $result_del = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data
+                       ADD_SQL(SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
 SET holiday_active='N', holiday_activated='0'
-WHERE userid=%s LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
+WHERE userid=%s LIMIT 1", array(bigintval($content['userid'])), __FUNCTION__, __LINE__, false));
 
                        // Prepare array
                        $content = array(
-                               'holiday_end'      => MAKE_DATETIME($end  , "3"),
-                               'holiday_start'    => MAKE_DATETIME($start, "3"),
-                               'holiday_comments' => $comments
+                               'holiday_end'      => MAKE_DATETIME($content['holiday_end']  , "3"),
+                               'holiday_start'    => MAKE_DATETIME($content['holiday_start'], "3"),
+                               'holiday_comments' => $content['comments']
                        );
 
                        // Send mail to user
-                       $msg = LOAD_EMAIL_TEMPLATE("member_holiday_unlock", $content, $uid);
-                       SEND_EMAIL($uid, HOLIDAY_MEMBER_UNLOCK_SUBJ, $msg);
+                       $msg = LOAD_EMAIL_TEMPLATE("member_holiday_unlock", $content, $content['userid']);
+                       SEND_EMAIL($content['userid'], getMessage('HOLIDAY_MEMBER_UNLOCK_SUBJ'), $msg);
 
                        // Remember userid for admin
-                       $admin .= $uid."\n";
-               }
+                       $admin .= $content['userid']."\n";
+               } // END - if
 
                // Send mail to admins
-               SEND_ADMIN_NOTIFICATION(HOLIDAY_ADMIN_UNLOCK_SUBJ, "admin_holiday_unlock", $admin, "0");
-       }
+               SEND_ADMIN_NOTIFICATION(getMessage('HOLIDAY_ADMIN_UNLOCK_SUBJ'), "admin_holiday_unlock", $admin, "0");
+
+               // Run all SQLs
+               runFilterChain('run_sqls');
+       } // END - if
 
        // Free memory
        SQL_FREERESULT($result_stop);