X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fyoomedia_functions.php;h=3c7ce1d13bfdc7f790ba8ce0b190c45eaf19b78a;hb=f1d0a68ef017ce2e658e8e681b8dba79b8f1b4df;hp=8b317b64069750e718bede1c96c8026d3de7c1b4;hpb=15b33f67108fcf717fc56fc9cb931f7c22a69737;p=mailer.git
diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index 8b317b6406..3c7ce1d13b 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 - 2013 by Mailer Developer Team *
* For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -41,12 +41,12 @@ if (!defined('__SECURITY')) {
} // END - if
// Queries the given Yoo!Media API 2.0 script
-function YOOMEDIA_QUERY_API ($script, $countQuery = true) {
+function YOOMEDIA_QUERY_API ($script, $countQuery = TRUE) {
// Init response array
$response = array();
// Enougth queries left?
- if ((getConfig('yoomedia_requests_remain') > 0) || ($countQuery === false)) {
+ if ((getConfig('yoomedia_requests_remain') > 0) || ($countQuery === FALSE)) {
// Prepare request array
$requestData = array(
'id' => getConfig('yoomedia_id'),
@@ -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) {
@@ -72,7 +72,7 @@ function YOOMEDIA_QUERY_API ($script, $countQuery = true) {
} // END - if
// Shall we count the query as used?
- if ($countQuery === true) {
+ if ($countQuery === TRUE) {
// Then update the config!
updateConfiguration('yoomedia_requests_remain', 1, '-');
} // END - if
@@ -87,7 +87,7 @@ function YOOMEDIA_TEST_CONFIG ($data) {
// Is this admin?
if (!isAdmin()) {
// No admin!
- return false;
+ return FALSE;
} // END - if
// Remove 'ok'
@@ -105,20 +105,20 @@ function YOOMEDIA_TEST_CONFIG ($data) {
// Query the API with a test request without couting it
// If zero reply comes back the data is invalid!
- $response = YOOMEDIA_QUERY_API('out_textmail.php', true); // @TODO Ask Yoo!Media for test script
+ $response = YOOMEDIA_QUERY_API('out_textmail.php', TRUE); // @TODO Ask Yoo!Media for test script
// Default error code is 0 = all fine!
$errorCode = YOOMEDIA_GET_ERRORCODE_FROM_RESULT($response);
// Log the response if failed
- if ((count($response) == 0) && ($errorCode > 0)) {
+ if ((!isFilledArray($response)) && (isValidNumber($errorCode))) {
// Queries depleted (as we count here!)
logDebugMessage(__FUNCTION__, __LINE__, 'Requested depleted. Maxmimum was: ' . getConfig('yoomedia_requests_total') . ',errorCode=' . $errorCode);
$errorCode = -1;
- } elseif ((($errorCode <= 4) && ($errorCode > 0)) || ($errorCode >= 8)) {
+ } elseif ((($errorCode <= 4) && (isValidNumber($errorCode))) || ($errorCode >= 8)) {
// An error has returned from the account
logDebugMessage(__FUNCTION__, __LINE__, 'Unexpected error code ' . $errorCode . ' received.');
- } elseif ((count($response) > 0) && ($errorCode != 0)) {
+ } elseif ((isFilledArray($response)) && (isValidNumber($errorCode))) {
// Log serialized raw response
logDebugMessage(__FUNCTION__, __LINE__, 'errorCode=' . $errorCode . ',response=' . base64_encode(serialize($response)));
$errorCode = -1;
@@ -127,7 +127,7 @@ function YOOMEDIA_TEST_CONFIG ($data) {
$errorCode = '0';
}
- // Do we have some data there?
+ // Is some data there?
return ($errorCode == '0');
}
@@ -141,7 +141,7 @@ function YOOMEDIA_GET_PARSED_RESULT_TEXTMAILS () {
$result = array();
// Parse the response
- if (count($response) > 0) {
+ if (isFilledArray($response)) {
$result = YOOMEDIA_PARSE_RESPONSE($response, 'textmail');
} // END - if
@@ -157,15 +157,15 @@ function YOOMEDIA_PARSE_RESPONSE ($response, $type) {
// Cut off the header
$dummy = removeHttpHeaderFromResponse($response);
- // If we have no result, abort here
- if (count($dummy) == 0) {
+ // If there is no result, abort here
+ if (!isFilledArray($dummy)) {
// 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(PHP_EOL, $dummy));
// Last line should never be a pipe!
if (substr($responseLine, -1, 1) == '|') {
@@ -201,23 +201,27 @@ function YOOMEDIA_PREPARE_MAIL_DELIVERY ($data) {
// Is this an admin?
if (!isAdmin()) {
// Abort here
- return false;
+ return FALSE;
} elseif (!isExtensionActive('bonus')) {
// Abort here
- return false;
+ return FALSE;
}
// 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);
+ loadTemplate('admin_send_yoomedia', FALSE, $data);
}
// Adds the mail to the bonus mail pool
@@ -225,10 +229,10 @@ function YOOMEDIA_SEND_BONUS_MAIL ($data, $mailMode) {
// Is this an admin?
if (!isAdmin()) {
// Abort here
- return false;
+ return FALSE;
} elseif (!isExtensionActive('bonus')) {
// Abort here
- return false;
+ return FALSE;
}
// Add dummy receiver to avoid notice
@@ -255,12 +259,12 @@ function YOOMEDIA_SEND_BONUS_MAIL ($data, $mailMode) {
// Lockdown given id
function YOOMEDIA_EXCLUDE_MAIL ($data, $mailMode) {
// Search for the entry
- if (YOOMEDIA_CHECK_RELOAD($data['id'], $data['reload'], $mailMode) === false) {
+ if (YOOMEDIA_CHECK_RELOAD($data['id'], $data['reload'], $mailMode) === FALSE) {
// Convert mode for mails
$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')",
+ sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_yoomedia_reload` (`type`, `y_id`, `y_reload`, `inserted`) VALUES ('%s',%s,%s,'0000-00-00 00:00')",
array(
$mailMode,
bigintval($data['id']),
@@ -275,7 +279,7 @@ function YOOMEDIA_UNLIST_MAIL ($data, $mailMode) {
$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",
+ sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_yoomedia_reload` WHERE `type`='%s' AND `y_id`=%s LIMIT 1",
array($mailMode, bigintval($data['id'])), __FUNCTION__, __LINE__);
}
@@ -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
@@ -318,21 +322,21 @@ function translateYooMediaError ($errorCode) {
// Checks if the mail id is in reload lock
function YOOMEDIA_CHECK_RELOAD ($id, $reload, $type) {
// Default is not in reload lock
- $reloaded = false;
+ $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 = sqlQueryEscaped("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?
- if (SQL_NUMROWS($result) == 1) {
+ if (sqlNumRows($result) == 1) {
// Load time
- list($id, $time) = SQL_FETCHROW($result);
+ list($id, $time) = sqlFetchRow($result);
// Are we ready to sent again?
if (((time() - $time) >= ($reload * 60*60)) && ($time > 0)) {
// Remove entry
- SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_yoomedia_reload` WHERE `id`=%s LIMIT 1",
+ sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_yoomedia_reload` WHERE `id`=%s LIMIT 1",
array($id), __FUNCTION__, __LINE__);
} else {
// Dont' sent again this mail
@@ -341,7 +345,7 @@ function YOOMEDIA_CHECK_RELOAD ($id, $reload, $type) {
} // END - if
// Free result
- SQL_FREERESULT($result);
+ sqlFreeResult($result);
// Return result
return $reloaded;
@@ -350,12 +354,12 @@ function YOOMEDIA_CHECK_RELOAD ($id, $reload, $type) {
// Lock given mail down for reload lock
function YOOMEDIA_RELOAD_LOCK ($data, $mailMode) {
// Search for the entry
- if (YOOMEDIA_CHECK_RELOAD($data['id'], $data['reload'], $mailMode) === false) {
+ if (YOOMEDIA_CHECK_RELOAD($data['id'], $data['reload'], $mailMode) === FALSE) {
// Convert mode for mails
$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)",
+ sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_yoomedia_reload` (`type`, `y_id`, `y_reload`) VALUES ('%s',%s,%s)",
array($mailMode, bigintval($data['id']), bigintval($data['reload'])), __FUNCTION__, __LINE__);
} // END - if
}
@@ -394,7 +398,6 @@ function YOOMEDIA_GET_ERRORCODE_FROM_RESULT ($response) {
$code = bigintval($codeArray[0]);
} elseif (!empty($response[0])) {
// Merge response together
- die('response='.print_r($response,true).'
');
$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(PHP_EOL, $code);
$code = $codeArray[0];
// Remove carrige-return
- $code = trim(str_replace("\n", '', $code));
+ $code = trim(str_replace(PHP_EOL, '', $code));
// Is it still empty?
if (empty($code)) {
@@ -423,12 +426,12 @@ function YOOMEDIA_GET_ERRORCODE_FROM_RESULT ($response) {
$code = -999;
} // END - if
}
- } elseif (count($response) == 0) {
+ } elseif (!isFilledArray($response)) {
// All fine, but empty result
$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