From: Roland Häder Date: Wed, 10 Mar 2010 00:32:43 +0000 (+0000) Subject: More fields rewritten, statement added when the bug-report mails got removed X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=8d7f183d20c336ca455fe1076dc0a99e31758734 More fields rewritten, statement added when the bug-report mails got removed --- diff --git a/inc/functions.php b/inc/functions.php index 1f462bdfa4..0a6f17f48f 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -536,7 +536,7 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = ' //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "TO={$toEmail},SUBJECT={$subject}
"); // Compile subject line (for POINTS constant etc.) - eval("\$subject = decodeEntities(\"".compileRawCode(escapeQuotes($subject))."\");"); + eval('$subject = decodeEntities("' . compileRawCode(escapeQuotes($subject)) . '");'); // Set from header if ((!isInStringIgnoreCase('@', $toEmail)) && ($toEmail > 0)) { @@ -582,10 +582,10 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = ' } // Compile "TO" - eval("\$toEmail = \"".compileRawCode(escapeQuotes($toEmail))."\";"); + eval('$toEmail = "' . compileRawCode(escapeQuotes($toEmail)) . '";'); // Compile "MSG" - eval("\$message = \"".str_replace('$', '$', compileRawCode(escapeQuotes($message)))."\";"); + eval('$message = "' . str_replace('$', '$', compileRawCode(escapeQuotes($message))) . '";'); // Fix HTML parameter (default is no!) if (empty($isHtml)) $isHtml = 'N'; diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php index ab04a7fa5d..9b1b5be02c 100644 --- a/inc/libs/surfbar_functions.php +++ b/inc/libs/surfbar_functions.php @@ -364,11 +364,11 @@ function SURFBAR_MEMBER_RESUBMIT_ACTION ($urlData) { // Display selected "action form" function SURFBAR_MEMBER_DISPLAY_ACTION_FORM ($action, $urlData) { // Translate some data - $urlData['url_registered'] = generateDateTime($urlData['url_registered'], 2); - $urlData['views_total'] = translateComma($urlData['views_total']); - $urlData['views_max'] = translateComma($urlData['views_max']); - $urlData['views_allowed'] = translateComma($urlData['views_allowed']); - $urlData['last_locked'] = generateDateTime($urlData['last_locked'], 2); + $urlData['url_registered'] = generateDateTime($urlData['url_registered'], 2); + $urlData['views_total'] = translateComma($urlData['views_total']); + $urlData['views_max'] = translateComma($urlData['views_max']); + $urlData['views_allowed'] = translateComma($urlData['views_allowed']); + $urlData['url_last_locked'] = generateDateTime($urlData['url_last_locked'], 2); // Is the lock reason empty? if (empty($urlData['lock_reason'])) { @@ -556,7 +556,7 @@ function SURFBAR_GET_URL_DATA ($searchTerm, $column = 'id', $order = 'id', $sort $result = SQL_QUERY_ESC("SELECT `id`, `userid`, `url`, `views_total`, `views_max`, `views_allowed`, `status`, - UNIX_TIMESTAMP(`registered`) AS `url_registered`, UNIX_TIMESTAMP(`last_locked`) AS `last_locked`, `lock_reason`, + UNIX_TIMESTAMP(`registered`) AS `url_registered`, UNIX_TIMESTAMP(`last_locked`) AS `url_last_locked`, `lock_reason`, `views_max`, `views_allowed`, `fixed_reload` FROM `{?_MYSQL_PREFIX?}_surfbar_urls` @@ -684,12 +684,12 @@ function SURFBAR_NOTIFY_ADMIN ($messageType, $content) { } // END - if // Translate some data if present - if (isset($content['status'])) $content['status'] = translateSurfbarUrlStatus($content['status']); - if (isset($content['url_registered'])) $content['url_registered'] = generateDateTime($content['url_registered'], 2); - if (isset($content['last_locked'])) $content['last_locked'] = generateDateTime($content['last_locked'], 2); - if (isset($content['views_total'])) $content['views_total'] = translateComma($content['views_total']); - if (isset($content['views_allowed'])) $content['views_allowed'] = translateComma($content['views_allowed']); - if (isset($content['views_max'])) $content['views_max'] = translateComma($content['views_max']); + if (isset($content['status'])) $content['status'] = translateSurfbarUrlStatus($content['status']); + if (isset($content['url_registered'])) $content['url_registered'] = generateDateTime($content['url_registered'], 2); + if (isset($content['url_last_locked'])) $content['url_last_locked'] = generateDateTime($content['url_last_locked'], 2); + if (isset($content['views_total'])) $content['views_total'] = translateComma($content['views_total']); + if (isset($content['views_allowed'])) $content['views_allowed'] = translateComma($content['views_allowed']); + if (isset($content['views_max'])) $content['views_max'] = translateComma($content['views_max']); // Send the notification out return sendAdminNotification($subject, $templateName, $content, $content['userid']); @@ -717,12 +717,12 @@ function SURFBAR_NOTIFY_USER ($messageType, $content) { } // END - if // Translate some data if present - if (isset($content['status'])) $content['status'] = translateSurfbarUrlStatus($content['status']); - if (isset($content['url_registered'])) $content['url_registered'] = generateDateTime($content['url_registered'], 2); - if (isset($content['last_locked'])) $content['last_locked'] = generateDateTime($content['last_locked'], 2); - if (isset($content['views_total'])) $content['views_total'] = translateComma($content['views_total']); - if (isset($content['views_allowed'])) $content['views_allowed'] = translateComma($content['views_allowed']); - if (isset($content['views_max'])) $content['views_max'] = translateComma($content['views_max']); + if (isset($content['status'])) $content['status'] = translateSurfbarUrlStatus($content['status']); + if (isset($content['url_registered'])) $content['url_registered'] = generateDateTime($content['url_registered'], 2); + if (isset($content['url_last_locked'])) $content['url_last_locked'] = generateDateTime($content['url_last_locked'], 2); + if (isset($content['views_total'])) $content['views_total'] = translateComma($content['views_total']); + if (isset($content['views_allowed'])) $content['views_allowed'] = translateComma($content['views_allowed']); + if (isset($content['views_max'])) $content['views_max'] = translateComma($content['views_max']); // Load template $mailText = loadEmailTemplate($templateName, $content, $content['userid']); @@ -1488,7 +1488,7 @@ function SURFBAR_GET_USER_URLS () { u.id, u.userid, u.url, u.status, u.views_total, u.views_max, u.views_allowed, UNIX_TIMESTAMP(u.registered) AS url_registered, - UNIX_TIMESTAMP(u.last_locked) AS last_locked, + UNIX_TIMESTAMP(u.last_locked) AS url_last_locked, u.lock_reason AS lock_reason FROM `{?_MYSQL_PREFIX?}_surfbar_urls` AS u diff --git a/templates/de/html/ext/ext_report.tpl b/templates/de/html/ext/ext_report.tpl index 623d2c470c..0f536c7c97 100644 --- a/templates/de/html/ext/ext_report.tpl +++ b/templates/de/html/ext/ext_report.tpl @@ -35,6 +35,7 @@ Reproduzierung nötig)
Die Daten aus den Bugs werden stets vertraulich behandelt und unterliegen den aktuellen Datenschutzgesetzen. Es erfolgt ausnahmelos keine Weitergabe oder -Weiterleitung in jeglicher Form an Dritte. +Weiterleitung in jeglicher Form an Dritte. Die Mails werden nach der Behebung +des Fehlers von mir vollständig und rückstandlos gelöscht.