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

2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* operation/events/events.php: Fixed sound event popup over https.
	
	Fixes: #3443835



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5198 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-11-29 12:17:39 +00:00
parent 09dd9885fd
commit 66b07c6ebd
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/events/events.php: Fixed sound event popup over https.
Fixes: #3443835
2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_reporting.php: Removed entities in events

4
pandora_console/operation/events/events.php
View File

@ -207,11 +207,11 @@ if ($config["pure"] == 0) {
);
ui_print_page_header (__("Events"), "images/lightning_go.png", false, "eventview", false, $buttons);
?>
<script type="text/javascript">
function openSoundEventWindow() {
url = '<?php echo 'http://' . $_SERVER['SERVER_NAME'] . $config['homeurl'] . '/operation/events/sound_events.php'; ?>';
url = '<?php $protocol = $config['https'] ? 'https' : 'http'; echo $protocol . '://' . $_SERVER['SERVER_NAME'] . $config['homeurl'] . '/operation/events/sound_events.php'; ?>';
window.open(url, '<?php __('Sound Alerts'); ?>','width=300, height=300, toolbar=no, location=no, directories=no, status=no, menubar=no');
}