From 05cadb6f429907bfde44cab0f9309d82113f03d1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 5 Dec 2008 00:13:39 +0000 Subject: [PATCH] Missing templates/language strings added for migrated URLs --- .gitattributes | 11 +++++++ inc/databases.php | 2 +- inc/extensions/ext-surfbar.php | 2 +- inc/language/surfbar_de.php | 6 ++++ templates/de/emails/.htaccess | 1 + templates/de/emails/admin/.htaccess | 1 + .../admin_surfbar_url_migrated_deleted.tpl | 33 +++++++++++++++++++ .../admin_surfbar_url_migrated_migrated.tpl | 33 +++++++++++++++++++ .../admin_surfbar_url_migrated_pending.tpl | 33 +++++++++++++++++++ templates/de/emails/admins/.htaccess | 2 +- templates/de/emails/beg/.htaccess | 2 +- templates/de/emails/bonus/.htaccess | 2 +- templates/de/emails/guest/.htaccess | 1 + templates/de/emails/member/.htaccess | 1 + .../member_surfbar_url_active_deleted.tpl | 4 +-- .../member_surfbar_url_locked_deleted.tpl | 4 +-- .../member_surfbar_url_migrated_deleted.tpl | 19 +++++++++++ .../member_surfbar_url_migrated_migrated.tpl | 21 ++++++++++++ .../member_surfbar_url_migrated_pending.tpl | 19 +++++++++++ .../member_surfbar_url_pending_deleted.tpl | 4 +-- .../member_surfbar_url_stopped_deleted.tpl | 4 +-- templates/de/emails/sponsor/.htaccess | 1 + 22 files changed, 193 insertions(+), 13 deletions(-) create mode 100644 templates/de/emails/.htaccess create mode 100644 templates/de/emails/admin/.htaccess create mode 100644 templates/de/emails/admin/admin_surfbar_url_migrated_deleted.tpl create mode 100644 templates/de/emails/admin/admin_surfbar_url_migrated_migrated.tpl create mode 100644 templates/de/emails/admin/admin_surfbar_url_migrated_pending.tpl create mode 100644 templates/de/emails/guest/.htaccess create mode 100644 templates/de/emails/member/.htaccess create mode 100644 templates/de/emails/member/member_surfbar_url_migrated_deleted.tpl create mode 100644 templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl create mode 100644 templates/de/emails/member/member_surfbar_url_migrated_pending.tpl create mode 100644 templates/de/emails/sponsor/.htaccess diff --git a/.gitattributes b/.gitattributes index 1a68632c5c..f0d603f5a7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -619,8 +619,10 @@ install/tables.sql -text /surfbar.php -text templates/.htaccess -text templates/de/.htaccess -text +templates/de/emails/.htaccess -text templates/de/emails/add-points.tpl -text templates/de/emails/admin-del_links.tpl -text +templates/de/emails/admin/.htaccess -text templates/de/emails/admin/admin_autopurge_del_mails.tpl -text templates/de/emails/admin/admin_autopurge_delete.tpl -text templates/de/emails/admin/admin_autopurge_inactive.tpl -text @@ -665,6 +667,9 @@ templates/de/emails/admin/admin_surfbar_url_depleted.tpl -text templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl -text templates/de/emails/admin/admin_surfbar_url_locked_pending.tpl -text templates/de/emails/admin/admin_surfbar_url_migrate.tpl -text +templates/de/emails/admin/admin_surfbar_url_migrated_deleted.tpl -text +templates/de/emails/admin/admin_surfbar_url_migrated_migrated.tpl -text +templates/de/emails/admin/admin_surfbar_url_migrated_pending.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 @@ -699,10 +704,12 @@ templates/de/emails/del-user.tpl -text templates/de/emails/del_sponsor.tpl -text templates/de/emails/done-admin.tpl -text templates/de/emails/done-member.tpl -text +templates/de/emails/guest/.htaccess -text templates/de/emails/guest/guest_request_confirm.tpl -text templates/de/emails/header.tpl -text templates/de/emails/lock-user.tpl -text templates/de/emails/lock_sponsor.tpl -text +templates/de/emails/member/.htaccess -text templates/de/emails/member/member_autopurge_delete.tpl -text templates/de/emails/member/member_autopurge_inactive.tpl -text templates/de/emails/member/member_autopurge_points.tpl -text @@ -749,6 +756,9 @@ templates/de/emails/member/member_surfbar_url_depleted.tpl -text templates/de/emails/member/member_surfbar_url_locked_deleted.tpl -text templates/de/emails/member/member_surfbar_url_locked_pending.tpl -text templates/de/emails/member/member_surfbar_url_migrate.tpl -text +templates/de/emails/member/member_surfbar_url_migrated_deleted.tpl -text +templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl -text +templates/de/emails/member/member_surfbar_url_migrated_pending.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 @@ -775,6 +785,7 @@ templates/de/emails/order-reject.tpl -text templates/de/emails/profile-updte.tpl -text templates/de/emails/register-admin.tpl -text templates/de/emails/register-member.tpl -text +templates/de/emails/sponsor/.htaccess -text templates/de/emails/sponsor/sponsor_activate.tpl -text templates/de/emails/sponsor/sponsor_add_points.tpl -text templates/de/emails/sponsor/sponsor_change_data.tpl -text diff --git a/inc/databases.php b/inc/databases.php index 9146e30005..ee0c53f73a 100644 --- a/inc/databases.php +++ b/inc/databases.php @@ -114,7 +114,7 @@ define('USAGE_BASE', "usage"); define('SERVER_URL', "http://www.mxchange.org"); // Current SVN revision -define('CURR_SVN_REVISION', "595"); +define('CURR_SVN_REVISION', "596"); // Take a prime number which is long (if you know a longer one please try it out!) define('_PRIME', 591623); diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php index 5f0d5e1f20..a4345b4f66 100644 --- a/inc/extensions/ext-surfbar.php +++ b/inc/extensions/ext-surfbar.php @@ -138,7 +138,7 @@ UNIQUE KEY `status_action` (`status`,`action`) $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('REJECTED','DELETE','DELETED')"; $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('REJECTED','FRAMETEST',NULL)"; $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('REJECTED','RESUBMIT','PENDING')"; - $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('MIGRATED','EDIT','PENDING')"; + $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('MIGRATED','EDIT','MIGRATED')"; $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('MIGRATED','DELETE','DELETED')"; $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('MIGRATED','FRAMETEST',NULL)"; $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('MIGRATED','BOOKNOW','PENDING')"; diff --git a/inc/language/surfbar_de.php b/inc/language/surfbar_de.php index 7769c4f98e..7f47e0f2a0 100644 --- a/inc/language/surfbar_de.php +++ b/inc/language/surfbar_de.php @@ -158,6 +158,9 @@ define('ADMIN_SURFBAR_NOTIFY_URL_LOCKED_PENDING_SUBJECT', "[Surfbar:] Mitglied h 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_URL_MIGRATED_DELETED_SUBJECT', "[Surfbar:] Mitglied hat migrierte URL gelöscht"); +define('ADMIN_SURFBAR_NOTIFY_URL_MIGRATED_MIGRATED_SUBJECT', "[Surfbar:] Mitglied hat migrierte URL geändert"); +define('ADMIN_SURFBAR_NOTIFY_URL_MIGRATED_PENDING_SUBJECT', "[Surfbar:] Mitglied hat migrierte URL gebucht"); define('ADMIN_SURFBAR_NOTIFY_DEFAULT_SUBJECT', "Problem in Surfbar-Betreff"); // Auto-generated admin subject lines @@ -183,6 +186,9 @@ define('MEMBER_SURFBAR_NOTIFY_URL_LOCKED_PENDING_SUBJECT', "[Surfbar:] Sie haben 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_STOPPED_SUBJECT', "[Surfbar:] Sie haben Ihre freigegebene URL gestoppt"); +define('MEMBER_SURFBAR_NOTIFY_URL_MIGRATED_DELETED_SUBJECT', "[Surfbar:] Sie haben eine migrierte URL gelöscht"); +define('MEMBER_SURFBAR_NOTIFY_URL_MIGRATED_MIGRATED_SUBJECT', "[Surfbar:] Sie haben eine migrierte URL geändert"); +define('MEMBER_SURFBAR_NOTIFY_URL_MIGRATED_PENDING_SUBJECT', "[Surfbar:] Sie haben eine migrierte URL gebucht"); 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/templates/de/emails/.htaccess b/templates/de/emails/.htaccess new file mode 100644 index 0000000000..14249c50bd --- /dev/null +++ b/templates/de/emails/.htaccess @@ -0,0 +1 @@ +Deny from all \ No newline at end of file diff --git a/templates/de/emails/admin/.htaccess b/templates/de/emails/admin/.htaccess new file mode 100644 index 0000000000..14249c50bd --- /dev/null +++ b/templates/de/emails/admin/.htaccess @@ -0,0 +1 @@ +Deny from all \ No newline at end of file diff --git a/templates/de/emails/admin/admin_surfbar_url_migrated_deleted.tpl b/templates/de/emails/admin/admin_surfbar_url_migrated_deleted.tpl new file mode 100644 index 0000000000..0867e38bb5 --- /dev/null +++ b/templates/de/emails/admin/admin_surfbar_url_migrated_deleted.tpl @@ -0,0 +1,33 @@ +{--HELLO_ADMIN--}, + +Ein Mitglied hat soeben eine migrierte 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] +------------------------------------------ +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_migrated_migrated.tpl b/templates/de/emails/admin/admin_surfbar_url_migrated_migrated.tpl new file mode 100644 index 0000000000..270e548e5b --- /dev/null +++ b/templates/de/emails/admin/admin_surfbar_url_migrated_migrated.tpl @@ -0,0 +1,33 @@ +{--HELLO_ADMIN--}, + +Ein Mitglied hat soeben eine migrierte URL geändert. Dabei wurde sie auf "Migriert" belassen. + +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_migrated_pending.tpl b/templates/de/emails/admin/admin_surfbar_url_migrated_pending.tpl new file mode 100644 index 0000000000..632cc92618 --- /dev/null +++ b/templates/de/emails/admin/admin_surfbar_url_migrated_pending.tpl @@ -0,0 +1,33 @@ +{--HELLO_ADMIN--}, + +Ein Mitglied hat soeben eine migrierte URL gebucht. 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/admins/.htaccess b/templates/de/emails/admins/.htaccess index 03688ee918..14249c50bd 100644 --- a/templates/de/emails/admins/.htaccess +++ b/templates/de/emails/admins/.htaccess @@ -1 +1 @@ -Deny from all +Deny from all \ No newline at end of file diff --git a/templates/de/emails/beg/.htaccess b/templates/de/emails/beg/.htaccess index 03688ee918..14249c50bd 100644 --- a/templates/de/emails/beg/.htaccess +++ b/templates/de/emails/beg/.htaccess @@ -1 +1 @@ -Deny from all +Deny from all \ No newline at end of file diff --git a/templates/de/emails/bonus/.htaccess b/templates/de/emails/bonus/.htaccess index 03688ee918..14249c50bd 100644 --- a/templates/de/emails/bonus/.htaccess +++ b/templates/de/emails/bonus/.htaccess @@ -1 +1 @@ -Deny from all +Deny from all \ No newline at end of file diff --git a/templates/de/emails/guest/.htaccess b/templates/de/emails/guest/.htaccess new file mode 100644 index 0000000000..14249c50bd --- /dev/null +++ b/templates/de/emails/guest/.htaccess @@ -0,0 +1 @@ +Deny from all \ No newline at end of file diff --git a/templates/de/emails/member/.htaccess b/templates/de/emails/member/.htaccess new file mode 100644 index 0000000000..14249c50bd --- /dev/null +++ b/templates/de/emails/member/.htaccess @@ -0,0 +1 @@ +Deny from all \ No newline at end of file diff --git a/templates/de/emails/member/member_surfbar_url_active_deleted.tpl b/templates/de/emails/member/member_surfbar_url_active_deleted.tpl index f4f330e5a0..2def4fc555 100644 --- a/templates/de/emails/member/member_surfbar_url_active_deleted.tpl +++ b/templates/de/emails/member/member_surfbar_url_active_deleted.tpl @@ -1,6 +1,6 @@ -Hallo $content[surname] $content[family],, +Hallo $content[gender] $content[surname] $content[family], -Sie haben soeben Ihre freigegebene URL gelöscht. +Sie haben soeben Ihre freigegebene URL gelöscht. Sollte dies ein Versehen sein, so melden Sie sich bitte beim Support. Hier sind alle Daten dazu: ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_locked_deleted.tpl b/templates/de/emails/member/member_surfbar_url_locked_deleted.tpl index 43df8f6c92..ce5c309efa 100644 --- a/templates/de/emails/member/member_surfbar_url_locked_deleted.tpl +++ b/templates/de/emails/member/member_surfbar_url_locked_deleted.tpl @@ -1,6 +1,6 @@ -Hallo $content[surname] $content[family],, +Hallo $content[gender] $content[surname] $content[family], -Sie haben soeben Ihre gesperrte URL gelöscht. +Sie haben soeben Ihre gesperrte URL gelöscht. Sollte dies ein Versehen sein, so melden Sie sich bitte beim Support. Hier sind alle Daten dazu: ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_migrated_deleted.tpl b/templates/de/emails/member/member_surfbar_url_migrated_deleted.tpl new file mode 100644 index 0000000000..5f8445882a --- /dev/null +++ b/templates/de/emails/member/member_surfbar_url_migrated_deleted.tpl @@ -0,0 +1,19 @@ +Hallo $content[gender] $content[surname] $content[family], + +Sie hatten soeben Ihre aus der Mailbuchung migrierte URL gelöscht. Sollte dies ein Versehen sein, so melden Sie sich bitte beim Support. + +Hier sind alle Daten dazu: +------------------------------------------ +User-ID: $content[userid] +------------------------------------------ +Gebuchte URL: $content[url] +------------------------------------------ +ID in der Surfbar: $content[id] +------------------------------------------ +URL angemeldet: $content[registered] +------------------------------------------ + +Mit freundlichem Gruss, + Ihr {!MAIN_TITLE!} Team + +{!URL!}/login.php ({!WEBMASTER!}) diff --git a/templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl b/templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl new file mode 100644 index 0000000000..f5e2094f97 --- /dev/null +++ b/templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl @@ -0,0 +1,21 @@ +Hallo $content[gender] $content[surname] $content[family], + +Sie hatten soeben Ihre aus der Mailbuchung migrierte URL geändert. Bitte buchen Sie diese, wenn Sie dies wünschen. + +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] +------------------------------------------ +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_migrated_pending.tpl b/templates/de/emails/member/member_surfbar_url_migrated_pending.tpl new file mode 100644 index 0000000000..a0a673dcd5 --- /dev/null +++ b/templates/de/emails/member/member_surfbar_url_migrated_pending.tpl @@ -0,0 +1,19 @@ +Hallo $content[gender] $content[surname] $content[family], + +Sie hatten soeben Ihre aus der Mailbuchung migrierte URL gebucht. Dabei wurde sie auf "Wartend" gestellt. + +Hier sind alle Daten dazu: +------------------------------------------ +User-ID: $content[userid] +------------------------------------------ +Gebuchte URL: $content[url] +------------------------------------------ +ID in der Surfbar: $content[id] +------------------------------------------ +URL angemeldet: $content[registered] +------------------------------------------ + +Mit freundlichem Gruss, + Ihr {!MAIN_TITLE!} Team + +{!URL!}/login.php ({!WEBMASTER!}) diff --git a/templates/de/emails/member/member_surfbar_url_pending_deleted.tpl b/templates/de/emails/member/member_surfbar_url_pending_deleted.tpl index cba33e5f83..0d54985885 100644 --- a/templates/de/emails/member/member_surfbar_url_pending_deleted.tpl +++ b/templates/de/emails/member/member_surfbar_url_pending_deleted.tpl @@ -1,6 +1,6 @@ -Hallo $content[surname] $content[family],, +Hallo $content[gender] $content[surname] $content[family], -Sie haben soeben eine in unserer Surfbar gebuchte URL zurückgenommen. +Sie haben soeben eine in unserer Surfbar gebuchte URL zurückgenommen. Sollte dies ein Versehen sein, so melden Sie sich bitte beim Support. Hier sind alle Daten dazu: ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_stopped_deleted.tpl b/templates/de/emails/member/member_surfbar_url_stopped_deleted.tpl index 904c88fd76..be394ca782 100644 --- a/templates/de/emails/member/member_surfbar_url_stopped_deleted.tpl +++ b/templates/de/emails/member/member_surfbar_url_stopped_deleted.tpl @@ -1,6 +1,6 @@ -Hallo $content[surname] $content[family],, +Hallo $content[gender] $content[surname] $content[family], -Sie haben soeben Ihre gestoppte URL gelöscht. +Sie haben soeben Ihre gestoppte URL gelöscht. Sollte dies ein Versehen sein, so melden Sie sich bitte beim Support. Hier sind alle Daten dazu: ------------------------------------------ diff --git a/templates/de/emails/sponsor/.htaccess b/templates/de/emails/sponsor/.htaccess new file mode 100644 index 0000000000..14249c50bd --- /dev/null +++ b/templates/de/emails/sponsor/.htaccess @@ -0,0 +1 @@ +Deny from all \ No newline at end of file -- 2.39.5