Moved language strings, more EL in templates

[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 6e78f65d9ed415c7212aca5c781a81967c9f2432..71d580f60a0ca6ddafae449a5484f9bdd6bd1251 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -186,7 +186,7 @@ LIMIT 1",
        } // END - if
 
        // Parse the status or mode parameter
-       if (isGetRequestParameterSet(('status'))) {
+       if (isGetRequestParameterSet('status')) {
                // Is a WHERE statement already there?
                if (!empty($whereStatement)) {
                        // Then append the status column
@@ -269,18 +269,15 @@ LIMIT 1",
 
                        // 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>]';
+                       if ($content['links'] > 0) $content['links'] = $base . '&amp;what=list_links&amp;userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['links'] . '%}</a>]';
 
                        // Set link to sent mails if present
-                       if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&amp;what=email_details&amp;userid=' . $content['userid'] . '%}">' . translateComma($content['emails_sent']) . '</a>]';
+                       if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&amp;what=email_details&amp;userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['emails_sent'] . '%}</a>]';
 
                        // Add nickname
                        $content['nickname'] = '{--EXT_NICKNAME_404--}';
                        if (isExtensionInstalled('nickname')) $content['nickname'] = getNickname($content['userid']);
 
-                       // Calculate total points
-                       $content['points'] = countSumTotalData($content['userid'], 'user_points', 'points')  - countSumTotalData($content['userid'], 'user_data', 'used_points');
-
                        // Clickrate
                        $content['rate'] = '0';
                        if ($content['emails_received'] > 0) {
@@ -321,9 +318,9 @@ LIMIT 1",
 
                // Init title with "all accounts"
                $content['title'] = '{--ADMIN_ALL_ACCOUNTS--}';
-               if (isGetRequestParameterSet(('status'))) {
+               if (isGetRequestParameterSet('status')) {
                        // Set title according to the 'status'
-                       $content['title'] = sprintf("{--ADMIN_LIST_STATUS_%s_ACCOUNTS--}", strtoupper(getRequestParameter(('status'))));
+                       $content['title'] = sprintf("{--ADMIN_LIST_STATUS_%s_ACCOUNTS--}", strtoupper(getRequestParameter('status')));
                } elseif (isGetRequestParameterSet('mode')) {
                        // Set title according to the "mode"
                        $content['title'] = sprintf("{--ADMIN_LIST_MODE_%s_ACCOUNTS--}", strtoupper(getRequestParameter('mode')));