Filters for configurable userid exclusion added:

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

diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index 213b7fab04e99d8e043d950e5faca774a062fee2..5360c5104c0c487f1effea32e1da26ef279c39eb 100644 (file)
--- a/inc/libs/yoomedia_functions.php
+++ b/inc/libs/yoomedia_functions.php
@@ -60,7 +60,7 @@ function YOOMEDIA_QUERY_API ($script, $countQuery = TRUE) {
                );
 
                // Run the query
-               $response = sendGetRequest('http://www.yoomedia.de/interface_2.0/' . $script, $requestData, TRUE);
+               $response = sendHttpGetRequest('http://www.yoomedia.de/interface_2.0/' . $script, $requestData, TRUE);
 
                // Convert from ISO to UTF-8 only if count is > 3 because <= 3 means timeout
                if (count($response) > 3) {
@@ -165,7 +165,7 @@ function YOOMEDIA_PARSE_RESPONSE ($response, $type) {
        } // END - if
 
        // The result is now still raw, so we must split it up and trim spaces away
-       $responseLine = trim(implode(chr(10), $dummy));
+       $responseLine = trim(implode(PHP_EOL, $dummy));
 
        // Last line should never be a pipe!
        if (substr($responseLine, -1, 1) == '|') {
@@ -325,7 +325,7 @@ function YOOMEDIA_CHECK_RELOAD ($id, $reload, $type) {
        $reloaded = FALSE;
 
        // Query database
-       $result = SQL_QUERY_ESC("SELECT `id`, UNIX_TIMESTAMP(`inserted`) AS inserted FROM `{?_MYSQL_PREFIX?}_yoomedia_reload` WHERE `type`='%s' AND `y_id`=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT `id`, UNIX_TIMESTAMP(`inserted`) AS `inserted` FROM `{?_MYSQL_PREFIX?}_yoomedia_reload` WHERE `type`='%s' AND `y_id`=%s LIMIT 1",
                array($type, bigintval($id)), __FUNCTION__, __LINE__);
 
        // Entry found?
@@ -414,11 +414,11 @@ function YOOMEDIA_GET_ERRORCODE_FROM_RESULT ($response) {
                        $code = $codeArray[0];
 
                        // Remove all new-line characters
-                       $codeArray = explode(chr(10), $code);
+                       $codeArray = explode(PHP_EOL, $code);
                        $code = $codeArray[0];
 
                        // Remove carrige-return
-                       $code = trim(str_replace(chr(10), '', $code));
+                       $code = trim(str_replace(PHP_EOL, '', $code));
 
                        // Is it still empty?
                        if (empty($code)) {