Fixes for ext-surfbar (the usual asset)

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 26f2aef2342e3771b9c47e22c14dcd81115e3ff1..33a2f58ff8a270d5c8894d899d11b096a766a91d 100644 (file)
--- 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 9ac1fadacc115d2a1399a7575ed01ab1d444e174..cf46a9366eec52d36dc4ac18b2a0037248ff37a4 100644 (file)
--- 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 ce02758fb2b2b31eae6d50c8ed1c5ce3120c6fb6..0cf6e2ab9650351b3ae8b27c2c77e14c4a5244ee 100644 (file)
--- 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 dbde6a592609de698c3b6b9b9badda27bd9af577..d41b8acc658ec161659b0a351ff5c8bb465bb22c 100644 (file)
--- 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 e3446626e33be9c2f759d72b41b3d92bd23740ac..da9bfd255138a082b6a2d05ffb6c758558513bbf 100644 (file)
--- 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 a2e45a6158fd9539bb57312380b20670fca48cf8..50354e4b691bc705c41f20e344a65a2932e96715 100644 (file)
--- 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 0555c8e123171041e7cacbac5d1348f24bba5758..9c3a2396006fb0ebff7fe1a940e68a24307c3708 100644 (file)
--- 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 4224fedfe43b2cc419ae3a5c7c2325a70d8f2dc1..f2bd4695d9ad6c177ad37a85e9acba0f47199239 100644 (file)
--- 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 2415c6eda2d0598429e6f8f297cd7cffdba991b5..0f191cd9d77bbeabd22b29bfc2bf56463682b557 100644 (file)
--- 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 52fea255498f8ca39ec25b14563bfcf46b05dbe9..e6a4fed3504dfb1bcfe97b277423cc9b9276e0d1 100644 (file)
--- 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 8de45873af872949672a4d6825d37ab06c002b5b..33b1897b1de984c1aac6a28585a56acedc8ffaed 100644 (file)
--- 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 9d381bf1c7fd5753cda8cae762f7b61f6a6f43a5..6a2f1bd9680dd1af2a9dfd6b9b3228b110071adb 100644 (file)
--- 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 d42f7a7310d17c484a1fcfb56af1bf3b2ad42af4..4257d3d0b0b7a4b1153dc190602afffccddf5e54 100644 (file)
--- 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 8592abd6533422320515c245e70d09b4b57a45c2..0bfba32a458692c6e1747275d13c7c6fe7ae9302 100644 (file)
--- 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 a47d61ea3ec4a75c1a993fbd4d5b957ad6fd615c..d2f0a747a8cac114e3d27b2525f7a2ffbbf67f14 100644 (file)
--- 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 1c74f4fde295ac5aefff5b2907e8f9d90edd7dc4..afe8a3cc9eea7e957e30891a840b1ab3d937622b 100644 (file)
--- 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 b6f8af23efb9cb6b9afb66a5db6f19e478bdf164..d598612b7bce5a2f31d437c2c80aefb81b6d9108 100644 (file)
--- 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 7c93a02178b40d2ed05bd863c6b0317de1c09f12..7f7d946f5f6bfa5820a53e47e0002ab0a02083ed 100644 (file)
--- 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 be0dfceb601cfec5e6ae58e23d7f4df5ec45b3dd..cd02aba8c2f8bae167d43c48ecf9a3dfe2514d0f 100644 (file)
--- 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 fc132fec9d9ea93979e64ac392cef098f1ceadce..84164d9ea0f5859159dcb7d6012bdc5c3afb9d82 100644 (file)
--- 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 47bb65460cd2c974d65a4b4de9b9540affdac4ef..4d2051f37f8cf6c96c77670750b6d5ff8157576d 100644 (file)
--- 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 60e10fbaf82503617b23fdecfb421e1f0c57df50..bb62b7f30ec57574e163fb984d2253e290e65410 100644 (file)
--- 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 91b40ddef32316445033de6bd67f5c6dc1184828..928301903809cbe830e332be413d19295898a5db 100644 (file)
--- 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 283ff3d9d44d5fc9fc6a66b20e0fc7629e6a5f85..d6298bb23eb27d9a62f17b39705544c3d111d27b 100644 (file)
--- 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 966571f395e84b2c43fef7ef00b046108c7d5864..41c71e8dbeedcce48f36bf4631396d613d745f45 100644 (file)
--- 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 8a815490646b6a875b8e258081eea7eef3ce0173..d9d31011d6b66d3fa6d92aea7e0d6a805f7400f5 100644 (file)
--- 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 36f3cf0bc6a2880268810c826d7820287152c5b5..8b128ef55e19790fc4ae92a19432d2af98e2e8b5 100644 (file)
--- 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 f05d6411e10e7e32126bd85825b46ff3530c19ab..8ab181872c623144f67710b31ebf8deef4d8aa7c 100644 (file)
--- 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 32f83651f07a2182a219d3063018bb70992ad53c..6bc35d6a3ef73c87a108d6e81a71c82d53de30bb 100644 (file)
--- 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 476da80c6252ee35e779434ad698cee3c9474558..40f99408fda8426f347f77e8f122705a9afa54e6 100644 (file)
--- 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 6f2a681ce4c7b90c53809bf0f52c87acb704c9a7..6ffc31047e5fe9fd9c4413075db968527828644c 100644 (file)
--- 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 ad6ca789a73a88c084360512e3845700e8a0cef5..3a901a1d391f600619aff23a43ea6543a1c683ce 100644 (file)
--- 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 ef2eceafef6968a10c017093c4177242d674a0b8..237023474b5fc989a773f561f9ca83eaaba07ca2 100644 (file)
--- 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 331522d346ef16de3d98b33d3e5a4c0999691cea..b1e7953f4be37cd4cbb9043b5364a1032855fb18 100644 (file)
--- 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 32d53896d146b8d0470d5f71c554d6c3ac1954f1..658bb3ab331837506adae901d22123d3b914cdc2 100644 (file)
--- 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 a1a6e6e70a7fa200d49633b86ba4b314c444fdcb..43d247b91c879fa3c3bc4273151c70b5eef98a5c 100644 (file)
--- 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 14fef75ab63ba4b2aa147d94f3c60ba0740c7f2d..9a321f9a4d17f0453925b786cd634a345b6ab05e 100644 (file)
--- 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 54f8becfddee86459413ae7e10a874411d5da820..350d8c861c79dd0f2a29a650b3b1533bc89e2c64 100644 (file)
--- 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 aa255d7d15fbf15886fdb6238aefb3379e46f636..5984d1f759bd8bcaed4f4b97e6fb40067b838297 100644 (file)
--- 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 f9a2be126f02abc197a55e23dd12adf207d7b192..d27c36aa51395f2e40eaa202b591132a1484b386 100644 (file)
--- 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 74d2830cc9bd5814627173909e4bce4984691f4e..ce0f7ea0ae670508fa4bff452b51337fa5189d61 100644 (file)
--- 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 f0194230b7ab563e0c1a59e5be5650f32ebae250..1b808e0b937a35678dd27cfb03c6eb76776ce88b 100644 (file)
--- 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 47b5d210644decb98c13d82143b9a1bde03a1732..eaf9020037ec84ba77e952467295a7d002927fe2 100644 (file)
--- 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 065f81bfe99d78777aae18589a2539b3c61742ef..2eddd252035d459daefdd368d4bf5815c0d3dd1c 100644 (file)
--- 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 4a07662c56fa1519b6a6d7400144001a1adcdaca..69f0c90b89ec84e8aa52a771b842d55483a17375 100644 (file)
--- 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 5f04940a511aa7fb31e94f7d0fa1d14f12be2c67..917b0b234c5490964b26937d50da885d7dc64a89 100644 (file)
--- 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 0a87664f48d47b2bc04ffc8849e6e5e9f48c6dfb..92920763e0dc62541f3eb732949cd8c358da28f7 100644 (file)
--- 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 ae1d5da5ebe35fa9b0937a02b2ebc6e71e58f2a6..ce359967df18b19a8a5cef217287e5102c2a5bba 100644 (file)
--- 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 852359ed03ef8e88c9b5ff7fcc8ff679bb587ca0..4441bb4907fec98088c489ac4c08b122ae662bd4 100644 (file)
--- 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 83e054d0c88be06b7e86b12e6e4f4e1896e5d8be..0e231647ec57783b0f11cdc44313152d4a5de59a 100644 (file)
--- 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 40b867bcb3f31437f56221fd18e6ddc4e43b5d1c..32de9dc4fbfd51f3409c3b59d80cec669aa225db 100644 (file)
--- 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 b794eea6a40e39a44bfb9238ef12e10c2188f85b..415be6f3536c886b21ef6ec6a8ddc4db95943b1b 100644 (file)
--- 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 9d8e6aeed62ae1fd515c1190087cb441ee36bfd7..a25652b3753de81159dd7c7ca9dfefef2ee150eb 100644 (file)
--- 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 ce8ad4820b8091748c1809ebffe5d9d6f24e596d..5e3dc38284e13c92e31a552305cc844b4f27e9c1 100644 (file)
--- 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 9ee7bc1fcc3bb3e80978cdde888dfae177cedac5..df6cc5e939f96243902abbaaf21c25dab95c0f30 100644 (file)
--- 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 9aa05ec73460b2fc075c7e80d5d85c208d46b136..c753347428f05a9ce0e69a0587d55f4c283943d8 100644 (file)
--- 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 5e36fc951ef704b6c4fef9cdc1295b63ba23b104..5c853e66c726b93eefc08358acdf7d9b1096212e 100644 (file)
--- 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 4e2108813f697218cbdc62f74b36546a956fbca8..9f5d3194d62a75b0d592bc15ce1e0433f8a0f6d4 100644 (file)
--- 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 @@
 <tr>
        <td align="center" class="bottom right switch_sw$content[sw]">
-               <input type="hidden" name="id[$content[url_id]]" value="1" />
-               <input type="hidden" name="userid_raw[$content[url_id]]" value="$content[userid_raw]" />
+               <input type="hidden" name="url_id[$content[url_id]]" value="1" />
+               <input type="hidden" name="url_userid[$content[url_id]]" value="$content[url_userid]" />
                $content[url_userid]
        </td>
        <td align="center" class="bottom right switch_sw$content[sw]">

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 c105ae39395691b887108229f708db22a8794d0b..a3fe707a5175c8bfb332a168d1c13128c341ac4a 100644 (file)
--- 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 @@
 <tr>
        <td align="center" class="bottom right switch_sw$content[sw]">
-               <input type="hidden" name="id[$content[url_id]]" value="1" />
-               <input type="hidden" name="userid_raw[$content[url_id]]" value="$content[userid_raw]" />
+               <input type="hidden" name="url_id[$content[url_id]]" value="1" />
+               <input type="hidden" name="url_userid[$content[url_id]]" value="$content[url_userid]" />
                $content[url_userid]
        </td>
        <td align="center" class="bottom right switch_sw$content[sw]">

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 0f7ac649ab194c1253de5e0f3226c16b34666346..45020c8091e2a229fd354da3f253bae37e47d4bb 100644 (file)
--- 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 @@
 <tr>
        <td align="center" class="bottom right switch_sw$content[sw]">
-               <input type="checkbox" class="admin_normal" title="{--ID_SELECT--} $content[url_id]" name="id[$content[url_id]]" value="1" />
+               <input type="checkbox" class="admin_normal" title="{--ID_SELECT--} $content[url_id]" name="url_id[$content[url_id]]" value="1" />
        </td>
        <td align="center" class="bottom right switch_sw$content[sw]">
-               $content[url_userid]
+               {%pipe,generateUserProfileLink=$content[url_userid]%}
        </td>
        <td align="center" class="bottom right switch_sw$content[sw]">
-               <a href="$content[url]" target="_blank" title="{--ADMIN_TEST_URL--}">{--ADMIN_TEST_URL--}</a>
+               <a href="{%pipe,generateFrametesterUrl=$content[url]%}" target="_blank" title="{--ADMIN_TEST_URL--}">{--ADMIN_TEST_URL--}</a>
        </td>
        <td align="center" class="bottom right switch_sw$content[sw]">
                <a href="{%url=modules.php?module=admin&amp;what=surfbar_stats&amp;url_id=$content[url_id]%}">{%pipe,translateComma=$content[url_views_total]%}</a>
@@ -21,6 +21,6 @@
                $content[url_last_locked]
        </td>
        <td align="center" class="bottom switch_sw$content[sw]">
-               $content[lock_reason]
+               $content[url_lock_reason]
        </td>
 </tr>

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 715670ce220edc528c8e86b7c45292bdebf0d761..24b25df46c47f2f5a4489561d03e77642c658eb0 100644 (file)
--- 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 @@
 <tr>
        <td align="center" class="bottom right switch_sw$content[sw]">
-               <input type="hidden" name="id[$content[url_id]]" value="1" />
-               <input type="hidden" name="userid_raw[$content[url_id]]" value="$content[url_userid_raw]" />
+               <input type="hidden" name="url_id[$content[url_id]]" value="1" />
+               <input type="hidden" name="url_userid[$content[url_id]]" value="$content[url_url_userid]" />
                <input type="hidden" name="last_locked[$content[url_id]]" value="NOW()" />
                $content[url_userid]
        </td>

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 75d904c2dc78d57b9d9759de97d874e1522c3492..d3432a7a12cc36f8388ad20a37a1d5c5674a19d5 100644 (file)
--- 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 @@
 <tr>
        <td align="center" class="bottom right switch_sw$content[sw]">
-               <input type="hidden" name="id[$content[url_id]]" value="1" />
-               <input type="hidden" name="userid_raw[$content[url_id]]" value="$content[url_userid_raw]" />
+               <input type="hidden" name="url_id[$content[url_id]]" value="1" />
+               <input type="hidden" name="url_userid[$content[url_id]]" value="$content[url_url_userid]" />
                $content[url_userid]
        </td>
        <td align="center" class="bottom right switch_sw$content[sw]">

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 477c08db27390b2fce99c1bf202f8795274fe30c..f07c40608b4812be814e855f7c0e16cf38fce0ac 100644 (file)
--- 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 @@
 <tr>
        <td align="center" class="bottom right switch_sw$content[sw]">
-               <input type="checkbox" class="admin_normal" title="{--ID_SELECT--} $content[url_id]" name="id[$content[url_id]]" value="1" />
+               <input type="checkbox" class="admin_normal" title="{--ID_SELECT--} $content[url_id]" name="url_id[$content[url_id]]" value="1" />
        </td>
        <td align="center" class="bottom right switch_sw$content[sw]">
                $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 434b0ceb2d527620597dc119de37bf7eea83c9a2..939f608c714a75922335434a34c2ea927514b8f0 100644 (file)
--- 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 @@
 
        <div class="member_title top" style="padding-top:5px;padding-bottom:5px">
                <input type="reset" class="member_reset" value="{--CLEAR_FORM--}" />
-               <input type="hidden" name="id" value="$content[url_id]" />
+               <input type="hidden" name="url_id" value="$content[url_id]" />
                <input type="hidden" name="action" value="delete" />
                <input type="hidden" name="execute" value="1" />
                <input type="submit" class="member_submit" name="ok" value="{--MEMBER_SURFBAR_ACTION_DELETE_NOW_SUBMIT--}" />

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 68cc5f942eb5815ac61e83b290d0961470ff4a70..ab0056dd7b6657f13f0d14c910f6877804ff8a6e 100644 (file)
--- 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 @@
 
        <div class="member_title top" style="padding-top:5px;padding-bottom:5px">
                <input type="reset" class="member_reset" value="{--CLEAR_FORM--}" />
-               <input type="hidden" name="id" value="$content[url_id]" />
+               <input type="hidden" name="url_id" value="$content[url_id]" />
                <input type="hidden" name="action" value="edit" />
                <input type="hidden" name="execute" value="1" />
                <input type="submit" class="member_submit" name="ok" value="{--MEMBER_SURFBAR_ACTION_EDIT_NOW_SUBMIT--}" />

diff --git a/templates/de/html/member/member_surfbar_list_form.tpl b/templates/de/html/member/member_surfbar_list_form.tpl
index 0b9dc1686239fb2b351a7423abfecf6960b13c5f..d95cf40b2e818624ac8bd431836748ea38435722 100644 (file)
--- a/templates/de/html/member/member_surfbar_list_form.tpl
+++ b/templates/de/html/member/member_surfbar_list_form.tpl
@@ -1,6 +1,6 @@
 <td align="center" width="$content[width]%%">
        <form accept-charset="utf-8" action="{%url=modules.php?module=login&amp;what=surfbar_list%}" method="post">
-               <input type="hidden" name="id" value="$content[url_id]" />
+               <input type="hidden" name="url_id" value="$content[url_id]" />
                <input type="hidden" name="action" value="$content[action]" />
                <input type="submit" class="member_submit" name="ok" title="$content[title]" value="$content[submit]" />
        </form>

diff --git a/templates/de/html/member/member_surfbar_list_row.tpl b/templates/de/html/member/member_surfbar_list_row.tpl
index 8f5b8211346b71382e1197ab330954ff0119a829..189ae3227c753d27a22ba4bcf967cd38de0bb0ba 100644 (file)
--- 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]
        </td>
        <td align="center" class="switch_sw$content[sw] bottom right">
-               $content[lock_reason]
+               $content[url_lock_reason]
        </td>
        <td align="center" class="switch_sw$content[sw] bottom">
                $content[actions]