X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fyoomedia_functions.php;h=61116d9bba26b081ccf492f427f7e90b9d5084d8;hp=4b234a24638af97de7c6e6b1a74fa5ff8471f2a4;hb=b7aada7890a3c7d1c1da4d2b36d8d7683fa61c06;hpb=8f60465485bd5e9ab2c0ddfa1f054458cf510042

diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index 4b234a2463..61116d9bba 100644
--- 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,7 +46,7 @@ function YOOMEDIA_TEST_CONFIG ($data) {
 	} // END - if
 
 	// Transfer config data
-	$_CONFIG = merge_array($_CONFIG, $data);
+	mergeConfig($data);
 
 	// Temporary allow maximum
 	setConfigEntry('yoomedia_tm_max_reload'   , 1000);
@@ -59,7 +57,7 @@ function YOOMEDIA_TEST_CONFIG ($data) {
 
 	// Query the API with a test request without couting it
 	// If zero reply comes back the data is invalid!
-	$response = YOOMEDIA_QUERY_API("out_textmail.php", true); // TODO Ask Yoo!Media for test script
+	$response = YOOMEDIA_QUERY_API("out_textmail.php", true); // @TODO Ask Yoo!Media for test script
 
 	// Log the response if failed
 	if (count($response) == 0) {
@@ -84,14 +82,14 @@ function YOOMEDIA_QUERY_API ($script, $countQuery = true) {
 		// Prepare the low-level request
 		$requestString = sprintf("http://www.yoomedia.de/interface_2.0/%s?id=%s&sid=%s&pw=%s&reload=%s&ma=%s&uebrig=%s&verguetung=%s&erotik=%s",
 			$script,
-			bigintval(getConfig('yoomedia_id')),
-			bigintval(getConfig('yoomedia_sid')),
+			getConfig(('yoomedia_id')),
+			getConfig(('yoomedia_sid')),
 			getConfig('yoomedia_passwd'),
-			bigintval(getConfig('yoomedia_tm_max_reload')),
-			bigintval(getConfig('yoomedia_tm_min_wait')),
-			bigintval(getConfig('yoomedia_tm_clicks_remain')),
-			bigintval(getConfig('yoomedia_tm_min_pay')),
-			bigintval(getConfig('yoomedia_erotic_allowed'))
+			getConfig(('yoomedia_tm_max_reload')),
+			getConfig(('yoomedia_tm_min_wait')),
+			getConfig(('yoomedia_tm_clicks_remain')),
+			getConfig(('yoomedia_tm_min_pay')),
+			getConfig(('yoomedia_erotic_allowed'))
 		);
 
 		// Run the query
@@ -243,7 +241,7 @@ function YOOMEDIA_EXCLUDE_MAIL ($data, $mode) {
 
 		// Add the entry
 		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__);
+			array($mode, bigintval($data['id']), bigintval($data['reload'])), __FUNCTION__, __LINE__);
 	} // END - if
 }
 
@@ -254,7 +252,7 @@ function YOOMEDIA_UNLIST_MAIL ($data, $mode) {
 
 	// Add the entry
 	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__);
+		array($mode, bigintval($data['id'])), __FUNCTION__, __LINE__);
 }
 
 // "Translates" the index number into an assosiative value
@@ -304,7 +302,7 @@ function YOOMEDIA_CHECK_RELOAD ($id, $reload, $type) {
 
 	// 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",
-		array($type, bigintval($id)), __FILE__, __LINE__);
+		array($type, bigintval($id)), __FUNCTION__, __LINE__);
 
 	// Entry found?
 	if (SQL_NUMROWS($result) == 1) {
@@ -315,7 +313,7 @@ function YOOMEDIA_CHECK_RELOAD ($id, $reload, $type) {
 		if (((time() - $time) >= ($reload * 60*60)) && ($time > 0)) {
 			// Remove entry
 			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_yoomedia_reload` WHERE id=%s LIMIT 1",
-				array($id), __FILE__, __LINE__);
+				array($id), __FUNCTION__, __LINE__);
 		} else {
 			// Dont' sent again this mail
 			$reloaded = $time;
@@ -338,7 +336,7 @@ function YOOMEDIA_RELOAD_LOCK ($data, $mode) {
 
 		// Add the entry
 		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__);
+			array($mode, bigintval($data['id']), bigintval($data['reload'])), __FUNCTION__, __LINE__);
 	} // END - if
 }