From 70d4db53b7e4c4f8221d3015d8ea867cc20e6f3a Mon Sep 17 00:00:00 2001
From: SJ <sj@acts.hu>
Date: Wed, 17 Sep 2014 15:51:35 +0200
Subject: [PATCH] keepalive fix for buggy browsers

---
 webui/config.php                  |  2 +-
 webui/js.php                      | 19 -------------------
 webui/view/javascript/piler-in.js | 15 ++++++++++-----
 3 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/webui/config.php b/webui/config.php
index 76c316af..82e3404c 100644
--- a/webui/config.php
+++ b/webui/config.php
@@ -236,7 +236,7 @@ $memcached_servers = array(
       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['DELIMITER'] = "\t";
diff --git a/webui/js.php b/webui/js.php
index d82cbf62..be7ac054 100644
--- a/webui/js.php
+++ b/webui/js.php
@@ -7,25 +7,6 @@ $language = new Language();
 
 $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");
 require_once($javascript);
 
diff --git a/webui/view/javascript/piler-in.js b/webui/view/javascript/piler-in.js
index af0ec406..50030be7 100644
--- a/webui/view/javascript/piler-in.js
+++ b/webui/view/javascript/piler-in.js
@@ -1176,13 +1176,18 @@ var Piler =
     poor_mans_keepalive_for_dummy_browsers: function()
     {
 
-<?php if(BROWSER_WITH_NTLM_BUG == 1 && ENABLE_SSO_LOGIN == 1) { ?>
+<?php if(ENABLE_SSO_LOGIN == 1) { ?>
 
-       Piler.log("[poor_mans_keepalive_for_dummy_browsers]");
+       // MSIE 11 and Outlook 2013 match this condition
 
-       jQuery.ajax('/ok.txt', { async:   false })
-       .done( function(a) { } )
-       .fail(function(a, b) { alert("Problem retrieving XML data:" + b) });
+       if(Object.hasOwnProperty.call(window, "ActiveXObject") && !window.ActiveXObject) {
+
+          Piler.log("[poor_mans_keepalive_for_dummy_browsers]");
+
+          jQuery.ajax('/ok.txt', { async:   false })
+          .done( function(a) { } )
+          .fail(function(a, b) { alert("Problem retrieving XML data:" + b) });
+       }
 
 <?php } ?>