Rewrote 'we' word a little, rewrote mail order to use SQL_INSERTID() instead of anoth...

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

diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index 8b317b64069750e718bede1c96c8026d3de7c1b4..bedb886982080d2d197b8df02e93aef986692bfb 100644 (file)
--- a/inc/libs/yoomedia_functions.php
+++ b/inc/libs/yoomedia_functions.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -127,7 +127,7 @@ function YOOMEDIA_TEST_CONFIG ($data) {
                $errorCode = '0';
        }
 
-       // Do we have some data there?
+       // Is some data there?
        return ($errorCode == '0');
 }
 
@@ -160,12 +160,12 @@ function YOOMEDIA_PARSE_RESPONSE ($response, $type) {
        // If we have no result, abort here
        if (count($dummy) == 0) {
                // Empty response from API
-               debug_report_bug(__FUNCTION__, __LINE__, 'Empty result from API received. response()=' . count($response) . ',type=' . $type);
+               reportBug(__FUNCTION__, __LINE__, 'Empty result from API received. response()=' . count($response) . ',type=' . $type);
                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));
+       $responseLine = trim(implode(chr(10), $dummy));
 
        // Last line should never be a pipe!
        if (substr($responseLine, -1, 1) == '|') {
@@ -208,13 +208,17 @@ function YOOMEDIA_PREPARE_MAIL_DELIVERY ($data) {
        }
 
        // Is the waiting time below one second? Then fix it to one (zero seconds are not yet supported!)
-       if ($data['wait'] < 1) $data['wait'] = 1;
+       if ($data['wait'] < 1) {
+               $data['wait'] = 1;
+       } // END - if
 
        // Half of waiting time is a good reward!
        $data['reward'] = round($data['wait'] / 2 + 0.4);
 
        // Is the reward below one?
-       if ($data['reward'] < 1) $data['reward'] = 1;
+       if ($data['reward'] < 1) {
+               $data['reward'] = 1;
+       } // END - if
 
        // Load template
        loadTemplate('admin_send_yoomedia', false, $data);
@@ -308,7 +312,7 @@ function translateYooMediaError ($errorCode) {
                $return = $GLOBALS['translation_tables']['yoomedia']['error_codes'][$errorCode];
        } else {
                // Log missing entries
-               debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown error code <strong>%s[%s]</strong> detected.", $errorCode, gettype($errorCode)));
+               reportBug(__FUNCTION__, __LINE__, sprintf("Unknown error code <strong>%s[%s]</strong> detected.", $errorCode, gettype($errorCode)));
        }
 
        // Return value
@@ -394,7 +398,6 @@ function YOOMEDIA_GET_ERRORCODE_FROM_RESULT ($response) {
                $code = bigintval($codeArray[0]);
        } elseif (!empty($response[0])) {
                // Merge response together
-               die('response=<pre>'.print_r($response,true).'</pre>');
                $parts = explode('|', implode('', $response));
 
                // If we have only one part, we got an error
@@ -411,11 +414,11 @@ function YOOMEDIA_GET_ERRORCODE_FROM_RESULT ($response) {
                        $code = $codeArray[0];
 
                        // Remove all new-line characters
-                       $codeArray = explode("\n", $code);
+                       $codeArray = explode(chr(10), $code);
                        $code = $codeArray[0];
 
                        // Remove carrige-return
-                       $code = trim(str_replace("\n", '', $code));
+                       $code = trim(str_replace(chr(10), '', $code));
 
                        // Is it still empty?
                        if (empty($code)) {
@@ -428,7 +431,7 @@ function YOOMEDIA_GET_ERRORCODE_FROM_RESULT ($response) {
                $code = '0';
        } else {
                // Should not happen!
-               debug_report_bug(__FUNCTION__, __LINE__, 'Cannot parse response. Raw response:<pre>' . print_r($response, true) . '</pre>');
+               reportBug(__FUNCTION__, __LINE__, 'Cannot parse response. Raw response:<pre>' . print_r($response, true) . '</pre>');
        }
 
        // Return error code