Add device's currently cached heartbeat interval to the device display.

horde · May 16, 2014 · 6712a44 · 6712a44
1 parent 2a6a67b
commit 6712a44
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/horde/admin/activesync.php b/horde/admin/activesync.php
@@ -82,6 +82,10 @@
 $js = array();
 foreach ($devices as $key => $device) {
     $dev = $state->loadDeviceInfo($device['device_id'], $device['device_user']);
+    $syncCache = new Horde_ActiveSync_SyncCache($state, $dev->id, $dev->user, $injector->getInstance('Horde_Log_Logger'));
+    $dev->hbinterval = $syncCache->hbinterval
+        ? $syncCache->hbinterval
+        : ($syncCache->wait ? $syncCache->wait * 60 : _("Unavailable"));
     $js[$dev->id] = array(
         'id' => $dev->id,
         'user' => $dev->user

diff --git a/horde/lib/Prefs/Special/Activesync.php b/horde/lib/Prefs/Special/Activesync.php
@@ -48,6 +48,10 @@ public function display(Horde_Core_Prefs_Ui $ui)
                 'id' => $dev->id,
                 'user' => $dev->user
             );
+            $syncCache = new Horde_ActiveSync_SyncCache($state, $dev->id, $dev->user, $injector->getInstance('Horde_Log_Logger'));
+            $dev->hbinterval = $syncCache->hbinterval
+                ? $syncCache->hbinterval
+                : ($syncCache->wait ? $syncCache->wait * 60 : _("Unavailable"));
             $devs[] = $dev;
         }
 

diff --git a/horde/templates/activesync/device_table.html.php b/horde/templates/activesync/device_table.html.php
@@ -26,6 +26,7 @@
         <?php foreach ($d->getFormattedDeviceProperties() as $key => $value): ?>
           <?php echo '<b>' . $key . '</b>: ' . $value . '<br />' ?>
         <?php endforeach; ?>
+        <b><?php echo _("Cached Heartbeat (seconds)")?></b>: <?php echo $d->hbinterval ?><br />
       </td>
       <td>
         <?php if ($d->policykey): ?>

diff --git a/horde/templates/prefs/activesync.html.php b/horde/templates/prefs/activesync.html.php
@@ -53,6 +53,7 @@
     <?php foreach ($d->getFormattedDeviceProperties() as $key => $value): ?>
       <?php echo '<b>' . $key . '</b>: ' . $value . '<br />' ?>
     <?php endforeach; ?>
+    <b><?php echo _("Cached Heartbeat (seconds)")?></b>: <?php echo $d->hbinterval ?><br />
   </td>
  </tr>
 <?php endforeach; ?>