From d994661015f9b87e5258efa0f521a0bb92b6d48d Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Tue, 5 Jul 2005 16:59:29 +0000
Subject: [PATCH] code cleanup - see SC#129

---
 auth/cas/forbidden.php | 12 +++++++++---
 auth/cas/lib.php       |  3 ++-
 auth/cas/login.php     |  4 ++--
 auth/cas/logout.php    |  9 +++++----
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/auth/cas/forbidden.php b/auth/cas/forbidden.php
index d2d4989ddb1..80a62e6b2f8 100644
--- a/auth/cas/forbidden.php
+++ b/auth/cas/forbidden.php
@@ -1,10 +1,16 @@
 <?php
 // version $Id$
 // Page for forbidden access from CAS
-    require_once("../../config.php");
+    require("../../config.php");
+
+    if (!$site = get_site()) {
+        error("No site found!");
+    }
+
+    $loginsite = get_string("loginsite");
     $errormsg = get_string("auth_cas_invalidcaslogin", "auth");
-    print_header("$site->fullname: $loginsite", "$site->fullname", $loginsite,
-    $focus, "", true, "<div align=right>$langmenu</div>");
+
+    print_header("$site->fullname: $loginsite", "$site->fullname", $loginsite);
     include("forbidden.html");
     print_footer();
     exit;
diff --git a/auth/cas/lib.php b/auth/cas/lib.php
index f4399fbde55..ff348ae0b68 100644
--- a/auth/cas/lib.php
+++ b/auth/cas/lib.php
@@ -1,5 +1,5 @@
 <?PHP
-// $Id: lib.php
+// $Id$
 // author: romuald Lorthioir
 //CHANGELOG:
 //16/03/2005 Use of LDAP Module
@@ -13,6 +13,7 @@ This Module is using the /auth/cas/index_form.html.
 This module is using the LDAP Module so you need the /auth/ldap directory.
 You can see /auth/ldap/lib.php for the other functions.
 */
+defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');
 
 define('AUTH_LDAP_NAME', 'cas'); // for ldap module
 require_once($CFG->dirroot.'/config.php');
diff --git a/auth/cas/login.php b/auth/cas/login.php
index 8f2aa8a38b3..ba86d7598b2 100644
--- a/auth/cas/login.php
+++ b/auth/cas/login.php
@@ -1,9 +1,9 @@
 <?php
-// $Id: login.php
+// $Id$
 // author: romualdLorthioir $
 //CHANGELOG:
 //05.03.2005 replace /login/index.php
-
+defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');
 
     //Define variables used in page
     if (!$site = get_site()) {
diff --git a/auth/cas/logout.php b/auth/cas/logout.php
index d8df052553c..210c19a35c5 100644
--- a/auth/cas/logout.php
+++ b/auth/cas/logout.php
@@ -1,7 +1,8 @@
-<?php
- // logout the user from CAS server (destroy the ticket)
-       global $CFG;
-       require_once($CFG->dirroot.'/config.php');
+<?php 
+// $Id$
+// logout the user from CAS server (destroy the ticket)
+defined('MOODLE_INTERNAL') or die('Direct access to this script is forbidden.');
+
        include_once($CFG->dirroot.'/lib/cas/CAS.php');
        phpCAS::client($CFG->cas_version,$CFG->cas_hostname,(Integer)$CFG->cas_port,$CFG->cas_baseuri);
        $backurl = $CFG->wwwroot;