Opps...

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

diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index 83167b12750858a146374a249d2e7931f47c2be4..5ee18e176610bcff4d93a451de2ea71cee5594f2 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                    *
@@ -191,19 +189,19 @@ function YOOMEDIA_PARSE_RESPONSE ($response, $type) {
        $dataArray = explode('|', $responseLine);
 
        // Now make the result array with two dimensions
-       $cnt = '0'; $entry = '0';
+       $count = '0'; $entry = '0';
        foreach ($dataArray as $line) {
                // Add the line
-               $result[$entry][yoomediaTranslateIndex($type, $cnt)] = $line;
+               $result[$entry][yoomediaTranslateIndex($type, $count)] = $line;
 
                // End of data of first entry reached?
-               if ($cnt == 6) {
+               if ($count == 6) {
                        // Then advance to next entry and reset counter
                        $entry++;
-                       $cnt = '0';
+                       $count = '0';
                } else {
                        // Count up
-                       $cnt++;
+                       $count++;
                }
        } // END - foreach
 
@@ -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);
 }
@@ -432,7 +418,7 @@ 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(__FUNCTION__, __LINE__, 'Cannot parse response. Raw response:<pre>' . print_r($response, true) . '</pre>');
        }