Heavy rewrite:

[mailer.git] / inc / modules / admin / what-list_user.php

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index 52d2998e15abc677b5e247ad7448b3a85e3cecc0..57630cefba64ae463a0c359863e9d96f122761a7 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -141,7 +141,7 @@ LIMIT 1",
                define('_LINKS', $LINKS);
                define('_ADMIN_LINKS', generateMemberAdminActionLinks($uid, $DATA['status']));
                $DATA['gender']            = translateGender($DATA['gender']);
-               $DATA['email_link']        = generateMemberEmailLink($DATA['email'], "user_data");
+               $DATA['email_link']        = generateEmailLink($DATA['email'], 'user_data');
                $DATA['status']            = translateUserStatus($DATA['status']);
                $DATA['last_online']       = generateDateTime($DATA['last_online'], '0');
                $DATA['used_points']       = translateComma($DATA['used_points']);
@@ -149,8 +149,8 @@ LIMIT 1",
                $DATA['joined']            = generateDateTime($DATA['joined'], '0');
                $DATA['last_update']       = generateDateTime($DATA['last_update'], '0');
                $DATA['last_profile_sent'] = generateDateTime($DATA['last_profile_sent'], '0');
-               $DATA['total']             = translateComma(GET_TOTAL_DATA($uid, "user_points", "points"));
-               $DATA['locked']            = translateComma(GET_TOTAL_DATA($uid, "user_points", "locked_points"));
+               $DATA['total']             = translateComma(GET_TOTAL_DATA($uid, 'user_points', 'points'));
+               $DATA['locked']            = translateComma(GET_TOTAL_DATA($uid, 'user_points', 'locked_points'));
                $DATA['lock_timestamp']    = generateDateTime($DATA['lock_timestamp'], '2');
 
                // Is the lock reason not set?
@@ -298,7 +298,7 @@ LIMIT 1",
                        if ($content['refid'] > 0) $content['refid'] = generateUserProfileLink($content['refid']);
 
                        // Get number of unconfirmed mails
-                       $LINKS = GET_TOTAL_DATA($content['userid'], "user_links", 'id', 'userid', true);
+                       $LINKS = GET_TOTAL_DATA($content['userid'], 'user_links', 'id', 'userid', true);
                        if ($LINKS > 0) $LINKS = $base."&amp;what=list_links&amp;uid=".$content['userid']."\">".translateComma($LINKS)."</a>]";
 
                        // Set link to sent mails if present
@@ -308,7 +308,7 @@ LIMIT 1",
                        if (empty($content['nickname']) || $content['nickname'] == $content['userid']) $content['nickname'] = '---';
 
                        // Calculate total points
-                       $pointsTotal = GET_TOTAL_DATA($content['userid'], "user_points", "points")  - GET_TOTAL_DATA($content['userid'], "user_data", "used_points");
+                       $pointsTotal = GET_TOTAL_DATA($content['userid'], 'user_points', 'points')  - GET_TOTAL_DATA($content['userid'], 'user_data', 'used_points');
 
                        // Clickrate
                        $clickRate = 0;
@@ -320,13 +320,13 @@ LIMIT 1",
                        $content['sw']     = $SW;
                        $content['uid']    = generateUserProfileLink($content['userid']);
                        $content['gender'] = translateGender($content['gender']);
-                       $content['email']  = "[<a href=\"".generateMemberEmailLink($content['email'], "user_data")."\">".$content['email']."</a>]";
+                       $content['email']  = "[<a href=\"".generateEmailLink($content['email'], 'user_data')."\">".$content['email']."</a>]";
                        $content['addr']   = $content['REMOTE_ADDR'];
                        $content['links']  = $LINKS;
                        $content['alinks'] = generateMemberAdminActionLinks($content['userid'], $content['status']);
                        $content['points'] = translateComma($pointsTotal);
                        $content['rate']   = translateComma($clickRate);
-                       $content['locked'] = translateComma(GET_TOTAL_DATA($content['userid'], "user_points", "locked_points"));
+                       $content['locked'] = translateComma(GET_TOTAL_DATA($content['userid'], 'user_points', 'locked_points'));
                        $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], '2');
                        $content['status'] = translateUserStatus($content['status']);