From: Roland Häder Date: Sun, 20 Jun 2010 22:07:04 +0000 (+0000) Subject: Fixes for ext-surfbar (the usual asset) X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=98e932344cf1462454f0a875a25fed3d1df4f812 Fixes for ext-surfbar (the usual asset) --- diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php index 26f2aef234..33a2f58ff8 100644 --- a/inc/libs/surfbar_functions.php +++ b/inc/libs/surfbar_functions.php @@ -309,7 +309,7 @@ function SURFBAR_MEMBER_RETREAT_ACTION ($urlData) { function SURFBAR_MEMBER_BOOKNOW_ACTION ($urlData) { // Create the data array for next function call $data = array( - $urlData['id'] => $urlData + $urlData['id'] => $urlData ); // Simply change the status here @@ -367,9 +367,9 @@ function SURFBAR_MEMBER_DISPLAY_ACTION_FORM ($action, $urlData) { $content = SURFBAR_PREPARE_CONTENT_FOR_TEMPLATE($content); // Is the lock reason empty? - if (empty($urlData['lock_reason'])) { + if (empty($urlData['url_lock_reason'])) { // Fix it to three dashes - $urlData['lock_reason'] = '---'; + $urlData['url_lock_reason'] = '---'; } // END - if // Include fields only for action 'edit' @@ -488,14 +488,14 @@ function SURFBAR_HANDLE_LOW_POINTS () { $userids = SURFBAR_DETERMINE_DEPLETED_USERIDS(getConfig('surfbar_warn_low_points')); // "Walk" through all URLs - foreach ($userids['userid'] as $userid => $dummy) { + foreach ($userids['url_userid'] as $userid => $dummy) { // Is the last notification far enougth away to notify again? if ((time() - $userids['notified'][$userid]) >= getConfig('surfbar_low_interval')) { // Prepare content $content = array( - 'userid' => $userid, - 'points' => $userids['points'][$userid], - 'notified' => $userids['notified'][$userid] + 'url_userid' => $userid, + 'points' => $userids['points'][$userid], + 'notified' => $userids['notified'][$userid] ); // Notify this user @@ -681,13 +681,13 @@ function SURFBAR_NOTIFY_ADMIN ($messageType, $content) { $content = SURFBAR_PREPARE_CONTENT_FOR_TEMPLATE($content); // Send the notification out - return sendAdminNotification($subject, $templateName, $content, $content['userid']); + return sendAdminNotification($subject, $templateName, $content, $content['url_userid']); } // Notify the user about the performed action function SURFBAR_NOTIFY_USER ($messageType, $content) { // Skip notification if userid is zero - if ($content['userid'] == '0') { + if ($content['url_userid'] == '0') { return false; } // END - if @@ -709,10 +709,10 @@ function SURFBAR_NOTIFY_USER ($messageType, $content) { $content = SURFBAR_PREPARE_CONTENT_FOR_TEMPLATE($content); // Load template - $mailText = loadEmailTemplate($templateName, $content, $content['userid']); + $mailText = loadEmailTemplate($templateName, $content, $content['url_userid']); // Send the email - return sendEmail($content['userid'], $subject, $mailText); + return sendEmail($content['url_userid'], $subject, $mailText); } // Translates some data for template usage @@ -883,7 +883,7 @@ function SURFBAR_GET_TOTAL_URLS ($status = 'ACTIVE', $excludeUserId = '0') { $userids = SURFBAR_DETERMINE_DEPLETED_USERIDS(); // If we dont get any user ids back, there are no URLs - if (count($userids['userid']) == 0) { + if (count($userids['url_userid']) == 0) { // No user ids found, no URLs! return 0; } // END - if @@ -891,7 +891,7 @@ function SURFBAR_GET_TOTAL_URLS ($status = 'ACTIVE', $excludeUserId = '0') { // Is the exlude userid set? if ($excludeUserId > 0) { // Then add it - $userids['userid'][$excludeUserId] = $excludeUserId; + $userids['url_userid'][$excludeUserId] = $excludeUserId; } // END - if // Get amount from database @@ -900,7 +900,7 @@ function SURFBAR_GET_TOTAL_URLS ($status = 'ACTIVE', $excludeUserId = '0') { FROM `{?_MYSQL_PREFIX?}_surfbar_urls` WHERE - `url_userid` NOT IN (".implode(', ', $userids['userid']).") AND + `url_userid` NOT IN (".implode(', ', $userids['url_userid']).") AND `url_status`='%s' LIMIT 1", array($status), __FUNCTION__, __LINE__ @@ -1146,15 +1146,15 @@ LIMIT 1", function SURFBAR_DETERMINE_DEPLETED_USERIDS ($limit=0) { // Init array $userids = array( - 'userid' => array(), - 'points' => array(), - 'notified' => array(), + 'url_userid' => array(), + 'points' => array(), + 'notified' => array(), ); // Do we have a current user id? if ((isMember()) && ($limit == '0')) { // Then add this as well - $userids['userid'][getMemberId()] = getMemberId(); + $userids['url_userid'][getMemberId()] = getMemberId(); $userids['points'][getMemberId()] = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points'); $userids['notified'][getMemberId()] = '0'; @@ -1195,16 +1195,16 @@ ORDER BY // Load all userid while ($content = SQL_FETCHARRAY($result)) { // Get total points - $points = countSumTotalData($content['userid'], 'user_points', 'points') - countSumTotalData($content['userid'], 'user_data', 'used_points'); - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "userid={$content['userid']},points={$points}", false); + $points = countSumTotalData($content['url_userid'], 'user_points', 'points') - countSumTotalData($content['url_userid'], 'user_data', 'used_points'); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "userid={$content['url_userid']},points={$points}", false); // Shall we add this to ignore? if ($points <= $limit) { // Ignore this one! - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "userid={$content['userid']} has depleted points amount!", false); - $userids['userid'][$content['userid']] = $content['userid']; - $userids['points'][$content['userid']] = $points; - $userids['notified'][$content['userid']] = $content['notified']; + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "userid={$content['url_userid']} has depleted points amount!", false); + $userids['url_userid'][$content['url_userid']] = $content['url_userid']; + $userids['points'][$content['url_userid']] = $points; + $userids['notified'][$content['url_userid']] = $content['notified']; } // END - if } // END - while @@ -1290,7 +1290,7 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array()) // Update the status now // ---------- Comment out for debugging/developing member actions! --------- - //SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_surfbar_urls` SET `status`='%s' WHERE `id`=%s LIMIT 1", + //SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_surfbar_urls` SET `status`='%s' WHERE `url_id`=%s LIMIT 1", // array($newStatus, bigintval($urlId)), __FUNCTION__, __LINE__); // ---------- Comment out for debugging/developing member actions! --------- @@ -1303,7 +1303,7 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array()) // ---------- Comment out for debugging/developing member actions! --------- // Prepare content for notification routines - $data[$urlId]['userid'] = $data[$urlId]['userid']; + $data[$urlId]['url_userid'] = $data[$urlId]['url_userid']; $data[$urlId]['frametester'] = generateFrametesterUrl($data[$urlId]['url']); $data[$urlId]['reward'] = translateComma(getConfig('surfbar_static_reward')); $data[$urlId]['costs'] = translateComma(getConfig('surfbar_static_costs')); @@ -1599,7 +1599,7 @@ function SURFBAR_DETERMINE_NEXT_ID ($urlId = '0') { $userids = SURFBAR_DETERMINE_DEPLETED_USERIDS(); // Get maximum randomness factor - $maxRand = SURFBAR_GET_MAX_RANDOM($userids['userid'], $add); + $maxRand = SURFBAR_GET_MAX_RANDOM($userids['url_userid'], $add); // If more than one URL can be called generate the random number! if ($maxRand > 1) { @@ -1630,7 +1630,7 @@ LEFT JOIN ON sbu.url_id=l.locks_url_id WHERE - sbu.url_userid NOT IN (".implode(',', $userids['userid']).") AND + sbu.url_userid NOT IN (".implode(',', $userids['url_userid']).") AND sbu.url_status='ACTIVE' AND (sbu.url_views_allowed=0 OR (sbu.url_views_allowed > 0 AND sbu.url_views_max > 0)) ".$add." diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index 9ac1fadacc..cf46a9366e 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -720,7 +720,7 @@ function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') { } // Send mails for del/edit/lock build modes -function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '') { +function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '', $userid = 'userid_raw') { // Default subject is the subject part $subject = $subjectPart; @@ -731,7 +731,7 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '') { } // END - if // Is the raw userid set? - if (postRequestParameter('userid_raw', $id) > 0) { + if (postRequestParameter($userid, $id) > 0) { // Generate subject $subjectLine = getMessage('MEMBER_'.strtoupper($subject).'_'.strtoupper($table).'_SUBJECT'); @@ -743,7 +743,7 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '') { } // Send email out - sendEmail(postRequestParameter('userid_raw', $id), $subjectLine, $mail); + sendEmail(postRequestParameter($userid, $id), $subjectLine, $mail); } // END - if // Generate subject @@ -751,14 +751,14 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '') { // Send admin notification out if (!empty($subjectPart)) { - sendAdminNotification($subjectLine, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content, postRequestParameter('userid_raw', $id)); + sendAdminNotification($subjectLine, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content, postRequestParameter($userid, $id)); } else { - sendAdminNotification($subjectLine, 'admin_' . $mode . '_' . $table, $content, postRequestParameter('userid_raw', $id)); + sendAdminNotification($subjectLine, 'admin_' . $mode . '_' . $table, $content, postRequestParameter($userid, $id)); } } // Build a special template list -function adminListBuilder ($listType, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn) { +function adminListBuilder ($listType, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $userid = 'userid_raw') { $OUT = ''; $SW = 2; // "Walk" through all entries @@ -782,7 +782,7 @@ function adminListBuilder ($listType, $IDs, $table, $columns, $filterFunctions, // Do we have a userid? if ($key == 'userid') { // Add it again as raw id - $content['userid_raw'] = bigintval($value); + $content[$userid] = bigintval($value); } // END - if // If the key matches the idColumn variable, we need to temporary remember it @@ -824,7 +824,7 @@ function adminListBuilder ($listType, $IDs, $table, $columns, $filterFunctions, } // Change status of "build" list -function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray) { +function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray, $userid = 'userid_raw') { // All valid entries? (We hope so here!) if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && (count($statusArray) > 0)) { // "Walk" through all entries @@ -871,7 +871,7 @@ function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFuncti logDebugMessage(__FUNCTION__, __LINE__, 'Found entry: ' . $key); // Skip id, raw userid and 'do_$mode' - if (!in_array($key, array($idColumn, 'userid_raw', ('do_' . $mode)))) { + if (!in_array($key, array($idColumn, $userid, ('do_' . $mode)))) { // Are there brackets () at the end? if (substr($entries[$id], -2, 2) == '()') { // Direct SQL command found @@ -913,22 +913,26 @@ function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFuncti } // Delete rows by given id numbers -function adminDeleteEntriesConfirm ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $deleteNow=false, $idColumn='id', $userIdColumn='userid') { +function adminDeleteEntriesConfirm ($IDs, $table, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = false, $idColumn = 'id', $userIdColumn = 'userid', $userid = 'userid_raw') { // All valid entries? (We hope so here!) if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues))) { // Shall we delete here or list for deletion? if ($deleteNow === true) { // The base SQL command: - $sql = "DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_%s` WHERE %s IN (%s)"; + $sql = "DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s` IN (%s)"; // Delete them all $idList = ''; foreach ($IDs as $id => $sel) { // Is there a userid? - if (isPostRequestParameterSet('userid_raw', $id)) { + if (isPostRequestParameterSet($userid, $id)) { // Load all data from that id - $result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE %s=%s LIMIT 1", - array($table, $idColumn, $id), __FUNCTION__, __LINE__); + $result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1", + array( + $table, + $idColumn, + $id + ), __FUNCTION__, __LINE__); // Fetch the data $content = SQL_FETCHARRAY($result); @@ -945,7 +949,7 @@ function adminDeleteEntriesConfirm ($IDs, $table, $columns=array(), $filterFunct } // END - foreach // Run the query - SQL_QUERY($sql, array($table, $idColumn, substr($idList, 0, -1)), __FUNCTION__, __LINE__); + SQL_QUERY_ESC($sql, array($table, $idColumn, substr($idList, 0, -1)), __FUNCTION__, __LINE__); // Was this fine? if (SQL_AFFECTEDROWS() == count($IDs)) { @@ -963,7 +967,7 @@ function adminDeleteEntriesConfirm ($IDs, $table, $columns=array(), $filterFunct } // Edit rows by given id numbers -function adminEditEntriesConfirm ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $editNow=false, $idColumn='id', $userIdColumn='userid') { +function adminEditEntriesConfirm ($IDs, $table, $columns = array(), $filterFunctions = array(), $extraValues = array(), $editNow = false, $idColumn = 'id', $userIdColumn = 'userid', $userid = 'userid_raw') { // All valid entries? (We hope so here!) if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues))) { // Shall we change here or list for editing? @@ -980,7 +984,7 @@ function adminEditEntriesConfirm ($IDs, $table, $columns=array(), $filterFunctio ); foreach (postRequestArray() as $key => $entries) { // Skip raw userid which is always invalid - if ($key == 'userid_raw') { + if ($key == $userid) { // Continue with next field continue; } // END - if diff --git a/inc/modules/admin/what-list_surfbar_urls.php b/inc/modules/admin/what-list_surfbar_urls.php index ce02758fb2..0cf6e2ab96 100644 --- a/inc/modules/admin/what-list_surfbar_urls.php +++ b/inc/modules/admin/what-list_surfbar_urls.php @@ -63,7 +63,7 @@ if (isFormSent('edit')) { adminEditEntriesConfirm( postRequestParameter('id'), 'surfbar_urls', - array('id', 'userid', 'url'), + array('url_id', 'url_userid', 'url'), array('bigintval', 'addMemberSelectionBox', ''), array('', array(false, true, true, 'userid[]'), '') ); @@ -71,67 +71,78 @@ if (isFormSent('edit')) { } elseif (isPostRequestParameterSet('do_edit')) { // Change data of entries adminEditEntriesConfirm( - postRequestParameter('id'), + postRequestParameter('url_id'), 'surfbar_urls', array(), array(), array(), - true + true, + 'url_id' ); } elseif (isPostRequestParameterSet('delete')) { // Show entries for deletion adminDeleteEntriesConfirm( - postRequestParameter('id'), + postRequestParameter('url_id'), 'surfbar_urls', - array('id', 'userid', 'url', 'registered'), + array('url_id', 'url_userid', 'url', 'url_registered'), array('bigintval', 'generateUserProfileLink', 'generateFrametesterUrl', ''), - array('', '', '', '') + array('', '', '', ''), + false, + 'url_id', + 'userid', + 'url_userid' ); $show = false; } elseif (isPostRequestParameterSet('do_delete')) { // Remove entries from database - adminDeleteEntriesConfirm(postRequestParameter('id'), 'surfbar_urls', array(), array(), array(), true); + adminDeleteEntriesConfirm(postRequestParameter('url_id'), 'surfbar_urls', array(), array(), array(), true, 'url_id'); } elseif (isFormSent('lock')) { // Un-/lock selected URLs. This does not work for pending URLs adminLockEntriesConfirm( - postRequestParameter('id'), + postRequestParameter('url_id'), 'surfbar_urls', - array('id', 'userid', 'url', 'registered', 'status'), + array('url_id', 'url_userid', 'url', 'url_registered', 'status'), array('bigintval', 'generateUserProfileLink', 'generateFrametesterUrl', '', 'translateSurfbarUrlStatus'), - array('', '', '', '', '') + array('', '', '', '', ''), + false, + 'url_id' ); $show = false; } elseif (isPostRequestParameterSet('do_lock')) { // Un-/lock selected URLs. This does not work for pending URLs adminLockEntriesConfirm( - postRequestParameter('id'), + postRequestParameter('url_id'), 'surfbar_urls', array(), array(), array(), array('status' => array('ACTIVE' => 'LOCKED', 'LOCKED' => 'ACTIVE')), - true + true, + 'url_id' ); } elseif (isPostRequestParameterSet('undelete')) { // Undelete selected URLs. This does only work for deleted URLs... ;-) adminUndeleteEntriesConfirm( - postRequestParameter('id'), + postRequestParameter('url_id'), 'surfbar_urls', - array('id', 'userid', 'url', 'registered', 'status'), + array('url_id', 'url_userid', 'url', 'url_registered', 'status'), array('bigintval', 'generateUserProfileLink', 'generateFrametesterUrl', '', 'translateSurfbarUrlStatus'), - array('', '', '', '', '') + array('', '', '', '', ''), + false, + 'url_id' ); $show = false; } elseif (isPostRequestParameterSet('do_undelete')) { // Undelete selected URLs. This does only work for deleted URLs... ;-) adminUndeleteEntriesConfirm( - postRequestParameter('id'), + postRequestParameter('url_id'), 'surfbar_urls', array(), array(), array(), array('status' => array('DELETED' => 'ACTIVE')), - true + true, + 'url_id' ); } @@ -156,13 +167,9 @@ if (SQL_NUMROWS($result) > 0) { while ($content = SQL_FETCHARRAY($result)) { // "Translate"/add content $content['sw'] = $SW; - $content['url_userid'] = generateUserProfileLink($content['url_userid']); - $content['url'] = generateFrametesterUrl($content['url']); - $content['views_total'] = translateComma($content['url_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'] = '---'; + if (empty($content['url_lock_reason'])) $content['url_lock_reason'] = '---'; // Load row template $OUT .= loadTemplate('admin_list_surfbar_urls_row', true, $content); diff --git a/inc/modules/admin/what-unlock_surfbar_urls.php b/inc/modules/admin/what-unlock_surfbar_urls.php index dbde6a5926..d41b8acc65 100644 --- a/inc/modules/admin/what-unlock_surfbar_urls.php +++ b/inc/modules/admin/what-unlock_surfbar_urls.php @@ -46,18 +46,18 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { addMenuDescription('admin', __FILE__); // Is the form sent? -if ((isPostRequestParameterSet('unlock')) && (is_array(postRequestParameter('id'))) && (count(postRequestParameter('id')) > 0)) { +if ((isPostRequestParameterSet('unlock')) && (is_array(postRequestParameter('url_id'))) && (count(postRequestParameter('url_id')) > 0)) { // Unlock selected URLs - if (SURFBAR_ADMIN_UNLOCK_URL_IDS(postRequestParameter('id'))) { + if (SURFBAR_ADMIN_UNLOCK_URL_IDS(postRequestParameter('url_id'))) { // Unlock done! :-) loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_UNLOCK_DONE')); } else { // Unlock failed! loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_UNLOCK_FAILED')); } -} elseif ((isPostRequestParameterSet(('reject'))) && (is_array(postRequestParameter('id'))) && (count(postRequestParameter('id')) > 0)) { +} elseif ((isPostRequestParameterSet(('reject'))) && (is_array(postRequestParameter('url_id'))) && (count(postRequestParameter('url_id')) > 0)) { // Reject selected URLs - if (SURFBAR_ADMIN_REJECT_URL_IDS(postRequestParameter('id'))) { + if (SURFBAR_ADMIN_REJECT_URL_IDS(postRequestParameter('url_id'))) { // Unlock done! :-) loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_UNLOCK_DONE')); } else { diff --git a/inc/modules/member/what-surfbar_list.php b/inc/modules/member/what-surfbar_list.php index e3446626e3..da9bfd2551 100644 --- a/inc/modules/member/what-surfbar_list.php +++ b/inc/modules/member/what-surfbar_list.php @@ -83,9 +83,9 @@ if ((isFormSent()) && (isPostRequestParameterSet(('action'))) && (isPostRequestP $content['url_last_locked'] = generateDateTime($content['url_last_locked'], 2); $content['actions'] = SURFBAR_MEMBER_ACTIONS($content['id'], $content['url_status']); $content['url_status'] = translateSurfbarUrlStatus($content['url_status']); - if (empty($content['lock_reason'])) { + if (empty($content['url_lock_reason'])) { // Fixes some HTML problems with empty cells - $content['lock_reason'] = '---'; + $content['url_lock_reason'] = '---'; } // END - if // Load row template diff --git a/templates/de/emails/admin/admin_del_surfbar_urls.tpl b/templates/de/emails/admin/admin_del_surfbar_urls.tpl index a2e45a6158..50354e4b69 100644 --- a/templates/de/emails/admin/admin_del_surfbar_urls.tpl +++ b/templates/de/emails/admin/admin_del_surfbar_urls.tpl @@ -6,7 +6,7 @@ Hier sind alle Daten dazu: ------------------------------------------ Gebuchte URL: $content[url] ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Status: {%pipe,translateSurfbarUrlStatus=$content[url_status]%} ------------------------------------------ @@ -16,7 +16,7 @@ Angemeldet: $content[url_registered] ------------------------------------------ Zuletzt gesperrt: $content[url_last_locked] ------------------------------------------ -Sperrgrund: $content[lock_reason] +Sperrgrund: $content[url_lock_reason] ------------------------------------------ ID in der Surfbar: $content[url_id] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_edit_surfbar_urls.tpl b/templates/de/emails/admin/admin_edit_surfbar_urls.tpl index 0555c8e123..9c3a239600 100644 --- a/templates/de/emails/admin/admin_edit_surfbar_urls.tpl +++ b/templates/de/emails/admin/admin_edit_surfbar_urls.tpl @@ -10,8 +10,7 @@ Neue URL: $content[url] Framekiller-Test: $content[frametester] ------------------------------------------ -Alte Mitglieder-Id: $content[userid] -Neue Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Angemeldet: $content[url_registered] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_lock_active_surfbar_urls.tpl b/templates/de/emails/admin/admin_lock_active_surfbar_urls.tpl index 4224fedfe4..f2bd4695d9 100644 --- a/templates/de/emails/admin/admin_lock_active_surfbar_urls.tpl +++ b/templates/de/emails/admin/admin_lock_active_surfbar_urls.tpl @@ -9,9 +9,9 @@ URL: $content[url] Framekiller-Test: $content[frametester] ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ -Sperrgrund: $content[lock_reason] +Sperrgrund: $content[url_lock_reason] ------------------------------------------ Letzte Sperrung: $content[url_last_locked] ------------------------------------------ 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 2415c6eda2..0f191cd9d7 100644 --- a/templates/de/emails/admin/admin_lock_locked_surfbar_urls.tpl +++ b/templates/de/emails/admin/admin_lock_locked_surfbar_urls.tpl @@ -9,9 +9,9 @@ URL: $content[url] Framekiller-Test: $content[frametester] ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ -Sperrgrund: $content[lock_reason] +Sperrgrund: $content[url_lock_reason] ------------------------------------------ Letzte Sperrung: $content[url_last_locked] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl b/templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl index 52fea25549..e6a4fed350 100644 --- a/templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_active_deleted.tpl @@ -4,7 +4,7 @@ eines unserer Mitglieder hat soeben seine freigegebene URL gelöscht. Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Email: {%user,email=$userid%} ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_active_pending.tpl b/templates/de/emails/admin/admin_surfbar_url_active_pending.tpl index 8de45873af..33b1897b1d 100644 --- a/templates/de/emails/admin/admin_surfbar_url_active_pending.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_active_pending.tpl @@ -4,7 +4,7 @@ Ein Mitglied hat soeben seine freigegebene URL geändert. Dabei wurde sie au Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Email: {%user,email=$userid%} ------------------------------------------ @@ -18,7 +18,7 @@ URL angemeldet: $content[url_registered] ------------------------------------------ Zuletzt gesperrt: $content[url_last_locked] ------------------------------------------ -Sperrgrund: $content[lock_reason] +Sperrgrund: $content[url_lock_reason] ------------------------------------------ Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%} ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_active_stopped.tpl b/templates/de/emails/admin/admin_surfbar_url_active_stopped.tpl index 9d381bf1c7..6a2f1bd968 100644 --- a/templates/de/emails/admin/admin_surfbar_url_active_stopped.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_active_stopped.tpl @@ -4,7 +4,7 @@ Ein Mitglied hat soeben seine URL gestoppt: Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Email: {%user,email=$userid%} ------------------------------------------ @@ -18,7 +18,7 @@ URL angemeldet: $content[url_registered] ------------------------------------------ Zuletzt gesperrt: $content[url_last_locked] ------------------------------------------ -Sperrgrund: $content[lock_reason] +Sperrgrund: $content[url_lock_reason] ------------------------------------------ Gesamteinblendungen: {%pipe,translateComma=$content[url_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 d42f7a7310..4257d3d0b0 100644 --- a/templates/de/emails/admin/admin_surfbar_url_confirmed.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_confirmed.tpl @@ -9,7 +9,7 @@ Gebuchte URL: $content[url] Framekiller-Test: $content[frametester] ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Angemeldet: $content[url_registered] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_depleted.tpl b/templates/de/emails/admin/admin_surfbar_url_depleted.tpl index 8592abd653..0bfba32a45 100644 --- a/templates/de/emails/admin/admin_surfbar_url_depleted.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_depleted.tpl @@ -11,7 +11,7 @@ Email: {%user,email=$userid%} Framekiller-Test: $content[frametester] ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ URL angemeldet: $content[url_registered] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl b/templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl index a47d61ea3e..d2f0a747a8 100644 --- a/templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_locked_deleted.tpl @@ -4,7 +4,7 @@ eines unserer Mitglieder hat soeben eine gesperrte URL gelöscht. Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Email: {%user,email=$userid%} ------------------------------------------ @@ -21,7 +21,7 @@ $content[frametester] ------------------------------------------ Zuletzt gesperrt: $content[url_last_locked] ------------------------------------------ -Sperrgrund: $content[lock_reason] +Sperrgrund: $content[url_lock_reason] ------------------------------------------ Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%} ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_locked_pending.tpl b/templates/de/emails/admin/admin_surfbar_url_locked_pending.tpl index 1c74f4fde2..afe8a3cc9e 100644 --- a/templates/de/emails/admin/admin_surfbar_url_locked_pending.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_locked_pending.tpl @@ -4,7 +4,7 @@ Ein Mitglied hat soeben seine gesperrte URL erneut gebucht. Dabei wurde sie auf Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Email: {%user,email=$userid%} ------------------------------------------ @@ -18,7 +18,7 @@ URL angemeldet: $content[url_registered] ------------------------------------------ Zuletzt gesperrt: $content[url_last_locked] ------------------------------------------ -Sperrgrund: $content[lock_reason] +Sperrgrund: $content[url_lock_reason] ------------------------------------------ Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%} ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_migrate.tpl b/templates/de/emails/admin/admin_surfbar_url_migrate.tpl index b6f8af23ef..d598612b7b 100644 --- a/templates/de/emails/admin/admin_surfbar_url_migrate.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_migrate.tpl @@ -11,7 +11,7 @@ Email: {%user,email=$userid%} Framekiller-Test: $content[frametester] ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Status: {%pipe,translateSurfbarUrlStatus=$content[url_status]%} ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_migrated_deleted.tpl b/templates/de/emails/admin/admin_surfbar_url_migrated_deleted.tpl index 7c93a02178..7f7d946f5f 100644 --- a/templates/de/emails/admin/admin_surfbar_url_migrated_deleted.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_migrated_deleted.tpl @@ -4,7 +4,7 @@ Ein Mitglied hat soeben eine migrierte URL gelöscht. Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Email: {%user,email=$userid%} ------------------------------------------ @@ -18,7 +18,7 @@ URL angemeldet: $content[url_registered] ------------------------------------------ Zuletzt gesperrt: $content[url_last_locked] ------------------------------------------ -Sperrgrund: $content[lock_reason] +Sperrgrund: $content[url_lock_reason] ------------------------------------------ Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%} ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_migrated_migrated.tpl b/templates/de/emails/admin/admin_surfbar_url_migrated_migrated.tpl index be0dfceb60..cd02aba8c2 100644 --- a/templates/de/emails/admin/admin_surfbar_url_migrated_migrated.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_migrated_migrated.tpl @@ -4,7 +4,7 @@ Ein Mitglied hat soeben eine migrierte URL geändert. Dabei wurde sie auf "M Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Email: {%user,email=$userid%} ------------------------------------------ @@ -18,7 +18,7 @@ URL angemeldet: $content[url_registered] ------------------------------------------ Zuletzt gesperrt: $content[url_last_locked] ------------------------------------------ -Sperrgrund: $content[lock_reason] +Sperrgrund: $content[url_lock_reason] ------------------------------------------ Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%} ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_migrated_pending.tpl b/templates/de/emails/admin/admin_surfbar_url_migrated_pending.tpl index fc132fec9d..84164d9ea0 100644 --- a/templates/de/emails/admin/admin_surfbar_url_migrated_pending.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_migrated_pending.tpl @@ -4,7 +4,7 @@ Ein Mitglied hat soeben eine migrierte URL gebucht. Dabei wurde sie auf "Wartend Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Email: {%user,email=$userid%} ------------------------------------------ @@ -18,7 +18,7 @@ URL angemeldet: $content[url_registered] ------------------------------------------ Zuletzt gesperrt: $content[url_last_locked] ------------------------------------------ -Sperrgrund: $content[lock_reason] +Sperrgrund: $content[url_lock_reason] ------------------------------------------ Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%} ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_pending.tpl b/templates/de/emails/admin/admin_surfbar_url_pending.tpl index 47bb65460c..4d2051f37f 100644 --- a/templates/de/emails/admin/admin_surfbar_url_pending.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_pending.tpl @@ -11,7 +11,7 @@ Email: {%user,email=$userid%} Framekiller-Test: $content[frametester] ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ URL angemeldet: $content[url_registered] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_pending_active.tpl b/templates/de/emails/admin/admin_surfbar_url_pending_active.tpl index 60e10fbaf8..bb62b7f30e 100644 --- a/templates/de/emails/admin/admin_surfbar_url_pending_active.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_pending_active.tpl @@ -4,7 +4,7 @@ ein Administrator hat soeben eine URL-Buchung freigeschaltet. Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Email: {%user,email=$userid%} ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl b/templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl index 91b40ddef3..9283019038 100644 --- a/templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_pending_deleted.tpl @@ -4,7 +4,7 @@ eines unserer Mitglieder hat soeben seine URL-Buchung zurückgezogen. Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Email: {%user,email=$userid%} ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_pending_rejected.tpl b/templates/de/emails/admin/admin_surfbar_url_pending_rejected.tpl index 283ff3d9d4..d6298bb23e 100644 --- a/templates/de/emails/admin/admin_surfbar_url_pending_rejected.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_pending_rejected.tpl @@ -4,7 +4,7 @@ ein Administrator hat soeben eine URL-Buchung abgewiesen. Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Email: {%user,email=$userid%} ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_reg.tpl b/templates/de/emails/admin/admin_surfbar_url_reg.tpl index 966571f395..41c71e8dbe 100644 --- a/templates/de/emails/admin/admin_surfbar_url_reg.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_reg.tpl @@ -11,7 +11,7 @@ Email: {%user,email=$userid%} Framekiller-Test: $content[frametester] ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Anzahl Aufrufe: $content[limit] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_rejected.tpl b/templates/de/emails/admin/admin_surfbar_url_rejected.tpl index 8a81549064..d9d31011d6 100644 --- a/templates/de/emails/admin/admin_surfbar_url_rejected.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_rejected.tpl @@ -9,7 +9,7 @@ Gebuchte URL: $content[url] Framekiller-Test: $content[frametester] ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Angemeldet: $content[url_registered] ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_stopped_continued.tpl b/templates/de/emails/admin/admin_surfbar_url_stopped_continued.tpl index 36f3cf0bc6..8b128ef55e 100644 --- a/templates/de/emails/admin/admin_surfbar_url_stopped_continued.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_stopped_continued.tpl @@ -4,7 +4,7 @@ Ein Mitglied hat soeben seine gestoppte URL gestartet. Dabei wurde sie auf "Wart Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Email: {%user,email=$userid%} ------------------------------------------ @@ -18,7 +18,7 @@ URL angemeldet: $content[url_registered] ------------------------------------------ Zuletzt gesperrt: $content[url_last_locked] ------------------------------------------ -Sperrgrund: $content[lock_reason] +Sperrgrund: $content[url_lock_reason] ------------------------------------------ Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%} ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_stopped_deleted.tpl b/templates/de/emails/admin/admin_surfbar_url_stopped_deleted.tpl index f05d6411e1..8ab181872c 100644 --- a/templates/de/emails/admin/admin_surfbar_url_stopped_deleted.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_stopped_deleted.tpl @@ -4,7 +4,7 @@ eines unserer Mitglieder hat soeben seine gestoppte URL gelöscht. Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Email: {%user,email=$userid%} ------------------------------------------ diff --git a/templates/de/emails/admin/admin_surfbar_url_stopped_pending.tpl b/templates/de/emails/admin/admin_surfbar_url_stopped_pending.tpl index 32f83651f0..6bc35d6a3e 100644 --- a/templates/de/emails/admin/admin_surfbar_url_stopped_pending.tpl +++ b/templates/de/emails/admin/admin_surfbar_url_stopped_pending.tpl @@ -4,7 +4,7 @@ Ein Mitglied hat soeben seine gestoppte URL geändert. Dabei wurde sie auf " Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Email: {%user,email=$userid%} ------------------------------------------ @@ -18,7 +18,7 @@ URL angemeldet: $content[url_registered] ------------------------------------------ Zuletzt gesperrt: $content[url_last_locked] ------------------------------------------ -Sperrgrund: $content[lock_reason] +Sperrgrund: $content[url_lock_reason] ------------------------------------------ Gesamteinblendungen: {%pipe,translateComma=$content[url_views_total]%} ------------------------------------------ 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 476da80c62..40f99408fd 100644 --- a/templates/de/emails/admin/admin_undelete_active_surfbar_urls.tpl +++ b/templates/de/emails/admin/admin_undelete_active_surfbar_urls.tpl @@ -9,9 +9,9 @@ URL: $content[url] Framekiller-Test: $content[frametester] ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ -Sperrgrund: $content[lock_reason] +Sperrgrund: $content[url_lock_reason] ------------------------------------------ Letzte Sperrung: $content[url_last_locked] ------------------------------------------ diff --git a/templates/de/emails/member/member_del_surfbar_urls.tpl b/templates/de/emails/member/member_del_surfbar_urls.tpl index 6f2a681ce4..6ffc31047e 100644 --- a/templates/de/emails/member/member_del_surfbar_urls.tpl +++ b/templates/de/emails/member/member_del_surfbar_urls.tpl @@ -1,4 +1,4 @@ -Hallo Mitglied, +Hallo {%user,gender,translateGender=$content[url_userid]%} {%user,surname=$content[url_userid]%} {%user,family=$content[url_userid]%}, wir haben soeben Ihre in unserer Surfbar gebuchte URL entfernt. @@ -6,7 +6,7 @@ Hier sind alle Daten dazu: ------------------------------------------ Gebuchte URL: $content[url] ------------------------------------------ -Ihre Mitglieder-Id: $content[userid] +Ihre Mitglieder-Id: $content[url_userid] ------------------------------------------ Aufrufe gesamt: {%pipe,translateComma=$content[url_views_total]%} ------------------------------------------ diff --git a/templates/de/emails/member/member_edit_surfbar_urls.tpl b/templates/de/emails/member/member_edit_surfbar_urls.tpl index ad6ca789a7..3a901a1d39 100644 --- a/templates/de/emails/member/member_edit_surfbar_urls.tpl +++ b/templates/de/emails/member/member_edit_surfbar_urls.tpl @@ -1,4 +1,4 @@ -Hallo Mitglied, +Hallo {%user,gender,translateGender=$content[url_userid]%} {%user,surname=$content[url_userid]%} {%user,family=$content[url_userid]%}, wir haben soeben Ihre in unserer Surfbar gebuchte URL geändert. @@ -10,7 +10,7 @@ Aufrufe gesamt: {%pipe,translateComma=$content[url_views_total]%} ------------------------------------------ Angemeldet: $content[url_registered] ------------------------------------------ -Ihre Mitglieder-Id: $content[userid] +Ihre Mitglieder-Id: $content[url_userid] ------------------------------------------ ID in der Surfbar: $content[url_id] ------------------------------------------ diff --git a/templates/de/emails/member/member_lock_active_surfbar_urls.tpl b/templates/de/emails/member/member_lock_active_surfbar_urls.tpl index ef2eceafef..237023474b 100644 --- a/templates/de/emails/member/member_lock_active_surfbar_urls.tpl +++ b/templates/de/emails/member/member_lock_active_surfbar_urls.tpl @@ -1,4 +1,4 @@ -Hallo Mitglied, +Hallo {%user,gender,translateGender=$content[url_userid]%} {%user,surname=$content[url_userid]%} {%user,family=$content[url_userid]%}, wir haben soeben Ihre URL in der Surfbar wieder freigegeben. @@ -8,7 +8,7 @@ Gebuchte URL: $content[url] ------------------------------------------ Angemeldet: $content[url_registered] ------------------------------------------ -Ihre Mitglieder-Id: $content[userid] +Ihre Mitglieder-Id: $content[url_userid] ------------------------------------------ ID in der Surfbar: $content[url_id] ------------------------------------------ diff --git a/templates/de/emails/member/member_lock_locked_surfbar_urls.tpl b/templates/de/emails/member/member_lock_locked_surfbar_urls.tpl index 331522d346..b1e7953f4b 100644 --- a/templates/de/emails/member/member_lock_locked_surfbar_urls.tpl +++ b/templates/de/emails/member/member_lock_locked_surfbar_urls.tpl @@ -1,4 +1,4 @@ -Hallo Mitglied, +Hallo {%user,gender,translateGender=$content[url_userid]%} {%user,surname=$content[url_userid]%} {%user,family=$content[url_userid]%}, wir haben soeben Ihre URL in der Surfbar sperren müssen. Bitte halten Sie unsere AGBs ein! @@ -6,11 +6,11 @@ Hier sind alle Daten dazu: ------------------------------------------ Gebuchte URL: $content[url] ------------------------------------------ -Sperrgrund: $content[lock_reason] +Sperrgrund: $content[url_lock_reason] ------------------------------------------ Angemeldet: $content[url_registered] ------------------------------------------ -Ihre Mitglieder-Id: $content[userid] +Ihre Mitglieder-Id: $content[url_userid] ------------------------------------------ ID in der Surfbar: $content[url_id] ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_low_points.tpl b/templates/de/emails/member/member_surfbar_low_points.tpl index 32d53896d1..658bb3ab33 100644 --- a/templates/de/emails/member/member_surfbar_low_points.tpl +++ b/templates/de/emails/member/member_surfbar_low_points.tpl @@ -4,7 +4,7 @@ Sie haben in unserer Surfbar mindestens eine URL gebucht. Ihr {?POINTS?}-Stand i Hier sind alle Daten: ------------------------------------------ -Ihre Mitglieder-Id: $content[userid] +Ihre Mitglieder-Id: $content[url_userid] ------------------------------------------ Ihr aktuelles Guthaben: {%pipe,translateComma=$content[points]%} {?POINTS?} ------------------------------------------ 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 a1a6e6e70a..43d247b91c 100644 --- a/templates/de/emails/member/member_surfbar_url_active_deleted.tpl +++ b/templates/de/emails/member/member_surfbar_url_active_deleted.tpl @@ -4,7 +4,7 @@ Sie haben soeben Ihre freigegebene URL gelöscht. Sollte dies ein Versehen s Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Gebuchte URL: $content[url] ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_active_pending.tpl b/templates/de/emails/member/member_surfbar_url_active_pending.tpl index 14fef75ab6..9a321f9a4d 100644 --- a/templates/de/emails/member/member_surfbar_url_active_pending.tpl +++ b/templates/de/emails/member/member_surfbar_url_active_pending.tpl @@ -4,7 +4,7 @@ Sie hatten soeben Ihre freigegebene URL geändert. Dabei wurde sie auf "Wart Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Gebuchte URL: $content[url] (Neu: $content[edit][url]) ------------------------------------------ @@ -14,7 +14,7 @@ URL angemeldet: $content[url_registered] ------------------------------------------ Zuletzt gesperrt: $content[url_last_locked] ------------------------------------------ -Sperrgrund: $content[lock_reason] +Sperrgrund: $content[url_lock_reason] ------------------------------------------ Neue maximale Einblendungen: {%pipe,translateSurfbarLimit=$content[edit][limit]%} ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_active_stopped.tpl b/templates/de/emails/member/member_surfbar_url_active_stopped.tpl index 54f8becfdd..350d8c861c 100644 --- a/templates/de/emails/member/member_surfbar_url_active_stopped.tpl +++ b/templates/de/emails/member/member_surfbar_url_active_stopped.tpl @@ -4,7 +4,7 @@ Sie hatten soeben Ihre gebuchte URL gestoppt. Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Gebuchte URL: $content[url] ------------------------------------------ @@ -14,7 +14,7 @@ URL angemeldet: $content[url_registered] ------------------------------------------ Zuletzt gesperrt: $content[url_last_locked] ------------------------------------------ -Sperrgrund: $content[lock_reason] +Sperrgrund: $content[url_lock_reason] ------------------------------------------ Mit freundlichen Grüßen, diff --git a/templates/de/emails/member/member_surfbar_url_confirmed.tpl b/templates/de/emails/member/member_surfbar_url_confirmed.tpl index aa255d7d15..5984d1f759 100644 --- a/templates/de/emails/member/member_surfbar_url_confirmed.tpl +++ b/templates/de/emails/member/member_surfbar_url_confirmed.tpl @@ -6,7 +6,7 @@ Hier sind alle Daten: ------------------------------------------ Gebuchte URL: $content[url] ------------------------------------------ -Ihre Mitglieder-Id: $content[userid] +Ihre Mitglieder-Id: $content[url_userid] ------------------------------------------ Status: {%pipe,translateSurfbarUrlStatus=$content[url_status]%}; ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_depleted.tpl b/templates/de/emails/member/member_surfbar_url_depleted.tpl index f9a2be126f..d27c36aa51 100644 --- a/templates/de/emails/member/member_surfbar_url_depleted.tpl +++ b/templates/de/emails/member/member_surfbar_url_depleted.tpl @@ -6,7 +6,7 @@ Hier sind alle Daten: ------------------------------------------ Gebuchte URL: $content[url] ------------------------------------------ -Ihre Mitglieder-Id: $content[userid] +Ihre Mitglieder-Id: $content[url_userid] ------------------------------------------ Status: {%pipe,translateSurfbarUrlStatus=$content[url_status]%} ------------------------------------------ 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 74d2830cc9..ce0f7ea0ae 100644 --- a/templates/de/emails/member/member_surfbar_url_locked_deleted.tpl +++ b/templates/de/emails/member/member_surfbar_url_locked_deleted.tpl @@ -4,7 +4,7 @@ Sie haben soeben Ihre gesperrte URL gelöscht. Sollte dies ein Versehen sein Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Gebuchte URL: $content[url] ------------------------------------------ @@ -14,7 +14,7 @@ URL angemeldet: $content[url_registered] ------------------------------------------ Zuletzt gesperrt: $content[url_last_locked] ------------------------------------------ -Sperrgrund: $content[lock_reason] +Sperrgrund: $content[url_lock_reason]; ------------------------------------------ Mit freundlichen Grüßen, diff --git a/templates/de/emails/member/member_surfbar_url_locked_pending.tpl b/templates/de/emails/member/member_surfbar_url_locked_pending.tpl index f0194230b7..1b808e0b93 100644 --- a/templates/de/emails/member/member_surfbar_url_locked_pending.tpl +++ b/templates/de/emails/member/member_surfbar_url_locked_pending.tpl @@ -4,7 +4,7 @@ Sie hatten soeben Ihre gesperrte URL erneut gebucht. Dabei wurde sie auf "Warten Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Gebuchte URL: $content[url] ------------------------------------------ @@ -14,7 +14,7 @@ URL angemeldet: $content[url_registered] ------------------------------------------ Zuletzt gesperrt: $content[url_last_locked] ------------------------------------------ -Sperrgrund: $content[lock_reason] +Sperrgrund: $content[url_lock_reason] ------------------------------------------ Mit freundlichen Grüßen, diff --git a/templates/de/emails/member/member_surfbar_url_migrate.tpl b/templates/de/emails/member/member_surfbar_url_migrate.tpl index 47b5d21064..eaf9020037 100644 --- a/templates/de/emails/member/member_surfbar_url_migrate.tpl +++ b/templates/de/emails/member/member_surfbar_url_migrate.tpl @@ -6,7 +6,7 @@ Hier sind alle Daten: ------------------------------------------ Gebuchte URL: $content[url] ------------------------------------------ -Ihre Mitglieder-Id: $content[userid] +Ihre Mitglieder-Id: $content[url_userid] ------------------------------------------ Status: {%pipe,translateSurfbarUrlStatus=$content[url_status]%} ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_migrated_deleted.tpl b/templates/de/emails/member/member_surfbar_url_migrated_deleted.tpl index 065f81bfe9..2eddd25203 100644 --- a/templates/de/emails/member/member_surfbar_url_migrated_deleted.tpl +++ b/templates/de/emails/member/member_surfbar_url_migrated_deleted.tpl @@ -4,7 +4,7 @@ Sie hatten soeben Ihre aus der Mailbuchung migrierte URL gelöscht. Sollte d Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Gebuchte URL: $content[url] ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl b/templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl index 4a07662c56..69f0c90b89 100644 --- a/templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl +++ b/templates/de/emails/member/member_surfbar_url_migrated_migrated.tpl @@ -4,7 +4,7 @@ Sie hatten soeben Ihre aus der Mailbuchung migrierte URL geändert. Bitte bu Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Gebuchte URL: $content[url] (Neu: $content[edit][url]) ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_migrated_pending.tpl b/templates/de/emails/member/member_surfbar_url_migrated_pending.tpl index 5f04940a51..917b0b234c 100644 --- a/templates/de/emails/member/member_surfbar_url_migrated_pending.tpl +++ b/templates/de/emails/member/member_surfbar_url_migrated_pending.tpl @@ -4,7 +4,7 @@ Sie hatten soeben Ihre aus der Mailbuchung migrierte URL gebucht. Dabei wurde si Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Gebuchte URL: $content[url] ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_pending.tpl b/templates/de/emails/member/member_surfbar_url_pending.tpl index 0a87664f48..92920763e0 100644 --- a/templates/de/emails/member/member_surfbar_url_pending.tpl +++ b/templates/de/emails/member/member_surfbar_url_pending.tpl @@ -6,7 +6,7 @@ Hier sind alle Daten: ------------------------------------------ Gebuchte URL: $content[url] ------------------------------------------ -Ihre Mitglieder-Id: $content[userid] +Ihre Mitglieder-Id: $content[url_userid] ------------------------------------------ Status: {%pipe,translateSurfbarUrlStatus=$content[url_status]%} ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_pending_active.tpl b/templates/de/emails/member/member_surfbar_url_pending_active.tpl index ae1d5da5eb..ce359967df 100644 --- a/templates/de/emails/member/member_surfbar_url_pending_active.tpl +++ b/templates/de/emails/member/member_surfbar_url_pending_active.tpl @@ -4,7 +4,7 @@ Ein Administrator hat soeben Ihre gebuchte URL für unsere Surfbar freigesch Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Gebuchte URL: $content[url] ------------------------------------------ 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 852359ed03..4441bb4907 100644 --- a/templates/de/emails/member/member_surfbar_url_pending_deleted.tpl +++ b/templates/de/emails/member/member_surfbar_url_pending_deleted.tpl @@ -4,7 +4,7 @@ Sie haben soeben eine in unserer Surfbar gebuchte URL zurückgenommen. Sollt Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Gebuchte URL: $content[url] ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_pending_rejected.tpl b/templates/de/emails/member/member_surfbar_url_pending_rejected.tpl index 83e054d0c8..0e231647ec 100644 --- a/templates/de/emails/member/member_surfbar_url_pending_rejected.tpl +++ b/templates/de/emails/member/member_surfbar_url_pending_rejected.tpl @@ -4,7 +4,7 @@ Ein Administrator hat soeben Ihre gebuchte URL für unsere Surfbar abgelehnt Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Gebuchte URL: $content[url] ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_reg.tpl b/templates/de/emails/member/member_surfbar_url_reg.tpl index 40b867bcb3..32de9dc4fb 100644 --- a/templates/de/emails/member/member_surfbar_url_reg.tpl +++ b/templates/de/emails/member/member_surfbar_url_reg.tpl @@ -6,7 +6,7 @@ Hier sind alle Daten: ------------------------------------------ Gebuchte URL: $content[url] ------------------------------------------ -Ihre Mitglieder-Id: $content[userid] +Ihre Mitglieder-Id: $content[url_userid] ------------------------------------------ Anzahl Aufrufe: $content[limit] ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_rejected.tpl b/templates/de/emails/member/member_surfbar_url_rejected.tpl index b794eea6a4..415be6f353 100644 --- a/templates/de/emails/member/member_surfbar_url_rejected.tpl +++ b/templates/de/emails/member/member_surfbar_url_rejected.tpl @@ -6,7 +6,7 @@ Hier sind alle Daten: ------------------------------------------ Gebuchte URL: $content[url] ------------------------------------------ -Ihre Mitglieder-Id: $content[userid] +Ihre Mitglieder-Id: $content[url_userid] ------------------------------------------ Status: {%pipe,translateSurfbarUrlStatus=$content[url_status]%} ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_stopped_continued.tpl b/templates/de/emails/member/member_surfbar_url_stopped_continued.tpl index 9d8e6aeed6..a25652b375 100644 --- a/templates/de/emails/member/member_surfbar_url_stopped_continued.tpl +++ b/templates/de/emails/member/member_surfbar_url_stopped_continued.tpl @@ -4,7 +4,7 @@ Sie hatten soeben Ihre gestoppte URL gestartet. Dabei wurde sie auf "Wartend" ge Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Gebuchte URL: $content[url] (Neu: $content[edit][url]) ------------------------------------------ @@ -14,7 +14,7 @@ URL angemeldet: $content[url_registered] ------------------------------------------ Zuletzt gesperrt: $content[url_last_locked] ------------------------------------------ -Sperrgrund: $content[lock_reason] +Sperrgrund: $content[url_lock_reason] ------------------------------------------ Neue maximale Einblendungen: {%pipe,translateSurfbarLimit=$content[edit][limit]%} ------------------------------------------ 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 ce8ad4820b..5e3dc38284 100644 --- a/templates/de/emails/member/member_surfbar_url_stopped_deleted.tpl +++ b/templates/de/emails/member/member_surfbar_url_stopped_deleted.tpl @@ -4,7 +4,7 @@ Sie haben soeben Ihre gestoppte URL gelöscht. Sollte dies ein Versehen sein Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Gebuchte URL: $content[url] ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_stopped_pending.tpl b/templates/de/emails/member/member_surfbar_url_stopped_pending.tpl index 9ee7bc1fcc..df6cc5e939 100644 --- a/templates/de/emails/member/member_surfbar_url_stopped_pending.tpl +++ b/templates/de/emails/member/member_surfbar_url_stopped_pending.tpl @@ -4,7 +4,7 @@ Sie hatten soeben Ihre gestoppte URL geändert. Dabei wurde sie auf "Wartend Hier sind alle Daten dazu: ------------------------------------------ -Mitglieder-Id: $content[userid] +Mitglieder-Id: $content[url_userid] ------------------------------------------ Gebuchte URL: $content[url] (Neu: $content[edit][url]) ------------------------------------------ @@ -14,7 +14,7 @@ URL angemeldet: $content[url_registered] ------------------------------------------ Zuletzt gesperrt: $content[url_last_locked] ------------------------------------------ -Sperrgrund: $content[lock_reason] +Sperrgrund: $content[url_lock_reason] ------------------------------------------ Neue maximale Einblendungen: {%pipe,translateSurfbarLimit=$content[edit][limit]%} ------------------------------------------ diff --git a/templates/de/emails/member/member_surfbar_url_unlock.tpl b/templates/de/emails/member/member_surfbar_url_unlock.tpl index 9aa05ec734..c753347428 100644 --- a/templates/de/emails/member/member_surfbar_url_unlock.tpl +++ b/templates/de/emails/member/member_surfbar_url_unlock.tpl @@ -6,7 +6,7 @@ Hier sind alle Daten: ------------------------------------------ Gebuchte URL: $content[url] ------------------------------------------ -Ihre Mitglieder-Id: $content[userid] +Ihre Mitglieder-Id: $content[url_userid] ------------------------------------------ Status: {%pipe,translateSurfbarUrlStatus=$content[url_status]%} ------------------------------------------ diff --git a/templates/de/emails/member/member_undelete_active_surfbar_urls.tpl b/templates/de/emails/member/member_undelete_active_surfbar_urls.tpl index 5e36fc951e..5c853e66c7 100644 --- a/templates/de/emails/member/member_undelete_active_surfbar_urls.tpl +++ b/templates/de/emails/member/member_undelete_active_surfbar_urls.tpl @@ -1,4 +1,4 @@ -Hallo Mitglied, +Hallo {%user,gender,translateGender=$content[url_userid]%} {%user,surname=$content[url_userid]%} {%user,family=$content[url_userid]%}, wir haben soeben Ihre zuvor gelöschte URL in der Surfbar wiederhergestellt. @@ -6,11 +6,11 @@ Hier sind alle Daten dazu: ------------------------------------------ Gebuchte URL: $content[url] ------------------------------------------ -Sperrgrund: $content[lock_reason] +Sperrgrund: $content[url_lock_reason] ------------------------------------------ Angemeldet: $content[url_registered] ------------------------------------------ -Ihre Mitglieder-Id: $content[userid] +Ihre Mitglieder-Id: $content[url_userid] ------------------------------------------ ID in der Surfbar: $content[url_id] ------------------------------------------ diff --git a/templates/de/html/admin/admin_del_surfbar_urls_row.tpl b/templates/de/html/admin/admin_del_surfbar_urls_row.tpl index 4e2108813f..9f5d3194d6 100644 --- a/templates/de/html/admin/admin_del_surfbar_urls_row.tpl +++ b/templates/de/html/admin/admin_del_surfbar_urls_row.tpl @@ -1,7 +1,7 @@ - - + + $content[url_userid] diff --git a/templates/de/html/admin/admin_edit_surfbar_urls_row.tpl b/templates/de/html/admin/admin_edit_surfbar_urls_row.tpl index c105ae3939..a3fe707a51 100644 --- a/templates/de/html/admin/admin_edit_surfbar_urls_row.tpl +++ b/templates/de/html/admin/admin_edit_surfbar_urls_row.tpl @@ -1,7 +1,7 @@ - - + + $content[url_userid] 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 0f7ac649ab..45020c8091 100644 --- a/templates/de/html/admin/admin_list_surfbar_urls_row.tpl +++ b/templates/de/html/admin/admin_list_surfbar_urls_row.tpl @@ -1,12 +1,12 @@ - + - $content[url_userid] + {%pipe,generateUserProfileLink=$content[url_userid]%} - {--ADMIN_TEST_URL--} + {--ADMIN_TEST_URL--} {%pipe,translateComma=$content[url_views_total]%} @@ -21,6 +21,6 @@ $content[url_last_locked] - $content[lock_reason] + $content[url_lock_reason] 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 715670ce22..24b25df46c 100644 --- a/templates/de/html/admin/admin_lock_surfbar_urls_row.tpl +++ b/templates/de/html/admin/admin_lock_surfbar_urls_row.tpl @@ -1,7 +1,7 @@ - - + + $content[url_userid] 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 75d904c2dc..d3432a7a12 100644 --- a/templates/de/html/admin/admin_undelete_surfbar_urls_row.tpl +++ b/templates/de/html/admin/admin_undelete_surfbar_urls_row.tpl @@ -1,7 +1,7 @@ - - + + $content[url_userid] diff --git a/templates/de/html/admin/admin_unlock_surfbar_urls_row.tpl b/templates/de/html/admin/admin_unlock_surfbar_urls_row.tpl index 477c08db27..f07c40608b 100644 --- a/templates/de/html/admin/admin_unlock_surfbar_urls_row.tpl +++ b/templates/de/html/admin/admin_unlock_surfbar_urls_row.tpl @@ -1,6 +1,6 @@ - + $content[url_userid] diff --git a/templates/de/html/member/member_surfbar_delete_action_form.tpl b/templates/de/html/member/member_surfbar_delete_action_form.tpl index 434b0ceb2d..939f608c71 100644 --- a/templates/de/html/member/member_surfbar_delete_action_form.tpl +++ b/templates/de/html/member/member_surfbar_delete_action_form.tpl @@ -22,7 +22,7 @@
- + diff --git a/templates/de/html/member/member_surfbar_edit_action_form.tpl b/templates/de/html/member/member_surfbar_edit_action_form.tpl index 68cc5f942e..ab0056dd7b 100644 --- a/templates/de/html/member/member_surfbar_edit_action_form.tpl +++ b/templates/de/html/member/member_surfbar_edit_action_form.tpl @@ -21,7 +21,7 @@
- + diff --git a/templates/de/html/member/member_surfbar_list_form.tpl b/templates/de/html/member/member_surfbar_list_form.tpl index 0b9dc16862..d95cf40b2e 100644 --- a/templates/de/html/member/member_surfbar_list_form.tpl +++ b/templates/de/html/member/member_surfbar_list_form.tpl @@ -1,6 +1,6 @@
- +
diff --git a/templates/de/html/member/member_surfbar_list_row.tpl b/templates/de/html/member/member_surfbar_list_row.tpl index 8f5b821134..189ae3227c 100644 --- a/templates/de/html/member/member_surfbar_list_row.tpl +++ b/templates/de/html/member/member_surfbar_list_row.tpl @@ -12,7 +12,7 @@ $content[url_last_locked] - $content[lock_reason] + $content[url_lock_reason] $content[actions]