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 3697eb485fe093da2b6bba0916c5a6d49fb68550..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', '{--_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';
@@ -180,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
@@ -262,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);
@@ -288,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);
@@ -309,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