[Mapbender-commits] r2843 - in branches/nimix_dev: . core
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Mon Aug 18 10:02:04 EDT 2008
Author: nimix
Date: 2008-08-18 10:02:03 -0400 (Mon, 18 Aug 2008)
New Revision: 2843
Added:
branches/nimix_dev/core/
branches/nimix_dev/core/globalSettings.php
branches/nimix_dev/core/i18n.php
branches/nimix_dev/core/system.php
Removed:
branches/nimix_dev/core/globalSettings.php
branches/nimix_dev/core/i18n.php
branches/nimix_dev/core/system.php
Log:
merge
Copied: branches/nimix_dev/core (from rev 2653, trunk/mapbender/core)
Deleted: branches/nimix_dev/core/globalSettings.php
===================================================================
--- trunk/mapbender/core/globalSettings.php 2008-07-11 13:18:59 UTC (rev 2653)
+++ branches/nimix_dev/core/globalSettings.php 2008-08-18 14:02:03 UTC (rev 2843)
@@ -1,52 +0,0 @@
-<?php
-//
-// start the session
-//
-session_start();
-
-//
-//
-// All data Mapbender handles internally are UTF-8
-mb_internal_encoding("UTF-8");
-
-//
-// constants
-//
-require_once(dirname(__FILE__)."/../core/system.php");
-
-//
-// configuration file
-//
-require_once(dirname(__FILE__)."/../conf/mapbender.conf");
-
-//
-// database wrapper
-//
-if(SYS_DBTYPE=="mysql") {
- require_once(dirname(__FILE__) . "/../lib/database-mysql.php");
-}
-else {
- require_once(dirname(__FILE__) . "/../lib/database-pgsql.php");
-}
-
-
-//
-// class for error handling
-//
-require_once(dirname(__FILE__)."/../http/classes/class_mb_exception.php");
-
-//
-// I18n wrapper function, gettext
-//
-require_once(dirname(__FILE__) . "/../core/i18n.php");
-require_once(dirname(__FILE__) . "/../http/classes/class_locale.php");
-$localeObj = new Mb_locale($_SESSION["mb_lang"]);
-
-
-//
-// establish database connection
-//
-$con = db_connect($DBSERVER, $OWNER, $PW);
-db_select_db(DB, $con);
-
-?>
Copied: branches/nimix_dev/core/globalSettings.php (from rev 2653, trunk/mapbender/core/globalSettings.php)
===================================================================
--- branches/nimix_dev/core/globalSettings.php (rev 0)
+++ branches/nimix_dev/core/globalSettings.php 2008-08-18 14:02:03 UTC (rev 2843)
@@ -0,0 +1,52 @@
+<?php
+//
+// start the session
+//
+session_start();
+
+//
+//
+// All data Mapbender handles internally are UTF-8
+mb_internal_encoding("UTF-8");
+
+//
+// constants
+//
+require_once(dirname(__FILE__)."/../core/system.php");
+
+//
+// configuration file
+//
+require_once(dirname(__FILE__)."/../conf/mapbender.conf");
+
+//
+// database wrapper
+//
+if(SYS_DBTYPE=="mysql") {
+ require_once(dirname(__FILE__) . "/../lib/database-mysql.php");
+}
+else {
+ require_once(dirname(__FILE__) . "/../lib/database-pgsql.php");
+}
+
+
+//
+// class for error handling
+//
+require_once(dirname(__FILE__)."/../http/classes/class_mb_exception.php");
+
+//
+// I18n wrapper function, gettext
+//
+require_once(dirname(__FILE__) . "/../core/i18n.php");
+require_once(dirname(__FILE__) . "/../http/classes/class_locale.php");
+$localeObj = new Mb_locale($_SESSION["mb_lang"]);
+
+
+//
+// establish database connection
+//
+$con = db_connect($DBSERVER, $OWNER, $PW);
+db_select_db(DB, $con);
+
+?>
Deleted: branches/nimix_dev/core/i18n.php
===================================================================
--- trunk/mapbender/core/i18n.php 2008-07-11 13:18:59 UTC (rev 2653)
+++ branches/nimix_dev/core/i18n.php 2008-08-18 14:02:03 UTC (rev 2843)
@@ -1,8 +0,0 @@
-<?php
- function _mb ($someString) {
- if (USE_I18N) {
- return _($someString);
- }
- return $someString;
- }
-?>
\ No newline at end of file
Copied: branches/nimix_dev/core/i18n.php (from rev 2653, trunk/mapbender/core/i18n.php)
===================================================================
--- branches/nimix_dev/core/i18n.php (rev 0)
+++ branches/nimix_dev/core/i18n.php 2008-08-18 14:02:03 UTC (rev 2843)
@@ -0,0 +1,8 @@
+<?php
+ function _mb ($someString) {
+ if (USE_I18N) {
+ return _($someString);
+ }
+ return $someString;
+ }
+?>
\ No newline at end of file
Deleted: branches/nimix_dev/core/system.php
===================================================================
--- trunk/mapbender/core/system.php 2008-07-11 13:18:59 UTC (rev 2653)
+++ branches/nimix_dev/core/system.php 2008-08-18 14:02:03 UTC (rev 2843)
@@ -1,37 +0,0 @@
-<?php
-# $Id:$
-# Copyright (C) 2002 CCGIS
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# 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.
-
-#
-# mapbender version
-#
-define("MB_VERSION_NUMBER", "2.5.0");
-define("MB_VERSION_APPENDIX", "RC2");
-define("MB_RELEASE_DATE", mktime(0,0,0,4,21,2008));//h, min,sec,month,day,year
-
-#
-# constants from map.js
-#
-define("MB_RESOLUTION", "28.35");
-define("MB_FEATURE_COUNT", "100");
-define("MB_SECURITY_PROXY", "http://wms1.ccgis.de/mapbender/tools/security_proxy.php?mb_ows_security_proxy=");
-#
-# available log levels
-#
-define("LOG_LEVEL_LIST", "off,error,warning,notice,all");
-
-define("ZOOM_MOUSEWHEEL", "1.1");
\ No newline at end of file
Copied: branches/nimix_dev/core/system.php (from rev 2653, trunk/mapbender/core/system.php)
===================================================================
--- branches/nimix_dev/core/system.php (rev 0)
+++ branches/nimix_dev/core/system.php 2008-08-18 14:02:03 UTC (rev 2843)
@@ -0,0 +1,37 @@
+<?php
+# $Id:$
+# Copyright (C) 2002 CCGIS
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# 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.
+
+#
+# mapbender version
+#
+define("MB_VERSION_NUMBER", "2.5.0");
+define("MB_VERSION_APPENDIX", "RC2");
+define("MB_RELEASE_DATE", mktime(0,0,0,4,21,2008));//h, min,sec,month,day,year
+
+#
+# constants from map.js
+#
+define("MB_RESOLUTION", "28.35");
+define("MB_FEATURE_COUNT", "100");
+define("MB_SECURITY_PROXY", "http://wms1.ccgis.de/mapbender/tools/security_proxy.php?mb_ows_security_proxy=");
+#
+# available log levels
+#
+define("LOG_LEVEL_LIST", "off,error,warning,notice,all");
+
+define("ZOOM_MOUSEWHEEL", "1.1");
\ No newline at end of file
More information about the Mapbender_commits
mailing list