X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fyoomedia_functions.php;h=0294ab98c686ad321d69835708ae4b5b7ff263b3;hb=ca11996eb52fa0a1ec45d6ab10f5331c4a54a116;hp=8a9889d3ead598d0fffc4223276c617cc6890625;hpb=ed2e4260898a75477dd0bffad49732fdf702717e;p=mailer.git
diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index 8a9889d3ea..0294ab98c6 100644
--- 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 *
@@ -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,20 +208,24 @@ 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);
}
// Adds the mail to the bonus mail pool
-function YOOMEDIA_SEND_BONUS_MAIL ($data, $mode) {
+function YOOMEDIA_SEND_BONUS_MAIL ($data, $mailMode) {
// Is this an admin?
if (!isAdmin()) {
// Abort here
@@ -236,7 +240,7 @@ function YOOMEDIA_SEND_BONUS_MAIL ($data, $mode) {
// HTML or normal? (normal is default...)
$type = 't';
- if (($mode == 'html') && (isExtensionActive('html_mail'))) $type = 'h';
+ if (($mailMode == 'html') && (isExtensionActive('html_mail'))) $type = 'h';
// Auto-generate URL
$data['url'] = sprintf("http://www.yoomedia.de/code/%s-mail.php?id=%s&sid=%s",
@@ -246,23 +250,23 @@ function YOOMEDIA_SEND_BONUS_MAIL ($data, $mode) {
);
// Lock this mail for new delivery
- YOOMEDIA_RELOAD_LOCK($data, $mode);
+ YOOMEDIA_RELOAD_LOCK($data, $mailMode);
// Call the lower function
- addNewBonusMail($data, $mode);
+ addNewBonusMail($data, $mailMode);
}
// Lockdown given id
-function YOOMEDIA_EXCLUDE_MAIL ($data, $mode) {
+function YOOMEDIA_EXCLUDE_MAIL ($data, $mailMode) {
// Search for the entry
- if (YOOMEDIA_CHECK_RELOAD($data['id'], $data['reload'], $mode) === false) {
+ if (YOOMEDIA_CHECK_RELOAD($data['id'], $data['reload'], $mailMode) === false) {
// Convert mode for mails
- $mode = YOOMEDIA_CONVERT_MODE($mode);
+ $mailMode = YOOMEDIA_CONVERT_MODE($mailMode);
// Add the entry
SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_yoomedia_reload` (`type`,`y_id`,`y_reload`,`inserted`) VALUES ('%s',%s,%s,'0000-00-00 00:00')",
array(
- $mode,
+ $mailMode,
bigintval($data['id']),
bigintval($data['reload'])
), __FUNCTION__, __LINE__);
@@ -270,13 +274,13 @@ function YOOMEDIA_EXCLUDE_MAIL ($data, $mode) {
}
// Remove lock of given mail
-function YOOMEDIA_UNLIST_MAIL ($data, $mode) {
+function YOOMEDIA_UNLIST_MAIL ($data, $mailMode) {
// Convert mode for mails
- $mode = YOOMEDIA_CONVERT_MODE($mode);
+ $mailMode = YOOMEDIA_CONVERT_MODE($mailMode);
// Add the entry
SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_yoomedia_reload` WHERE `type`='%s' AND `y_id`=%s LIMIT 1",
- array($mode, bigintval($data['id'])), __FUNCTION__, __LINE__);
+ array($mailMode, bigintval($data['id'])), __FUNCTION__, __LINE__);
}
// "Translates" the index number into an assosiative value
@@ -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 %s[%s] detected.", $errorCode, gettype($errorCode)));
+ reportBug(__FUNCTION__, __LINE__, sprintf("Unknown error code %s[%s] detected.", $errorCode, gettype($errorCode)));
}
// Return value
@@ -348,33 +352,33 @@ function YOOMEDIA_CHECK_RELOAD ($id, $reload, $type) {
}
// Lock given mail down for reload lock
-function YOOMEDIA_RELOAD_LOCK ($data, $mode) {
+function YOOMEDIA_RELOAD_LOCK ($data, $mailMode) {
// Search for the entry
- if (YOOMEDIA_CHECK_RELOAD($data['id'], $data['reload'], $mode) === false) {
+ if (YOOMEDIA_CHECK_RELOAD($data['id'], $data['reload'], $mailMode) === false) {
// Convert mode for mails
- $mode = YOOMEDIA_CONVERT_MODE($mode);
+ $mailMode = YOOMEDIA_CONVERT_MODE($mailMode);
// Add the entry
SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_yoomedia_reload` (`type`,`y_id`,`y_reload`) VALUES ('%s',%s,%s)",
- array($mode, bigintval($data['id']), bigintval($data['reload'])), __FUNCTION__, __LINE__);
+ array($mailMode, bigintval($data['id']), bigintval($data['reload'])), __FUNCTION__, __LINE__);
} // END - if
}
// Convert mode for mails
-function YOOMEDIA_CONVERT_MODE ($mode) {
+function YOOMEDIA_CONVERT_MODE ($mailMode) {
// Convert mode for normal/html
- switch ($mode) {
+ switch ($mailMode) {
case 'normal':
- $mode = 'textmail';
+ $mailMode = 'textmail';
break;
case 'html':
- $mode = 'htmlmail';
+ $mailMode = 'htmlmail';
break;
} // END - switch
// Return result
- return $mode;
+ return $mailMode;
}
// Extract code from response
@@ -410,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)) {
@@ -427,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:' . print_r($response, true) . '
');
+ reportBug(__FUNCTION__, __LINE__, 'Cannot parse response. Raw response:' . print_r($response, true) . '
');
}
// Return error code