More usage of wrapper functions

[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 0c861764522ffd981c4a34001ed85d600346c553..91f225c556313a4dc4f285f8dc757120764c8ff4 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -45,7 +45,6 @@ addYouAreHereLink('admin', __FILE__);
 
 // Init variables
 $MORE = '';
-$colspan = 4;
 
 // Add lock reason?
 if (isExtensionInstalledAndNewer('user', '0.3.5')) {
@@ -76,7 +75,7 @@ if (isGetRequestParameterSet('userid')) {
 
        // Does the account exists?
        $result_user = SQL_QUERY_ESC("SELECT
-       `userid`, `country`, `email`, `birth_day`, `birth_month`, `birth_year`, `last_online`, `used_points`, `emails_sent`, `joined`, `last_update`, `last_profile_sent`, `notified`, `emails_received`, `mails_confirmed`".$MORE."
+       `userid`,`country`,`email`,`birth_day`,`birth_month`,`birth_year`,`last_online`,`used_points`,`emails_sent`,`joined`,`last_update`,`last_profile_sent`,`notified`,`emails_received`,`mails_confirmed`".$MORE."
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
@@ -105,18 +104,18 @@ LIMIT 1",
                // Is this above zero?
                if ($stamp > 0) {
                        // Then use it
-                       $content['birthday'] = generateDateTime($stamp, '3');
+                       $content['birthday'] = generateDateTime($stamp, '2');
                } else {
                        // Zero or below so set zero!
-                       $content['birthday'] = generateDateTime(0, '3');
+                       $content['birthday'] = generateDateTime(0, '2');
                }
 
                // Prepare data for template
                $content['email_link']        = generateEmailLink($content['email'], 'user_data');
-               $content['last_online']       = generateDateTime($content['last_online'], '0');
-               $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['last_online']       = generateDateTime($content['last_online'], '2');
+               $content['joined']            = generateDateTime($content['joined'], '2');
+               $content['last_update']       = generateDateTime($content['last_update'], '2');
+               $content['last_profile_sent'] = generateDateTime($content['last_profile_sent'], '2');
                $content['total_points']      = getTotalPoints($content['userid']);
                $content['locked_points']     = countSumTotalData($content['userid'], 'user_points', 'locked_points') + countSumTotalData($content['userid'], 'user_points', 'locked_order_points');
 
@@ -131,7 +130,7 @@ LIMIT 1",
 
                // Add more data
                $content['own_points']     = $data['points'];
-               $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], 2);
+               $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], '2');
 
                // Link to email_details if some are sent
                if ($content['emails_sent'] > 0) {
@@ -212,7 +211,7 @@ LIMIT 1",
        } // END - if
 
        // Generate master query string
-       $sql = sprintf("SELECT `userid`, `email`, `emails_sent`, `mails_confirmed`, `emails_received`" . $MORE . " FROM `{?_MYSQL_PREFIX?}_user_data`" . $whereStatement . " ORDER BY `%s` ASC",
+       $sql = sprintf("SELECT `userid`,`email`,`emails_sent`,`mails_confirmed`,`emails_received`" . $MORE . " FROM `{?_MYSQL_PREFIX?}_user_data`" . $whereStatement . " ORDER BY `%s` ASC",
                getRequestParameter('sortby')
        );
 
@@ -238,17 +237,11 @@ LIMIT 1",
        // Are there some entries?
        if (!SQL_HASZERONUMS($result_master)) {
                // We have some (new?) registrations!
-               $templateContent['colspan2']   = ($colspan + 2);
                $templateContent['user_count'] = getTotalConfirmedUser();
 
-               // Sorting links
-               $templateContent['alpha_sort'] = alpha(getRequestParameter('sortby'), ($colspan + 1), true);
-               $templateContent['sort_links'] = addSortLinks(getRequestParameter('letter'), getRequestParameter('sortby'), ($colspan + 1), true);
-               $templateContent['page_nav']   = '';
-
-               if ($numPages > 1) {
-                       $templateContent['page_nav'] = addPageNavigation($numPages, getConfig('user_limit'), true, $colspan, true);
-               } // END - if
+               // Sorting links and number of pages
+               $templateContent['sort_links'] = addSortLinks(getRequestParameter('letter'), getRequestParameter('sortby'));
+               $templateContent['num_pages'] = $numPages;
 
                // Column with nickname when nickname extension is present
                // @TODO Rewrite this into a filter
@@ -283,7 +276,7 @@ LIMIT 1",
 
                        // Transfer data to array
                        $content['email']          = '[<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['email'] . '</a>]';
-                       $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], 2);
+                       $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], '2');
                        $content['refs']           = countSumTotalData($content['userid'], 'user_refs', 'id', 'userid', true);
                        $content['own_points']     = countSumTotalData($content['userid'], 'user_points', 'points') + countSumTotalData($content['userid'], 'user_points', 'order_points');
                        $content['locked_points']  = countSumTotalData($content['userid'], 'user_points', 'locked_points') + countSumTotalData($content['userid'], 'user_points', 'locked_order_points');