[Mapbender-commits] r6890 - trunk/mapbender/core

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2010-09-03 14:53:02 +0000 (Fri, 03 Sep 2010)
New Revision: 6890

Modified:
   trunk/mapbender/core/globalSettings.php
   trunk/mapbender/core/system.php
Log:
session name (commented)

Modified: trunk/mapbender/core/globalSettings.php
===================================================================
--- trunk/mapbender/core/globalSettings.php	2010-09-03 14:52:21 UTC (rev 6889)
+++ trunk/mapbender/core/globalSettings.php	2010-09-03 14:53:02 UTC (rev 6890)
@@ -17,10 +17,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 ob_start();
-//
-// initiates the session-handling
-//
-session_start();
 
 //
 // constants
@@ -28,6 +24,13 @@
 require_once(dirname(__FILE__)."/../core/system.php");
 
 //
+// initiates the session-handling
+//
+if (defined("SESSION_NAME") && is_string(SESSION_NAME)) {
+//	session_name(SESSION_NAME);
+}
+session_start();
+//
 // Add FirePHP for debugging only, supply a global $firephp
 //
 if (defined("LOG_PHP_WITH_FIREPHP") && LOG_PHP_WITH_FIREPHP === "on") {

Modified: trunk/mapbender/core/system.php
===================================================================
--- trunk/mapbender/core/system.php	2010-09-03 14:52:21 UTC (rev 6889)
+++ trunk/mapbender/core/system.php	2010-09-03 14:53:02 UTC (rev 6890)
@@ -16,6 +16,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+
+//define("SESSION_NAME", "TRUNK_SESSID");
 #
 # mapbender version
 #
@@ -59,7 +61,7 @@
 	"dynamicOverview,FeatureInfoRedirect,highlightPOI,navFrame,sandclock," .
 	"scaleBar,scaleSelect,setBBOX,setPOI2Scale,reload,overview,addWMS," .
 	"repaint,changeEPSG,User,AdminTabs,GroupEditor,GuiEditor,UserEditor,".
-	"scalebar,addWMSfromTree,mousewheelZoom,doubleclickZoom," .
+	"scalebar,addWMSfromTree,mousewheelZoom,mapframe1_mousewheelZoom,doubleclickZoom," .
 	"overviewToggle,resizeMapsize,coordsLookup,selArea1,loadwmc,savewmc," . 
 	"resultList,mb_featureList_digitize,md_editor_container,md_editor_data," . 
 	"md_editor_navigation,md_editor_search_data,md_editor_result_data,metadata_create_data,".