New function isValidUserid() introduced, more rewrites to EL:
authorRoland Häder <roland@mxchange.org>
Mon, 28 Jun 2010 03:47:11 +0000 (03:47 +0000)
committerRoland Häder <roland@mxchange.org>
Mon, 28 Jun 2010 03:47:11 +0000 (03:47 +0000)
- New function isValidUserId() introduced, see ticket #147. This function just
  validates a given user id if it not null, not empty and larget than zero.
- More rewrites to make use of EL
- 'surfbar_counter' is now a CSS class, not id
- TODOs.txt updated

44 files changed:
DOCS/TODOs.txt
inc/libs/doubler_functions.php
inc/mails/doubler_mails.php
inc/modules/admin/overview-inc.php
inc/modules/admin/what-chk_regs.php
inc/modules/admin/what-del_email.php
inc/modules/admin/what-edit_emails.php
inc/modules/admin/what-list_autopurge.php
inc/modules/admin/what-list_bonus.php
inc/modules/admin/what-list_holiday.php
inc/modules/admin/what-list_refs.php
inc/modules/admin/what-list_task.php
inc/modules/admin/what-list_unconfirmed.php
inc/modules/admin/what-list_user.php
inc/modules/admin/what-sub_points.php
inc/modules/admin/what-unlock_emails.php
inc/modules/admin/what-unlock_sponsor.php
inc/modules/admin/what-unlock_surfbar_urls.php
inc/modules/admin/what-usr_online.php
inc/wrapper-functions.php
templates/de/html/admin/admin_del_email_normal.tpl
templates/de/html/admin/admin_edit_email_row.tpl
templates/de/html/admin/admin_list_autopurge_row.tpl
templates/de/html/admin/admin_list_bonus_rows.tpl
templates/de/html/admin/admin_list_chk_reg_row.tpl
templates/de/html/admin/admin_list_holiday_row.tpl
templates/de/html/admin/admin_list_online_row.tpl
templates/de/html/admin/admin_list_refs.tpl
templates/de/html/admin/admin_list_refs2.tpl
templates/de/html/admin/admin_list_refs_row.tpl
templates/de/html/admin/admin_list_unconfirmed.tpl
templates/de/html/admin/admin_list_unconfirmed_row.tpl
templates/de/html/admin/admin_list_user_row.tpl
templates/de/html/admin/admin_unlock_emails_row.tpl
templates/de/html/admin/admin_unlock_surfbar_urls_row.tpl
templates/de/html/js/js_surfbar_stopped.tpl
templates/de/html/surfbar/surfbar_frame_stats.tpl
templates/de/html/surfbar/surfbar_frame_textlinks.tpl
templates/de/html/surfbar/surfbar_frame_top.tpl
templates/de/html/surfbar/surfbar_stopped.tpl
theme/business/css/surfbar.css
theme/default/css/surfbar.css
theme/desert/css/surfbar.css
theme/org/css/surfbar.css

index 334942e..99787c5 100644 (file)
 ./inc/libs/task_functions.php:53:// @TODO Move all extension-dependent queries into filters
 ./inc/libs/theme_functions.php:95:     // @TODO Can't this be rewritten to an API function?
 ./inc/libs/user_functions.php:146:     // @TODO These two constants are no longer used, maybe we reactivate this code?
-./inc/libs/user_functions.php:233:// @TODO Double-check configuration entry here
-./inc/libs/user_functions.php:325:                     // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);
-./inc/libs/user_functions.php:345:                     // @TODO Make this filter working: $url = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
-./inc/libs/user_functions.php:421:     // @TODO We should try to rewrite this to fetchUserData() somehow
+./inc/libs/user_functions.php:234:// @TODO Double-check configuration entry here
+./inc/libs/user_functions.php:326:                     // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);
+./inc/libs/user_functions.php:346:                     // @TODO Make this filter working: $url = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
+./inc/libs/user_functions.php:422:     // @TODO We should try to rewrite this to fetchUserData() somehow
 ./inc/libs/yoomedia_functions.php:116: $response = YOOMEDIA_QUERY_API('out_textmail.php', true); // @TODO Ask Yoo!Media for test script
 ./inc/load_config.php:77:      // @TODO Rewrite them to avoid this else block
 ./inc/loader/load_cache-extension.php:13: * @TODO Rewrite this whole file to load_cache-extensions.php           *
 ./inc/modules/admin/what-config_rallye_prices.php:209:                         // @TODO Rewritings: level->price_level, infos->info in template
 ./inc/modules/admin/what-config_rallye_prices.php:226:                 // @TODO Rewrite these two constants
 ./inc/modules/admin/what-config_register.php:78:       // @TODO Move this HTML code into a template
+./inc/modules/admin/what-del_email.php:60:             // @TODO Unused: $price = getPaymentPoints($content['payment_id'], 'price');
+./inc/modules/admin/what-del_email.php:61:             // @TODO Unused: cat_id, payment_id
 ./inc/modules/admin/what-edit_user.php:20: * @TODO Add support for ext-country                                    *
 ./inc/modules/admin/what-email_stats.php:48:// @TODO Unused at the moment
 ./inc/modules/admin/what-extensions.php:362:                                           // @TODO Rewrite this to a filter
 ./inc/modules/admin/what-guest_add.php:85:             // @TODO This can be somehow rewritten to a function
 ./inc/modules/admin/what-holiday_list.php:48:// @TODO Unused at the moment
 ./inc/modules/admin/what-list_autopurge.php:49:// @TODO Rewrite those lines to filter
-./inc/modules/admin/what-list_autopurge.php:85:                // @TODO Rewritings: surname->surname,family->family in templates
-./inc/modules/admin/what-list_bonus.php:131:           // @TODO Can't this be moved into our expression language?
+./inc/modules/admin/what-list_bonus.php:136:           // @TODO Can't this be moved into our expression language?
 ./inc/modules/admin/what-list_cats.php:56:             // @TODO No longer needed? define('__CATS_BASE'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
 ./inc/modules/admin/what-list_cats.php:72:                             // @TODO Rewrite this to countSum.....() function
 ./inc/modules/admin/what-list_links.php:57:            // @TODO Try to rewrite this to a filter
 ./inc/modules/admin/what-list_links.php:98:                                    // @TODO Rewrite this to includes/filter
 ./inc/modules/admin/what-list_refs.php:110:                                                            // @TODO Try to rewrite some to EL
 ./inc/modules/admin/what-list_task.php:146:            // @TODO Rewrite these templates to one and add $OUT
-./inc/modules/admin/what-list_task.php:180:                    // @TODO Rewritings: admin->assigned_admin,userid->userid,type->task_type_msg in template
+./inc/modules/admin/what-list_task.php:180:                    // @TODO Rewritings: admin->assigned_admin,type->task_type_msg in template
 ./inc/modules/admin/what-list_task.php:192:                            // @TODO Rewrite this to $OUT .= ..., true, ...
 ./inc/modules/admin/what-list_task.php:196:                            // @TODO Rewrite this to $OUT .= ..., true, ...
 ./inc/modules/admin/what-list_unconfirmed.php:100:             // @TODO Rewrite this to $content = SQL_FETCHARRAY(), look some lines above for two differrent queries
 ./inc/modules/admin/what-list_unconfirmed.php:88:      // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus
 ./inc/modules/admin/what-list_user.php:157:            // @TODO Rewrite these to filters
 ./inc/modules/admin/what-list_user.php:275:            // @TODO Rewrite this into a filter
-./inc/modules/admin/what-list_user.php:325:                    // @TODO Rewrite this into a filter
+./inc/modules/admin/what-list_user.php:322:                    // @TODO Rewrite this into a filter
 ./inc/modules/admin/what-list_user.php:59:// @TODO Rewrite these if-blocks in a filter
 ./inc/modules/admin/what-logs.php:69:                  // @TODO Fix content-type here
 ./inc/modules/admin/what-logs.php:72:                  // @TODO Fix content-type here
@@ -255,10 +256,7 @@ Warning: Not parsing JavaScript templates/de/html/js/js_jquery.tpl.
 Warning: Not parsing JavaScript templates/de/html/js/js_surfbar_member_book.tpl.
 Warning: Not parsing JavaScript templates/de/html/js/js_surfbar_stopped.tpl.
 Warning: Not parsing JavaScript templates/de/html/js/js_surfbar_member_edit.tpl.
-PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/guest/guest_rallye_expired_footer.tpl, line: 6 in 
-PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/guest/guest_rallye_expired_footer.tpl, line: 7 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/guest/guest_footer.tpl, line: 6 in 
-PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/guest/guest_rallye_footer.tpl, line: 11 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/guest/guest_menu_content.tpl, line: 2 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/guest/guest_doubler.tpl, line: 52 in 
 PHP Warning:  DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/guest/guest_content_footer.tpl, line: 1 in 
index c299e11..13690c1 100644 (file)
@@ -94,8 +94,8 @@ LIMIT %s",
                        // @TODO Can't this be moved into EL?
                        if (isAdmin()) {
                                // Set links to admin area
-                               if ($content['userid'] > 0) { $content['userid'] = generateUserProfileLink($content['userid']); } else { $content['userid'] = '---'; }
-                               if ($content['refid'] > 0)  { $content['refid']  = generateUserProfileLink($content['refid']);  } else { $content['refid']  = '---'; }
+                               if (isValidUserId($content['userid'])) { $content['userid'] = generateUserProfileLink($content['userid']); } else { $content['userid'] = '---'; }
+                               if (isValidUserId($content['refid']))  { $content['refid']  = generateUserProfileLink($content['refid']);  } else { $content['refid']  = '---'; }
                        } // END - if
 
                        // Prepare data for the row template
index 975fae0..d2cca8e 100644 (file)
@@ -48,8 +48,8 @@ if (!defined('__SECURITY')) {
 if (getOutputMode() != 0) return;
 
 // Initialize variables
-$jackpot = '0'; $user = '0';
-if (isExtensionActive('jackpot')) $jackpot = getJackpotPoints();
+$jackpotPoints = '0'; $userPoints = '0';
+if (isExtensionActive('jackpot')) $jackpotPoints = getJackpotPoints();
 
 // Get total points of the doubler itself
 $DOUBLER_POINTS = DOUBLER_GET_TOTAL_POINTS_LEFT();
@@ -146,17 +146,17 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y'))
                        $okay = false;
 
                        // Check for jackpot inclusion in doubling process
-                       if (($jackpot > 0) && ($jackpot >= $content['points']) && (getConfig('doubler_jackpot') == 'Y')) {
+                       if (($jackpotPoints > 0) && ($jackpotPoints >= $content['points']) && (getConfig('doubler_jackpot') == 'Y')) {
                                // Subtract points from jackpot
                                subtractPointsFromJackpot($content['points']);
-                               $jackpot -= $content['points'];
+                               $jackpotPoints -= $content['points'];
 
                                // Okay, done!
                                $okay = true;
                        } // END - if
 
                        // Exclude also webmaster's id in taking points from webmaster's account
-                       if (($user > 0) && ($user >= $content['points']) && ($okay === false) && (getConfig('doubler_userid') > 0) && ($content['userid'] != getConfig('doubler_userid'))) {
+                       if (($userPoints > 0) && ($userPoints >= $content['points']) && ($okay === false) && (getConfig('doubler_userid') > 0) && ($content['userid'] != getConfig('doubler_userid'))) {
                                // Add points to used points
                                subtractPoints('doubler_payout', getConfig('doubler_userid'), $content['points']);
 
index 81719aa..0b83fa2 100644 (file)
@@ -450,7 +450,7 @@ LIMIT 1",
                        // Get task type
                        $content['task_type_msg'] = getMessage('ADMIN_TASK_IS_'.strtoupper($content['task_type']).'');
 
-                       if ($content['userid'] > 0) {
+                       if (isValidUserId($content['userid'])) {
                                // Member found otherwise it's a system task
                                $content['userid'] = generateUserProfileLink($content['userid']);
                        } else {
index 6c3ca60..a21d404 100644 (file)
@@ -59,20 +59,17 @@ if (SQL_NUMROWS($result) > 0) {
        // We have some (new?) registrations!
        $OUT = ''; $SW = 2;
        while ($content = SQL_FETCHARRAY($result)) {
-               // Add link to refid
-               if ($content['refid'] > 0) $content['refid'] = generateUserProfileLink($content['refid']);
-
                // Prepare array for the row template
                $content = array(
                        'sw'          => $SW,
-                       'gender'      => translateGender($content['gender']),
+                       'gender'      => $content['gender'],
                        'surname'     => $content['surname'],
                        'family'      => $content['family'],
                        'email'       => '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['email'] . '</a>',
                        'remote_addr' => $content['REMOTE_ADDR'],
                        'refid'       => $content['refid'],
                        'user_hash'   => $content['user_hash'],
-                       'link'        => generateUserProfileLink($content['userid']),
+                       'userid'      => $content['userid'],
                );
 
                // Load row template and switch color
index 11de7d3..c5abb43 100644 (file)
@@ -48,25 +48,20 @@ $cnt = '0';
 
 if (isGetRequestParameterSet('mid')) {
        // Load email data
-       $result = SQL_QUERY_ESC("SELECT `id`, `sender`, `subject`, `url`, `timestamp`, `payment_id` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT `id`, `sender`, `subject`, `url`, `timestamp`, `cat_id`, `payment_id` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
                array(bigintval(getRequestParameter('mid'))), __FILE__, __LINE__);
 
        // Delete mail only once
        if (SQL_NUMROWS($result) == 1) {
                // Load data
-               list ($id, $sender, $subject, $url, $timestamp, $payId) = SQL_FETCHROW($result);
-               SQL_FREERESULT($result);
+               $content = SQL_FETCHARRAY($result);
 
                // Get points we shall pay back per mail
-               $price = getPaymentPoints($payId, 'price');
+               // @TODO Unused: $price = getPaymentPoints($content['payment_id'], 'price');
+               // @TODO Unused: cat_id, payment_id
 
                // Prepare data for the template
-               $content['id']        = $id;
-               $content['sender']    = generateUserProfileLink($sender);
-               $content['subject']   = $subject;
-               $content['url']       = generateDerefererUrl($url);
-               $content['url_raw']   = $url;
-               $content['timestamp'] = generateDateTime($timestamp, 0);
+               $content['timestamp'] = generateDateTime($content['timestamp'], 0);
 
                // Load template
                loadTemplate('admin_del_email_normal', false, $content);
@@ -157,6 +152,9 @@ LIMIT 1",
                // Mail already deleted!
                loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NORMAL_MAIL_ALREADY_DELETED'));
        }
+
+       // Free result
+       SQL_FREERESULT($result);
 } elseif (isGetRequestParameterSet('pid')) {
        // Remove stats entries
        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1",
index 29bb65f..b18689d 100644 (file)
@@ -49,20 +49,26 @@ if ((isFormSent()) && (!isPostRequestParameterSet('id'))) {
        unsetPostRequestParameter('ok');
 } // END - if
 
-$result = SQL_QUERY("SELECT id, sender, subject, payment_id, cat_id FROM `{?_MYSQL_PREFIX?}_pool` ORDER BY timestamp", __FILE__, __LINE__);
+// Query the pool
+$result = SQL_QUERY("SELECT
+       `id`, `sender`, `subject`, `payment_id`, `cat_id`
+FROM
+       `{?_MYSQL_PREFIX?}_pool`
+ORDER BY
+       `timestamp` ASC", __FILE__, __LINE__);
+
+// Entries found?
 if (SQL_NUMROWS($result) > 0) {
        if (isFormSent()) {
                // Make mail editable...
-               $result = SQL_QUERY_ESC("SELECT subject, text, url FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
-               array(bigintval(postRequestParameter('id'))), __FILE__, __LINE__);
-               list($subj, $text, $url) = SQL_FETCHROW($result);
-               SQL_FREERESULT($result);
+               $result = SQL_QUERY_ESC("SELECT `id`, `subject`, `text`, `url` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
+                       array(bigintval(postRequestParameter('id'))), __FILE__, __LINE__);
 
-               // Prepare constant for template
-               $content['id']       = bigintval(postRequestParameter('id'));
-               $content['url']      = $url;
-               $content['subject']  = $subj;
-               $content['text']     = $text;
+               // Fetch row
+               $content = SQL_FETCHARRAY($result);
+
+               // Free result
+               SQL_FREERESULT($result);
 
                // Load template
                loadTemplate('admin_edit_email', false, $content);
@@ -96,20 +102,13 @@ LIMIT 1",
                // There are mail orders available
                $OUT = ''; $SW = 2;
                while ($content = SQL_FETCHARRAY($result)) {
-                       // Prepare data for the row template
-                       $content = array(
-                               'sw'      => $SW,
-                               'id'      => $content['id'],
-                               'subject' => $content['subject'],
-                               'userid'  => generateUserProfileLink($content['sender']),
-                               'pay'     => getPaymentTitlePrice($content['payment_id']),
-                               'cat'     => getCategory($content['cat_id']),
-                       );
+                       // Add color swapping
+                       $content['sw'] = $SW;
 
                        // Load row template and switch colors
                        $OUT .= loadTemplate('admin_edit_email_row', true, $content);
                        $SW = 3 - $SW;
-               }
+               } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
index 5cbd509..50b09a9 100644 (file)
@@ -59,34 +59,28 @@ if (isExtensionActive('doubler'))              $EXCLUDE_LIST .= ' AND d.userid !
 if (isExtensionInstalledAndNewer('holiday', '0.1.3')) $EXCLUDE_LIST .= " AND d.holiday_active='N'";
 
 // Check for all accounts
-$result = SQL_QUERY_ESC("SELECT
+$result = SQL_QUERY("SELECT
        d.userid, d.gender, d.surname, d.family, d.email, d.joined, d.last_online, d.ap_notified
 FROM
        `{?_MYSQL_PREFIX?}_user_data` AS d
 WHERE
        d.`status`='CONFIRMED' AND
-       d.joined < (UNIX_TIMESTAMP() - %s) AND
-       d.last_online < (UNIX_TIMESTAMP() - %s) AND
-       d.ap_notified < (UNIX_TIMESTAMP() - %s)
+       d.joined < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) AND
+       d.last_online < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) AND
+       d.ap_notified < (UNIX_TIMESTAMP() - {?ap_inactive_since?})
        ".$EXCLUDE_LIST."
 ORDER BY
-       d.userid ASC",
-       array(
-               getConfig('ap_inactive_since'),
-               getConfig('ap_inactive_since'),
-               getConfig('ap_inactive_since')
-       ), __FILE__, __LINE__);
+       d.userid ASC", __FILE__, __LINE__);
 
 if (SQL_NUMROWS($result) > 0) {
        // Ok, we have found some inactive accounts
        $OUT = ''; $SW = 2;
        while ($content = SQL_FETCHARRAY($result)) {
                // Prepare data for the row template
-               // @TODO Rewritings: surname->surname,family->family in templates
                $content = array(
                        'sw'          => $SW,
-                       'userid'      => generateUserProfileLink($content['userid']),
-                       'gender'      => translateGender($content['gender']),
+                       'userid'      => $content['userid'],
+                       'gender'      => $content['gender'],
                        'surname'     => $content['surname'],
                        'family'      => $content['family'],
                        'email'       => '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['email'] . '</a>',
index 38c8ee8..021a2e8 100644 (file)
@@ -78,11 +78,19 @@ if (getConfig('bonus_active') == 'Y') {
        }
 
        // Check if at least one is in the active rallye
-       $result = SQL_QUERY_ESC("SELECT `userid`, `email`, `gender`, `surname`, `family`, ".$USE." AS points, `last_online`
-FROM `{?_MYSQL_PREFIX?}_user_data`
-WHERE `status`='CONFIRMED' AND ".$USE." > 0".$lastOnline."
-ORDER BY `points` DESC, `last_online` DESC, `userid` ASC",
-       array($ONLINE), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT
+       `userid`, `email`, `gender`, `surname`, `family`, ".$USE." AS points, `last_online`
+FROM
+       `{?_MYSQL_PREFIX?}_user_data`
+WHERE
+       `status`='CONFIRMED' AND
+       ".$USE." > 0
+       ".$lastOnline."
+ORDER BY
+       `points` DESC,
+       `last_online` DESC,
+       `userid` ASC",
+               array($ONLINE), __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result) > 0) {
                // List users
@@ -100,10 +108,7 @@ ORDER BY `points` DESC, `last_online` DESC, `userid` ASC",
                        } // END - if
 
                        // Prepare content
-                       $content['userid']      = generateUserProfileLink($content['userid']);
                        $content['email']       = generateEmailLink($content['email'], 'user_data');
-                       $content['gender']      = translateGender($content['gender']);
-                       $content['points']      = translateComma($content['points']);
                        $content['last_online'] = generateDateTime($content['last_online'], 2);
                        $content['sw']     = $SW;
                        $content['win1']   = $WIN1;
index 2947ae1..9845488 100644 (file)
@@ -46,11 +46,16 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addMenuDescription('admin', __FILE__);
 
 // Start listing holiday requests
-$result = SQL_QUERY("SELECT h.id, h.userid, h.holiday_start, h.holiday_end, h.comments, d.status, d.last_online
-FROM `{?_MYSQL_PREFIX?}_user_holidays` AS h
-LEFT JOIN `{?_MYSQL_PREFIX?}_user_data` AS d
-ON h.userid=d.userid
-ORDER BY h.userid", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT
+       h.id, h.userid, h.holiday_start, h.holiday_end, h.comments, d.status, d.last_online
+FROM
+       `{?_MYSQL_PREFIX?}_user_holidays` AS h
+LEFT JOIN
+       `{?_MYSQL_PREFIX?}_user_data` AS d
+ON
+       h.userid=d.userid
+ORDER BY
+       h.userid ASC", __FILE__, __LINE__);
 
 if (SQL_NUMROWS($result) > 0) {
        // List all holiday requests
@@ -61,20 +66,20 @@ if (SQL_NUMROWS($result) > 0) {
 
                // Prepare data for the row template
                $content = array(
-                       'sw'       => $SW,
-                       'id'       => $content['id'],
-                       'userid'      => generateUserProfileLink($content['userid']),
-                       'start'    => generateDateTime($content['holiday_start'], 3),
-                       'end'      => generateDateTime($content['holiday_end'], 3),
-                       'comments' => wordwrap($content['comments'], 15),
-                       'status'   => translateUserStatus($content['status']),
-                       'last_online'     => generateDateTime($content['last_online'], 3),
+                       'sw'          => $SW,
+                       'id'          => $content['id'],
+                       'userid'      => $content['userid'],
+                       'start'       => generateDateTime($content['holiday_start'], 3),
+                       'end'         => generateDateTime($content['holiday_end'], 3),
+                       'comments'    => wordwrap($content['comments'], 15),
+                       'status'      => $content['status'],
+                       'last_online' => generateDateTime($content['last_online'], 3),
                );
 
                // Load row template and switch color
                $OUT .= loadTemplate('admin_list_holiday_row', true, $content);
                $SW = 3 - $SW;
-       }
+       } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
index 4451dc6..a763a39 100644 (file)
@@ -110,13 +110,13 @@ ORDER BY
                                                                // @TODO Try to rewrite some to EL
                                                                $content = array(
                                                                        'sw'         => $SW,
-                                                                       'u_link'     => generateUserProfileLink(getUserData('userid')),
-                                                                       'gender'     => translateGender(getUserData('gender')),
+                                                                       'userid'     => getUserData('userid'),
+                                                                       'gender'     => getUserData('gender'),
                                                                        'refs_link'  => 0,
                                                                        'surname'    => getUserData('surname'),
                                                                        'family'     => getUserData('family'),
                                                                        'email'      => '[<a href="' . generateEmailLink(getUserData('email'), 'user_data') . '">' . getUserData('email') . '</a>]',
-                                                                       'status'     => translateUserStatus(getUserData('status')),
+                                                                       'status'     => getUserData('status'),
                                                                        'registered' => generateDateTime(getUserData('joined'), 3),
                                                                );
 
@@ -156,13 +156,13 @@ ORDER BY
                                        // Prepare data for the template
                                        $content = array(
                                                'sw'         => $SW,
-                                               'u_link'     => generateUserProfileLink($levels['userid']),
-                                               'gender'     => translateGender($levels['gender']),
+                                               'userid'     => $levels['userid'],
+                                               'gender'     => $levels['gender'],
                                                'refs_link'  => 0,
                                                'surname'    => $levels['surname'],
                                                'family'     => $levels['family'],
                                                'email'      => '[<a href="' . generateEmailLink($levels['email'], 'user_data') . '">' . $levels['email'] . '</a>]',
-                                               'status'     => translateUserStatus($levels['status']),
+                                               'status'     => $levels['status'],
                                                'registered' => generateDateTime($levels['joined'], 3),
                                        );
 
@@ -180,7 +180,7 @@ ORDER BY
                        // Prepare content
                        $content = array(
                                'rows'   => $OUT,
-                               'userid' => generateUserProfileLink(getRequestParameter('userid'))
+                               'userid' => getRequestParameter('userid')
                        );
 
                        // Load main template
index 206b477..97957c0 100644 (file)
@@ -168,7 +168,7 @@ ORDER BY
                        } // END - switch
 
                        // Member assigned with task?
-                       if ($content['userid'] > 0) {
+                       if (isValidUserId($content['userid'])) {
                                // Member found otherwise it's a system task
                                $content['userid'] = generateUserProfileLink($content['userid']);
                        } else {
@@ -177,7 +177,7 @@ ORDER BY
                        }
 
                        // Prepare content
-                       // @TODO Rewritings: admin->assigned_admin,userid->userid,type->task_type_msg in template
+                       // @TODO Rewritings: admin->assigned_admin,type->task_type_msg in template
                        $content = merge_array($content, array(
                                'sw'      => $SW,
                                'admin'   => $content['assigned_admin'],
index 32aa985..679b5bc 100644 (file)
@@ -138,12 +138,11 @@ LIMIT %s",
                                        // Prepare data for the row template
                                        $content = array(
                                                'sw'     => $SW,
-                                               'u_link' => generateUserProfileLink($content['userid']),
                                                'userid' => $content['userid'],
                                                'link'   => $LINK,
                                                'id'     => $ID,
                                                'email'  => '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . translateGender($content['gender']) . ' ' . $content['surname'] . ' ' . $content['family'] . '</a>',
-                                               'status' => translateUserStatus($content['status']),
+                                               'status' => $content['status'],
                                        );
 
                                        // Load row template and switch colors
@@ -172,13 +171,13 @@ LIMIT %s",
 
                // Prepare content
                $content = array(
-                       'sender_link'   => generateUserProfileLink($sender),
-                       'subject'       => $subj,
-                       'text'          => $text,
-                       'url'           => generateFrametesterUrl($url),
-                       'unconfirmed'   => $unconfirmed,
-                       'stamp'         => generateDateTime($stamp, 2),
-                       'rows'          => $OUT
+                       'sender'      => $sender,
+                       'subject'     => $subj,
+                       'text'        => $text,
+                       'url'         => $url,
+                       'unconfirmed' => $unconfirmed,
+                       'stamp'       => generateDateTime($stamp, 2),
+                       'rows'        => $OUT
                );
 
                // Load final template
index 61ace38..87e9901 100644 (file)
@@ -119,9 +119,9 @@ LIMIT 1",
 
                // Add links to the numbers
                if ($content['links'] > 0) $content['links'] = $base . '&amp;what=list_links&amp;userid=' . $userid . '%}">' . $content['links'] . '</a>]';
-               if ($content['refid'] > 0) $content['refid'] = $base . '&amp;what=list_user&amp;userid=' . $content['refid'] . '%}">'.$content['refid'] . '</a>]';
-               if ($content['refs']  > 0) $content['refs']  = $base . '&amp;what=list_refs&amp;userid=' . $userid . '%}">' . $content['refs'] . '</a>]';
-               if ($content['cats']  > 0) $content['cats']  = $base . '&amp;what=list_cats&amp;userid=' . $userid . '%}">' . $content['cats'] . '</a>]';
+               if (isValidUserId($content['refid'])) $content['refid'] = $base . '&amp;what=list_user&amp;userid=' . $content['refid'] . '%}">'.$content['refid'] . '</a>]';
+               if ($content['refs']  > 0) $content['refs']  = $base . '&amp;what=list_refs&amp;userid=' . $userid . '%}">' . translateComma($content['refs']) . '</a>]';
+               if ($content['cats']  > 0) $content['cats']  = $base . '&amp;what=list_cats&amp;userid=' . $userid . '%}">' . translateComma($content['cats']) . '</a>]';
 
                // Fix empty module
                if (empty($content['last_module'])) $content['last_module'] = '---';
@@ -285,9 +285,6 @@ LIMIT 1",
                        // Merge more data in
                        $content = merge_array($content, $templateContent);
 
-                       // Set refid link
-                       if ($content['refid'] > 0) $content['refid'] = generateUserProfileLink($content['refid']);
-
                        // Get number of unconfirmed mails
                        $content['links'] = countSumTotalData($content['userid'], 'user_links', 'id', 'userid', true);
                        if ($content['links'] > 0) $content['links'] = $base . '&amp;what=list_links&amp;userid=' . $content['userid'] . '%}">' . translateComma($content['links']) . '</a>]';
@@ -316,7 +313,7 @@ LIMIT 1",
                        $content['locked']         = countSumTotalData($content['userid'], 'user_points', 'locked_points');
 
                        // If we have at least one referal, make it clickable to referal list
-                       if ($content['refs'] > 0) $content['refs'] = $base . '&amp;what=list_refs&amp;userid=' . $content['userid'] . '%}">' . $content['refs'] . '</a>]';
+                       if ($content['refs'] > 0) $content['refs'] = $base . '&amp;what=list_refs&amp;userid=' . $content['userid'] . '%}">' . translateComma($content['refs']) . '</a>]';
 
                        // Is the lock reason not set?
                        if (!isset($content['lock_reason'])) $content['lock_reason'] = '---';
index 4b72569..651bd11 100644 (file)
@@ -101,7 +101,7 @@ if (getRequestParameter('userid') == 'all') {
                        loadTemplate('admin_settings_saved', false, getMessage('ADMIN_POINTS_SUBTRACTED'));
                } else {
                        // Prepare content
-                       $content['user']   = '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['surname'] . ' ' . $content['family'] . '</a>';
+                       $content['user']   = '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . translateGender($content['gender']) . ' ' . $content['surname'] . ' ' . $content['family'] . '</a>';
                        $content['userid'] = bigintval(getRequestParameter('userid'));
 
                        // Load form
index 75bddbb..947f16f 100644 (file)
@@ -47,7 +47,7 @@ addMenuDescription('admin', __FILE__);
 
 // Check for mails
 $result_main = SQL_QUERY("SELECT
-       `id`,`sender`,`subject`,`payment_id` AS `payment`,`timestamp`,`url`,`target_send`,`cat_id` AS category
+       `id`, `sender`, `subject`, `payment_id`, `timestamp`, `url`, `target_send`, `cat_id`
 FROM
        `{?_MYSQL_PREFIX?}_pool`
 WHERE
@@ -196,21 +196,8 @@ LIMIT 1",
                $OUT = ''; $SW = 2;
                while ($content = SQL_FETCHARRAY($result_main)) {
                        // Prepare data for the template
-                       $content = array(
-                               'sw'          => $SW,
-                               'id'          => $content['id'],
-                               'sender'      => $content['sender'],
-                               'u_link'      => generateUserProfileLink($content['sender']),
-                               'subject'     => $content['subject'],
-                               'tester'      => generateFrametesterUrl($content['url']),
-                               'url'         => $content['url'],
-                               'cat_title'   => str_replace('"', '&quot;', getCategory($content['category'])),
-                               'cat_link'    => $content['category'],
-                               'pay_title'   => str_replace('"', '&quot;', getPaymentTitlePrice($content['payment'], true)),
-                               'pay_link'    => $content['payment'],
-                               'timestamp'   => generateDateTime($content['timestamp'], 2),
-                               'target_send' => $content['target_send'],
-                       );
+                       $content['sw']        = $SW;
+                       $content['timestamp'] = generateDateTime($content['timestamp'], 2);
 
                        // Load row template and switch colors
                        $OUT .= loadTemplate('admin_unlock_emails_row', true, $content);
index d25521c..94d6061 100644 (file)
@@ -135,7 +135,7 @@ LIMIT 1",
                        array($content['id']), __FILE__, __LINE__);
 
                        // Update, if applyable, referal count and points
-                       if (($content['refid'] > 0) && ($content['refid'] != $content['id'])) {
+                       if ((isValidUserId($content['refid'])) && ($content['refid'] != $content['id'])) {
                                // Update referal account
                                SQL_QUERY_ESC("UPDATE
        `{?_MYSQL_PREFIX?}_sponsor_data`
index d41b8ac..f902b37 100644 (file)
@@ -86,8 +86,6 @@ if (SQL_NUMROWS($result) > 0) {
        while ($content = SQL_FETCHARRAY($result)) {
                // "Translate"/add content
                $content['sw']             = $SW;
-               $content['userid']         = generateUserProfileLink($content['userid']);
-               $content['framekiller']    = generateFrametesterUrl($content['url']);
                $content['url_registered'] = generateDateTime($content['url_registered'], 2);
 
                // Load row template
index dd4f51c..3a1043a 100644 (file)
@@ -73,16 +73,10 @@ if (isExtensionActive('online')) {
                        } elseif (($row['is_member'] != 'Y') && ($row['is_admin'] != 'Y')) {
                                // Is a guest
                                $row['userid'] = getMessage('_IS_GUEST');
-                       } elseif ($row['userid'] > 0) {
+                       } elseif (isValidUserId($row['userid'])) {
                                // Add profile link to userid
                                $row['userid'] = generateUserProfileLink($row['userid']);
-                       } // END - if
-
-                       // Is the refid set?
-                       if ($row['refid'] > 0) {
-                               // Add profile link to referer id
-                               $row['refid'] = generateUserProfileLink($row['refid']);
-                       } // END - if
+                       }
 
                        // Add more content
                        $row['sw'] = $SW;
index 9615ce1..8e7ae4c 100644 (file)
@@ -1049,5 +1049,17 @@ function debugOutput ($message) {
        outputHtml('<div class="debug_message">' . $message . '</div>');
 }
 
+// Is given userid valid?
+function isValidUserId ($userid) {
+       // Do we have cache?
+       if (!isset($GLOBALS['is_valid_userid'][$userid])) {
+               // Check it out
+               $GLOBALS['is_valid_userid'][$userid] = ((!is_null($userid)) && (!empty($userid)) && ($userid > 0));
+       } // END - if
+
+       // Return cache
+       return $GLOBALS['is_valid_userid'][$userid];
+}
+
 // [EOF]
 ?>
index cd3215e..064f70a 100644 (file)
@@ -1,5 +1,5 @@
-<table border="0" cellspacing="0" cellpadding="0"
-       class="admin_table dashed" width="99%">
+<div align="center">
+<table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed" width="99%">
        <tr>
                <td class="admin_title" colspan="8" align="center" height="35">
                        <div class="admin_misc">{--ADMIN_EMAIL_DELETED--}</div>
        </tr>
        <tr>
                <td class="top right admin_misc" align="center">$content[id]</td>
-               <td class="top right admin_misc" align="center">$content[sender]</td>
+               <td class="top right admin_misc" align="center">{%pipe,generateUserProfileLink=$content[sender]%}</td>
                <td class="top right admin_misc" align="center">$content[subject]</td>
-               <td class="top right admin_misc" align="center"><a
-                       href="$content[url]" target="_blank">{--ADMIN_TEST_URL--}</a></td>
+               <td class="top right admin_misc" align="center">
+                       <a href="{%pipe,generateDerefererUrl=$content[url]%}" target="_blank">{--ADMIN_TEST_URL--}</a>
+               </td>
                <td class="top right admin_misc" align="center">$content[timestamp]</td>
        </tr>
 </table>
+</div>
index c29c14b..abc760f 100644 (file)
@@ -5,6 +5,6 @@
        </td>
        <td class="switch_sw$content[sw] bottom">
                $content[subject]
-               ({--EMAIL_SENDER--}: $content[userid]; {%pipe,translateComma=$content[pay]%}; $content[cat])
+               ({--EMAIL_SENDER--}: {%pipe,generateUserProfileLink=$content[userid]%}; {%pipe,getPaymentTitlePrice=$content[payment_id]%}; {%pipe,getCategory=$content[cat_id]%})
        </td>
 </tr>
index c2e12e0..4f1e3c7 100644 (file)
@@ -1,6 +1,6 @@
 <tr>
-       <td align="center" class="switch_sw$content[sw] bottom right">$content[userid]</td>
-       <td align="center" class="switch_sw$content[sw] bottom right">$content[gender]</td>
+       <td align="center" class="switch_sw$content[sw] bottom right">{%pipe,generateUserProfileLink=$content[userid]%}</td>
+       <td align="center" class="switch_sw$content[sw] bottom right">{%pipe,translateGender=$content[gender]%}</td>
        <td align="center" class="switch_sw$content[sw] bottom right">$content[surname]</td>
        <td align="center" class="switch_sw$content[sw] bottom right">$content[family]</td>
        <td align="center" class="switch_sw$content[sw] bottom right">$content[email]</td>
index 6116944..04b8a9f 100644 (file)
@@ -1,7 +1,7 @@
 <tr>
        <td class="switch_sw$content[sw] bottom right" align="center">$content[win1]$content[cnt]$content[win2]</td>
-       <td class="switch_sw$content[sw] bottom right" align="center">$content[win1]$content[userid]$content[win2]</td>
-       <td class="switch_sw$content[sw] bottom right">$content[win1]<a href="$content[email]">$content[gender] $content[surname] $content[family]</a>$content[win2]</td>
-       <td class="switch_sw$content[sw] bottom right">$content[points] {?POINTS?}</td>
+       <td class="switch_sw$content[sw] bottom right" align="center">$content[win1]{%pipe,generateUserProfileLink=$content[userid]%}$content[win2]</td>
+       <td class="switch_sw$content[sw] bottom right">$content[win1]<a href="$content[email]">{%pipe,translateGender$content[gender]%} $content[surname] $content[family]</a>$content[win2]</td>
+       <td class="switch_sw$content[sw] bottom right">{%pipe,translateComma=$content[points]%} {?POINTS?}</td>
        <td class="switch_sw$content[sw] bottom">$content[last_online]</td>
 </tr>
index cb77fb4..ac7f678 100644 (file)
@@ -1,11 +1,11 @@
 <tr>
-       <td align="center" class="switch_sw$content[sw] top right">$content[link]</td>
-       <td align="center" class="switch_sw$content[sw] top right">$content[gender]</td>
+       <td align="center" class="switch_sw$content[sw] top right">{%pipe,generateUserProfileLink=$content[userid]%}</td>
+       <td align="center" class="switch_sw$content[sw] top right">{%pipe,translateGender=$content[gender]%}</td>
        <td align="center" class="switch_sw$content[sw] top right">$content[surname]</td>
        <td align="center" class="switch_sw$content[sw] top right">$content[family]</td>
        <td align="center" class="switch_sw$content[sw] top right">$content[email]</td>
        <td align="center" class="switch_sw$content[sw] top right">$content[remote_addr]</td>
-       <td align="center" class="switch_sw$content[sw] top right">$content[refid]</td>
+       <td align="center" class="switch_sw$content[sw] top right">{%pipe,generateUserProfileLink=$content[refid]%}</td>
        <td align="center" class="switch_sw$content[sw] top">
                <a href="{%url=confirm.php?hash=$content[user_hash]%}" target="_blank">{--CONFIRMATION_LINK--}</a>
        </td>
index 680a54b..8603de0 100644 (file)
@@ -3,7 +3,7 @@
                <input type="checkbox" title="{--ID_SELECT--} $content[id]" name="sel[$content[id]]" class="admin_normal" value="1" />
        </td>
        <td class="switch_sw$content[sw] bottom right" align="center">
-               $content[userid]
+               {%pipe,generateUserProfileLink=$content[userid]%}
        </td>
        <td class="switch_sw$content[sw] bottom right" align="center">
                $content[start]
@@ -15,7 +15,7 @@
                <div class="pre">$content[comments]</div>
        </td>
        <td class="switch_sw$content[sw] bottom right" align="center">
-               $content[status]
+               {%pipe,translateUserStatus=$content[status]%}
        </td>
        <td class="switch_sw$content[sw] bottom" align="center">
                $content[last_online]
index 4db0933..ff71486 100644 (file)
@@ -2,7 +2,7 @@
   <td align="center" width="5%" class="switch_sw$content[sw] bottom right">$content[id]</td>
   <td align="center" width="15%" class="switch_sw$content[sw] bottom right">$content[userid]</td>
   <td align="center" width="10%" class="switch_sw$content[sw] bottom right">$content[ip]</td>
-  <td align="center" width="5%" class="switch_sw$content[sw] bottom right">$content[refid]</td>
+  <td align="center" width="5%" class="switch_sw$content[sw] bottom right">{%pipe,generateUserProfileLink=$content[refid]%}</td>
   <td align="center" width="10%" class="switch_sw$content[sw] bottom right">$content[module]</td>
   <td align="center" width="10%" class="switch_sw$content[sw] bottom right">$content[action]</td>
   <td align="center" width="5%" class="switch_sw$content[sw] bottom right">$content[what]</td>
index d2a02e1..3828f7a 100644 (file)
@@ -2,7 +2,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
 <tr>
        <td colspan="6" class="admin_title">
-               <strong>{%message,ADMIN_LIST_REFERALS=$content[userid]%}</strong>
+               <strong>{%message,ADMIN_LIST_REFERALS={%pipe,generateUserProfileLink=$content[userid]%}%}</strong>
        </td>
 </tr>
 <tr>
index 69f853c..788378e 100644 (file)
@@ -2,7 +2,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
 <tr>
        <td class="admin_title bottom">
-               <strong>{%message,ADMIN_LIST_REFERALS=$content[userid]%}</strong>
+               <strong>{%message,ADMIN_LIST_REFERALS={%pipe,generateUserProfileLink=$content[userid]%}%}</strong>
        </td>
 </tr>
 $content[rows]
index a427d59..cd177e0 100644 (file)
@@ -1,8 +1,8 @@
 <tr>
-       <td align="right" class="bottom right switch_sw$content[sw]" valign="top">$content[u_link]&nbsp;&nbsp;</td>
+       <td align="right" class="bottom right switch_sw$content[sw]" valign="top">{%pipe,generateUserProfileLink=$content[userid]%}</td>
        <td align="center" class="bottom right switch_sw$content[sw]">$content[refs_link]</td>
-       <td class="bottom right switch_sw$content[sw]">$content[gender] $content[surname] $content[family]</td>
+       <td class="bottom right switch_sw$content[sw]">{%pipe,translateGender=$content[gender]%} $content[surname] $content[family]</td>
        <td class="bottom right switch_sw$content[sw]">$content[email]</td>
-       <td align="center" class="bottom right switch_sw$content[sw]">$content[status]</td>
+       <td align="center" class="bottom right switch_sw$content[sw]">{%pipe,translateUserStatus=$content[status]%}</td>
        <td class="bottom switch_sw$content[sw]">$content[registered]</td>
 </tr>
index 9ed6e26..3590924 100644 (file)
@@ -3,7 +3,7 @@
 <tr>
        <td width="260" align="center" class="bottom right">
                {--EMAIL_SENDER--}:<br />
-               <strong>$content[sender_link]</strong>
+               <strong>{%pipe,generateUserProfileLink=$content[sender]%}</strong>
        </td>
        <td width="260" align="center" class="bottom">
                {--EMAIL_SUBJECT--}:<br />
@@ -12,7 +12,7 @@
 </tr>
 <tr>
        <td align="center" class="bottom right">{--EMAIL_URL--}:<br />
-               <strong><a href="$content[url]" target="_blank">{--ADMIN_TEST_URL--}</a></strong>
+               <strong><a href="{%pipe,generateFrametesterUrl=$content[url]%}" target="_blank">{--ADMIN_TEST_URL--}</a></strong>
        </td>
        <td align="center" class="bottom">
                {--EMAIL_TIMESTAMP--}:<br />
index f8b6f8b..35d691d 100644 (file)
@@ -1,8 +1,8 @@
 <tr>
-       <td align="center" class="switch_sw$content[sw] bottom right">$content[u_link]</td>
+       <td align="center" class="switch_sw$content[sw] bottom right">{%pipe,generateUserProfileLink=$content[userid]%}</td>
        <td align="center" class="switch_sw$content[sw] bottom right">
                <a href="{%url=mailid.php?userid=$content[userid]&amp;$content[link]=$content[id]%}" target="_blank">{--CLICK_NOW--}</a>
        </td>
        <td class="switch_sw$content[sw] bottom right">$content[email]</td>
-       <td align="center" class="switch_sw$content[sw] bottom">$content[status]</td>
+       <td align="center" class="switch_sw$content[sw] bottom">{%pipe,translateUserStatus=$content[status]%}</td>
 </tr>
index 5239cf9..7dba30c 100644 (file)
@@ -22,7 +22,7 @@
 <tr>
        <td align="center" class="right switch_sw$content[sw] bottom">$content[email]</td>
        <td align="center" class="right switch_sw$content[sw] bottom">$content[REMOTE_ADDR]</td>
-       <td align="center" class="right switch_sw$content[sw] bottom">$content[refid]</td>
+       <td align="center" class="right switch_sw$content[sw] bottom">{%pipe,generateUserProfileLink=$content[refid]%}</td>
        <td align="center" class="right switch_sw$content[sw] bottom">{%pipe,translateUserStatus=$content[status]%}</td>
        <td align="center" class="switch_sw$content[sw] bottom">$content[links]</td>
 </tr>
index 9dfec03..3898552 100644 (file)
@@ -5,24 +5,24 @@
                <input type="hidden" name="url[$content[id]]" value="$content[url]" />
        </td>
        <td class="switch_sw$content[sw] top right admin_misc" align="center">
-               $content[u_link]
+               {%pipe,generateUserProfileLink=$content[sender]%}
        </td>
        <td class="switch_sw$content[sw] top right admin_misc">
                $content[subject]
        </td>
        <td class="switch_sw$content[sw] top right" align="center">
-               <a href="$content[tester]" target="_blank">{--ADMIN_TEST_URL--}</a>
+               <a href="{%pipe,generateFrametesterUrl=$content[url]%}" target="_blank">{--ADMIN_TEST_URL--}</a>
        </td>
        <td class="switch_sw$content[sw] top right admin_misc" align="center">
-               <span class="admin_note" title="$content[cat_title]">$content[cat_link]</span>
+               <span class="admin_note" title="{%pipe,getCategory=$content[cat_id]%}">$content[cat_link]</span>
        </td>
        <td class="switch_sw$content[sw] top right admin_misc" align="center">
-               <span class="admin_note" title="$content[pay_title]">$content[pay_link]</span>
+               <span class="admin_note" title="{%pipe,getPaymentTitlePrice=$content[payment_id]%}">$content[pay_link]</span>
        </td>
        <td class="switch_sw$content[sw] top right admin_misc" align="center">
                $content[timestamp]
        </td>
        <td class="switch_sw$content[sw] top admin_misc" align="center">
-               $content[target_send]
+               {%pipe,translateComma=$content[target_send]%}
        </td>
 </tr>
index f07c406..ef03687 100644 (file)
@@ -3,13 +3,13 @@
                <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]">
                $content[url]
        </td>
        <td align="center" class="bottom right switch_sw$content[sw]">
-               <a href="$content[framekiller]" 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 switch_sw$content[sw]">
                $content[url_registered]
index 4234cf4..003585d 100644 (file)
@@ -1,5 +1,5 @@
 var interval  = null;
-var countDown   = "$content[restart]";
+var countDown = "$content[restart]";
 var timer     = document.getElementById("surfbar_counter");
 var buttonDiv = document.getElementById("surfbar_button");
 
index 56d990f..7f94626 100644 (file)
@@ -2,12 +2,12 @@
 <tr>
        <td id="surfbar_td">
                Guthaben: <span id="surfbar_points">{%pipe,translateComma=$content[points]%} {?POINTS?}</span> -
-               Jetzt Online: <span id="surfbar_counter">{%pipe,SURFBAR_DETERMINE_TOTAL_ONLINE%}</span> -
-               Seitenaufrufe: Heute:<span id="surfbar_counter">{%config,translateComma=surfbar_daily_counter%}</span> -
-               Gestern:<span id="surfbar_counter">{%config,translateComma=surfbar_yester_counter%}</span> -
-               Woche:<span id="surfbar_counter">{%config,translateComma=surfbar_weekly_counter%}</span> -
-               Monat:<span id="surfbar_counter">{%config,translateComma=surfbar_monthly_counter%}</span> -
-               Gesamt:<span id="surfbar_counter">{%config,translateComma=surfbar_total_counter%}</span>
+               Jetzt Online: <span class="surfbar_counter">{%pipe,SURFBAR_DETERMINE_TOTAL_ONLINE%}</span> -
+               Seitenaufrufe: Heute:<span class="surfbar_counter">{%config,translateComma=surfbar_daily_counter%}</span> -
+               Gestern:<span class="surfbar_counter">{%config,translateComma=surfbar_yester_counter%}</span> -
+               Woche:<span class="surfbar_counter">{%config,translateComma=surfbar_weekly_counter%}</span> -
+               Monat:<span class="surfbar_counter">{%config,translateComma=surfbar_monthly_counter%}</span> -
+               Gesamt:<span class="surfbar_counter">{%config,translateComma=surfbar_total_counter%}</span>
        </td>
 </tr>
 </table>
index 5aafa18..6ddacb2 100644 (file)
@@ -1,7 +1,7 @@
 <table border="0" cellspacing="0" cellpadding="0" width="100%" id="surfbar_table">
 <tr>
        <td id="surfbar_td">
-               Jetzt Online: <span id="surfbar_counter">{%pipe,SURFBAR_DETERMINE_TOTAL_ONLINE%}</span> -
+               Jetzt Online: <span class="surfbar_counter">{%pipe,SURFBAR_DETERMINE_TOTAL_ONLINE%}</span> -
                <!-- @TODO These are static lines and should be replaced by a filter (see ext-sponsor) //-->
                <a href="{%url=modules.php?module=index&amp;what=impressum%}" target="_blank">Ihr Textlink hier?</a> -
                <a href="{%url=modules.php?module=index&amp;what=impressum%}" target="_blank">Ihr Textlink hier?</a> -
index 5ac1300..6574ded 100644 (file)
@@ -4,7 +4,7 @@
        <td id="surfbar_td">
                <div>
                &raquo;<span id="surfbar_points">$content[xxx]=$content[xxx] {?POINTS?}</span> in
-               <span id="surfbar_counter">$content[xxx]</span>
+               <span class="surfbar_counter">$content[xxx]</span>
                <span id="surfbar_counter_word">Sekunden</span>&laquo;
                &raquo;<span id="surfbar_reload">X</span> von
                <span id="surfbar_max">X</span> im Reload&laquo;
index 0631f35..74c27aa 100644 (file)
@@ -6,7 +6,7 @@
 
                <div id="surfbar_button">
                        Keine URLs mehr verf&uuml;gbar oder Datenbankfehler liegt vor.<br />
-                       Neustart in <span id="surfbar_counter">$content[start]</span> Sekunden
+                       Neustart in <span class="surfbar_counter">$content[start]</span> Sekunden
                </div>
        </div>
 </div>
index 7338f48..c6f5adf 100644 (file)
@@ -10,7 +10,7 @@
        
 }
 
-#surfbar_counter {
+.surfbar_counter {
        
 }
 
index afbd84e..5d1f232 100644 (file)
@@ -14,7 +14,7 @@
        
 }
 
-#surfbar_counter {
+.surfbar_counter {
        
 }
 
index 413f6d4..8706ca5 100644 (file)
        
 }
 
-#surfbar_counter {
+.surfbar_counter {
        
 }
 
-#surfar_counter_word {
+#surfbar_counter_word {
        
 }
 
@@ -32,4 +32,4 @@
 
 #surfbar_points {
        font-weight: bold;
-}
\ No newline at end of file
+}
index bcf9250..c6f5adf 100644 (file)
@@ -10,7 +10,7 @@
        
 }
 
-#surfbar_counter {
+.surfbar_counter {
        
 }
 
@@ -32,4 +32,4 @@
 
 #surfbar_points {
        font-weight: bold;
-}
\ No newline at end of file
+}