Several more constants rewritten to getConfig()

[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 151cc2e5782948550f506d848f7086f574049fd2..bb1bb5e5b9d85a63375d85f873c20745758946ad 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -360,7 +360,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
                                if (($menu == $act) && (empty($wht))) {
                                        $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."\">";
                                }
 
                                $OUT .= $title;
@@ -413,7 +413,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
                                                                if ($wht == $wht_sub) {
                                                                        $OUT .= "<strong>";
                                                                } else {
-                                                                       $OUT .= "[<a href=\"{!URL!}/modules.php?module=admin&amp;what=".$wht_sub."\">";
+                                                                       $OUT .= "[<a href=\"{?URL?}/modules.php?module=admin&amp;what=".$wht_sub."\">";
                                                                }
                                                        } else {
                                                                $OUT .= "<em class=\"admin_note\">";
@@ -662,10 +662,10 @@ function ADMIN_MAKE_MENU_SELECTION ($menu, $type, $name, $default = '') {
                // Is this a PHP script?
                if ((!isDirectory($file)) && (strpos($file, "".$type.'-') > -1) && (strpos($file, '.php') > 0)) {
                        // Then test if the file is readable
-                       $test = sprintf("%sinc/modules/%s/%s", constant('PATH'), $menu, $file);
+                       $test = sprintf("inc/modules/%s/%s", $menu, $file);
 
                        // Is the file there?
-                       if (isFileReadable($test)) {
+                       if (isIncludeReadable($test)) {
                                // Extract the value for what=xxx
                                $part = substr($file, (strlen($type) + 1));
                                $part = substr($part, 0, -4);
@@ -701,7 +701,7 @@ function generateUserProfileLink ($uid, $title = '', $wht = 'list_user') {
 
        // Return link
        //* DEBUG: */ OUTPUT_HTML("a:".$title."<br />");
-       return "<a href=\"{!URL!}/modules.php?module=admin&amp;what=".$wht."&amp;uid=".$uid."\" title=\"{--ADMIN_USER_PROFILE_TITLE--}\">".$title."</a>";
+       return "<a href=\"{?URL?}/modules.php?module=admin&amp;what=".$wht."&amp;uid=".$uid."\" title=\"{--ADMIN_USER_PROFILE_TITLE--}\">".$title."</a>";
 }
 
 // Check "logical-area-mode"
@@ -1295,11 +1295,11 @@ function ADMIN_CREATE_USERID_LINK ($uid) {
        // Is the userid set correctly?
        if ($uid > 0) {
                // Create a link to that profile
-               return '{!URL!}/modules.php?module=admin&amp;what=list_user&amp;uid='.bigintval($uid);
+               return '{?URL?}/modules.php?module=admin&amp;what=list_user&amp;uid='.bigintval($uid);
        } // 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';
 }
 
 //