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

diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index 4b234a2463..69d4b301f7 100644
--- a/inc/libs/yoomedia_functions.php
+++ b/inc/libs/yoomedia_functions.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Spezielle Funktion fuer Yoo!Media-Erweiterung    *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -39,8 +44,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 +51,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 +62,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 +87,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 +246,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,20 +257,18 @@ 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
 function YOOMEDIA_TRANSLATE_INDEX ($type, $index) {
-	global $yoomediaTranslationTable;
-
 	// Default is the index
 	$return = $index;
 
 	// Is the element there?
-	if (isset($yoomediaTranslationTable[$type][$index])) {
+	if (isset($GLOBALS['translation_tables']['yoomedia'][$type][$index])) {
 		// Use this element
-		$return = $yoomediaTranslationTable[$type][$index];
+		$return = $GLOBALS['translation_tables']['yoomedia'][$type][$index];
 	} else {
 		// Not found!
 		DEBUG_LOG(__FUNCTION__, __LINE__, " type={$type},index={$index} not found.");
@@ -279,15 +280,13 @@ function YOOMEDIA_TRANSLATE_INDEX ($type, $index) {
 
 // "Translate" error code
 function YOOMEDIA_TRANSLATE_ERROR ($errorCode) {
-	global $yoomediaTranslationTable;
-
 	// Default is "failed"
 	$return = "failed";
 
 	// Is the entry there?
-	if (isset($yoomediaTranslationTable['error_codes'][$errorCode])) {
+	if (isset($GLOBALS['translation_tables']['yoomedia']['error_codes'][$errorCode])) {
 		// Entry found!
-		$return = $yoomediaTranslationTable['error_codes'][$errorCode];
+		$return = $GLOBALS['translation_tables']['yoomedia']['error_codes'][$errorCode];
 	} else {
 		// Log missing entries
 		DEBUG_LOG(__FUNCTION__, __LINE__, " errorCode={$errorCode}");
@@ -304,7 +303,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 +314,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 +337,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
 }