X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fyoomedia_functions.php;h=213b7fab04e99d8e043d950e5faca774a062fee2;hp=ff7b85a9b81310d10230f8be74aa23761998d25b;hb=596c8ab32594401ca84abfbfe35513ddfff31bec;hpb=56931cd9321119dd37372bd16d6c552857e40066

diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index ff7b85a9b8..213b7fab04 100644
--- a/inc/libs/yoomedia_functions.php
+++ b/inc/libs/yoomedia_functions.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -41,27 +41,26 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Queries the given Yoo!Media API 2.0 script
-function YOOMEDIA_QUERY_API ($script, $countQuery = true) {
+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')
+	if ((getConfig('yoomedia_requests_remain') > 0) || ($countQuery === FALSE)) {
+		// Prepare request array
+		$requestData = array(
+			'id'         => getConfig('yoomedia_id'),
+			'sid'        => getConfig('yoomedia_sid'),
+			'pw'         => getConfig('yoomedia_passwd'),
+			'reload'     => getConfig('yoomedia_tm_max_reload'),
+			'ma'         => getConfig('yoomedia_tm_min_wait'),
+			'uebrig'     => getConfig('yoomedia_tm_clicks_remain'),
+			'verguetung' => getConfig('yoomedia_tm_min_pay'),
+			'erotik'     => getConfig('yoomedia_erotic_allowed')
 		);
 
 		// Run the query
-		$response = sendGetRequest($requestString);
+		$response = sendGetRequest('http://www.yoomedia.de/interface_2.0/' . $script, $requestData, TRUE);
 
 		// Convert from ISO to UTF-8 only if count is > 3 because <= 3 means timeout
 		if (count($response) > 3) {
@@ -69,19 +68,11 @@ function YOOMEDIA_QUERY_API ($script, $countQuery = true) {
 			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) {
+		if ($countQuery === TRUE) {
 			// Then update the config!
 			updateConfiguration('yoomedia_requests_remain', 1, '-');
 		} // END - if
@@ -96,48 +87,47 @@ function YOOMEDIA_TEST_CONFIG ($data) {
 	// Is this admin?
 	if (!isAdmin()) {
 		// No admin!
-		return false;
+		return FALSE;
 	} // END - if
 
-	// Transfer config data
+	// Remove 'ok'
+	unset($data['ok']);
+
+	// Merge config
 	mergeConfig($data);
 
 	// Temporary allow maximum
-	setConfigEntry('yoomedia_tm_max_reload'   , 100000);
-	setConfigEntry('yoomedia_tm_min_wait'     , 0);
-	setConfigEntry('yoomedia_tm_clicks_remain', 10);
-	setConfigEntry('yoomedia_tm_min_pay'      , 0);
-	setConfigEntry('yoomedia_erotic_allowed'  , 1);
+	setConfigEntry('yoomedia_tm_max_reload'   , '100000');
+	setConfigEntry('yoomedia_tm_min_wait'     , '1000');
+	setConfigEntry('yoomedia_tm_clicks_remain', '10');
+	setConfigEntry('yoomedia_tm_min_pay'      , '0.00001');
+	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
 
 	// Default error code is 0 = all fine!
 	$errorCode = YOOMEDIA_GET_ERRORCODE_FROM_RESULT($response);
 
 	// Log the response if failed
-	if (count($response) == 0) {
+	if ((count($response) == 0) && ($errorCode > 0)) {
 		// Queries depleted (as we count here!)
-		logDebugMessage(__FUNCTION__, __LINE__, 'Requested depleted. Maxmimum was: ' . getConfig('yoomedia_requests_total'));
-		$errorCode = -1;
-	} elseif (!isset($response[8])) {
-		// Invalid response
-		logDebugMessage(__FUNCTION__, __LINE__, 'Missing response line [8]. Raw response=' . base64_encode(serialize($response)));
+		logDebugMessage(__FUNCTION__, __LINE__, 'Requested depleted. Maxmimum was: ' . getConfig('yoomedia_requests_total') . ',errorCode=' . $errorCode);
 		$errorCode = -1;
 	} elseif ((($errorCode <= 4) && ($errorCode > 0)) || ($errorCode >= 8)) {
 		// An error has returned from the account
 		logDebugMessage(__FUNCTION__, __LINE__, 'Unexpected error code ' . $errorCode . ' received.');
-	} elseif (count($response) < 9) {
+	} elseif ((count($response) > 0) && ($errorCode != 0)) {
 		// Log serialized raw response
-		logDebugMessage(__FUNCTION__, __LINE__, 'Raw response=' . base64_encode(serialize($response)));
+		logDebugMessage(__FUNCTION__, __LINE__, 'errorCode=' . $errorCode . ',response=' . base64_encode(serialize($response)));
 		$errorCode = -1;
 	} else {
 		// This is fine, because the result array is okay and the response code on element 8 is fine
 		$errorCode = '0';
 	}
 
-	// Do we have some data there?
+	// Is some data there?
 	return ($errorCode == '0');
 }
 
@@ -147,8 +137,13 @@ function YOOMEDIA_GET_PARSED_RESULT_TEXTMAILS () {
 	// Get the raw response
 	$response = YOOMEDIA_QUERY_API('out_textmail.php');
 
+	// By default an empty result is returned
+	$result = array();
+
 	// Parse the response
-	$result = YOOMEDIA_PARSE_RESPONSE($response, 'textmail');
+	if (count($response) > 0) {
+		$result = YOOMEDIA_PARSE_RESPONSE($response, 'textmail');
+	} // END - if
 
 	// Return result
 	return $result;
@@ -165,12 +160,12 @@ function YOOMEDIA_PARSE_RESPONSE ($response, $type) {
 	// If we have no result, abort here
 	if (count($dummy) == 0) {
 		// Empty response from API
-		logDebugMessage(__FUNCTION__, __LINE__, 'Empy result from API received.');
+		reportBug(__FUNCTION__, __LINE__, 'Empty result from API received. response()=' . count($response) . ',type=' . $type);
 		return array();
 	} // END - if
 
 	// The result is now still raw, so we must split it up and trim spaces away
-	$responseLine = trim(implode("\n", $dummy));
+	$responseLine = trim(implode(chr(10), $dummy));
 
 	// Last line should never be a pipe!
 	if (substr($responseLine, -1, 1) == '|') {
@@ -206,34 +201,38 @@ function YOOMEDIA_PREPARE_MAIL_DELIVERY ($data) {
 	// Is this an admin?
 	if (!isAdmin()) {
 		// Abort here
-		return false;
+		return FALSE;
 	} elseif (!isExtensionActive('bonus')) {
 		// Abort here
-		return false;
+		return FALSE;
 	}
 
 	// Is the waiting time below one second? Then fix it to one (zero seconds are not yet supported!)
-	if ($data['wait'] < 1) $data['wait'] = 1;
+	if ($data['wait'] < 1) {
+		$data['wait'] = 1;
+	} // END - if
 
 	// Half of waiting time is a good reward!
 	$data['reward'] = round($data['wait'] / 2 + 0.4);
 
 	// Is the reward below one?
-	if ($data['reward'] < 1) $data['reward'] = 1;
+	if ($data['reward'] < 1) {
+		$data['reward'] = 1;
+	} // END - if
 
 	// Load template
-	loadTemplate('admin_send_yoomedia', false, $data);
+	loadTemplate('admin_send_yoomedia', FALSE, $data);
 }
 
 // Adds the mail to the bonus mail pool
-function YOOMEDIA_SEND_BONUS_MAIL ($data, $mode) {
+function YOOMEDIA_SEND_BONUS_MAIL ($data, $mailMode) {
 	// Is this an admin?
 	if (!isAdmin()) {
 		// Abort here
-		return false;
+		return FALSE;
 	} elseif (!isExtensionActive('bonus')) {
 		// Abort here
-		return false;
+		return FALSE;
 	}
 
 	// Add dummy receiver to avoid notice
@@ -241,7 +240,7 @@ function YOOMEDIA_SEND_BONUS_MAIL ($data, $mode) {
 
 	// HTML or normal? (normal is default...)
 	$type = 't';
-	if (($mode == 'html') && (isExtensionActive('html_mail'))) $type = 'h';
+	if (($mailMode == 'html') && (isExtensionActive('html_mail'))) $type = 'h';
 
 	// Auto-generate URL
 	$data['url'] = sprintf("http://www.yoomedia.de/code/%s-mail.php?id=%s&sid=%s",
@@ -251,23 +250,23 @@ function YOOMEDIA_SEND_BONUS_MAIL ($data, $mode) {
 	);
 
 	// Lock this mail for new delivery
-	YOOMEDIA_RELOAD_LOCK($data, $mode);
+	YOOMEDIA_RELOAD_LOCK($data, $mailMode);
 
 	// Call the lower function
-	addNewBonusMail($data, $mode);
+	addNewBonusMail($data, $mailMode);
 }
 
 // Lockdown given id
-function YOOMEDIA_EXCLUDE_MAIL ($data, $mode) {
+function YOOMEDIA_EXCLUDE_MAIL ($data, $mailMode) {
 	// Search for the entry
-	if (YOOMEDIA_CHECK_RELOAD($data['id'], $data['reload'], $mode) === false) {
+	if (YOOMEDIA_CHECK_RELOAD($data['id'], $data['reload'], $mailMode) === FALSE) {
 		// Convert mode for mails
-		$mode = YOOMEDIA_CONVERT_MODE($mode);
+		$mailMode = YOOMEDIA_CONVERT_MODE($mailMode);
 
 		// 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,
+				$mailMode,
 				bigintval($data['id']),
 				bigintval($data['reload'])
 			), __FUNCTION__, __LINE__);
@@ -275,13 +274,13 @@ function YOOMEDIA_EXCLUDE_MAIL ($data, $mode) {
 }
 
 // Remove lock of given mail
-function YOOMEDIA_UNLIST_MAIL ($data, $mode) {
+function YOOMEDIA_UNLIST_MAIL ($data, $mailMode) {
 	// Convert mode for mails
-	$mode = YOOMEDIA_CONVERT_MODE($mode);
+	$mailMode = YOOMEDIA_CONVERT_MODE($mailMode);
 
 	// 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'])), __FUNCTION__, __LINE__);
+		array($mailMode, bigintval($data['id'])), __FUNCTION__, __LINE__);
 }
 
 // "Translates" the index number into an assosiative value
@@ -313,7 +312,7 @@ function translateYooMediaError ($errorCode) {
 		$return = $GLOBALS['translation_tables']['yoomedia']['error_codes'][$errorCode];
 	} else {
 		// Log missing entries
-		debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown error code <strong>%s[%s]</strong> detected.", $errorCode, gettype($errorCode)));
+		reportBug(__FUNCTION__, __LINE__, sprintf("Unknown error code <strong>%s[%s]</strong> detected.", $errorCode, gettype($errorCode)));
 	}
 
 	// Return value
@@ -323,7 +322,7 @@ function translateYooMediaError ($errorCode) {
 // Checks if the mail id is in reload lock
 function YOOMEDIA_CHECK_RELOAD ($id, $reload, $type) {
 	// Default is not in reload lock
-	$reloaded = false;
+	$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",
@@ -353,37 +352,40 @@ function YOOMEDIA_CHECK_RELOAD ($id, $reload, $type) {
 }
 
 // Lock given mail down for reload lock
-function YOOMEDIA_RELOAD_LOCK ($data, $mode) {
+function YOOMEDIA_RELOAD_LOCK ($data, $mailMode) {
 	// Search for the entry
-	if (YOOMEDIA_CHECK_RELOAD($data['id'], $data['reload'], $mode) === false) {
+	if (YOOMEDIA_CHECK_RELOAD($data['id'], $data['reload'], $mailMode) === FALSE) {
 		// Convert mode for mails
-		$mode = YOOMEDIA_CONVERT_MODE($mode);
+		$mailMode = YOOMEDIA_CONVERT_MODE($mailMode);
 
 		// 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'])), __FUNCTION__, __LINE__);
+			array($mailMode, bigintval($data['id']), bigintval($data['reload'])), __FUNCTION__, __LINE__);
 	} // END - if
 }
 
 // Convert mode for mails
-function YOOMEDIA_CONVERT_MODE ($mode) {
+function YOOMEDIA_CONVERT_MODE ($mailMode) {
 	// Convert mode for normal/html
-	switch ($mode) {
+	switch ($mailMode) {
 		case 'normal':
-			$mode = 'textmail';
+			$mailMode = 'textmail';
 			break;
 
 		case 'html':
-			$mode = 'htmlmail';
+			$mailMode = 'htmlmail';
 			break;
 	} // END - switch
 
 	// Return result
-	return $mode;
+	return $mailMode;
 }
 
 // Extract code from response
 function YOOMEDIA_GET_ERRORCODE_FROM_RESULT ($response) {
+	// The response must be an array
+	assert(is_array($response));
+
 	// Bad code as default
 	$code = -999;
 
@@ -394,32 +396,44 @@ function YOOMEDIA_GET_ERRORCODE_FROM_RESULT ($response) {
 
 		// Use only the first element
 		$code = bigintval($codeArray[0]);
-	} elseif ((is_array($response[0])) && (isset($response[0]['id']))) {
-		// Begin with extraction
-		$codeArray = explode(' ', $response[0]['id']);
-		$code = $codeArray[0];
-		$codeArray = explode('<br />', $code);
-		$code = $codeArray[0];
-		$codeArray = explode('<br>', $code);
-		$code = $codeArray[0];
-
-		// Remove all new-line characters
-		$codeArray = explode("\n", $code);
-		$code = $codeArray[0];
-
-		// Remove carrige-return
-		$code = str_replace("\n", '', $code);
-
-	} elseif (count($response) < 9) {
+	} elseif (!empty($response[0])) {
+		// Merge response together
+		$parts = explode('|', implode('', $response));
+
+		// If we have only one part, we got an error
+		if (count($parts) > 1) {
+			// All fine
+			$code = '0';
+		} else {
+			// Begin with extraction of error code
+			$codeArray = explode(' ', $response[0]);
+			$code = $codeArray[0];
+			$codeArray = explode('<br />', $code);
+			$code = $codeArray[0];
+			$codeArray = explode('<br>', $code);
+			$code = $codeArray[0];
+
+			// Remove all new-line characters
+			$codeArray = explode(chr(10), $code);
+			$code = $codeArray[0];
+
+			// Remove carrige-return
+			$code = trim(str_replace(chr(10), '', $code));
+
+			// Is it still empty?
+			if (empty($code)) {
+				// Then fix it
+				$code = -999;
+			} // END - if
+		}
+	} elseif (count($response) == 0) {
+		// All fine, but empty result
+		$code = '0';
+	} else {
 		// Should not happen!
-		debug_report_bug(__FUNCTION__, __LINE__, 'Cannot parse response. Raw response:<pre>' . print_r($response, true) . '</pre>');
+		reportBug(__FUNCTION__, __LINE__, 'Cannot parse response. Raw response:<pre>' . print_r($response, TRUE) . '</pre>');
 	}
 
-	// Fix empty code to bad
-	if (empty($code)) {
-		$code = -999;
-	} // END - if
-
 	// Return error code
 	return $code;
 }