LOAD_CONFIGURED_URL() added, bug #66 resolved

[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 9e689ce6c4f681b95cf119af98289d26a960bade..80215936949c48f59ca5a5ced36c092d490b6a08 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -37,7 +37,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("user")) || (GET_EXT_VERSION("user") == "")) {
        // Missing extension!
-       ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "user"));
+       addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "user"));
        return;
 }
 
@@ -90,7 +90,7 @@ if (empty($_GET['sortby'])) { $_GET['sortby'] = "userid"; }
 if (empty($_GET['page']))   { $_GET['page']   = "1";      }
 
 // Set base URL
-$BASE = "[<A href=\"".URL."/modules.php?module=admin";
+$BASE = "[<a href=\"".URL."/modules.php?module=admin";
 
 if (!empty($_GET['u_id'])) {
        // Secure the user ID
@@ -112,19 +112,19 @@ LIMIT 1",
                $LINKS = GET_TOTAL_DATA($uid, "user_links", "id", "userid", true);
 
                // Add links to the numbers
-               if ($LINKS > 0) $LINKS = $BASE."&amp;what=list_links&amp;u_id=".$uid."\">".$LINKS."</A>]";
-               if ($DATA['refid'] > 0) $DATA['refid'] = $BASE."&amp;what=list_user&amp;u_id=".$DATA['refid']."\">".$DATA['refid']."</A>]";
+               if ($LINKS > 0) $LINKS = $BASE."&amp;what=list_links&amp;u_id=".$uid."\">".$LINKS."</a>]";
+               if ($DATA['refid'] > 0) $DATA['refid'] = $BASE."&amp;what=list_user&amp;u_id=".$DATA['refid']."\">".$DATA['refid']."</a>]";
                if (empty($DATA['last_module'])) $DATA['last_module'] = "---";
-               if ($REFS > 0) $REFS = $BASE."&amp;what=list_refs&amp;u_id=".$uid."\">".$REFS."</A>]";
-               if ($CATS > 0) $CATS = $BASE."&amp;what=list_cats&amp;u_id=".$uid."\">".$CATS."</A>]";
+               if ($REFS > 0) $REFS = $BASE."&amp;what=list_refs&amp;u_id=".$uid."\">".$REFS."</a>]";
+               if ($CATS > 0) $CATS = $BASE."&amp;what=list_cats&amp;u_id=".$uid."\">".$CATS."</a>]";
 
                // Calculate timestamp for birthday
-               $stamp = MAKE_DATETIME(mktime(0, 0, 0, $DATA['birth_month'], $DATA['birth_day'], $DATA['birth_year']), "3");
+               $stamp = mktime(0, 0, 0, $DATA['birth_month'], $DATA['birth_day'], $DATA['birth_year']);
 
                // Is this above zero?
                if ($stamp > 0) {
                        // Then use it
-                       define('_BIRTHDAY', $stamp);
+                       define('_BIRTHDAY', MAKE_DATETIME($stamp, "3"));
                } else {
                        // Zero or below so set zero!
                        define('_BIRTHDAY', MAKE_DATETIME(0, "3"));
@@ -140,7 +140,7 @@ LIMIT 1",
                $DATA['status']            = TRANSLATE_STATUS($DATA['status']);
                $DATA['last_online']       = MAKE_DATETIME($DATA['last_online'], "0");
                $DATA['used_points']       = TRANSLATE_COMMA($DATA['used_points']);
-               if ($DATA['emails_sent'] > 0) $DATA['emails_sent'] = $BASE."&amp;what=email_details&amp;u_id=".$uid."\">".TRANSLATE_COMMA($DATA['emails_sent'])."</A>]";
+               if ($DATA['emails_sent'] > 0) $DATA['emails_sent'] = $BASE."&amp;what=email_details&amp;u_id=".$uid."\">".TRANSLATE_COMMA($DATA['emails_sent'])."</a>]";
                $DATA['joined']            = MAKE_DATETIME($DATA['joined'], "0");
                $DATA['last_update']       = MAKE_DATETIME($DATA['last_update'], "0");
                $DATA['last_profile_sent'] = MAKE_DATETIME($DATA['last_profile_sent'], "0");
@@ -264,13 +264,9 @@ LIMIT 1",
                define('__COLSPAN2'  , ($colspan + 2));
                define('__USER_CNT'  , $user_count);
 
-               if ((function_exists('alpha')) && (function_exists('SortLinks'))) {
-                       define('__ALPHA_SORT', alpha($_GET['sortby'], $colspan, true));
-                       define('__SORT_LINKS', SortLinks($_GET['letter'], $_GET['sortby'], $colspan, true));
-               } else {
-                       define('__ALPHA_SORT', "");
-                       define('__SORT_LINKS', "");
-               }
+               // Sorting links
+               define('__ALPHA_SORT', alpha($_GET['sortby'], $colspan, true));
+               define('__SORT_LINKS', SortLinks($_GET['letter'], $_GET['sortby'], $colspan, true));
 
                if ($PAGES > 1) {
                        define('__PAGE_NAV', ADD_PAGENAV($PAGES, getConfig('user_limit'), true, $colspan, true));
@@ -299,10 +295,10 @@ LIMIT 1",
 
                        // Get number of unconfirmed mails
                        $LINKS = GET_TOTAL_DATA($content['userid'], "user_links", "id", "userid", true);
-                       if ($LINKS > 0) $LINKS = $BASE."&amp;what=list_links&amp;u_id=".$content['userid']."\">".TRANSLATE_COMMA($LINKS)."</A>]";
+                       if ($LINKS > 0) $LINKS = $BASE."&amp;what=list_links&amp;u_id=".$content['userid']."\">".TRANSLATE_COMMA($LINKS)."</a>]";
 
                        // Set link to sent mails if present
-                       if ($content['emails_sent'] > 0) $content['emails_sent'] = $BASE."&amp;what=email_details&amp;u_id=".$content['userid']."\">".TRANSLATE_COMMA($content['emails_sent'])."</A>]";
+                       if ($content['emails_sent'] > 0) $content['emails_sent'] = $BASE."&amp;what=email_details&amp;u_id=".$content['userid']."\">".TRANSLATE_COMMA($content['emails_sent'])."</a>]";
 
                        // Add nickname
                        if (empty($content['nickname']) || $content['nickname'] == $content['userid']) $content['nickname'] = "---";
@@ -320,7 +316,7 @@ LIMIT 1",
                        $content['sw']     = $SW;
                        $content['uid']    = ADMIN_USER_PROFILE_LINK($content['userid']);
                        $content['gender'] = TRANSLATE_GENDER($content['gender']);
-                       $content['email']  = "[<A href=\"".CREATE_EMAIL_LINK($content['email'], "user_data")."\">".$content['email']."</A>]";
+                       $content['email']  = "[<a href=\"".CREATE_EMAIL_LINK($content['email'], "user_data")."\">".$content['email']."</a>]";
                        $content['addr']   = $content['REMOTE_ADDR'];
                        $content['links']  = $LINKS;
                        $content['alinks'] = MEMBER_ACTION_LINKS($content['userid'], $content['status']);