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

[svn_mapbender at osgeo.org]

Author: kmq
Date: 2010-11-02 04:00:11 -0700 (Tue, 02 Nov 2010)
New Revision: 7081

Modified:
   trunk/mapbender/http/javascripts/map.php
Log:
Changed countervariablename in the loop that includes modules.  was used until now, which can create conflicts when includding .php files that generate javascript 

Modified: trunk/mapbender/http/javascripts/map.php
===================================================================
--- trunk/mapbender/http/javascripts/map.php	2010-11-02 09:07:09 UTC (rev 7080)
+++ trunk/mapbender/http/javascripts/map.php	2010-11-02 11:00:11 UTC (rev 7081)
@@ -125,12 +125,12 @@
 	}
 }
 
-for ($i = 0; $i < count($moduleArray); $i++) {
-	if (trim($moduleArray[$i]) !== "") {
+for ($moduleIndex = 0; $moduleIndex < count($moduleArray); $moduleIndex++) {
+	if (trim($moduleArray[$moduleIndex]) !== "") {
 		$fileFound = false;
 		$pathArray = explode(",", MODULE_SEARCH_PATHS);
 		foreach ($pathArray as $path) {
-			$currentFile = dirname(__FILE__) . "/" . $path . trim($moduleArray[$i]);
+			$currentFile = dirname(__FILE__) . "/" . $path . trim($moduleArray[$moduleIndex]);
 			if (file_exists($currentFile)) {
 				$e = new mb_notice("LOADING module : " . $currentFile);
 				require_once($currentFile);
@@ -145,8 +145,8 @@
 		}
 	}
 
-	$e = new mb_exception("Javascript module not found: " . trim($moduleArray[$i]));
-	echo "var e = new Mb_exception('Javascript module not found: " . trim($moduleArray[$i]) . "');";
+	$e = new mb_exception("Javascript module not found: " . trim($moduleArray[$moduleIndex]));
+	echo "var e = new Mb_exception('Javascript module not found: " . trim($moduleArray[$moduleIndex]) . "');";
 }
 
 //