More surfbar templates added:

- Deleting and re-submitting locked URLs
- Missing function added

diff --git a/.gitattributes b/.gitattributes
index 5440dc26d10d548066c4d6d7b41a2157fecf9b0e..52d2aea4f838fa841fcc6a821a7ff32e34f278d9 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -659,6 +659,8 @@ 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_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_pending.tpl -text
 templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl -text
@@ -741,6 +743,8 @@ 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_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_pending.tpl -text
 templates/de/emails/member/member_surfbar_url_pending_deleted.tpl -text

diff --git a/inc/databases.php b/inc/databases.php
index f268fd450a26469684d73394f0f3b619cd9f64dd..ddda760fd24697d5d9d64c1edc204f145addd410 100644 (file)
--- 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', "574");
+define('CURR_SVN_REVISION', "575");
 
 // 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/surfbar_de.php b/inc/language/surfbar_de.php
index ab358c58dcfa9b7d3d5a455b9935a1ea801f797e..7d0bbcd712ce061d684e5e494043053c1166db0a 100644 (file)
--- a/inc/language/surfbar_de.php
+++ b/inc/language/surfbar_de.php
@@ -147,12 +147,14 @@ define('ADMIN_SURFBAR_NOTIFY_URL_REG_SUBJECT', "[Surfbar:] Mitgliedsbuchung eine
 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_ACTIVE_DELETED_SUBJECT', "[Surfbar:] Mitglied hat freigegebene URL gelöscht");
+define('ADMIN_SURFBAR_NOTIFY_URL_LOCKED_DELETED_SUBJECT', "[Surfbar:] Mitglied hat gesperrte 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_ACTIVE_PENDING_SUBJECT', "[Surfbar:] Mitglied hat freigegebene URL geändert");
+define('ADMIN_SURFBAR_NOTIFY_URL_LOCKED_PENDING_SUBJECT', "[Surfbar:] Mitglied hat gesperrte URL erneut gebucht");
 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");
@@ -170,14 +172,16 @@ define('MEMBER_SURFBAR_NOTIFY_URL_REG_SUBJECT', "[Surfbar:] Ihre URL wartet auf
 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_ACTIVE_DELETED_SUBJECT', "[Surfbar:] Sie haben Ihre freigegebene URL gelöscht");
+define('MEMBER_SURFBAR_NOTIFY_URL_LOCKED_DELETED_SUBJECT', "[Surfbar:] Sie haben eine gesperrte 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_ACTIVE_PENDING_SUBJECT', "[Surfbar:] Sie haben Ihre freigegebene URL geändert");
+define('MEMBER_SURFBAR_NOTIFY_URL_LOCKED_PENDING_SUBJECT', "[Surfbar:] Sie haben eine gesperrte URL erneut gebucht");
 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 26610a438ed795a8d4430cfbd5886651cc9dd28f..e1de2d3bd53ddc3e04e0d29d8146292fa42e778a 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -340,6 +340,10 @@ function SURFBAR_MEMBER_UNPAUSE_ACTION ($urlData) {
        // Return status change
        return SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['status'], $urlData['new_status'], array($urlData['id'] => $urlData));
 }
+// Resubmit locked URL
+function SURFBAR_MEMBER_RESUBMIT_ACTION ($urlData) {
+       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
@@ -681,6 +685,14 @@ function SURFBAR_NOTIFY_USER ($messageType, $content) {
                ADD_FATAL(MEMBER_SURFBAR_NOTIFY_SUBJECT_404, $constantName);
        }
 
+       // Translate some data if present
+       if (isset($content['status']))        $content['status']        = SURFBAR_TRANSLATE_STATUS($content['status']);
+       if (isset($content['registered']))    $content['registered']    = MAKE_DATETIME($content['registered'], "2");
+       if (isset($content['last_locked']))   $content['last_locked']   = MAKE_DATETIME($content['last_locked'], "2");
+       if (isset($content['views_total']))   $content['views_total']   = TRANSLATE_COMMA($content['views_total']);
+       if (isset($content['views_allowed'])) $content['views_allowed'] = TRANSLATE_COMMA($content['views_allowed']);
+       if (isset($content['views_max']))     $content['views_max']     = TRANSLATE_COMMA($content['views_max']);
+
        // Load template
        $mailText = LOAD_EMAIL_TEMPLATE($templateName, $content, $content['uid']);
 

diff --git a/templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl b/templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl
new file mode 100644 (file)
index 0000000..9e4ca4f
--- /dev/null
+++ b/templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl
@@ -0,0 +1,42 @@
+{--HELLO_ADMIN--},
+
+eines unserer Mitglieder hat soeben eine gesperrte 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]
+------------------------------------------
+Zuletzt gesperrt: $content[last_locked]
+------------------------------------------
+Sperrgrund: $content[lock_reason]
+------------------------------------------
+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_locked_pending.tpl b/templates/de/emails/admin/admin_surfbar_url_locked_pending.tpl
new file mode 100644 (file)
index 0000000..b2bc0f4
--- /dev/null
+++ b/templates/de/emails/admin/admin_surfbar_url_locked_pending.tpl
@@ -0,0 +1,33 @@
+{--HELLO_ADMIN--},
+
+Ein Mitglied hat soeben seine gesperrte URL erneut 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/member/member_surfbar_url_locked_deleted.tpl b/templates/de/emails/member/member_surfbar_url_locked_deleted.tpl
new file mode 100644 (file)
index 0000000..43df8f6
--- /dev/null
+++ b/templates/de/emails/member/member_surfbar_url_locked_deleted.tpl
@@ -0,0 +1,23 @@
+Hallo $content[surname] $content[family],,
+
+Sie haben soeben Ihre gesperrte 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]
+------------------------------------------
+Zuletzt gesperrt: $content[last_locked]
+------------------------------------------
+Sperrgrund: $content[lock_reason]
+------------------------------------------
+
+{--ADMIN_THANX--}
+  {--YOUR--} {!MAIN_TITLE!} {--SCRIPT--}
+
+{!URL!}/admin.php

diff --git a/templates/de/emails/member/member_surfbar_url_locked_pending.tpl b/templates/de/emails/member/member_surfbar_url_locked_pending.tpl
new file mode 100644 (file)
index 0000000..2e01f99
--- /dev/null
+++ b/templates/de/emails/member/member_surfbar_url_locked_pending.tpl
@@ -0,0 +1,23 @@
+Hallo $content[gender] $content[surname] $content[family],
+
+Sie hatten soeben Ihre gesperrte URL erneut gebucht. Dabei wurde sie auf "Wartend" gestellt. Bitte beachten Sie hierbei, dass Missbrauch dieser Funktion zur Sperrung Ihres Accounts auf {!MAIN_TITLE!} führen kann.
+
+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!})