[Mapbender-commits] r1511 - trunk/mapbender/http/classes
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Wed Jul 18 10:59:29 EDT 2007
Author: christoph
Date: 2007-07-18 10:59:29 -0400 (Wed, 18 Jul 2007)
New Revision: 1511
Modified:
trunk/mapbender/http/classes/class_wms.php
Log:
removed char_encode function
Modified: trunk/mapbender/http/classes/class_wms.php
===================================================================
--- trunk/mapbender/http/classes/class_wms.php 2007-07-18 14:58:31 UTC (rev 1510)
+++ trunk/mapbender/http/classes/class_wms.php 2007-07-18 14:59:29 UTC (rev 1511)
@@ -20,6 +20,7 @@
include_once(dirname(__FILE__)."/../../conf/mapbender.conf");
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);
@@ -84,15 +85,16 @@
$values = null;
$tags = null;
- $this->wms_getcapabilities_doc = $this->char_encode($data);
+ $admin = new administration();
+ $this->wms_getcapabilities_doc = $admin->char_encode($data);
$this->wms_upload_url = $url;
- $this->wms_id = "";
+ $this->wms_id = "";
$parser = xml_parser_create(CHARSET);
xml_parser_set_option($parser,XML_OPTION_CASE_FOLDING,0);
xml_parser_set_option($parser,XML_OPTION_SKIP_WHITE,1);
xml_parser_set_option($parser,XML_OPTION_TARGET_ENCODING,CHARSET);
- xml_parse_into_struct($parser,$this->wms_getcapabilities_doc,$values,$tags);
+ xml_parse_into_struct($parser,$data,$values,$tags);
$code = xml_get_error_code($parser);
if ($code) {
@@ -1615,12 +1617,7 @@
#db_close($connect);
}
- function char_encode($s){
- if(CHARSET == 'UTF-8'){
- $s = utf8_encode($s);
- }
- return $s;
- }
+
function checkObj(){
if($this->wms_getcapabilities == '' || $this->wms_getmap == '' ){
echo "<br>Missing parameters: <br>";
@@ -1657,11 +1654,5 @@
$this->layer_id = $id;
$this->layer_parent = $parent;
}
- function char_encode($s){
- if(CHARSET == 'UTF-8'){
- $s = utf8_encode($s);
- }
- return $s;
- }
}
?>
\ No newline at end of file
More information about the Mapbender_commits
mailing list