[Mapbender-commits] r4759 - branches/print_dev/conf

[svn_mapbender at osgeo.org]

Author: mschulz
Date: 2009-09-28 09:02:59 -0400 (Mon, 28 Sep 2009)
New Revision: 4759

Modified:
   branches/print_dev/conf/mapbender.conf-dist
   branches/print_dev/conf/session.conf
Log:
merged from trunk

Modified: branches/print_dev/conf/mapbender.conf-dist
===================================================================
--- branches/print_dev/conf/mapbender.conf-dist	2009-09-28 11:48:05 UTC (rev 4758)
+++ branches/print_dev/conf/mapbender.conf-dist	2009-09-28 13:02:59 UTC (rev 4759)
@@ -80,6 +80,15 @@
 define("OWSPROXY", "http://<ip or name>/owsproxy");
 
 # --------------------------------------------
+# Definitions for HTTP Authentication
+# --------------------------------------------
+
+define('REALM', 'mapbender_registry');
+define('NONCEKEY', 'mapbender');
+$nonceLife = 300; 
+define('HTTP_AUTH_PROXY',"https://".$_SERVER['HTTP_HOST']."/http_auth"); //Problem - behind a rewrite rule - define it hardcoded?
+
+# --------------------------------------------
 # type of server-connection
 # curl, socket, http
 # --------------------------------------------
@@ -88,10 +97,11 @@
 define("CONNECTION", "http");
 #define("CONNECTION", "socket");
 
-define("CONNECTION_PROXY", "<ip>");
-define("CONNECTION_PORT", "<port>");
-define("CONNECTION_USER", "<user>");
-define("CONNECTION_PASSWORD", "<password>");
+define("CONNECTION_PROXY", ""); // ip
+define("CONNECTION_PORT", ""); // port
+define("CONNECTION_USER", ""); // user
+define("CONNECTION_PASSWORD", ""); // password
+define("CONNECTION_USERAGENT", "Mapbender");
 
 # --------------------------------------------
 # HOSTs not for Proxy (curl)
@@ -152,6 +162,12 @@
 define("LANGUAGE", "en");   // only available if USE_I18N is "true". 
 							// "en", "de", "bg", "gr", "nl", "hu", "it", "es","fr","pt"
 
+# --------------------------------------------
+# RSS
+# --------------------------------------------
+define("GEO_RSS_FILE", "../tmp/georss.xml");
+
+
 ###HACK for GLOBALS
 $DBSERVER=DBSERVER;
   $DB=DB;

Modified: branches/print_dev/conf/session.conf
===================================================================
--- branches/print_dev/conf/session.conf	2009-09-28 11:48:05 UTC (rev 4758)
+++ branches/print_dev/conf/session.conf	2009-09-28 13:02:59 UTC (rev 4759)
@@ -8,6 +8,9 @@
 Mapbender::session()->set("mb_user_name",$name);
 Mapbender::session()->set("mb_user_ip",$_SERVER['REMOTE_ADDR']);
 Mapbender::session()->set("mb_myBBOX",$_REQUEST["mb_myBBOX"]);
+Mapbender::session()->set("mb_myBBOXEpsg",$_REQUEST["mb_myBBOXEpsg"]);
+Mapbender::session()->set("mb_myBBOXEpsg_transform",$_REQUEST["mb_myBBOXEpsg_transform"]);
+
 Mapbender::session()->set("mb_myKml",$_REQUEST["kml_id"]);
 Mapbender::session()->set("mb_myPOI",$_REQUEST["mb_myPOI"]);
 Mapbender::session()->set("mb_myPOI2SCALE",$_REQUEST["mb_myPOI2SCALE"]);
@@ -22,6 +25,8 @@
 }
 Mapbender::session()->set("wms",$arr_wms);
 unset($i);
+Mapbender::session()->set("addwms_showWMS", $_REQUEST["addwms_showWMS"]);
+Mapbender::session()->set("addwms_zoomToExtent", $_REQUEST["addwms_zoomToExtent"]);
 
 Mapbender::session()->set("mb_myWmc","");
 Mapbender::session()->set("mb_myWmc_action","");