From 06cd1f4c78c37ebdde4f12bfb16f1830c9a450ec Mon Sep 17 00:00:00 2001
From: Benjamin Renard <brenard@easter-eggs.com>
Date: Wed, 10 Mar 2010 17:07:18 +0100
Subject: [PATCH] LSsession : added loadLSauth() method and used this method to
 load LSauth class and configuration.

---
 .../includes/class/class.LSsession.php        | 36 +++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/public_html/includes/class/class.LSsession.php b/public_html/includes/class/class.LSsession.php
index 20793dd4..168196e5 100644
--- a/public_html/includes/class/class.LSsession.php
+++ b/public_html/includes/class/class.LSsession.php
@@ -284,6 +284,33 @@ class LSsession {
     return;
   }
 
+ /**
+  * Chargement d'une classe d'authentification d'LdapSaisie
+  *
+  * @param[in] $auth Nom de la classe d'authentification a charger (Exemple : HTTP)
+  *
+  * @author Benjamin Renard <brenard@easter-eggs.com
+  * 
+  * @retval boolean true si le chargement a reussi, false sinon.
+  */
+  public static function loadLSauth($auth=false) {
+    if (self :: loadLSclass('LSauth')) {
+      if ($auth) {
+        if(self :: includeFile(LS_CLASS_DIR .'class.LSauth'.$auth.'.php')) {
+          self :: includeFile(LS_CONF_DIR."LSauth/config.LSauth".$auth.".php");
+          return true;
+        }
+      }
+      else {
+        return true;
+      } 
+    }
+    else {
+      LSerror :: addErrorCode('LSsession_05','LSauth');
+    }
+    return;
+  }
+
  /**
   * Chargement des addons LdapSaisie
   *
@@ -553,11 +580,11 @@ class LSsession {
                                    );
         }
         else {
-          if (self :: loadLSclass('LSauth')) {
+          if (self :: loadLSauth()) {
             if (isset(self :: $ldapServer['LSauth']['method'])) {
               $LSauthClass = 'LSauth'.self :: $ldapServer['LSauth']['method'];
-              if (!self :: loadLSclass($LSauthClass)) {
-                LSerror :: addErrorCode('LSsession_08',$LSauthClass);
+              if (!self :: loadLSauth(self :: $ldapServer['LSauth']['method'])) {
+                LSerror :: addErrorCode('LSsession_08',self :: $ldapServer['LSauth']['method']);
                 $LSauthClass = 'LSauth';
               }
             }
@@ -582,9 +609,6 @@ class LSsession {
               }
             }
           }
-          else {
-            LSerror :: addErrorCode('LSsession_05','LSauth');
-          }
         }
       }
       else {