tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2014-01-09 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions.php: added function "https_is_running".
	
	* include/functions_gis.php, operation/gis_maps/render_view.php,
	operation/gis_maps/public_console.php, godmode/setup/gis_step_2.php:
	fixed the urls for google maps when it is running in https mode.
	
	Fixes: #2403




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9303 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2014-01-09 13:33:16 +00:00
parent 613df874b7
commit be56740004
6 changed files with 96 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2014-01-09 Miguel de Dios <miguel.dedios@artica.es>
* include/functions.php: added function "https_is_running".
* include/functions_gis.php, operation/gis_maps/render_view.php,
operation/gis_maps/public_console.php, godmode/setup/gis_step_2.php:
fixed the urls for google maps when it is running in https mode.
Fixes: #2403
2014-01-09 Junichi Satoh <junichi@rworks.jp>
* godmode/servers/plugin.php: Fixed that unexpected strings are set

11
pandora_console/include/functions.php
View File

@ -68,6 +68,17 @@ require_once('functions_io.php');
// }
//}
function https_is_running() {
if (isset ($_SERVER['HTTPS'])
&& ($_SERVER['HTTPS'] === true
|| $_SERVER['HTTPS'] == 'on')) {
return true;
}
return false;
}
/**
* Cleans an object or an array and casts all values as integers
*

11
pandora_console/include/functions_gis.php
View File

@ -1001,9 +1001,16 @@ function gis_get_agent_map($agent_id, $heigth, $width, $show_history = false, $c
}
if ($gmap_layer === true) {
?>
if (https_is_running()) {
?>
<script type="text/javascript" src="https://maps.google.com/maps?file=api&v=2&sensor=false&key=<?php echo $gmap_key ?>" ></script>
<?php
}
else {
?>
<script type="text/javascript" src="http://maps.google.com/maps?file=api&v=2&sensor=false&key=<?php echo $gmap_key ?>" ></script>
<?php
<?php
}
}
gis_print_map($agent_name . "_agent_map", $defaultMap['zoom_level'],

7
pandora_console/operation/gis_maps/public_console.php
View File

@ -94,9 +94,16 @@ if ($confMap !== false) {
}
}
if ($gmap_layer === true) {
if (https_is_running()) {
?>
<script type="text/javascript" src="https://maps.google.com/maps?file=api&v=2&sensor=false&key=<?php echo $gmap_key ?>" ></script>
<?php
}
else {
?>
<script type="text/javascript" src="http://maps.google.com/maps?file=api&v=2&sensor=false&key=<?php echo $gmap_key ?>" ></script>
<?php
}
}
$controls = array('PanZoomBar', 'ScaleLine', 'Navigation', 'MousePosition', 'layerSwitcher');

8
pandora_console/operation/gis_maps/render_view.php
View File

@ -72,10 +72,18 @@ if ($confMap !== false) {
}
}
}
if ($gmap_layer === true) {
if (https_is_running()) {
?>
<script type="text/javascript" src="https://maps.google.com/maps?file=api&v=2&sensor=false&key=<?php echo $gmap_key ?>" ></script>
<?php
}
else {
?>
<script type="text/javascript" src="http://maps.google.com/maps?file=api&v=2&sensor=false&key=<?php echo $gmap_key ?>" ></script>
<?php
}
}
$controls = array('PanZoomBar', 'ScaleLine', 'Navigation', 'MousePosition', 'layerSwitcher');