Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadhura Jayaratne <madhura.cj@gmail.com>2013-04-14 22:08:30 +0400
committerMadhura Jayaratne <madhura.cj@gmail.com>2013-04-14 22:08:30 +0400
commit2ce7be77981309b0e7088d3e1a6a1f5054bd79c8 (patch)
tree6166f500db4973dd300138f1f8cf75bee70f37ac /tbl_gis_visualization.php
parent818167ad030a3f19de2da60c19387b324254f332 (diff)
HTTPS will not see OpenStreetMaps due to CSP. So do not show the checkbox also
Diffstat (limited to 'tbl_gis_visualization.php')
-rw-r--r--tbl_gis_visualization.php23
1 files changed, 16 insertions, 7 deletions
diff --git a/tbl_gis_visualization.php b/tbl_gis_visualization.php
index 136f6c06d9..f27241767d 100644
--- a/tbl_gis_visualization.php
+++ b/tbl_gis_visualization.php
@@ -149,17 +149,22 @@ foreach ($spatialCandidates as $spatialCandidate) {
<tr><td></td>
<td class="button"><input type="submit" name="displayVisualizationBtn" value="<?php echo __('Redraw'); ?>" /></td>
</tr>
+<?php
+if (! $GLOBALS['PMA_Config']->isHttps()) {
+ ?>
<tr><td class="choice" colspan="2">
<input type="checkbox" name="visualizationSettings[choice]" id="choice" value="useBaseLayer"
- <?php
-
-if (isset($visualizationSettings['choice'])) {
- echo(' checked="checked"');
-}
- ?>
+ <?php
+ if (isset($visualizationSettings['choice'])) {
+ echo(' checked="checked"');
+ }
+ ?>
/>
<label for="choice"><?php echo __("Use OpenStreetMaps as Base Layer"); ?></label>
</td></tr>
+ <?php
+}
+?>
</table>
<input type="hidden" name="displayVisualization" value="redraw">
<input type="hidden" name="sql_query" value="<?php echo htmlspecialchars($sql_query); ?>" />
@@ -204,7 +209,11 @@ if ($svg_support) {
<script language="javascript" type="text/javascript">
function drawOpenLayers()
{
- <?php echo (PMA_GIS_visualizationResults($data, $visualizationSettings, 'ol')); ?>
+ <?php
+ if (! $GLOBALS['PMA_Config']->isHttps()) {
+ echo (PMA_GIS_visualizationResults($data, $visualizationSettings, 'ol'));
+ }
+ ?>
}
</script>
</fieldset>