Some minor cleanups and debugging of initial setup

diff --git a/admin/index.php b/admin/index.php
index fdeddce0cb371e40e62d373ecad2c89f124824fa..dbb0750e606c5d3fa49b0d61202db4faca902c4b 100644 (file)
--- 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("<A HREF=\"http://moodle.org\">Moodle</A> - 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 "<BR>";
+            echo "<br />";
             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 ccfe14c6be7ed57b2816cf6187283b5cfff4a7bf..ce20492f5e484388b5e15eb15a76500db7c71250 100644 (file)
--- 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;