From bd35194036c75209faf4b043a19717a7a9ce690c Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Tue, 20 Feb 2007 17:29:45 +0000
Subject: [PATCH] MDL-8590 auth cleanup - part 5

---
 mod/lams/constants.php | 2 +-
 mod/lams/lib.php       | 8 +++++---
 mod/lams/list.php      | 3 ++-
 mod/lams/userinfo.php  | 1 -
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/mod/lams/constants.php b/mod/lams/constants.php
index 7f18c506d4..dae5323f48 100644
--- a/mod/lams/constants.php
+++ b/mod/lams/constants.php
@@ -1,6 +1,6 @@
 <?php  /// LAMS constants
 
-unset($LAMSCONSTANTS);
+$LAMSCONSTANTS = new object();
 
 $LAMSCONSTANTS->login_request   = '/LoginRequest';
 $LAMSCONSTANTS->param_uid       = 'uid';
diff --git a/mod/lams/lib.php b/mod/lams/lib.php
index 8a9722f0d2..f96f32877a 100644
--- a/mod/lams/lib.php
+++ b/mod/lams/lib.php
@@ -1,9 +1,11 @@
 <?PHP  // $Id$
 
 /// Library of functions and constants for module lams
-include_once('../../config.php');
-require_once($CFG->dirroot.'/lib/datalib.php');
-require_once($CFG->dirroot.'/lib/moodlelib.php');
+
+if (!defined('MOODLE_INTERNAL')) {
+    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
+}
+
 require_once($CFG->dirroot.'/lib/soaplib.php');
 
 
diff --git a/mod/lams/list.php b/mod/lams/list.php
index fde3fdd0bd..09cfd6702b 100644
--- a/mod/lams/list.php
+++ b/mod/lams/list.php
@@ -2,7 +2,8 @@
 
 /// send LAMS learning deisgn list as a string seperated by ":" to client
 
-include_once("lib.php");
+require_once("../../config.php");
+require_once("lib.php");
 
 $result = lams_get_sequences($USER->username,$courseid);
 if(is_string($result)){//some exception happened!
diff --git a/mod/lams/userinfo.php b/mod/lams/userinfo.php
index 0db32cfd4b..2a34ed8566 100644
--- a/mod/lams/userinfo.php
+++ b/mod/lams/userinfo.php
@@ -13,7 +13,6 @@
  * serverId and serverKey
  */
   include_once("../../config.php");
-    include_once($CFG->dirroot.'/lib/datalib.php');
 
     if(!isset($CFG->lams_serverid)||!isset($CFG->lams_serverkey))
     {
-- 
2.39.5