Last references to now replaced with mergeConfig()

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

diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index 22a0fb9c6b63581017352520582112903acf56f4..9307272432fa2916a294906b7a56ce105dcfb871 100644 (file)
--- a/inc/libs/yoomedia_functions.php
+++ b/inc/libs/yoomedia_functions.php
@@ -39,8 +39,6 @@ if (!defined('__SECURITY')) {
 
 // Test if the extension settings did work
 function YOOMEDIA_TEST_CONFIG ($data) {
-       global $_CONFIG;
-
        // Is this admin?
        if (!IS_ADMIN()) {
                // No admin!
@@ -48,14 +46,14 @@ function YOOMEDIA_TEST_CONFIG ($data) {
        } // END - if
 
        // Transfer config data
-       $_CONFIG = merge_array($_CONFIG, $data);
+       mergeConfig($data);
 
        // Temporary allow maximum
-       getConfig('yoomedia_tm_max_reload')    = 1000;
-       getConfig('yoomedia_tm_min_wait')      = 0;
-       getConfig('yoomedia_tm_clicks_remain') = 10;
-       getConfig('yoomedia_tm_min_pay')       = 0;
-       getConfig('yoomedia_erotic_allowed')   = 1;
+       setConfigEntry('yoomedia_tm_max_reload'   , 1000);
+       setConfigEntry('yoomedia_tm_min_wait'     , 0);
+       setConfigEntry('yoomedia_tm_clicks_remain', 10);
+       setConfigEntry('yoomedia_tm_min_pay'      , 0);
+       setConfigEntry('yoomedia_erotic_allowed'  , 1);
 
        // Query the API with a test request without couting it
        // If zero reply comes back the data is invalid!
@@ -242,7 +240,7 @@ function YOOMEDIA_EXCLUDE_MAIL ($data, $mode) {
                $mode = YOOMEDIA_CONVERT_MODE($mode);
 
                // Add the entry
-               $result = SQL_QUERY_ESC("INSERT INTO `"._MYSQL_PREFIX."_yoomedia_reload` (`type`,`y_id`,`y_reload`,`inserted`) VALUES ('%s',%s,%s,'0000-00-00 00:00')",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_yoomedia_reload` (`type`,`y_id`,`y_reload`,`inserted`) VALUES ('%s',%s,%s,'0000-00-00 00:00')",
                        array($mode, bigintval($data['id']), bigintval($data['reload'])), __FILE__, __LINE__);
        } // END - if
 }
@@ -253,7 +251,7 @@ function YOOMEDIA_UNLIST_MAIL ($data, $mode) {
        $mode = YOOMEDIA_CONVERT_MODE($mode);
 
        // Add the entry
-       $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_yoomedia_reload` WHERE `type`='%s' AND `y_id`=%s LIMIT 1",
+       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_yoomedia_reload` WHERE `type`='%s' AND `y_id`=%s LIMIT 1",
                array($mode, bigintval($data['id'])), __FILE__, __LINE__);
 }
 
@@ -303,7 +301,7 @@ function YOOMEDIA_CHECK_RELOAD ($id, $reload, $type) {
        $reloaded = false;
 
        // Query database
-       $result = SQL_QUERY_ESC("SELECT `id`, UNIX_TIMESTAMP(`inserted`) AS inserted FROM `"._MYSQL_PREFIX."_yoomedia_reload` WHERE `type`='%s' AND `y_id`=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT `id`, UNIX_TIMESTAMP(`inserted`) AS inserted FROM `{!_MYSQL_PREFIX!}_yoomedia_reload` WHERE `type`='%s' AND `y_id`=%s LIMIT 1",
                array($type, bigintval($id)), __FILE__, __LINE__);
 
        // Entry found?
@@ -314,7 +312,7 @@ function YOOMEDIA_CHECK_RELOAD ($id, $reload, $type) {
                // Are we ready to sent again?
                if (((time() - $time) >= ($reload * 60*60)) && ($time > 0)) {
                        // Remove entry
-                       $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_yoomedia_reload WHERE id=%s LIMIT 1",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_yoomedia_reload` WHERE id=%s LIMIT 1",
                                array($id), __FILE__, __LINE__);
                } else {
                        // Dont' sent again this mail
@@ -337,7 +335,7 @@ function YOOMEDIA_RELOAD_LOCK ($data, $mode) {
                $mode = YOOMEDIA_CONVERT_MODE($mode);
 
                // Add the entry
-               $result = SQL_QUERY_ESC("INSERT INTO `"._MYSQL_PREFIX."_yoomedia_reload` (`type`,`y_id`,`y_reload`) VALUES ('%s',%s,%s)",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_yoomedia_reload` (`type`,`y_id`,`y_reload`) VALUES ('%s',%s,%s)",
                        array($mode, bigintval($data['id']), bigintval($data['reload'])), __FILE__, __LINE__);
        } // END - if
 }