From 9b2c6d08be1a0ee92d6f4a5d815cbf3903d11541 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Fri, 11 Nov 2016 23:05:36 -0500
Subject: [PATCH] Fix autorefresh

---
 admin/admin_main.php    | 12 ++++++-----
 admin/show_tickets.php  |  1 +
 inc/header.inc.php      | 44 -----------------------------------------
 inc/headerAdmin.inc.php | 44 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/admin/admin_main.php b/admin/admin_main.php
index 9f9c519a..f4e036e9 100644
--- a/admin/admin_main.php
+++ b/admin/admin_main.php
@@ -82,11 +82,13 @@ else {
             </div>
         </div>
         <div class="box-body">
-            <label>
-                <input type="checkbox" onclick="toggleAutoRefresh(this);" id="reloadCB">
-                <?php echo $hesklang['arp']; ?>
-                <span id="timer"></span>
-            </label>
+            <div class="checkbox">
+                <label>
+                    <input type="checkbox" onclick="toggleAutoRefresh(this);" id="reloadCB">
+                    <?php echo $hesklang['arp']; ?>
+                    <span id="timer"></span>
+                </label>
+            </div>
             <script type="text/javascript">heskCheckReloading();</script><br>
             <?php
             /* Print tickets? */
diff --git a/admin/show_tickets.php b/admin/show_tickets.php
index 22ff698b..2ff64261 100644
--- a/admin/show_tickets.php
+++ b/admin/show_tickets.php
@@ -70,6 +70,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
             </div>
         </div>
         <div class="box-body">
+            
             <label>
                 <input type="checkbox" onclick="toggleAutoRefresh(this);" id="reloadCB">
                 <?php echo $hesklang['arp']; ?>
diff --git a/inc/header.inc.php b/inc/header.inc.php
index efc1f34e..1d03dd02 100644
--- a/inc/header.inc.php
+++ b/inc/header.inc.php
@@ -241,50 +241,6 @@ if (is_dir(HESK_PATH . 'install')) {
         echo '<script src="https://www.google.com/recaptcha/api.js?hl=' . $hesklang['RECAPTCHA'] . '" async defer></script>';
     }
 
-    // Auto reload
-    if (defined('AUTO_RELOAD') && hesk_checkPermission('can_view_tickets',0) && ! isset($_SESSION['hide']['ticket_list'])) {
-        ?>
-        <script type="text/javascript">
-            var count = <?php echo empty($_SESSION['autoreload']) ? 30 : intval($_SESSION['autoreload']); ?>;
-            var reloadcounter;
-            var countstart = count;
-
-            function heskReloadTimer() {
-                count = count-1;
-                if (count &lt;= 0) {
-                    clearInterval(reloadcounter);
-                    window.location.reload();
-                    return;
-                }
-
-                document.getElementById("timer").innerHTML = "(" + count + ")";
-            }
-
-            function heskCheckReloading() {
-                if (<?php if ($_SESSION['autoreload']) echo "getCookie('autorefresh') == null || "; ?>getCookie('autorefresh') == '1') {
-                    document.getElementById("reloadCB").checked=true;
-                    document.getElementById("timer").innerHTML = "(" + count + ")";
-                    reloadcounter = setInterval(heskReloadTimer, 1000);
-                }
-            }
-
-            function toggleAutoRefresh(cb) {
-                if (cb.checked) {
-                    setCookie('autorefresh', '1');
-                    document.getElementById("timer").innerHTML = "(" + count + ")";
-                    reloadcounter = setInterval(heskReloadTimer, 1000);
-                } else {
-                    setCookie('autorefresh', '0');
-                    count = countstart;
-                    clearInterval(reloadcounter);
-                    document.getElementById("timer").innerHTML = "";
-                }
-            }
-
-        </script>
-        <?php
-    }
-
     if (defined('VALIDATOR')) {
         ?>
         <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/validation-scripts.js"></script>
diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index 53274e4f..c53bd84f 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -210,6 +210,50 @@ $modsForHesk_settings = mfh_getSettings();
         }
     }
 
+    // Auto reload
+    if (defined('AUTO_RELOAD') && hesk_checkPermission('can_view_tickets',0) && ! isset($_SESSION['hide']['ticket_list'])) {
+        ?>
+        <script type="text/javascript">
+            var count = <?php echo empty($_SESSION['autoreload']) ? 30 : intval($_SESSION['autoreload']); ?>;
+            var reloadcounter;
+            var countstart = count;
+
+            function heskReloadTimer() {
+                count = count-1;
+                if (count <= 0) {
+                    clearInterval(reloadcounter);
+                    window.location.reload();
+                    return;
+                }
+
+                document.getElementById("timer").innerHTML = "(" + count + ")";
+            }
+
+            function heskCheckReloading() {
+                if (<?php if ($_SESSION['autoreload']) echo "getCookie('autorefresh') == null || "; ?>getCookie('autorefresh') == '1') {
+                    document.getElementById("reloadCB").checked=true;
+                    document.getElementById("timer").innerHTML = "(" + count + ")";
+                    reloadcounter = setInterval(heskReloadTimer, 1000);
+                }
+            }
+
+            function toggleAutoRefresh(cb) {
+                if (cb.checked) {
+                    setCookie('autorefresh', '1');
+                    document.getElementById("timer").innerHTML = "(" + count + ")";
+                    reloadcounter = setInterval(heskReloadTimer, 1000);
+                } else {
+                    setCookie('autorefresh', '0');
+                    count = countstart;
+                    clearInterval(reloadcounter);
+                    document.getElementById("timer").innerHTML = "";
+                }
+            }
+
+        </script>
+        <?php
+    }
+
     if (defined('MFH_CALENDAR')) { ?>
         <script src="<?php echo HESK_PATH; ?>js/calendar/moment.js"></script>
         <script src="<?php echo HESK_PATH; ?>js/calendar/fullcalendar.min.js"></script>