Broken mask fixed (%%) and request dispatcher sendRawRequest() rewritten to timeout...

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

diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index 75a0362ebc9b8350c9342ea5cd2b754d57bff618..a0e9c5a70fffe1b4d5f16bfd82e840b0d05b60d2 100644 (file)
--- a/inc/libs/yoomedia_functions.php
+++ b/inc/libs/yoomedia_functions.php
@@ -39,6 +39,57 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
+} // END - if
+
+// 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 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
@@ -91,53 +142,6 @@ function YOOMEDIA_TEST_CONFIG ($data) {
        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('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 - 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;
-}
-
 // "Getter" for a parsed result for all text mails. This means an array without
 // the header lines will be returned
 function YOOMEDIA_GET_PARSED_RESULT_TEXTMAILS () {