[Mapbender-commits] r1880 - tags/2.4.4_rc1/resources
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Fri Nov 30 11:36:49 EST 2007
Author: christoph
Date: 2007-11-30 11:36:49 -0500 (Fri, 30 Nov 2007)
New Revision: 1880
Added:
tags/2.4.4_rc1/resources/update_mapbender_2.4.3_to_2.4.4_rc1.diff
Log:
update from 2.4.3 to 2.4.4 rc1
Added: tags/2.4.4_rc1/resources/update_mapbender_2.4.3_to_2.4.4_rc1.diff
===================================================================
--- tags/2.4.4_rc1/resources/update_mapbender_2.4.3_to_2.4.4_rc1.diff (rev 0)
+++ tags/2.4.4_rc1/resources/update_mapbender_2.4.3_to_2.4.4_rc1.diff 2007-11-30 16:36:49 UTC (rev 1880)
@@ -0,0 +1,641 @@
+Index: Changes.txt
+===================================================================
+--- Changes.txt (revision 1870)
++++ Changes.txt (working copy)
+@@ -4,6 +4,11 @@
+
+ ------------------------
+
++Changelog 2.4.4
++
++see http://www.mapbender.org/index.php/Template:Changelog_2.4.4
++
++
+ Changelog 2.4.3
+
+ see http://www.mapbender.org/index.php/Template:Changelog_2.4.3
+Index: http/classes/class_gui.php
+===================================================================
+--- http/classes/class_gui.php (revision 1870)
++++ http/classes/class_gui.php (working copy)
+@@ -183,7 +183,7 @@
+ $error = true;
+ }
+
+- $sql = "INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_element, e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires, e_url) SELECT '" . $newGuiName . "', e_id, e_pos, e_public, e_comment, e_element, e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires, e_url FROM gui_element WHERE fkey_gui_id = '" . $guiList . "';";
++ $sql = "INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element, e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires, e_url) SELECT '" . $newGuiName . "', e_id, e_pos, e_public, e_comment, e_title, e_element, e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires, e_url FROM gui_element WHERE fkey_gui_id = '" . $guiList . "';";
+ $res = db_query($sql);
+ if (!$res) {
+ $report .= "<br><br>" . $sql . "<br><br>" . db_error() . "<br>";
+@@ -204,14 +204,15 @@
+ $error = true;
+ }
+
+- $sql = "INSERT INTO gui_mb_group (fkey_gui_id, fkey_mb_group_id, mb_group_type) SELECT '" . $newGuiName . "', fkey_mb_group_id, mb_group_type FROM gui_mb_group WHERE fkey_gui_id = '" . $guiList . "';";
+- $res = db_query($sql);
+- if (!$res) {
+- $report .= "<br><br>" . $sql . "<br><br>" . db_error() . "<br>";
+- $error = true;
+- }
++ if ($withUsers == true) {
++ /* group of original gui is copied as well */
++ $sql = "INSERT INTO gui_mb_group (fkey_gui_id, fkey_mb_group_id, mb_group_type) SELECT '" . $newGuiName . "', fkey_mb_group_id, mb_group_type FROM gui_mb_group WHERE fkey_gui_id = '" . $guiList . "';";
++ $res = db_query($sql);
++ if (!$res) {
++ $report .= "<br><br>" . $sql . "<br><br>" . db_error() . "<br>";
++ $error = true;
++ }
+
+- if ($withUsers == true) {
+ /* users of original gui are copied as well */
+ $sql = "INSERT INTO gui_mb_user (fkey_gui_id, fkey_mb_user_id, mb_user_type) SELECT '" . $newGuiName . "', fkey_mb_user_id, mb_user_type FROM gui_mb_user WHERE fkey_gui_id = '" . $guiList . "';";
+ $res = db_query($sql);
+Index: http/classes/class_mb_exception.php
+===================================================================
+--- http/classes/class_mb_exception.php (revision 1870)
++++ http/classes/class_mb_exception.php (working copy)
+@@ -29,6 +29,8 @@
+ var $mb_log_level = LOG_LEVEL;
+ var $dir = "../../log/";
+ var $filename_prefix = "mb_error_";
++ var $result = false;
++ var $message = "";
+
+ function indexOf($level, $levelArray) {
+ $index = false;
+@@ -57,11 +59,31 @@
+ if($h = fopen($logfile,"a")){
+ $content = date("Y.m.d, H:i:s") . "," . $n .chr(13).chr(10);
+ if(!fwrite($h,$content)){
+- #exit;
++ $this->result = false;
++ $this->message = "Unable to write " . $logfile;
++ return false;
+ }
+ fclose($h);
++ $this->result = true;
++ $this->message = "Successful.";
++ return true;
++ }
++ else {
++ $this->result = false;
++ $this->message = "Unable to open or generate " . $logfile;
++ return false;
+ }
+ }
++ else {
++ $this->result = false;
++ $this->message = "Directory " . $this->dir . " is not valid.";
++ return false;
++ }
++ }
++ else {
++ $this->result = false;
++ $this->message = "Log level '" . $level . "' is not valid or logging is disabled in mapbender.conf.";
++ return false;
+ }
+ }
+ }
+@@ -70,7 +92,7 @@
+ var $level = "notice";
+
+ function mb_notice($message) {
+- $this->mb_log($message, $this->level);
++ return $this->mb_log("Notice: " . $message, $this->level);
+ }
+ }
+
+@@ -78,7 +100,7 @@
+ var $level = "warning";
+
+ function mb_warning($message) {
+- $this->mb_log($message, $this->level);
++ return $this->mb_log("Warning: " . $message, $this->level);
+ }
+ }
+
+@@ -86,7 +108,7 @@
+ var $level = "error";
+
+ function mb_exception($message) {
+- $this->mb_log($message, $this->level);
++ return $this->mb_log("ERROR: " . $message, $this->level);
+ }
+ }
+ ?>
+\ No newline at end of file
+Index: http/classes/class_wms.php
+===================================================================
+--- http/classes/class_wms.php (revision 1870)
++++ http/classes/class_wms.php (working copy)
+@@ -435,7 +435,7 @@
+
+ if(strtoupper($element[tag]) == "SRS"){
+ $this->objLayer[$cnt_layer]->wms_srs1 = $element[value];
+- $this->wms_srs = explode (" ", $this->objLayer[0]->wms_srs1);
++ $this->wms_srs = array_keys( array_flip(explode (" ", $this->objLayer[0]->wms_srs1)));
+ }
+ if(strtoupper($element[tag]) == "LATLONBOUNDINGBOX"){
+ $cnt_epsg++;
+Index: http/extensions/geom2wfst.php
+===================================================================
+--- http/extensions/geom2wfst.php (revision 1870)
++++ http/extensions/geom2wfst.php (working copy)
+@@ -115,7 +115,7 @@
+ }
+ else {
+ $response = "error";
+- echo "\"error message\":\"".addslashes($data)."\",";
++ echo "\"error message\":\"".preg_replace("/\"/", "'", preg_replace("/\n/", "", preg_replace("/\r/", "", $data)))."\",";
+ }
+ echo "\"response\":\"".$response."\"}";
+ ?>
+\ No newline at end of file
+Index: http/index.php
+===================================================================
+--- http/index.php (revision 1870)
++++ http/index.php (working copy)
+@@ -109,7 +109,7 @@
+
+ <div class="mapbender_welcome">Welcome to <font align="left" color="#000000">Ma</font><font color="#0000CE">p</font><font color="#C00000">b</font><font color="#000000">ender</font></div>
+
+- <font color="#ff0000">Mapbender Version 2.4.3 (2007-10-05)</font>
++ <font color="#ff0000">Mapbender Version 2.4.4 rc1 (2007-11-30)</font>
+ </td></tr>
+ </table>
+ <br>
+Index: http/javascripts/mod_digitize_tab.php
+===================================================================
+--- http/javascripts/mod_digitize_tab.php (revision 1870)
++++ http/javascripts/mod_digitize_tab.php (working copy)
+@@ -853,7 +853,7 @@
+ }
+
+ function isInteger(str) {
+- if (str.match(/^\d+$/)) {
++ if (str.match(/^\d*$/)) {
+ return true;
+ }
+ return false;
+Index: http/javascripts/mod_savewmc.php
+===================================================================
+--- http/javascripts/mod_savewmc.php (revision 1870)
++++ http/javascripts/mod_savewmc.php (working copy)
+@@ -26,7 +26,12 @@
+ echo "mod_savewmc_target = '".$e_target."';";
+ ?>
+ function setOnUnload() {
+- document.getElementsByTagName('body')[0].setAttribute("onUnload", "mod_savewmc('session');");
++ if (ie) {
++ document.getElementsByTagName('body')[0].onunload = function() {var x = new Function ("", "mod_savewmc_session()"); x(); };
++ }
++ else {
++ document.getElementsByTagName('body')[0].setAttribute("onUnload", "mod_savewmc_session();");
++ }
+ }
+
+ try {if (saveInSession) {}}catch(e) {saveInSession = 0;}
+@@ -31,7 +36,7 @@
+
+ try {if (saveInSession) {}}catch(e) {saveInSession = 0;}
+
+-if (saveInSession == '1') {
++if (saveInSession == 1) {
+ mb_registerInitFunctions('setOnUnload()');
+ }
+
+@@ -38,22 +43,26 @@
+ var mod_savewmc_img = new Image(); mod_savewmc_img.src = "<?php echo $e_src; ?>";
+ //var mod_savewmc_img_over = new Image(); mod_savewmc_img_over.src = "<?php echo preg_replace("/_off/","_over",$e_src); ?>";
+
++function mod_savewmc_session(){
++ sendMapDataToServer("session", function(result, status) {});
++}
+
+ function mod_savewmc(title){
++ var generalTitle = title ? title : prompt("Save WMC as...");
++ if (generalTitle != "" && generalTitle != null) {
++ sendMapDataToServer(generalTitle, function(result, status) {alert(status + ": " + result);});
++ }
++}
++
++function sendMapDataToServer(generalTitle, callbackFunction) {
++ var user = "<?php echo $_SESSION["mb_user_id"]; ?>";
++ var ind = getMapObjIndexByName(mod_savewmc_target);
+
+- var ind = getMapObjIndexByName(mod_savewmc_target);
+- var session = 0;
+- var generalTitle = title;
++ var extensionDataString = "";
++ if (currentWmcExtensionData != null) {
++ extensionDataString = currentWmcExtensionData.toJSONString();
++ }
+
+- if (generalTitle) {
+- if (generalTitle == 'session') {
+- session = 1;
+- }
+- }
+- else {
+- generalTitle = prompt("Save WMC as...");
+- }
+- mb_ajax_post("../php/mod_insertWmcIntoDb.php", {"saveInSession":session, "generalTitle":generalTitle, "mapObject":mb_mapObj[ind].toJSONString()}, function (result, status) {
+- alert(result);
+- });
++ window.frames['ajax'].$.ajaxSetup({async:false}); //TODO: find out why async doesn't work onunload
++ window.frames['ajax'].$.post("../php/mod_insertWmcIntoDb.php", {"saveInSession":saveInSession, "generalTitle":generalTitle, "extensionData":extensionDataString, "mapObject":mb_mapObj[ind].toJSONString()}, callbackFunction);
+ }
+\ No newline at end of file
+Index: http/javascripts/mod_wfs_gazetteer_client.php
+===================================================================
+--- http/javascripts/mod_wfs_gazetteer_client.php (revision 1870)
++++ http/javascripts/mod_wfs_gazetteer_client.php (working copy)
+@@ -50,6 +50,7 @@
+ var point_px = 10;
+ var resultGeom = null;
+ var cw_fillcolor = "#cc33cc";
++var g_buffer;
+
+
+ parent.mb_registerInitFunctions("window.frames['"+this.name+"'].initModWfsGazetteer()");
+@@ -73,8 +74,8 @@
+
+ function appendStyles() {
+ var styleObj;
+- var rule = global_wfsConfObj[global_selectedWfsConfId].g_style + global_wfsConfObj[global_selectedWfsConfId].g_res_style;
+- if (parent.ie) {
++ var rule = global_wfsConfObj[global_selectedWfsConfId].g_style + global_wfsConfObj[global_selectedWfsConfId].g_res_style;
++ if (parent.ie) {
+ var styleSheetObj=document.createStyleSheet();
+ styleObj=styleSheetObj.owningElement || styleSheetObj.ownerNode;
+ styleObj.setAttribute("type","text/css");
+@@ -114,6 +115,7 @@
+ else if (wfsCount === 1) {
+ appendStyles();
+ appendWfsForm();
++ g_buffer = global_wfsConfObj[global_selectedWfsConfId].g_buffer;
+ }
+ else {
+ appendWfsConfSelectBox();
+@@ -312,7 +314,7 @@
+ else if (event == "click"){
+ global_resultHighlight.del(resultGeom.get(index), cw_fillcolor);
+ var bbox = resultGeom.get(index).getBBox();
+- var buffer = new parent.Point(1,1);
++ var buffer = new parent.Point(g_buffer,g_buffer);
+ bbox[0] = bbox[0].minus(buffer);
+ bbox[1] = bbox[1].plus(buffer);
+ parent.mb_calculateExtent(targetArray[0], bbox[0].x, bbox[0].y, bbox[1].x, bbox[1].y);
+Index: http/javascripts/mod_wfs_SpatialRequest.php
+===================================================================
+--- http/javascripts/mod_wfs_SpatialRequest.php (revision 1870)
++++ http/javascripts/mod_wfs_SpatialRequest.php (working copy)
+@@ -408,7 +408,7 @@
+ }
+ filter += '</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs>';
+ filter += '</gml:Polygon></Within></ogc:Filter>';
+- mb_get_geom(url, filter, i, w_[i]);
++ mb_get_geom(url, filter, i, wfs_config[w_[i]]['featuretype_name'], w_[i], w[i]);
+ }
+ }
+ else if(queryGeom.geomType==geomType.line){
+@@ -430,7 +430,7 @@
+ filter += rectangle[0].x+","+rectangle[0].y+ " " + rectangle[1].x+","+rectangle[1].y;
+ filter += "</gml:coordinates></gml:Box></ogc:BBOX></ogc:Filter>";
+ url += param;
+- mb_get_geom(url, filter, i, w_[i]);
++ mb_get_geom(url, filter, i, wfs_config[w_[i]]['featuretype_name'], w_[i], w[i]);
+ }
+ }
+ else if(queryGeom.geomType == geomType.point){
+@@ -451,7 +451,7 @@
+ filter += (tmp.x + buffer) + "," + (tmp.y + buffer) + " " + (tmp.x - buffer) + "," + (tmp.y + buffer) + " " + (tmp.x - buffer) + "," + (tmp.y - buffer);
+ filter += "</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></Intersects></ogc:Filter>";
+ url += param;
+- mb_get_geom(url, filter, i, w_[i]);
++ mb_get_geom(url, filter, i, wfs_config[w_[i]]['featuretype_name'], w_[i], w[i]);
+ }
+ }
+ // highlight = new Highlight(mb_wfs_targets, highlight_tag_id, {"position":"absolute", "top":"0px", "left":"0px", "z-index":generalHighlightZIndex}, generalHighlightLineWidth);
+@@ -458,9 +458,9 @@
+ return true;
+ }
+
+-function mb_get_geom(url, filter, index, wfs_conf_id) {
++function mb_get_geom(url, filter, index, typename, js_wfs_conf_id, db_wfs_conf_id) {
+
+- mb_ajax_post("../" + wfsResultModulePath + wfsResultModuleFilename,{'url':url,'filter':filter,'typename':wfs_config[wfs_conf_id]['featuretype_name'],'wfs_conf_id':wfs_conf_id},function(js_code,status){
++ mb_ajax_post("../" + wfsResultModulePath + wfsResultModuleFilename, {'url':url,'filter':filter,'typename':typename,'js_wfs_conf_id':js_wfs_conf_id, 'db_wfs_conf_id':db_wfs_conf_id}, function(js_code,status){
+ // alert(js_code);
+ eval(js_code);
+ if (typeof(geom) == 'object') mb_execWfsReadSubFunctions(geom);
+Index: http/javascripts/wfs.js
+===================================================================
+--- http/javascripts/wfs.js (revision 1870)
++++ http/javascripts/wfs.js (working copy)
+@@ -196,7 +196,9 @@
+ else if (myconf['namespaces'][q]['name'] == "xsi") ns_xsi = true;
+ else if (myconf['namespaces'][q]['name'] == "wfs") ns_wfs = true;
+ else if (myconf['namespaces'][q]['name'] == "topp") ns_topp = true;
+- str += 'xmlns:' + myconf['namespaces'][q]['name'] + '="' + myconf['namespaces'][q]['location'] + '" ';
++ if (myconf['namespaces'][q]['name'] != 'xmlns') {
++ str += 'xmlns:' + myconf['namespaces'][q]['name'] + '="' + myconf['namespaces'][q]['location'] + '" ';
++ }
+ }
+
+ if (ns_gml == false) str += 'xmlns:gml="http://www.opengis.net/gml" ';
+Index: http/php/mod_renameGUI.php
+===================================================================
+--- http/php/mod_renameGUI.php (revision 1870)
++++ http/php/mod_renameGUI.php (working copy)
+@@ -214,7 +214,7 @@
+ echo "<tr><td class='newName_str'>Name: </td><td><input class='newName' type='text' id='newGuiName' name='newGuiName'></td></tr>\n";
+ echo "<tr>";
+ echo " <td><input class='button_rename' type='button' value='rename' onclick='validate_rename()'></td>";
+-echo " <td><input class='button_copy' type='button' value='copy' onclick='validate_copy()'><div class='button_copy_checkbox'>(<input name='withUsers' type='checkbox' /> copy users)</div></td>";
++echo " <td><input class='button_copy' type='button' value='copy' onclick='validate_copy()'><div class='button_copy_checkbox'>(<input name='withUsers' type='checkbox' /> copy users and groups)</div></td>";
+ echo "</tr>\n";
+ echo "</table>";
+ }
+Index: http/php/mod_wfs_result.php
+===================================================================
+--- http/php/mod_wfs_result.php (revision 1870)
++++ http/php/mod_wfs_result.php (working copy)
+@@ -18,7 +18,11 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+ $filter = stripslashes($_REQUEST["filter"]);
+-$url = stripslashes($_REQUEST['url']);
++$url = stripslashes($_REQUEST["url"]);
++$js_wfs_conf_id = $_REQUEST["js_wfs_conf_id"];
++$db_wfs_conf_id = $_REQUEST["db_wfs_conf_id"];
++$typename = $_REQUEST["typename"];
++
+ //echo $filter; die();
+ require_once("../../conf/mapbender.conf");
+ require_once("../classes/class_stripRequest.php");
+@@ -60,7 +64,6 @@
+ $el = -1;
+ $fid = -1;
+
+-$typename = $_REQUEST["typename"];
+ $element_str = "";
+ $geom_str = "";
+ foreach ($values as $element) {
+@@ -106,7 +109,7 @@
+ }
+ // TO DO: the following is added twice! Once suffices.
+ $element_str .= "geom.get(" . $member . ").e.setElement('fid', '".$fid."');\n";
+- $element_str .= "geom.get(" . $member . ").wfs_conf = ".$_REQUEST['wfs_conf_id'].";\n";
++ $element_str .= "geom.get(" . $member . ").wfs_conf = ".$js_wfs_conf_id.";\n";
+ }
+ else if(strtoupper($element[tag]) == strtoupper("gml:coordinates") && $geom == true){
+ $tmp = str_replace(",,","",str_replace(" ",",",trim($element[value])));
+Index: http/tools/mapbender_setup.php
+===================================================================
+--- http/tools/mapbender_setup.php (revision 1870)
++++ http/tools/mapbender_setup.php (working copy)
+@@ -21,7 +21,8 @@
+ # 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");
++include_once(dirname(__FILE__)."/../../conf/mapbender.conf");
++include_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
+
+ ?>
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+@@ -31,11 +32,11 @@
+ <meta http-equiv="pragma" content="no-cache">
+ <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+ <meta name="robots" content="noindex,nofollow">
+- <title>Mapbender Setupchecker</title>
++ <title>Mapbender Setup-Checker</title>
+ </head>
+ <link rel="stylesheet" type="text/css" href="../css/mapbender.css">
+ <body>
+-<table BGCOLOR="#ffffff" width="70%" height="70%" ALIGN="top" CELLSPACING="0" CELLPADDING="10" STYLE="-moz-border-radius:8px; border:2px #000000 solid;">
++<table BGCOLOR="#ffffff" width="95%" height="95%" ALIGN="center" CELLSPACING="0" CELLPADDING="10" STYLE="-moz-border-radius:8px; border:2px #000000 solid;">
+ <tr><td VALIGN="center" STYLE="margin-bottom:0px; padding-bottom:0px;">
+ <H1 style="padding:0px; margin:0px; font:32px/32px bold Arial,Helvetica,sans-serif; font-stretch:extra-expanded;font-weight:bold">
+ <font align="left"" style="font-weight:bold" color="#000000"> Ma</font><font color="#0000CE" style="font-weight:bold">p</font><font color="#C00000">b</font><font color="#000000" style="font-weight:bold">ender</font>
+@@ -53,11 +54,11 @@
+ ###########################################
+ #phpversion
+ $check ="<tr ><td width=\"25%\">php Version</td>";
+- if (phpversion()>'4.3.0'){
+- if (phpversion()<'5.1.0') $check .="<td width=\"10\"></td><td><font color=#0000FF>Version: " . phpversion() . "! you should think about upgrade to >=php5.1!</td></tr>";
++ if (phpversion()>='5.1.0'){
++ if (phpversion()<'5.2.0') $check .="<td width=\"10\"></td><td><font color=#0000FF>Version: " . phpversion() . "! You should think about upgrade to the current php version (get it <a href='http://www.php.net/downloads.php' target='_blank'>here</a>)</td></tr>";
+ else $check .="<td width=\"10\">X</td><td><font color=#00D000>Version: " . phpversion() . "</td></tr>";
+ }
+- else $check .="<td width=\"10\"></td><td><font color=#FF0000>Version: " . phpversion() . "! your PHP is very old, think about upgrade to >=php5.1!</td></tr>";
++ else $check .="<td width=\"10\"></td><td><font color=#FF0000>Version: " . phpversion() . "! Your PHP Version is very old, please upgrade to version >=5.1.0 to use full mapbender functionality and reduce problems!</td></tr>";
+ #php-schnittstelle
+ if(php_sapi_name() == 'cgi') $check.="<tr><td >interface</td><td>X</td><td><font color=#00D000>CGI-PHP</td></tr>";
+ else $check.="<tr><td >interface</td><td>X</td><td><font color=#00D000>Modul-PHP</td></tr>";
+@@ -74,9 +75,14 @@
+ if (get_cfg_var('memory_limit')) $check .="<tr ><td>memory Limit</td><td>X</td><td><font color=#00D000>" . get_cfg_var('memory_limit') . "</font><font color='#0000FF'> (running in memory-trouble with printing? Perhaps raise your memory limit)</font></td></tr>";
+ else $check .="<tr ><td>memory Limit</td><td></td><td><font color=#FF0000>memory_limit must be set (30M will be enough for the moment)</font></td></tr>";
+ # error_reporting
++#Error Reporting: 6135 =>error_reporting = E_ALL & ~E_NOTICE (6135-8(E_NOTICE))
++#Error Reporting: 1 => error_reporting = E_ERROR
++#Error Reporting: 6143 => error_reporting = E_ALL
+ $check .="<tr ><td>error-reporting</td>";
+- if (get_cfg_var('error_reporting')!=2039) $check .="<td></td><td><font color=#FF0000>please set error_reporting to 'E_ALL & ~E_NOTICE' except for testing</td></tr>";
+- else $check .="<td>X</td><td><font color=#00D000>ok, error_reporting = E_ALL & ~E_NOTICE </td></tr>";
++ if (get_cfg_var('error_reporting')==6143||get_cfg_var('error_reporting')==8) $check .="<td></td><td><font color=#FF0000>please set error_reporting to 'E_ALL & ~E_NOTICE' or 'E_ERROR' except for debugging</td></tr>";
++ elseif (get_cfg_var('error_reporting')==6135)$check .="<td>X</td><td><font color=#00D000>ok, error_reporting = E_ALL & ~E_NOTICE</td></tr>";
++ elseif (get_cfg_var('error_reporting')==1)$check .="<td>X</td><td><font color=#00D000>ok, error_reporting = E_ERROR</td></tr>";
++ else $check .="<td></td><td><font color=#0000FF>(Your error_reporting configuration is not implementet into this test yet. You shoul know what you are doing or set it to E_ALL & ~E_NOTICE)</td></tr>";
+ # session.save_handler
+ if (!get_cfg_var('session.save_handler')||get_cfg_var('session.save_handler')!='files') $check .="<tr ><td>session.save_handler</td><td></td><td><font color=#FF0000>session.save_handler must be set to 'session.save_handler = files'!</font></td></tr>";
+ else $check .="<tr ><td>session.save_handler</td><td>X</td><td><font color=#00D000>session.save_handler = " . get_cfg_var('session.save_handler') . "</font></td></tr>";
+@@ -88,6 +94,10 @@
+ $check .="<tr ><td>allow_url_fopen</td>";
+ if (get_cfg_var('allow_url_fopen')=='1') $check .= "<td>X</td><td><font color=#00D000>On</font></td></tr>";
+ else $check .= "<td></td><td><font color=#FF0000>Off =>allow_url_fopen must be on read <a href='http://www.mapbender.org/index.php/Allow_url_fopen' target=_blank>this</a></font></td></tr>";
++# short_open_tag
++ $check .="<tr ><td>short_open_tag</td>";
++ if (get_cfg_var('short_open_tag')!='1') $check .= "<td>X</td><td><font color=#00D000>Off</font></td></tr>";
++ else $check .= "<td></td><td><font color=#FF0000>On => Displaying XML files will not work properly</font></td></tr>";
+ echo $check;
+ #################################################
+ #PHP Extensioncheck
+@@ -92,13 +102,10 @@
+ #################################################
+ #PHP Extensioncheck
+ #################################################
+-#MYSQL
+ ?>
+- </table>
+- <br><br>
+- <table style="border: 2px solid rgb(128, 128, 128); -moz-border-radius-topleft: 8px; -moz-border-radius-topright: 8px; -moz-border-radius-bottomright: 8px; -moz-border-radius-bottomleft: 8px;" bgcolor=#dddddd cellspacing=0 cellpadding=0 width="95%">
+ <th colspan="3" bgcolor=#F0F0F0>PHP Extensioncheck</th>
+ <?php
++#MYSQL
+ if(!extension_loaded('mysql')) $check="<tr ><td width=\"25%\">MySQL check</td><td width=\"10\"></td><td><font color=#FF0000 >MySQL not installed! (You have to include mysql-extension if you want to use MySQL as MB-Database!)</font></td></tr>";
+ else $check="<tr ><td width=\"25%\">MySQL check</td><td width=\"10\">X</td><td><font color=#00D000 >MySQL installed</font></td></tr>";
+ #PGSQL
+@@ -107,7 +114,16 @@
+ #GD
+ if(extension_loaded('gd')) $check.="<tr ><td>GD2 check</td><td>X</td><td><font color=#00D000>GD installed</font></td></tr>";
+ else $check.="<tr ><td>GD2 check</td><td></td><td><font color=#FF0000>GD not installed (no printing possible)</font></td></tr>";
+- echo $check;
++
++#mbstring
++ if(extension_loaded('mbstring')) $check.="<tr ><td>mbstring check</td><td>X</td><td><font color=#00D000>mbstring installed</font></td></tr>";
++ else $check.="<tr ><td>mbstring check</td><td></td><td><font color=#FF0000>PHP extension mbstring is not installed</font></td></tr>";
++
++#gettext
++ if(extension_loaded('gettext')) $check.="<tr ><td>gettext check</td><td>X</td><td><font color=#00D000>gettext installed</font></td></tr>";
++ else $check.="<tr ><td>gettext check</td><td></td><td><font color=#FF0000>PHP extension gettext is not installed</font></td></tr>";
++
++echo $check;
+ ####################################
+ # Database check
+ ####################################
+@@ -130,22 +146,22 @@
+ $con_postgis = pg_connect($con_string);
+ $sql = "Select postgis_full_version();";
+ $res = pg_query($con_postgis,$sql);
+- if(!$res) $check .="<tr width=\"20%\><td>PostGIS support</td><td></td><td><font color=#FF0000>no PostGIS function available</tr>";
++ if(!$res) $check .="<tr width=\"20%\><td>PostGIS support</td><td></td><td><font color=#FF0000>no PostGIS function available</td></tr>";
+ else{
+ $cnt=0;
+ while(pg_fetch_row($res)){
+- $check .="<tr><td>PostGIS support</td><td>X</td><td><font color=#00D000>PostGIS function available</tr>";
++ $check .="<tr><td>PostGIS support</td><td>X</td><td><font color=#00D000>PostGIS function available</td></tr>";
+ $check .="<tr><td>Version</td><td>X</td><td><font color=#00D000>" . pg_fetch_result($res,$cnt,0). "</td></tr>";
+ $cnt++;
+ }
+- if ($cnt==0) $check .="<tr><td>PostGIS support</td><td></td><td><font color=#FF0000>no PostGIS function available</tr>";
++ if ($cnt==0) $check .="<tr><td>PostGIS support</td><td></td><td><font color=#FF0000>no PostGIS function available</td></tr>";
+ }
+ }
+- else $check .="<tr><td>Postgis support</td><td></td><td><font color=#FF0000>no PostGIS function available</font></tr>";
++ else $check .="<tr><td>Postgis support</td><td></td><td><font color=#FF0000>no PostGIS function available</font></td></tr>";
+ echo $check;
+ }
+ else{
+- $check = "<tr><td width=\"25%\">Administration Database</td><td>X</td><td><font color=#00D000>PostgreSQL</td><tr>";
++ $check = "<tr><td width=\"25%\">Administration Database</td><td>X</td><td><font color=#00D000>PostgreSQL</td></tr>";
+ $check .= "<tr><td>Connect to Database</td>";
+ if($con) $check .="<td width=\"10\">X</td><td><font color=#00D000>connected</font></td></tr>";
+ else $check .="<td width=\"10\"></td><td><font color=#FF0000>not connected</font></td></tr>";
+@@ -163,9 +179,6 @@
+ # PostGIS check
+ ######################################
+ ?>
+- </table>
+- <br><br>
+- <table style="border: 2px solid rgb(128, 128, 128); -moz-border-radius-topleft: 8px; -moz-border-radius-topright: 8px; -moz-border-radius-bottomright: 8px; -moz-border-radius-bottomleft: 8px;" bgcolor=#dddddd cellspacing=0 cellpadding=0 width="95%">
+ <th colspan="3" bgcolor=#F0F0F0>PostGIS check</th>
+ <?php
+ $check ="";
+@@ -173,18 +186,18 @@
+ $sql = "select postgis_full_version();";
+ if (pg_query($con,$sql))$res = pg_query($con,$sql);
+ else echo "<tr><td><font>pg_query($con,$sql)";
+- if(!$res) $check .="<tr><td width=\"25%\">PostGIS support</td><td width=\"10\"></td><td><font color=#FF0000>no PostGIS function available</tr>";
++ if(!$res) $check .="<tr><td width=\"25%\">PostGIS support</td><td width=\"10\"></td><td><font color=#FF0000>no PostGIS function available</td></tr>";
+ else{
+ $cnt=0;
+ while(pg_fetch_row($res)){
+- $check .="<tr><td width=\"25%\">PostGIS support</td><td width=\"10\">X</td><td><font color=#00D000>PostGIS function available</tr>";
++ $check .="<tr><td width=\"25%\">PostGIS support</td><td width=\"10\">X</td><td><font color=#00D000>PostGIS function available</td></tr>";
+ $check .="<tr><td>Version</td><td width=\"10\">X</td><td><font color=#00D000>" . pg_fetch_result($res,$cnt,0). "</td></tr>";
+ $cnt++;
+ }
+- if ($cnt==0) $check .="<tr><td width=\"25%\">PostGIS support</td><td width=\"10\"></td><td><font color=#FF0000>no PostGIS function available</tr>";
++ if ($cnt==0) $check .="<tr><td width=\"25%\">PostGIS support</td><td width=\"10\"></td><td><font color=#FF0000>no PostGIS function available</td></tr>";
+ }
+ }
+- else $check .="<tr><td width=\"25%\">Postgis support</td><td width=\"10\"></td><td><font color=#FF0000>no PostGIS function available</font></tr>";
++ else $check .="<tr><td width=\"25%\">Postgis support</td><td width=\"10\"></td><td><font color=#FF0000>no PostGIS function available</font></td></tr>";
+ echo $check;
+ }
+ #################################
+@@ -194,7 +207,7 @@
+ </table>
+ <br><br>
+ <table style="border: 2px solid rgb(128, 128, 128); -moz-border-radius-topleft: 8px; -moz-border-radius-topright: 8px; -moz-border-radius-bottomright: 8px; -moz-border-radius-bottomleft: 8px;" bgcolor=#dddddd cellspacing=0 cellpadding=0 width="95%">
+- <th colspan="3" bgcolor=#F0F0F0>mapbender.conf check</th>
++ <th colspan="4" bgcolor=#F0F0F0>Mapbender Configuration Check</th>
+ <?php
+ # SYS_DBTYPE
+ if ((SYS_DBTYPE == 'mysql' || SYS_DBTYPE == 'pgsql') && defined('SYS_DBTYPE')) $check ="<tr><td>Administration Database</td><td >X</td><td><font color=#00D000>" . SYS_DBTYPE . "</font></td></tr>";
+@@ -211,15 +224,15 @@
+ # PREPAREDSTATEMENTS
+ if (defined('PREPAREDSTATEMENTS')){
+ if (PREPAREDSTATEMENTS == true){
+- if (phpversion()<'5.1.0') $check.="<tr><td width=\"25%\">PREPAREDSTATEMENTS-<br>compatibility</td><td width=\"10\"></td><td><font color=\"#ff0000\">PREPAREDSTATEMENTS =set to 'true' and php version " . phpversion() . " is incompatible<br>set PREPAREDSTATEMENTS to false or update php to >=5.1</td></tr>";
+- else $check .="<tr><td width=\"25%\">PREPAREDSTATEMENTS-<br>compatibility</td><td width=\"10\">X</td><td><font color=#00D000>set to 'true' and php " . phpversion() . " should work</td><tr/>";
++ if (phpversion()<'5.1.0') $check.="<tr><td width=\"25%\">PREPAREDSTATEMENTS</td><td width=\"10\"></td><td><font color=\"#ff0000\">PREPAREDSTATEMENTS =set to 'true' and php version " . phpversion() . " is incompatible<br>set PREPAREDSTATEMENTS to false or update php to >=5.1</td></tr>";
++ else $check .="<tr><td width=\"25%\">PREPAREDSTATEMENTS</td><td width=\"10\">X</td><td><font color=#00D000>set to 'true' and php " . phpversion() . " should work</td></tr>";
+ }
+ else{
+- if (phpversion()<'5.1.0') $check .="<tr><td width=\"25%\">PREPAREDSTATEMENTS-<br>compatibility</td><td width=\"10\">X</td><td><font color=#00D000>set to 'false' and php " . phpversion() . " should work </font><font color='#0000FF'> (but think about upgrading to php 5.1)</td><tr/>";
+- else $check .="<tr><td width=\"25%\">PREPAREDSTATEMENTS-<br>compatibility</td><td width=\"10\">X</td><td><font color=#00D000>set to 'false' and php " . phpversion() . " should work <font color=#0000FF>(but you can set PREPAREDSTATEMENTS to 'true')</font></td><tr/>";
++ if (phpversion()<'5.1.0') $check .="<tr><td width=\"25%\">PREPAREDSTATEMENTS-<br>compatibility</td><td width=\"10\">X</td><td><font color=#00D000>set to 'false' and php " . phpversion() . " should work </font><font color='#0000FF'> (but think about upgrading to php 5.1)</td></tr>";
++ else $check .="<tr><td width=\"25%\">PREPAREDSTATEMENTS-<br>compatibility</td><td width=\"10\">X</td><td><font color=#00D000>set to 'false' and php " . phpversion() . " should work <font color=#0000FF>(but you can set PREPAREDSTATEMENTS to 'true')</font></td></tr>";
+ }
+ }
+- else $check .="<tr><td width=\"25%\">PREPAREDSTATEMENTS-<br>compatibility</td><td width=\"10\"></td><td><font color=#FF0000>PREPAREDSTATEMENTS is not defined</td><tr/>";
++ else $check .="<tr><td width=\"25%\">PREPAREDSTATEMENTS-<br>compatibility</td><td width=\"10\"></td><td><font color=#FF0000>PREPAREDSTATEMENTS is not defined</td></tr>";
+ # CHARSET
+ if (CHARSET != "" && defined('CHARSET')) $check .="<tr><td>CHARSET</td><td>X</td><td><font color=#00D000>" . CHARSET . "</font><font color='#0000FF'></font></td></tr>";
+ else $check .="<tr><td>CHARSET</td><td></td><td><font color=#FF0000>CHARSET is not defined</font></td></tr>";
+@@ -226,14 +239,49 @@
+ # TMPDIR
+ if (TMPDIR != "" && defined('TMPDIR')) $check .="<tr><td>TMPDIR</td><td>X</td><td><font color=#00D000>" . TMPDIR . "</font><font color='#0000FF'></font></td></tr>";
+ else $check .="<tr><td>TMPDIR</td><td></td><td><font color=#FF0000>TMPDIR is not defined</font></td></tr>";
++# OWSPROXY
++ if (OWSPROXY != "" && defined('OWSPROXY')) $check .="<tr><td>OWSPROXY</td><td>X</td><td><font color=#00D000>" . OWSPROXY . "</font><font color=#0000FF> (Is this the right URL to your OWSPROXY?)</font></td></tr>";
++ else $check .="<tr><td>OWSPROXY</td><td></td><td><font color=#FF0000>OWSPROXY not defined</font><font color=#0000FF>(if you want to camouflage your WMS, you should think about OWSPROXY!)</font></td></tr>";
++#AUTO_UPDATE
++ if (AUTO_UPDATE != "" && defined('AUTO_UPDATE')){
++ if (AUTO_UPDATE == '1'){
++ $check .="<tr><td>AUTO_UPDATE</td><td>X</td><td>set to 1: will update all out-of-date WMS automatically<td></tr>";
++ if (!TIME_LIMIT || TIME_LIMIT == "")$check .="<tr><td>TIME_LIMIT</td><td></td><td><font color=#FF0000>you should define a TIME_LIMIT for the AUTO_UPDATE funtionallity</font><td></tr>";
++ }
++ elseif (AUTO_UPDATE == '0') $check .="<tr><td>AUTO_UPDATE</td><td>X</td><td><font color=#00D000>set to 0:</font> <font color=#0000FF>(see the result of the test and update WMS manually)</font></td></tr>";
++ else $check .="<tr><td>AUTO_UPDATE</td><td></td><td><font color=#FF0000>set to " . AUTO_UPDATE . ": this configuration value is not supported(as yet!)</td></tr>";
++ }
++ else $check .="<tr><td>AUTO_UPDATE</td><td></td><td><font color=#FF0000>AUTO_UPDATE not defined </font><font color=#0000FF>(for the wms monitoring functionality you have to define this constant)</font></td></tr>";
++# ERROR LOGGING
++ $testLog = new mb_notice("This is a test run by the Mapbender setup script.");
++ if ($testLog->result) {
++ $check .="<tr><td>ERROR LOGGING</td><td>X</td><td><font color=#00D000>" . $testLog->message . "</font></td></tr>";
++ }
++ else {
++ $check .="<tr><td>ERROR LOGGING</td><td></td><td><font color=#FF0000>" . $testLog->message . "</font></td></tr>";
++ }
++#LOG_LEVEL (off,error,warning,all)
++ if (LOG_LEVEL !="" && defined('LOG_LEVEL')){
++ if (LOG_LEVEL =='off') $check .="<tr><td>LOG_LEVEL</td><td>X</td><td>switched off: <font color=#FF0000>-no Mapbender-errors logging</font><td></tr>";
++ elseif (LOG_LEVEL =='error') $check .="<tr><td>LOG_LEVEL</td><td>X</td><td><font color=#00D000>set to 'error': </font><font color=#0000FF>-Mapbender-errors will be logged</font><td></tr>";
++ elseif (LOG_LEVEL =='warning') $check .="<tr><td>LOG_LEVEL</td><td>X</td><td><font color=#00D000>set to 'warning: </font><font color=#0000FF>- Mapbender-errors and -warnings will be logged</font><td></tr>";
++ elseif (LOG_LEVEL =='all') $check .="<tr><td>LOG_LEVEL</td><td>X</td><td><font color=#00D000>set to 'all': </font><font color=#0000FF>-really every little notice will be logged!!</font><td></tr>";
++ else $check .="<tr><td>LOG_LEVEL</td><td></td><td><font color=#FF0000>set to " . LOG_LEVEL . ": this configuration value is not supported (as yet!)</font></td></tr>";
++ }
++# PORTAL
++ if (defined('PORTAL')){
++ if (PORTAL == true) $check .="<tr><td width=\"25%\">PORTAL</td><td width=\"10\">X</td><td><font color=#00D000>true</font><font color='#0000FF'> (Users can create theirs own accounts)</font></td></tr>";
++ else $check .="<tr><td width=\"25%\">PORTAL</td><td width=\"10\">X</td><td><font color=#00D000>false<font color=#0000FF> (Users can't create their own accounts at the moment)</font></td></tr>";
++ }
++ else $check .="<tr><td width=\"25%\">PORTAL</td><td width=\"10\"></td><td><font color=#FF0000>PORTAL is not defined<font color=#0000FF>(Maybe an old configuration file?)</font></td></tr>";
+ # MAXLOGIN
+ if (MAXLOGIN != "" && defined('MAXLOGIN')) $check .="<tr><td>MAXLOGIN</td><td>X</td><td><font color=#00D000>" . MAXLOGIN . "</font><font color='#0000FF'></font></td></tr>";
+- else $check .="<tr><td>MAXLOGIN</td><td></td><td><font color=#FF0000>MAXLOGIN is not defined</font></td></tr>";
++ else $check .="<tr><td>MAXLOGIN</td><td></td><td><font color=#0000FF>MAXLOGIN is not defined</font></td></tr>";
+ # LOGIN
+- if (defined('LOGIN')) $check .= "<tr height=10/><tr><td>Login-Path</td><td colspan=2><a href='" . LOGIN . "' target='_blank'>" . LOGIN . "</a><br><font color=#0000FF> (if this link doesn't work, check out your 'URL to Login' in your mapbender.conf<br>Perhaps an alias in your httpd.conf will solve the prob')</td>";
++ if (defined('LOGIN')) $check .= "<tr height=10/><tr><td>Login-Path</td><td colspan=2><a href='" . LOGIN . "' target='_blank'>" . LOGIN . "</a><br><font color=#0000FF> (If this link doesn't work, check your url to 'Login' in your mapbender.conf<br>Perhaps an alias in your httpd.conf will solve the problem, too)</td>";
+ else $check .= "<tr height=10/><tr><td>Login-Path</td><td colspan=2><font color=#FF0000>LOGIN is not defined</font></td>";
+ echo $check;
+- echo "<tr height=10/><tr bgcolor=#F0F0F0><td colspan=3>Legend:<br><font color=#FF0000>red = maybe your Mapbender will run into trouble</font><br><font color=#0000FF>blue = just a tip</font><br><font color=#00D000>green = seems to be alright</font></td></tr>";
++ echo "<tr height=10/><tr bgcolor=#F0F0F0><td colspan=4>Legend:<br><font color=#FF0000>red = maybe your Mapbender will run into trouble</font><br><font color=#0000FF>blue = just a tip</font><br><font color=#00D000>green = seems to be alright</font></td></tr>";
+ echo "</table>";
+ echo "<tr><td colspan=3 align=right>for further informations visit <a href=\"http://www.mapbender.org/index.php/Installation_en\" target=\"_blank\"><font align=\"left\" style=\"font-weight:bold\" color=\"#000000\"> Ma</font><font color=\"#0000CE\" style=\"font-weight:bold\">p</font><font color=\"#C00000\" style=\"font-weight:bold\">b</font><font color=\"#000000\" style=\"font-weight:bold\">ender</font> installation instructions</a></td></tr>";
+ ?>
More information about the Mapbender_commits
mailing list