bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-11-08 00:31:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

keepalive fix for buggy browsers

Browse Source
This commit is contained in:
SJ 2014-09-17 15:51:35 +02:00
parent 836a15663f
commit 70d4db53b7
3 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webui/config.php
View File

@ -236,7 +236,7 @@ $memcached_servers = array(
array('127.0.0.1', 11211) array('127.0.0.1', 11211)
); );
$partitions_to_monitor = array('/', '/home', '/var', '/tmp'); $partitions_to_monitor = array('/', '/home', '/var', '/var/piler', '/tmp');
$config['DATA_PARTITION'] = '/var'; $config['DATA_PARTITION'] = '/var';
$config['DELIMITER'] = "\t"; $config['DELIMITER'] = "\t";

19
webui/js.php
View File

@ -7,25 +7,6 @@ $language = new Language();
$javascript = DIR_BASE . '/view/javascript/piler-in.js'; $javascript = DIR_BASE . '/view/javascript/piler-in.js';
/*
* some funky User-Agent scripts:
*
*
* - chrome: Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.120 Safari/537.36
*
* - firefox: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:32.0) Gecko/20100101 Firefox/32.0
*
* - IE 11: Mozilla/5.0 (Windows NT 6.3; WOW64; Trident/7.0; rv:11.0) like Gecko
*
*/
if(OUTLOOK == 1 || strstr($_SERVER['HTTP_USER_AGENT'], " MSIE") || strstr($_SERVER['HTTP_USER_AGENT'], "Trident")) {
define('BROWSER_WITH_NTLM_BUG', 1);
} else {
define('BROWSER_WITH_NTLM_BUG', 0);
}
Header("Content-Type: text/javascript"); Header("Content-Type: text/javascript");
require_once($javascript); require_once($javascript);

7
webui/view/javascript/piler-in.js
View File

@ -1176,13 +1176,18 @@ var Piler =
poor_mans_keepalive_for_dummy_browsers: function() poor_mans_keepalive_for_dummy_browsers: function()
{ {
<?php if(BROWSER_WITH_NTLM_BUG == 1 && ENABLE_SSO_LOGIN == 1) { ?> <?php if(ENABLE_SSO_LOGIN == 1) { ?>
// MSIE 11 and Outlook 2013 match this condition
if(Object.hasOwnProperty.call(window, "ActiveXObject") && !window.ActiveXObject) {
Piler.log("[poor_mans_keepalive_for_dummy_browsers]"); Piler.log("[poor_mans_keepalive_for_dummy_browsers]");
jQuery.ajax('/ok.txt', { async: false }) jQuery.ajax('/ok.txt', { async: false })
.done( function(a) { } ) .done( function(a) { } )
.fail(function(a, b) { alert("Problem retrieving XML data:" + b) }); .fail(function(a, b) { alert("Problem retrieving XML data:" + b) });
}
<?php } ?> <?php } ?>