[Mapbender-commits] r2655 - in branches/2.5/http: classes tools
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Fri Jul 11 11:16:21 EDT 2008
Author: christoph
Date: 2008-07-11 11:16:21 -0400 (Fri, 11 Jul 2008)
New Revision: 2655
Modified:
branches/2.5/http/classes/class_SaveLegend.php
branches/2.5/http/classes/class_administration.php
branches/2.5/http/classes/class_bbox.php
branches/2.5/http/classes/class_checkInput.php
branches/2.5/http/classes/class_connector.php
branches/2.5/http/classes/class_gml2.php
branches/2.5/http/classes/class_gui.php
branches/2.5/http/classes/class_json.php
branches/2.5/http/classes/class_keyword.php
branches/2.5/http/classes/class_kml.php
branches/2.5/http/classes/class_kml_geometry.php
branches/2.5/http/classes/class_kml_line.php
branches/2.5/http/classes/class_kml_linearring.php
branches/2.5/http/classes/class_kml_multigeometry.php
branches/2.5/http/classes/class_kml_ows.php
branches/2.5/http/classes/class_kml_parser_ows.php
branches/2.5/http/classes/class_kml_placemark.php
branches/2.5/http/classes/class_kml_point.php
branches/2.5/http/classes/class_kml_polygon.php
branches/2.5/http/classes/class_layer_monitor.php
branches/2.5/http/classes/class_locale.php
branches/2.5/http/classes/class_log.php
branches/2.5/http/classes/class_metadata.php
branches/2.5/http/classes/class_monitor.php
branches/2.5/http/classes/class_point.php
branches/2.5/http/classes/class_user.php
branches/2.5/http/classes/class_weldMaps2Image.php
branches/2.5/http/classes/class_weldMaps2PNG.php
branches/2.5/http/classes/class_wfs.php
branches/2.5/http/classes/class_wfs_conf.php
branches/2.5/http/classes/class_wmc.php
branches/2.5/http/classes/class_wms.php
branches/2.5/http/tools/mapbender_setup.php
Log:
bug fix...missing globalSettings.php
Modified: branches/2.5/http/classes/class_SaveLegend.php
===================================================================
--- branches/2.5/http/classes/class_SaveLegend.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_SaveLegend.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -22,8 +22,9 @@
* getlegendurl
*
**/
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
+
require_once(dirname(__FILE__)."/class_stripRequest.php");
-require_once(dirname(__FILE__)."/class_mb_exception.php");
require_once(dirname(__FILE__)."/class_connector.php");
class SaveLegend{
Modified: branches/2.5/http/classes/class_administration.php
===================================================================
--- branches/2.5/http/classes/class_administration.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_administration.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -16,11 +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.
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-require_once(dirname(__FILE__)."/class_mb_exception.php");
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
require_once(dirname(__FILE__)."/class_user.php");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
require(dirname(__FILE__) . "/phpmailer-1.72/class.phpmailer.php");
Modified: branches/2.5/http/classes/class_bbox.php
===================================================================
--- branches/2.5/http/classes/class_bbox.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_bbox.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -17,10 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
/**
* A bounding box consisting of an lower left and an upper right point, and an EPSG.
Modified: branches/2.5/http/classes/class_checkInput.php
===================================================================
--- branches/2.5/http/classes/class_checkInput.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_checkInput.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -17,6 +17,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
+
class checkInput{
var $v;
function checkInput($q,$v,$t){
Modified: branches/2.5/http/classes/class_connector.php
===================================================================
--- branches/2.5/http/classes/class_connector.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_connector.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -17,11 +17,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
-mb_internal_encoding("UTF-8");
-
/**
* Establishes a connection to a given URL (and loads the content).
* Supports HTTP (GET and POST), cURL and socket connections.
Modified: branches/2.5/http/classes/class_gml2.php
===================================================================
--- branches/2.5/http/classes/class_gml2.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_gml2.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -16,10 +16,11 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
+
require_once(dirname(__FILE__)."/../classes/class_connector.php");
require_once(dirname(__FILE__)."/../classes/class_json.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+
class gml2 {
var $geomtype_point = 'Point';
var $geomtype_polygon = 'Polygon';
Modified: branches/2.5/http/classes/class_gui.php
===================================================================
--- branches/2.5/http/classes/class_gui.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_gui.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -17,11 +17,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-
/**
* GUI is a set of GUI elements and services.
*/
Modified: branches/2.5/http/classes/class_json.php
===================================================================
--- branches/2.5/http/classes/class_json.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_json.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -17,11 +17,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-mb_internal_encoding("UTF-8");
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
-
define("JSON_PEAR", "json_pear");
define("JSON_NATIVE", "json_native");
Modified: branches/2.5/http/classes/class_keyword.php
===================================================================
--- branches/2.5/http/classes/class_keyword.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_keyword.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -16,9 +16,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-include_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
/**
* class to handle keywords for services
Modified: branches/2.5/http/classes/class_kml.php
===================================================================
--- branches/2.5/http/classes/class_kml.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_kml.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
class kml {
Modified: branches/2.5/http/classes/class_kml_geometry.php
===================================================================
--- branches/2.5/http/classes/class_kml_geometry.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_kml_geometry.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -17,7 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
require_once(dirname(__FILE__)."/../classes/class_kml_polygon.php");
require_once(dirname(__FILE__)."/../classes/class_kml_linearring.php");
Modified: branches/2.5/http/classes/class_kml_line.php
===================================================================
--- branches/2.5/http/classes/class_kml_line.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_kml_line.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -17,7 +17,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
+
require_once(dirname(__FILE__)."/../classes/class_point.php");
require_once(dirname(__FILE__)."/../classes/class_kml_geometry.php");
Modified: branches/2.5/http/classes/class_kml_linearring.php
===================================================================
--- branches/2.5/http/classes/class_kml_linearring.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_kml_linearring.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -17,7 +17,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
+
require_once(dirname(__FILE__)."/../classes/class_kml_line.php");
/**
Modified: branches/2.5/http/classes/class_kml_multigeometry.php
===================================================================
--- branches/2.5/http/classes/class_kml_multigeometry.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_kml_multigeometry.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -17,7 +17,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
+
require_once(dirname(__FILE__)."/../classes/class_kml_geometry.php");
/**
Modified: branches/2.5/http/classes/class_kml_ows.php
===================================================================
--- branches/2.5/http/classes/class_kml_ows.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_kml_ows.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -17,12 +17,9 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-session_start();
-mb_internal_encoding("UTF-8");
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
require_once(dirname(__FILE__)."/../classes/class_json.php");
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
require_once(dirname(__FILE__)."/../classes/class_point.php");
require_once(dirname(__FILE__)."/../classes/class_kml_geometry.php");
Modified: branches/2.5/http/classes/class_kml_parser_ows.php
===================================================================
--- branches/2.5/http/classes/class_kml_parser_ows.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_kml_parser_ows.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -17,8 +17,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
require_once(dirname(__FILE__)."/../classes/class_json.php");
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
require_once(dirname(__FILE__)."/../classes/class_point.php");
require_once(dirname(__FILE__)."/../classes/class_kml_polygon.php");
require_once(dirname(__FILE__)."/../classes/class_kml_linearring.php");
Modified: branches/2.5/http/classes/class_kml_placemark.php
===================================================================
--- branches/2.5/http/classes/class_kml_placemark.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_kml_placemark.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -17,7 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
/**
* A Placemark consists of a geometry of type {@link KMLPoint}, {@link KMLPolygon},
Modified: branches/2.5/http/classes/class_kml_point.php
===================================================================
--- branches/2.5/http/classes/class_kml_point.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_kml_point.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -19,7 +19,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
require_once(dirname(__FILE__)."/../classes/class_kml_geometry.php");
/**
Modified: branches/2.5/http/classes/class_kml_polygon.php
===================================================================
--- branches/2.5/http/classes/class_kml_polygon.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_kml_polygon.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
require_once(dirname(__FILE__)."/../classes/class_kml_geometry.php");
require_once(dirname(__FILE__)."/../classes/class_kml_linearring.php");
Modified: branches/2.5/http/classes/class_layer_monitor.php
===================================================================
--- branches/2.5/http/classes/class_layer_monitor.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_layer_monitor.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -17,6 +17,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
+
class Layer_load_count {
function __construct () {
Modified: branches/2.5/http/classes/class_locale.php
===================================================================
--- branches/2.5/http/classes/class_locale.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_locale.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -17,8 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-include_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
/**
* sets the locale, depending on various settings:
Modified: branches/2.5/http/classes/class_log.php
===================================================================
--- branches/2.5/http/classes/class_log.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_log.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -22,6 +22,7 @@
* [15/Jul/2004: 10:00:08 +0200] 192.168.2.102 urldecode(username) userid
*modul "GET /map/http/ HTTP/1.1"
*/
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
class log {
var $dir = "../../log/";
Modified: branches/2.5/http/classes/class_metadata.php
===================================================================
--- branches/2.5/http/classes/class_metadata.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_metadata.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -16,14 +16,9 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
require_once(dirname(__FILE__)."/class_administration.php");
-require_once(dirname(__FILE__)."/class_mb_exception.php");
-include_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
-
/**
* class to handle keywords for services
*/
Modified: branches/2.5/http/classes/class_monitor.php
===================================================================
--- branches/2.5/http/classes/class_monitor.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_monitor.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -17,9 +17,10 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
+
require_once(dirname(__FILE__)."/../classes/class_wms.php");
require_once(dirname(__FILE__)."/../classes/class_bbox.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
define("MONITOR_DEFAULT_SCALE", 500000);
define("MONITOR_IMG_WIDTH", 20);
Modified: branches/2.5/http/classes/class_point.php
===================================================================
--- branches/2.5/http/classes/class_point.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_point.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -17,10 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
/**
* A Mapbender_point is a 2-dimensional point with an EPSG.
Modified: branches/2.5/http/classes/class_user.php
===================================================================
--- branches/2.5/http/classes/class_user.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_user.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -17,7 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
/**
* A Mapbender user as described in the table mb_user.
Modified: branches/2.5/http/classes/class_weldMaps2Image.php
===================================================================
--- branches/2.5/http/classes/class_weldMaps2Image.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_weldMaps2Image.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -17,10 +17,9 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
require_once(dirname(__FILE__)."/class_stripRequest.php");
-require_once(dirname(__FILE__)."/class_mb_exception.php");
require_once(dirname(__FILE__)."/class_connector.php");
-include_once(dirname(__FILE__)."/../../conf/mapbender.conf");
/*
* Class generats Images (jpegs/pngs/geotiff)
Modified: branches/2.5/http/classes/class_weldMaps2PNG.php
===================================================================
--- branches/2.5/http/classes/class_weldMaps2PNG.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_weldMaps2PNG.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -23,10 +23,9 @@
* get/post '___' separated maprequests
*
**/
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
require_once(dirname(__FILE__)."/class_stripRequest.php");
-require_once(dirname(__FILE__)."/class_mb_exception.php");
require_once(dirname(__FILE__)."/class_connector.php");
-include_once(dirname(__FILE__)."/../../conf/mapbender.conf");
class weldMaps2PNG{
Modified: branches/2.5/http/classes/class_wfs.php
===================================================================
--- branches/2.5/http/classes/class_wfs.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_wfs.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -21,9 +21,8 @@
* class for wfs-objects
*/
-include_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
require_once(dirname(__FILE__)."/class_connector.php");
-require_once(dirname(__FILE__)."/class_mb_exception.php");
require_once(dirname(__FILE__)."/class_administration.php");
class wfs {
Modified: branches/2.5/http/classes/class_wfs_conf.php
===================================================================
--- branches/2.5/http/classes/class_wfs_conf.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_wfs_conf.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -17,9 +17,9 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__)."/class_mb_exception.php");
-require_once(dirname(__FILE__)."/class_user.php");
-require_once(dirname(__FILE__)."/class_administration.php");
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
+require_once(dirname(__FILE__)."/../classes/class_user.php");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
require_once(dirname(__FILE__)."/../classes/class_json.php");
class WfsConf {
Modified: branches/2.5/http/classes/class_wmc.php
===================================================================
--- branches/2.5/http/classes/class_wmc.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_wmc.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -16,17 +16,14 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-require_once(dirname(__FILE__) . "/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
+
require_once(dirname(__FILE__) . "/../classes/class_wms.php");
-require_once(dirname(__FILE__) . "/../classes/class_mb_exception.php");
require_once(dirname(__FILE__) . "/../classes/class_layer_monitor.php");
require_once(dirname(__FILE__) . "/../classes/class_point.php");
require_once(dirname(__FILE__) . "/../classes/class_bbox.php");
require_once(dirname(__FILE__) . "/../classes/class_json.php");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
-
function mb_utf8_encode ($str) {
if(CHARSET=="UTF-8") return utf8_encode($str);
return $str;
Modified: branches/2.5/http/classes/class_wms.php
===================================================================
--- branches/2.5/http/classes/class_wms.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/classes/class_wms.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -17,15 +17,10 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-include_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
require_once(dirname(__FILE__)."/class_connector.php");
-require_once(dirname(__FILE__)."/class_mb_exception.php");
require_once(dirname(__FILE__)."/class_administration.php");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
-
-
class wms {
var $lastURL;
var $wms_id;
Modified: branches/2.5/http/tools/mapbender_setup.php
===================================================================
--- branches/2.5/http/tools/mapbender_setup.php 2008-07-11 14:54:25 UTC (rev 2654)
+++ branches/2.5/http/tools/mapbender_setup.php 2008-07-11 15:16:21 UTC (rev 2655)
@@ -21,9 +21,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-include_once(dirname(__FILE__)."/../php/system.php");
-include_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-include_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
More information about the Mapbender_commits
mailing list