From 1473fe9de9fe73856ab7fde98f5b74ee655e2104 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 28 Mar 2010 18:05:12 +0000 Subject: [PATCH] Conflict solved, more templates added, TODOs.txt updated: - Conflict between user and surfbar URL status solved - New templates for unlock/reject of booked URLs added - TODOs.txt updated --- DOCS/TODOs.txt | 28 ++++++------- inc/language/surfbar_de.php | 12 ++++-- inc/libs/surfbar_functions.php | 42 +++++++++---------- inc/modules/admin/what-list_surfbar_urls.php | 20 ++++----- .../admin/what-unlock_surfbar_urls.php | 10 ++--- inc/modules/member/what-surfbar_list.php | 4 +- .../emails/admin/admin_del_surfbar_urls.tpl | 2 +- .../admin/admin_surfbar_url_confirmed.tpl | 2 +- .../admin/admin_surfbar_url_migrate.tpl | 2 +- .../admin/admin_surfbar_url_pending.tpl | 2 +- .../admin_surfbar_url_pending_active.tpl | 38 +++++++++++++++++ .../admin_surfbar_url_pending_rejected.tpl | 38 +++++++++++++++++ .../de/emails/admin/admin_surfbar_url_reg.tpl | 2 +- .../admin/admin_surfbar_url_rejected.tpl | 2 +- .../emails/admin/admin_surfbar_url_unlock.tpl | 2 +- .../member/member_surfbar_url_confirmed.tpl | 2 +- .../member/member_surfbar_url_depleted.tpl | 2 +- .../member/member_surfbar_url_migrate.tpl | 2 +- .../member/member_surfbar_url_pending.tpl | 2 +- .../member_surfbar_url_pending_active.tpl | 19 +++++++++ .../member_surfbar_url_pending_rejected.tpl | 19 +++++++++ .../emails/member/member_surfbar_url_reg.tpl | 2 +- .../member/member_surfbar_url_rejected.tpl | 2 +- .../member/member_surfbar_url_unlock.tpl | 2 +- .../admin/admin_list_surfbar_urls_row.tpl | 2 +- .../admin/admin_lock_surfbar_urls_row.tpl | 2 +- .../admin/admin_undelete_surfbar_urls_row.tpl | 2 +- .../html/member/member_surfbar_list_row.tpl | 2 +- 28 files changed, 192 insertions(+), 74 deletions(-) create mode 100644 templates/de/emails/admin/admin_surfbar_url_pending_active.tpl create mode 100644 templates/de/emails/admin/admin_surfbar_url_pending_rejected.tpl create mode 100644 templates/de/emails/member/member_surfbar_url_pending_active.tpl create mode 100644 templates/de/emails/member/member_surfbar_url_pending_rejected.tpl diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 004c42f9af..f098b63a62 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -39,18 +39,18 @@ ./inc/extensions/ext-yoomedia.php:56:// @TODO Only deprecated when 'ext-network' is ready! setExtensionDeprecated('Y'); ./inc/extensions-functions.php:380:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) ) ./inc/extensions-functions.php:493: // @TODO Extension is loaded, what next? -./inc/functions.php:1023:// @TODO $simple is deprecated -./inc/functions.php:1058: // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates -./inc/functions.php:2534: // @TODO Add a little more infos here +./inc/functions.php:1026:// @TODO $simple is deprecated +./inc/functions.php:1061: // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates +./inc/functions.php:2537: // @TODO Add a little more infos here ./inc/functions.php:256: // @TODO Remove this sanity-check if all is fine ./inc/functions.php:259: // @TODO Try to rewrite all $DATA to $content -./inc/functions.php:2617: // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ? -./inc/functions.php:2640: // @TODO Rewrite this old lost code to a template -./inc/functions.php:2729: // @TODO Are these convertions still required? -./inc/functions.php:2747:// @TODO Rewrite this function to use readFromFile() and writeToFile() -./inc/functions.php:3626:// @TODO Lame description for this function -./inc/functions.php:3648: // @TODO Move this in a filter -./inc/functions.php:3772: // @TODO This is still very static, rewrite it somehow +./inc/functions.php:2620: // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ? +./inc/functions.php:2643: // @TODO Rewrite this old lost code to a template +./inc/functions.php:2733: // @TODO Are these convertions still required? +./inc/functions.php:2751:// @TODO Rewrite this function to use readFromFile() and writeToFile() +./inc/functions.php:3630:// @TODO Lame description for this function +./inc/functions.php:3652: // @TODO Move this in a filter +./inc/functions.php:3776: // @TODO This is still very static, rewrite it somehow ./inc/functions.php:474: // @TODO Do only use $content, not $DATA or raw variables ./inc/functions.php:544: // @TODO Extension 'msg' does not exist ./inc/functions.php:613:// @TODO Rewrite this to an extension 'smtp' @@ -77,8 +77,8 @@ ./inc/libs/register_functions.php:373: // @TODO Rewrite this to a filter ./inc/libs/register_functions.php:380: // @TODO Rewrite this whole if() block to addPointsThroughReferalSystem(). This will also make following if() block obsolete ./inc/libs/register_functions.php:381: // @TODO Wether the registration bonus should only be added to user directly or through referal system should be configurable -./inc/libs/surfbar_functions.php:1497: // @TODO This can be somehow rewritten -./inc/libs/surfbar_functions.php:950: // @TODO Invalid salt should be refused +./inc/libs/surfbar_functions.php:1530: // @TODO This can be somehow rewritten +./inc/libs/surfbar_functions.php:963: // @TODO Invalid salt should be refused ./inc/libs/task_functions.php:245: // @TODO These can be rewritten to filter ./inc/libs/task_functions.php:53:// @TODO Move all extension-dependent queries into filters ./inc/libs/user_functions.php:138: // @TODO These two constants are no longer used, maybe we reactivate this code? @@ -197,8 +197,8 @@ ./inc/revision-functions.php:153:// @TODO Please describe this function ./inc/wrapper-functions.php:127:// @TODO Implement $compress ./inc/wrapper-functions.php:134:// @TODO Implement $decompress -./inc/wrapper-functions.php:429:// @TODO Do some more sanity check here -./inc/wrapper-functions.php:747: * @TODO Do we really need this check? If yes, try to fix this: +./inc/wrapper-functions.php:449:// @TODO Do some more sanity check here +./inc/wrapper-functions.php:764: * @TODO Do we really need this check? If yes, try to fix this: ./mailid.php:135: // @TODO Rewrite this to a filter ./mailid.php:215: // @TODO Rewrite this to a dynamic include or so ./mailid.php:95: // @TODO Rewrite this to a filter diff --git a/inc/language/surfbar_de.php b/inc/language/surfbar_de.php index c2b722f51c..4643733a1a 100644 --- a/inc/language/surfbar_de.php +++ b/inc/language/surfbar_de.php @@ -162,6 +162,8 @@ addMessages(array( 'ADMIN_SURFBAR_NOTIFY_URL_STOPPED_DELETED_SUBJECT' => "[Surfbar:] Mitglied hat angehaltene URL gelöscht", 'ADMIN_SURFBAR_NOTIFY_URL_REJECTED_SUBJECT' => "[Surfbar:] URL abgelehnt", 'ADMIN_SURFBAR_NOTIFY_URL_PENDING_SUBJECT' => "[Surfbar:] URL-Buchung zugestimmt", + 'ADMIN_SURFBAR_NOTIFY_URL_PENDING_ACTIVE_SUBJECT' => "[Surfbar:] URL-Buchung freigeschaltet", + 'ADMIN_SURFBAR_NOTIFY_URL_PENDING_REJECTED_SUBJECT' => "[Surfbar:] URL-Buchung abgelehnt", 'ADMIN_SURFBAR_NOTIFY_URL_DEPLETED_SUBJECT' => "[Surfbar:] URL automatisch angehalten", 'ADMIN_SURFBAR_NOTIFY_URL_ACTIVE_PENDING_SUBJECT' => "[Surfbar:] Mitglied hat freigegebene URL geändert", 'ADMIN_SURFBAR_NOTIFY_URL_LOCKED_PENDING_SUBJECT' => "[Surfbar:] Mitglied hat gesperrte URL erneut gebucht", @@ -171,7 +173,7 @@ addMessages(array( 'ADMIN_SURFBAR_NOTIFY_URL_MIGRATED_DELETED_SUBJECT' => "[Surfbar:] Mitglied hat migrierte URL gelöscht", 'ADMIN_SURFBAR_NOTIFY_URL_MIGRATED_MIGRATED_SUBJECT' => "[Surfbar:] Mitglied hat migrierte URL geändert", 'ADMIN_SURFBAR_NOTIFY_URL_MIGRATED_PENDING_SUBJECT' => "[Surfbar:] Mitglied hat migrierte URL gebucht", - 'ADMIN_SURFBAR_NOTIFY_DEFAULT_SUBJECT' => "Problem in Surfbar-Betreff", + 'ADMIN_SURFBAR_NOTIFY_DEFAULT_SUBJECT' => "Problem in Surfbar-Betreff (%s)", // Auto-generated admin subject lines 'ADMIN_DEL_SURFBAR_URLS_SUBJECT' => "[Surfbar:] URL entfernt", @@ -188,8 +190,10 @@ addMessages(array( 'MEMBER_SURFBAR_NOTIFY_URL_LOCKED_DELETED_SUBJECT' => "[Surfbar:] Sie haben eine gesperrte URL gelöscht", 'MEMBER_SURFBAR_NOTIFY_URL_PENDING_DELETED_SUBJECT' => "[Surfbar:] Sie haben Ihre wartende URL zurückgenommen", 'MEMBER_SURFBAR_NOTIFY_URL_STOPPED_DELETED_SUBJECT' => "[Surfbar:] Sie haben Ihre gestoppte URL gelöscht", - 'MEMBER_SURFBAR_NOTIFY_URL_REJECTED_SUBJECT' => "[Surfbar:] Ihre URL wurde abgelehnt.", + 'MEMBER_SURFBAR_NOTIFY_URL_REJECTED_SUBJECT' => "[Surfbar:] Ihre URL wurde abgelehnt", 'MEMBER_SURFBAR_NOTIFY_URL_PENDING_SUBJECT' => "[Surfbar:] Zustimmung zur URL-Buchung erhalten", + 'MEMBER_SURFBAR_NOTIFY_URL_PENDING_ACTIVE_SUBJECT' => "[Surfbar:] Ihre URL wurde freigeschaltet", + 'MEMBER_SURFBAR_NOTIFY_URL_PENDING_REJECTED_SUBJECT' => "[Surfbar:] Ihre URL wurde abgelehnt", 'MEMBER_SURFBAR_NOTIFY_URL_DEPLETED_SUBJECT' => "[Surfbar:] Ihre URL wurde automatisch angehalten", 'MEMBER_SURFBAR_NOTIFY_URL_ACTIVE_PENDING_SUBJECT' => "[Surfbar:] Sie haben Ihre freigegebene URL geändert", 'MEMBER_SURFBAR_NOTIFY_URL_LOCKED_PENDING_SUBJECT' => "[Surfbar:] Sie haben eine gesperrte URL erneut gebucht", @@ -199,8 +203,8 @@ addMessages(array( 'MEMBER_SURFBAR_NOTIFY_URL_MIGRATED_DELETED_SUBJECT' => "[Surfbar:] Sie haben eine migrierte URL gelöscht", 'MEMBER_SURFBAR_NOTIFY_URL_MIGRATED_MIGRATED_SUBJECT' => "[Surfbar:] Sie haben eine migrierte URL geändert", 'MEMBER_SURFBAR_NOTIFY_URL_MIGRATED_PENDING_SUBJECT' => "[Surfbar:] Sie haben eine migrierte URL gebucht", - 'MEMBER_SURFBAR_NOTIFY_DEFAULT_SUBJECT' => "[Fehler:] Bitte leiten Sie diese Mail an uns weiter.", - 'MEMBER_SURFBAR_NOTIFY_LOW_POINTS_SUBJECT' => "[Surfbar:] Ihr {?POINTS?}-Stand ist sehr niedrig.", + 'MEMBER_SURFBAR_NOTIFY_DEFAULT_SUBJECT' => "[Fehler:] Bitte leiten Sie diese Mail an uns weiter!", + 'MEMBER_SURFBAR_NOTIFY_LOW_POINTS_SUBJECT' => "[Surfbar:] Ihr {?POINTS?}-Stand ist sehr niedrig!", // Auto-generated member subject lines 'MEMBER_DEL_SURFBAR_URLS_SUBJECT' => "[Surfbar:] Ihre URL wurde entfernt", diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php index 9b1b5be02c..8736faeafc 100644 --- a/inc/libs/surfbar_functions.php +++ b/inc/libs/surfbar_functions.php @@ -230,7 +230,7 @@ function SURFBAR_MEMBER_DO_FORM ($formData, $URLs) { } elseif (!isset($URLs[$formData['id']])) { // id not found in cache return false; - } elseif (!SURFBAR_VALIDATE_MEMBER_ACTION_STATUS($formData['action'], $URLs[$formData['id']]['status'])) { + } elseif (!SURFBAR_VALIDATE_MEMBER_ACTION_STATUS($formData['action'], $URLs[$formData['id']]['url_status'])) { // Action not allowed for current URL status return false; } @@ -302,7 +302,7 @@ function SURFBAR_MEMBER_RETREAT_ACTION ($urlData) { ); // Simply change the status here - return SURFBAR_CHANGE_STATUS ($urlData['id'], $urlData['status'], $urlData['new_status'], $data); + return SURFBAR_CHANGE_STATUS ($urlData['id'], $urlData['url_status'], $urlData['new_status'], $data); } // Book an URL now (from migration) @@ -313,7 +313,7 @@ function SURFBAR_MEMBER_BOOKNOW_ACTION ($urlData) { ); // Simply change the status here - return SURFBAR_CHANGE_STATUS ($urlData['id'], $urlData['status'], $urlData['new_status'], $data); + return SURFBAR_CHANGE_STATUS ($urlData['id'], $urlData['url_status'], $urlData['new_status'], $data); } // Show edit form or do the changes @@ -342,7 +342,7 @@ function SURFBAR_MEMBER_DELETE_ACTION ($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)); + return SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['url_status'], $urlData['new_status'], array($urlData['id'] => $urlData)); } // Unpause stopped banner @@ -353,12 +353,12 @@ function SURFBAR_MEMBER_UNPAUSE_ACTION ($urlData) { $urlData['edit']['limit'] = $urlData['views_max']; // Return status change - return SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['status'], $urlData['new_status'], array($urlData['id'] => $urlData)); + return SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['url_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)); + return SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['url_status'], $urlData['new_status'], array($urlData['id'] => $urlData)); } // Display selected "action form" @@ -424,7 +424,7 @@ function SURFBAR_MEMBER_EXECUTE_ACTION ($action, $urlData) { // Execute the function if (call_user_func_array($functionName, array($urlData)) == true) { // Update status as well - $executed = SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['status'], $urlData['new_status'], array($urlData['id'] => $urlData)); + $executed = SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['url_status'], $urlData['new_status'], array($urlData['id'] => $urlData)); } // END - if } else { // Not found! @@ -444,7 +444,7 @@ function SURFBAR_MEMBER_EXECUTE_EDIT_ACTION ($urlData) { //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']), __FUNCTION__, __LINE__); + array($urlData['url'], $urlData['edit']['limit'], $urlData['edit']['limit'], $urlData['id'], $urlData['url_status']), __FUNCTION__, __LINE__); // All fine $status = true; @@ -555,7 +555,7 @@ function SURFBAR_GET_URL_DATA ($searchTerm, $column = 'id', $order = 'id', $sort // Look up the record $result = SQL_QUERY_ESC("SELECT `id`, `userid`, `url`, - `views_total`, `views_max`, `views_allowed`, `status`, + `views_total`, `views_max`, `views_allowed`, `status` AS `url_status`, UNIX_TIMESTAMP(`registered`) AS `url_registered`, UNIX_TIMESTAMP(`last_locked`) AS `url_last_locked`, `lock_reason`, `views_max`, `views_allowed`, `fixed_reload` FROM @@ -606,8 +606,8 @@ function SURFBAR_REGISTER_URL ($url, $userid, $status = 'PENDING', $addMode = 'r $content = merge_array($extraFields, array( 'url' => $url, 'frametester' => generateFrametesterUrl($url), - 'userid' => $userid, - 'status' => $status, + 'userid' => $userid, + 'url_status' => $status, )); // Is limit/reload set? @@ -656,7 +656,7 @@ function SURFBAR_INSERT_URL_BY_ARRAY ($urlData) { array( $userid, $urlData['url'], - $urlData['status'], + $urlData['url_status'], $urlData['limit'], $urlData['limit'], $urlData['reload'] @@ -680,11 +680,11 @@ function SURFBAR_NOTIFY_ADMIN ($messageType, $content) { // Is the subject line there? if ((substr($subject, 0, 1) == '!') && (substr($subject, -1, 1) == '!')) { // Set default subject if following eval() wents wrong - $subject = getMessage('ADMIN_SURFBAR_NOTIFY_DEFAULT_SUBJECT'); + $subject = getMaskedMessage('ADMIN_SURFBAR_NOTIFY_DEFAULT_SUBJECT', strtoupper($messageType)); } // END - if // Translate some data if present - if (isset($content['status'])) $content['status'] = translateSurfbarUrlStatus($content['status']); + if (isset($content['url_status'])) $content['url_status'] = translateSurfbarUrlStatus($content['url_status']); if (isset($content['url_registered'])) $content['url_registered'] = generateDateTime($content['url_registered'], 2); if (isset($content['url_last_locked'])) $content['url_last_locked'] = generateDateTime($content['url_last_locked'], 2); if (isset($content['views_total'])) $content['views_total'] = translateComma($content['views_total']); @@ -717,7 +717,7 @@ function SURFBAR_NOTIFY_USER ($messageType, $content) { } // END - if // Translate some data if present - if (isset($content['status'])) $content['status'] = translateSurfbarUrlStatus($content['status']); + if (isset($content['url_status'])) $content['url_status'] = translateSurfbarUrlStatus($content['url_status']); if (isset($content['url_registered'])) $content['url_registered'] = generateDateTime($content['url_registered'], 2); if (isset($content['url_last_locked'])) $content['url_last_locked'] = generateDateTime($content['url_last_locked'], 2); if (isset($content['views_total'])) $content['views_total'] = translateComma($content['views_total']); @@ -1270,7 +1270,7 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array()) } // END - if // Is the status like prevStatus is saying? - if ($data[$urlId]['status'] != $prevStatus) { + if ($data[$urlId]['url_status'] != $prevStatus) { // No, then abort here return false; } // END - if @@ -1297,16 +1297,16 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array()) $data[$urlId]['costs'] = translateComma(getConfig('surfbar_static_costs')); // Do some dirty fixing here: - if (($data[$urlId]['status'] == 'STOPPED') && ($newStatus == 'pending')) { + if (($data[$urlId]['url_status'] == 'STOPPED') && ($newStatus == 'pending')) { // Fix for template change $newStatus = 'continued'; } // END - if // Send admin notification - SURFBAR_NOTIFY_ADMIN("url_{$data[$urlId]['status']}_{$newStatus}", $data[$urlId]); + SURFBAR_NOTIFY_ADMIN('url_' . $data[$urlId]['url_status'] . '_' . $newStatus, $data[$urlId]); // Send user notification - SURFBAR_NOTIFY_USER("url_{$data[$urlId]['status']}_{$newStatus}", $data[$urlId]); + SURFBAR_NOTIFY_USER('url_' . $data[$urlId]['url_status'] . '_' . $newStatus, $data[$urlId]); // All done! return true; @@ -1521,8 +1521,8 @@ function SURFBAR_GET_ARRAY_FROM_STATUS ($status) { $returnArray = array(); // Get all assigned actions - $result = SQL_QUERY_ESC("SELECT action FROM `{?_MYSQL_PREFIX?}_surfbar_actions` WHERE `status`='%s' ORDER BY `id` ASC", - array($status), __FUNCTION__, __LINE__); + $result = SQL_QUERY_ESC("SELECT `action` FROM `{?_MYSQL_PREFIX?}_surfbar_actions` WHERE `status`='%s' ORDER BY `id` ASC", + array($status), __FUNCTION__, __LINE__); // Some entries there? if (SQL_NUMROWS($result) > 0) { diff --git a/inc/modules/admin/what-list_surfbar_urls.php b/inc/modules/admin/what-list_surfbar_urls.php index 076a5c3065..be0ad38097 100644 --- a/inc/modules/admin/what-list_surfbar_urls.php +++ b/inc/modules/admin/what-list_surfbar_urls.php @@ -140,9 +140,9 @@ if ($show === false) return false; // List all URLs $result = SQL_QUERY("SELECT - `id`, `userid`, `url`, `views_total`, `status`, - UNIX_TIMESTAMP(`registered`) AS registered, - UNIX_TIMESTAMP(`last_locked`) AS last_locked, + `id`, `userid`, `url`, `views_total`, `status` AS `url_status`, + UNIX_TIMESTAMP(`registered`) AS url_registered, + UNIX_TIMESTAMP(`last_locked`) AS url_last_locked, `lock_reason` FROM `{?_MYSQL_PREFIX?}_surfbar_urls` @@ -155,13 +155,13 @@ if (SQL_NUMROWS($result) > 0) { $OUT = ''; $SW = 2; while ($content = SQL_FETCHARRAY($result)) { // "Translate"/add content - $content['sw'] = $SW; - $content['userid'] = generateUserProfileLink($content['userid']); - $content['url'] = generateFrametesterUrl($content['url']); - $content['views_total'] = translateComma($content['views_total']); - $content['status'] = translateSurfbarUrlStatus($content['status']); - $content['registered'] = generateDateTime($content['registered'], 2); - $content['last_locked'] = generateDateTime($content['last_locked'], 2); + $content['sw'] = $SW; + $content['userid'] = generateUserProfileLink($content['userid']); + $content['url'] = generateFrametesterUrl($content['url']); + $content['views_total'] = translateComma($content['views_total']); + $content['url_status'] = translateSurfbarUrlStatus($content['url_status']); + $content['url_registered'] = generateDateTime($content['url_registered'], 2); + $content['url_last_locked'] = generateDateTime($content['url_last_locked'], 2); if (empty($content['lock_reason'])) $content['lock_reason'] = '---'; // Load row template diff --git a/inc/modules/admin/what-unlock_surfbar_urls.php b/inc/modules/admin/what-unlock_surfbar_urls.php index d5ef600a33..32a6624c27 100644 --- a/inc/modules/admin/what-unlock_surfbar_urls.php +++ b/inc/modules/admin/what-unlock_surfbar_urls.php @@ -68,7 +68,7 @@ if ((isPostRequestParameterSet('unlock')) && (is_array(postRequestParameter('id' // List all URLs $result = SQL_QUERY("SELECT - `id`, `userid`, `url`, UNIX_TIMESTAMP(`registered`) AS registered + `id`, `userid`, `url`, UNIX_TIMESTAMP(`registered`) AS url_registered FROM `{?_MYSQL_PREFIX?}_surfbar_urls` WHERE @@ -82,10 +82,10 @@ if (SQL_NUMROWS($result) > 0) { $OUT = ''; $SW = 2; while ($content = SQL_FETCHARRAY($result)) { // "Translate"/add content - $content['sw'] = $SW; - $content['userid'] = generateUserProfileLink($content['userid']); - $content['framekiller'] = generateFrametesterUrl($content['url']); - $content['registered'] = generateDateTime($content['registered'], 2); + $content['sw'] = $SW; + $content['userid'] = generateUserProfileLink($content['userid']); + $content['framekiller'] = generateFrametesterUrl($content['url']); + $content['url_registered'] = generateDateTime($content['url_registered'], 2); // Load row template $OUT .= loadTemplate('admin_unlock_surfbar_urls_row', true, $content); diff --git a/inc/modules/member/what-surfbar_list.php b/inc/modules/member/what-surfbar_list.php index 8bfdf0d17a..a4c3b1b850 100644 --- a/inc/modules/member/what-surfbar_list.php +++ b/inc/modules/member/what-surfbar_list.php @@ -81,8 +81,8 @@ if ((isFormSent()) && (isPostRequestParameterSet(('action'))) && (isPostRequestP } // END - if $content['url_registered'] = generateDateTime($content['url_registered'], 2); $content['url_last_locked'] = generateDateTime($content['url_last_locked'], 2); - $content['actions'] = SURFBAR_MEMBER_ACTIONS($content['id'], $content['status']); - $content['status'] = translateSurfbarUrlStatus($content['status']); + $content['actions'] = SURFBAR_MEMBER_ACTIONS($content['id'], $content['url_status']); + $content['url_status'] = translateSurfbarUrlStatus($content['url_status']); if (empty($content['lock_reason'])) { // Fixes some HTML problems with empty cells $content['lock_reason'] = '---'; diff --git a/templates/de/emails/admin/admin_del_surfbar_urls.tpl b/templates/de/emails/admin/admin_del_surfbar_urls.tpl index 9d9c813a22..b4736c8efe 100644 --- a/templates/de/emails/admin/admin_del_surfbar_urls.tpl +++ b/templates/de/emails/admin/admin_del_surfbar_urls.tpl @@ -8,7 +8,7 @@ Gebuchte URL: $content[url] ------------------------------------------ Mitglieder-Id: $content[userid] ------------------------------------------ -Status: $content[status] +Status: $content[url_status] ------------------------------------------ Aufrufe gesamt: $content[views_total] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_confirmed.tpl b/templates/de/emails/admin/admin_surfbar_url_confirmed.tpl index b8c98a5f4a..67063eb72a 100644 --- a/templates/de/emails/admin/admin_surfbar_url_confirmed.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_confirmed.tpl @@ -13,7 +13,7 @@ Mitglieder-Id: $content[userid] ------------------------------------------ Angemeldet: $content[url_registered] ------------------------------------------ -Status: $content[status] +Status: $content[url_status] ------------------------------------------ ID in der Surfbar: $content[id] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_migrate.tpl b/templates/de/emails/admin/admin_surfbar_url_migrate.tpl index 113f682058..7479943354 100644 --- a/templates/de/emails/admin/admin_surfbar_url_migrate.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_migrate.tpl @@ -13,7 +13,7 @@ $content[frametester] ------------------------------------------ Mitglieder-Id: $content[userid] ------------------------------------------ -Status: $content[status] +Status: $content[url_status] ------------------------------------------ ID in der Surfbar: $content[insert_id] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_pending.tpl b/templates/de/emails/admin/admin_surfbar_url_pending.tpl index 2e20f4872b..b12b435430 100644 --- a/templates/de/emails/admin/admin_surfbar_url_pending.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_pending.tpl @@ -15,7 +15,7 @@ Mitglieder-Id: $content[userid] ------------------------------------------ URL angemeldet: $content[url_registered] ------------------------------------------ -Status: $content[status] +Status: $content[url_status] ------------------------------------------ Vergütung/Aufruf: $content[reward] {?POINTS?} ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_pending_active.tpl b/templates/de/emails/admin/admin_surfbar_url_pending_active.tpl new file mode 100644 index 0000000000..a58344f612 --- /dev/null +++ b/templates/de/emails/admin/admin_surfbar_url_pending_active.tpl @@ -0,0 +1,38 @@ +Hallo Administrator, + +ein Administrator hat soeben eine URL-Buchung freigeschaltet. + +Hier sind alle Daten dazu: +------------------------------------------ +Mitglieder-Id: $content[userid] +------------------------------------------ +Email: {%user,email=$userid%} +------------------------------------------ +Name: {%user,surname=$userid%} {%user,family=$userid%} +------------------------------------------ +Gebuchte URL: $content[url] +------------------------------------------ +ID in der Surfbar: $content[id] +------------------------------------------ +URL angemeldet: $content[url_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] +------------------------------------------ + +Mit freundlichen Grüßen, + Ihr {?MAIN_TITLE?} Script + +{?URL?}/admin.php diff --git a/templates/de/emails/admin/admin_surfbar_url_pending_rejected.tpl b/templates/de/emails/admin/admin_surfbar_url_pending_rejected.tpl new file mode 100644 index 0000000000..90b5c1f988 --- /dev/null +++ b/templates/de/emails/admin/admin_surfbar_url_pending_rejected.tpl @@ -0,0 +1,38 @@ +Hallo Administrator, + +ein Administrator hat soeben eine URL-Buchung abgewiesen. + +Hier sind alle Daten dazu: +------------------------------------------ +Mitglieder-Id: $content[userid] +------------------------------------------ +Email: {%user,email=$userid%} +------------------------------------------ +Name: {%user,surname=$userid%} {%user,family=$userid%} +------------------------------------------ +Gebuchte URL: $content[url] +------------------------------------------ +ID in der Surfbar: $content[id] +------------------------------------------ +URL angemeldet: $content[url_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] +------------------------------------------ + +Mit freundlichen Grüßen, + Ihr {?MAIN_TITLE?} Script + +{?URL?}/admin.php diff --git a/templates/de/emails/admin/admin_surfbar_url_reg.tpl b/templates/de/emails/admin/admin_surfbar_url_reg.tpl index 59cf71cdd5..32cc1f6757 100644 --- a/templates/de/emails/admin/admin_surfbar_url_reg.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_reg.tpl @@ -15,7 +15,7 @@ Mitglieder-Id: $content[userid] ------------------------------------------ Anzahl Aufrufe: $content[limit] ------------------------------------------ -Status: $content[status] +Status: $content[url_status] ------------------------------------------ ID in der Surfbar: $content[insert_id] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_rejected.tpl b/templates/de/emails/admin/admin_surfbar_url_rejected.tpl index f2d0bd1cd7..ed6cf86ed0 100644 --- a/templates/de/emails/admin/admin_surfbar_url_rejected.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_rejected.tpl @@ -13,7 +13,7 @@ Mitglieder-Id: $content[userid] ------------------------------------------ Angemeldet: $content[url_registered] ------------------------------------------ -Status: $content[status] +Status: $content[url_status] ------------------------------------------ ID in der Surfbar: $content[id] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_unlock.tpl b/templates/de/emails/admin/admin_surfbar_url_unlock.tpl index e90cf6aa15..6cef745ddb 100644 --- a/templates/de/emails/admin/admin_surfbar_url_unlock.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_unlock.tpl @@ -9,7 +9,7 @@ Gebuchte URL: $content[url] Framekiller-Test: $content[frametester] ------------------------------------------ -Status: $content[status] +Status: $content[url_status] ------------------------------------------ Anzahl Aufrufe: $content[limit] ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_confirmed.tpl b/templates/de/emails/member/member_surfbar_url_confirmed.tpl index 681da41adf..1b742634d0 100644 --- a/templates/de/emails/member/member_surfbar_url_confirmed.tpl +++ b/templates/de/emails/member/member_surfbar_url_confirmed.tpl @@ -8,7 +8,7 @@ Gebuchte URL: $content[url] ------------------------------------------ Ihre Mitglieder-Id: $content[userid] ------------------------------------------ -Status: $content[status] +Status: $content[url_status] ------------------------------------------ ID in der Surfbar: $content[id] ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_depleted.tpl b/templates/de/emails/member/member_surfbar_url_depleted.tpl index ba4aedfa9a..18eeeffd2e 100644 --- a/templates/de/emails/member/member_surfbar_url_depleted.tpl +++ b/templates/de/emails/member/member_surfbar_url_depleted.tpl @@ -8,7 +8,7 @@ Gebuchte URL: $content[url] ------------------------------------------ Ihre Mitglieder-Id: $content[userid] ------------------------------------------ -Status: $content[status] +Status: $content[url_status] ------------------------------------------ Datum der Buchung: $content[url_registered] ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_migrate.tpl b/templates/de/emails/member/member_surfbar_url_migrate.tpl index 02840da126..ccdb5a615e 100644 --- a/templates/de/emails/member/member_surfbar_url_migrate.tpl +++ b/templates/de/emails/member/member_surfbar_url_migrate.tpl @@ -8,7 +8,7 @@ Gebuchte URL: $content[url] ------------------------------------------ Ihre Mitglieder-Id: $content[userid] ------------------------------------------ -Status: $content[status] +Status: $content[url_status] ------------------------------------------ ID in der Surfbar: $content[insert_id] ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_pending.tpl b/templates/de/emails/member/member_surfbar_url_pending.tpl index 3ea7b9ffe8..464592ddb4 100644 --- a/templates/de/emails/member/member_surfbar_url_pending.tpl +++ b/templates/de/emails/member/member_surfbar_url_pending.tpl @@ -8,7 +8,7 @@ Gebuchte URL: $content[url] ------------------------------------------ Ihre Mitglieder-Id: $content[userid] ------------------------------------------ -Status: $content[status] +Status: $content[url_status] ------------------------------------------ Datum der Buchung: $content[url_registered] ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_pending_active.tpl b/templates/de/emails/member/member_surfbar_url_pending_active.tpl new file mode 100644 index 0000000000..1b765eee20 --- /dev/null +++ b/templates/de/emails/member/member_surfbar_url_pending_active.tpl @@ -0,0 +1,19 @@ +Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}, + +Ein Administrator hat soeben Ihre gebuchte URL für unsere Surfbar freigeschaltet. + +Hier sind alle Daten dazu: +------------------------------------------ +Mitglieder-Id: $content[userid] +------------------------------------------ +Gebuchte URL: $content[url] +------------------------------------------ +ID in der Surfbar: $content[id] +------------------------------------------ +URL angemeldet: $content[url_registered] +------------------------------------------ + +Mit freundlichen Grüßen, + Ihr {?MAIN_TITLE?} Team + +{?URL?}/login.php ({?WEBMASTER?}) diff --git a/templates/de/emails/member/member_surfbar_url_pending_rejected.tpl b/templates/de/emails/member/member_surfbar_url_pending_rejected.tpl new file mode 100644 index 0000000000..fca1f235e8 --- /dev/null +++ b/templates/de/emails/member/member_surfbar_url_pending_rejected.tpl @@ -0,0 +1,19 @@ +Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}, + +Ein Administrator hat soeben Ihre gebuchte URL für unsere Surfbar abgelehnt. + +Hier sind alle Daten dazu: +------------------------------------------ +Mitglieder-Id: $content[userid] +------------------------------------------ +Gebuchte URL: $content[url] +------------------------------------------ +ID in der Surfbar: $content[id] +------------------------------------------ +URL angemeldet: $content[url_registered] +------------------------------------------ + +Mit freundlichen Grüßen, + Ihr {?MAIN_TITLE?} Team + +{?URL?}/login.php ({?WEBMASTER?}) diff --git a/templates/de/emails/member/member_surfbar_url_reg.tpl b/templates/de/emails/member/member_surfbar_url_reg.tpl index 457bfc0a47..95d26088a2 100644 --- a/templates/de/emails/member/member_surfbar_url_reg.tpl +++ b/templates/de/emails/member/member_surfbar_url_reg.tpl @@ -10,7 +10,7 @@ Ihre Mitglieder-Id: $content[userid] ------------------------------------------ Anzahl Aufrufe: $content[limit] ------------------------------------------ -Status: $content[status] +Status: $content[url_status] ------------------------------------------ ID in der Surfbar: $content[insert_id] ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_rejected.tpl b/templates/de/emails/member/member_surfbar_url_rejected.tpl index 8ab50181cd..205c0d16de 100644 --- a/templates/de/emails/member/member_surfbar_url_rejected.tpl +++ b/templates/de/emails/member/member_surfbar_url_rejected.tpl @@ -8,7 +8,7 @@ Gebuchte URL: $content[url] ------------------------------------------ Ihre Mitglieder-Id: $content[userid] ------------------------------------------ -Status: $content[status] +Status: $content[url_status] ------------------------------------------ ID in der Surfbar: $content[id] ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_unlock.tpl b/templates/de/emails/member/member_surfbar_url_unlock.tpl index 7542f2b612..ce702754bf 100644 --- a/templates/de/emails/member/member_surfbar_url_unlock.tpl +++ b/templates/de/emails/member/member_surfbar_url_unlock.tpl @@ -8,7 +8,7 @@ Gebuchte URL: $content[url] ------------------------------------------ Ihre Mitglieder-Id: $content[userid] ------------------------------------------ -Status: $content[status] +Status: $content[url_status] ------------------------------------------ Anzahl Aufrufe: $content[limit] ------------------------------------------ diff --git a/templates/de/html/admin/admin_list_surfbar_urls_row.tpl b/templates/de/html/admin/admin_list_surfbar_urls_row.tpl index f1005b45b4..36471a6f06 100644 --- a/templates/de/html/admin/admin_list_surfbar_urls_row.tpl +++ b/templates/de/html/admin/admin_list_surfbar_urls_row.tpl @@ -12,7 +12,7 @@ $content[views_total] - $content[status] + $content[url_status] $content[url_registered] diff --git a/templates/de/html/admin/admin_lock_surfbar_urls_row.tpl b/templates/de/html/admin/admin_lock_surfbar_urls_row.tpl index e4cb39dd58..bff0efabd9 100644 --- a/templates/de/html/admin/admin_lock_surfbar_urls_row.tpl +++ b/templates/de/html/admin/admin_lock_surfbar_urls_row.tpl @@ -9,7 +9,7 @@ {--ADMIN_TEST_URL--} - $content[status] + $content[url_status] $content[url_registered] diff --git a/templates/de/html/admin/admin_undelete_surfbar_urls_row.tpl b/templates/de/html/admin/admin_undelete_surfbar_urls_row.tpl index 5b855fea5b..7ad3ab5ab5 100644 --- a/templates/de/html/admin/admin_undelete_surfbar_urls_row.tpl +++ b/templates/de/html/admin/admin_undelete_surfbar_urls_row.tpl @@ -8,7 +8,7 @@ {--ADMIN_TEST_URL--} - $content[status] + $content[url_status] $content[url_registered] diff --git a/templates/de/html/member/member_surfbar_list_row.tpl b/templates/de/html/member/member_surfbar_list_row.tpl index 05960e4675..d109bd6646 100644 --- a/templates/de/html/member/member_surfbar_list_row.tpl +++ b/templates/de/html/member/member_surfbar_list_row.tpl @@ -3,7 +3,7 @@ {--MEMBER_SURFBAR_TEST_URL--} - $content[status] + $content[url_status] $content[url_registered] -- 2.30.2