[Mapbender-commits] r7556 - in trunk/mapbender/http: geoportal php

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2011-02-10 06:27:45 -0800 (Thu, 10 Feb 2011)
New Revision: 7556

Modified:
   trunk/mapbender/http/geoportal/mod_initialStartWmc.php
   trunk/mapbender/http/php/mod_getServiceDisclaimer.php
Log:
bugfixes

Modified: trunk/mapbender/http/geoportal/mod_initialStartWmc.php
===================================================================
--- trunk/mapbender/http/geoportal/mod_initialStartWmc.php	2011-02-10 14:05:56 UTC (rev 7555)
+++ trunk/mapbender/http/geoportal/mod_initialStartWmc.php	2011-02-10 14:27:45 UTC (rev 7556)
@@ -57,7 +57,7 @@
 	$classJSON = new Mapbender_JSON;
 }
 if ($languageCode == 'en'){
-	$pathToLoadScript = '/portal/maps.html?WMC=';
+	$pathToLoadScript = '/portal/en/maps.html?WMC=';
 }
 //define sql for selecting informations from database:
 $sql = "";

Modified: trunk/mapbender/http/php/mod_getServiceDisclaimer.php
===================================================================
--- trunk/mapbender/http/php/mod_getServiceDisclaimer.php	2011-02-10 14:05:56 UTC (rev 7555)
+++ trunk/mapbender/http/php/mod_getServiceDisclaimer.php	2011-02-10 14:27:45 UTC (rev 7556)
@@ -241,7 +241,7 @@
 			$accessConstraints .= display_text($row['accessconstraints']);
 			echo $t_a.$htmlHeader['accessConstraintsHeader'].$t_b.$accessConstraints.$t_c;
 		}
-		if (isset($row['termsofuse_id']) or (strtoupper($row['fees']) != "NONE" & ($row['fees'] != '')) or ($type == "wms" & isset($row['wms_pricevolume']) & $row['wms_pricevolume'] != 0) ) {
+		if (isset($row['termsofuse_id']) or (strtoupper($row['fees']) != "NONE" & (str_replace(" ", "", $row['fees']) != "")) or ($type == "wms" & isset($row['wms_pricevolume']) & $row['wms_pricevolume'] != 0) ) {
 			$feesPart = $t_a.$htmlHeader['feesHeader'].$t_b;
 			if (isset($row['termsofuse_id'])) {
 				$fees = $htmlHeader['licences'];
@@ -285,7 +285,7 @@
 			echo "<h2>".$htmlHeader['accessConstraintsHeader']."</h2>";
 			echo $accessConstraints."<br>";
 		}
-		if (isset($row['termsofuse_id']) or (strtoupper($row['fees']) != "NONE" & ($row['fees'] != '')) or ($type == "wms" & isset($row['wms_pricevolume']) & $row['wms_pricevolume'] != 0) ) {
+		if (isset($row['termsofuse_id']) or (strtoupper($row['fees']) != "NONE" & (str_replace(" ", "", $row['fees']) != "")) or ($type == "wms" & isset($row['wms_pricevolume']) & $row['wms_pricevolume'] != 0) ) {
 			echo "<h2>".$htmlHeader['feesHeader']."</h2>";
 			if (isset($row['termsofuse_id'])) {
 				$fees = $htmlHeader['licences'];