From 1dd24519546072f358786d94acee52453a8f4a17 Mon Sep 17 00:00:00 2001 From: moodler Date: Mon, 26 May 2003 14:38:41 +0000 Subject: [PATCH] Some minor cleanups and debugging of initial setup --- admin/index.php | 18 +++++++++++++++--- admin/site.php | 5 +++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/admin/index.php b/admin/index.php index fdeddce0cb..dbb0750e60 100644 --- a/admin/index.php +++ b/admin/index.php @@ -72,6 +72,18 @@ "./"); } +/// Set some necessary variables during set-up to avoid PHP warnings later on this page + if (!isset($CFG->framename)) { + $CFG->framename = "_top"; + } + if (!isset($CFG->release)) { + $CFG->release = ""; + } + if (!isset($CFG->version)) { + $CFG->version = ""; + } + + /// Check if the main tables have been installed yet or not. @@ -92,7 +104,7 @@ } if (! $maintables) { - if (!$agreelicence) { + if (empty($agreelicence)) { $strlicense = get_string("license"); print_header($strlicense, $strlicense, $strlicense, "", "", false, " ", " "); print_heading("Moodle - Modular Object-Oriented Dynamic Learning Environment"); @@ -100,9 +112,9 @@ print_simple_box_start("center"); echo text_to_html(get_string("gpl")); print_simple_box_end(); - echo "
"; + echo "
"; notice_yesno(get_string("doyouagree"), "index.php?agreelicence=true", - "http://www.gnu.org/copyleft/gpl.html"); + "http://moodle.org/doc/?frame=licence.html"); exit; } diff --git a/admin/site.php b/admin/site.php index ccfe14c6be..ce20492f5e 100644 --- a/admin/site.php +++ b/admin/site.php @@ -52,6 +52,11 @@ $form = $site; $firsttime = false; } else { + $form->fullname = ""; + $form->shortname = ""; + $form->summary = ""; + $form->newsitems = 0; + $form->id = ""; $form->category = 0; $form->format = "social"; $form->newsitems = 0; -- 2.39.5