[Mapbender-commits] r9498 - trunk/mapbender

svn_mapbender at osgeo.org svn_mapbender at osgeo.org
Fri May 27 01:42:51 PDT 2016


Author: armin11
Date: 2016-05-27 01:42:51 -0700 (Fri, 27 May 2016)
New Revision: 9498

Removed:
   trunk/mapbender/line.xml
   trunk/mapbender/mapbender.conf
Log:
Fix wrong commit

Deleted: trunk/mapbender/line.xml
===================================================================
--- trunk/mapbender/line.xml	2016-05-27 07:50:43 UTC (rev 9497)
+++ trunk/mapbender/line.xml	2016-05-27 08:42:51 UTC (rev 9498)
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kml xmlns="http://earth.google.com/kml/2.1">
- <Document>
-  <name>kml line</name>
-  <description>kml line test</description>
-  <Style id="style1">
-   <LineStyle>
-    <color>990000ff</color>
-    <width>4</width>
-   </LineStyle>
-  </Style>
-  <Placemark>
-   <name>Polyline 1</name>
-   <description>test1</description>
-   <styleUrl>#style1</styleUrl>
-   <LineString>
-    <altitudeMode>relative</altitudeMode>
-    <coordinates>
-6.9528,50.9431 6.9533,50.9399 6.9531,50.9378 6.9527,50.9359 6.9531,50.9336 6.9545,50.9314
-   </coordinates>
-   </LineString>
-  </Placemark>
-  <Style id="style2">
-   <LineStyle>
-    <color>990000ff</color>
-    <width>4</width>
-   </LineStyle>
-  </Style>
-  <Placemark>
-   <name>Polyline 2</name>
-   <description>test2</description>
-   <styleUrl>#style2</styleUrl>
-   <LineString>
-    <altitudeMode>relative</altitudeMode>
-    <coordinates>
-6.9624,50.9402 6.9630,50.9376 6.9634,50.9354 6.9634,50.9333 6.9628,50.9303
-   </coordinates>
-   </LineString>
-  </Placemark>
-  <Style id="style3">
-   <LineStyle>
-    <color>990000ff</color>
-    <width>4</width>
-   </LineStyle>
-  </Style>
-  <Placemark>
-   <name>Polyline 3</name>
-   <description>test 3</description>
-   <styleUrl>#style3</styleUrl>
-   <LineString>
-    <altitudeMode>relative</altitudeMode>
-    <coordinates>
-6.9540,50.9351 6.9572,50.9350 6.9601,50.9358 6.9627,50.9361
-   </coordinates>
-   </LineString>
-  </Placemark>
- </Document>
-</kml>

Deleted: trunk/mapbender/mapbender.conf
===================================================================
--- trunk/mapbender/mapbender.conf	2016-05-27 07:50:43 UTC (rev 9497)
+++ trunk/mapbender/mapbender.conf	2016-05-27 08:42:51 UTC (rev 9498)
@@ -1,349 +0,0 @@
-<?php
-# $Id: mapbender.conf-dist 6540 2010-07-03 16:47:38Z christoph $
-# http://www.mapbender.org/index.php/Mapbender.conf
-# Copyright (C) 2002 CCGIS 
- 
-# --------------------------------------------
-# type of mapbender database
-# --------------------------------------------
-
-
-define("SYS_DBTYPE", "pgsql");
-
-# --------------------------------------------
-# database information
-# --------------------------------------------
-
-define("DBSERVER", "localhost");
-define("PORT", "5433");
-define("DB", "geoportal");
-define("OWNER", "postgres");
-define("PW", "postgres");
-
-# --------------------------------------------
-# prepared statements (PHP > 5.1.x, PostgreSQL > 7.4)
-# --------------------------------------------
-define("PREPAREDSTATEMENTS",true);
-
-# --------------------------------------------
-# encoding - default characterset UTF-8 / ISO-8859-1
-# --------------------------------------------
-define("CHARSET","UTF-8");
-
-# --------------------------------------------
-# error_reporting
-# --------------------------------------------
-
-//ini_set('error_reporting', 'E_ALL & ~ E_NOTICE');
-
-# --------------------------------------------
-# directory for temporary files
-# --------------------------------------------
-
-define("TMPDIR", "../tmp");
-
-# --------------------------------------------
-# directory for log files
-# --------------------------------------------
-define("LOG_DIR", dirname(__FILE__) . "/../log/");
-
-# --------------------------------------------
-# URL to login
-# --------------------------------------------
-
-#define("LOGIN", "http://".$_SERVER['HTTP_HOST']."/mapbender/frames/login.php");
-define("LOGIN", "http://".$_SERVER['HTTP_HOST']."/portal/anmelden.html");
-
-if (isset($_SERVER['HTTP_HOST']) && $_SERVER['HTTP_HOST'] != '') {
-
-	define("LOGIN", "http://".$_SERVER['HTTP_HOST']."/portal/anmelden.html");
-
-} else {
-	define("LOGIN", "http://10.176.178.10/portal/anmelden.html");
-}
-define("MAXLOGIN", 3);
-$login = LOGIN;
-
-# --------------------------------------------
-# mapbender web path
-# --------------------------------------------
-define("MAPBENDER_PATH", "http://10.176.178.10/mapbender");
-
-# --------------------------------------------
-# URL to owsproxy
-# (no terminating slash)
-# --------------------------------------------
-
-define("OWSPROXY", "http://".$_SERVER['HTTP_HOST'].":80"."/owsproxy");
-
-define("OWSPROXY_USE_LOCALHOST", true);
-
-# Allow OWSPROXY to serve services which are available to the public user - a new session will be set
-
-define("OWSPROXY_ALLOW_PUBLIC_USER", true);
-# Bind the owsproxy to the ip address of the session for which it was invoked. Makes the proxy more secure. The dynamiccaly build url can only be used on one computer - beware of NAT rules ;-). The IP has to be written into the session.
-
-define("OWSPROXY_BIND_IP", false);
-
-# Allow the use of an existing session for other calling applications. The url will be used to identify an existing session and the application will use this identity! Beware of security problems if the url is given to an other user. This one may alter the original identity! For security reasons set this value to false. 
-
-define("OWSPROXY_ALLOW_SESSION_GRABBING", true);
-
-define("OWSPROXY_SESSION_GRABBING_WHITELIST", "localhost,127.0.0.1");
-# LIMIT for count of rows, that maybe exported at once from owsproxy_log module
-define("OWS_LOG_EXPORT_LIMIT_CSV", 1000);
-define("OWS_LOG_EXPORT_LIMIT", 1000);
-# --------------------------------------------
-# Definitions for HTTP Authentication
-# --------------------------------------------
-
-define('REALM', 'mapbender_registry');
-define('NONCEKEY', 'geoportal');
-$nonceLife = 300; 
-define('HTTP_AUTH_PROXY',"http://".$_SERVER['HTTP_HOST']."/http_auth"); //Problem - behind a rewrite rule - define it hardcoded?
-
-# --------------------------------------------
-# type of server-connection
-# curl, socket, http
-# --------------------------------------------
-
-define("CONNECTION", "curl");
-#define("CONNECTION", "http");
-#define("CONNECTION", "socket");
-
-define("CONNECTION_PROXY", "10.176.179.65"); // ip
-define("CONNECTION_PORT", "3128"); // port
-#define("CONNECTION_PROXY", ""); // ip
-#define("CONNECTION_PORT", ""); // port
-
-
-define("CONNECTION_USER", ""); // user
-define("CONNECTION_PASSWORD", ""); // password
-define("CONNECTION_USERAGENT", "");
-
-# --------------------------------------------
-# HOSTs not for Proxy (curl)
-# --------------------------------------------
-define("NOT_PROXY_HOSTS", "localhost,127.0.0.1");
-
-# --------------------------------------------
-# security: path to modules
-# --------------------------------------------
-
-define("CHECK", false);
-
-# --------------------------------------------
-# enable/disable portal
-# --------------------------------------------
-
-define("PORTAL", false);
-
-# --------------------------------------------
-# enable/disable ows metadata overwrite
-# If set to false, the edited metadata of the ows will not
-# automatically exchanged with the metadata from the server,
-# when updating the service. It has to be done with help of
-# the metadata editor afterwards
-# --------------------------------------------
-
-define("MD_OVERWRITE", false);
-
-# --------------------------------------------
-# mail settings for internal mapbender mails 
-# smtp mailing
-# for further settings check 'class_administration.php'
-# please check phpmailer for more information
-# --------------------------------------------
-
-define("USE_PHP_MAILING", "true");
-define("MAILHOST", "localhost");
-define("MAILUSERNAME", "");
-define("MAILPASSWORD", "");
-define("MAILADMIN", "gdi-hessen-geoportal at hvbg.hessen.de");
-define("MAILADMINNAME", "Geoportal-Hessen");
-
-$mailHost = MAILHOST;
-$mailUsername =  MAILUSERNAME;
-$mailPassword =  MAILPASSWORD;
- 
-# --------------------------------------------
-# wms monitoring
-# --------------------------------------------
-
-define("AUTO_UPDATE", "0");
-define("TIME_LIMIT", "10");
-define("PHP_PATH", "/usr/bin/");
-
-# --------------------------------------------
-# Mapbender error logging
-# --------------------------------------------
-
-define("LOG_LEVEL", "notice"); //"off","error","warning","notice" or "all"
-define("LOG_JS", "off"); // "on", "alert", "console" or "off"
-
-
-# --------------------------------------------
-# Internationalization
-# --------------------------------------------
-
-define("USE_I18N", true);  // requires gettext for PHP. 
-							// If "false", LANGUAGE is set to english
-define("LANGUAGE", "de");   // only available if USE_I18N is "true". 
-							// "en", "de", "bg", "gr", "nl", "hu", "it", "es","fr","pt"
-
-# --------------------------------------------
-# Notify subscribers and gui owners by email
-# Mapbender 2.7.4+
-# If set to true, all owners of guis where an updated service is used are notified about the update process.
-# If a layername changed, this information will be part of the mail too!! It enables an external user to actualize the
-# service configuration of his gis client (e.g. reload capabilities).
-# --------------------------------------------
-define("NOTIFY_ON_UPDATE",true);
-
-# --------------------------------------------
-# RSS
-# --------------------------------------------
-define("GEO_RSS_FILE", "../geoportal/news/georss.xml");
-
-
-#TWITTER DB UPDATES
-define("TWITTER_NEWS",false);
-#---------------------------------------------
-
-#TWITTER METADATA
-#---------------------------------------------
-
-define("TWITTER_METADATA",false);
-
-#---------------------------------------------
-# ANONYMOUS 
-#---------------------------------------------
-define("ANONYMOUS_USER", 2);
-define("ANONYMOUS_GROUP", 37);
-
-define("REGISTRATING_GROUP",36);
-
-#---------------------------------------------
-# PREVIEW
-#---------------------------------------------
-define("PREVIEW_DIR", "../geoportal/preview");
-
-#---------------------------------------------
-# METADATA
-# This path is defined to allow a saving of iso19139 xml files which are generated by mapbender and metador
-# The folder should be owned by the webserver user to allow writing of files which are generated from a php 
-# script. The content of the folder may be harvested 
-#---------------------------------------------
-define("METADATA_DIR", "../../metadata");
-
-#---------------------------------------------
-# METADATA CODESPACE
-#---------------------------------------------
-# This path is used as a default codespace of metadatasets which are administrated thru the simple mapbender layer metadata editor
-#---------------------------------------------
-define("METADATA_DEFAULT_CODESPACE", "http://www.geoportal.hessen.de");
-
-#---------------------------------------------
-# External Validator
-#---------------------------------------------
-# This is an absolute URL to an external validation service
-#---------------------------------------------
-define("INSPIRE_VALIDATOR_URL", "http://inspire-geoportal.ec.europa.eu/GeoportalProxyWebServices/resources/INSPIREResourceTester");
-
-# --------------------------------------------
-#INSPIRE Category, this is an ID of a mapbender custom_category which is used to identify inspire datasets - done so in germany
-# --------------------------------------------
-define("INSPIRE_CUSTOM_CAT_ID", "11");
-
-# --------------------------------------------
-# UPLOAD
-# --------------------------------------------
-
-define("UPLOAD_DIR", "../tmp");
-define("UPLOAD_WHITELIST_FILE_TYPES", "xml");
-define("UPLOAD_BLACKLIST_FILE_TYPES", "");
-define("UPLOAD_MAX_SIZE_KB", 2048);
-
-
-# --------------------------------------------
-# use jQuery from Google CDN
-# --------------------------------------------
-define("LOAD_JQUERY_FROM_GOOGLE", false);
-#---------------------------------------------
-
-# HOSTNAME WHITELIST
-
-# The whitelist is used for some modules who generate urls from a given hostName GET parameter. In such a case it is usefull to give a whitelist for security reasons! If no hostName is given, the parameter $_SERVER['HTTP_HOST'] is used for the urls!
-
-# Activate APC variable cache if wished and installed
-# class_map.php, frames/index.php, class_gui 
-#
-define("MAPBENDER_VARIABLE_CACHE", true);
-define("MAPBENDER_CACHE_TYPE", "apc");
-#define("MAPBENDER_VARIABLE_CACHE", false);
-#define("MAPBENDER_CACHE_TYPE", "apc");
-
-# define memcached server connections, if memcached ist used for session storing
-# lib/class_Mapbender_session.php
-#
-define("MEMCACHED_IP", "localhost");
-define("MEMCACHED_PORT", "11211");
-
-#---------------------------------------------
-
-define("HOSTNAME_WHITELIST", "10.176.178.10,localhost");
-
-#---------------------------------------------
-
-# CORS PROXY ORIGIN WHITELIST
-
-# The whitelist is used for CORS Proxy which is able to proxy GetMap REQUEST for OpenData classified WMS resources! The Origin part of the http header is read and the Access-Control-Allow-Origin for the GetMap results is set to this value! If more than one host is given please use space as separator
-
-#---------------------------------------------
-
-define("CORS_WHITELIST", "http://localhost http://127.0.0.1 http://localhost:5984 http://localhost:8099 http://localhost:8090 http://127.0.0.1:5984 http://127.0.0.1:8090 http://127.0.0.1:8099");
-
-# --------------------------------------------
-
-# --------------------------------------------
-
-# Calculate bboxes for all supported SRS (Postgis needed)
-
-# This module will compute bboxes for all srs which will be found in the service capabilities and which are defined
-
-# in the array below. Normaly mapbender only uses bbox's which are given thru the service caps. In many use cases it is
-
-# needfull to have more than one bbox given (e.g. metadata). The array is defined to supress the calculation of to many 
-
-# srs like e.g. geoserver offers. The array should include all the srs which are used in the mapbender installation and 
-
-# which are usefull for the special community for which the installation was done (local-sdi, INSPIRE, ...) 
-
-# --------------------------------------------
-
-define("SRS_ARRAY", "4326,31467,25832,4258,4839");
-# --------------------------------------------
-# define a public user
-# --------------------------------------------
-define("PUBLIC_USER", "2");
-
-# --------------------------------------------
-# define a wrapper for index.php to use get api when integrated in external applications like cms
-# --------------------------------------------
-define("WRAPPER_PATH","/portal/karten.html");
-
-# --------------------------------------------
-# user autocomplete
-# --------------------------------------------
-define('SEARCH_LIMIT', 50);
-define('SEARCH_COLUMN1', 'mb_user_name');
-define('SEARCH_COLUMN2', 'mb_user_email');
-
-###HACK for GLOBALS
-$DBSERVER=DBSERVER;
-  $DB=DB;
-  $OWNER=OWNER;
-  $PW=PW;
-  
-
-?>



More information about the Mapbender_commits mailing list