From d5aefa2b094887bb1866a9540db375df052d72d9 Mon Sep 17 00:00:00 2001
From: Dominique Fournier <dominique@fournier38.fr>
Date: Tue, 16 Sep 2014 11:42:02 +0000
Subject: [PATCH] authparams : take the informations from session with the
 right name ("domframework)

git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@1823 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
---
 authparams.php | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/authparams.php b/authparams.php
index f4b576b..c853dcd 100644
--- a/authparams.php
+++ b/authparams.php
@@ -6,6 +6,31 @@
 /** Takes the email and the password of the user */
 class authparams
 {
+  public $email = null;
+  public $password = null;
+
+  /** Parse the different authentication processes to found the email/password
+      of the user. 
+      If non is found, return "anonymous", "anonymous" */
+  public function __construct ($authprocesses=array("session","post"))
+  {
+    foreach ($authprocesses as $authprocess)
+    {
+      try
+      {
+        $res = $this->$authprocess();
+        $this->email = $res["email"];
+        $this->password = $res["password"];
+        break;
+      }
+      catch (Exception $e)
+      {
+        $this->email = "anonymous";
+        $this->password = "anonymous";
+      }
+    }
+  }
+
   /** Get informations from $POST variables */
   public function post()
   {
@@ -19,11 +44,11 @@ class authparams
   {
     if (!isset ($_SESSION))
       throw new Exception ("No session previously opened", 401);
-    if (!isset ($_SESSION["auth"]["email"]) ||
-        !isset ($_SESSION["auth"]["password"]))
+    if (!isset ($_SESSION["domframework"]["auth"]["email"]) ||
+        !isset ($_SESSION["domframework"]["auth"]["password"]))
       throw new Exception ("No previous email in session", 401);
-    return array ("email"=>$_SESSION["auth"]["email"],
-                  "password"=>$_SESSION["auth"]["email"]);
+    return array ("email"=>$_SESSION["domframework"]["auth"]["email"],
+                  "password"=>$_SESSION["domframework"]["auth"]["password"]);
   }
 
   /** Get informations from a HTTP authentication */
@@ -43,4 +68,5 @@ class authparams
                     "password"=>$_SERVER["PHP_AUTH_PW"]);
     }
   }
+
 }