fixing a couple of instances of hardcoded /admin/

diff --git a/admin/lang.php b/admin/lang.php
index d062af6f7e4462b534190bee2c4bb3f093a67881..1a61e9eddb5f7846cdb150efd388f13dcee69979 100644 (file)
--- a/admin/lang.php
+++ b/admin/lang.php
@@ -27,7 +27,7 @@
         case "missing":
             $navigation = "<a href=\"lang.php\">$strlanguage</a> -> $strmissingstrings";
             $title = $strmissingstrings;
-            $button = '<form target="'.$CFG->framename.'" method="get" action="'.$CFG->wwwroot.'/admin/lang.php">'.
+            $button = '<form target="'.$CFG->framename.'" method="get" action="'.$CFG->wwwroot.'/'.$CFG->admin.'/lang.php">'.
                       '<input type="hidden" name="mode" value="compare" />'.
                       '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />'.
                       '<input type="submit" value="'.$strcomparelanguage.'" /></form>';
@@ -35,7 +35,7 @@
         case "compare":
             $navigation = "<a href=\"lang.php\">$strlanguage</a> -> $strcomparelanguage";
             $title = $strcomparelanguage;
-            $button = '<form target="'.$CFG->framename.'" method="get" action="'.$CFG->wwwroot.'/admin/lang.php">'.
+            $button = '<form target="'.$CFG->framename.'" method="get" action="'.$CFG->wwwroot.'/'.$CFG->admin.'/lang.php">'.
                       '<input type="hidden" name="mode" value="missing" />'.
                       '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />'.
                       '<input type="submit" value="'.$strmissingstrings.'" /></form>';
@@ -60,7 +60,7 @@
         echo "<table align=\"center\"><tr><td align=\"right\">";
         echo "<b>$strcurrentlanguage:</b>";
         echo "</td><td>";
-        echo popup_form ("$CFG->wwwroot/admin/lang.php?lang=", $langs, "chooselang", $currlang, "", "", "", true);
+        echo popup_form ("$CFG->wwwroot/$CFG->admin/lang.php?lang=", $langs, "chooselang", $currlang, "", "", "", true);
         echo "</td></tr></table>";
         print_heading("<a href=\"lang.php?mode=missing&sesskey=$USER->sesskey\">$strmissingstrings</a>");
         print_heading("<a href=\"lang.php?mode=compare&sesskey=$USER->sesskey\">$strcomparelanguage</a>");

diff --git a/mod/glossary/formats.php b/mod/glossary/formats.php
index c21860365323ecc5554ff26f94ad6f1191c96be1..cc8a7c1ffb784dd5f14fc9d1e85363a766db1944 100644 (file)
--- a/mod/glossary/formats.php
+++ b/mod/glossary/formats.php
@@ -31,7 +31,7 @@
             }
             update_record("glossary_formats",$displayformat);
         }
-        redirect("../../admin/module.php?sesskey=$USER->sesskey&module=glossary#formats");
+        redirect("../../$CFG->admin/module.php?sesskey=$USER->sesskey&module=glossary#formats");
         die;
     } elseif ( $mode == 'edit' and $form) {
         
@@ -43,7 +43,7 @@
         $displayformat->sortorder   = $form->sortorder;
         
         update_record("glossary_formats",$displayformat);
-        redirect("../../admin/module.php?sesskey=$USER->sesskey&module=glossary#formats");
+        redirect("../../$CFG->admin/module.php?sesskey=$USER->sesskey&module=glossary#formats");
         die;
     }
     
@@ -54,9 +54,9 @@
     $strdisplayformats = get_string("displayformats","glossary");
 
     print_header("$strmodulename: $strconfiguration", $site->fullname,
-                  "<a href=\"../../admin/index.php\">$stradmin</a> -> ".
-                  "<a href=\"../../admin/configure.php\">$strconfiguration</a> -> ".
-                  "<a href=\"../../admin/modules.php\">$strmanagemodules</a> -> <a href=\"../../admin/module.php?module=glossary&sesskey=$USER->sesskey\">$strmodulename</a> -> $strdisplayformats");
+                  "<a href=\"../../$CFG->admin/index.php\">$stradmin</a> -> ".
+                  "<a href=\"../../$CFG->admin/configure.php\">$strconfiguration</a> -> ".
+                  "<a href=\"../../$CFG->admin/modules.php\">$strmanagemodules</a> -> <a href=\"../../$CFG->admin/module.php?module=glossary&sesskey=$USER->sesskey\">$strmodulename</a> -> $strdisplayformats");
 
     print_heading($strmodulename . ': ' . get_string("displayformats","glossary"));
 

diff --git a/theme/index.php b/theme/index.php
index e8c8caccbdbf0d529797ff90719fdc7a9908e0ec..03fd1b60144d058a4fa9d8dee7ddfe2d2a34e2b9 100644 (file)
--- a/theme/index.php
+++ b/theme/index.php
@@ -39,8 +39,8 @@
     $strthemesaved = get_string("themesaved");
 
     print_header("$site->shortname: $strthemes", $site->fullname, 
-                 "<a href=\"$CFG->wwwroot/admin/index.php\">$stradministration</a> -> ".
-                 "<a href=\"$CFG->wwwroot/admin/configure.php\">$strconfiguration</a> -> $strthemes");
+                 "<a href=\"$CFG->wwwroot/$CFG->admin/index.php\">$stradministration</a> -> ".
+                 "<a href=\"$CFG->wwwroot/$CFG->admin/configure.php\">$strconfiguration</a> -> $strthemes");
 
     if ($choose and confirm_sesskey()) {
         if (set_config("theme", $choose)) {