Fixes for various bugs (e.g.: 'secret file could not be read', SQL error and more)

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

diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php
index b231b060468049186cc6d33be1874b75934139e0..340a5abac88052afbc85c42ed1bb3096e61f0f06 100644 (file)
--- a/inc/libs/holiday_functions.php
+++ b/inc/libs/holiday_functions.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,15 +43,18 @@ if (!defined('__SECURITY')) {
 // Stops all expired holidays
 function stopHolidays () {
        // Let's find some expired holiday requests...
-       $result_stop = SQL_QUERY("SELECT
-       `userid`,`holiday_start`,`holiday_end`,`comments`
+       $result_stop = sqlQuery("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_HASZERONUMS($result_stop)) {
+       if (!ifSqlHasZeroNums($result_stop)) {
                // We foud at least one
                $admin = '';
 
@@ -59,20 +62,21 @@ ORDER BY
                initSqls();
 
                // Process all found entries
-               while ($content = SQL_FETCHARRAY($result_stop)) {
+               while ($content = sqlFetchArray($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));
+                       addSql(sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_holidays` WHERE `userid`=%s LIMIT 1",
+                               array(bigintval($content['userid'])), __FUNCTION__, __LINE__, FALSE));
 
                        // Unlock account
-                       addSql(SQL_QUERY_ESC("UPDATE
+                       addSql(sqlQueryEscaped("UPDATE
        `{?_MYSQL_PREFIX?}_user_data`
 SET
-       `holiday_active`='N', `holiday_activated`=0
+       `holiday_active`='N',
+       `holiday_activated`=0
 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(
@@ -86,7 +90,7 @@ LIMIT 1",
                        sendEmail($content['userid'], '{--MEMBER_HOLIDAY_UNLOCK_SUBJECT--}', $message);
 
                        // Remember userid for admin
-                       $admin .= $content['userid']."\n";
+                       $admin .= $content['userid'] . PHP_EOL;
                } // END - if
 
                // Send mail to admins
@@ -97,7 +101,23 @@ LIMIT 1",
        } // END - if
 
        // Free memory
-       SQL_FREERESULT($result_stop);
+       sqlFreeResult($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]