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

Merge pull request #515 in ZP/z-push from feature/ZP-1195-expose-webservicedevice--getdevicedetails to develop

* commit 'cbdcc5f1':
  ZP-1195 Call Request::GetUser() only once.
  ZP-1195 Expose GetDeviceDetails() via WebserviceDevice.

src/lib/webservice/webservicedevice.php

@@ -28,7 +28,7 @@
 class WebserviceDevice {
 
     /**
-     * Returns a list of all known devices of the Request::GetGETUser()
+     * Returns a list of all known devices of the Request::GetGETUser().
      *
      * @access public
      * @return array
@@ -48,7 +48,22 @@ class WebserviceDevice {
     }
 
     /**
-     * Remove all state data for a device of the Request::GetGETUser()
+     * Returns the details of a given deviceid of the Request::GetGETUser().
+     *
+     * @access public
+     * @return ASDevice object
+     */
+    public function GetDeviceDetails($deviceId) {
+        $user = Request::GetGETUser();
+        $deviceId = preg_replace("/[^A-Za-z0-9]/", "", $deviceId);
+        ZLog::Write(LOGLEVEL_INFO, sprintf("WebserviceDevice::GetDeviceDetails('%s'): getting device details from state of user '%s'", $deviceId, $user));
+
+        ZPush::GetTopCollector()->AnnounceInformation(sprintf("Retrieved details of device '%s'", $deviceId), true);
+        return ZPushAdmin::GetDeviceDetails($deviceId, $user);
+    }
+
+    /**
+     * Remove all state data for a device of the Request::GetGETUser().
      *
      * @param string    $deviceId       the device id
      *
@@ -70,7 +85,7 @@ class WebserviceDevice {
     }
 
     /**
-     * Marks a device of the Request::GetGETUser() to be remotely wiped
+     * Marks a device of the Request::GetGETUser() to be remotely wiped.
      *
      * @param string    $deviceId       the device id
      *