From: iarenaza <iarenaza>
Date: Thu, 4 Jun 2009 22:24:13 +0000 (+0000)
Subject: ntlmsso login hook: MDL-18596 We need to call httpsrequired() before using httpswwwroot
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=265edb48f5239035cbc1e7ea91f2d049b99c7af1;p=moodle.git

ntlmsso login hook: MDL-18596 We need to call httpsrequired() before using httpswwwroot
Merged from MOODLE_19_STABLE
---

diff --git a/auth/ldap/auth.php b/auth/ldap/auth.php
index cd36ea6bd1..f2968dc105 100644
--- a/auth/ldap/auth.php
+++ b/auth/ldap/auth.php
@@ -1797,6 +1797,9 @@ class auth_plugin_ldap extends auth_plugin_base {
      */
     function loginpage_hook() {
         global $CFG, $SESSION;
+
+        // HTTPS is potentially required
+        httpsrequired();
  
         if (($_SERVER['REQUEST_METHOD'] === 'GET'         // Only on initial GET of loginpage
                 || ($_SERVER['REQUEST_METHOD'] === 'POST'