Deprecated variables for templates removed, mor EL-rewrites, getMessage() rewritten:

[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 87e9901869dc176511512f618ea9776eaf6b6b5e..5c8220c82393724919674abd414c5c35aa03569d 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -72,7 +72,7 @@ if (isExtensionInstalledAndNewer('user', '0.3.4')) {
        // Add lock reason?
        if (isExtensionInstalledAndNewer('user', '0.3.5')) {
                // Add them...
-               $MORE .= ", `lock_reason`, UNIX_TIMESTAMP(`lock_timestamp`) AS lock_timestamp";
+               $MORE .= ", `lock_reason`, UNIX_TIMESTAMP(`lock_timestamp`) AS `lock_timestamp`";
        } // END - if
 } // END - if
 
@@ -139,15 +139,14 @@ LIMIT 1",
                }
 
                // Prepare data for template
-               $content['admin_links']       = generateMemberAdminActionLinks($userid, $content['status']);
                $content['email_link']        = generateEmailLink($content['email'], 'user_data');
                $content['last_online']       = generateDateTime($content['last_online'], 0);
                if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&amp;what=email_details&amp;userid=' . $userid . '%}">' . translateComma($content['emails_sent']) . '</a>]';
                $content['joined']            = generateDateTime($content['joined'], 0);
                $content['last_update']       = generateDateTime($content['last_update'], 0);
                $content['last_profile_sent'] = generateDateTime($content['last_profile_sent'], 0);
-               $content['total']             = translateComma(countSumTotalData($userid, 'user_points', 'points'));
-               $content['locked']            = translateComma(countSumTotalData($userid, 'user_points', 'locked_points'));
+               $content['total']             = countSumTotalData($userid, 'user_points', 'points');
+               $content['locked']            = countSumTotalData($userid, 'user_points', 'locked_points');
                $content['lock_timestamp']    = generateDateTime($content['lock_timestamp'], 2);
 
                // Is the lock reason not set?
@@ -163,16 +162,10 @@ LIMIT 1",
                        $content['nickname'] = getMessage('EXT_NICKNAME_404');
                }
 
-               // Is the user extension newer?
-               if (isExtensionInstalledAndNewer('user', '0.3.4')) {
-                       // Then "translate" the number
-                       $content['rand_confirmed'] = translateComma($content['rand_confirmed']);
-               } // END - if
-
                // Clickrate
                $content['click_rate'] = '0';
                if ($content['emails_received'] > 0) {
-                       $content['click_rate'] = translateComma($content['mails_confirmed'] / $content['emails_received'] * 100);
+                       $content['click_rate'] = ($content['mails_confirmed'] / $content['emails_received'] * 100);
                } // END - if
 
                // Is the extension 'country' installed?
@@ -243,7 +236,7 @@ LIMIT 1",
        // Calculate page count (0.5 fixes a bug with page count)
        if (getConfig('user_limit') == '0') {
                setConfigEntry('user_limit', 100);
-               loadTemplate('admin_settings_saved', false, getMessage('EXTENSION_WARNING_USER_LIMIT'));
+               loadTemplate('admin_settings_saved', false, '{--EXTENSION_WARNING_USER_LIMIT--}');
        } // END - if
 
        // Activate the extension please!
@@ -307,7 +300,6 @@ LIMIT 1",
                        // Transfer data to array
                        $content['sw']             = $SW;
                        $content['email']          = '[<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['email'] . '</a>]';
-                       $content['alinks']         = generateMemberAdminActionLinks($content['userid'], $content['status']);
                        $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], 2);
                        $content['refs']           = countSumTotalData($content['userid'], 'user_refs', 'id', 'userid', true);
                        $content['locked']         = countSumTotalData($content['userid'], 'user_points', 'locked_points');
@@ -359,7 +351,7 @@ LIMIT 1",
                loadTemplate('admin_list_user', false, $content);
        } else {
                // No one as registered so far! :-(
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_NONE_REGISTERED'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_NONE_REGISTERED--}');
        }
 
        // Free memory