Global rewrite of engine:

[mailer.git] / inc / modules / admin / admin-inc.php

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 7d38f8fa16b9719549f716baacd2003db3def04a..327e51147f14261741e49015bbf8f0d1dd1e414c 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -377,7 +377,7 @@ ORDER BY
                                        if (($menu == $action) && (empty($what))) {
                                                $OUT .= '<strong>';
                                        } else {
-                                               $OUT .= '[<a href="{?URL?}/modules.php?module=admin&amp;action=' . $menu . '">';
+                                               $OUT .= '[<a href="{%url=modules.php?module=admin&amp;action=' . $menu . '%}">';
                                        }
                                } else {
                                        $OUT .= '<em style="cursor:help" class="admin_note" title="{--MENU_ACTION_404--}">';
@@ -447,7 +447,7 @@ ORDER BY
                                                                if ($what == $what_sub) {
                                                                        $OUT .= '<strong>';
                                                                } else {
-                                                                       $OUT .= '[<a href="{?URL?}/modules.php?module=admin&amp;what=' . $what_sub . '">';
+                                                                       $OUT .= '[<a href="{%url=modules.php?module=admin&amp;what=' . $what_sub . '%}">';
                                                                }
                                                        } else {
                                                                $OUT .= '<em style="cursor:help" class="admin_note" title="{--MENU_WHAT_404--}">';
@@ -713,7 +713,10 @@ function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
        if (($title == '') && ($userid > 0)) {
                // Set userid as title
                $title = $userid;
-       } // END - if
+       } elseif ($userid == 0) {
+               // User id zero is invalid
+               return '<strong>' . $userid . '</strong>';
+       }
 
        if (($title == '0') && ($what == 'list_refs')) {
                // Return title again
@@ -727,7 +730,7 @@ function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
        }
 
        // Return link
-       return '[<a href="{?URL?}/modules.php?module=admin&amp;what=' . $what . '&amp;userid=' . $userid . '" title="{--ADMIN_USER_PROFILE_TITLE--}">' . $title . '</a>]';
+       return '[<a href="{%url=modules.php?module=admin&amp;what=' . $what . '&amp;userid=' . $userid . '%}" title="{--ADMIN_USER_PROFILE_TITLE--}">' . $title . '</a>]';
 }
 
 // Check "logical-area-mode"
@@ -1320,11 +1323,11 @@ function adminCreateUserLink ($userid) {
        // Is the userid set correctly?
        if ($userid > 0) {
                // Create a link to that profile
-               return '{?URL?}/modules.php?module=admin&amp;what=list_user&amp;userid='.bigintval($userid);
+               return '{%url=modules.php?module=admin&amp;what=list_user&amp;userid='.bigintval($userid) . '%}';
        } // END - if
 
        // Return a link to the user list
-       return '{?URL?}/modules.php?module=admin&amp;what=list_user';
+       return '{%url=modules.php?module=admin&amp;what=list_user%}';
 }
 
 // Generate a "link" for the given admin id (admin_id)