From d4774aabf3b0a7d7a36eb61b5e01667b32cf9292 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 28 Nov 2008 02:02:29 +0000 Subject: [PATCH] More surfbar mail templates added, a lot renamed to naming convention. - Added for stopped URLs which shall start again - Added for stopped URLs which shall be deleted - A lot renamed! --- .gitattributes | 19 +++++-- inc/databases.php | 2 +- inc/language/_de.php | 41 +++++++++++++++ inc/language/surfbar_de.php | 18 +++++-- inc/libs/surfbar_functions.php | 51 ++++++++++++------- inc/modules/admin/what-list_surfbar_urls.php | 12 ++--- .../admin_surfbar_url_active_deleted.tpl | 38 ++++++++++++++ .../admin_surfbar_url_active_pending.tpl | 33 ++++++++++++ ...l => admin_surfbar_url_active_stopped.tpl} | 8 +-- ... => admin_surfbar_url_pending_deleted.tpl} | 2 +- .../admin_surfbar_url_stopped_continued.tpl | 33 ++++++++++++ .../admin_surfbar_url_stopped_deleted.tpl | 38 ++++++++++++++ .../admin_surfbar_url_stopped_pending.tpl | 33 ++++++++++++ .../member_surfbar_url_active_deleted.tpl | 19 +++++++ ... => member_surfbar_url_active_pending.tpl} | 6 +-- .../member_surfbar_url_active_stopped.tpl | 23 +++++++++ ...=> member_surfbar_url_pending_deleted.tpl} | 2 +- .../member_surfbar_url_stopped_continued.tpl | 25 +++++++++ .../member_surfbar_url_stopped_deleted.tpl | 19 +++++++ .../member_surfbar_url_stopped_pending.tpl | 25 +++++++++ 20 files changed, 404 insertions(+), 43 deletions(-) create mode 100644 inc/language/_de.php create mode 100644 templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl create mode 100644 templates/de/emails/admin/admin_surfbar_url_active_pending.tpl rename templates/de/emails/admin/{admin_surfbar_url_edited.tpl => admin_surfbar_url_active_stopped.tpl} (79%) rename templates/de/emails/admin/{admin_surfbar_url_deleted.tpl => admin_surfbar_url_pending_deleted.tpl} (97%) create mode 100644 templates/de/emails/admin/admin_surfbar_url_stopped_continued.tpl create mode 100644 templates/de/emails/admin/admin_surfbar_url_stopped_deleted.tpl create mode 100644 templates/de/emails/admin/admin_surfbar_url_stopped_pending.tpl create mode 100644 templates/de/emails/member/member_surfbar_url_active_deleted.tpl rename templates/de/emails/member/{member_surfbar_url_edited.tpl => member_surfbar_url_active_pending.tpl} (77%) create mode 100644 templates/de/emails/member/member_surfbar_url_active_stopped.tpl rename templates/de/emails/member/{member_surfbar_url_deleted.tpl => member_surfbar_url_pending_deleted.tpl} (94%) create mode 100644 templates/de/emails/member/member_surfbar_url_stopped_continued.tpl create mode 100644 templates/de/emails/member/member_surfbar_url_stopped_deleted.tpl create mode 100644 templates/de/emails/member/member_surfbar_url_stopped_pending.tpl diff --git a/.gitattributes b/.gitattributes index 0721643c2c..8835d5b330 100644 --- a/.gitattributes +++ b/.gitattributes @@ -157,6 +157,7 @@ inc/install-inc.php -text inc/js/.htaccess -text inc/language.php -text inc/language/.htaccess -text +inc/language/_de.php -text inc/language/active_de.php -text inc/language/admins_de.php -text inc/language/autopurge_de.php -text @@ -653,14 +654,19 @@ templates/de/emails/admin/admin_support-order.tpl -text templates/de/emails/admin/admin_support-ordr.tpl -text templates/de/emails/admin/admin_support-reflink.tpl -text templates/de/emails/admin/admin_support-unconfirmed.tpl -text +templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl -text +templates/de/emails/admin/admin_surfbar_url_active_pending.tpl -text +templates/de/emails/admin/admin_surfbar_url_active_stopped.tpl -text templates/de/emails/admin/admin_surfbar_url_confirmed.tpl -text -templates/de/emails/admin/admin_surfbar_url_deleted.tpl -text templates/de/emails/admin/admin_surfbar_url_depleted.tpl -text -templates/de/emails/admin/admin_surfbar_url_edited.tpl -text templates/de/emails/admin/admin_surfbar_url_migrate.tpl -text templates/de/emails/admin/admin_surfbar_url_pending.tpl -text +templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl -text templates/de/emails/admin/admin_surfbar_url_reg.tpl -text templates/de/emails/admin/admin_surfbar_url_rejected.tpl -text +templates/de/emails/admin/admin_surfbar_url_stopped_continued.tpl -text +templates/de/emails/admin/admin_surfbar_url_stopped_deleted.tpl -text +templates/de/emails/admin/admin_surfbar_url_stopped_pending.tpl -text templates/de/emails/admin/admin_surfbar_url_unlock.tpl -text templates/de/emails/admin/admin_transfer_ap.tpl -text templates/de/emails/admin/admin_transfer_points.tpl -text @@ -730,14 +736,19 @@ templates/de/emails/member/member_support-ordr.tpl -text templates/de/emails/member/member_support-reflink.tpl -text templates/de/emails/member/member_support-unconfirmed.tpl -text templates/de/emails/member/member_surfbar_low_points.tpl -text +templates/de/emails/member/member_surfbar_url_active_deleted.tpl -text +templates/de/emails/member/member_surfbar_url_active_pending.tpl -text +templates/de/emails/member/member_surfbar_url_active_stopped.tpl -text templates/de/emails/member/member_surfbar_url_confirmed.tpl -text -templates/de/emails/member/member_surfbar_url_deleted.tpl -text templates/de/emails/member/member_surfbar_url_depleted.tpl -text -templates/de/emails/member/member_surfbar_url_edited.tpl -text templates/de/emails/member/member_surfbar_url_migrate.tpl -text templates/de/emails/member/member_surfbar_url_pending.tpl -text +templates/de/emails/member/member_surfbar_url_pending_deleted.tpl -text templates/de/emails/member/member_surfbar_url_reg.tpl -text templates/de/emails/member/member_surfbar_url_rejected.tpl -text +templates/de/emails/member/member_surfbar_url_stopped_continued.tpl -text +templates/de/emails/member/member_surfbar_url_stopped_deleted.tpl -text +templates/de/emails/member/member_surfbar_url_stopped_pending.tpl -text templates/de/emails/member/member_surfbar_url_unlock.tpl -text templates/de/emails/member/member_transfer_recipient.tpl -text templates/de/emails/member/member_transfer_sender.tpl -text diff --git a/inc/databases.php b/inc/databases.php index 2038c0174a..d05929501d 100644 --- a/inc/databases.php +++ b/inc/databases.php @@ -114,7 +114,7 @@ define('USAGE_BASE', "usage"); define('SERVER_URL', "http://www.mxchange.org"); // This current patch level -define('CURR_SVN_REVISION', "572"); +define('CURR_SVN_REVISION', "573"); // Take a prime number which is long (if you know a longer one please try it out!) define('_PRIME', 591623); diff --git a/inc/language/_de.php b/inc/language/_de.php new file mode 100644 index 0000000000..f7a0f27a4a --- /dev/null +++ b/inc/language/_de.php @@ -0,0 +1,41 @@ + diff --git a/inc/language/surfbar_de.php b/inc/language/surfbar_de.php index a4ec015a78..ab358c58dc 100644 --- a/inc/language/surfbar_de.php +++ b/inc/language/surfbar_de.php @@ -146,11 +146,16 @@ define('ADMIN_SURFBAR_NOTIFY_URL_UNLOCK_SUBJECT', "[Surfbar:] URL hinzugefü define('ADMIN_SURFBAR_NOTIFY_URL_REG_SUBJECT', "[Surfbar:] Mitgliedsbuchung einer URL"); define('ADMIN_SURFBAR_NOTIFY_URL_MIGRATE_SUBJECT', "[Surfbar:] Migrierung einer Mailbuchung"); define('ADMIN_SURFBAR_NOTIFY_URL_ACTIVE_SUBJECT', "[Surfbar:] Freigabe einer URL"); -define('ADMIN_SURFBAR_NOTIFY_URL_DELETED_SUBJECT', "[Surfbar:] URL gelöscht"); +define('ADMIN_SURFBAR_NOTIFY_URL_ACTIVE_DELETED_SUBJECT', "[Surfbar:] Mitglied hat freigegebene URL gelöscht"); +define('ADMIN_SURFBAR_NOTIFY_URL_PENDING_DELETED_SUBJECT', "[Surfbar:] Mitglied hat wartende URL zurückgenommen"); +define('ADMIN_SURFBAR_NOTIFY_URL_STOPPED_DELETED_SUBJECT', "[Surfbar:] Mitglied hat angehaltene URL gelöscht"); define('ADMIN_SURFBAR_NOTIFY_URL_REJECTED_SUBJECT', "[Surfbar:] URL abgelehnt"); define('ADMIN_SURFBAR_NOTIFY_URL_PENDING_SUBJECT', "[Surfbar:] URL-Buchung zugestimmt"); define('ADMIN_SURFBAR_NOTIFY_URL_DEPLETED_SUBJECT', "[Surfbar:] URL automatisch angehalten"); -define('ADMIN_SURFBAR_NOTIFY_URL_EDITED_SUBJECT', "[Surfbar:'] Mitglied hat URL geändert"); +define('ADMIN_SURFBAR_NOTIFY_URL_ACTIVE_PENDING_SUBJECT', "[Surfbar:] Mitglied hat freigegebene URL geändert"); +define('ADMIN_SURFBAR_NOTIFY_URL_STOPPED_CONTINUED_SUBJECT', "[Surfbar:] Mitglied hat gestoppte URL gestartet"); +define('ADMIN_SURFBAR_NOTIFY_URL_STOPPED_PENDING_SUBJECT', "[Surfbar:] Mitglied hat gestoppte URL geändert"); +define('ADMIN_SURFBAR_NOTIFY_URL_ACTIVE_STOPPED_SUBJECT', "[Surfbar:] Mitglied hat freigegebene URL gestoppt"); define('ADMIN_SURFBAR_NOTIFY_DEFAULT_SUBJECT', "Problem in Surfbar-Betreff"); // Auto-generated admin subject lines @@ -164,11 +169,16 @@ define('MEMBER_SURFBAR_NOTIFY_URL_UNLOCK_SUBJECT', "[Surfbar:] Ihre URL wurde au define('MEMBER_SURFBAR_NOTIFY_URL_REG_SUBJECT', "[Surfbar:] Ihre URL wartet auf Freischaltung"); define('MEMBER_SURFBAR_NOTIFY_URL_MIGRATE_SUBJECT', "[Surfbar:] Ihre URL aus der Mailbuchung wurde migriert"); define('MEMBER_SURFBAR_NOTIFY_URL_ACTIVE_SUBJECT', "[Surfbar:] Ihre URL wurde freigegeben"); -define('MEMBER_SURFBAR_NOTIFY_URL_DELETED_SUBJECT', "[Surfbar:] Löschung Ihrer URL"); +define('MEMBER_SURFBAR_NOTIFY_URL_ACTIVE_DELETED_SUBJECT', "[Surfbar:] Sie haben Ihre freigegebene URL gelöscht"); +define('MEMBER_SURFBAR_NOTIFY_URL_PENDING_DELETED_SUBJECT', "[Surfbar:] Sie haben Ihre wartende URL zurückgenommen"); +define('MEMBER_SURFBAR_NOTIFY_URL_STOPPED_DELETED_SUBJECT', "[Surfbar:] Sie haben Ihre gestoppte URL gelöscht"); define('MEMBER_SURFBAR_NOTIFY_URL_REJECTED_SUBJECT', "[Surfbar:] Ihre URL wurde abgelehnt!"); define('MEMBER_SURFBAR_NOTIFY_URL_PENDING_SUBJECT', "[Surfbar:] Zustimmung zur URL-Buchung erhalten"); define('MEMBER_SURFBAR_NOTIFY_URL_DEPLETED_SUBJECT', "[Surfbar:] Ihre URL wurde automatisch angehalten"); -define('MEMBER_SURFBAR_NOTIFY_URL_EDITED_SUBJECT', "[Surfbar:] Sie haben Ihre URL geändert"); +define('MEMBER_SURFBAR_NOTIFY_URL_STOPPED_CONTINUED_SUBJECT', "[Surfbar:] Sie haben Ihre gestoppte URL gestartet"); +define('MEMBER_SURFBAR_NOTIFY_URL_STOPPED_PENDING_SUBJECT', "[Surfbar:] Sie haben Ihre gestoppte URL geändert"); +define('MEMBER_SURFBAR_NOTIFY_URL_ACTIVE_PENDING_SUBJECT', "[Surfbar:] Sie haben Ihre freigegebene URL geändert"); +define('MEMBER_SURFBAR_NOTIFY_URL_ACTIVE_STOPPED_SUBJECT', "[Surfbar:] Sie haben Ihre freigegebene URL gestoppt"); define('MEMBER_SURFBAR_NOTIFY_DEFAULT_SUBJECT', "[Fehler:] Bitte leiten Sie diese Mail an uns weiter!"); define('MEMBER_SURFBAR_NOTIFY_LOW_POINTS_SUBJECT', "[Surfbar:] Ihr {!POINTS!}-Stand ist sehr niedrig!"); diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php index 99c1b30705..e64aac3a53 100644 --- a/inc/libs/surfbar_functions.php +++ b/inc/libs/surfbar_functions.php @@ -326,6 +326,20 @@ function SURFBAR_MEMBER_DELETE_ACTION ($urlData) { // Display form return SURFBAR_MEMBER_DISPLAY_ACTION_FORM("delete", $urlData); } +// Pause active banner +function SURFBAR_MEMBER_PAUSE_ACTION ($urlData) { + return SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['status'], $urlData['new_status'], array($urlData['id'] => $urlData)); +} +// Unpause stopped banner +function SURFBAR_MEMBER_UNPAUSE_ACTION ($urlData) { + // Fix missing entry for template + $urlData['edit'] = $urlData['unpause']; + $urlData['edit']['url'] = $urlData['url']; + $urlData['edit']['limit'] = $urlData['views_max']; + + // Return status change + return SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['status'], $urlData['new_status'], array($urlData['id'] => $urlData)); +} // Display selected "action form" function SURFBAR_MEMBER_DISPLAY_ACTION_FORM ($action, $urlData) { // Translate some data @@ -400,33 +414,26 @@ function SURFBAR_MEMBER_EXECUTE_ACTION ($action, $urlData) { } // "Execute edit" function: Update changed data function SURFBAR_MEMBER_EXECUTE_EDIT_ACTION ($urlData) { + // Default is nothing done + $status = false; + // Translate URLs for testing $url1 = COMPILE_CODE($urlData['url']); $url2 = COMPILE_CODE($urlData['edit']['url']); // Has the URL or limit changed? - if (($urlData['views_allowed'] != $urlData['edit']['limit']) || ($url1 != $url2)) { + if (true) { + //if (($urlData['views_allowed'] != $urlData['edit']['limit']) || ($url1 != $url2)) { // Run the query SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_surfbar_urls SET url='%s', views_allowed=%s, views_max=%s WHERE id=%s AND status='%s' LIMIT 1", array($urlData['url'], $urlData['edit']['limit'], $urlData['edit']['limit'], $urlData['id'], $urlData['status']), __FILE__, __LINE__); - // Prepare new data - $urlData['new_url'] = $urlData['edit']['url']; - $urlData['new_limit'] = $urlData['edit']['limit']; - unset($urlData['edit']); - - // Send admin notification - SURFBAR_NOTIFY_ADMIN("url_edited", $urlData); - - // Send user notification - SURFBAR_NOTIFY_USER("url_edited", $urlData); - // All fine - return true; + $status = true; } - // Not updated - return false; + // Return status + return $status; } // "Execute delete" function: Does nothing... function SURFBAR_MEMBER_EXECUTE_DELETE_ACTION ($urlData) { @@ -1198,8 +1205,8 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array()) // Update the status now // ---------- Comment out for debugging/developing member actions! --------- - //SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_surfbar_urls SET status='%s' WHERE id=%s LIMIT 1", - // array($newStatus, bigintval($urlId)), __FILE__, __LINE__); + SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_surfbar_urls SET status='%s' WHERE id=%s LIMIT 1", + array($newStatus, bigintval($urlId)), __FILE__, __LINE__); // ---------- Comment out for debugging/developing member actions! --------- // Was that fine? @@ -1214,11 +1221,17 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array()) $data[$urlId]['reward'] = TRANSLATE_COMMA($_CONFIG['surfbar_static_reward']); $data[$urlId]['costs'] = TRANSLATE_COMMA($_CONFIG['surfbar_static_costs']); + // Do some dirt fixing here: + if (($data[$urlId]['status'] == "STOPPED") && ($newStatus == "pending")) { + // Fix for template change + $newStatus = "continued"; + } // END - if + // Send admin notification - SURFBAR_NOTIFY_ADMIN("url_{$newStatus}", $data[$urlId]); + SURFBAR_NOTIFY_ADMIN("url_{$data[$urlId]['status']}_{$newStatus}", $data[$urlId]); // Send user notification - SURFBAR_NOTIFY_USER("url_{$newStatus}", $data[$urlId]); + SURFBAR_NOTIFY_USER("url_{$data[$urlId]['status']}_{$newStatus}", $data[$urlId]); // All done! return true; diff --git a/inc/modules/admin/what-list_surfbar_urls.php b/inc/modules/admin/what-list_surfbar_urls.php index 4221cf2fa0..3a25ee7f01 100644 --- a/inc/modules/admin/what-list_surfbar_urls.php +++ b/inc/modules/admin/what-list_surfbar_urls.php @@ -70,8 +70,8 @@ if (isset($_POST['edit'])) { $_POST['id'], "surfbar_urls", array("id", "userid", "url", "registered"), - array("bigintval", "ADMIN_USER_PROFILE_LINK", "FRAMETESTER", "MAKE_DATETIME"), - array("", "", "", "2") + array("bigintval", "ADMIN_USER_PROFILE_LINK", "FRAMETESTER", ""), + array("", "", "", "") ); $show = false; } elseif (isset($_POST['do_delete'])) { @@ -83,8 +83,8 @@ if (isset($_POST['edit'])) { $_POST['id'], "surfbar_urls", array("id", "userid", "url", "registered", "status"), - array("bigintval", "ADMIN_USER_PROFILE_LINK", "FRAMETESTER", "MAKE_DATETIME", "SURFBAR_TRANSLATE_STATUS"), - array("", "", "", "2", "") + array("bigintval", "ADMIN_USER_PROFILE_LINK", "FRAMETESTER", "", "SURFBAR_TRANSLATE_STATUS"), + array("", "", "", "", "") ); $show = false; } elseif (isset($_POST['do_lock'])) { @@ -104,8 +104,8 @@ if (isset($_POST['edit'])) { $_POST['id'], "surfbar_urls", array("id", "userid", "url", "registered", "status"), - array("bigintval", "ADMIN_USER_PROFILE_LINK", "FRAMETESTER", "MAKE_DATETIME", "SURFBAR_TRANSLATE_STATUS"), - array("", "", "", "2", "") + array("bigintval", "ADMIN_USER_PROFILE_LINK", "FRAMETESTER", "", "SURFBAR_TRANSLATE_STATUS"), + array("", "", "", "", "") ); $show = false; } elseif (isset($_POST['do_undelete'])) { diff --git a/templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl b/templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl new file mode 100644 index 0000000000..d8d608e789 --- /dev/null +++ b/templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl @@ -0,0 +1,38 @@ +{--HELLO_ADMIN--}, + +eines unserer Mitglieder hat soeben seine freigegebene URL gelöscht. + +Hier sind alle Daten dazu: +------------------------------------------ +User-ID: $content[userid] +------------------------------------------ +Email: $content[email] +------------------------------------------ +Name: $content[surname] $content[family] +------------------------------------------ +Gebuchte URL: $content[url] +------------------------------------------ +ID in der Surfbar: $content[id] +------------------------------------------ +URL angemeldet: $content[registered] +------------------------------------------ +Framekiller-Test: +$content[frametester] +------------------------------------------ +Gesamteinblendungen: $content[views_total] +------------------------------------------ +Maximale Einblendungen: $content[views_allowed] +------------------------------------------ +Davon übrig: $content[views_max] +------------------------------------------ +Vergütung/Aufruf: $content[reward] {!POINTS!} +------------------------------------------ +Kosten/Aufruf: $content[costs] {!POINTS!} +------------------------------------------ +ID in der Surfbar: $content[id] +------------------------------------------ + +{--ADMIN_THANX--} + {--YOUR--} {!MAIN_TITLE!} {--SCRIPT--} + +{!URL!}/admin.php diff --git a/templates/de/emails/admin/admin_surfbar_url_active_pending.tpl b/templates/de/emails/admin/admin_surfbar_url_active_pending.tpl new file mode 100644 index 0000000000..53557cf57a --- /dev/null +++ b/templates/de/emails/admin/admin_surfbar_url_active_pending.tpl @@ -0,0 +1,33 @@ +{--HELLO_ADMIN--}, + +Ein Mitglied hat soeben seine freigegebene URL geändert. Dabei wurde sie auf "Wartend" gestellt. + +Hier sind alle Daten dazu: +------------------------------------------ +User-ID: $content[userid] +------------------------------------------ +Email: $content[email] +------------------------------------------ +Name: $content[surname] $content[family] +------------------------------------------ +Gebuchte URL: $content[url] (Neu: $content[edit][url]) +------------------------------------------ +ID in der Surfbar: $content[id] +------------------------------------------ +URL angemeldet: $content[registered] +------------------------------------------ +Zuletzt gesperrt: $content[last_locked] +------------------------------------------ +Sperrgrund: $content[lock_reason] +------------------------------------------ +Gesamteinblendungen: $content[views_total] +------------------------------------------ +Maximale Einblendungen: $content[views_allowed] (Neu: $content[edit][limit]) +------------------------------------------ +Davon übrig: $content[views_max] (Neu: $content[edit][limit]) +------------------------------------------ + +{--ADMIN_THANX--} + {--YOUR--} {!MAIN_TITLE!} {--SCRIPT--} + +{!URL!}/admin.php diff --git a/templates/de/emails/admin/admin_surfbar_url_edited.tpl b/templates/de/emails/admin/admin_surfbar_url_active_stopped.tpl similarity index 79% rename from templates/de/emails/admin/admin_surfbar_url_edited.tpl rename to templates/de/emails/admin/admin_surfbar_url_active_stopped.tpl index 2864f2d30b..947c696522 100644 --- a/templates/de/emails/admin/admin_surfbar_url_edited.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_active_stopped.tpl @@ -1,6 +1,6 @@ {--HELLO_ADMIN--}, -Ein Mitglied hat soeben seine URL geändert: +Ein Mitglied hat soeben seine URL gestoppt: Hier sind alle Daten dazu: ------------------------------------------ @@ -10,7 +10,7 @@ Email: $content[email] ------------------------------------------ Name: $content[surname] $content[family] ------------------------------------------ -Gebuchte URL: $content[url] (Neu: $content[new_url]) +Gebuchte URL: $content[url] ------------------------------------------ ID in der Surfbar: $content[id] ------------------------------------------ @@ -22,9 +22,9 @@ Sperrgrund: $content[lock_reason] ------------------------------------------ Gesamteinblendungen: $content[views_total] ------------------------------------------ -Maximale Einblendungen: $content[views_allowed] (Neu: $content[new_limit]) +Maximale Einblendungen: $content[views_allowed] ------------------------------------------ -Davon übrig: $content[views_max] (Neu: $content[new_limit]) +Davon übrig: $content[views_max] ------------------------------------------ {--ADMIN_THANX--} diff --git a/templates/de/emails/admin/admin_surfbar_url_deleted.tpl b/templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl similarity index 97% rename from templates/de/emails/admin/admin_surfbar_url_deleted.tpl rename to templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl index db8540029a..fa78ec5f1f 100644 --- a/templates/de/emails/admin/admin_surfbar_url_deleted.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl @@ -1,6 +1,6 @@ {--HELLO_ADMIN--}, -eines unserer Mitglieder hat soeben seine URL-Buchung zurückgezogen bzw. gel&oum;scht. +eines unserer Mitglieder hat soeben seine URL-Buchung zurückgezogen. Hier sind alle Daten dazu: ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_stopped_continued.tpl b/templates/de/emails/admin/admin_surfbar_url_stopped_continued.tpl new file mode 100644 index 0000000000..6f79d05bdc --- /dev/null +++ b/templates/de/emails/admin/admin_surfbar_url_stopped_continued.tpl @@ -0,0 +1,33 @@ +{--HELLO_ADMIN--}, + +Ein Mitglied hat soeben seine gestoppte URL gestartet. Dabei wurde sie auf "Wartend" gestellt. + +Hier sind alle Daten dazu: +------------------------------------------ +User-ID: $content[userid] +------------------------------------------ +Email: $content[email] +------------------------------------------ +Name: $content[surname] $content[family] +------------------------------------------ +Gebuchte URL: $content[url] +------------------------------------------ +ID in der Surfbar: $content[id] +------------------------------------------ +URL angemeldet: $content[registered] +------------------------------------------ +Zuletzt gesperrt: $content[last_locked] +------------------------------------------ +Sperrgrund: $content[lock_reason] +------------------------------------------ +Gesamteinblendungen: $content[views_total] +------------------------------------------ +Maximale Einblendungen: $content[views_allowed] +------------------------------------------ +Davon übrig: $content[views_max] +------------------------------------------ + +{--ADMIN_THANX--} + {--YOUR--} {!MAIN_TITLE!} {--SCRIPT--} + +{!URL!}/admin.php diff --git a/templates/de/emails/admin/admin_surfbar_url_stopped_deleted.tpl b/templates/de/emails/admin/admin_surfbar_url_stopped_deleted.tpl new file mode 100644 index 0000000000..09a1b251d3 --- /dev/null +++ b/templates/de/emails/admin/admin_surfbar_url_stopped_deleted.tpl @@ -0,0 +1,38 @@ +{--HELLO_ADMIN--}, + +eines unserer Mitglieder hat soeben seine gestoppte URL gelöscht. + +Hier sind alle Daten dazu: +------------------------------------------ +User-ID: $content[userid] +------------------------------------------ +Email: $content[email] +------------------------------------------ +Name: $content[surname] $content[family] +------------------------------------------ +Gebuchte URL: $content[url] +------------------------------------------ +ID in der Surfbar: $content[id] +------------------------------------------ +URL angemeldet: $content[registered] +------------------------------------------ +Framekiller-Test: +$content[frametester] +------------------------------------------ +Gesamteinblendungen: $content[views_total] +------------------------------------------ +Maximale Einblendungen: $content[views_allowed] +------------------------------------------ +Davon übrig: $content[views_max] +------------------------------------------ +Vergütung/Aufruf: $content[reward] {!POINTS!} +------------------------------------------ +Kosten/Aufruf: $content[costs] {!POINTS!} +------------------------------------------ +ID in der Surfbar: $content[id] +------------------------------------------ + +{--ADMIN_THANX--} + {--YOUR--} {!MAIN_TITLE!} {--SCRIPT--} + +{!URL!}/admin.php diff --git a/templates/de/emails/admin/admin_surfbar_url_stopped_pending.tpl b/templates/de/emails/admin/admin_surfbar_url_stopped_pending.tpl new file mode 100644 index 0000000000..8a21bf9ef7 --- /dev/null +++ b/templates/de/emails/admin/admin_surfbar_url_stopped_pending.tpl @@ -0,0 +1,33 @@ +{--HELLO_ADMIN--}, + +Ein Mitglied hat soeben seine gestoppte URL geändert. Dabei wurde sie auf "Wartend" gestellt. + +Hier sind alle Daten dazu: +------------------------------------------ +User-ID: $content[userid] +------------------------------------------ +Email: $content[email] +------------------------------------------ +Name: $content[surname] $content[family] +------------------------------------------ +Gebuchte URL: $content[url] (Neu: $content[edit][url]) +------------------------------------------ +ID in der Surfbar: $content[id] +------------------------------------------ +URL angemeldet: $content[registered] +------------------------------------------ +Zuletzt gesperrt: $content[last_locked] +------------------------------------------ +Sperrgrund: $content[lock_reason] +------------------------------------------ +Gesamteinblendungen: $content[views_total] +------------------------------------------ +Maximale Einblendungen: $content[views_allowed] (Neu: $content[edit][limit]) +------------------------------------------ +Davon übrig: $content[views_max] (Neu: $content[edit][limit]) +------------------------------------------ + +{--ADMIN_THANX--} + {--YOUR--} {!MAIN_TITLE!} {--SCRIPT--} + +{!URL!}/admin.php diff --git a/templates/de/emails/member/member_surfbar_url_active_deleted.tpl b/templates/de/emails/member/member_surfbar_url_active_deleted.tpl new file mode 100644 index 0000000000..f4f330e5a0 --- /dev/null +++ b/templates/de/emails/member/member_surfbar_url_active_deleted.tpl @@ -0,0 +1,19 @@ +Hallo $content[surname] $content[family],, + +Sie haben soeben Ihre freigegebene URL gelöscht. + +Hier sind alle Daten dazu: +------------------------------------------ +User-ID: $content[userid] +------------------------------------------ +Gebuchte URL: $content[url] +------------------------------------------ +ID in der Surfbar: $content[id] +------------------------------------------ +URL angemeldet: $content[registered] +------------------------------------------ + +{--ADMIN_THANX--} + {--YOUR--} {!MAIN_TITLE!} {--SCRIPT--} + +{!URL!}/admin.php diff --git a/templates/de/emails/member/member_surfbar_url_edited.tpl b/templates/de/emails/member/member_surfbar_url_active_pending.tpl similarity index 77% rename from templates/de/emails/member/member_surfbar_url_edited.tpl rename to templates/de/emails/member/member_surfbar_url_active_pending.tpl index 5113c0be24..15b6ab7614 100644 --- a/templates/de/emails/member/member_surfbar_url_edited.tpl +++ b/templates/de/emails/member/member_surfbar_url_active_pending.tpl @@ -1,12 +1,12 @@ Hallo $content[gender] $content[surname] $content[family], -Sie hatten soeben Ihre gebuchte URL geändert. Dabei wurde sie eventuell auf "Wartend" gestellt. +Sie hatten soeben Ihre freigegebene URL geändert. Dabei wurde sie auf "Wartend" gestellt. Hier sind alle Daten dazu: ------------------------------------------ User-ID: $content[userid] ------------------------------------------ -Gebuchte URL: $content[url] (Neu: $content[new_url]) +Gebuchte URL: $content[url] (Neu: $content[edit][url]) ------------------------------------------ ID in der Surfbar: $content[id] ------------------------------------------ @@ -16,7 +16,7 @@ Zuletzt gesperrt: $content[last_locked] ------------------------------------------ Sperrgrund: $content[lock_reason] ------------------------------------------ -Neue maximale Einblendungen: $content[new_limit] +Neue maximale Einblendungen: $content[edit][limit] ------------------------------------------ Mit freundlichem Gruss, diff --git a/templates/de/emails/member/member_surfbar_url_active_stopped.tpl b/templates/de/emails/member/member_surfbar_url_active_stopped.tpl new file mode 100644 index 0000000000..2e17de8e90 --- /dev/null +++ b/templates/de/emails/member/member_surfbar_url_active_stopped.tpl @@ -0,0 +1,23 @@ +Hallo $content[gender] $content[surname] $content[family], + +Sie hatten soeben Ihre gebuchte URL gestoppt. + +Hier sind alle Daten dazu: +------------------------------------------ +User-ID: $content[userid] +------------------------------------------ +Gebuchte URL: $content[url] +------------------------------------------ +ID in der Surfbar: $content[id] +------------------------------------------ +URL angemeldet: $content[registered] +------------------------------------------ +Zuletzt gesperrt: $content[last_locked] +------------------------------------------ +Sperrgrund: $content[lock_reason] +------------------------------------------ + +Mit freundlichem Gruss, + Ihr {!MAIN_TITLE!} Team + +{!URL!}/login.php ({!WEBMASTER!}) diff --git a/templates/de/emails/member/member_surfbar_url_deleted.tpl b/templates/de/emails/member/member_surfbar_url_pending_deleted.tpl similarity index 94% rename from templates/de/emails/member/member_surfbar_url_deleted.tpl rename to templates/de/emails/member/member_surfbar_url_pending_deleted.tpl index c535bca5cf..cba33e5f83 100644 --- a/templates/de/emails/member/member_surfbar_url_deleted.tpl +++ b/templates/de/emails/member/member_surfbar_url_pending_deleted.tpl @@ -1,6 +1,6 @@ Hallo $content[surname] $content[family],, -Sie haben soeben eine in unserer Surfbar gebuchte URL zurückgenommen bzw. gelöscht. +Sie haben soeben eine in unserer Surfbar gebuchte URL zurückgenommen. Hier sind alle Daten dazu: ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_stopped_continued.tpl b/templates/de/emails/member/member_surfbar_url_stopped_continued.tpl new file mode 100644 index 0000000000..96b2ba0840 --- /dev/null +++ b/templates/de/emails/member/member_surfbar_url_stopped_continued.tpl @@ -0,0 +1,25 @@ +Hallo $content[gender] $content[surname] $content[family], + +Sie hatten soeben Ihre gestoppte URL gestartet. Dabei wurde sie auf "Wartend" gestellt. + +Hier sind alle Daten dazu: +------------------------------------------ +User-ID: $content[userid] +------------------------------------------ +Gebuchte URL: $content[url] (Neu: $content[edit][url]) +------------------------------------------ +ID in der Surfbar: $content[id] +------------------------------------------ +URL angemeldet: $content[registered] +------------------------------------------ +Zuletzt gesperrt: $content[last_locked] +------------------------------------------ +Sperrgrund: $content[lock_reason] +------------------------------------------ +Neue maximale Einblendungen: $content[edit][limit] +------------------------------------------ + +Mit freundlichem Gruss, + Ihr {!MAIN_TITLE!} Team + +{!URL!}/login.php ({!WEBMASTER!}) diff --git a/templates/de/emails/member/member_surfbar_url_stopped_deleted.tpl b/templates/de/emails/member/member_surfbar_url_stopped_deleted.tpl new file mode 100644 index 0000000000..904c88fd76 --- /dev/null +++ b/templates/de/emails/member/member_surfbar_url_stopped_deleted.tpl @@ -0,0 +1,19 @@ +Hallo $content[surname] $content[family],, + +Sie haben soeben Ihre gestoppte URL gelöscht. + +Hier sind alle Daten dazu: +------------------------------------------ +User-ID: $content[userid] +------------------------------------------ +Gebuchte URL: $content[url] +------------------------------------------ +ID in der Surfbar: $content[id] +------------------------------------------ +URL angemeldet: $content[registered] +------------------------------------------ + +{--ADMIN_THANX--} + {--YOUR--} {!MAIN_TITLE!} {--SCRIPT--} + +{!URL!}/admin.php diff --git a/templates/de/emails/member/member_surfbar_url_stopped_pending.tpl b/templates/de/emails/member/member_surfbar_url_stopped_pending.tpl new file mode 100644 index 0000000000..5fb1c1b8bc --- /dev/null +++ b/templates/de/emails/member/member_surfbar_url_stopped_pending.tpl @@ -0,0 +1,25 @@ +Hallo $content[gender] $content[surname] $content[family], + +Sie hatten soeben Ihre gestoppte URL geändert. Dabei wurde sie auf "Wartend" gestellt. + +Hier sind alle Daten dazu: +------------------------------------------ +User-ID: $content[userid] +------------------------------------------ +Gebuchte URL: $content[url] (Neu: $content[edit][url]) +------------------------------------------ +ID in der Surfbar: $content[id] +------------------------------------------ +URL angemeldet: $content[registered] +------------------------------------------ +Zuletzt gesperrt: $content[last_locked] +------------------------------------------ +Sperrgrund: $content[lock_reason] +------------------------------------------ +Neue maximale Einblendungen: $content[edit][limit] +------------------------------------------ + +Mit freundlichem Gruss, + Ihr {!MAIN_TITLE!} Team + +{!URL!}/login.php ({!WEBMASTER!}) -- 2.39.5