moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 08:26:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Modified Greg's work to:

Browse source 
- rename the main_frame variable to framename, because it
       - might have caused some confusion
       - none of the global variables have underscores
  - put the config in the config table, with a default of _top
This commit is contained in:
moodler 2003-03-12 07:36:22 +00:00
parent 2ea9027bc4
commit f82c2d428a
12 changed files with 50 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/db/mysql.php
View file

@ -88,6 +88,7 @@ function main_upgrade($oldversion=0) {
}
if ($oldversion < 2002102503) {
execute_sql(" ALTER TABLE `course` ADD `modinfo` TEXT NOT NULL AFTER `format` ");
require_once("$CFG->dirroot/mod/forum/lib.php");
require_once("$CFG->dirroot/course/lib.php");

1
lib/defaults.php
View file

@ -26,6 +26,7 @@
"prefix" => "",
"guestloginbutton" => 1,
"sessiontimeout" => 7200,
"framename" => "_top",
"debug" => 7
);

8
lib/weblib.php
View file

@ -319,7 +319,7 @@ function popup_form ($common, $options, $formname, $selected="", $nothing="choos
$nothing = get_string("choose")."...";
}
$output = "<FORM TARGET=\"{$CFG->main_frame}\" NAME=$formname>";
$output = "<FORM TARGET=\"{$CFG->framename}\" NAME=$formname>";
$output .= "<SELECT NAME=popup onChange=\"top.location=document.$formname.popup.options[document.$formname.popup.selectedIndex].value\">\n";
if ($nothing != "") {
@ -636,10 +636,10 @@ function print_footer ($course=NULL) {
$course = get_site();
$homepage = true;
} else {
$homelink = "<A TARGET=\"{$CFG->main_frame}\" HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A>";
$homelink = "<A TARGET=\"{$CFG->framename}\" HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A>";
}
} else {
$homelink = "<A TARGET=\"{$CFG->main_frame}\" HREF=\"$CFG->wwwroot\">".get_string("home")."</A>";
$homelink = "<A TARGET=\"{$CFG->framename}\" HREF=\"$CFG->wwwroot\">".get_string("home")."</A>";
$course = get_site();
}
@ -673,7 +673,7 @@ function print_navigation ($navigation) {
if (! $site = get_site()) {
$site->shortname = get_string("home");;
}
echo "<A TARGET=\"{$CFG->main_frame}\" HREF=\"$CFG->wwwroot/\">$site->shortname</A> -> $navigation";
echo "<A TARGET=\"{$CFG->framename}\" HREF=\"$CFG->wwwroot/\">$site->shortname</A> -> $navigation";
}
}