A lot code 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 b8ce9527871867eb46d178d62a55612f51cfb3c6..3bd4aabdd964e5e4cb0e9bb8c814c7caf1e8ff7e 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -86,9 +86,9 @@ if (isExtensionActive('country')) {
 }
 
 // Init unset data
-if (!isGetRequestParameterSet('letter')) { setGetRequestParameter('letter', getMessage('_ALL2')); }
-if (!isGetRequestParameterSet('sortby')) { setGetRequestParameter('sortby', 'userid');            }
-if (!isGetRequestParameterSet('page'))   { setGetRequestParameter('page'  , 1);                 }
+if (!isGetRequestParameterSet('letter')) { setGetRequestParameter('letter', '');       }
+if (!isGetRequestParameterSet('sortby')) { setGetRequestParameter('sortby', 'userid'); }
+if (!isGetRequestParameterSet('page'))   { setGetRequestParameter('page'  , 1);        }
 
 // Set base URL
 $base = '[<a href="{%url=modules.php?module=admin';
@@ -123,9 +123,6 @@ LIMIT 1",
                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'] = '---';
-
                // Calculate timestamp for birthday
                $stamp = mktime(0, 0, 0, $content['birth_month'], $content['birth_day'], $content['birth_year']);
 
@@ -148,19 +145,11 @@ LIMIT 1",
                $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?
-               if (!isset($content['lock_reason'])) $content['lock_reason'] = '---';
+               $content['nickname']          = '{--EXT_NICKNAME_404--}';
 
                // Nickname inclusion?
                // @TODO Rewrite these to filters
-               if (isExtensionActive('nickname')) {
-                       // Nickname not set or invalid? Then
-                       if ((empty($content['nickname'])) || ($content['nickname'] == $userid)) $content['nickname'] = '---';
-               } else {
-                       // Extension not found
-                       $content['nickname'] = '{--EXT_NICKNAME_404--}';
-               }
+               if (isExtensionInstalled('nickname')) $content['nickname'] = getNickname($content['userid']);
 
                // Clickrate
                $content['click_rate'] = '0';
@@ -191,9 +180,9 @@ LIMIT 1",
        SQL_FREERESULT($result_user);
 } else {
        $whereStatement = '';
-       if ((getRequestParameter('letter') != getMessage('_ALL2')) && (getRequestParameter('letter') != getMessage('_OTHERS')) && (isGetRequestParameterSet('letter'))) {
+       if (isGetRequestParameterSet('letter')) {
                // List only persons w
-               $whereStatement = " WHERE `family` LIKE '".getRequestParameter('letter') . "%'";
+               $whereStatement = " WHERE `family` LIKE '".getRequestParameter('letter') . "%%'";
        } // END - if
 
        // Parse the status or mode parameter
@@ -273,7 +262,7 @@ LIMIT 1",
                } // END - if
 
                // Load all users
-               $OUT = ''; $SW = 2;
+               $OUT = '';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Merge more data in
                        $content = merge_array($content, $templateContent);
@@ -286,7 +275,8 @@ LIMIT 1",
                        if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&amp;what=email_details&amp;userid=' . $content['userid'] . '%}">' . translateComma($content['emails_sent']) . '</a>]';
 
                        // Add nickname
-                       if ((empty($content['nickname'])) || ($content['nickname'] == $content['userid'])) $content['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');
@@ -298,7 +288,6 @@ LIMIT 1",
                        } // END - if
 
                        // Transfer data to array
-                       $content['sw']             = $SW;
                        $content['email']          = '[<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['email'] . '</a>]';
                        $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], 2);
                        $content['refs']           = countSumTotalData($content['userid'], 'user_refs', 'id', 'userid', true);
@@ -307,9 +296,6 @@ LIMIT 1",
                        // 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'] . '%}">' . translateComma($content['refs']) . '</a>]';
 
-                       // Is the lock reason not set?
-                       if (!isset($content['lock_reason'])) $content['lock_reason'] = '---';
-
                        // Is the extension 'country' installed?
                        // @TODO Rewrite this into a filter
                        if (isExtensionActive('country')) {
@@ -322,7 +308,6 @@ LIMIT 1",
 
                        // Load row template and switch colors
                        $OUT .= loadTemplate('admin_list_user_row', true, $content);
-                       $SW = 3 - $SW;
                } // END - while
 
                // Free memory