From dae73c05e93f42f14926082036f4d15075cff539 Mon Sep 17 00:00:00 2001 From: moodler Date: Thu, 10 Apr 2003 13:46:52 +0000 Subject: [PATCH] New $CFG->admin directory can override the location of the admin directory. Useful because some web hosts use /admin for other things. --- admin/admin.php | 4 ++-- admin/creators.php | 4 ++-- course/categories.php | 2 +- course/delete.php | 8 ++++---- course/edit.php | 4 ++-- course/lib.php | 22 +++++++++++----------- course/log.php | 4 ++-- course/teacher.php | 11 +++++------ lib/setup.php | 8 +++++++- 9 files changed, 36 insertions(+), 31 deletions(-) diff --git a/admin/admin.php b/admin/admin.php index 79f98b742b..aa43ee8e27 100644 --- 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", - "wwwroot/admin\">$stradministration -> + "$stradministration -> $strassignadmins", ""); /// Get all existing admins diff --git a/admin/creators.php b/admin/creators.php index d09dd2c898..da25a73400 100755 --- 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", - "wwwroot/admin\">$stradministration -> + "$stradministration -> $strassigncreators", ""); /// Get all existing creators diff --git a/course/categories.php b/course/categories.php index b46a62d3f3..7ed3adc982 100644 --- a/course/categories.php +++ b/course/categories.php @@ -25,7 +25,7 @@ $stradd = get_string("add"); print_header("$site->shortname: $strcategories", "$site->fullname", - "wwwroot/admin/\">$stradministration -> $strcategories"); + "admin/index.php\">$stradministration -> $strcategories"); print_heading($strcategories); diff --git a/course/delete.php b/course/delete.php index e8630ad284..5956d74b56 100644 --- a/course/delete.php +++ b/course/delete.php @@ -21,7 +21,7 @@ if (!$id) { print_header("$site->shortname: $strdeletecourse", $site->fullname, - "wwwroot/admin\">$stradministration -> $strdeletecourse"); + "admin/index.php\">$stradministration -> $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, - "wwwroot/admin\">$stradministration -> + "admin/index.php\">$stradministration -> $strdeletecourse -> $strdeletecheck"); notice_yesno("$strdeletecoursecheck

$course->fullname", @@ -63,7 +63,7 @@ $strdeletingcourse = get_string("deletingcourse", "", $course->shortname); print_header("$site->shortname: $strdeletingcourse", $site->fullname, - "wwwroot/admin\">$stradministration -> + "admin/index.php\">$stradministration -> $strdeletecourse -> $strdeletingcourse"); print_heading($strdeletingcourse); diff --git a/course/edit.php b/course/edit.php index 087fd24727..80cbd10431 100644 --- 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", - "wwwroot/admin/\">$stradministration + "admin/index.php\">$stradministration -> $straddnewcourse", $focus); } diff --git a/course/lib.php b/course/lib.php index 814190114b..b173147940 100644 --- a/course/lib.php +++ b/course/lib.php @@ -615,18 +615,18 @@ function print_admin_links ($siteid, $width=180) { $icon = "wwwroot/pix/i/settings.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">"; if (isadmin()) { - $moddata[]="wwwroot/admin/config.php\">".get_string("configvariables").""; + $moddata[]="wwwroot/$CFG->admin/config.php\">".get_string("configvariables").""; $modicon[]=$icon; - $moddata[]="wwwroot/admin/site.php\">".get_string("sitesettings").""; + $moddata[]="wwwroot/$CFG->admin/site.php\">".get_string("sitesettings").""; $modicon[]=$icon; $moddata[]="wwwroot/course/log.php?id=$siteid\">".get_string("sitelogs").""; $modicon[]=$icon; $moddata[]="wwwroot/theme/index.php\">".get_string("choosetheme").""; $modicon[]=$icon; - $moddata[]="wwwroot/admin/lang.php\">".get_string("checklanguage").""; + $moddata[]="wwwroot/$CFG->admin/lang.php\">".get_string("checklanguage").""; $modicon[]=$icon; - if (file_exists("$CFG->dirroot/admin/$CFG->dbtype")) { - $moddata[]="wwwroot/admin/$CFG->dbtype/frame.php\">".get_string("managedatabase").""; + if (file_exists("$CFG->diradmin/$CFG->dbtype")) { + $moddata[]="wwwroot/$CFG->admin/$CFG->dbtype/frame.php\">".get_string("managedatabase").""; $modicon[]=$icon; } $moddata[]="
"; @@ -646,17 +646,17 @@ function print_admin_links ($siteid, $width=180) { $modicon[]=$icon; $moddata[]="
"; $modicon[]=""; - $moddata[]="wwwroot/admin/user.php?newuser=true\">".get_string("addnewuser").""; + $moddata[]="wwwroot/$CFG->admin/user.php?newuser=true\">".get_string("addnewuser").""; $modicon[]=$icon; - $moddata[]="wwwroot/admin/user.php\">".get_string("edituser").""; + $moddata[]="wwwroot/$CFG->admin/user.php\">".get_string("edituser").""; $modicon[]=$icon; - $moddata[]="wwwroot/admin/admin.php\">".get_string("assignadmins").""; + $moddata[]="wwwroot/$CFG->admin/admin.php\">".get_string("assignadmins").""; $modicon[]=$icon; - $moddata[]="wwwroot/admin/creators.php\">".get_string("assigncreators").""; + $moddata[]="wwwroot/$CFG->admin/creators.php\">".get_string("assigncreators").""; $modicon[]=$icon; - $moddata[]="wwwroot/admin/auth.php\">".get_string("authentication").""; + $moddata[]="wwwroot/$CFG->admin/auth.php\">".get_string("authentication").""; $modicon[]=$icon; - $fulladmin = "

wwwroot/admin/\">".get_string("admin")."..."; + $fulladmin = "

wwwroot/$CFG->admin/\">".get_string("admin")."..."; } print_side_block(get_string("administration"), "", $moddata, $modicon, $fulladmin, $width); diff --git a/course/log.php b/course/log.php index 05878f1c64..68bddde420 100644 --- a/course/log.php +++ b/course/log.php @@ -49,7 +49,7 @@ id\">$strlogs -> $userinfo, $dateinfo", ""); } else { print_header("$course->shortname: $strlogs", "$course->fullname", - "wwwroot/admin/\">$stradministration -> + "wwwadmin/index.php\">$stradministration -> id\">$strlogs -> $userinfo, $dateinfo", ""); } @@ -65,7 +65,7 @@ "id\">$course->shortname -> $strlogs", ""); } else { print_header("$course->shortname: $strlogs", "$course->fullname", - "wwwroot/admin/\">$stradministration -> $strlogs", ""); + "wwwadmin/index.php\">$stradministration -> $strlogs", ""); } print_heading(get_string("chooselogs").":"); diff --git a/course/teacher.php b/course/teacher.php index 0521ac6714..f8754f2e89 100644 --- 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", - "$stradministration -> $strassignteachers"); + "admin/index.php\">$stradministration -> $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", - "$stradministration -> - $strassignteachers -> - $course->shortname", ""); + "admin/index.php\">$stradministration -> + $strassignteachers -> $course->shortname", ""); print_heading("wwwroot/course/view.php?id=$course->id\">$course->fullname"); diff --git a/lib/setup.php b/lib/setup.php index 6f378fc2ff..3f85bc6477 100644 --- 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 -- 2.39.5