X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fyoomedia_functions.php;h=4307dc6bda166278c0a53316800032f1b662a090;hp=85ef0445f46b2719a2eefd15d3ca2d42c93b5474;hb=1c28686d33a76fa9e3e5bd90f737b20bfe211575;hpb=7618bd22d09e9bddab2ca39308f6523c06dd1521

diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index 85ef0445f4..4307dc6bda 100644
--- a/inc/libs/yoomedia_functions.php
+++ b/inc/libs/yoomedia_functions.php
@@ -14,11 +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, 2010 by Mailer Developer Team                    *
+ * 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 *
@@ -162,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) {
@@ -185,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
 
@@ -304,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.");
 	}
 
@@ -319,7 +309,7 @@ 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
@@ -420,7 +410,7 @@ function YOOMEDIA_GET_ERRORCODE_FROM_RESULT ($response) {
 		// Remove carrige-return
 		$code = str_replace("\n", '', $code);
 
-	} else {
+	} elseif (count($response) < 9) {
 		// Should not happen!
 		debug_report_bug(__FUNCTION__, __LINE__, 'Cannot parse response. Raw response:<pre>' . print_r($response, true) . '</pre>');
 	}