Extension ext-network continued:

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

diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php
index bd09b0a29e3a0ce5f2ff75ba029ad3bb36248927..8b5c02d71124dbfad78f178bb7cbb9788a08b3d6 100644 (file)
--- a/inc/libs/holiday_functions.php
+++ b/inc/libs/holiday_functions.php
@@ -44,7 +44,10 @@ if (!defined('__SECURITY')) {
 function stopHolidays () {
        // Let's find some expired holiday requests...
        $result_stop = SQL_QUERY("SELECT
-       `userid`,`holiday_start`,`holiday_end`,`comments`
+       `userid`,
+       `holiday_start`,
+       `holiday_end`,
+       `comments`
 FROM
        `{?_MYSQL_PREFIX?}_user_holidays`
 WHERE
@@ -62,7 +65,7 @@ ORDER BY
                while ($content = SQL_FETCHARRAY($result_stop)) {
                        // Stop holiday
                        addSql(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
                        addSql(SQL_QUERY_ESC("UPDATE
@@ -73,7 +76,7 @@ SET
 WHERE
        `userid`=%s
 LIMIT 1",
-                               array(bigintval($content['userid'])), __FUNCTION__, __LINE__, false));
+                               array(bigintval($content['userid'])), __FUNCTION__, __LINE__, FALSE));
 
                        // Prepare array
                        $content = merge_array($content, array(
@@ -87,7 +90,7 @@ LIMIT 1",
                        sendEmail($content['userid'], '{--MEMBER_HOLIDAY_UNLOCK_SUBJECT--}', $message);
 
                        // Remember userid for admin
-                       $admin .= $content['userid'].chr(10);
+                       $admin .= $content['userid'] . PHP_EOL;
                } // END - if
 
                // Send mail to admins
@@ -101,5 +104,21 @@ LIMIT 1",
        SQL_FREERESULT($result_stop);
 }
 
+// ----------------------------------------------------------------------------
+//                 Wrapper functions for configuration entries
+// ----------------------------------------------------------------------------
+
+// Getter for user_alpha
+function getHolidayLock () {
+       // Is there cache?
+       if (!isset($GLOBALS[__FUNCTION__])) {
+               // Determine it
+               $GLOBALS[__FUNCTION__] = getConfig('holiday_lock');
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__];
+}
+
 // [EOF]
 ?>