[Mapbender-commits] r2197 - in branches/2.5: conf http http/javascripts http/php

Thu Mar 6 09:25:09 EST 2008

Author: nimix
Date: 2008-03-06 09:25:08 -0500 (Thu, 06 Mar 2008)
New Revision: 2197

Added:
   branches/2.5/http/php/system.php
Modified:
   branches/2.5/conf/mapbender.conf-dist
   branches/2.5/http/index.php
   branches/2.5/http/javascripts/map.php
   branches/2.5/http/php/mb_validateSession.php
Log:
add system.php with version string

Modified: branches/2.5/conf/mapbender.conf-dist
===================================================================

--- branches/2.5/conf/mapbender.conf-dist	2008-03-06 14:21:30 UTC (rev 2196)
+++ branches/2.5/conf/mapbender.conf-dist	2008-03-06 14:25:08 UTC (rev 2197)
@@ -139,9 +139,8 @@
 # Mapbender error logging
 # --------------------------------------------
 
-define("LOG_LEVEL_LIST", "off,error,warning,notice,all"); // DO NOT CHANGE!!
-define("LOG_LEVEL", "off"); // one of the above
-define("LOG_JS", "off"); // "on", "alert", "console", "off"
+define("LOG_LEVEL", "all"); //"off","error","warning","notice" or "all"
+define("LOG_JS", "on"); // "on", "alert", "console" or "off"
 
 ###HACK for GLOBALS
 $DBSERVER=DBSERVER;

Modified: branches/2.5/http/index.php
===================================================================
--- branches/2.5/http/index.php	2008-03-06 14:21:30 UTC (rev 2196)
+++ branches/2.5/http/index.php	2008-03-06 14:25:08 UTC (rev 2197)
@@ -17,6 +17,8 @@
 # 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.
+
+include_once(dirname(__FILE__)."/php/system.php");
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//Dtd HTML 4.01 Transitional//EN">
 <html>
@@ -109,7 +111,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.2 (2007-07-30)</font>
+		<font color="#ff0000">Mapbender Version <?php echo MB_VERSION_NUMBER." ".MB_VERSION_APPENDIX?> (<?php echo date("d-m-Y",MB_RELEASE_DATE);?>)</font>
 		</td></tr>
 	</table>
 <br>

Modified: branches/2.5/http/javascripts/map.php
===================================================================
--- branches/2.5/http/javascripts/map.php	2008-03-06 14:21:30 UTC (rev 2196)
+++ branches/2.5/http/javascripts/map.php	2008-03-06 14:25:08 UTC (rev 2197)
@@ -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.
 
-session_start();
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
+require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 require_once(dirname(__FILE__)."/../classes/class_wms.php");
 
 // see http://trac.osgeo.org/mapbender/ticket/79
@@ -61,6 +60,9 @@
 echo "var mapbender = {};";
 echo "mapbender.locale = '" . $_SESSION["mb_locale"] . "';";
 echo "mapbender.languageId = '" . $_SESSION["mb_lang"] . "';";
+echo "mapbender.versionNumber = '" . MB_VERSION_NUMBER . "';";
+echo "mapbender.versionAppendix = '" . MB_VERSION_APPENDIX . "';";
+echo "mapbender.releaseDate = new Date(".date("Y",MB_RELEASE_DATE).",".date("n",MB_RELEASE_DATE).",".date("j",MB_RELEASE_DATE).");";
 echo "var owsproxy = '".OWSPROXY."';";
 echo "var global_mb_log_js = '".LOG_JS."';";
 echo "var global_mb_log_level = '".LOG_LEVEL."';";

Modified: branches/2.5/http/php/mb_validateSession.php
===================================================================
--- branches/2.5/http/php/mb_validateSession.php	2008-03-06 14:21:30 UTC (rev 2196)
+++ branches/2.5/http/php/mb_validateSession.php	2008-03-06 14:25:08 UTC (rev 2197)
@@ -18,6 +18,8 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 session_start();
+
+require_once(dirname(__FILE__)."/../php/system.php");
 require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
 require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
 

Added: branches/2.5/http/php/system.php
===================================================================
--- branches/2.5/http/php/system.php	                        (rev 0)
+++ branches/2.5/http/php/system.php	2008-03-06 14:25:08 UTC (rev 2197)
@@ -0,0 +1,32 @@
+<?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", "RC1");
+define("MB_RELEASE_DATE", mktime(0,0,0,3,6,2008));//h, min,sec,month,day,year
+
+#
+#available log levels 
+#
+define("LOG_LEVEL_LIST", "off,error,warning,notice,all");
+
+
+

