From: Marcin Haba Date: Fri, 3 Aug 2018 19:31:11 +0000 (+0200) Subject: baculum: Fix group most recent backups option in restore wizard for mysql X-Git-Tag: Release-9.2.1~46 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=06acd79cf1a2aae327c79658a24ff1aa79498f44;p=thirdparty%2Fbacula.git baculum: Fix group most recent backups option in restore wizard for mysql --- diff --git a/gui/baculum/protected/API/Pages/API/JobsRecent.php b/gui/baculum/protected/API/Pages/API/JobsRecent.php index 8d2ef1492f..f38e79a8e5 100644 --- a/gui/baculum/protected/API/Pages/API/JobsRecent.php +++ b/gui/baculum/protected/API/Pages/API/JobsRecent.php @@ -29,7 +29,9 @@ class JobsRecent extends BaculumAPIServer { } elseif ($this->Request->contains('client') && $this->getModule('misc')->isValidName($this->Request['client'])) { $client = $this->Request['client']; $client_row = $this->getModule('client')->getClientByName($client); - $clientid = is_object($client_row) ? $client_row->clientid : null; + if (is_object($client_row)) { + $clientid = intval($client_row->clientid); + } } $filesetid = null; if ($this->Request->contains('filesetid')) { @@ -37,13 +39,15 @@ class JobsRecent extends BaculumAPIServer { } elseif ($this->Request->contains('fileset') && $this->getModule('misc')->isValidName($this->Request['fileset'])) { $fileset = $this->Request['fileset']; $fileset_row = $this->getModule('fileset')->getFileSetByName($fileset); - $filesetid = is_object($fileset_row) ? $fileset_row->filesetid : null; + if (is_object($fileset_row)) { + $filesetid = intval($fileset_row->filesetid); + } } - if (!is_int($clientid)) { + if (is_null($clientid)) { $this->output = ClientError::MSG_ERROR_CLIENT_DOES_NOT_EXISTS; $this->error = ClientError::ERROR_CLIENT_DOES_NOT_EXISTS; - } elseif (!is_int($filesetid)) { + } elseif (is_null($filesetid)) { $this->output = FileSetError::MSG_ERROR_FILESET_DOES_NOT_EXISTS; $this->error = FileSetError::ERROR_FILESET_DOES_NOT_EXISTS; } else {