X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fyoomedia_functions.php;h=a91329b4e9415a86e39f079131cfe6d2a7ad3adc;hb=09f5758c42a33a56bdd461c946ffe759a59c54aa;hp=75a0362ebc9b8350c9342ea5cd2b754d57bff618;hpb=566cbcf381d60410b4c5b3a2fc4cd7bfdf49b8fc;p=mailer.git

diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index 75a0362ebc..a91329b4e9 100644
--- a/inc/libs/yoomedia_functions.php
+++ b/inc/libs/yoomedia_functions.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -39,6 +40,57 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
+} // END - if
+
+// Queries the given Yoo!Media API 2.0 script
+function YOOMEDIA_QUERY_API ($script, $countQuery = true) {
+	// Init response array
+	$response = array();
+
+	// Enougth queries left?
+	if ((getConfig('yoomedia_requests_remain') > 0) || ($countQuery === false)) {
+		// 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,
+			getConfig('yoomedia_id'),
+			getConfig('yoomedia_sid'),
+			getConfig('yoomedia_passwd'),
+			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
+		$response = sendGetRequest($requestString);
+
+		// Convert from ISO to UTF-8 only if count is > 3 because <= 3 means timeout
+		if (count($response) > 3) {
+			// Convert all lines to UTF-8
+			foreach ($response as $k => $v) {
+				// Convert the line
+				$response[$k] = iconv('windows-1252', 'UTF-8//TRANSLIT', $v);
+				/*
+				// iconv()-less ISO-8859-1 -> UTF-8
+				$response[$k] = preg_replace(
+					"/([\x80-\xFF])/e",
+					"chr(0xC0|ord('\\1')>>6).chr(0x80|ord('\\1')&0x3F)",
+					$v
+				);
+				*/
+			} // END - foreach
+		} // END - if
+
+		// Shall we count the query as used?
+		if ($countQuery === true) {
+			// Then update the config!
+			updateConfiguration('yoomedia_requests_remain', 1, '-');
+		} // END - if
+	} // END - if
+
+	// Return the data
+	return $response;
 }
 
 // Test if the extension settings did work
@@ -91,53 +143,6 @@ function YOOMEDIA_TEST_CONFIG ($data) {
 	return ($errorCode == '0');
 }
 
-// Queries the given Yoo!Media API 2.0 script
-function YOOMEDIA_QUERY_API ($script, $countQuery = true) {
-	// Init response array
-	$response = array();
-
-	// Enougth queries left?
-	if ((getConfig('yoomedia_requests_remain') > 0) || ($countQuery === false)) {
-		// 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,
-			getConfig('yoomedia_id'),
-			getConfig('yoomedia_sid'),
-			getConfig('yoomedia_passwd'),
-			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
-		$response = sendGetRequest($requestString);
-
-		// Convert from ISO to UTF-8
-		foreach ($response as $k => $v) {
-			$response[$k] = iconv('windows-1252', 'UTF-8//TRANSLIT', $v);
-			/*
-			// iconv()-less ISO-8859-1 -> UTF-8
-			$response[$k] = preg_replace(
-				"/([\x80-\xFF])/e",
-				"chr(0xC0|ord('\\1')>>6).chr(0x80|ord('\\1')&0x3F)",
-				$v
-			);
-			*/
-		} // END - if
-
-		// Shall we count the query as used?
-		if ($countQuery === true) {
-			// Then update the config!
-			updateConfiguration('yoomedia_requests_remain', 1, '-');
-		} // END - if
-	} // END - if
-
-	// Return the data
-	return $response;
-}
-
 // "Getter" for a parsed result for all text mails. This means an array without
 // the header lines will be returned
 function YOOMEDIA_GET_PARSED_RESULT_TEXTMAILS () {
@@ -428,7 +433,7 @@ function YOOMEDIA_GET_ERRORCODE_FROM_RESULT ($response) {
 		$code = str_replace("\n", '', $code);
 	} else {
 		// Should not happen!
-		logDebugMessage(__FUNCTION__, __LINE__, 'Cannot parse response. Raw response=' . base64_encode(serialize($response)));
+		debug_report_bug('Cannot parse response. Raw response:<pre>' . print_r($response, true) . '</pre>');
 	}
 
 	// Return error code