X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fyoomedia_functions.php;h=a91329b4e9415a86e39f079131cfe6d2a7ad3adc;hb=09f5758c42a33a56bdd461c946ffe759a59c54aa;hp=47015d5224dec9c41f13347b9fcdf01170fb3185;hpb=f2736bc6457140146890877d992be862a78b259f;p=mailer.git
diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index 47015d5224..a91329b4e9 100644
--- a/inc/libs/yoomedia_functions.php
+++ b/inc/libs/yoomedia_functions.php
@@ -1,7 +1,7 @@
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
@@ -67,7 +119,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;
@@ -84,50 +136,11 @@ function YOOMEDIA_TEST_CONFIG ($data) {
$errorCode = -1;
} else {
// This is fine, because the result array is okay and the response code on element 8 is fine
- $errorCode = 0;
+ $errorCode = '0';
}
// Do we have some data there?
- 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('ISO-8859-1', 'UTF-8//TRANSLIT',$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;
+ return ($errorCode == '0');
}
// "Getter" for a parsed result for all text mails. This means an array without
@@ -161,6 +174,13 @@ function YOOMEDIA_PARSE_RESPONSE ($response, $type) {
} // END - if
} // END - foreach
+ // If we have no result, abort here
+ if (count($dummy) == 0) {
+ // Empty response from API
+ logDebugMessage(__FUNCTION__, __LINE__, 'Empy result from API received.');
+ 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));
@@ -171,7 +191,7 @@ function YOOMEDIA_PARSE_RESPONSE ($response, $type) {
$dataArray = explode('|', $responseLine);
// Now make the result array with two dimensions
- $cnt = 0; $entry = 0;
+ $cnt = '0'; $entry = '0';
foreach ($dataArray as $line) {
// Add the line
$result[$entry][yoomediaTranslateIndex($type, $cnt)] = $line;
@@ -180,7 +200,7 @@ function YOOMEDIA_PARSE_RESPONSE ($response, $type) {
if ($cnt == 6) {
// Then advance to next entry and reset counter
$entry++;
- $cnt = 0;
+ $cnt = '0';
} else {
// Count up
$cnt++;
@@ -239,7 +259,7 @@ function YOOMEDIA_SEND_BONUS_MAIL ($data, $mode) {
}
// Add dummy receiver to avoid notice
- $data['receiver'] = 0;
+ $data['receiver'] = '0';
// HTML or normal? (normal is default...)
$type = 't';
@@ -372,11 +392,11 @@ function YOOMEDIA_CONVERT_MODE ($mode) {
// Convert mode for normal/html
switch ($mode) {
case 'normal':
- $mode = "textmail";
+ $mode = 'textmail';
break;
case 'html':
- $mode = "htmlmail";
+ $mode = 'htmlmail';
break;
} // END - switch
@@ -392,17 +412,17 @@ function YOOMEDIA_GET_ERRORCODE_FROM_RESULT ($response) {
// Which response should we parse?
if ((isset($response[8])) && (count($response) == 9)) {
// Use error code from element 8 (mostly API errors)
- $codeArray = explode("
", $response[8]);
+ $codeArray = explode('
', $response[8]);
// 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']);
+ $codeArray = explode(' ', $response[0]['id']);
$code = $codeArray[0];
- $codeArray = explode("
", $code);
+ $codeArray = explode('
', $code);
$code = $codeArray[0];
- $codeArray = explode("
", $code);
+ $codeArray = explode('
', $code);
$code = $codeArray[0];
// Remove all new-line characters
@@ -413,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:
' . print_r($response, true) . ''); } // Return error code