[Mapbender-commits] r5914 - branches/3_dev/conf

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2010-04-11 07:26:11 -0400 (Sun, 11 Apr 2010)
New Revision: 5914

Modified:
   branches/3_dev/conf/session.conf
Log:
login and portal site will be applications as well

login is now handled in http/frames/index.php

Modified: branches/3_dev/conf/session.conf
===================================================================
--- branches/3_dev/conf/session.conf	2010-04-11 11:07:54 UTC (rev 5913)
+++ branches/3_dev/conf/session.conf	2010-04-11 11:26:11 UTC (rev 5914)
@@ -8,7 +8,12 @@
 require_once(dirname(__FILE__)."/../core/lib/class_Session.php");
 
 Mapbender::session()->set("mb_user_password",$password);
-Mapbender::session()->set("mb_user_id",$row["mb_user_id"]);   
+if (isset($user) && !is_null($user)) {
+	Mapbender::session()->set("mb_user_id", $user->id);   
+}
+else {
+	Mapbender::session()->set("mb_user_id",$row["mb_user_id"]);   
+}
 Mapbender::session()->set("mb_user_name",$name);
 Mapbender::session()->set("mb_user_ip",$_SERVER['REMOTE_ADDR']);
 Mapbender::session()->set("mb_myBBOX",$_GET["mb_myBBOX"]);