Backwards-compatiblity must be turned off

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

diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index ef00bd8e29f0b0e95dd936f6f8cff371a6f7812e..5c5d437460674a32b571a3276559a3ce886ddd8f 100644 (file)
--- a/inc/libs/yoomedia_functions.php
+++ b/inc/libs/yoomedia_functions.php
@@ -14,8 +14,6 @@
  * $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                    *
@@ -119,7 +117,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;
@@ -231,18 +229,6 @@ function YOOMEDIA_PREPARE_MAIL_DELIVERY ($data) {
        // Is the reward below one?
        if ($data['reward'] < 1) $data['reward'] = 1;
 
-       // Add website id
-       $data['sid'] = getConfig('yoomedia_sid');
-
-       // Add total receivers
-       $data['all'] = translateComma(getTotalReceivers());
-
-       // Add categories
-       $data['categories'] = generateCategoryOptionsList('normal');
-
-       // Decode entities
-       $data['text'] = decodeEntities($data['text']);
-
        // Load template
        loadTemplate('admin_send_yoomedia', false, $data);
 }
@@ -335,7 +321,7 @@ function translateYooMediaError ($errorCode) {
                $return = $GLOBALS['translation_tables']['yoomedia']['error_codes'][$errorCode];
        } else {
                // Log missing entries
-               debug_report_bug(sprintf("Unknown error code <strong>%s[%s]</strong> detected.", $errorCode, gettype($errorCode)));
+               debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown error code <strong>%s[%s]</strong> detected.", $errorCode, gettype($errorCode)));
        }
 
        // Return value
@@ -432,9 +418,9 @@ 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('Cannot parse response. Raw response:<pre>' . print_r($response, true) . '</pre>');
+               debug_report_bug(__FUNCTION__, __LINE__, 'Cannot parse response. Raw response:<pre>' . print_r($response, true) . '</pre>');
        }
 
        // Fix empty code to bad