Fix all requires() to use absolute paths (Sun boxes have problems with relative

paths, it seems). Also, login is required to view the calendar of any course
other than the site.

diff --git a/calendar/event.php b/calendar/event.php
index 7031a87d455d6e6012c77b30b4866731a0c92cdf..eb4ba6db9f9c9db3a743535dc1c9f8ee2f3de2bd 100644 (file)
--- a/calendar/event.php
+++ b/calendar/event.php
@@ -39,9 +39,9 @@
 /////////////////////////////////////////////////////////////////////////////
 
     require_once('../config.php');
-    require_once('lib.php');
-    require_once('../course/lib.php');
-    require_once('../mod/forum/lib.php');
+    require_once($CFG->dirroot.'/calendar/lib.php');
+    require_once($CFG->dirroot.'/course/lib.php');
+    require_once($CFG->dirroot.'/mod/forum/lib.php');
 
     require_login();
 

diff --git a/calendar/preferences.php b/calendar/preferences.php
index 194f3f4b63296b8fe7c28bf28e88645436d6bf2c..5a134a3e74250f2e7f6db491226537551ca17cc1 100644 (file)
--- a/calendar/preferences.php
+++ b/calendar/preferences.php
@@ -1,9 +1,8 @@
 <?PHP  // $Id$
        // preferences.php - user prefs for calendar
 
-    require("../config.php");
-    require_once('lib.php');
-
+    require_once('../config.php');
+    require_once($CFG->dirroot.'/calendar/lib.php');
 
     if (isset($SESSION->cal_course_referer)) {
         if (! $course = get_record("course", "id", $SESSION->cal_course_referer)) {
@@ -17,7 +16,7 @@
 
 /// If data submitted, then process and store.
 
-       if ($form = data_submitted()) {  
+       if ($form = data_submitted()) {
         print_header();
         foreach ($form as $preference => $value) {
             switch ($preference) {

diff --git a/calendar/set.php b/calendar/set.php
index 78d40f5bd86be25213486af3430c55bfc0110a7c..470bd736396d956ca98e8c8a14690efae3d5f5f6 100644 (file)
--- a/calendar/set.php
+++ b/calendar/set.php
@@ -39,7 +39,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
     require_once('../config.php');
-    require_once('lib.php');
+    require_once($CFG->dirroot.'/calendar/lib.php');
 
     require_variable($_GET['from']);
     require_variable($_GET['var']);

diff --git a/calendar/view.php b/calendar/view.php
index eb6042c5867eff9b409cae546f98be8952eacb40..243eebdf3b5d8615b5b179bd75606821931c3719 100644 (file)
--- a/calendar/view.php
+++ b/calendar/view.php
@@ -41,8 +41,8 @@
 //  Display the calendar page.
 
     require_once('../config.php');
-    require_once('../course/lib.php');
-    require_once('lib.php');
+    require_once($CFG->dirroot.'/course/lib.php');
+    require_once($CFG->dirroot.'/calendar/lib.php');
 
     optional_variable($_GET['view'], 'upcoming');
     optional_variable($_GET['course'], 0);
@@ -117,7 +117,8 @@
     // but NOT for the "main page" course
     if($SESSION->cal_course_referer > 1 &&
       ($shortname = get_field('course', 'shortname', 'id', $SESSION->cal_course_referer)) !== false) {
-        // If we know about the referring course, show a return link
+        // If we know about the referring course, show a return link and ALSO require login!
+        require_login();
         $nav = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$SESSION->cal_course_referer.'">'.$shortname.'</a> -> '.$nav;
     }
 

diff --git a/course/view.php b/course/view.php
index c945d5431bdcb0f3420f98513d6e7bfc6ea6e0b4..029261194c927dee03c4f6c78fefbb2bb8c5a5df 100644 (file)
--- a/course/view.php
+++ b/course/view.php
@@ -2,9 +2,9 @@
 
 //  Display the course home page.
 
-    require_once("../config.php");
-    require_once("lib.php");
-    require_once("$CFG->libdir/blocklib.php");
+    require_once('../config.php');
+    require_once('lib.php');
+    require_once($CFG->libdir.'/blocklib.php');
 
     optional_variable($id);
     optional_variable($name);
@@ -25,7 +25,7 @@
 
     require_login($course->id);
 
-    require_once('../calendar/lib.php');    /// This is after login because it needs $USER
+    require_once($CFG->dirroot.'/calendar/lib.php');    /// This is after login because it needs $USER
 
     add_to_log($course->id, "course", "view", "view.php?id=$course->id", "$course->id");