X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fyoomedia_functions.php;h=41ea321a7f24ec44204e5069f09c985257954e14;hb=b8c86fa12322603c24a88ea2b0fd3dbeba612752;hp=04deb26e9d62b6a78f81606d8ecfce8f269bc077;hpb=bf01243fde80bcd43029376788dc3ec341620c6d;p=mailer.git

diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index 04deb26e9d..41ea321a7f 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,23 +46,23 @@ function YOOMEDIA_TEST_CONFIG ($data) {
 	} // END - if
 
 	// Transfer config data
-	$_CONFIG = array_merge($_CONFIG, $data);
+	mergeConfig($data);
 
 	// Temporary allow maximum
-	$_CONFIG['yoomedia_tm_max_reload']    = 1000;
-	$_CONFIG['yoomedia_tm_min_wait']      = 0;
-	$_CONFIG['yoomedia_tm_clicks_remain'] = 10;
-	$_CONFIG['yoomedia_tm_min_pay']       = 0;
-	$_CONFIG['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!
-	$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) {
 		// Queries depleted (as we count here!)
-		DEBUG_LOG(__FUNCTION__, __LINE__, " Requested depleted. Maxmimum was: ".$_CONFIG['yoomedia_requests_total']);
+		DEBUG_LOG(__FUNCTION__, __LINE__, " Requested depleted. Maxmimum was: ".getConfig('yoomedia_requests_total'));
 	} elseif (count($response) <= 10) {
 		// Log serialized raw response
 		DEBUG_LOG(__FUNCTION__, __LINE__, " Raw response=".base64_encode(serialize($response)));
@@ -76,24 +74,22 @@ function YOOMEDIA_TEST_CONFIG ($data) {
 
 // Queries the given Yoo!Media API 2.0 script
 function YOOMEDIA_QUERY_API ($script, $countQuery = true) {
-	global $_CONFIG;
-
 	// Init response array
 	$response = array();
 
 	// Enougth queries left?
-	if (($_CONFIG['yoomedia_requests_remain'] > 0) || (!$countQuery)) {
+	if ((getConfig('yoomedia_requests_remain') > 0) || (!$countQuery)) {
 		// 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($_CONFIG['yoomedia_id']),
-			bigintval($_CONFIG['yoomedia_sid']),
-			$_CONFIG['yoomedia_passwd'],
-			bigintval($_CONFIG['yoomedia_tm_max_reload']),
-			bigintval($_CONFIG['yoomedia_tm_min_wait']),
-			bigintval($_CONFIG['yoomedia_tm_clicks_remain']),
-			bigintval($_CONFIG['yoomedia_tm_min_pay']),
-			bigintval($_CONFIG['yoomedia_erotic_allowed'])
+			bigintval(getConfig('yoomedia_id')),
+			bigintval(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'))
 		);
 
 		// Run the query
@@ -173,8 +169,6 @@ function YOOMEDIA_PARSE_RESPONSE ($response, $type) {
 
 // Prepares a bonus mail for delivery. Works only if extension "bonus" is active
 function YOOMEDIA_PREPARE_MAIL_DELIVERY ($data) {
-	global $_CONFIG;
-
 	// Is this an admin?
 	if (!IS_ADMIN()) {
 		// Abort here
@@ -194,7 +188,7 @@ function YOOMEDIA_PREPARE_MAIL_DELIVERY ($data) {
 	if ($data['reward'] < 1) $data['reward'] = 1;
 
 	// Add website id
-	$data['sid'] = $_CONFIG['yoomedia_sid'];
+	$data['sid'] = getConfig('yoomedia_sid');
 
 	// Add total receivers
 	$data['all'] = TRANSLATE_COMMA(GET_TOTAL_RECEIVERS());
@@ -208,8 +202,6 @@ function YOOMEDIA_PREPARE_MAIL_DELIVERY ($data) {
 
 // Adds the mail to the bonus mail pool
 function YOOMEDIA_SEND_BONUS_MAIL ($data, $mode) {
-	global $_CONFIG;
-
 	// Is this an admin?
 	if (!IS_ADMIN()) {
 		// Abort here
@@ -248,8 +240,8 @@ 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')",
-			array($mode, bigintval($data['id']), bigintval($data['reload'])), __FILE__, __LINE__);
+		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'])), __FUNCTION__, __LINE__);
 	} // END - if
 }
 
@@ -259,8 +251,8 @@ 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",
-		array($mode, bigintval($data['id'])), __FILE__, __LINE__);
+	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'])), __FUNCTION__, __LINE__);
 }
 
 // "Translates" the index number into an assosiative value
@@ -309,8 +301,8 @@ 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",
-		array($type, bigintval($id)), __FILE__, __LINE__);
+	$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)), __FUNCTION__, __LINE__);
 
 	// Entry found?
 	if (SQL_NUMROWS($result) == 1) {
@@ -320,8 +312,8 @@ 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",
-				array($id), __FILE__, __LINE__);
+			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_yoomedia_reload` WHERE id=%s LIMIT 1",
+				array($id), __FUNCTION__, __LINE__);
 		} else {
 			// Dont' sent again this mail
 			$reloaded = $time;
@@ -343,8 +335,8 @@ 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)",
-			array($mode, bigintval($data['id']), bigintval($data['reload'])), __FILE__, __LINE__);
+		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'])), __FUNCTION__, __LINE__);
 	} // END - if
 }