X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fyoomedia_functions.php;h=4307dc6bda166278c0a53316800032f1b662a090;hb=330dbb3e2b34450cd1665497506455e195a0a166;hp=a0e9c5a70fffe1b4d5f16bfd82e840b0d05b60d2;hpb=6a545ced209c14b75d2dc04f43ee010e9ae9b47c;p=mailer.git

diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index a0e9c5a70f..4307dc6bda 100644
--- a/inc/libs/yoomedia_functions.php
+++ b/inc/libs/yoomedia_functions.php
@@ -14,10 +14,9 @@
  * $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 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -118,7 +117,7 @@ function YOOMEDIA_TEST_CONFIG ($data) {
 	$errorCode = YOOMEDIA_GET_ERRORCODE_FROM_RESULT($response);
 
 	// Log the response if failed
-	if (count($response) == '0') {
+	if (count($response) == 0) {
 		// Queries depleted (as we count here!)
 		logDebugMessage(__FUNCTION__, __LINE__, 'Requested depleted. Maxmimum was: ' . getConfig('yoomedia_requests_total'));
 		$errorCode = -1;
@@ -161,17 +160,7 @@ function YOOMEDIA_PARSE_RESPONSE ($response, $type) {
 	$result = array();
 
 	// Cut off the header
-	$dummy = $response;
-	foreach ($response as $line) {
-		// Remove line
-		array_shift($dummy);
-
-		// Is this line empty?
-		if (empty($line)) {
-			// Then stop here
-			break;
-		} // END - if
-	} // END - foreach
+	$dummy = removeHttpHeaderFromResponse($response);
 
 	// If we have no result, abort here
 	if (count($dummy) == 0) {
@@ -184,25 +173,27 @@ function YOOMEDIA_PARSE_RESPONSE ($response, $type) {
 	$responseLine = trim(implode("\n", $dummy));
 
 	// Last line should never be a pipe!
-	if (substr($responseLine, -1, 1) == '|') $responseLine = substr($responseLine, 0, -1);
+	if (substr($responseLine, -1, 1) == '|') {
+		$responseLine = substr($responseLine, 0, -1);
+	} // END - if
 
 	// Now, explode all in one array
 	$dataArray = explode('|', $responseLine);
 
 	// Now make the result array with two dimensions
-	$cnt = '0'; $entry = '0';
+	$count = '0'; $entry = '0';
 	foreach ($dataArray as $line) {
 		// Add the line
-		$result[$entry][yoomediaTranslateIndex($type, $cnt)] = $line;
+		$result[$entry][yoomediaTranslateIndex($type, $count)] = $line;
 
 		// End of data of first entry reached?
-		if ($cnt == 6) {
+		if ($count == 6) {
 			// Then advance to next entry and reset counter
 			$entry++;
-			$cnt = '0';
+			$count = '0';
 		} else {
 			// Count up
-			$cnt++;
+			$count++;
 		}
 	} // END - foreach
 
@@ -230,18 +221,6 @@ function YOOMEDIA_PREPARE_MAIL_DELIVERY ($data) {
 	// Is the reward below one?
 	if ($data['reward'] < 1) $data['reward'] = 1;
 
-	// Add website id
-	$data['sid'] = getConfig('yoomedia_sid');
-
-	// Add total receivers
-	$data['all'] = translateComma(getTotalReceivers());
-
-	// Add categories
-	$data['categories'] = generateCategoryOptionsList('normal');
-
-	// Decode entities
-	$data['text'] = decodeEntities($data['text']);
-
 	// Load template
 	loadTemplate('admin_send_yoomedia', false, $data);
 }
@@ -315,7 +294,7 @@ function yoomediaTranslateIndex ($type, $index) {
 		// Use this element
 		$return = $GLOBALS['translation_tables']['yoomedia'][$type][$index];
 	} else {
-		// Not found!
+		// Not found
 		logDebugMessage(__FUNCTION__, __LINE__, "type={$type},index={$index} not found.");
 	}
 
@@ -330,11 +309,11 @@ function translateYooMediaError ($errorCode) {
 
 	// Is the entry there?
 	if (isset($GLOBALS['translation_tables']['yoomedia']['error_codes'][$errorCode])) {
-		// Entry found!
+		// Entry found
 		$return = $GLOBALS['translation_tables']['yoomedia']['error_codes'][$errorCode];
 	} else {
 		// Log missing entries
-		debug_report_bug(sprintf("Unknown error code <strong>%s</strong> detected.", $errorCode));
+		debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown error code <strong>%s[%s]</strong> detected.", $errorCode, gettype($errorCode)));
 	}
 
 	// Return value
@@ -359,7 +338,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), __FUNCTION__, __LINE__);
+				array($id), __FUNCTION__, __LINE__);
 		} else {
 			// Dont' sent again this mail
 			$reloaded = $time;
@@ -430,11 +409,17 @@ function YOOMEDIA_GET_ERRORCODE_FROM_RESULT ($response) {
 
 		// Remove carrige-return
 		$code = str_replace("\n", '', $code);
-	} else {
+
+	} elseif (count($response) < 9) {
 		// Should not happen!
-		logDebugMessage(__FUNCTION__, __LINE__, 'Cannot parse response. Raw response=' . base64_encode(serialize($response)));
+		debug_report_bug(__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;
 }