From: Marcin Haba Date: Wed, 3 Aug 2022 07:31:27 +0000 (+0200) Subject: baculum: Adapt code to use PSR-4 autoloader X-Git-Tag: Release-13.0.1~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34718ec5e1dba754609f51a3f9831238d8cd58a1;p=thirdparty%2Fbacula.git baculum: Adapt code to use PSR-4 autoloader --- diff --git a/gui/baculum/Makefile b/gui/baculum/Makefile index 7d1f3196c..af889576d 100644 --- a/gui/baculum/Makefile +++ b/gui/baculum/Makefile @@ -37,7 +37,7 @@ examples = examples configcachedir = $(datadir)/runtime samplesdir = $(examples)/$(SAMPLETYPE) -webdatadirsrc = $(datadir)/$(webdir)/Class \ +webdatadirsrc = $(datadir)/$(webdir)/Modules \ $(datadir)/$(webdir)/Config \ $(datadir)/$(webdir)/JavaScript \ $(datadir)/$(webdir)/Data \ @@ -46,14 +46,14 @@ webdatadirsrc = $(datadir)/$(webdir)/Class \ $(datadir)/$(webdir)/Pages \ $(datadir)/$(webdir)/Portlets -apidatadirsrc = $(datadir)/$(apidir)/Class \ +apidatadirsrc = $(datadir)/$(apidir)/Modules \ $(datadir)/$(apidir)/Config \ $(datadir)/$(apidir)/Layouts \ $(datadir)/$(apidir)/Logs \ $(datadir)/$(apidir)/Pages \ $(datadir)/$(apidir)/Portlets -commondatadirsrc = $(datadir)/$(commondir)/Class \ +commondatadirsrc = $(datadir)/$(commondir)/Modules \ $(datadir)/$(commondir)/JavaScript \ $(datadir)/$(commondir)/Pages \ $(datadir)/$(commondir)/Portlets diff --git a/gui/baculum/protected/API/Layouts/Main.php b/gui/baculum/protected/API/Layouts/Main.php index f18c9b4b6..b8703f0ed 100644 --- a/gui/baculum/protected/API/Layouts/Main.php +++ b/gui/baculum/protected/API/Layouts/Main.php @@ -19,8 +19,8 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - -Prado::using('Application.Common.Class.Params'); + +use Prado\Web\UI\TTemplateControl; /** * Main layout. diff --git a/gui/baculum/protected/API/Layouts/Main.tpl b/gui/baculum/protected/API/Layouts/Main.tpl index b826c083a..0310e5b20 100644 --- a/gui/baculum/protected/API/Layouts/Main.tpl +++ b/gui/baculum/protected/API/Layouts/Main.tpl @@ -20,7 +20,7 @@ /> /> /> - +
@@ -28,7 +28,7 @@
- +
<%[ Version: ]%> <%=Params::BACULUM_VERSION%>
diff --git a/gui/baculum/protected/API/Layouts/Wizard.php b/gui/baculum/protected/API/Layouts/Wizard.php index 4ce694a3a..88b4f3e0a 100644 --- a/gui/baculum/protected/API/Layouts/Wizard.php +++ b/gui/baculum/protected/API/Layouts/Wizard.php @@ -19,7 +19,9 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Prado\Web\UI\TTemplateControl; + /** * Wizard layout. * diff --git a/gui/baculum/protected/API/Class/APIConfig.php b/gui/baculum/protected/API/Modules/APIConfig.php similarity index 98% rename from gui/baculum/protected/API/Class/APIConfig.php rename to gui/baculum/protected/API/Modules/APIConfig.php index 014ac2c59..24090973c 100644 --- a/gui/baculum/protected/API/Class/APIConfig.php +++ b/gui/baculum/protected/API/Modules/APIConfig.php @@ -20,7 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.Common.Class.ConfigFileModule'); +namespace Baculum\API\Modules; + +use Baculum\Common\Modules\ConfigFileModule; /** * Manage API configuration. @@ -40,7 +42,7 @@ class APIConfig extends ConfigFileModule { /** * API config file path */ - const CONFIG_FILE_PATH = 'Application.API.Config.api'; + const CONFIG_FILE_PATH = 'Baculum.API.Config.api'; /** * API config file format diff --git a/gui/baculum/protected/API/Class/APIDbModule.php b/gui/baculum/protected/API/Modules/APIDbModule.php similarity index 92% rename from gui/baculum/protected/API/Class/APIDbModule.php rename to gui/baculum/protected/API/Modules/APIDbModule.php index 8c191f7fd..3a683c896 100644 --- a/gui/baculum/protected/API/Class/APIDbModule.php +++ b/gui/baculum/protected/API/Modules/APIDbModule.php @@ -20,11 +20,12 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.Common.Class.Errors'); -Prado::using('Application.API.Class.APIConfig'); -Prado::using('Application.API.Class.BAPIException'); -Prado::using('Application.API.Class.Database'); -Prado::using('System.Data.ActiveRecord.TActiveRecord'); +namespace Baculum\API\Modules; + +use Baculum\Common\Modules\Errors\DatabaseError; +use PDO; +use Prado\Data\ActiveRecord\TActiveRecord; +use Prado\Data\TDbConnection; /** * Base API database module. @@ -83,7 +84,7 @@ class APIDbModule extends TActiveRecord { * @param array database parameters from api config * @param bool force connection try (used when db_params are not saved yet) * @return object TDbConnection instance or null if errors occured during connecting - * @throws BCatalogExcemption if cataloga access is not supported + * @throws BCatalogException if cataloga access is not supported */ public static function getAPIDbConnection(array $db_params, $force = false) { $db_connection = null; diff --git a/gui/baculum/protected/API/Class/APIModule.php b/gui/baculum/protected/API/Modules/APIModule.php similarity index 95% rename from gui/baculum/protected/API/Class/APIModule.php rename to gui/baculum/protected/API/Modules/APIModule.php index 4a9d3300d..2972db93a 100644 --- a/gui/baculum/protected/API/Class/APIModule.php +++ b/gui/baculum/protected/API/Modules/APIModule.php @@ -20,7 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('System.TModule'); +namespace Baculum\API\Modules; + +use Prado\TModule; /** * Abstract API module. diff --git a/gui/baculum/protected/API/Class/APIServer.php b/gui/baculum/protected/API/Modules/APIServer.php similarity index 97% rename from gui/baculum/protected/API/Class/APIServer.php rename to gui/baculum/protected/API/Modules/APIServer.php index e3e150802..93e08001f 100644 --- a/gui/baculum/protected/API/Class/APIServer.php +++ b/gui/baculum/protected/API/Modules/APIServer.php @@ -20,6 +20,10 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ +namespace Baculum\API\Modules; + +use Prado\Prado; + /** * API Server layer. * Introduces main method inherited by particular API server versions. @@ -46,7 +50,6 @@ class APIServer extends APIModule { * Set API server instance. * * @param BaculumAPIServer $obj server object - * @return none */ public function setServerObj($obj) { $this->server = $obj; diff --git a/gui/baculum/protected/API/Class/APIServerV1.php b/gui/baculum/protected/API/Modules/APIServerV1.php similarity index 95% rename from gui/baculum/protected/API/Class/APIServerV1.php rename to gui/baculum/protected/API/Modules/APIServerV1.php index 35be0af34..34815016d 100644 --- a/gui/baculum/protected/API/Class/APIServerV1.php +++ b/gui/baculum/protected/API/Modules/APIServerV1.php @@ -20,8 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.APIServer'); -Prado::using('Application.API.Class.APIInterfaces'); +namespace Baculum\API\Modules; + +use stdClass; /** * API Server version 1. @@ -36,7 +37,6 @@ class APIServerV1 extends APIServer implements IAPIServer { /** * Support for API GET method request. * - * @return none; */ public function get() { $this->getServerObj()->get(); @@ -45,7 +45,6 @@ class APIServerV1 extends APIServer implements IAPIServer { /** * Support for API PUT method request. * - * @return none */ public function put() { $id = $this->Request->contains('id') ? intval($this->Request['id']) : 0; @@ -92,7 +91,6 @@ class APIServerV1 extends APIServer implements IAPIServer { /** * Support for API POST method request. * - * @return none */ public function post() { $params = new StdClass; @@ -105,7 +103,6 @@ class APIServerV1 extends APIServer implements IAPIServer { /** * Support for API DELETE method request. * - * @return none */ public function delete() { $id = null; diff --git a/gui/baculum/protected/API/Class/APIServerV2.php b/gui/baculum/protected/API/Modules/APIServerV2.php similarity index 92% rename from gui/baculum/protected/API/Class/APIServerV2.php rename to gui/baculum/protected/API/Modules/APIServerV2.php index ba9b86dbb..f8a38018b 100644 --- a/gui/baculum/protected/API/Class/APIServerV2.php +++ b/gui/baculum/protected/API/Modules/APIServerV2.php @@ -20,8 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.APIServer'); -Prado::using('Application.API.Class.APIInterfaces'); +namespace Baculum\API\Modules; + +use stdClass; /** * API Server version 2. @@ -39,7 +40,6 @@ class APIServerV2 extends APIServer implements IAPIServer { /** * Support for API GET method request. * - * @return none; */ public function get() { $this->getServerObj()->get(); @@ -48,7 +48,6 @@ class APIServerV2 extends APIServer implements IAPIServer { /** * Support for API PUT method request. * - * @return none */ public function put() { $id = $this->Request->contains('id') ? intval($this->Request['id']) : 0; @@ -63,7 +62,6 @@ class APIServerV2 extends APIServer implements IAPIServer { /** * Support for API POST method request. * - * @return none */ public function post() { $inputstr = file_get_contents("php://input"); @@ -77,7 +75,6 @@ class APIServerV2 extends APIServer implements IAPIServer { /** * Support for API DELETE method request. * - * @return none */ public function delete() { $id = null; diff --git a/gui/baculum/protected/API/Class/APIUrlMapping.php b/gui/baculum/protected/API/Modules/APIUrlMapping.php similarity index 93% rename from gui/baculum/protected/API/Class/APIUrlMapping.php rename to gui/baculum/protected/API/Modules/APIUrlMapping.php index a33ffec7f..4f1ce43c7 100644 --- a/gui/baculum/protected/API/Class/APIUrlMapping.php +++ b/gui/baculum/protected/API/Modules/APIUrlMapping.php @@ -20,7 +20,8 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('System.Web.TUrlMapping'); +use Baculum\Common\Modules\BaculumUrlMapping; +use Prado\Web\TUrlMappingPattern; /** * Extension default URL mapper for API. diff --git a/gui/baculum/protected/API/Class/BAPIException.php b/gui/baculum/protected/API/Modules/BAPIException.php similarity index 70% rename from gui/baculum/protected/API/Class/BAPIException.php rename to gui/baculum/protected/API/Modules/BAPIException.php index 8ec63d348..b598b3051 100644 --- a/gui/baculum/protected/API/Class/BAPIException.php +++ b/gui/baculum/protected/API/Modules/BAPIException.php @@ -20,24 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.Common.Class.BException'); +namespace Baculum\API\Modules; -/** - * API exceptions. - * - * @author Marcin Haba - * @category Exception - * @package Baculum API - */ -class BAPIException extends BException { -} +use Baculum\Common\Modules\BException; -class BCatalogException extends BAPIException { -} - -class BConsoleException extends BAPIException { -} - -class BConfigException extends BAPIException { +class BAPIException extends BException { } -?> diff --git a/gui/baculum/protected/API/Modules/BCatalogException.php b/gui/baculum/protected/API/Modules/BCatalogException.php new file mode 100644 index 000000000..ae672cd90 --- /dev/null +++ b/gui/baculum/protected/API/Modules/BCatalogException.php @@ -0,0 +1,26 @@ + +} \ No newline at end of file diff --git a/gui/baculum/protected/API/Class/BaculaConfig.php b/gui/baculum/protected/API/Modules/BaculaConfig.php similarity index 96% rename from gui/baculum/protected/API/Class/BaculaConfig.php rename to gui/baculum/protected/API/Modules/BaculaConfig.php index b083469a1..c815f2bb4 100644 --- a/gui/baculum/protected/API/Class/BaculaConfig.php +++ b/gui/baculum/protected/API/Modules/BaculaConfig.php @@ -20,7 +20,10 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.Common.Class.ConfigFileModule'); +namespace Baculum\API\Modules; + +use Baculum\Common\Modules\Logging; +use Baculum\Common\Modules\ConfigFileModule; /** * Manage Bacula configuration. diff --git a/gui/baculum/protected/API/Class/BaculaSetting.php b/gui/baculum/protected/API/Modules/BaculaSetting.php similarity index 96% rename from gui/baculum/protected/API/Class/BaculaSetting.php rename to gui/baculum/protected/API/Modules/BaculaSetting.php index e5a656de4..5c8936d89 100644 --- a/gui/baculum/protected/API/Class/BaculaSetting.php +++ b/gui/baculum/protected/API/Modules/BaculaSetting.php @@ -20,11 +20,12 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.Common.Class.Params'); -Prado::using('Application.Common.Class.Errors'); -Prado::using('Application.API.Class.BAPIException'); -Prado::using('Application.API.Class.APIModule'); -Prado::using('Application.API.Class.APIConfig'); +namespace Baculum\API\Modules; + +use Baculum\Common\Modules\Logging; +use Baculum\Common\Modules\Errors\BaculaConfigError; +use Baculum\Common\Modules\Errors\JSONToolsError; +use Baculum\Common\Modules\Params; /** * Read/write Bacula configuration. @@ -301,7 +302,7 @@ class BaculaSetting extends APIModule { ); } $overwrite_directive = array_map( - 'overwrite_directives_callback', + ['BaculaSetting', 'overwrite_directives_callback'], array_keys($directive_value[$i]), $values ); @@ -572,27 +573,28 @@ class BaculaSetting extends APIModule { } return $tool_type; } -} -function overwrite_directives_callback($directive_name, $directive_value) { - $directive = ''; - $overwrite_directives = array( - 'Level', - 'Pool', - 'Storage', - 'Messages', - 'FullPool', - 'DifferentialPool', - 'IncrementalPool', - 'Accurate', - 'Priority', - 'SpoolData', - 'MaxRunSchedTime', - 'NextPool', - 'MaxConnectTime' - ); - if (in_array($directive_name, $overwrite_directives)) { - $directive = "{$directive_name}={$directive_value}"; + + public static function overwrite_directives_callback($directive_name, $directive_value) { + $directive = ''; + $overwrite_directives = array( + 'Level', + 'Pool', + 'Storage', + 'Messages', + 'FullPool', + 'DifferentialPool', + 'IncrementalPool', + 'Accurate', + 'Priority', + 'SpoolData', + 'MaxRunSchedTime', + 'NextPool', + 'MaxConnectTime' + ); + if (in_array($directive_name, $overwrite_directives)) { + $directive = "{$directive_name}={$directive_value}"; + } + return $directive; } - return $directive; } ?> diff --git a/gui/baculum/protected/API/Class/BaculumAPIPage.php b/gui/baculum/protected/API/Modules/BaculumAPIPage.php similarity index 90% rename from gui/baculum/protected/API/Class/BaculumAPIPage.php rename to gui/baculum/protected/API/Modules/BaculumAPIPage.php index 432e319db..cbad987da 100644 --- a/gui/baculum/protected/API/Class/BaculumAPIPage.php +++ b/gui/baculum/protected/API/Modules/BaculumAPIPage.php @@ -20,11 +20,11 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ +namespace Baculum\API\Modules; + session_start(); -Prado::using('Application.API.Pages.Requirements'); -Prado::using('Application.Common.Class.BaculumPage'); -Prado::using('Application.API.Class.APIConfig'); +use Baculum\Common\Modules\BaculumPage; /** * Main API pages class. diff --git a/gui/baculum/protected/API/Class/BaculumAPIServer.php b/gui/baculum/protected/API/Modules/BaculumAPIServer.php similarity index 93% rename from gui/baculum/protected/API/Class/BaculumAPIServer.php rename to gui/baculum/protected/API/Modules/BaculumAPIServer.php index d4acd0462..ba8d5b5df 100644 --- a/gui/baculum/protected/API/Class/BaculumAPIServer.php +++ b/gui/baculum/protected/API/Modules/BaculumAPIServer.php @@ -20,16 +20,16 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('System.Web.UI.TPage'); -Prado::using('System.Exceptions.TException'); -Prado::using('Application.Common.Class.Errors'); -Prado::using('Application.Common.Class.OAuth2'); -Prado::using('Application.Common.Class.Logging'); -Prado::using('Application.API.Class.BAPIException'); -Prado::using('Application.API.Class.APIDbModule'); -Prado::using('Application.API.Class.Bconsole'); -Prado::using('Application.API.Class.OAuth2.TokenRecord'); -Prado::using('Application.API.Class.APIServer'); +namespace Baculum\API\Modules; + +use Baculum\Common\Modules\Errors\AuthenticationError; +use Baculum\Common\Modules\Errors\AuthorizationError; +use Baculum\Common\Modules\Errors\GenericError; +use Prado\Web\UI\TPage; +use Prado\Exceptions\TException; +use Baculum\Common\Modules\OAuth2; +use Baculum\Common\Modules\Logging; +use Baculum\API\Modules\OAuth2\TokenRecord; /** * Abstract module from which inherits each of API module. @@ -161,7 +161,6 @@ abstract class BaculumAPIServer extends TPage { * * @access public * @param mixed $params onInit action params - * @return none */ public function onInit($params) { parent::onInit($params); @@ -188,7 +187,6 @@ abstract class BaculumAPIServer extends TPage { * Run requested resource. * It sets output and error values. * - * @return none */ private function runResource() { $version = APIServer::getVersion(); @@ -214,7 +212,7 @@ abstract class BaculumAPIServer extends TPage { break; } } - } catch(Prado\Exceptions\TException $e) { + } catch(TException $e) { $this->getModule('logging')->log( __FUNCTION__, "Method: {$_SERVER['REQUEST_METHOD']} $e", @@ -236,7 +234,6 @@ abstract class BaculumAPIServer extends TPage { * Initialize auth parameters. * * @param array $auth token params stored in TokenRecord session - * @return none */ private function initAuthParams(array $auth) { // if client has own bconsole config, assign it here @@ -282,7 +279,6 @@ abstract class BaculumAPIServer extends TPage { * * @access public * @param mixed $params onInit action params - * @return none */ public function onLoad($params) { parent::onLoad($params); diff --git a/gui/baculum/protected/API/Class/BasicAPIUserConfig.php b/gui/baculum/protected/API/Modules/BasicAPIUserConfig.php similarity index 89% rename from gui/baculum/protected/API/Class/BasicAPIUserConfig.php rename to gui/baculum/protected/API/Modules/BasicAPIUserConfig.php index cbe630f44..841fd2be1 100644 --- a/gui/baculum/protected/API/Class/BasicAPIUserConfig.php +++ b/gui/baculum/protected/API/Modules/BasicAPIUserConfig.php @@ -20,7 +20,10 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.Common.Class.BasicUserConfig'); +namespace Baculum\API\Modules; + +use Prado\Prado; +use Baculum\Common\Modules\BasicUserConfig; /** * Manage HTTP Basic auth method users. @@ -34,7 +37,7 @@ class BasicAPIUserConfig extends BasicUserConfig { /** * Users login and password file for HTTP Basic auth. */ - const USERS_FILE_NAME = 'Application.API.Config.baculum'; + const USERS_FILE_NAME = 'Baculum.API.Config.baculum'; const USERS_FILE_EXTENSION = '.users'; public function getConfigPath() { diff --git a/gui/baculum/protected/API/Class/BasicConfig.php b/gui/baculum/protected/API/Modules/BasicConfig.php similarity index 97% rename from gui/baculum/protected/API/Class/BasicConfig.php rename to gui/baculum/protected/API/Modules/BasicConfig.php index 84e4fd584..d98ebc9a8 100644 --- a/gui/baculum/protected/API/Class/BasicConfig.php +++ b/gui/baculum/protected/API/Modules/BasicConfig.php @@ -20,7 +20,10 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.Common.Class.ConfigFileModule'); +namespace Baculum\API\Modules; + +use Baculum\Common\Modules\Logging; +use Baculum\Common\Modules\ConfigFileModule; /** * Manage Basic user configuration. @@ -35,7 +38,7 @@ class BasicConfig extends ConfigFileModule { /** * Basic user config file path */ - const CONFIG_FILE_PATH = 'Application.API.Config.basic'; + const CONFIG_FILE_PATH = 'Baculum.API.Config.basic'; /** * Basic user config file format diff --git a/gui/baculum/protected/API/Class/Bconsole.php b/gui/baculum/protected/API/Modules/Bconsole.php similarity index 97% rename from gui/baculum/protected/API/Class/Bconsole.php rename to gui/baculum/protected/API/Modules/Bconsole.php index b4cfcc902..1111c75f4 100644 --- a/gui/baculum/protected/API/Class/Bconsole.php +++ b/gui/baculum/protected/API/Modules/Bconsole.php @@ -20,9 +20,11 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.Common.Class.Errors'); -Prado::using('Application.API.Class.BAPIException'); -Prado::using('Application.API.Class.APIModule'); +namespace Baculum\API\Modules; + +use Baculum\Common\Modules\Logging; +use Baculum\Common\Modules\Errors\BconsoleError; +use Prado\Prado; /** * Execute bconsole module. @@ -309,14 +311,14 @@ class Bconsole extends APIModule { } private function prepareOutputFile() { - $dir = Prado::getPathOfNamespace('Application.API.Config'); + $dir = Prado::getPathOfNamespace('Baculum.API.Config'); $fname = tempnam($dir, self::OUTPUT_FILE_PREFIX); return $fname; } public static function readOutputFile($out_id) { $output = array(); - $dir = Prado::getPathOfNamespace('Application.API.Config'); + $dir = Prado::getPathOfNamespace('Baculum.API.Config'); if (preg_match('/^[a-z0-9]+$/i', $out_id) === 1) { $file = $dir . '/' . self::OUTPUT_FILE_PREFIX . $out_id; if (file_exists($file)) { diff --git a/gui/baculum/protected/API/Class/ChangerCommand.php b/gui/baculum/protected/API/Modules/ChangerCommand.php similarity index 97% rename from gui/baculum/protected/API/Class/ChangerCommand.php rename to gui/baculum/protected/API/Modules/ChangerCommand.php index 490f3e137..dae10bcd4 100644 --- a/gui/baculum/protected/API/Class/ChangerCommand.php +++ b/gui/baculum/protected/API/Modules/ChangerCommand.php @@ -20,9 +20,12 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.Common.Class.Errors'); -Prado::using('Application.API.Class.DeviceConfig'); -Prado::using('Application.API.Class.APIModule'); +namespace Baculum\API\Modules; + +use Baculum\Common\Modules\Logging; +use Baculum\Common\Modules\Errors\DeviceError; +use Prado\Prado; +use stdClass; /** * Execute changer command module. @@ -251,7 +254,7 @@ class ChangerCommand extends APIModule { * @return string|boolean new temporary filename (with path), or false on failure. */ private function prepareOutputFile() { - $dir = Prado::getPathOfNamespace('Application.API.Config'); + $dir = Prado::getPathOfNamespace('Baculum.API.Config'); $fname = tempnam($dir, self::OUTPUT_FILE_PREFIX); return $fname; } @@ -265,7 +268,7 @@ class ChangerCommand extends APIModule { */ public static function readOutputFile($out_id) { $output = []; - $dir = Prado::getPathOfNamespace('Application.API.Config'); + $dir = Prado::getPathOfNamespace('Baculum.API.Config'); if (preg_match('/^[a-z0-9]+$/i', $out_id) === 1) { $file = $dir . '/' . self::OUTPUT_FILE_PREFIX . $out_id; if (file_exists($file)) { diff --git a/gui/baculum/protected/API/Class/ClientManager.php b/gui/baculum/protected/API/Modules/ClientManager.php similarity index 92% rename from gui/baculum/protected/API/Class/ClientManager.php rename to gui/baculum/protected/API/Modules/ClientManager.php index dac65d94e..88f8d7d30 100644 --- a/gui/baculum/protected/API/Class/ClientManager.php +++ b/gui/baculum/protected/API/Modules/ClientManager.php @@ -20,8 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.APIModule'); -Prado::using('Application.API.Class.ClientRecord'); +namespace Baculum\API\Modules; + +use Prado\Data\ActiveRecord\TActiveRecordCriteria; /** * Client manager module. diff --git a/gui/baculum/protected/API/Class/ClientRecord.php b/gui/baculum/protected/API/Modules/ClientRecord.php similarity index 95% rename from gui/baculum/protected/API/Class/ClientRecord.php rename to gui/baculum/protected/API/Modules/ClientRecord.php index a3d6aab23..da8cc4e26 100644 --- a/gui/baculum/protected/API/Class/ClientRecord.php +++ b/gui/baculum/protected/API/Modules/ClientRecord.php @@ -20,7 +20,7 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.APIDbModule'); +namespace Baculum\API\Modules; /** * Client active record module. diff --git a/gui/baculum/protected/API/Class/ComponentActions.php b/gui/baculum/protected/API/Modules/ComponentActions.php similarity index 96% rename from gui/baculum/protected/API/Class/ComponentActions.php rename to gui/baculum/protected/API/Modules/ComponentActions.php index f7ff0257a..6dc008034 100644 --- a/gui/baculum/protected/API/Class/ComponentActions.php +++ b/gui/baculum/protected/API/Modules/ComponentActions.php @@ -20,8 +20,10 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.APIModule'); -Prado::using('Application.Common.Class.Errors'); +namespace Baculum\API\Modules; + +use Baculum\Common\Modules\Logging; +use Baculum\Common\Modules\Errors\ActionsError; /** * Module responsible for executing action commands. diff --git a/gui/baculum/protected/API/Class/ComponentStatusModule.php b/gui/baculum/protected/API/Modules/ComponentStatusModule.php similarity index 97% rename from gui/baculum/protected/API/Class/ComponentStatusModule.php rename to gui/baculum/protected/API/Modules/ComponentStatusModule.php index 19cc3d4ba..70e760f40 100644 --- a/gui/baculum/protected/API/Class/ComponentStatusModule.php +++ b/gui/baculum/protected/API/Modules/ComponentStatusModule.php @@ -20,7 +20,7 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.APIModule'); +namespace Baculum\API\Modules; /** * Base abstract class to inherit commonly used method diff --git a/gui/baculum/protected/API/Class/ConsoleOutputPage.php b/gui/baculum/protected/API/Modules/ConsoleOutputPage.php similarity index 97% rename from gui/baculum/protected/API/Class/ConsoleOutputPage.php rename to gui/baculum/protected/API/Modules/ConsoleOutputPage.php index ad196c66c..4f09e8181 100644 --- a/gui/baculum/protected/API/Class/ConsoleOutputPage.php +++ b/gui/baculum/protected/API/Modules/ConsoleOutputPage.php @@ -20,6 +20,8 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ +namespace Baculum\API\Modules; + /** * Get console output page. * diff --git a/gui/baculum/protected/API/Class/ConsoleOutputShowPage.php b/gui/baculum/protected/API/Modules/ConsoleOutputShowPage.php similarity index 97% rename from gui/baculum/protected/API/Class/ConsoleOutputShowPage.php rename to gui/baculum/protected/API/Modules/ConsoleOutputShowPage.php index c0f26e403..fe2526d6f 100644 --- a/gui/baculum/protected/API/Class/ConsoleOutputShowPage.php +++ b/gui/baculum/protected/API/Modules/ConsoleOutputShowPage.php @@ -20,7 +20,7 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.ConsoleOutputPage'); +namespace Baculum\API\Modules; /** * Get console output for 'show' type commands. diff --git a/gui/baculum/protected/API/Class/Database.php b/gui/baculum/protected/API/Modules/Database.php similarity index 95% rename from gui/baculum/protected/API/Class/Database.php rename to gui/baculum/protected/API/Modules/Database.php index 62d2cae1a..329827bb3 100644 --- a/gui/baculum/protected/API/Class/Database.php +++ b/gui/baculum/protected/API/Modules/Database.php @@ -19,11 +19,13 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - -Prado::using('Application.Common.Class.Errors'); -Prado::using('Application.API.Class.BAPIException'); -Prado::using('Application.API.Class.APIModule'); -Prado::using('Application.API.Class.APIDbModule'); + +namespace Baculum\API\Modules; + +use Baculum\Common\Modules\Logging; +use Baculum\Common\Modules\Errors\DatabaseError; +use Prado\Data\TDbConnection; +use Prado\Exceptions\TDbException; /** * Database module. @@ -60,7 +62,7 @@ class Database extends APIModule { $connection->setActive(true); $tables_format = $this->getTablesFormat($connection); $is_connection = (is_numeric($tables_format) === true && $tables_format > 0); - } catch (Prado\Exceptions\TDbException $e) { + } catch (TDbException $e) { throw new BCatalogException( DatabaseError::MSG_ERROR_DB_CONNECTION_PROBLEM . ' ' . $e->getErrorMessage(), DatabaseError::ERROR_DB_CONNECTION_PROBLEM diff --git a/gui/baculum/protected/API/Class/DeviceConfig.php b/gui/baculum/protected/API/Modules/DeviceConfig.php similarity index 96% rename from gui/baculum/protected/API/Class/DeviceConfig.php rename to gui/baculum/protected/API/Modules/DeviceConfig.php index cdc92be7c..47808446b 100644 --- a/gui/baculum/protected/API/Class/DeviceConfig.php +++ b/gui/baculum/protected/API/Modules/DeviceConfig.php @@ -20,7 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.Common.Class.ConfigFileModule'); +namespace Baculum\API\Modules; + +use Baculum\Common\Modules\ConfigFileModule; /** * Manage devices configuration. @@ -46,7 +48,7 @@ class DeviceConfig extends ConfigFileModule { /** * Device config file path */ - const CONFIG_FILE_PATH = 'Application.API.Config.devices'; + const CONFIG_FILE_PATH = 'Baculum.API.Config.devices'; /** * Device config file format diff --git a/gui/baculum/protected/API/Class/FileSetManager.php b/gui/baculum/protected/API/Modules/FileSetManager.php similarity index 92% rename from gui/baculum/protected/API/Class/FileSetManager.php rename to gui/baculum/protected/API/Modules/FileSetManager.php index 337317c17..9b61dbc6a 100644 --- a/gui/baculum/protected/API/Class/FileSetManager.php +++ b/gui/baculum/protected/API/Modules/FileSetManager.php @@ -20,8 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.APIModule'); -Prado::using('Application.API.Class.FileSetRecord'); +namespace Baculum\API\Modules; + +use Prado\Data\ActiveRecord\TActiveRecordCriteria; /** * FileSet manager module. diff --git a/gui/baculum/protected/API/Class/FileSetRecord.php b/gui/baculum/protected/API/Modules/FileSetRecord.php similarity index 95% rename from gui/baculum/protected/API/Class/FileSetRecord.php rename to gui/baculum/protected/API/Modules/FileSetRecord.php index 52dc2310c..545923458 100644 --- a/gui/baculum/protected/API/Class/FileSetRecord.php +++ b/gui/baculum/protected/API/Modules/FileSetRecord.php @@ -20,7 +20,7 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.APIDbModule'); +namespace Baculum\API\Modules; /** * FileSet record module. diff --git a/gui/baculum/protected/API/Class/APIInterfaces.php b/gui/baculum/protected/API/Modules/IAPIServer.php similarity index 93% rename from gui/baculum/protected/API/Class/APIInterfaces.php rename to gui/baculum/protected/API/Modules/IAPIServer.php index 8c581306d..efe42f003 100644 --- a/gui/baculum/protected/API/Class/APIInterfaces.php +++ b/gui/baculum/protected/API/Modules/IAPIServer.php @@ -3,7 +3,7 @@ * Bacula(R) - The Network Backup Solution * Baculum - Bacula web interface * - * Copyright (C) 2013-2021 Kern Sibbald + * Copyright (C) 2013-2022 Kern Sibbald * * The main author of Baculum is Marcin Haba. * The original author of Bacula is Kern Sibbald, with contributions @@ -20,6 +20,8 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ +namespace Baculum\API\Modules; + /** * API interfaces. * diff --git a/gui/baculum/protected/API/Class/JSONTools.php b/gui/baculum/protected/API/Modules/JSONTools.php similarity index 97% rename from gui/baculum/protected/API/Class/JSONTools.php rename to gui/baculum/protected/API/Modules/JSONTools.php index ac7311922..5accfefe0 100644 --- a/gui/baculum/protected/API/Class/JSONTools.php +++ b/gui/baculum/protected/API/Modules/JSONTools.php @@ -20,8 +20,10 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.APIModule'); -Prado::using('Application.Common.Class.Errors'); +namespace Baculum\API\Modules; + +use Baculum\Common\Modules\Errors\JSONToolsError; +use Baculum\Common\Modules\Logging; /** * Bacula JSON tools manager. diff --git a/gui/baculum/protected/API/Class/JobManager.php b/gui/baculum/protected/API/Modules/JobManager.php similarity index 98% rename from gui/baculum/protected/API/Class/JobManager.php rename to gui/baculum/protected/API/Modules/JobManager.php index 14162576c..ba13111f2 100644 --- a/gui/baculum/protected/API/Class/JobManager.php +++ b/gui/baculum/protected/API/Modules/JobManager.php @@ -20,9 +20,10 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.APIModule'); -Prado::using('Application.API.Class.JobRecord'); -Prado::using('Application.API.Class.Database'); +namespace Baculum\API\Modules; + +use PDO; +use Prado\Data\ActiveRecord\TActiveRecordCriteria; /** * Job manager module. diff --git a/gui/baculum/protected/API/Class/JobRecord.php b/gui/baculum/protected/API/Modules/JobRecord.php similarity index 97% rename from gui/baculum/protected/API/Class/JobRecord.php rename to gui/baculum/protected/API/Modules/JobRecord.php index 977cd3919..0798cec12 100644 --- a/gui/baculum/protected/API/Class/JobRecord.php +++ b/gui/baculum/protected/API/Modules/JobRecord.php @@ -20,7 +20,7 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.APIDbModule'); +namespace Baculum\API\Modules; /** * Job record module. diff --git a/gui/baculum/protected/API/Class/LogManager.php b/gui/baculum/protected/API/Modules/LogManager.php similarity index 93% rename from gui/baculum/protected/API/Class/LogManager.php rename to gui/baculum/protected/API/Modules/LogManager.php index 4d3ef1766..54ca89d2e 100644 --- a/gui/baculum/protected/API/Class/LogManager.php +++ b/gui/baculum/protected/API/Modules/LogManager.php @@ -20,8 +20,7 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.APIModule'); -Prado::using('Application.API.Class.LogRecord'); +namespace Baculum\API\Modules; /** * Log manager module. diff --git a/gui/baculum/protected/API/Class/LogRecord.php b/gui/baculum/protected/API/Modules/LogRecord.php similarity index 95% rename from gui/baculum/protected/API/Class/LogRecord.php rename to gui/baculum/protected/API/Modules/LogRecord.php index bf113b0f7..1657ee320 100644 --- a/gui/baculum/protected/API/Class/LogRecord.php +++ b/gui/baculum/protected/API/Modules/LogRecord.php @@ -20,7 +20,7 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.APIDbModule'); +namespace Baculum\API\Modules; /** * Log record module. diff --git a/gui/baculum/protected/API/Class/Ls.php b/gui/baculum/protected/API/Modules/Ls.php similarity index 97% rename from gui/baculum/protected/API/Class/Ls.php rename to gui/baculum/protected/API/Modules/Ls.php index af431e6b5..42b3e3028 100644 --- a/gui/baculum/protected/API/Class/Ls.php +++ b/gui/baculum/protected/API/Modules/Ls.php @@ -21,7 +21,7 @@ */ -Prado::using('Application.API.Class.APIModule'); +namespace Baculum\API\Modules; /** * Ls command module. diff --git a/gui/baculum/protected/API/Class/OAuth2/AuthIdManager.php b/gui/baculum/protected/API/Modules/OAuth2/AuthIdManager.php similarity index 95% rename from gui/baculum/protected/API/Class/OAuth2/AuthIdManager.php rename to gui/baculum/protected/API/Modules/OAuth2/AuthIdManager.php index 0ca7705e4..c9215572c 100644 --- a/gui/baculum/protected/API/Class/OAuth2/AuthIdManager.php +++ b/gui/baculum/protected/API/Modules/OAuth2/AuthIdManager.php @@ -20,8 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.OAuth2.AuthIdRecord'); -Prado::using('Application.API.Class.APIModule'); +namespace Baculum\API\Modules\OAuth2; + +use Baculum\API\Modules\APIModule; /** * Manager for authorization identifiers (authorization codes). @@ -47,7 +48,6 @@ class AuthIdManager extends APIModule { * Delete expired authorization identifiers from database. * * @access public - * @return none */ public function deleteExpiredAuthIds() { $current_time = time(); diff --git a/gui/baculum/protected/API/Class/OAuth2/AuthIdRecord.php b/gui/baculum/protected/API/Modules/OAuth2/AuthIdRecord.php similarity index 80% rename from gui/baculum/protected/API/Class/OAuth2/AuthIdRecord.php rename to gui/baculum/protected/API/Modules/OAuth2/AuthIdRecord.php index 7c402d4b1..6c8cebf5b 100644 --- a/gui/baculum/protected/API/Class/OAuth2/AuthIdRecord.php +++ b/gui/baculum/protected/API/Modules/OAuth2/AuthIdRecord.php @@ -20,8 +20,11 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.Common.Class.Interfaces'); -Prado::using('Application.Common.Class.SessionRecord'); +namespace Baculum\API\Modules\OAuth2; + +use Prado\Prado; +use Baculum\Common\Modules\ISessionItem; +use Baculum\Common\Modules\SessionRecord; /** * Get/set OAuth2 auth identifier. @@ -30,7 +33,7 @@ Prado::using('Application.Common.Class.SessionRecord'); * @category Authorization * @package Baculum API */ -class AuthIdRecord extends SessionRecord implements SessionItem { +class AuthIdRecord extends SessionRecord implements ISessionItem { public $auth_id; public $client_id; @@ -47,7 +50,7 @@ class AuthIdRecord extends SessionRecord implements SessionItem { } public static function getSessionFile() { - return Prado::getPathOfNamespace('Application.API.Config.session', '.dump'); + return Prado::getPathOfNamespace('Baculum.API.Config.session', '.dump'); } } ?> diff --git a/gui/baculum/protected/API/Class/OAuth2/BaculumOAuth2.php b/gui/baculum/protected/API/Modules/OAuth2/BaculumOAuth2.php similarity index 97% rename from gui/baculum/protected/API/Class/OAuth2/BaculumOAuth2.php rename to gui/baculum/protected/API/Modules/OAuth2/BaculumOAuth2.php index 2b739a801..931093d13 100644 --- a/gui/baculum/protected/API/Class/OAuth2/BaculumOAuth2.php +++ b/gui/baculum/protected/API/Modules/OAuth2/BaculumOAuth2.php @@ -20,7 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.Common.Class.OAuth2'); +namespace Baculum\API\Modules\OAuth2; + +use Baculum\Common\Modules\OAuth2; /** * Baculum API specific module with generic methods to support OAuth2. @@ -87,7 +89,6 @@ class BaculumOAuth2 extends OAuth2 { * @param string $error_name error name * @param string $error_description human-readable error description * @param string $error_uri page location where client is able to get help for returned error - * @return none */ public function authorizationError($header, $error_name, $error_description = null, $error_uri = null, $state = null) { $error = array('error' => $error_name); @@ -117,7 +118,6 @@ class BaculumOAuth2 extends OAuth2 { * @access public * @param string $redirect_uri uniform resource identifier (URI) * @param array $params GET parameters for redirect_uri contained in associative array - * @return none */ public function authorizationRedirect($redirect_uri, $params = array()) { header(parent::HEADER_HTTP_FOUND); diff --git a/gui/baculum/protected/API/Class/OAuth2/OAuth2Config.php b/gui/baculum/protected/API/Modules/OAuth2/OAuth2Config.php similarity index 95% rename from gui/baculum/protected/API/Class/OAuth2/OAuth2Config.php rename to gui/baculum/protected/API/Modules/OAuth2/OAuth2Config.php index ccafc8d52..05f2ee6ea 100644 --- a/gui/baculum/protected/API/Class/OAuth2/OAuth2Config.php +++ b/gui/baculum/protected/API/Modules/OAuth2/OAuth2Config.php @@ -20,7 +20,10 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.Common.Class.ConfigFileModule'); +namespace Baculum\API\Modules\OAuth2; + +use Baculum\Common\Modules\Logging; +use Baculum\Common\Modules\ConfigFileModule; /** * Manage OAuth2 client configuration. @@ -35,7 +38,7 @@ class OAuth2Config extends ConfigFileModule { /** * OAuth2 client config file path */ - const CONFIG_FILE_PATH = 'Application.API.Config.oauth2'; + const CONFIG_FILE_PATH = 'Baculum.API.Config.oauth2'; /** * OAuth2 client config file format @@ -135,7 +138,6 @@ class OAuth2Config extends ConfigFileModule { * * @param array reference $config config to set added options. * @param mixed $section determines if passed all config or only section - * @return none */ private function setAddedOptions(&$config, $section = null) { foreach ($this->added_options as $added_opt => $defval) { diff --git a/gui/baculum/protected/API/Class/OAuth2/TokenManager.php b/gui/baculum/protected/API/Modules/OAuth2/TokenManager.php similarity index 96% rename from gui/baculum/protected/API/Class/OAuth2/TokenManager.php rename to gui/baculum/protected/API/Modules/OAuth2/TokenManager.php index cb939fdbc..affc1b3ec 100644 --- a/gui/baculum/protected/API/Class/OAuth2/TokenManager.php +++ b/gui/baculum/protected/API/Modules/OAuth2/TokenManager.php @@ -20,8 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.OAuth2.TokenRecord'); -Prado::using('Application.API.Class.APIModule'); +namespace Baculum\API\Modules\OAuth2; + +use Baculum\API\Modules\APIModule; /** * Manager for tokens. @@ -66,7 +67,6 @@ class TokenManager extends APIModule { * Delete expired tokens from database. * * @access public - * @return none */ public function deleteExpiredTokens() { $current_time = time(); diff --git a/gui/baculum/protected/API/Class/OAuth2/TokenRecord.php b/gui/baculum/protected/API/Modules/OAuth2/TokenRecord.php similarity index 81% rename from gui/baculum/protected/API/Class/OAuth2/TokenRecord.php rename to gui/baculum/protected/API/Modules/OAuth2/TokenRecord.php index 7f5dd0886..187d506d7 100644 --- a/gui/baculum/protected/API/Class/OAuth2/TokenRecord.php +++ b/gui/baculum/protected/API/Modules/OAuth2/TokenRecord.php @@ -20,8 +20,11 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.Common.Class.Interfaces'); -Prado::using('Application.Common.Class.SessionRecord'); +namespace Baculum\API\Modules\OAuth2; + +use Prado\Prado; +use Baculum\Common\Modules\ISessionItem; +use Baculum\Common\Modules\SessionRecord; /** * Module to store tokens as session record. @@ -30,7 +33,7 @@ Prado::using('Application.Common.Class.SessionRecord'); * @category Authorization * @package Baculum */ -class TokenRecord extends SessionRecord implements SessionItem { +class TokenRecord extends SessionRecord implements ISessionItem { public $access_token; public $refresh_token; @@ -48,7 +51,7 @@ class TokenRecord extends SessionRecord implements SessionItem { } public static function getSessionFile() { - return Prado::getPathOfNamespace('Application.API.Config.session', '.dump'); + return Prado::getPathOfNamespace('Baculum.API.Config.session', '.dump'); } } ?> diff --git a/gui/baculum/protected/API/Class/OAuthUrlMapping.php b/gui/baculum/protected/API/Modules/OAuthUrlMapping.php similarity index 93% rename from gui/baculum/protected/API/Class/OAuthUrlMapping.php rename to gui/baculum/protected/API/Modules/OAuthUrlMapping.php index e294763cc..330132a7b 100644 --- a/gui/baculum/protected/API/Class/OAuthUrlMapping.php +++ b/gui/baculum/protected/API/Modules/OAuthUrlMapping.php @@ -20,7 +20,8 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('System.Web.TUrlMapping'); +use Baculum\Common\Modules\BaculumUrlMapping; +use Prado\Web\TUrlMappingPattern; /** * Extension default URL mapper for OAuth2. diff --git a/gui/baculum/protected/API/Class/PanelUrlMapping.php b/gui/baculum/protected/API/Modules/PanelUrlMapping.php similarity index 93% rename from gui/baculum/protected/API/Class/PanelUrlMapping.php rename to gui/baculum/protected/API/Modules/PanelUrlMapping.php index 6a874d9ba..881be6cbd 100644 --- a/gui/baculum/protected/API/Class/PanelUrlMapping.php +++ b/gui/baculum/protected/API/Modules/PanelUrlMapping.php @@ -20,7 +20,8 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('System.Web.TUrlMapping'); +use Baculum\Common\Modules\BaculumUrlMapping; +use Prado\Web\TUrlMappingPattern; /** * Extension default URL mapper for Panel. diff --git a/gui/baculum/protected/API/Class/PoolManager.php b/gui/baculum/protected/API/Modules/PoolManager.php similarity index 91% rename from gui/baculum/protected/API/Class/PoolManager.php rename to gui/baculum/protected/API/Modules/PoolManager.php index b53c2a22d..2a97fc3fd 100644 --- a/gui/baculum/protected/API/Class/PoolManager.php +++ b/gui/baculum/protected/API/Modules/PoolManager.php @@ -20,9 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.APIModule'); -Prado::using('Application.API.Class.PoolRecord'); -Prado::using('Application.API.Class.Database'); +namespace Baculum\API\Modules; + +use Prado\Data\ActiveRecord\TActiveRecordCriteria; /** * Pool manager module. diff --git a/gui/baculum/protected/API/Class/PoolRecord.php b/gui/baculum/protected/API/Modules/PoolRecord.php similarity index 96% rename from gui/baculum/protected/API/Class/PoolRecord.php rename to gui/baculum/protected/API/Modules/PoolRecord.php index 511264ec7..07693f78a 100644 --- a/gui/baculum/protected/API/Class/PoolRecord.php +++ b/gui/baculum/protected/API/Modules/PoolRecord.php @@ -20,7 +20,7 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.APIDbModule'); +namespace Baculum\API\Modules; /** * Pool record module. diff --git a/gui/baculum/protected/API/Class/StatusClient.php b/gui/baculum/protected/API/Modules/StatusClient.php similarity index 97% rename from gui/baculum/protected/API/Class/StatusClient.php rename to gui/baculum/protected/API/Modules/StatusClient.php index 3a48fc00b..210f3d2c9 100644 --- a/gui/baculum/protected/API/Class/StatusClient.php +++ b/gui/baculum/protected/API/Modules/StatusClient.php @@ -20,7 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.ComponentStatusModule'); +namespace Baculum\API\Modules; + +use Baculum\Common\Modules\Errors\GenericError; /** * Module used to get and parse client status output. diff --git a/gui/baculum/protected/API/Class/StatusDirector.php b/gui/baculum/protected/API/Modules/StatusDirector.php similarity index 97% rename from gui/baculum/protected/API/Class/StatusDirector.php rename to gui/baculum/protected/API/Modules/StatusDirector.php index b2bcd1343..c24ebad76 100644 --- a/gui/baculum/protected/API/Class/StatusDirector.php +++ b/gui/baculum/protected/API/Modules/StatusDirector.php @@ -20,8 +20,7 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.Bconsole'); -Prado::using('Application.API.Class.ComponentStatusModule'); +namespace Baculum\API\Modules; /** * Module used to parse and prepare director status output. diff --git a/gui/baculum/protected/API/Class/StatusStorage.php b/gui/baculum/protected/API/Modules/StatusStorage.php similarity index 98% rename from gui/baculum/protected/API/Class/StatusStorage.php rename to gui/baculum/protected/API/Modules/StatusStorage.php index 4a74b1e1c..d8690f88d 100644 --- a/gui/baculum/protected/API/Class/StatusStorage.php +++ b/gui/baculum/protected/API/Modules/StatusStorage.php @@ -20,7 +20,7 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.ComponentStatusModule'); +namespace Baculum\API\Modules; /** * Module used to get and parse storage status output. diff --git a/gui/baculum/protected/API/Class/StorageManager.php b/gui/baculum/protected/API/Modules/StorageManager.php similarity index 92% rename from gui/baculum/protected/API/Class/StorageManager.php rename to gui/baculum/protected/API/Modules/StorageManager.php index b7bd43cbc..217073afb 100644 --- a/gui/baculum/protected/API/Class/StorageManager.php +++ b/gui/baculum/protected/API/Modules/StorageManager.php @@ -20,8 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.APIModule'); -Prado::using('Application.API.Class.StorageRecord'); +namespace Baculum\API\Modules; + +use Prado\Data\ActiveRecord\TActiveRecordCriteria; /** * Storage manager module. diff --git a/gui/baculum/protected/API/Class/StorageRecord.php b/gui/baculum/protected/API/Modules/StorageRecord.php similarity index 95% rename from gui/baculum/protected/API/Class/StorageRecord.php rename to gui/baculum/protected/API/Modules/StorageRecord.php index 08f2127d3..bd9f72780 100644 --- a/gui/baculum/protected/API/Class/StorageRecord.php +++ b/gui/baculum/protected/API/Modules/StorageRecord.php @@ -20,7 +20,7 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.APIDbModule'); +namespace Baculum\API\Modules; /** * Storage record module. diff --git a/gui/baculum/protected/API/Class/VersionManager.php b/gui/baculum/protected/API/Modules/VersionManager.php similarity index 91% rename from gui/baculum/protected/API/Class/VersionManager.php rename to gui/baculum/protected/API/Modules/VersionManager.php index c4f0eda97..67943944b 100644 --- a/gui/baculum/protected/API/Class/VersionManager.php +++ b/gui/baculum/protected/API/Modules/VersionManager.php @@ -20,8 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.APIModule'); -Prado::using('Application.API.Class.VersionRecord'); +namespace Baculum\API\Modules; + +use Prado\Data\ActiveRecord\TActiveRecordCriteria; /** * Version manager module. diff --git a/gui/baculum/protected/API/Class/VersionRecord.php b/gui/baculum/protected/API/Modules/VersionRecord.php similarity index 95% rename from gui/baculum/protected/API/Class/VersionRecord.php rename to gui/baculum/protected/API/Modules/VersionRecord.php index 5247f34c3..b0c2379c7 100644 --- a/gui/baculum/protected/API/Class/VersionRecord.php +++ b/gui/baculum/protected/API/Modules/VersionRecord.php @@ -20,7 +20,7 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.APIDbModule'); +namespace Baculum\API\Modules; /** * Version record module. diff --git a/gui/baculum/protected/API/Class/VolumeManager.php b/gui/baculum/protected/API/Modules/VolumeManager.php similarity index 97% rename from gui/baculum/protected/API/Class/VolumeManager.php rename to gui/baculum/protected/API/Modules/VolumeManager.php index 69dcf599e..138d4ba4b 100644 --- a/gui/baculum/protected/API/Class/VolumeManager.php +++ b/gui/baculum/protected/API/Modules/VolumeManager.php @@ -20,9 +20,7 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.APIModule'); -Prado::using('Application.API.Class.VolumeRecord'); -Prado::using('Application.API.Class.Database'); +namespace Baculum\API\Modules; /** * Volume manager module. diff --git a/gui/baculum/protected/API/Class/VolumeRecord.php b/gui/baculum/protected/API/Modules/VolumeRecord.php similarity index 97% rename from gui/baculum/protected/API/Class/VolumeRecord.php rename to gui/baculum/protected/API/Modules/VolumeRecord.php index 80430bd65..459699dd0 100644 --- a/gui/baculum/protected/API/Class/VolumeRecord.php +++ b/gui/baculum/protected/API/Modules/VolumeRecord.php @@ -20,7 +20,7 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.APIDbModule'); +namespace Baculum\API\Modules; /** * Volume record module. diff --git a/gui/baculum/protected/API/Pages/API/Actions.php b/gui/baculum/protected/API/Pages/API/Actions.php index c3a8a0f54..04eaa427b 100644 --- a/gui/baculum/protected/API/Pages/API/Actions.php +++ b/gui/baculum/protected/API/Pages/API/Actions.php @@ -20,8 +20,10 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.APIConfig'); - +use Baculum\API\Modules\APIConfig; +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\ActionsError; + /** * API actions support. * diff --git a/gui/baculum/protected/API/Pages/API/Authorize.php b/gui/baculum/protected/API/Pages/API/Authorize.php index cecdcf1d7..488688905 100644 --- a/gui/baculum/protected/API/Pages/API/Authorize.php +++ b/gui/baculum/protected/API/Pages/API/Authorize.php @@ -20,5 +20,5 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Pages.OAuth2.Authorize'); +use Baculum\API\Pages\OAuth2\Authorize; ?> diff --git a/gui/baculum/protected/API/Pages/API/BVFSCleanUp.php b/gui/baculum/protected/API/Pages/API/BVFSCleanUp.php index bd3068585..2c9daa6ea 100644 --- a/gui/baculum/protected/API/Pages/API/BVFSCleanUp.php +++ b/gui/baculum/protected/API/Pages/API/BVFSCleanUp.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\BVFSError; + /** * BVFS cleanup. * diff --git a/gui/baculum/protected/API/Pages/API/BVFSClearCache.php b/gui/baculum/protected/API/Pages/API/BVFSClearCache.php index e26fc5db3..f9de30213 100644 --- a/gui/baculum/protected/API/Pages/API/BVFSClearCache.php +++ b/gui/baculum/protected/API/Pages/API/BVFSClearCache.php @@ -20,6 +20,8 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ +use Baculum\API\Modules\BaculumAPIServer; + /** * BVFS clear cache. * diff --git a/gui/baculum/protected/API/Pages/API/BVFSGetJobids.php b/gui/baculum/protected/API/Pages/API/BVFSGetJobids.php index c59e74203..fae578d8a 100644 --- a/gui/baculum/protected/API/Pages/API/BVFSGetJobids.php +++ b/gui/baculum/protected/API/Pages/API/BVFSGetJobids.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\BVFSError; + /** * BVFS get jobids to do restore. * diff --git a/gui/baculum/protected/API/Pages/API/BVFSLsDirs.php b/gui/baculum/protected/API/Pages/API/BVFSLsDirs.php index 04684470a..c54ba002d 100644 --- a/gui/baculum/protected/API/Pages/API/BVFSLsDirs.php +++ b/gui/baculum/protected/API/Pages/API/BVFSLsDirs.php @@ -20,8 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.ConsoleOutputPage'); - +use Baculum\API\Modules\ConsoleOutputPage; +use Baculum\Common\Modules\Errors\BVFSError; + /** * BVFS list directories. * diff --git a/gui/baculum/protected/API/Pages/API/BVFSLsFiles.php b/gui/baculum/protected/API/Pages/API/BVFSLsFiles.php index 743e650b1..be01ccc6a 100644 --- a/gui/baculum/protected/API/Pages/API/BVFSLsFiles.php +++ b/gui/baculum/protected/API/Pages/API/BVFSLsFiles.php @@ -20,7 +20,8 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.ConsoleOutputPage'); +use Baculum\API\Modules\ConsoleOutputPage; +use Baculum\Common\Modules\Errors\BVFSError; /** * BVFS list files. diff --git a/gui/baculum/protected/API/Pages/API/BVFSRestore.php b/gui/baculum/protected/API/Pages/API/BVFSRestore.php index 1451f326d..ec24046ca 100644 --- a/gui/baculum/protected/API/Pages/API/BVFSRestore.php +++ b/gui/baculum/protected/API/Pages/API/BVFSRestore.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\BVFSError; + /** * BVFS restore. * diff --git a/gui/baculum/protected/API/Pages/API/BVFSUpdate.php b/gui/baculum/protected/API/Pages/API/BVFSUpdate.php index 5ad4089d9..0c9abf655 100644 --- a/gui/baculum/protected/API/Pages/API/BVFSUpdate.php +++ b/gui/baculum/protected/API/Pages/API/BVFSUpdate.php @@ -20,6 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\BVFSError; + /** * BVFS update. * diff --git a/gui/baculum/protected/API/Pages/API/BVFSVersions.php b/gui/baculum/protected/API/Pages/API/BVFSVersions.php index 9131ce461..0e7e2c326 100644 --- a/gui/baculum/protected/API/Pages/API/BVFSVersions.php +++ b/gui/baculum/protected/API/Pages/API/BVFSVersions.php @@ -20,7 +20,8 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.ConsoleOutputPage'); +use Baculum\API\Modules\ConsoleOutputPage; +use Baculum\Common\Modules\Errors\BVFSError; /** * BVFS versions. diff --git a/gui/baculum/protected/API/Pages/API/BasicUser.php b/gui/baculum/protected/API/Pages/API/BasicUser.php index 3d0afe0f1..dd271adbc 100644 --- a/gui/baculum/protected/API/Pages/API/BasicUser.php +++ b/gui/baculum/protected/API/Pages/API/BasicUser.php @@ -20,6 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\BasicUserError; + /** * Basic user endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/BasicUsers.php b/gui/baculum/protected/API/Pages/API/BasicUsers.php index 7c676f234..cccab7035 100644 --- a/gui/baculum/protected/API/Pages/API/BasicUsers.php +++ b/gui/baculum/protected/API/Pages/API/BasicUsers.php @@ -20,6 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\ClientError; + /** * Basic users endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/Catalog.php b/gui/baculum/protected/API/Pages/API/Catalog.php index e190c5832..846406916 100644 --- a/gui/baculum/protected/API/Pages/API/Catalog.php +++ b/gui/baculum/protected/API/Pages/API/Catalog.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\DatabaseError; + /** * Catalog test. * diff --git a/gui/baculum/protected/API/Pages/API/ChangerDriveLoad.php b/gui/baculum/protected/API/Pages/API/ChangerDriveLoad.php index 7c5e0731e..2ae4815e8 100644 --- a/gui/baculum/protected/API/Pages/API/ChangerDriveLoad.php +++ b/gui/baculum/protected/API/Pages/API/ChangerDriveLoad.php @@ -20,7 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.ChangerCommand'); +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\API\Modules\ChangerCommand; +use Baculum\Common\Modules\Errors\DeviceError; /** * Load a given slot to autochanger drive. diff --git a/gui/baculum/protected/API/Pages/API/ChangerDriveLoaded.php b/gui/baculum/protected/API/Pages/API/ChangerDriveLoaded.php index 25d476081..62f0f892c 100644 --- a/gui/baculum/protected/API/Pages/API/ChangerDriveLoaded.php +++ b/gui/baculum/protected/API/Pages/API/ChangerDriveLoaded.php @@ -20,6 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\DeviceError; + /** * Which slot is loaded in autochanger drive. * @@ -35,8 +38,8 @@ class ChangerDriveLoaded extends BaculumAPIServer { $drive = $this->Request->contains('drive') && $misc->isValidName($this->Request['drive']) ? $this->Request['drive'] : null; if (is_null($drive)) { - $this->output = ChangerCommandError::MSG_ERROR_CHANGER_COMMAND_AUTOCHANGER_DRIVE_DOES_NOT_EXIST; - $this->error = ChangerCommandError::ERROR_CHANGER_COMMAND_AUTOCHANGER_DRIVE_DOES_NOT_EXIST; + $this->output = DeviceError::MSG_ERROR_DEVICE_AUTOCHANGER_DRIVE_DOES_NOT_EXIST + $this->error = DeviceError::ERROR_DEVICE_AUTOCHANGER_DRIVE_DOES_NOT_EXIST return; } diff --git a/gui/baculum/protected/API/Pages/API/ChangerDriveUnload.php b/gui/baculum/protected/API/Pages/API/ChangerDriveUnload.php index 84e9749b6..438d4cc86 100644 --- a/gui/baculum/protected/API/Pages/API/ChangerDriveUnload.php +++ b/gui/baculum/protected/API/Pages/API/ChangerDriveUnload.php @@ -20,7 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.ChangerCommand'); +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\API\Modules\ChangerCommand; +use Baculum\Common\Modules\Errors\DeviceError; /** * Unload a given slot from autochanger drive. @@ -49,14 +51,14 @@ class ChangerDriveUnload extends BaculumAPIServer { $slot = $this->Request->contains('slot') && $misc->isValidInteger($this->Request['slot']) ? intval($this->Request['slot']) : null; if (is_null($drive)) { - $this->output = ChangerCommandError::MSG_ERROR_CHANGER_COMMAND_AUTOCHANGER_DRIVE_DOES_NOT_EXIST; - $this->error = ChangerCommandError::ERROR_CHANGER_COMMAND_AUTOCHANGER_DRIVE_DOES_NOT_EXIST; + $this->output = DeviceError::MSG_ERROR_DEVICE_AUTOCHANGER_DRIVE_DOES_NOT_EXIST; + $this->error = DeviceError::ERROR_DEVICE_AUTOCHANGER_DRIVE_DOES_NOT_EXIST return; } if (is_null($slot)) { - $this->output = ChangerCommandError::MSG_ERROR_CHANGER_COMMAND_WRONG_SLOT_NUMBER; - $this->error = ChangerCommandError::ERROR_CHANGER_COMMAND_WRONG_SLOT_NUMBER; + $this->output = DeviceError::MSG_ERROR_DEVICE_WRONG_SLOT_NUMBER; + $this->error = DeviceError::ERROR_DEVICE_WRONG_SLOT_NUMBER; return; } diff --git a/gui/baculum/protected/API/Pages/API/ChangerList.php b/gui/baculum/protected/API/Pages/API/ChangerList.php index 74c9b9193..3a8d1de97 100644 --- a/gui/baculum/protected/API/Pages/API/ChangerList.php +++ b/gui/baculum/protected/API/Pages/API/ChangerList.php @@ -20,6 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\DeviceError; + /** * List autochanger volume names (requires barcode reader). * diff --git a/gui/baculum/protected/API/Pages/API/ChangerListAll.php b/gui/baculum/protected/API/Pages/API/ChangerListAll.php index c7b1a19ae..2c8f10503 100644 --- a/gui/baculum/protected/API/Pages/API/ChangerListAll.php +++ b/gui/baculum/protected/API/Pages/API/ChangerListAll.php @@ -20,6 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\DeviceError; + /** * Autochanger list all slots. * diff --git a/gui/baculum/protected/API/Pages/API/ChangerSlots.php b/gui/baculum/protected/API/Pages/API/ChangerSlots.php index ba741d34f..9b56e6341 100644 --- a/gui/baculum/protected/API/Pages/API/ChangerSlots.php +++ b/gui/baculum/protected/API/Pages/API/ChangerSlots.php @@ -20,6 +20,8 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ +use Baculum\API\Modules\BaculumAPIServer; + /** * How many slots has autochanger. * diff --git a/gui/baculum/protected/API/Pages/API/ChangerSlotsTransfer.php b/gui/baculum/protected/API/Pages/API/ChangerSlotsTransfer.php index 5c0d7c6ef..e7e5027bc 100644 --- a/gui/baculum/protected/API/Pages/API/ChangerSlotsTransfer.php +++ b/gui/baculum/protected/API/Pages/API/ChangerSlotsTransfer.php @@ -20,7 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.ChangerCommand'); +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\API\Modules\ChangerCommand; +use Baculum\Common\Modules\Errors\DeviceError; /** * Transfer autochanger tape from slot to slot. diff --git a/gui/baculum/protected/API/Pages/API/Client.php b/gui/baculum/protected/API/Pages/API/Client.php index 6229638ad..56a39529b 100644 --- a/gui/baculum/protected/API/Pages/API/Client.php +++ b/gui/baculum/protected/API/Pages/API/Client.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\ClientError; + /** * Client endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/ClientBandwidthLimit.php b/gui/baculum/protected/API/Pages/API/ClientBandwidthLimit.php index 436a722d2..e9eeb12c6 100644 --- a/gui/baculum/protected/API/Pages/API/ClientBandwidthLimit.php +++ b/gui/baculum/protected/API/Pages/API/ClientBandwidthLimit.php @@ -20,6 +20,10 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\ClientError; +use Baculum\Common\Modules\Errors\GenericError; + /** * Client bandwidth limit endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/ClientLs.php b/gui/baculum/protected/API/Pages/API/ClientLs.php index 6c7925d59..f0244b898 100644 --- a/gui/baculum/protected/API/Pages/API/ClientLs.php +++ b/gui/baculum/protected/API/Pages/API/ClientLs.php @@ -20,6 +20,10 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\ClientError; +use Baculum\Common\Modules\Errors\GenericError; + /** * Client list directories. * diff --git a/gui/baculum/protected/API/Pages/API/ClientShow.php b/gui/baculum/protected/API/Pages/API/ClientShow.php index cbc99e58f..4f117c563 100644 --- a/gui/baculum/protected/API/Pages/API/ClientShow.php +++ b/gui/baculum/protected/API/Pages/API/ClientShow.php @@ -20,8 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.ConsoleOutputPage'); -Prado::using('Application.API.Class.ConsoleOutputShowPage'); +use Baculum\API\Modules\ConsoleOutputPage; +use Baculum\API\Modules\ConsoleOutputShowPage; +use Baculum\Common\Modules\Errors\ClientError; /** * Client show command endpoint. diff --git a/gui/baculum/protected/API/Pages/API/ClientStatus.php b/gui/baculum/protected/API/Pages/API/ClientStatus.php index 46a40d2e0..ba6bc3449 100644 --- a/gui/baculum/protected/API/Pages/API/ClientStatus.php +++ b/gui/baculum/protected/API/Pages/API/ClientStatus.php @@ -20,7 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.ConsoleOutputPage'); +use Baculum\API\Modules\ConsoleOutputPage; +use Baculum\Common\Modules\Errors\ClientError; +use Baculum\Common\Modules\Errors\GenericError; /** * Client status. diff --git a/gui/baculum/protected/API/Pages/API/Clients.php b/gui/baculum/protected/API/Pages/API/Clients.php index d7e85ea83..fe65726e9 100644 --- a/gui/baculum/protected/API/Pages/API/Clients.php +++ b/gui/baculum/protected/API/Pages/API/Clients.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\ClientError; + /** * Clients endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/ClientsShow.php b/gui/baculum/protected/API/Pages/API/ClientsShow.php index 28cd618f4..e34fc2ce1 100644 --- a/gui/baculum/protected/API/Pages/API/ClientsShow.php +++ b/gui/baculum/protected/API/Pages/API/ClientsShow.php @@ -20,8 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.ConsoleOutputPage'); -Prado::using('Application.API.Class.ConsoleOutputShowPage'); +use Baculum\API\Modules\ConsoleOutputPage; +use Baculum\API\Modules\ConsoleOutputShowPage; +use Baculum\Common\Modules\Errors\ClientError; /** * Clients show command endpoint. diff --git a/gui/baculum/protected/API/Pages/API/ComponentStatus.php b/gui/baculum/protected/API/Pages/API/ComponentStatus.php index 5bf558a1a..a7d283738 100644 --- a/gui/baculum/protected/API/Pages/API/ComponentStatus.php +++ b/gui/baculum/protected/API/Pages/API/ComponentStatus.php @@ -20,7 +20,8 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.Bconsole'); +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\GenericError; /** * Component status module. diff --git a/gui/baculum/protected/API/Pages/API/Config.php b/gui/baculum/protected/API/Pages/API/Config.php index c74a6e78e..0a99a08c6 100644 --- a/gui/baculum/protected/API/Pages/API/Config.php +++ b/gui/baculum/protected/API/Pages/API/Config.php @@ -20,7 +20,8 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.Common.Class.Errors'); +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\BaculaConfigError; /** * Config endpoint. diff --git a/gui/baculum/protected/API/Pages/API/ConsoleCommand.php b/gui/baculum/protected/API/Pages/API/ConsoleCommand.php index c06f93e9c..0b0396939 100644 --- a/gui/baculum/protected/API/Pages/API/ConsoleCommand.php +++ b/gui/baculum/protected/API/Pages/API/ConsoleCommand.php @@ -19,7 +19,9 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; + /** * Console command endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/DbSize.php b/gui/baculum/protected/API/Pages/API/DbSize.php index 0a88e5045..4e4714dea 100644 --- a/gui/baculum/protected/API/Pages/API/DbSize.php +++ b/gui/baculum/protected/API/Pages/API/DbSize.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\JobError; + /** * Database size endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/DirectorShow.php b/gui/baculum/protected/API/Pages/API/DirectorShow.php index 70cd305c7..4c49ba846 100644 --- a/gui/baculum/protected/API/Pages/API/DirectorShow.php +++ b/gui/baculum/protected/API/Pages/API/DirectorShow.php @@ -20,8 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.ConsoleOutputPage'); -Prado::using('Application.API.Class.ConsoleOutputShowPage'); +use Baculum\API\Modules\ConsoleOutputPage; +use Baculum\API\Modules\ConsoleOutputShowPage; +use Baculum\Common\Modules\Errors\BconsoleError; /** * Director show command endpoint. diff --git a/gui/baculum/protected/API/Pages/API/DirectorStatus.php b/gui/baculum/protected/API/Pages/API/DirectorStatus.php index c2f755eb4..d055f45af 100644 --- a/gui/baculum/protected/API/Pages/API/DirectorStatus.php +++ b/gui/baculum/protected/API/Pages/API/DirectorStatus.php @@ -20,7 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.ConsoleOutputPage'); +use Baculum\API\Modules\ConsoleOutputPage; +use Baculum\Common\Modules\Errors\BconsoleError; +use Baculum\Common\Modules\Errors\GenericError; /** * Director status command endpoint. diff --git a/gui/baculum/protected/API/Pages/API/Directors.php b/gui/baculum/protected/API/Pages/API/Directors.php index a10ab7c55..34c8f50bd 100644 --- a/gui/baculum/protected/API/Pages/API/Directors.php +++ b/gui/baculum/protected/API/Pages/API/Directors.php @@ -20,6 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\BconsoleError; + /** * Directors endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/FileSet.php b/gui/baculum/protected/API/Pages/API/FileSet.php index cc884804d..2d1b5956c 100644 --- a/gui/baculum/protected/API/Pages/API/FileSet.php +++ b/gui/baculum/protected/API/Pages/API/FileSet.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\FileSetError; + /** * FileSet endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/FileSetResNames.php b/gui/baculum/protected/API/Pages/API/FileSetResNames.php index 5174a657e..adff1ca56 100644 --- a/gui/baculum/protected/API/Pages/API/FileSetResNames.php +++ b/gui/baculum/protected/API/Pages/API/FileSetResNames.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\BconsoleError; + /** * FileSet resource names endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/FileSets.php b/gui/baculum/protected/API/Pages/API/FileSets.php index 79610cd48..4e2ab538e 100644 --- a/gui/baculum/protected/API/Pages/API/FileSets.php +++ b/gui/baculum/protected/API/Pages/API/FileSets.php @@ -20,6 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\FileSetError; + /** * FileSets endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/Job.php b/gui/baculum/protected/API/Pages/API/Job.php index f8d5958b7..7b352594a 100644 --- a/gui/baculum/protected/API/Pages/API/Job.php +++ b/gui/baculum/protected/API/Pages/API/Job.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\JobError; + /** * Job endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/JobBandwidthLimit.php b/gui/baculum/protected/API/Pages/API/JobBandwidthLimit.php index a175f8ff7..6dce69054 100644 --- a/gui/baculum/protected/API/Pages/API/JobBandwidthLimit.php +++ b/gui/baculum/protected/API/Pages/API/JobBandwidthLimit.php @@ -20,6 +20,10 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\GenericError; +use Baculum\Common\Modules\Errors\JobError; + /** * Job bandwidth limit endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/JobCancel.php b/gui/baculum/protected/API/Pages/API/JobCancel.php index 0aa8e9e65..72cff28d4 100644 --- a/gui/baculum/protected/API/Pages/API/JobCancel.php +++ b/gui/baculum/protected/API/Pages/API/JobCancel.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\JobError; + /** * Cancel job endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/JobEstimate.php b/gui/baculum/protected/API/Pages/API/JobEstimate.php index a67435055..3e8970a76 100644 --- a/gui/baculum/protected/API/Pages/API/JobEstimate.php +++ b/gui/baculum/protected/API/Pages/API/JobEstimate.php @@ -19,8 +19,11 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - -Prado::using('Application.API.Class.Bconsole'); + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\API\Modules\Bconsole; +use Baculum\Common\Modules\Errors\JobError; +use Baculum\Common\Modules\Errors\VolumeError; /** * Estimate job endpoint. diff --git a/gui/baculum/protected/API/Pages/API/JobFiles.php b/gui/baculum/protected/API/Pages/API/JobFiles.php index a9d9ce152..09d5243a9 100644 --- a/gui/baculum/protected/API/Pages/API/JobFiles.php +++ b/gui/baculum/protected/API/Pages/API/JobFiles.php @@ -20,6 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\JobError; + /** * Job files endpoint. * It finds job by file criteria. diff --git a/gui/baculum/protected/API/Pages/API/JobListFiles.php b/gui/baculum/protected/API/Pages/API/JobListFiles.php index a01cfe3d5..547b6db3c 100644 --- a/gui/baculum/protected/API/Pages/API/JobListFiles.php +++ b/gui/baculum/protected/API/Pages/API/JobListFiles.php @@ -20,6 +20,11 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ +use Baculum\API\Modules\APIServer; +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\GenericError; +use Baculum\Common\Modules\Errors\JobError; + /** * List files from 'list files jobid=xx' bconsole command. * diff --git a/gui/baculum/protected/API/Pages/API/JobLog.php b/gui/baculum/protected/API/Pages/API/JobLog.php index 4e6c1fe60..eb70c26c5 100644 --- a/gui/baculum/protected/API/Pages/API/JobLog.php +++ b/gui/baculum/protected/API/Pages/API/JobLog.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\JobError; + /** * Job log endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/JobResNames.php b/gui/baculum/protected/API/Pages/API/JobResNames.php index 38e08f78d..fa81ec010 100644 --- a/gui/baculum/protected/API/Pages/API/JobResNames.php +++ b/gui/baculum/protected/API/Pages/API/JobResNames.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\BconsoleError; + /** * Job resource names endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/JobRun.php b/gui/baculum/protected/API/Pages/API/JobRun.php index 86c781e50..cc1c55ab2 100644 --- a/gui/baculum/protected/API/Pages/API/JobRun.php +++ b/gui/baculum/protected/API/Pages/API/JobRun.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\JobError; + /** * Job run endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/JobShow.php b/gui/baculum/protected/API/Pages/API/JobShow.php index 0750431ed..8a8bbe137 100644 --- a/gui/baculum/protected/API/Pages/API/JobShow.php +++ b/gui/baculum/protected/API/Pages/API/JobShow.php @@ -20,8 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.ConsoleOutputPage'); -Prado::using('Application.API.Class.ConsoleOutputShowPage'); +use Baculum\API\Modules\ConsoleOutputPage; +use Baculum\API\Modules\ConsoleOutputShowPage; +use Baculum\Common\Modules\Errors\JobError; /** * Job show endpoint. diff --git a/gui/baculum/protected/API/Pages/API/JobTotals.php b/gui/baculum/protected/API/Pages/API/JobTotals.php index daf3f0754..d824ddb6d 100644 --- a/gui/baculum/protected/API/Pages/API/JobTotals.php +++ b/gui/baculum/protected/API/Pages/API/JobTotals.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\JobError; + /** * Job totals endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/Jobs.php b/gui/baculum/protected/API/Pages/API/Jobs.php index 9639e4c4e..a4f392f35 100644 --- a/gui/baculum/protected/API/Pages/API/Jobs.php +++ b/gui/baculum/protected/API/Pages/API/Jobs.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\JobError; + /** * Jobs endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/JobsForClient.php b/gui/baculum/protected/API/Pages/API/JobsForClient.php index 043982135..9af52e30a 100644 --- a/gui/baculum/protected/API/Pages/API/JobsForClient.php +++ b/gui/baculum/protected/API/Pages/API/JobsForClient.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\JobError; + /** * Jobs for client endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/JobsOnVolume.php b/gui/baculum/protected/API/Pages/API/JobsOnVolume.php index 62b08643e..a4c566443 100644 --- a/gui/baculum/protected/API/Pages/API/JobsOnVolume.php +++ b/gui/baculum/protected/API/Pages/API/JobsOnVolume.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\JobError; + /** * Jobs on volume endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/JobsRecent.php b/gui/baculum/protected/API/Pages/API/JobsRecent.php index c42915a73..26492e2e5 100644 --- a/gui/baculum/protected/API/Pages/API/JobsRecent.php +++ b/gui/baculum/protected/API/Pages/API/JobsRecent.php @@ -19,7 +19,12 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\ClientError; +use Baculum\Common\Modules\Errors\FileSetError; +use Baculum\Common\Modules\Errors\JobError; + /** * Recent jobs endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/JobsShow.php b/gui/baculum/protected/API/Pages/API/JobsShow.php index f2ee23a96..6da275563 100644 --- a/gui/baculum/protected/API/Pages/API/JobsShow.php +++ b/gui/baculum/protected/API/Pages/API/JobsShow.php @@ -20,8 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.ConsoleOutputPage'); -Prado::using('Application.API.Class.ConsoleOutputShowPage'); +use Baculum\API\Modules\ConsoleOutputPage; +use Baculum\API\Modules\ConsoleOutputShowPage; +use Baculum\Common\Modules\Errors\JobError; /** * Show jobs command endpoint. diff --git a/gui/baculum/protected/API/Pages/API/Messages.php b/gui/baculum/protected/API/Pages/API/Messages.php index 644077254..704fd15eb 100644 --- a/gui/baculum/protected/API/Pages/API/Messages.php +++ b/gui/baculum/protected/API/Pages/API/Messages.php @@ -20,6 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\GenericError; + /** * Console messages. * diff --git a/gui/baculum/protected/API/Pages/API/OAuth2Client.php b/gui/baculum/protected/API/Pages/API/OAuth2Client.php index ab291bba4..9a50fdecb 100644 --- a/gui/baculum/protected/API/Pages/API/OAuth2Client.php +++ b/gui/baculum/protected/API/Pages/API/OAuth2Client.php @@ -20,6 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\OAuth2Error; + /** * OAuth2 client endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/OAuth2Clients.php b/gui/baculum/protected/API/Pages/API/OAuth2Clients.php index 08d07c03b..364723a46 100644 --- a/gui/baculum/protected/API/Pages/API/OAuth2Clients.php +++ b/gui/baculum/protected/API/Pages/API/OAuth2Clients.php @@ -20,6 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\ClientError; + /** * OAuth2 clients endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/Pool.php b/gui/baculum/protected/API/Pages/API/Pool.php index 03648de61..b8363ddd2 100644 --- a/gui/baculum/protected/API/Pages/API/Pool.php +++ b/gui/baculum/protected/API/Pages/API/Pool.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\PoolError; + /** * Pool endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/PoolShow.php b/gui/baculum/protected/API/Pages/API/PoolShow.php index 7ec1171b5..0560e1b34 100644 --- a/gui/baculum/protected/API/Pages/API/PoolShow.php +++ b/gui/baculum/protected/API/Pages/API/PoolShow.php @@ -20,8 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.ConsoleOutputPage'); -Prado::using('Application.API.Class.ConsoleOutputShowPage'); +use Baculum\API\Modules\ConsoleOutputPage; +use Baculum\API\Modules\ConsoleOutputShowPage; +use Baculum\Common\Modules\Errors\PoolError; /** * Show pool command endpoint. diff --git a/gui/baculum/protected/API/Pages/API/PoolUpdate.php b/gui/baculum/protected/API/Pages/API/PoolUpdate.php index d58599812..85a85b029 100644 --- a/gui/baculum/protected/API/Pages/API/PoolUpdate.php +++ b/gui/baculum/protected/API/Pages/API/PoolUpdate.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\PoolError; + /** * Update pool command endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/PoolUpdateVolumes.php b/gui/baculum/protected/API/Pages/API/PoolUpdateVolumes.php index 5d3c3f913..00031ede9 100644 --- a/gui/baculum/protected/API/Pages/API/PoolUpdateVolumes.php +++ b/gui/baculum/protected/API/Pages/API/PoolUpdateVolumes.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\PoolError; + /** * Update pool volumes command endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/Pools.php b/gui/baculum/protected/API/Pages/API/Pools.php index 86da3c0e8..bc6041cfc 100644 --- a/gui/baculum/protected/API/Pages/API/Pools.php +++ b/gui/baculum/protected/API/Pages/API/Pools.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\PoolError; + /** * Pools endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/PoolsShow.php b/gui/baculum/protected/API/Pages/API/PoolsShow.php index a7ed29d4c..70c86ef21 100644 --- a/gui/baculum/protected/API/Pages/API/PoolsShow.php +++ b/gui/baculum/protected/API/Pages/API/PoolsShow.php @@ -20,8 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.ConsoleOutputPage'); -Prado::using('Application.API.Class.ConsoleOutputShowPage'); +use Baculum\API\Modules\ConsoleOutputPage; +use Baculum\API\Modules\ConsoleOutputShowPage; +use Baculum\Common\Modules\Errors\PoolError; /** * Show pools command endpoint. diff --git a/gui/baculum/protected/API/Pages/API/RequestToken.php b/gui/baculum/protected/API/Pages/API/RequestToken.php index b4a56fc12..faad9e0b8 100644 --- a/gui/baculum/protected/API/Pages/API/RequestToken.php +++ b/gui/baculum/protected/API/Pages/API/RequestToken.php @@ -20,5 +20,5 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Pages.OAuth2.RequestToken'); +use Baculum\API\Pages\OAuth2\RequestToken; ?> diff --git a/gui/baculum/protected/API/Pages/API/RestoreRun.php b/gui/baculum/protected/API/Pages/API/RestoreRun.php index 446c5975e..d4c0cb2b4 100644 --- a/gui/baculum/protected/API/Pages/API/RestoreRun.php +++ b/gui/baculum/protected/API/Pages/API/RestoreRun.php @@ -20,8 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.APIDbModule'); - +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\JobError; + /** * Run restore command endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/ScheduleStatus.php b/gui/baculum/protected/API/Pages/API/ScheduleStatus.php index b96a4e45a..c2a415a2b 100644 --- a/gui/baculum/protected/API/Pages/API/ScheduleStatus.php +++ b/gui/baculum/protected/API/Pages/API/ScheduleStatus.php @@ -20,7 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.Bconsole'); +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\API\Modules\Bconsole; +use Baculum\Common\Modules\Errors\PoolError; /** * Status schedune endpoint. diff --git a/gui/baculum/protected/API/Pages/API/Schedules.php b/gui/baculum/protected/API/Pages/API/Schedules.php index 487e182e1..1e1745a59 100644 --- a/gui/baculum/protected/API/Pages/API/Schedules.php +++ b/gui/baculum/protected/API/Pages/API/Schedules.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\PoolError; + /** * Schedules command endpoint * diff --git a/gui/baculum/protected/API/Pages/API/SlotsUpdate.php b/gui/baculum/protected/API/Pages/API/SlotsUpdate.php index 1967c55b6..6e58d8fd2 100644 --- a/gui/baculum/protected/API/Pages/API/SlotsUpdate.php +++ b/gui/baculum/protected/API/Pages/API/SlotsUpdate.php @@ -20,7 +20,10 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.Bconsole'); +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\API\Modules\Bconsole; +use Baculum\Common\Modules\Errors\StorageError; +use Baculum\Common\Modules\Errors\VolumeError; /** * Update slots command endpoint. diff --git a/gui/baculum/protected/API/Pages/API/Storage.php b/gui/baculum/protected/API/Pages/API/Storage.php index 05cdc7f7c..c6bc300b8 100644 --- a/gui/baculum/protected/API/Pages/API/Storage.php +++ b/gui/baculum/protected/API/Pages/API/Storage.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\StorageError; + /** * Storage endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/StorageMount.php b/gui/baculum/protected/API/Pages/API/StorageMount.php index 8a04dc862..5624d7e99 100644 --- a/gui/baculum/protected/API/Pages/API/StorageMount.php +++ b/gui/baculum/protected/API/Pages/API/StorageMount.php @@ -19,8 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - -Prado::using('Application.API.Class.Bconsole'); + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\API\Modules\Bconsole; +use Baculum\Common\Modules\Errors\StorageError; /** * Mount storage command endpoint. diff --git a/gui/baculum/protected/API/Pages/API/StorageMountV1.php b/gui/baculum/protected/API/Pages/API/StorageMountV1.php index f98f3fa26..79c66267e 100644 --- a/gui/baculum/protected/API/Pages/API/StorageMountV1.php +++ b/gui/baculum/protected/API/Pages/API/StorageMountV1.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\StorageError; + /** * Mount storage command endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/StorageRelease.php b/gui/baculum/protected/API/Pages/API/StorageRelease.php index 965aa5f6d..a00e6a177 100644 --- a/gui/baculum/protected/API/Pages/API/StorageRelease.php +++ b/gui/baculum/protected/API/Pages/API/StorageRelease.php @@ -19,8 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - -Prado::using('Application.API.Class.Bconsole'); + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\API\Modules\Bconsole; +use Baculum\Common\Modules\Errors\StorageError; /** * Release storage command endpoint. diff --git a/gui/baculum/protected/API/Pages/API/StorageReleaseV1.php b/gui/baculum/protected/API/Pages/API/StorageReleaseV1.php index e319f758a..f5efd8b10 100644 --- a/gui/baculum/protected/API/Pages/API/StorageReleaseV1.php +++ b/gui/baculum/protected/API/Pages/API/StorageReleaseV1.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\StorageError; + /** * Release storage command endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/StorageShow.php b/gui/baculum/protected/API/Pages/API/StorageShow.php index ed45c969a..4c6bfb203 100644 --- a/gui/baculum/protected/API/Pages/API/StorageShow.php +++ b/gui/baculum/protected/API/Pages/API/StorageShow.php @@ -20,8 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.ConsoleOutputPage'); -Prado::using('Application.API.Class.ConsoleOutputShowPage'); +use Baculum\API\Modules\ConsoleOutputPage; +use Baculum\API\Modules\ConsoleOutputShowPage; +use Baculum\Common\Modules\Errors\StorageError; /** * Show storage command endpoint. diff --git a/gui/baculum/protected/API/Pages/API/StorageStatus.php b/gui/baculum/protected/API/Pages/API/StorageStatus.php index 8874e44f4..a2f97423f 100644 --- a/gui/baculum/protected/API/Pages/API/StorageStatus.php +++ b/gui/baculum/protected/API/Pages/API/StorageStatus.php @@ -20,8 +20,10 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.ConsoleOutputPage'); - +use Baculum\API\Modules\ConsoleOutputPage; +use Baculum\Common\Modules\Errors\GenericError; +use Baculum\Common\Modules\Errors\StorageError; + /** * Storage status command endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/StorageUmount.php b/gui/baculum/protected/API/Pages/API/StorageUmount.php index e89f6a176..e016e461a 100644 --- a/gui/baculum/protected/API/Pages/API/StorageUmount.php +++ b/gui/baculum/protected/API/Pages/API/StorageUmount.php @@ -20,8 +20,10 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.Bconsole'); - +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\API\Modules\Bconsole; +use Baculum\Common\Modules\Errors\StorageError; + /** * Storage umount command endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/StorageUmountV1.php b/gui/baculum/protected/API/Pages/API/StorageUmountV1.php index 705094b64..5245cba0e 100644 --- a/gui/baculum/protected/API/Pages/API/StorageUmountV1.php +++ b/gui/baculum/protected/API/Pages/API/StorageUmountV1.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\StorageError; + /** * Storage umount command endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/Storages.php b/gui/baculum/protected/API/Pages/API/Storages.php index e4ca533ab..5ea64692a 100644 --- a/gui/baculum/protected/API/Pages/API/Storages.php +++ b/gui/baculum/protected/API/Pages/API/Storages.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\StorageError; + /** * Storages endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/StoragesShow.php b/gui/baculum/protected/API/Pages/API/StoragesShow.php index c963a984b..1801faa68 100644 --- a/gui/baculum/protected/API/Pages/API/StoragesShow.php +++ b/gui/baculum/protected/API/Pages/API/StoragesShow.php @@ -20,8 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.ConsoleOutputPage'); -Prado::using('Application.API.Class.ConsoleOutputShowPage'); +use Baculum\API\Modules\ConsoleOutputPage; +use Baculum\API\Modules\ConsoleOutputShowPage; +use Baculum\Common\Modules\Errors\StorageError; /** * Show storages command endpoint. diff --git a/gui/baculum/protected/API/Pages/API/Volume.php b/gui/baculum/protected/API/Pages/API/Volume.php index 5ce86db50..1eecb2e1a 100644 --- a/gui/baculum/protected/API/Pages/API/Volume.php +++ b/gui/baculum/protected/API/Pages/API/Volume.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\VolumeError; + /** * Volume endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/VolumeLabel.php b/gui/baculum/protected/API/Pages/API/VolumeLabel.php index 988f47f8a..5339f9bde 100644 --- a/gui/baculum/protected/API/Pages/API/VolumeLabel.php +++ b/gui/baculum/protected/API/Pages/API/VolumeLabel.php @@ -20,7 +20,11 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.Bconsole'); +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\API\Modules\Bconsole; +use Baculum\Common\Modules\Errors\PoolError; +use Baculum\Common\Modules\Errors\StorageError; +use Baculum\Common\Modules\Errors\VolumeError; /** * Label volume endpoint. diff --git a/gui/baculum/protected/API/Pages/API/VolumeLabelBarcodes.php b/gui/baculum/protected/API/Pages/API/VolumeLabelBarcodes.php index d46ffcd87..4c5eca532 100644 --- a/gui/baculum/protected/API/Pages/API/VolumeLabelBarcodes.php +++ b/gui/baculum/protected/API/Pages/API/VolumeLabelBarcodes.php @@ -20,7 +20,11 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.Bconsole'); +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\API\Modules\Bconsole; +use Baculum\Common\Modules\Errors\PoolError; +use Baculum\Common\Modules\Errors\StorageError; +use Baculum\Common\Modules\Errors\VolumeError; /** * Label barcodes command endpoint. diff --git a/gui/baculum/protected/API/Pages/API/VolumePrune.php b/gui/baculum/protected/API/Pages/API/VolumePrune.php index 6044abe14..ed5108728 100644 --- a/gui/baculum/protected/API/Pages/API/VolumePrune.php +++ b/gui/baculum/protected/API/Pages/API/VolumePrune.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\VolumeError; + /** * Volume prune command endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/VolumePurge.php b/gui/baculum/protected/API/Pages/API/VolumePurge.php index ac294a90a..24d5b6036 100644 --- a/gui/baculum/protected/API/Pages/API/VolumePurge.php +++ b/gui/baculum/protected/API/Pages/API/VolumePurge.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\VolumeError; + /** * Volume purge command endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/Volumes.php b/gui/baculum/protected/API/Pages/API/Volumes.php index e161c14cc..433e79e2d 100644 --- a/gui/baculum/protected/API/Pages/API/Volumes.php +++ b/gui/baculum/protected/API/Pages/API/Volumes.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\VolumeError; + /** * Volumes endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/VolumesInPool.php b/gui/baculum/protected/API/Pages/API/VolumesInPool.php index 27b3e9003..712158e5e 100644 --- a/gui/baculum/protected/API/Pages/API/VolumesInPool.php +++ b/gui/baculum/protected/API/Pages/API/VolumesInPool.php @@ -19,7 +19,11 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\PoolError; +use Baculum\Common\Modules\Errors\VolumeError; + /** * Volumes in pool endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/VolumesRequired.php b/gui/baculum/protected/API/Pages/API/VolumesRequired.php index 1bbeab11f..b4ffc0a70 100644 --- a/gui/baculum/protected/API/Pages/API/VolumesRequired.php +++ b/gui/baculum/protected/API/Pages/API/VolumesRequired.php @@ -19,7 +19,11 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\JobError; +use Baculum\Common\Modules\Errors\VolumeError; + /** * Required volumes endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/Welcome.php b/gui/baculum/protected/API/Pages/API/Welcome.php index afa63dd61..9e33b6193 100644 --- a/gui/baculum/protected/API/Pages/API/Welcome.php +++ b/gui/baculum/protected/API/Pages/API/Welcome.php @@ -19,7 +19,10 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ - + +use Baculum\API\Modules\BaculumAPIServer; +use Baculum\Common\Modules\Errors\GenericError; + /** * Welcome endpoint. * diff --git a/gui/baculum/protected/API/Pages/API/config.xml b/gui/baculum/protected/API/Pages/API/config.xml index c5cc3731f..4df7cbc0c 100644 --- a/gui/baculum/protected/API/Pages/API/config.xml +++ b/gui/baculum/protected/API/Pages/API/config.xml @@ -1,57 +1,57 @@ - + - - - - + + + + - - + + - - + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - + + - - - + + + - + - - + + - + diff --git a/gui/baculum/protected/API/Pages/OAuth2/Authorize.php b/gui/baculum/protected/API/Pages/OAuth2/Authorize.php index 5aa9a0b18..edb55ef4e 100644 --- a/gui/baculum/protected/API/Pages/OAuth2/Authorize.php +++ b/gui/baculum/protected/API/Pages/OAuth2/Authorize.php @@ -20,7 +20,7 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.BaculumAPIPage'); +use Baculum\API\Modules\BaculumAPIPage; /** * OAuth2 authorization server. diff --git a/gui/baculum/protected/API/Pages/OAuth2/RequestToken.php b/gui/baculum/protected/API/Pages/OAuth2/RequestToken.php index 82b8fc28e..73ce2791f 100644 --- a/gui/baculum/protected/API/Pages/OAuth2/RequestToken.php +++ b/gui/baculum/protected/API/Pages/OAuth2/RequestToken.php @@ -20,7 +20,7 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.API.Class.BaculumAPIPage'); +use Baculum\API\Modules\BaculumAPIPage; /** * OAuth2 authorization server - request token part. diff --git a/gui/baculum/protected/API/Pages/OAuth2/config.xml b/gui/baculum/protected/API/Pages/OAuth2/config.xml index 7351d9e0a..d502acb1e 100644 --- a/gui/baculum/protected/API/Pages/OAuth2/config.xml +++ b/gui/baculum/protected/API/Pages/OAuth2/config.xml @@ -1,14 +1,14 @@ - + - - - - + + + + - + diff --git a/gui/baculum/protected/API/Pages/Panel/APIBasicUsers.php b/gui/baculum/protected/API/Pages/Panel/APIBasicUsers.php index ea93bc0fe..6ecd9bb5f 100644 --- a/gui/baculum/protected/API/Pages/Panel/APIBasicUsers.php +++ b/gui/baculum/protected/API/Pages/Panel/APIBasicUsers.php @@ -20,8 +20,7 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('System.Web.UI.ActiveControls.TCallback'); -Prado::using('Application.API.Class.BaculumAPIPage'); +use Baculum\API\Modules\BaculumAPIPage; /** * API Basic users page. diff --git a/gui/baculum/protected/API/Pages/Panel/APIBasicUsers.tpl b/gui/baculum/protected/API/Pages/Panel/APIBasicUsers.tpl index 5ecbba64d..ce1485967 100644 --- a/gui/baculum/protected/API/Pages/Panel/APIBasicUsers.tpl +++ b/gui/baculum/protected/API/Pages/Panel/APIBasicUsers.tpl @@ -1,4 +1,4 @@ -<%@ MasterClass="Application.API.Layouts.Main" Theme="Baculum-v2"%> +<%@ MasterClass="Baculum.API.Layouts.Main" Theme="Baculum-v2"%>
@@ -153,7 +153,7 @@ var oBasicUserList = {

<%[ Add user ]%>

- <%[ Edit user ]%>
- +<%@ MasterClass="Baculum.API.Layouts.Main" Theme="Baculum-v2"%>
@@ -33,7 +33,7 @@
- + - +
diff --git a/gui/baculum/protected/Web/Pages/Dashboard.php b/gui/baculum/protected/Web/Pages/Dashboard.php index cfa681a52..885ca6f93 100644 --- a/gui/baculum/protected/Web/Pages/Dashboard.php +++ b/gui/baculum/protected/Web/Pages/Dashboard.php @@ -20,8 +20,7 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('System.Web.UI.ActiveControls.TActiveLinkButton'); -Prado::using('Application.Web.Class.BaculumWebPage'); +use Baculum\Web\Modules\BaculumWebPage; /** * Main dashboard page. diff --git a/gui/baculum/protected/Web/Pages/DeviceView.page b/gui/baculum/protected/Web/Pages/DeviceView.page index f0a1c57fa..5fc63cdb4 100644 --- a/gui/baculum/protected/Web/Pages/DeviceView.page +++ b/gui/baculum/protected/Web/Pages/DeviceView.page @@ -1,4 +1,4 @@ -<%@ MasterClass="Application.Web.Layouts.Main" Theme="Baculum-v2"%> +<%@ MasterClass="Baculum\Web\Layouts\Main" Theme="Baculum-v2"%>
@@ -76,7 +76,7 @@
- <%[ The pool has not been renamed but it has been copied with the new name. Please note that if the original pool contained volumes, they have not been moved and they are still assigned to the original pool in the catalog database. To re-assign volumes from the original pool to this one please go to the MAIN MENU ➤ Pools ➤ [NEW POOL] ➤ Tab: Actions and please use the 'Assign volumes' button. After re-assgning volumes you can delete the original pool. ]%>

- setViewState(self::FILESET_NAME, $fileset_name); diff --git a/gui/baculum/protected/Web/Pages/Graphs.page b/gui/baculum/protected/Web/Pages/Graphs.page index 9610b41d0..e4551486f 100644 --- a/gui/baculum/protected/Web/Pages/Graphs.page +++ b/gui/baculum/protected/Web/Pages/Graphs.page @@ -1,4 +1,4 @@ -<%@ MasterClass="Application.Web.Layouts.Main" Theme="Baculum-v2"%> +<%@ MasterClass="Baculum\Web\Layouts\Main" Theme="Baculum-v2"%>
@@ -7,5 +7,5 @@
- + diff --git a/gui/baculum/protected/Web/Pages/Graphs.php b/gui/baculum/protected/Web/Pages/Graphs.php index 1f041e9bc..55ff38e76 100644 --- a/gui/baculum/protected/Web/Pages/Graphs.php +++ b/gui/baculum/protected/Web/Pages/Graphs.php @@ -20,7 +20,7 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.Web.Class.BaculumWebPage'); +use Baculum\Web\Modules\BaculumWebPage; /** * Graphs page. diff --git a/gui/baculum/protected/Web/Pages/JobHistoryList.page b/gui/baculum/protected/Web/Pages/JobHistoryList.page index 257f5c75f..9cf93c8e7 100644 --- a/gui/baculum/protected/Web/Pages/JobHistoryList.page +++ b/gui/baculum/protected/Web/Pages/JobHistoryList.page @@ -1,4 +1,4 @@ -<%@ MasterClass="Application.Web.Layouts.Main" Theme="Baculum-v2"%> +<%@ MasterClass="Baculum\Web\Layouts\Main" Theme="Baculum-v2"%>
@@ -95,7 +95,7 @@

<%[ Tip: Use left-click to select table row. Use CTRL + left-click to multiple row selection. Use SHIFT + left-click to add a range of rows to selection. ]%>

- + show_btn_loader(sender.options.CallbackParameter); @@ -688,5 +688,5 @@ var bulk_actions_output_id = '<%=$this->SourceTemplateControl->BulkActions->Bulk oMonitor(); - + diff --git a/gui/baculum/protected/Web/Pages/JobHistoryList.php b/gui/baculum/protected/Web/Pages/JobHistoryList.php index 6fba287fb..dce5d043e 100644 --- a/gui/baculum/protected/Web/Pages/JobHistoryList.php +++ b/gui/baculum/protected/Web/Pages/JobHistoryList.php @@ -20,10 +20,8 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('System.Web.UI.ActiveControls.TActiveLinkButton'); -Prado::using('System.Web.UI.ActiveControls.TCallback'); -Prado::using('Application.Web.Class.BaculumWebPage'); -Prado::using('Application.Web.Portlets.RunJob'); +use Prado\Web\UI\ActiveControls\TCallback; +use Baculum\Web\Modules\BaculumWebPage; /** * Job history list page. @@ -113,7 +111,6 @@ class JobHistoryList extends BaculumWebPage { * * @param TCallback $sender callback object * @param TCallbackEventPrameter $param event parameter - * @return none */ public function cancelJobs($sender, $param) { $result = []; @@ -137,7 +134,6 @@ class JobHistoryList extends BaculumWebPage { * * @param TCallback $sender callback object * @param TCallbackEventPrameter $param event parameter - * @return none */ public function deleteJobs($sender, $param) { $result = []; diff --git a/gui/baculum/protected/Web/Pages/JobHistoryView.page b/gui/baculum/protected/Web/Pages/JobHistoryView.page index 8225e97a7..4d2c49425 100644 --- a/gui/baculum/protected/Web/Pages/JobHistoryView.page +++ b/gui/baculum/protected/Web/Pages/JobHistoryView.page @@ -1,4 +1,4 @@ -<%@ MasterClass="Application.Web.Layouts.Main" Theme="Baculum-v2"%> +<%@ MasterClass="Baculum\Web\Layouts\Main" Theme="Baculum-v2"%>
@@ -80,7 +80,7 @@

<%[ Warning ]%>

allow_graph_mode ? ' style="display: none"' : ''%>> @@ -106,7 +106,7 @@ <%[ Refresh interval (sec.): ]%>
- @@ -532,10 +532,10 @@ $(function() { } }, 3000); - + - + diff --git a/gui/baculum/protected/Web/Pages/JobView.php b/gui/baculum/protected/Web/Pages/JobView.php index 98a98a3c1..babeaf91d 100644 --- a/gui/baculum/protected/Web/Pages/JobView.php +++ b/gui/baculum/protected/Web/Pages/JobView.php @@ -20,10 +20,7 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('System.Web.UI.ActiveControls.TActiveLabel'); -Prado::using('System.Web.UI.ActiveControls.TActiveLinkButton'); -Prado::using('System.Web.UI.ActiveControls.TCallback'); -Prado::using('Application.Web.Class.BaculumWebPage'); +use Baculum\Web\Modules\BaculumWebPage; /** * Job view page. @@ -56,7 +53,6 @@ class JobView extends BaculumWebPage { /** * Set job name to run job again. * - * @return none; */ public function setJobName($job_name) { $this->setViewState(self::JOB_NAME, $job_name); @@ -74,7 +70,6 @@ class JobView extends BaculumWebPage { /** * Set job information from show job output. * - * @return none */ public function setJobInfo($job_name) { $job_show = $this->getModule('api')->get( @@ -103,7 +98,6 @@ class JobView extends BaculumWebPage { * * @param BaculaConfigDirectives $sender sender object * @param mixed $param save event parameter - * @return none */ public function reloadJobInfo($sender, $param) { if ($this->Request->contains('job')) { diff --git a/gui/baculum/protected/Web/Pages/LoginPage.page b/gui/baculum/protected/Web/Pages/LoginPage.page index 12f3f96e1..24d937c15 100644 --- a/gui/baculum/protected/Web/Pages/LoginPage.page +++ b/gui/baculum/protected/Web/Pages/LoginPage.page @@ -1,4 +1,4 @@ -<%@ MasterClass="Application.Web.Layouts.Simple" Theme="Baculum-v2"%> +<%@ MasterClass="Baculum\Web\Layouts\Simple" Theme="Baculum-v2"%>
diff --git a/gui/baculum/protected/Web/Pages/LoginPage.php b/gui/baculum/protected/Web/Pages/LoginPage.php index 12ea78e06..8df7024a6 100644 --- a/gui/baculum/protected/Web/Pages/LoginPage.php +++ b/gui/baculum/protected/Web/Pages/LoginPage.php @@ -20,7 +20,8 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.Web.Class.BaculumWebPage'); +use Baculum\Web\Modules\BaculumWebPage; +use Prado\Web\UI\WebControls\TLinkButton; /** * User login page. diff --git a/gui/baculum/protected/Web/Pages/Monitor.php b/gui/baculum/protected/Web/Pages/Monitor.php index 374ccec65..27362f1f1 100644 --- a/gui/baculum/protected/Web/Pages/Monitor.php +++ b/gui/baculum/protected/Web/Pages/Monitor.php @@ -19,9 +19,11 @@ * * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.Common.Class.Errors'); -Prado::using('Application.Web.Class.BaculumWebPage'); -Prado::using('Application.Web.Class.WebUserRoles'); + +use Baculum\Common\Modules\BaculumPage; +use Baculum\Common\Modules\Errors\GenericError; +use Baculum\Web\Modules\WebConfig; +use Baculum\Web\Modules\WebUserRoles; /** * Monitor class. @@ -35,8 +37,6 @@ Prado::using('Application.Web.Class.WebUserRoles'); */ class Monitor extends BaculumPage { - const DEFAULT_MAX_JOBS = 10000; - public function onInit($param) { parent::onInit($param); $monitor_data = [ @@ -55,7 +55,7 @@ class Monitor extends BaculumPage { $this->getModule('api')->initSessionCache(true); $web_config = $this->getModule('web_config')->getConfig(); - $job_limit = self::DEFAULT_MAX_JOBS; + $job_limit = WebConfig::DEF_MAX_JOBS; if (count($web_config) > 0 && key_exists('max_jobs', $web_config['baculum'])) { $job_limit = $web_config['baculum']['max_jobs']; } diff --git a/gui/baculum/protected/Web/Pages/NewBackupJobWizard.page b/gui/baculum/protected/Web/Pages/NewBackupJobWizard.page index 178fc1a1b..31e015c2b 100644 --- a/gui/baculum/protected/Web/Pages/NewBackupJobWizard.page +++ b/gui/baculum/protected/Web/Pages/NewBackupJobWizard.page @@ -1,4 +1,4 @@ -<%@ MasterClass="Application.Web.Layouts.Wizard" Theme="Baculum-v2"%> +<%@ MasterClass="Baculum\Web\Layouts\Wizard" Theme="Baculum-v2"%> <%[ This wizard enables you to create in easy way a new backup job. ]%>

- - - <%[ Please select Client from which you want to backup data and please select FileSet with files/directories definition to backup. ]%>

<%[ If your FileSet for this backup does not exist yet, you can create it. ]%>

- - -  <%[ Show Storage directives for Job ]%> - -

<%[ Schedule ]%>

- - <%[ Source Storage ]%>

<%[ Please select a storage using which you want to read copy data. ]%>

- <%[ Backup jobs selection criteria ]%>

<%[ Please select the criteria that will be used for selecting backup jobs to copy. ]%>

-
- <%[ Please select a storage using which you want to write copied data. ]%>

-

<%[ Limits ]%>

-

<%[ Schedule ]%>

-

<%[ Messages ]%>

- - - - <%[ Please select a pool from which you want to migrate data. ]%>

<%[ The source pool will be examined for finding backup jobs to migrate. ]%>

- <%[ Source Storage ]%>

<%[ Please select a storage using which you want to read migrate data. ]%>

- <%[ Backup jobs selection criteria ]%>

<%[ Please select the criteria that will be used for selecting backup jobs to migrate. ]%>

- - <%[ Destination Storage ]%>

<%[ Please select a storage using which you want to write migrated data. ]%>

-

<%[ Purge jobs ]%>

-

<%[ Limits ]%>

-

<%[ Schedule ]%>

-

<%[ Messages ]%>

- <%[ Other options ]%>
- +<%@ MasterClass="Baculum\Web\Layouts\Main" Theme="Baculum-v2"%>
diff --git a/gui/baculum/protected/Web/Pages/PoolList.php b/gui/baculum/protected/Web/Pages/PoolList.php index 733fec9fa..02da15ff4 100644 --- a/gui/baculum/protected/Web/Pages/PoolList.php +++ b/gui/baculum/protected/Web/Pages/PoolList.php @@ -20,7 +20,7 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.Web.Class.BaculumWebPage'); +use Baculum\Web\Modules\BaculumWebPage; /** * Pool list page. diff --git a/gui/baculum/protected/Web/Pages/PoolView.page b/gui/baculum/protected/Web/Pages/PoolView.page index 2f89e3104..5654d7174 100644 --- a/gui/baculum/protected/Web/Pages/PoolView.page +++ b/gui/baculum/protected/Web/Pages/PoolView.page @@ -1,4 +1,4 @@ -<%@ MasterClass="Application.Web.Layouts.Main" Theme="Baculum-v2"%> +<%@ MasterClass="Baculum\Web\Layouts\Main" Theme="Baculum-v2"%>
@@ -39,7 +39,7 @@ >   <%=Prado::localize('Update all vols in pool')%> - @@ -250,7 +250,7 @@

<%[ Warning ]%>

<%[ The pool has not been renamed but it has been copied with the new name. Please note that if the original pool contained volumes, they have not been moved and they are still assigned to the original pool in the catalog database. To re-assign volumes from the original pool to this one please go to the MAIN MENU ➤ Pools ➤ [NEW POOL] ➤ Tab: Actions and please use the 'Assign volumes' button. After re-assgning volumes you can delete the original pool. ]%>

- setViewState(self::POOL_NAME, $pool_name); diff --git a/gui/baculum/protected/Web/Pages/Requirements.php b/gui/baculum/protected/Web/Pages/Requirements.php index 4325a73a1..b39ccc561 100644 --- a/gui/baculum/protected/Web/Pages/Requirements.php +++ b/gui/baculum/protected/Web/Pages/Requirements.php @@ -20,7 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.Common.Class.GeneralRequirements'); +namespace Baculum\Web\Pages; + +use Baculum\Common\Modules\GeneralRequirements; /** * Web part requirements class. @@ -58,7 +60,6 @@ class Requirements extends GeneralRequirements { /** * Validate all Web environment depenencies. * - * @return none */ public function validateEnvironment() { parent::validateExtensions($this->req_exts); diff --git a/gui/baculum/protected/Web/Pages/RestoreWizard.page b/gui/baculum/protected/Web/Pages/RestoreWizard.page index 6cd7217e4..e1a84fc58 100644 --- a/gui/baculum/protected/Web/Pages/RestoreWizard.page +++ b/gui/baculum/protected/Web/Pages/RestoreWizard.page @@ -1,4 +1,4 @@ -<%@ MasterClass="Application.Web.Layouts.Wizard" Theme="Baculum-v2"%> +<%@ MasterClass="Baculum\Web\Layouts\Wizard" Theme="Baculum-v2"%> /> getModule('api')->get( @@ -181,7 +175,6 @@ class RestoreWizard extends BaculumWebPage * Set navigation buttons. * Used for restore specific jobid (hide previous button) * - * @return none */ public function setNavigationButtons() { $prev_btn = $this->RestoreWizard->getStepNavigation()->PreviousStepBtn; @@ -197,7 +190,6 @@ class RestoreWizard extends BaculumWebPage * * @param TWizard $sender sender object * @param TWizardNavigationEventParameter $param sender parameters - * @return none */ public function wizardNext($sender, $param) { if ($param->CurrentStepIndex === 0) { @@ -242,7 +234,6 @@ class RestoreWizard extends BaculumWebPage * * @param TWizard $sender sender object * @param TWizardNavigationEventParameter $param sender parameters - * @return none */ public function wizardPrev($sender, $param) { if ($param->CurrentStepIndex === 1) { @@ -260,7 +251,6 @@ class RestoreWizard extends BaculumWebPage /** * Cancel wizard. * - * @return none */ public function wizardStop($sender, $param) { $this->resetWizard(); @@ -272,7 +262,6 @@ class RestoreWizard extends BaculumWebPage * * @param TActiveDropDownList $sender sender object * @param TCommandParameter $param parameters object - * @return none */ public function loadBackupClients() { $client_list = []; @@ -292,7 +281,6 @@ class RestoreWizard extends BaculumWebPage /** * Load restore client list. * - * @return none */ public function loadRestoreClients() { $client_list = []; @@ -313,7 +301,6 @@ class RestoreWizard extends BaculumWebPage /** * Load backups for selected client (Step 2). * - * @return none */ public function loadBackupsForClient() { $clientid = $this->BackupClient->SelectedValue; @@ -367,7 +354,6 @@ class RestoreWizard extends BaculumWebPage * * @param TCallback $sender sender object * @param TCallbackEventParameter $param param object - * @return none */ public function loadJobList($sender, $param) { $prop = $param->getCallbackParameter(); @@ -418,7 +404,6 @@ class RestoreWizard extends BaculumWebPage * Set selected backup client. * * @param integer $clientid client identifier - * @return none */ public function getBackupClient($clientid) { $client = null; @@ -435,7 +420,6 @@ class RestoreWizard extends BaculumWebPage /** * Load backup jobs to restore for group most recent backups feature. * - * @return none */ public function loadGroupBackupToRestore() { $jobs = $this->getModule('api')->get(['jobs'])->output; @@ -456,7 +440,6 @@ class RestoreWizard extends BaculumWebPage /** * Load filesets to restore for group most recent backups feature. * - * @return none */ public function loadGroupFileSetToRestore() { $filesets = $this->getModule('api')->get(['filesets'])->output; @@ -473,7 +456,6 @@ class RestoreWizard extends BaculumWebPage /** * Prepare left file browser content. * - * @return none */ private function prepareBrowserContent() { $jobids = $this->getElementaryBackup(); @@ -632,7 +614,6 @@ class RestoreWizard extends BaculumWebPage * * @param TActiveLinkButton $sender sender object * @param TEventParameter $param events parameter - * @return none */ public function loadPath($sender, $param) { $path = explode('/', $this->PathField->Text); @@ -655,7 +636,6 @@ class RestoreWizard extends BaculumWebPage * * @param string|array $path path to go * @param bool $full_path determines if $path param is full path or relative path (singel directory) - * @return none */ private function goToPath($path = '', $full_path = false) { if (!empty($path) && !$full_path && $this->Session->contains('restore_path')) { @@ -682,7 +662,6 @@ class RestoreWizard extends BaculumWebPage * Go to specific path in the file browser by pathid. * * @param string $pathid path to go - * @return none */ private function goToPathByPathId($pathid) { $this->setRestorePathId($pathid); @@ -696,7 +675,6 @@ class RestoreWizard extends BaculumWebPage * * @param object $sender sender object * @param object $param param object - * @return none */ public function addFileToRestore($sender, $param) { $file_prop = []; @@ -718,7 +696,6 @@ class RestoreWizard extends BaculumWebPage * * @param TCallback $sender sender object * @param TEventParameter $param param object - * @return none */ public function removeSelectedFile($sender, $param) { $uniqid = $param->CallbackParameter; @@ -732,7 +709,6 @@ class RestoreWizard extends BaculumWebPage * * @param TCallback $sender sender object * @param object $param param object - * @return none */ public function getVersions($sender, $param) { list($filename, $pathid, $filenameid, $jobid) = explode('|', $param->CallbackParameter, 4); @@ -763,7 +739,7 @@ class RestoreWizard extends BaculumWebPage * Helper for adding filename to versions list. * * @param array $el version list element - * @return return version list element + * @return version list element */ $add_version_filename_func = function ($el) use ($filename) { $el['name'] = $filename; @@ -786,7 +762,6 @@ class RestoreWizard extends BaculumWebPage * Load file browser files to list. * * @param array $files files to list. - * @return none */ public function loadBrowserFiles($sender, $param) { $files = $this->Session->contains('files_browser') ? $this->Session['files_browser'] : []; @@ -796,7 +771,6 @@ class RestoreWizard extends BaculumWebPage /** * Load file versions area. * - * @return none; */ public function loadFileVersions($sender, $param) { $versions = $this->Session->contains('files_versions') ? $this->Session['files_versions'] : []; @@ -806,7 +780,6 @@ class RestoreWizard extends BaculumWebPage /** * Load selected files in drop area. * - * @return none */ public function loadSelectedFiles($sender, $param) { $files = $this->Session->contains('files_restore') ? $this->Session['files_restore'] : []; @@ -816,7 +789,6 @@ class RestoreWizard extends BaculumWebPage /** * Set file browser path field. * - * @return none */ private function loadBrowserPath() { $path = $this->Session->contains('restore_path') ? $this->Session['restore_path'] : []; @@ -827,7 +799,6 @@ class RestoreWizard extends BaculumWebPage * Generate Bvfs cache by job identifiers. * * @param string $jobids comma separated job identifiers - * @return none */ private function generateBvfsCache($jobids) { $this->getModule('api')->set( @@ -840,7 +811,6 @@ class RestoreWizard extends BaculumWebPage * Set versions for selected file. * * @param array $versions file versions data - * @return none */ private function setFileVersions($versions = []) { $this->Session->add('files_versions', $versions); @@ -850,7 +820,6 @@ class RestoreWizard extends BaculumWebPage * Get file versions for specified uniqid. * * @param string $uniqid file identifier - * @return none */ private function getFileVersions($uniqid) { $versions = []; @@ -869,7 +838,6 @@ class RestoreWizard extends BaculumWebPage * Set browser files. * * @param array $files file list - * @return none */ private function setBrowserFiles($files = []) { $this->Session->add('files_browser', $files); @@ -879,7 +847,6 @@ class RestoreWizard extends BaculumWebPage * Set restore browser path. * * @param array $path path - * @return none */ private function setRestorePath($path = []) { $this->Session->add('restore_path', $path); @@ -889,7 +856,6 @@ class RestoreWizard extends BaculumWebPage * Set restore browser pathid. * * @param integer $pathid pathid - * @return none */ private function setRestorePathId($pathid) { $this->Session->add('restore_pathid', $pathid); @@ -899,7 +865,6 @@ class RestoreWizard extends BaculumWebPage * Get browser file by uniqid. * * @param string $uniqid file identifier - * @return none */ private function getBrowserFile($uniqid) { $element = []; @@ -919,7 +884,6 @@ class RestoreWizard extends BaculumWebPage * * @param string $uniqid file identifier * @param array $file file properties to mark - * @return none */ private function markFileToRestore($uniqid, $file) { if (is_null($uniqid)) { @@ -935,7 +899,6 @@ class RestoreWizard extends BaculumWebPage * Unmark file to restore. * * @param string $uniqid file identifier - * @return none */ private function unmarkFileToRestore($uniqid) { if (key_exists($uniqid, $this->Session['files_restore'])) { @@ -958,7 +921,6 @@ class RestoreWizard extends BaculumWebPage * Set files to restore * * @param array $files files to restore - * @return none */ public function setFilesToRestore($files = []) { $this->Session->add('files_restore', $files); @@ -998,7 +960,6 @@ class RestoreWizard extends BaculumWebPage /** * Wizard finish method. * - * @return none */ public function wizardCompleted() { $jobids = $this->getElementaryBackup(); @@ -1088,7 +1049,6 @@ class RestoreWizard extends BaculumWebPage /** * Load restore jobs on the list. * - * @return none */ private function loadRestoreJobs() { $restore_job_tasks = $this->getModule('api')->get( @@ -1135,7 +1095,6 @@ class RestoreWizard extends BaculumWebPage * Reset wizard. * All fields are back to initial form. * - * @return none */ private function resetWizard() { $this->setBrowserFiles(); diff --git a/gui/baculum/protected/Web/Pages/ScheduleList.page b/gui/baculum/protected/Web/Pages/ScheduleList.page index 986c0ab71..bde80e5bb 100644 --- a/gui/baculum/protected/Web/Pages/ScheduleList.page +++ b/gui/baculum/protected/Web/Pages/ScheduleList.page @@ -1,4 +1,4 @@ -<%@ MasterClass="Application.Web.Layouts.Main" Theme="Baculum-v2"%> +<%@ MasterClass="Baculum\Web\Layouts\Main" Theme="Baculum-v2"%>
diff --git a/gui/baculum/protected/Web/Pages/ScheduleList.php b/gui/baculum/protected/Web/Pages/ScheduleList.php index f2463f884..f338b2f68 100644 --- a/gui/baculum/protected/Web/Pages/ScheduleList.php +++ b/gui/baculum/protected/Web/Pages/ScheduleList.php @@ -20,7 +20,7 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.Web.Class.BaculumWebPage'); +use Baculum\Web\Modules\BaculumWebPage; /** * Schedule list page. diff --git a/gui/baculum/protected/Web/Pages/ScheduleStatusList.php b/gui/baculum/protected/Web/Pages/ScheduleStatusList.php index fcbdb1f03..3f73f6623 100644 --- a/gui/baculum/protected/Web/Pages/ScheduleStatusList.php +++ b/gui/baculum/protected/Web/Pages/ScheduleStatusList.php @@ -20,7 +20,7 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.Web.Class.BaculumWebPage'); +use Baculum\Web\Modules\BaculumWebPage; /** * Schedule status list. diff --git a/gui/baculum/protected/Web/Pages/ScheduleStatusList.tpl b/gui/baculum/protected/Web/Pages/ScheduleStatusList.tpl index d98a56c4a..a3c5e90d0 100644 --- a/gui/baculum/protected/Web/Pages/ScheduleStatusList.tpl +++ b/gui/baculum/protected/Web/Pages/ScheduleStatusList.tpl @@ -1,6 +1,6 @@ -<%@ MasterClass="Application.Web.Layouts.Main" Theme="Baculum-v2"%> +<%@ MasterClass="Baculum\Web\Layouts\Main" Theme="Baculum-v2"%> - diff --git a/gui/baculum/protected/Web/Pages/ScheduleView.page b/gui/baculum/protected/Web/Pages/ScheduleView.page index c4bfcaf50..d0ad9d294 100644 --- a/gui/baculum/protected/Web/Pages/ScheduleView.page +++ b/gui/baculum/protected/Web/Pages/ScheduleView.page @@ -1,4 +1,4 @@ -<%@ MasterClass="Application.Web.Layouts.Main" Theme="Baculum-v2"%> +<%@ MasterClass="Baculum\Web\Layouts\Main" Theme="Baculum-v2"%>
@@ -11,7 +11,7 @@
- setViewState(self::SCHEDULE_NAME, $schedule_name); diff --git a/gui/baculum/protected/Web/Pages/Security.page b/gui/baculum/protected/Web/Pages/Security.page index 68c1ba7f5..d45266b5e 100644 --- a/gui/baculum/protected/Web/Pages/Security.page +++ b/gui/baculum/protected/Web/Pages/Security.page @@ -1,4 +1,4 @@ -<%@ MasterClass="Application.Web.Layouts.Main" Theme="Baculum-v2"%> +<%@ MasterClass="Baculum\Web\Layouts\Main" Theme="Baculum-v2"%>
@@ -1890,7 +1890,7 @@ $(function() { var bulk_actions_output_id = '<%=$this->SourceTemplateControl->BulkActions->BulkActionsOutput->ClientID%>'; - + - + diff --git a/gui/baculum/protected/Web/Pages/StorageView.php b/gui/baculum/protected/Web/Pages/StorageView.php index 05eb71e74..be89c40f5 100644 --- a/gui/baculum/protected/Web/Pages/StorageView.php +++ b/gui/baculum/protected/Web/Pages/StorageView.php @@ -20,14 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('System.Web.UI.ActiveControls.TActiveLabel'); -Prado::using('System.Web.UI.ActiveControls.TActivePanel'); -Prado::using('System.Web.UI.ActiveControls.TActiveTextBox'); -Prado::using('System.Web.UI.ActiveControls.TActiveRepeater'); -Prado::using('System.Web.UI.ActiveControls.TActiveLinkButton'); -Prado::using('Application.Common.Class.Params'); -Prado::using('Application.Common.Class.Errors'); -Prado::using('Application.Web.Class.BaculumWebPage'); +use Baculum\Common\Modules\Errors\DeviceError; +use Baculum\Common\Modules\Params; +use Baculum\Web\Modules\BaculumWebPage; /** * Storage view page. @@ -301,6 +296,7 @@ class StorageView extends BaculumWebPage { private function logActionError($result) { $emsg = sprintf('Error %s: %s', $result->error, $result->output); + $messages_log = $this->getModule('messages_log'); $messages_log->append($result->output); $this->getCallbackClient()->callClientFunction( 'oStorageActions.log', @@ -1017,7 +1013,6 @@ class StorageView extends BaculumWebPage { /** * Set storage storageid. * - * @return none; */ public function setStorageId($storageid) { $storageid = intval($storageid); @@ -1036,7 +1031,6 @@ class StorageView extends BaculumWebPage { /** * Set storage name. * - * @return none; */ public function setStorageName($storage_name) { $this->setViewState(self::STORAGE_NAME, $storage_name); @@ -1054,7 +1048,6 @@ class StorageView extends BaculumWebPage { /** * Set device name. * - * @return none; */ public function setDeviceName($device_name) { $this->setViewState(self::DEVICE_NAME, $device_name); @@ -1081,7 +1074,6 @@ class StorageView extends BaculumWebPage { /** * Set autochanger value for storage * - * @return none; */ public function setIsAutochanger($is_autochanger) { settype($is_autochanger, 'bool'); @@ -1091,7 +1083,6 @@ class StorageView extends BaculumWebPage { /** * Set storage address. * - * @return none; */ public function setStorageAddress($address) { $this->setViewState(self::STORAGE_ADDRESS, $address); diff --git a/gui/baculum/protected/Web/Pages/VolumeList.page b/gui/baculum/protected/Web/Pages/VolumeList.page index bbe0aa754..327761f73 100644 --- a/gui/baculum/protected/Web/Pages/VolumeList.page +++ b/gui/baculum/protected/Web/Pages/VolumeList.page @@ -1,4 +1,4 @@ -<%@ MasterClass="Application.Web.Layouts.Main" Theme="Baculum-v2"%> +<%@ MasterClass="Baculum\Web\Layouts\Main" Theme="Baculum-v2"%>
@@ -8,8 +8,8 @@
- - + +
@@ -573,7 +573,7 @@ var bulk_actions_output_id = '<%=$this->SourceTemplateControl->BulkActions->Bulk oVolumeList.reset_filters(); - diff --git a/gui/baculum/protected/Web/Pages/VolumeList.php b/gui/baculum/protected/Web/Pages/VolumeList.php index 3a1df651f..09a3ae802 100644 --- a/gui/baculum/protected/Web/Pages/VolumeList.php +++ b/gui/baculum/protected/Web/Pages/VolumeList.php @@ -20,7 +20,8 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.Web.Class.BaculumWebPage'); +use Baculum\Web\Modules\BaculumWebPage; +use Prado\Web\UI\ActiveControls\TCallback; /** * Volume list page. @@ -58,7 +59,6 @@ class VolumeList extends BaculumWebPage { * * @param TCallback $sender callback object * @param TCallbackEventPrameter $param event parameter - * @return none */ public function pruneVolumes($sender, $param) { $result = []; @@ -83,7 +83,6 @@ class VolumeList extends BaculumWebPage { * * @param TCallback $sender callback object * @param TCallbackEventPrameter $param event parameter - * @return none */ public function purgeVolumes($sender, $param) { $result = []; @@ -108,7 +107,6 @@ class VolumeList extends BaculumWebPage { * * @param TCallback $sender callback object * @param TCallbackEventPrameter $param event parameter - * @return none */ public function deleteVolumes($sender, $param) { $result = []; @@ -133,7 +131,6 @@ class VolumeList extends BaculumWebPage { * * @param TCallback $sender callback object * @param TCallbackEventPrameter $param event parameter - * @return none */ public function updateVolumes($sender, $param) { $volumes = $this->getVolumes(); diff --git a/gui/baculum/protected/Web/Pages/VolumeView.page b/gui/baculum/protected/Web/Pages/VolumeView.page index 68f8bae6c..6bf9e3b4e 100644 --- a/gui/baculum/protected/Web/Pages/VolumeView.page +++ b/gui/baculum/protected/Web/Pages/VolumeView.page @@ -1,4 +1,4 @@ -<%@ MasterClass="Application.Web.Layouts.Main" Theme="Baculum-v2"%> +<%@ MasterClass="Baculum\Web\Layouts\Main" Theme="Baculum-v2"%>
diff --git a/gui/baculum/protected/Web/Pages/VolumeView.php b/gui/baculum/protected/Web/Pages/VolumeView.php index a6c87d50e..1aef3f115 100644 --- a/gui/baculum/protected/Web/Pages/VolumeView.php +++ b/gui/baculum/protected/Web/Pages/VolumeView.php @@ -20,12 +20,7 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('System.Web.UI.ActiveControls.TActiveDropDownList'); -Prado::using('System.Web.UI.ActiveControls.TActiveLabel'); -Prado::using('System.Web.UI.ActiveControls.TActiveLinkButton'); -Prado::using('System.Web.UI.ActiveControls.TActiveTextBox'); -Prado::using('System.Web.UI.ActiveControls.TActiveCheckBox'); -Prado::using('Application.Web.Class.BaculumWebPage'); +use Baculum\Web\Modules\BaculumWebPage; /** * Volume view page. @@ -74,7 +69,6 @@ class VolumeView extends BaculumWebPage { /** * Set volume mediaid. * - * @return none; */ public function setMediaId($mediaid) { $mediaid = intval($mediaid); @@ -93,7 +87,6 @@ class VolumeView extends BaculumWebPage { /** * Set volume name. * - * @return none; */ public function setVolumeName($volume_name) { $this->setViewState(self::VOLUME_NAME, $volume_name); diff --git a/gui/baculum/protected/Web/Pages/WebConfigWizard.page b/gui/baculum/protected/Web/Pages/WebConfigWizard.page index 2bf114800..3d0a43b9c 100644 --- a/gui/baculum/protected/Web/Pages/WebConfigWizard.page +++ b/gui/baculum/protected/Web/Pages/WebConfigWizard.page @@ -1,4 +1,4 @@ -<%@ MasterClass="Application.Web.Layouts.Wizard" Theme="Baculum-v2"%> +<%@ MasterClass="Baculum\Web\Layouts\Wizard" Theme="Baculum-v2"%>

<%[ Baculum web interface requires to add at least one Baculum API instance with shared Catalog access. Please add API instance. ]%>

- - - - - + + + + - - - - + + + + - + - - + + - + - - - - - + + + + + - - + + diff --git a/gui/baculum/protected/Web/Portlets/AssignVolumesToPool.php b/gui/baculum/protected/Web/Portlets/AssignVolumesToPool.php index 56d24fa3a..642d54235 100644 --- a/gui/baculum/protected/Web/Portlets/AssignVolumesToPool.php +++ b/gui/baculum/protected/Web/Portlets/AssignVolumesToPool.php @@ -20,7 +20,9 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('Application.Web.Portlets.Portlets'); +namespace Baculum\Web\Portlets; + +use Prado\Prado; /** * Assign volumes to pool control. @@ -36,7 +38,6 @@ class AssignVolumesToPool extends Portlets { /** * Set pool identifier. * - * @return none; */ public function setPoolId($pool) { settype($pool, 'integer'); diff --git a/gui/baculum/protected/Web/Portlets/BConditional.php b/gui/baculum/protected/Web/Portlets/BConditional.php index 22f3f9cc1..ba9af431c 100644 --- a/gui/baculum/protected/Web/Portlets/BConditional.php +++ b/gui/baculum/protected/Web/Portlets/BConditional.php @@ -20,7 +20,10 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('System.Web.UI.WebControls.TConditional'); +use Prado\IDataRenderer; +use Prado\Web\UI\ActiveControls\IActiveControl; +use Prado\Web\UI\ActiveControls\TActiveControlAdapter; +use Prado\Web\UI\TTemplateControl; /** * Baculum conditional control. diff --git a/gui/baculum/protected/Web/Portlets/BaculaConfigComponents.php b/gui/baculum/protected/Web/Portlets/BaculaConfigComponents.php index 05ba7a9a2..5f78ced14 100644 --- a/gui/baculum/protected/Web/Portlets/BaculaConfigComponents.php +++ b/gui/baculum/protected/Web/Portlets/BaculaConfigComponents.php @@ -20,11 +20,7 @@ * Bacula(R) is a registered trademark of Kern Sibbald. */ -Prado::using('System.Web.UI.ActiveControls.TActiveLinkButton'); -Prado::using('System.Web.UI.ActiveControls.TActiveRepeater'); -Prado::using('Application.Web.Portlets.ComponentListTemplate'); -Prado::using('Application.Web.Portlets.NewResourceMenu'); -Prado::using('Application.Web.Class.Miscellaneous'); +namespace Baculum\Web\Portlets; /** * Bacula config components control. diff --git a/gui/baculum/protected/Web/Portlets/BaculaConfigComponents.tpl b/gui/baculum/protected/Web/Portlets/BaculaConfigComponents.tpl index 18ea121f6..81750b1b7 100644 --- a/gui/baculum/protected/Web/Portlets/BaculaConfigComponents.tpl +++ b/gui/baculum/protected/Web/Portlets/BaculaConfigComponents.tpl @@ -18,13 +18,13 @@
- +  <%[ Add ]%> - +