baculum: API endpoints code refactor

[bacula/bacula] / gui / baculum / protected / API / Pages / API / ClientStatus.php

diff --git a/gui/baculum/protected/API/Pages/API/ClientStatus.php b/gui/baculum/protected/API/Pages/API/ClientStatus.php
index cf81abe72997e4545e7c939347bbcffc905cd2f9..1a8e3618ffa7159370d4fb513193314dca281d15 100644 (file)
--- a/gui/baculum/protected/API/Pages/API/ClientStatus.php
+++ b/gui/baculum/protected/API/Pages/API/ClientStatus.php
@@ -23,12 +23,15 @@
 class ClientStatus extends BaculumAPIServer {
 
        public function get() {
-               $clientid = intval($this->Request['id']);
+               $clientid = $this->Request->contains('id') ? intval($this->Request['id']) : 0;
                $client = $this->getModule('client')->getClientById($clientid);
-               if(!is_null($client)) {
-                       $client_status = $this->getModule('bconsole')->bconsoleCommand($this->director, array('status', 'client="' . $client->name . '"'), $this->user);
-                       $this->output = $client_status->output;
-                       $this->error = (integer)$client_status->exitcode;
+               if(is_object($client)) {
+                       $result = $this->getModule('bconsole')->bconsoleCommand(
+                               $this->director,
+                               array('status', 'client="' . $client->name . '"')
+                       );
+                       $this->output = $result->output;
+                       $this->error = $result->exitcode;
                } else {
                        $this->output = ClientError::MSG_ERROR_CLIENT_DOES_NOT_EXISTS;
                        $this->error = ClientError::ERROR_CLIENT_DOES_NOT_EXISTS;