From dd4e427f846625b8a7131108b99b612576cc4821 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 27 Nov 2008 23:58:31 +0000 Subject: [PATCH] Templates added if user retreats an URL, tpos fixed --- .gitattributes | 2 + inc/databases.php | 2 +- .../emails/admin/admin_del_surfbar_urls.tpl | 2 +- .../emails/admin/admin_edit_surfbar_urls.tpl | 2 +- .../admin_lock_confirmed_surfbar_urls.tpl | 2 +- .../admin/admin_lock_locked_surfbar_urls.tpl | 2 +- .../de/emails/admin/admin_sponsor_edit.tpl | 2 +- .../admin/admin_surfbar_url_deleted.tpl | 38 +++++++++++++++++++ .../admin/admin_surfbar_url_depleted.tpl | 2 +- .../admin/admin_surfbar_url_migrate.tpl | 2 +- .../admin/admin_surfbar_url_pending.tpl | 2 +- .../de/emails/admin/admin_surfbar_url_reg.tpl | 2 +- .../admin_undelete_active_surfbar_urls.tpl | 2 +- .../member/member_surfbar_url_deleted.tpl | 19 ++++++++++ 14 files changed, 70 insertions(+), 11 deletions(-) create mode 100644 templates/de/emails/admin/admin_surfbar_url_deleted.tpl create mode 100644 templates/de/emails/member/member_surfbar_url_deleted.tpl diff --git a/.gitattributes b/.gitattributes index e16bba4df2..471c8fa0b3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -654,6 +654,7 @@ 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_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 @@ -730,6 +731,7 @@ 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_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 diff --git a/inc/databases.php b/inc/databases.php index 5cebf9659d..cd110b9cb1 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', "567"); +define('CURR_SVN_REVISION', "568"); // Take a prime number which is long (if you know a longer one please try it out!) define('_PRIME', 591623); diff --git a/templates/de/emails/admin/admin_del_surfbar_urls.tpl b/templates/de/emails/admin/admin_del_surfbar_urls.tpl index 87d0352da7..498f9269fa 100644 --- a/templates/de/emails/admin/admin_del_surfbar_urls.tpl +++ b/templates/de/emails/admin/admin_del_surfbar_urls.tpl @@ -2,7 +2,7 @@ Es wurde eine URL aus der Surfbar gelöscht. -Hier sind alle dazu: +Hier sind alle Daten dazu: ------------------------------------------ Gebuchte URL: $content[url] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_edit_surfbar_urls.tpl b/templates/de/emails/admin/admin_edit_surfbar_urls.tpl index 6474ad6202..4b96d8e93c 100644 --- a/templates/de/emails/admin/admin_edit_surfbar_urls.tpl +++ b/templates/de/emails/admin/admin_edit_surfbar_urls.tpl @@ -2,7 +2,7 @@ Es wurde eine URL aus der Surfbar geändert. -Hier sind alle dazu: +Hier sind alle Daten dazu: ------------------------------------------ Gebuchte URL: $DATA[url] Neue URL: $content[url] diff --git a/templates/de/emails/admin/admin_lock_confirmed_surfbar_urls.tpl b/templates/de/emails/admin/admin_lock_confirmed_surfbar_urls.tpl index 2d77e64422..ad32d2fc36 100644 --- a/templates/de/emails/admin/admin_lock_confirmed_surfbar_urls.tpl +++ b/templates/de/emails/admin/admin_lock_confirmed_surfbar_urls.tpl @@ -2,7 +2,7 @@ Es wurde eine URL in der Surfbar freigegeben. -Hier sind alle dazu: +Hier sind alle Daten dazu: ------------------------------------------ URL: $content[url] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_lock_locked_surfbar_urls.tpl b/templates/de/emails/admin/admin_lock_locked_surfbar_urls.tpl index 80696d4540..fbc21c4ec2 100644 --- a/templates/de/emails/admin/admin_lock_locked_surfbar_urls.tpl +++ b/templates/de/emails/admin/admin_lock_locked_surfbar_urls.tpl @@ -2,7 +2,7 @@ Es wurde eine URL in der Surfbar gesperrt. -Hier sind alle dazu: +Hier sind alle Daten dazu: ------------------------------------------ URL: $content[url] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_sponsor_edit.tpl b/templates/de/emails/admin/admin_sponsor_edit.tpl index fbe2800211..6ed49b9779 100644 --- a/templates/de/emails/admin/admin_sponsor_edit.tpl +++ b/templates/de/emails/admin/admin_sponsor_edit.tpl @@ -33,4 +33,4 @@ Es sind nun folgende Daten gesetzt: Mit freundlichem Gruss, Ihr {!MAIN_TITLE!} Team -{!URL!} ({!WEBMASTER!}) \ No newline at end of file +{!URL!} ({!WEBMASTER!}) diff --git a/templates/de/emails/admin/admin_surfbar_url_deleted.tpl b/templates/de/emails/admin/admin_surfbar_url_deleted.tpl new file mode 100644 index 0000000000..fa78ec5f1f --- /dev/null +++ b/templates/de/emails/admin/admin_surfbar_url_deleted.tpl @@ -0,0 +1,38 @@ +{--HELLO_ADMIN--}, + +eines unserer Mitglieder hat soeben seine URL-Buchung zurückgezogen. + +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_depleted.tpl b/templates/de/emails/admin/admin_surfbar_url_depleted.tpl index ad8306766d..20b1781cd3 100644 --- a/templates/de/emails/admin/admin_surfbar_url_depleted.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_depleted.tpl @@ -2,7 +2,7 @@ eine URL wurde soeben automatisch angehalten, da die maximalen Views verbraucht sind. -Hier sind alle dazu: +Hier sind alle Daten dazu: ------------------------------------------ Gebuchte URL: $content[url] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_migrate.tpl b/templates/de/emails/admin/admin_surfbar_url_migrate.tpl index 83eaa7e4ff..128b2c4c46 100644 --- a/templates/de/emails/admin/admin_surfbar_url_migrate.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_migrate.tpl @@ -2,7 +2,7 @@ es wurde soeben eine URL durch Freischaltung einer Mailbuchung in die Surfbar migriert. -Hier sind alle dazu: +Hier sind alle Daten dazu: ------------------------------------------ Gebuchte URL: $content[url] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_pending.tpl b/templates/de/emails/admin/admin_surfbar_url_pending.tpl index 7c313eb8b1..8da0c18b79 100644 --- a/templates/de/emails/admin/admin_surfbar_url_pending.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_pending.tpl @@ -2,7 +2,7 @@ ein Mitglied hat soeben einer URL-Buchung in Ihrer Surfbar zugestimmt. Diese wurde aus einer Mailbuchung migriert. -Hier sind alle dazu: +Hier sind alle Daten dazu: ------------------------------------------ Gebuchte URL: $content[url] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_reg.tpl b/templates/de/emails/admin/admin_surfbar_url_reg.tpl index 779163baca..432b0a9dac 100644 --- a/templates/de/emails/admin/admin_surfbar_url_reg.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_reg.tpl @@ -2,7 +2,7 @@ ein Mitglied hat soeben eine URL in der Surfbar gebucht. -Hier sind alle dazu: +Hier sind alle Daten dazu: ------------------------------------------ Gebuchte URL: $content[url] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_undelete_active_surfbar_urls.tpl b/templates/de/emails/admin/admin_undelete_active_surfbar_urls.tpl index fdb7b672c0..a46922fe70 100644 --- a/templates/de/emails/admin/admin_undelete_active_surfbar_urls.tpl +++ b/templates/de/emails/admin/admin_undelete_active_surfbar_urls.tpl @@ -2,7 +2,7 @@ Es wurde eine zuvor gelöschte URL in der Surfbar wiederhergestellt. -Hier sind alle dazu: +Hier sind alle Daten dazu: ------------------------------------------ URL: $content[url] ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_deleted.tpl b/templates/de/emails/member/member_surfbar_url_deleted.tpl new file mode 100644 index 0000000000..722ca1217f --- /dev/null +++ b/templates/de/emails/member/member_surfbar_url_deleted.tpl @@ -0,0 +1,19 @@ +Hallo $content[surname] $content[family],, + +Sie haben soeben eine in unserer Surfbar gebuchte URL zurückgenommen. + +Hier sind alle Daten dazu: +------------------------------------------ +User-ID: $content[userid] +------------------------------------------ +Gebuchte URL: $content[url] (Neu: $content[new_url]) +------------------------------------------ +ID in der Surfbar: $content[id] +------------------------------------------ +URL angemeldet: $content[registered] +------------------------------------------ + +{--ADMIN_THANX--} + {--YOUR--} {!MAIN_TITLE!} {--SCRIPT--} + +{!URL!}/admin.php -- 2.39.5