[Mapbender-commits] r2684 - in trunk/mapbender: core http/classes
http/javascripts http/print http/tools
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Tue Jul 22 03:26:20 EDT 2008
Author: christoph
Date: 2008-07-22 03:26:19 -0400 (Tue, 22 Jul 2008)
New Revision: 2684
Modified:
trunk/mapbender/core/globalSettings.php
trunk/mapbender/core/system.php
trunk/mapbender/http/classes/class_SaveLegend.php
trunk/mapbender/http/classes/class_administration.php
trunk/mapbender/http/classes/class_bbox.php
trunk/mapbender/http/classes/class_checkInput.php
trunk/mapbender/http/classes/class_connector.php
trunk/mapbender/http/classes/class_gml2.php
trunk/mapbender/http/classes/class_gui.php
trunk/mapbender/http/classes/class_json.php
trunk/mapbender/http/classes/class_keyword.php
trunk/mapbender/http/classes/class_kml.php
trunk/mapbender/http/classes/class_kml_geometry.php
trunk/mapbender/http/classes/class_kml_line.php
trunk/mapbender/http/classes/class_kml_linearring.php
trunk/mapbender/http/classes/class_kml_multigeometry.php
trunk/mapbender/http/classes/class_kml_ows.php
trunk/mapbender/http/classes/class_kml_parser_ows.php
trunk/mapbender/http/classes/class_kml_placemark.php
trunk/mapbender/http/classes/class_kml_point.php
trunk/mapbender/http/classes/class_kml_polygon.php
trunk/mapbender/http/classes/class_layer_monitor.php
trunk/mapbender/http/classes/class_locale.php
trunk/mapbender/http/classes/class_log.php
trunk/mapbender/http/classes/class_metadata.php
trunk/mapbender/http/classes/class_monitor.php
trunk/mapbender/http/classes/class_point.php
trunk/mapbender/http/classes/class_user.php
trunk/mapbender/http/classes/class_weldMaps2Image.php
trunk/mapbender/http/classes/class_weldMaps2PNG.php
trunk/mapbender/http/classes/class_wfs.php
trunk/mapbender/http/classes/class_wfs_conf.php
trunk/mapbender/http/javascripts/mod_log.php
trunk/mapbender/http/javascripts/wfs.js
trunk/mapbender/http/print/printPDF.conf
trunk/mapbender/http/print/printPDF_b.conf
trunk/mapbender/http/tools/mapbender_setup.php
Log:
merged w/ 2.5 branch
Modified: trunk/mapbender/core/globalSettings.php
===================================================================
--- trunk/mapbender/core/globalSettings.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/core/globalSettings.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -5,8 +5,8 @@
session_start();
//
-//
// All data Mapbender handles internally are UTF-8
+//
mb_internal_encoding("UTF-8");
//
@@ -29,7 +29,6 @@
require_once(dirname(__FILE__) . "/../lib/database-pgsql.php");
}
-
//
// class for error handling
//
@@ -42,7 +41,6 @@
require_once(dirname(__FILE__) . "/../http/classes/class_locale.php");
$localeObj = new Mb_locale($_SESSION["mb_lang"]);
-
//
// establish database connection
//
Modified: trunk/mapbender/core/system.php
===================================================================
--- trunk/mapbender/core/system.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/core/system.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -20,8 +20,8 @@
# 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
+define("MB_VERSION_APPENDIX", "RC5");
+define("MB_RELEASE_DATE", mktime(0,0,0,7,11,2008));//h, min,sec,month,day,year
#
# constants from map.js
@@ -34,4 +34,4 @@
#
define("LOG_LEVEL_LIST", "off,error,warning,notice,all");
-define("ZOOM_MOUSEWHEEL", "1.1");
\ No newline at end of file
+define("ZOOM_MOUSEWHEEL", "1.1");
Modified: trunk/mapbender/http/classes/class_SaveLegend.php
===================================================================
--- trunk/mapbender/http/classes/class_SaveLegend.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_SaveLegend.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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{
@@ -63,4 +64,4 @@
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/classes/class_administration.php
===================================================================
--- trunk/mapbender/http/classes/class_administration.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_administration.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -16,13 +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__)."/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");
/**
@@ -668,8 +664,8 @@
/**
* @deprecated
*/
- function getGuisByPermission($mb_user_id,$ignorepublic){
- $e = new mb_notice("administration->getGuisByPermission is deprecated, use user->getApplicationsByPermission instead!");
+ function getGuisByPermission($mb_user_id,$ignorepublic){
+ $e = new mb_notice("administration->getGuisByPermission is deprecated, use user->getApplicationsByPermission instead!");
$user = new User($mb_user_id);
return $user->getApplicationsByPermission($ignorepublic);
}
@@ -1110,10 +1106,10 @@
* @param integer userid the user-ID of the current user
* @return integer[] the IDs of the wfs_conf-table
*/
- function getWfsConfByPermission($userid){
+ function getWfsConfByPermission($userid){
$e = new mb_notice("administration->getWfsConfByPermission is deprecated, use user->getWfsConfByPermission instead!");
$user = new User($userid);
return $user->getWfsConfByPermission();
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/classes/class_bbox.php
===================================================================
--- trunk/mapbender/http/classes/class_bbox.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_bbox.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -17,11 +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");
-require_once(dirname(__FILE__)."/../classes/class_point.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.
@@ -155,4 +151,4 @@
return (string) "[" . $this->min . $this->max . " " . $this->epsg . "]";
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/classes/class_checkInput.php
===================================================================
--- trunk/mapbender/http/classes/class_checkInput.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_checkInput.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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){
@@ -51,4 +53,4 @@
}
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/classes/class_connector.php
===================================================================
--- trunk/mapbender/http/classes/class_connector.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_connector.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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.
@@ -210,4 +207,4 @@
}
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/classes/class_gml2.php
===================================================================
--- trunk/mapbender/http/classes/class_gml2.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_gml2.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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';
@@ -837,4 +838,4 @@
return $str;
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/classes/class_gui.php
===================================================================
--- trunk/mapbender/http/classes/class_gui.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_gui.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -17,12 +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_element.php");
+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.
*/
@@ -293,4 +289,4 @@
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/classes/class_json.php
===================================================================
--- trunk/mapbender/http/classes/class_json.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_json.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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");
@@ -78,4 +75,4 @@
return json_decode($aString);
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/classes/class_keyword.php
===================================================================
--- trunk/mapbender/http/classes/class_keyword.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_keyword.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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: trunk/mapbender/http/classes/class_kml.php
===================================================================
--- trunk/mapbender/http/classes/class_kml.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_kml.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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 {
@@ -172,4 +172,4 @@
}
// end class
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/classes/class_kml_geometry.php
===================================================================
--- trunk/mapbender/http/classes/class_kml_geometry.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_kml_geometry.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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");
@@ -57,4 +57,4 @@
return get_class($this);
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/classes/class_kml_line.php
===================================================================
--- trunk/mapbender/http/classes/class_kml_line.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_kml_line.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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");
@@ -117,4 +118,4 @@
*/
protected $pointArray = array();
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/classes/class_kml_linearring.php
===================================================================
--- trunk/mapbender/http/classes/class_kml_linearring.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_kml_linearring.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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");
/**
@@ -50,4 +51,4 @@
return "";
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/classes/class_kml_multigeometry.php
===================================================================
--- trunk/mapbender/http/classes/class_kml_multigeometry.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_kml_multigeometry.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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");
/**
@@ -79,4 +80,4 @@
private $geometryArray = array();
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/classes/class_kml_ows.php
===================================================================
--- trunk/mapbender/http/classes/class_kml_ows.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_kml_ows.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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");
@@ -490,4 +487,4 @@
*/
private $placemarkArray = array();
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/classes/class_kml_parser_ows.php
===================================================================
--- trunk/mapbender/http/classes/class_kml_parser_ows.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_kml_parser_ows.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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");
@@ -305,4 +305,4 @@
}
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/classes/class_kml_placemark.php
===================================================================
--- trunk/mapbender/http/classes/class_kml_placemark.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_kml_placemark.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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},
@@ -116,4 +116,4 @@
private $geometry;
private $properties = array();
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/classes/class_kml_point.php
===================================================================
--- trunk/mapbender/http/classes/class_kml_point.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_kml_point.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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");
/**
@@ -88,4 +88,4 @@
*/
private $point;
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/classes/class_kml_polygon.php
===================================================================
--- trunk/mapbender/http/classes/class_kml_polygon.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_kml_polygon.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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");
@@ -100,4 +100,4 @@
*/
private $innerBoundaryArray = array();
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/classes/class_layer_monitor.php
===================================================================
--- trunk/mapbender/http/classes/class_layer_monitor.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_layer_monitor.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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 () {
@@ -52,4 +54,4 @@
}
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/classes/class_locale.php
===================================================================
--- trunk/mapbender/http/classes/class_locale.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_locale.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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:
@@ -212,4 +211,4 @@
}
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/classes/class_log.php
===================================================================
--- trunk/mapbender/http/classes/class_log.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_log.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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/";
@@ -91,4 +92,4 @@
}
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/classes/class_metadata.php
===================================================================
--- trunk/mapbender/http/classes/class_metadata.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_metadata.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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: trunk/mapbender/http/classes/class_monitor.php
===================================================================
--- trunk/mapbender/http/classes/class_monitor.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_monitor.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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);
@@ -475,4 +476,4 @@
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/classes/class_point.php
===================================================================
--- trunk/mapbender/http/classes/class_point.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_point.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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.
@@ -175,4 +172,4 @@
return (string) "(" . $this->x . "," . $this->y . "," . $this->epsg . ")";
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/classes/class_user.php
===================================================================
--- trunk/mapbender/http/classes/class_user.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_user.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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.
@@ -156,4 +156,4 @@
return $wmcArray;
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/classes/class_weldMaps2Image.php
===================================================================
--- trunk/mapbender/http/classes/class_weldMaps2Image.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_weldMaps2Image.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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)
@@ -201,4 +200,4 @@
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/classes/class_weldMaps2PNG.php
===================================================================
--- trunk/mapbender/http/classes/class_weldMaps2PNG.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_weldMaps2PNG.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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{
@@ -80,4 +79,4 @@
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/classes/class_wfs.php
===================================================================
--- trunk/mapbender/http/classes/class_wfs.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_wfs.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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: trunk/mapbender/http/classes/class_wfs_conf.php
===================================================================
--- trunk/mapbender/http/classes/class_wfs_conf.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/classes/class_wfs_conf.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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 {
@@ -378,4 +378,4 @@
}
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/javascripts/mod_log.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_log.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/javascripts/mod_log.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -1,5 +1,5 @@
<?php
-require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require(dirname(__FILE__)."/../php/mb_validatePermission.php");
?>
mb_registerInitFunctions("mb_log_init()");
function mb_log_init(){
@@ -7,7 +7,7 @@
}
try{if(logtype){}}catch(e){logtype="";}
function mb_log_set(req, time_client){
- var url = '<?php echo $self; ?>&req=" + escape(req) + "&time_client=" + time_client;
+ var url = "../php/mod_log.php?<?php echo $urlParameters;?>&req=" + escape(req) + "&time_client=" + time_client;
mb_ajax_post(url, {req:req, time:time_client});
return true;
}
\ No newline at end of file
Modified: trunk/mapbender/http/javascripts/wfs.js
===================================================================
--- trunk/mapbender/http/javascripts/wfs.js 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/javascripts/wfs.js 2008-07-22 07:26:19 UTC (rev 2684)
@@ -43,7 +43,7 @@
var usemap = "";
var mod_usemap_radius = 10;
var mod_usemap_line_tolerance = 5;
-var useCheckboxForHighlighting = true;
+var useCheckboxForHighlighting = false;
var mb_wfs_fetch = new GeometryArray();
@@ -70,8 +70,10 @@
mb_registerSubFunctions('mod_usemap("")');
}
-if (useCheckboxForHighlighting) {
- mb_registerSubFunctions('highlight.paint()');
+if (useCheckboxForHighlighting) {
+ eventInit.register(function() {
+ mb_registerSubFunctions('highlight.paint()');
+ });
}
/*
@@ -227,8 +229,9 @@
str += 'xmlns:' + myconf['namespaces'][q]['name'] + '="' + myconf['namespaces'][q]['location'] + '" ';
} else if (myconf['namespaces'][q]['name'] == featureNS) {
ns_featureNS = true;
- str += 'xmlns:' + myconf['namespaces'][q]['name'] + '="' + myconf['namespaces'][q]['location'] + '" ';
- }
+ str += 'xmlns:' + myconf['namespaces'][q]['name'] + '="' + myconf['namespaces'][q]['location'] + '" '
+ strForSchemaLocation = myconf['namespaces'][q]['location'];
+ }
}
if (ns_gml == false) str += 'xmlns:gml="http://www.opengis.net/gml" ';
@@ -236,10 +239,15 @@
if (ns_xsi == false) str += 'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ';
if (ns_featureNS == false) str += 'xmlns:"+featureNS+"="http://www.someserver.com/"+featureNS+"" ';
if (ns_wfs == false) str += 'xmlns:wfs="http://www.opengis.net/wfs" ';
-
- str += 'xsi:schemaLocation="http://schemas.opengis.net/wfs/1.0.0/WFS-transaction.xsd">';
-
+ str += 'xsi:schemaLocation="http://www.opengis.net/wfs';
+ str += ' http://schemas.opengis.net/wfs/1.0.0/WFS-transaction.xsd';
+ str += ' ' + strForSchemaLocation;
+ str += ' '+ myconf['wfs_describefeaturetype'];
+ //str += mb_getConjunctionCharacter(myconf['wfs_describefeaturetype']);
+ //str += 'typename=' + myconf['featuretype_name'];
+ str += '">';
+
//
// ---------------------------------------- SAVE -------------------------------------------------
//
Modified: trunk/mapbender/http/print/printPDF.conf
===================================================================
--- trunk/mapbender/http/print/printPDF.conf 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/print/printPDF.conf 2008-07-22 07:26:19 UTC (rev 2684)
@@ -1,6 +1,6 @@
<?php
-include_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+include_once(dirname(__FILE__)."/../../core/globalSettings.php");
# filename for temporary imagefiles
$filename = TMPDIR."/map_".substr(md5(uniqid(rand())),0,7).".png";
@@ -9,7 +9,7 @@
*/
$download = true;
$downloadFile = TMPDIR."/map_".substr(md5(uniqid(rand())),0,7).".pdf";
-$downloadText = _("Download: Map as PDF...");
+$downloadText = _mb("Download: Map as PDF...");
/*
*run print as iframe or window
@@ -22,11 +22,11 @@
* Legend
*/
$legend=true;
-$label_legend = _('print legend');
+$label_legend = _mb('print legend');
$legendFilename = TMPDIR."/legend_".substr(md5(uniqid(rand())),0,7).".png";
$legendFilenameUserPolygon = TMPDIR."/legend_".substr(md5(uniqid(rand())),0,7).".png";
-$legendText = _("Legend");
-$legendFooter = _("powered by Mapbender");
+$legendText = _mb("Legend");
+$legendFooter = _mb("powered by Mapbender");
$legendImage = "./img/mapbender_logo.png";
$legendImage_width = 90;
$legendImage_height = 13;
@@ -48,50 +48,50 @@
$new_comment2 = $_REQUEST["comment2"];
}
-$text1 = _("Print preview");
+$text1 = _mb("Print preview");
$text2 = "- Mapbender -";
$text3 = "";
-$text4 = _("Scale 1:"). " ".$_REQUEST["map_scale"];
-$text5 = _("Date:") . " ".date("d.m.Y",strtotime("now"));
+$text4 = _mb("Scale 1:"). " ".$_REQUEST["map_scale"];
+$text5 = _mb("Date:") . " ".date("d.m.Y",strtotime("now"));
-$text6 = _("Notes:");
+$text6 = _mb("Notes:");
$text7 = "";
$text8 = $new_comment1;
$text9 = $new_comment2;
$text10 = "";
-$text11 = _("This copy has been automatically generated and is thus not valid without signature.");
-$text12 = _("This copy is protected by law (Par. 3 Abs. 1 VermKatG NW). It can be duplicaedted, modified, published or be passed to third parties only in agreement with");
-$text13 = _("the publisher, except duplicates and modifications aimed at internal use of government agencies or private use.");
+$text11 = _mb("This copy has been automatically generated and is thus not valid without signature.");
+$text12 = _mb("This copy is protected by law (Par. 3 Abs. 1 VermKatG NW). It can be duplicaedted, modified, published or be passed to third parties only in agreement with");
+$text13 = _mb("the publisher, except duplicates and modifications aimed at internal use of government agencies or private use.");
-$text14 = _("This copy is protected,");
-$text15 = _("ask me!!!!");
-$text16 = _("or the publisher");
-$text17 = _("or use is internally.");
+$text14 = _mb("This copy is protected,");
+$text15 = _mb("ask me!!!!");
+$text16 = _mb("or the publisher");
+$text17 = _mb("or use is internally.");
/*
* Labeling for buttons, textfields ...
*/
-$label_format = _("Format:");
+$label_format = _mb("Format:");
$label_format_a4 = "A4";
$label_format_a3 = "A3";
$label_format_a2 = "A2";
$label_format_a1 = "A1";
$label_format_a0 = "A0";
-$label_orientation = _("Orientation:");
-$label_portrait = _("portrait");
-$label_landscape = _("landscape");
+$label_orientation = _mb("Orientation:");
+$label_portrait = _mb("portrait");
+$label_landscape = _mb("landscape");
-$label_72dpi = sprintf(_("Quality: %d dpi"), 72);
-$label_288dpi = sprintf(_("Quality: %d dpi"), 288);
+$label_72dpi = sprintf(_mb("Quality: %d dpi"), 72);
+$label_288dpi = sprintf(_mb("Quality: %d dpi"), 288);
-$label_comment = _("Comment (max. 30)");
+$label_comment = _mb("Comment (max. 30)");
$comment_length = 30;
-$label_button = _('print');
+$label_button = _mb('print');
/*
* default
Modified: trunk/mapbender/http/print/printPDF_b.conf
===================================================================
--- trunk/mapbender/http/print/printPDF_b.conf 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/print/printPDF_b.conf 2008-07-22 07:26:19 UTC (rev 2684)
@@ -1,6 +1,6 @@
<?php
-include_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+include_once(dirname(__FILE__)."/../../core/globalSettings.php");
# filename for temporary imagefiles
$filename = TMPDIR."/map_".substr(md5(uniqid(rand())),0,7).".png";
@@ -9,7 +9,7 @@
*/
$download = true;
$downloadFile = TMPDIR."/map_".substr(md5(uniqid(rand())),0,7).".pdf";
-$downloadText = "Download: Karte als PDF...";
+$downloadText = _mb("Download: Map as PDF...");
/*
*run print as iframe or window
@@ -22,11 +22,11 @@
* Legend
*/
$legend=true;
-$label_legend = 'print legend';
+$label_legend = _mb('print legend');
$legendFilename = TMPDIR."/legend_".substr(md5(uniqid(rand())),0,7).".png";
$legendFilenameUserPolygon = TMPDIR."/legend_".substr(md5(uniqid(rand())),0,7).".png";
-$legendText = "Legende";
-$legendFooter = "powered by Mapbender";
+$legendText = _mb("Legend");
+$legendFooter = _mb("powered by Mapbender");
$legendImage = "./img/mapbender_logo.png";
$legendImage_width = 90;
$legendImage_height = 13;
@@ -48,50 +48,50 @@
$new_comment2 = $_REQUEST["comment2"];
}
-$text1 = "Druckansicht";
+$text1 = _mb("Print preview");
$text2 = "- Mapbender -";
$text3 = "";
-$text4 = "Maßstab 1 : " . $_REQUEST["map_scale"];
-$text5 = "Datum: " . date("d.m.Y",strtotime("now"));;
+$text4 = _mb("Scale 1:"). " ".$_REQUEST["map_scale"];
+$text5 = _mb("Date:") . " ".date("d.m.Y",strtotime("now"));
-$text6 = "Notizen:";
+$text6 = _mb("Notes:");
$text7 = "";
$text8 = $new_comment1;
$text9 = $new_comment2;
$text10 = "";
-$text11 = "Der Auszug ist maschinell erzeugt, er ist ohne Unterschrift gültig.";
-$text12 = "Dieser Auszug ist gesetzlich geschützt (§ 3 Abs. 1 VermKatG NW). Vervielfältigungen, Umarbeitungen, Veröffentlichungen oder die Weitergabe an Dritte nur mit Zustimmung des";
-$text13 = "Herausgebers, ausgenommen Vervielfältigungen und Umarbeitungen zur innerdienstlichen Verwendung bei Behörden oder zum eigenen Gebrauch.";
+$text11 = _mb("This copy has been automatically generated and is thus not valid without signature.");
+$text12 = _mb("This copy is protected by law (Par. 3 Abs. 1 VermKatG NW). It can be duplicaedted, modified, published or be passed to third parties only in agreement with");
+$text13 = _mb("the publisher, except duplicates and modifications aimed at internal use of government agencies or private use.");
-$text14 = "Dieser Auszug ist gesetzlich geschützt (§ 3 Abs. 1 VermKatG NW). Vervielfältigungen,";
-$text15 = "Umarbeitungen, Veröffentlichungen oder die Weitergabe an Dritte nur mit Zustimmung";
-$text16 = "des Herausgebers, ausgenommen Vervielfältigungen und Umarbeitungen zur inner-";
-$text17 = "dienstlichen Verwendung bei Behörden oder zum eigenen Gebrauch.";
+$text14 = _mb("This copy is protected,");
+$text15 = _mb("ask me!!!!");
+$text16 = _mb("or the publisher");
+$text17 = _mb("or use is internally.");
/*
* Labeling for buttons, textfields ...
*/
-$label_format = "Format:";
+$label_format = _mb("Format:");
$label_format_a4 = "A4";
$label_format_a3 = "A3";
$label_format_a2 = "A2";
$label_format_a1 = "A1";
$label_format_a0 = "A0";
-$label_orientation = "Orientation: ";
-$label_portrait = "portrait";
-$label_landscape = "landscape";
+$label_orientation = _mb("Orientation:");
+$label_portrait = _mb("portrait");
+$label_landscape = _mb("landscape");
-$label_72dpi = "Quality: 72 dpi";
-$label_288dpi = "Quality: 288 dpi";
+$label_72dpi = sprintf(_mb("Quality: %d dpi"), 72);
+$label_288dpi = sprintf(_mb("Quality: %d dpi"), 288);
-$label_comment = "Comment (max. 30)";
+$label_comment = _mb("Comment (max. 30)");
$comment_length = 30;
-$label_button = 'print';
+$label_button = _mb('print');
/*
* default
@@ -122,8 +122,8 @@
$a4 = true;
$a3 = true;
$a2 = true;
-$a1 = true;
-$a0 = true;
+$a1 = false;
+$a0 = false;
# dimensions of the map:
Modified: trunk/mapbender/http/tools/mapbender_setup.php
===================================================================
--- trunk/mapbender/http/tools/mapbender_setup.php 2008-07-22 05:48:25 UTC (rev 2683)
+++ trunk/mapbender/http/tools/mapbender_setup.php 2008-07-22 07:26:19 UTC (rev 2684)
@@ -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"
@@ -290,4 +288,4 @@
</td></tr>
</table>
</body>
-</html>
\ No newline at end of file
+</html>
More information about the Mapbender_commits
mailing list