New $CFG->admin directory can override the location of the admin

directory.

Useful because some web hosts use /admin for other things.

diff --git a/admin/admin.php b/admin/admin.php
index 79f98b742b5145827b9ca25ee5aee6941e25c73c..aa43ee8e27e5ff5d3ca6d17ccfe4f2984fa304e6 100644 (file)
--- a/admin/admin.php
+++ b/admin/admin.php
@@ -8,7 +8,7 @@
     optional_variable($remove, "");
 
     if (! $site = get_site()) {
-        redirect("$CFG->wwwroot/admin/");
+        redirect("$CFG->wwwroot/$CFG->admin/index.php");
     }
 
     require_login();
@@ -47,7 +47,7 @@
 
        print_header("$site->shortname: $course->shortname: $strassignadmins", 
                  "$site->fullname", 
-                 "<A HREF=\"$CFG->wwwroot/admin\">$stradministration</A> -> 
+                 "<A HREF=\"index.php\">$stradministration</A> -> 
                   <A HREF=\"{$_SERVER['PHP_SELF']}\">$strassignadmins</A>", "");
 
 /// Get all existing admins

diff --git a/admin/creators.php b/admin/creators.php
index d09dd2c89854fb5d1ec9b4439bfeca7cc11389e6..da25a734003db5f641d0398f9253f42743af4074 100755 (executable)
--- a/admin/creators.php
+++ b/admin/creators.php
@@ -8,7 +8,7 @@
     optional_variable($remove, "");
 
     if (! $site = get_site()) {
-        redirect("$CFG->wwwroot/admin/");
+        redirect("$CFG->wwwroot/$CFG->admin/index.php");
     }
 
     require_login();
@@ -47,7 +47,7 @@
 
        print_header("$site->shortname: $course->shortname: $strassigncreators", 
                  "$site->fullname", 
-                 "<A HREF=\"$CFG->wwwroot/admin\">$stradministration</A> -> 
+                 "<A HREF=\"index.php\">$stradministration</A> -> 
                   <A HREF=\"{$_SERVER['PHP_SELF']}\">$strassigncreators</A>", "");
 
 /// Get all existing creators

diff --git a/course/categories.php b/course/categories.php
index b46a62d3f36557c82cd7534685e560aa39f60ae7..7ed3adc98201fc73c34a977e64bd14f0b0c47fcb 100644 (file)
--- a/course/categories.php
+++ b/course/categories.php
@@ -25,7 +25,7 @@
     $stradd = get_string("add");
 
        print_header("$site->shortname: $strcategories", "$site->fullname", 
-                 "<A HREF=\"$CFG->wwwroot/admin/\">$stradministration</A> -> $strcategories");
+                 "<A HREF=\"../$CFG->admin/index.php\">$stradministration</A> -> $strcategories");
 
     print_heading($strcategories);
 

diff --git a/course/delete.php b/course/delete.php
index e8630ad2841f410b9c58826787b92188df2b9bec..5956d74b56983537644baa411de9bd6d43362d3c 100644 (file)
--- a/course/delete.php
+++ b/course/delete.php
@@ -21,7 +21,7 @@
 
     if (!$id) {
            print_header("$site->shortname: $strdeletecourse", $site->fullname, 
-                     "<A HREF=\"$CFG->wwwroot/admin\">$stradministration</A> -> $strdeletecourse");
+                     "<A HREF=\"../$CFG->admin/index.php\">$stradministration</A> -> $strdeletecourse");
 
         if ($courses = get_courses()) {
             print_heading(get_string("choosecourse"));
@@ -32,7 +32,7 @@
             print_simple_box_end();
         } else {
             print_heading(get_string("nocoursesyet"));
-            print_continue("$CFG->wwwroot/admin/");
+            print_continue("../$CFG->admin/index.php");
         }
         print_footer();
         exit;
@@ -46,7 +46,7 @@
         $strdeletecheck = get_string("deletecheck", "", $course->shortname);
         $strdeletecoursecheck = get_string("deletecoursecheck");
            print_header("$site->shortname: $strdeletecheck", $site->fullname, 
-                     "<A HREF=\"$CFG->wwwroot/admin\">$stradministration</A> -> 
+                     "<A HREF=\"../$CFG->admin/index.php\">$stradministration</A> -> 
                       <A HREF=\"delete.php\">$strdeletecourse</A> -> $strdeletecheck");
 
         notice_yesno("$strdeletecoursecheck<BR><BR>$course->fullname", 
@@ -63,7 +63,7 @@
     $strdeletingcourse = get_string("deletingcourse", "", $course->shortname);
 
        print_header("$site->shortname: $strdeletingcourse", $site->fullname, 
-                 "<A HREF=\"$CFG->wwwroot/admin\">$stradministration</A> -> 
+                 "<A HREF=\"../$CFG->admin/index.php\">$stradministration</A> -> 
                   <A HREF=\"delete.php\">$strdeletecourse</A> -> $strdeletingcourse");
 
     print_heading($strdeletingcourse);

diff --git a/course/edit.php b/course/edit.php
index 087fd2472779b738a083021e71db0bacb04b8a82..80cbd1043138c1e055c9b834d35b96f6f0eb16c5 100644 (file)
--- a/course/edit.php
+++ b/course/edit.php
@@ -25,7 +25,7 @@
     }
 
     if (! $site = get_site()) {
-        redirect("$CFG->wwwroot/admin/");
+        redirect("$CFG->wwwroot/$CFG->admin/index.php");
     }
 
 
@@ -137,7 +137,7 @@
                       -> $streditcoursesettings", $focus);
     } else {
         print_header("$site->shortname: $straddnewcourse", "$site->fullname",
-                     "<A HREF=\"$CFG->wwwroot/admin/\">$stradministration</A> 
+                     "<A HREF=\"../$CFG->admin/index.php\">$stradministration</A> 
                       -> $straddnewcourse", $focus);
     }
 

diff --git a/course/lib.php b/course/lib.php
index 814190114be920e12e0bb83b48caae4b1172a8ea..b173147940974f706137815b79badf426d08eef3 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -615,18 +615,18 @@ function print_admin_links ($siteid, $width=180) {
     
     $icon = "<IMG SRC=\"$CFG->wwwroot/pix/i/settings.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
     if (isadmin()) {
-           $moddata[]="<A HREF=\"$CFG->wwwroot/admin/config.php\">".get_string("configvariables")."</A>";
+           $moddata[]="<A HREF=\"$CFG->wwwroot/$CFG->admin/config.php\">".get_string("configvariables")."</A>";
                $modicon[]=$icon;
-               $moddata[]="<A HREF=\"$CFG->wwwroot/admin/site.php\">".get_string("sitesettings")."</A>";
+               $moddata[]="<A HREF=\"$CFG->wwwroot/$CFG->admin/site.php\">".get_string("sitesettings")."</A>";
                $modicon[]=$icon;
                $moddata[]="<A HREF=\"$CFG->wwwroot/course/log.php?id=$siteid\">".get_string("sitelogs")."</A>";
                $modicon[]=$icon;
                $moddata[]="<A HREF=\"$CFG->wwwroot/theme/index.php\">".get_string("choosetheme")."</A>";
                $modicon[]=$icon;
-               $moddata[]="<A HREF=\"$CFG->wwwroot/admin/lang.php\">".get_string("checklanguage")."</A>";
+               $moddata[]="<A HREF=\"$CFG->wwwroot/$CFG->admin/lang.php\">".get_string("checklanguage")."</A>";
                $modicon[]=$icon;
-               if (file_exists("$CFG->dirroot/admin/$CFG->dbtype")) {
-            $moddata[]="<A HREF=\"$CFG->wwwroot/admin/$CFG->dbtype/frame.php\">".get_string("managedatabase")."</A>";
+               if (file_exists("$CFG->diradmin/$CFG->dbtype")) {
+            $moddata[]="<A HREF=\"$CFG->wwwroot/$CFG->admin/$CFG->dbtype/frame.php\">".get_string("managedatabase")."</A>";
                        $modicon[]=$icon;
                }
                $moddata[]="<HR>";
@@ -646,17 +646,17 @@ function print_admin_links ($siteid, $width=180) {
                $modicon[]=$icon;
                $moddata[]="<HR>";
                $modicon[]="";
-               $moddata[]="<A HREF=\"$CFG->wwwroot/admin/user.php?newuser=true\">".get_string("addnewuser")."</A>";
+               $moddata[]="<A HREF=\"$CFG->wwwroot/$CFG->admin/user.php?newuser=true\">".get_string("addnewuser")."</A>";
                $modicon[]=$icon;
-               $moddata[]="<A HREF=\"$CFG->wwwroot/admin/user.php\">".get_string("edituser")."</A>";
+               $moddata[]="<A HREF=\"$CFG->wwwroot/$CFG->admin/user.php\">".get_string("edituser")."</A>";
                $modicon[]=$icon;
-               $moddata[]="<A HREF=\"$CFG->wwwroot/admin/admin.php\">".get_string("assignadmins")."</A>";
+               $moddata[]="<A HREF=\"$CFG->wwwroot/$CFG->admin/admin.php\">".get_string("assignadmins")."</A>";
                $modicon[]=$icon;
-        $moddata[]="<A HREF=\"$CFG->wwwroot/admin/creators.php\">".get_string("assigncreators")."</A>";
+        $moddata[]="<A HREF=\"$CFG->wwwroot/$CFG->admin/creators.php\">".get_string("assigncreators")."</A>";
                $modicon[]=$icon;
-               $moddata[]="<A HREF=\"$CFG->wwwroot/admin/auth.php\">".get_string("authentication")."</A>";
+               $moddata[]="<A HREF=\"$CFG->wwwroot/$CFG->admin/auth.php\">".get_string("authentication")."</A>";
                $modicon[]=$icon;
-        $fulladmin = "<P><A HREF=\"$CFG->wwwroot/admin/\">".get_string("admin")."</A>...";
+        $fulladmin = "<P><A HREF=\"$CFG->wwwroot/$CFG->admin/\">".get_string("admin")."</A>...";
     }
 
     print_side_block(get_string("administration"), "", $moddata, $modicon, $fulladmin, $width);

diff --git a/course/log.php b/course/log.php
index 05878f1c64fa1b6cf785a29528c61338de582895..68bddde420a4ba23212da8f3051f8d76d5d65d29 100644 (file)
--- a/course/log.php
+++ b/course/log.php
@@ -49,7 +49,7 @@
                           <A HREF=\"log.php?id=$course->id\">$strlogs</A> -> $userinfo, $dateinfo", "");
         } else {
             print_header("$course->shortname: $strlogs", "$course->fullname", 
-                         "<A HREF=\"$CFG->wwwroot/admin/\">$stradministration</A> ->
+                         "<A HREF=\"$CFG->wwwadmin/index.php\">$stradministration</A> ->
                           <A HREF=\"log.php?id=$course->id\">$strlogs</A> -> $userinfo, $dateinfo", "");
         }
         
@@ -65,7 +65,7 @@
                      "<A HREF=\"view.php?id=$course->id\">$course->shortname</A> -> $strlogs", "");
         } else {
             print_header("$course->shortname: $strlogs", "$course->fullname", 
-                     "<A HREF=\"$CFG->wwwroot/admin/\">$stradministration</A> -> $strlogs", "");
+                     "<A HREF=\"$CFG->wwwadmin/index.php\">$stradministration</A> -> $strlogs", "");
         }
 
         print_heading(get_string("chooselogs").":");

diff --git a/course/teacher.php b/course/teacher.php
index 0521ac67148915a1a755ef24022cdabe39bce77f..f8754f2e895de03518fb2169cf9d94629ea3d270 100644 (file)
--- a/course/teacher.php
+++ b/course/teacher.php
@@ -7,7 +7,7 @@
     optional_variable($id);       // course id
 
     if (! $site = get_site()) {
-        redirect("$CFG->wwwroot/admin/");
+        redirect("$CFG->wwwroot/$CFG->admin/index.php");
     }
 
     require_login();
@@ -30,7 +30,7 @@
 
     if (!$id) {
            print_header("$site->shortname: $strassignteachers", "$site->fullname", 
-                     "<A HREF=\"../admin/\">$stradministration</A> -> $strassignteachers");
+                     "<A HREF=\"../$CFG->admin/index.php\">$stradministration</A> -> $strassignteachers");
         
         $isadmin = isadmin(); /// cache value
         $courses = get_courses();
@@ -50,7 +50,7 @@
         
         if ($coursesfound == FALSE) {         
             print_heading(get_string("nocoursesyet"));
-            print_continue("$CFG->wwwroot/admin/");
+            print_continue("../$CFG->admin/index.php");
         }
 
         print_footer();
@@ -64,9 +64,8 @@
 
        print_header("$site->shortname: $course->shortname: $strassignteachers", 
                  "$site->fullname", 
-                 "<A HREF=\"../admin/\">$stradministration</A> -> 
-                  <A HREF=\"teacher.php\">$strassignteachers</A> ->
-                  $course->shortname", "");
+                 "<A HREF=\"../$CFG->admin/index.php\">$stradministration</A> -> 
+                  <A HREF=\"teacher.php\">$strassignteachers</A> -> $course->shortname", "");
     print_heading("<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->fullname</A>");
 
 

diff --git a/lib/setup.php b/lib/setup.php
index 6f378fc2ff4e3e1acdc358e8de4df2cd962b6cd7..3f85bc6477f67fe2eb1f663f7c909a152991d45c 100644 (file)
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -15,7 +15,7 @@
 
 /// Connect to the database using adodb
 
-    $CFG->libdir = "$CFG->dirroot/lib";
+    $CFG->libdir   = "$CFG->dirroot/lib";
 
     require_once("$CFG->libdir/adodb/adodb.inc.php"); // Database access functions
 
@@ -32,6 +32,12 @@
     //$CFG->prefix = "$CFG->dbname.$CFG->prefix";
 
 
+/// Define admin directory
+
+    if (!isset($CFG->admin)) {   // Just in case it isn't defined in config.php
+        $CFG->admin = "admin";   // This is relative to the wwwroot and dirroot
+    }
+
 
 /// Load up standard libraries