X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fyoomedia_functions.php;h=5360c5104c0c487f1effea32e1da26ef279c39eb;hb=4f7df133f736da124e6f7bd02008b9093f736451;hp=0294ab98c686ad321d69835708ae4b5b7ff263b3;hpb=63f159414369b5ea19a8ca75d8cd8033c45d8341;p=mailer.git
diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index 0294ab98c6..5360c5104c 100644
--- a/inc/libs/yoomedia_functions.php
+++ b/inc/libs/yoomedia_functions.php
@@ -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,7 +105,7 @@ 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);
@@ -127,7 +127,7 @@ function YOOMEDIA_TEST_CONFIG ($data) {
$errorCode = '0';
}
- // Do we have some data there?
+ // Is some data there?
return ($errorCode == '0');
}
@@ -165,7 +165,7 @@ function YOOMEDIA_PARSE_RESPONSE ($response, $type) {
} // END - if
// The result is now still raw, so we must split it up and trim spaces away
- $responseLine = trim(implode(chr(10), $dummy));
+ $responseLine = trim(implode(PHP_EOL, $dummy));
// Last line should never be a pipe!
if (substr($responseLine, -1, 1) == '|') {
@@ -201,10 +201,10 @@ 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!)
@@ -221,7 +221,7 @@ function YOOMEDIA_PREPARE_MAIL_DELIVERY ($data) {
} // END - if
// Load template
- loadTemplate('admin_send_yoomedia', false, $data);
+ loadTemplate('admin_send_yoomedia', FALSE, $data);
}
// Adds the mail to the bonus mail pool
@@ -229,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
@@ -259,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')",
+ 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(
$mailMode,
bigintval($data['id']),
@@ -322,10 +322,10 @@ 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 = SQL_QUERY_ESC("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?
@@ -354,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)",
+ SQL_QUERY_ESC("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
}
@@ -414,11 +414,11 @@ function YOOMEDIA_GET_ERRORCODE_FROM_RESULT ($response) {
$code = $codeArray[0];
// Remove all new-line characters
- $codeArray = explode(chr(10), $code);
+ $codeArray = explode(PHP_EOL, $code);
$code = $codeArray[0];
// Remove carrige-return
- $code = trim(str_replace(chr(10), '', $code));
+ $code = trim(str_replace(PHP_EOL, '', $code));
// Is it still empty?
if (empty($code)) {
@@ -431,7 +431,7 @@ function YOOMEDIA_GET_ERRORCODE_FROM_RESULT ($response) {
$code = '0';
} else {
// Should not happen!
- reportBug(__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