[Mapbender-commits] r5367 - trunk/mapbender/http/javascripts

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2010-01-20 08:02:17 -0500 (Wed, 20 Jan 2010)
New Revision: 5367

Modified:
   trunk/mapbender/http/javascripts/map.php
Log:


Modified: trunk/mapbender/http/javascripts/map.php
===================================================================
--- trunk/mapbender/http/javascripts/map.php	2010-01-20 13:01:56 UTC (rev 5366)
+++ trunk/mapbender/http/javascripts/map.php	2010-01-20 13:02:17 UTC (rev 5367)
@@ -33,23 +33,26 @@
 //
 // Define global variables (TODO: move to mapbender object later on)
 //
-echo "var mb_nr = Mapbender.sessionId = '".session_id()."';";
-echo "var mb_session_name = Mapbender.sessionName = '".session_name()."';";
-echo "var mb_myLogin = Mapbender.loginUrl = '".Mapbender::session()->get("mb_login")."';";
-echo "var mb_styleID = '".md5(Mapbender::session()->get("mb_user_name"))."';";
-echo "var mb_myBBOX = '".Mapbender::session()->get("mb_myBBOX")."';";
-echo "Mapbender.locale = '" . Mapbender::session()->get("mb_locale") . "';";
-echo "Mapbender.languageId = '" . Mapbender::session()->get("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."';";
-echo "var global_log_levels = '".LOG_LEVEL_LIST."';";
-echo "var mb_feature_count = ".MB_FEATURE_COUNT.";";
-echo "var mb_resolution = ".MB_RESOLUTION.";";
-echo "var mb_security_proxy = '" . MB_SECURITY_PROXY . "';";
+echo "Mapbender.sessionId = '".session_id()."';\n";
+echo "var mb_nr = Mapbender.sessionId;\n";
+echo "Mapbender.sessionName = '".session_name()."';\n";
+echo "var mb_session_name = Mapbender.sessionName;\n";
+echo "Mapbender.loginUrl = '".Mapbender::session()->get("mb_login")."';\n";
+echo "var mb_myLogin = Mapbender.loginUrl;\n";
+echo "var mb_styleID = '".md5(Mapbender::session()->get("mb_user_name"))."';\n";
+echo "var mb_myBBOX = '".Mapbender::session()->get("mb_myBBOX")."';\n";
+echo "Mapbender.locale = '" . Mapbender::session()->get("mb_locale") . "';\n";
+echo "Mapbender.languageId = '" . Mapbender::session()->get("mb_lang") . "';\n";
+echo "Mapbender.versionNumber = '" . MB_VERSION_NUMBER . "';\n";
+echo "Mapbender.versionAppendix = '" . MB_VERSION_APPENDIX . "';\n";
+echo "Mapbender.releaseDate = new Date(".date("Y",MB_RELEASE_DATE).",".date("n",MB_RELEASE_DATE).",".date("j",MB_RELEASE_DATE).");\n";
+echo "var owsproxy = '".OWSPROXY."';\n";
+echo "var global_mb_log_js = '".LOG_JS."';\n";
+echo "var global_mb_log_level = '".LOG_LEVEL."';\n";
+echo "var global_log_levels = '".LOG_LEVEL_LIST."';\n";
+echo "var mb_feature_count = ".MB_FEATURE_COUNT.";\n";
+echo "var mb_resolution = ".MB_RESOLUTION.";\n";
+echo "var mb_security_proxy = '" . MB_SECURITY_PROXY . "';\n";
 
 //
 // Load external JavaScript libraries
@@ -59,12 +62,13 @@
 if (!LOAD_JQUERY_FROM_GOOGLE) {
 	$extFileArray[]= "jquery-ui-1.7.2.custom/js/jquery-1.3.2.min.js";
 }
-$extFileArray[]= "jqjson.min.js";
+$extFileArray[]= "jqjson.js";
 
 for ($i = 0; $i < count($extFileArray); $i++) {
 	$currentFile = $extPath . $extFileArray[$i];
 	if (file_exists($currentFile)) {
 		require_once($currentFile);
+		echo "\n\n\n\n";
 	}
 	else {
 		$e = new mb_exception("Extension not found: " . $currentFile);
@@ -93,7 +97,7 @@
 	$currentFile = $libPath . $libFileArray[$i];
 	if (file_exists($currentFile)) {
 		require_once($currentFile);
-		echo "\n";
+		echo "\n\n\n\n";
 	}
 	else {
 		$e = new mb_exception("Library not found: " . $currentFile);