return false;
} // END - if
- // Transfer config data
+ // Remove 'ok'
+ unset($data['ok']);
+
+ // Merge config
mergeConfig($data);
// Temporary allow maximum
- setConfigEntry('yoomedia_tm_max_reload' , 100000);
- setConfigEntry('yoomedia_tm_min_wait' , 0);
- setConfigEntry('yoomedia_tm_clicks_remain', 10);
- setConfigEntry('yoomedia_tm_min_pay' , 0);
- setConfigEntry('yoomedia_erotic_allowed' , 1);
+ setConfigEntry('yoomedia_tm_max_reload' , '100000');
+ setConfigEntry('yoomedia_tm_min_wait' , '1000');
+ setConfigEntry('yoomedia_tm_clicks_remain', '10');
+ setConfigEntry('yoomedia_tm_min_pay' , '0.00001');
+ setConfigEntry('yoomedia_erotic_allowed' , '1');
// Query the API with a test request without couting it
// If zero reply comes back the data is invalid!
// Log the response if failed
if ((count($response) == 0) && ($errorCode > 0)) {
// Queries depleted (as we count here!)
- logDebugMessage(__FUNCTION__, __LINE__, 'Requested depleted. Maxmimum was: ' . getConfig('yoomedia_requests_total'));
+ logDebugMessage(__FUNCTION__, __LINE__, 'Requested depleted. Maxmimum was: ' . getConfig('yoomedia_requests_total') . ',errorCode=' . $errorCode);
$errorCode = -1;
} elseif ((($errorCode <= 4) && ($errorCode > 0)) || ($errorCode >= 8)) {
// An error has returned from the account
logDebugMessage(__FUNCTION__, __LINE__, 'Unexpected error code ' . $errorCode . ' received.');
} elseif ((count($response) > 0) && ($errorCode != 0)) {
// Log serialized raw response
- logDebugMessage(__FUNCTION__, __LINE__, 'Raw response=' . base64_encode(serialize($response)));
+ logDebugMessage(__FUNCTION__, __LINE__, 'errorCode=' . $errorCode . ',response=' . base64_encode(serialize($response)));
$errorCode = -1;
} else {
// This is fine, because the result array is okay and the response code on element 8 is fine
// Get the raw response
$response = YOOMEDIA_QUERY_API('out_textmail.php');
+ // By default an empty result is returned
+ $result = array();
+
// Parse the response
- $result = YOOMEDIA_PARSE_RESPONSE($response, 'textmail');
+ if (count($response) > 0) {
+ $result = YOOMEDIA_PARSE_RESPONSE($response, 'textmail');
+ } // END - if
// Return result
return $result;
// If we have no result, abort here
if (count($dummy) == 0) {
// Empty response from API
- logDebugMessage(__FUNCTION__, __LINE__, 'Empy result from API received.');
+ debug_report_bug(__FUNCTION__, __LINE__, 'Empty result from API received. response()=' . count($response) . ',type=' . $type);
return array();
} // END - if
}
// 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
// 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",
);
// 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__);
}
// 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
}
// 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
// Use only the first element
$code = bigintval($codeArray[0]);
} elseif (!empty($response[0])) {
- // Begin with extraction
- $codeArray = explode(' ', $response[0]['id']);
- $code = $codeArray[0];
- $codeArray = explode('<br />', $code);
- $code = $codeArray[0];
- $codeArray = explode('<br>', $code);
- $code = $codeArray[0];
-
- // Remove all new-line characters
- $codeArray = explode("\n", $code);
- $code = $codeArray[0];
-
- // Remove carrige-return
- $code = str_replace("\n", '', $code);
+ // Merge response together
+ $parts = explode('|', implode('', $response));
+
+ // If we have only one part, we got an error
+ if (count($parts) > 1) {
+ // All fine
+ $code = '0';
+ } else {
+ // Begin with extraction of error code
+ $codeArray = explode(' ', $response[0]);
+ $code = $codeArray[0];
+ $codeArray = explode('<br />', $code);
+ $code = $codeArray[0];
+ $codeArray = explode('<br>', $code);
+ $code = $codeArray[0];
+
+ // Remove all new-line characters
+ $codeArray = explode("\n", $code);
+ $code = $codeArray[0];
+
+ // Remove carrige-return
+ $code = trim(str_replace("\n", '', $code));
+
+ // Is it still empty?
+ if (empty($code)) {
+ // Then fix it
+ $code = -999;
+ } // END - if
+ }
} elseif (count($response) == 0) {
// All fine, but empty result
- $code = 0;
+ $code = '0';
} else {
// Should not happen!
debug_report_bug(__FUNCTION__, __LINE__, 'Cannot parse response. Raw response:<pre>' . print_r($response, true) . '</pre>');
}
- // Fix empty code to bad
- if (empty($code)) {
- $code = -999;
- } // END - if
-
// Return error code
return $code;
}
projects / mailer.git / blobdiff