auth/cas MDL-23371 Add missing detection of PHP LDAP module like we d…

…o in auth/ldap
sehaj-sk · Jul 25, 2010 · 840fcf0 · 840fcf0
1 parent fe3b9da
commit 840fcf0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/auth/cas/auth.php b/auth/cas/auth.php
@@ -188,6 +188,20 @@ function connectCAS() {
     function config_form($config, $err, $user_fields) {
         global $CFG, $OUTPUT;
 
+        if (!function_exists('ldap_connect')) { // Is php-ldap really there?
+            echo $OUTPUT->notification(get_string('auth_ldap_noextension', 'auth_ldap'));
+
+            // Don't return here, like we do in auth/ldap. We cas use CAS without LDAP.
+            // So just warn the user (done above) and define the LDAP constants we use
+            // in config.html, to silence the warnings.
+            if (!defined('LDAP_DEREF_NEVER')) {
+                define ('LDAP_DEREF_NEVER', 0);
+            }
+            if (!defined('LDAP_DEREF_ALWAYS')) {
+            define ('LDAP_DEREF_ALWAYS', 3);
+            }
+        }
+
         include($CFG->dirroot.'/auth/cas/config.html');
     }
 

diff --git a/auth/cas/config.html b/auth/cas/config.html
@@ -80,10 +80,6 @@
 
 $yesno = array( get_string('no'), get_string('yes') );
 
-if (!function_exists('ldap_connect')) { // Is php-ldap really there?
-    echo $OUTPUT->notification(get_string('auth_ldap_noextension', 'auth_ldap'));
-}
-
 ?>
 <table cellspacing="0" cellpadding="5" border="0">
 <tr>