Merge pull request #617 in ZP/z-push from...

Merge pull request #617 in ZP/z-push from feature/ZP-1305-show-koe-last-connection-time-in to develop

* commit 'bf3f0374':
  ZP-1305 Save KOE's access time and alert if too old in z-push-admin.

src/lib/core/asdevice.php

@@ -59,6 +59,7 @@ class ASDevice extends StateObject {
                                     'koebuilddate' => false,
                                     'koegabbackendfolderid' => false,
                                     'koecapabilities' => array(),
+                                    'koelastaccess' => false,
                                 );
 
     static private $loadedData;

src/lib/core/devicemanager.php

@@ -98,6 +98,7 @@ class DeviceManager {
         if ($this->IsKoe() && $this->device->GetKoeVersion() !== false) {
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("KOE: %s / %s / %s", $this->device->GetKoeVersion(), $this->device->GetKoeBuild(), strftime("%Y-%m-%d %H:%M", $this->device->GetKoeBuildDate())));
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("KOE Capabilities: %s ", count($this->device->GetKoeCapabilities()) ? implode(',', $this->device->GetKoeCapabilities()) : 'unknown'));
+            ZLog::Write(LOGLEVEL_DEBUG, sprintf("KOE Last confirmed access: %s (may be up to 7h old)", ($this->device->GetKoeLastAccess() ? strftime("%Y-%m-%d %H:%M", $this->device->GetKoeLastAccess()) : 'unknown')));
         }
     }
 
@@ -164,6 +165,10 @@ class DeviceManager {
             $this->device->SetKoeBuild(Request::GetKoeBuild());
             $this->device->SetKoeBuildDate(Request::GetKoeBuildDate());
             $this->device->SetKoeCapabilities(Request::GetKoeCapabilities());
+            // update KOE last access time if it's at least 6h old
+            if ($this->device->GetKoeLastAccess() < time() - 21600) {
+                $this->device->SetKoeLastAccess(time());
+            }
         }
 
         // data to be saved

src/z-push-admin.php

@@ -977,15 +977,21 @@ class ZPushAdminCLI {
             echo "Kopano Outlook Extension:\n";
             echo "\tVersion:\t". $device->GetKoeVersion() ."\n";
             echo "\tBuild:\t\t". $device->GetKoeBuild() ."\n";
-            echo "\tBuild Date:\t". strftime("%Y-%m-%d %H:%M",$device->GetKoeBuildDate()) ."\n";
+            echo "\tBuild Date:\t". strftime("%Y-%m-%d %H:%M", $device->GetKoeBuildDate()) ."\n";
             echo "\tCapabilities:\t". (count($device->GetKoeCapabilities()) ? implode(',', $device->GetKoeCapabilities()) : 'unknown') ."\n";
+            echo "\tLast access:\t". ($device->GetKoeLastAccess() ? strftime("%Y-%m-%d", $device->GetKoeLastAccess()) : 'unknown') ."\n";
         }
 
         echo "Attention needed:\t";
 
-        if ($device->GetDeviceError())
+        if ($device->GetDeviceError()) {
             echo $device->GetDeviceError() ."\n";
-        else if (!isset($device->ignoredmessages) || empty($device->ignoredmessages)) {
+        }
+        // if KOE's access time is older than 7:01 h than the last successful sync it's probably inactive
+        elseif ($device->GetKoeLastAccess() && $device->GetKoeLastAccess() + 25260 < $device->GetLastSyncTime()) {
+            echo "KOE seems to be inactive on client\n";
+        }
+        if (!isset($device->ignoredmessages) || empty($device->ignoredmessages)) {
             echo "No errors known\n";
         }
         else {