Extension ext-network continued:

[mailer.git] / inc / libs / yoomedia_functions.php

diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index b153bd6f50037c01cfa13e0fb99db3484672994e..8a9889d3ead598d0fffc4223276c617cc6890625 100644 (file)
--- a/inc/libs/yoomedia_functions.php
+++ b/inc/libs/yoomedia_functions.php
@@ -90,15 +90,18 @@ function YOOMEDIA_TEST_CONFIG ($data) {
                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!
@@ -110,14 +113,14 @@ function YOOMEDIA_TEST_CONFIG ($data) {
        // Log the response if failed
        if ((count($response) == 0) && ($errorCode > 0)) {
                // Queries depleted (as we count here!)
-               logDebugMessage(__FUNCTION__, __LINE__, 'Requested depleted. Maxmimum was: ' . getConfig('yoomedia_requests_total'));
+               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) > 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
@@ -134,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;
@@ -152,7 +160,7 @@ 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.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'Empty result from API received. response()=' . count($response) . ',type=' . $type);
                return array();
        } // END - if
 
@@ -385,33 +393,43 @@ function YOOMEDIA_GET_ERRORCODE_FROM_RESULT ($response) {
                // Use only the first element
                $code = bigintval($codeArray[0]);
        } elseif (!empty($response[0])) {
-               // 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);
+               // 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("\n", $code);
+                       $code = $codeArray[0];
+
+                       // Remove carrige-return
+                       $code = trim(str_replace("\n", '', $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;
+               $code = '0';
        } else {
                // Should not happen!
                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;
 }