Missing templates/language strings added for migrated URLs
authorRoland Häder <roland@mxchange.org>
Fri, 5 Dec 2008 00:13:39 +0000 (00:13 +0000)
committerRoland Häder <roland@mxchange.org>
Fri, 5 Dec 2008 00:13:39 +0000 (00:13 +0000)
22 files changed:
.gitattributes
inc/databases.php
inc/extensions/ext-surfbar.php
inc/language/surfbar_de.php
templates/de/emails/.htaccess [new file with mode: 0644]
templates/de/emails/admin/.htaccess [new file with mode: 0644]
templates/de/emails/admin/admin_surfbar_url_migrated_deleted.tpl [new file with mode: 0644]
templates/de/emails/admin/admin_surfbar_url_migrated_migrated.tpl [new file with mode: 0644]
templates/de/emails/admin/admin_surfbar_url_migrated_pending.tpl [new file with mode: 0644]
templates/de/emails/admins/.htaccess
templates/de/emails/beg/.htaccess
templates/de/emails/bonus/.htaccess
templates/de/emails/guest/.htaccess [new file with mode: 0644]
templates/de/emails/member/.htaccess [new file with mode: 0644]
templates/de/emails/member/member_surfbar_url_active_deleted.tpl
templates/de/emails/member/member_surfbar_url_locked_deleted.tpl
templates/de/emails/member/member_surfbar_url_migrated_deleted.tpl [new file with mode: 0644]
templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl [new file with mode: 0644]
templates/de/emails/member/member_surfbar_url_migrated_pending.tpl [new file with mode: 0644]
templates/de/emails/member/member_surfbar_url_pending_deleted.tpl
templates/de/emails/member/member_surfbar_url_stopped_deleted.tpl
templates/de/emails/sponsor/.htaccess [new file with mode: 0644]

index 1a68632..f0d603f 100644 (file)
@@ -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
index 9146e30..ee0c53f 100644 (file)
@@ -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);
index 5f0d5e1..a4345b4 100644 (file)
@@ -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')";
index 7769c4f..7f47e0f 100644 (file)
@@ -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&auml;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&ouml;scht");
+define('ADMIN_SURFBAR_NOTIFY_URL_MIGRATED_MIGRATED_SUBJECT', "[Surfbar:] Mitglied hat migrierte URL ge&auml;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&auml;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&ouml;scht");
+define('MEMBER_SURFBAR_NOTIFY_URL_MIGRATED_MIGRATED_SUBJECT', "[Surfbar:] Sie haben eine migrierte URL ge&auml;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 (file)
index 0000000..14249c5
--- /dev/null
@@ -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 (file)
index 0000000..14249c5
--- /dev/null
@@ -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 (file)
index 0000000..0867e38
--- /dev/null
@@ -0,0 +1,33 @@
+{--HELLO_ADMIN--},
+
+Ein Mitglied hat soeben eine migrierte URL gel&ouml;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 &uuml;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 (file)
index 0000000..270e548
--- /dev/null
@@ -0,0 +1,33 @@
+{--HELLO_ADMIN--},
+
+Ein Mitglied hat soeben eine migrierte URL ge&auml;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 &uuml;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 (file)
index 0000000..632cc92
--- /dev/null
@@ -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 &uuml;brig: $content[views_max]
+------------------------------------------
+
+{--ADMIN_THANX--}
+  {--YOUR--} {!MAIN_TITLE!} {--SCRIPT--}
+
+{!URL!}/admin.php
index 03688ee..14249c5 100644 (file)
@@ -1 +1 @@
-Deny from all\r
+Deny from all
\ No newline at end of file
index 03688ee..14249c5 100644 (file)
@@ -1 +1 @@
-Deny from all\r
+Deny from all
\ No newline at end of file
index 03688ee..14249c5 100644 (file)
@@ -1 +1 @@
-Deny from all\r
+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 (file)
index 0000000..14249c5
--- /dev/null
@@ -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 (file)
index 0000000..14249c5
--- /dev/null
@@ -0,0 +1 @@
+Deny from all
\ No newline at end of file
index f4f330e..2def4fc 100644 (file)
@@ -1,6 +1,6 @@
-Hallo $content[surname] $content[family],,
+Hallo $content[gender] $content[surname] $content[family],
 
-Sie haben soeben Ihre freigegebene URL gel&ouml;scht.
+Sie haben soeben Ihre freigegebene URL gel&ouml;scht. Sollte dies ein Versehen sein, so melden Sie sich bitte beim Support.
 
 Hier sind alle Daten dazu:
 ------------------------------------------
index 43df8f6..ce5c309 100644 (file)
@@ -1,6 +1,6 @@
-Hallo $content[surname] $content[family],,
+Hallo $content[gender] $content[surname] $content[family],
 
-Sie haben soeben Ihre gesperrte URL gel&ouml;scht.
+Sie haben soeben Ihre gesperrte URL gel&ouml;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 (file)
index 0000000..5f84458
--- /dev/null
@@ -0,0 +1,19 @@
+Hallo $content[gender] $content[surname] $content[family],
+
+Sie hatten soeben Ihre aus der Mailbuchung migrierte URL gel&ouml;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 (file)
index 0000000..f5e2094
--- /dev/null
@@ -0,0 +1,21 @@
+Hallo $content[gender] $content[surname] $content[family],
+
+Sie hatten soeben Ihre aus der Mailbuchung migrierte URL ge&auml;ndert. Bitte buchen Sie diese, wenn Sie dies w&uuml;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 (file)
index 0000000..a0a673d
--- /dev/null
@@ -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!})
index cba33e5..0d54985 100644 (file)
@@ -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&uuml;ckgenommen.
+Sie haben soeben eine in unserer Surfbar gebuchte URL zur&uuml;ckgenommen. Sollte dies ein Versehen sein, so melden Sie sich bitte beim Support.
 
 Hier sind alle Daten dazu:
 ------------------------------------------
index 904c88f..be394ca 100644 (file)
@@ -1,6 +1,6 @@
-Hallo $content[surname] $content[family],,
+Hallo $content[gender] $content[surname] $content[family],
 
-Sie haben soeben Ihre gestoppte URL gel&ouml;scht.
+Sie haben soeben Ihre gestoppte URL gel&ouml;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 (file)
index 0000000..14249c5
--- /dev/null
@@ -0,0 +1 @@
+Deny from all
\ No newline at end of file