READ permission OK
"; - -// Get server ID -$server_id = (int) ($_GET['id'] ?? 0); - -if ($server_id > 0) { - $server = new GlpiPlugin\Urbackup\Server(); - if ($server->getFromDB($server_id)) { - echo "Server: " . $server->fields['name'] . "
"; - - $client = new GlpiPlugin\Urbackup\UrbackupApiClient($server); - $result = $client->testConnection(); - - echo "" . print_r($result, true) . ""; - } else { - echo "
Server not found
"; - } -} else { - echo "No server ID provided
"; -} - -Html::footer(); diff --git a/install/install.php b/install/install.php index 4473388..1f3d7c3 100644 --- a/install/install.php +++ b/install/install.php @@ -31,14 +31,15 @@ function plugin_urbackup_install_process(): bool plugin_urbackup_install_create_initial_schema($migration); plugin_urbackup_install_update_configs_table($migration); - plugin_urbackup_install_update_assettypes_table($migration); // Convert old assettype configurations to GLPI 11 capacity system plugin_urbackup_install_convert_assettypes_to_capacities($migration); plugin_urbackup_install_update_servers_table($migration); plugin_urbackup_install_update_serverassets_table($migration); - plugin_urbackup_install_update_profiles_table($migration); + + // Drop tables that are no longer used (replaced by Profile::registerRights() and Capacity system) + plugin_urbackup_install_drop_legacy_tables($migration); $migration->executeMigration(); @@ -61,10 +62,8 @@ function plugin_urbackup_install_create_initial_schema(Migration $migration): vo $required_tables = [ 'glpi_plugin_urbackup_configs', - 'glpi_plugin_urbackup_assettypes', 'glpi_plugin_urbackup_servers', 'glpi_plugin_urbackup_serverassets', - 'glpi_plugin_urbackup_profiles', ]; $missing_table_found = false; @@ -264,6 +263,7 @@ function plugin_urbackup_install_update_servers_table(Migration $migration): voi $migration->addKey($table, 'entities_id'); $migration->addKey($table, 'locations_id'); $migration->addKey($table, 'is_active'); + $migration->addKey($table, ['locations_id', 'is_active'], 'location_active'); } /** @@ -298,46 +298,39 @@ function plugin_urbackup_install_update_serverassets_table(Migration $migration) 'after' => 'itemtype', ]); + $migration->addField($table, 'date_creation', 'timestamp'); + $migration->addField($table, 'date_mod', 'timestamp'); + $migration->addKey($table, 'plugin_urbackup_servers_id'); $migration->addKey($table, ['itemtype', 'items_id'], 'item'); } /** - * Update profiles table. + * Drop legacy tables that are no longer used. * * @param Migration $migration Migration instance * * @return void */ -function plugin_urbackup_install_update_profiles_table(Migration $migration): void +function plugin_urbackup_install_drop_legacy_tables(Migration $migration): void { global $DB; + // glpi_plugin_urbackup_profiles was replaced by Profile::registerRights() in 0.5.0 $table = 'glpi_plugin_urbackup_profiles'; - - if (!$DB->tableExists($table)) { - return; + if ($DB->tableExists($table)) { + $migration->displayMessage(__('Dropping legacy glpi_plugin_urbackup_profiles table', 'urbackup')); + $DB->queryOrDie("DROP TABLE IF EXISTS `$table`"); } - $migration->addField($table, 'profiles_id', 'integer', [ - 'value' => 0, - 'after' => 'id', - ]); + // glpi_plugin_urbackup_assettypes was replaced by GLPI 11 Capacity system in 0.6.0 + $table2 = 'glpi_plugin_urbackup_assettypes'; + if ($DB->tableExists($table2)) { + $migration->displayMessage(__('Dropping legacy glpi_plugin_urbackup_assettypes table', 'urbackup')); + $DB->queryOrDie("DROP TABLE IF EXISTS `$table2`"); + } - $migration->addField($table, 'rightname', 'string', [ - 'value' => '', - 'after' => 'profiles_id', - ]); - - $migration->addField($table, 'rights', 'integer', [ - 'value' => 0, - 'after' => 'rightname', - ]); - - $migration->addField($table, 'date_creation', 'timestamp'); - $migration->addField($table, 'date_mod', 'timestamp'); - - $migration->addKey($table, ['profiles_id', 'rightname'], 'profile_right'); + $migration->displayMessage(__('Legacy tables dropped successfully', 'urbackup')); } /** diff --git a/install/mysql/plugin_urbackup-empty.sql b/install/mysql/plugin_urbackup-empty.sql index 52e7a86..ff173f3 100644 --- a/install/mysql/plugin_urbackup-empty.sql +++ b/install/mysql/plugin_urbackup-empty.sql @@ -8,17 +8,6 @@ CREATE TABLE IF NOT EXISTS `glpi_plugin_urbackup_configs` ( KEY `name` (`name`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; -CREATE TABLE IF NOT EXISTS `glpi_plugin_urbackup_assettypes` ( - `id` INT UNSIGNED NOT NULL AUTO_INCREMENT, - `itemtype` VARCHAR(255) NOT NULL DEFAULT '', - `is_active` TINYINT NOT NULL DEFAULT 0, - `date_creation` TIMESTAMP NULL DEFAULT NULL, - `date_mod` TIMESTAMP NULL DEFAULT NULL, - PRIMARY KEY (`id`), - KEY `itemtype` (`itemtype`), - KEY `is_active` (`is_active`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; - CREATE TABLE IF NOT EXISTS `glpi_plugin_urbackup_servers` ( `id` INT UNSIGNED NOT NULL AUTO_INCREMENT, `entities_id` INT UNSIGNED NOT NULL DEFAULT 0, @@ -43,7 +32,8 @@ CREATE TABLE IF NOT EXISTS `glpi_plugin_urbackup_servers` ( KEY `name` (`name`), KEY `entities_id` (`entities_id`), KEY `locations_id` (`locations_id`), - KEY `is_active` (`is_active`) + KEY `is_active` (`is_active`), + KEY `location_active` (`locations_id`, `is_active`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; CREATE TABLE IF NOT EXISTS `glpi_plugin_urbackup_serverassets` ( @@ -51,18 +41,11 @@ CREATE TABLE IF NOT EXISTS `glpi_plugin_urbackup_serverassets` ( `plugin_urbackup_servers_id` INT UNSIGNED NOT NULL DEFAULT 0, `itemtype` VARCHAR(255) NOT NULL DEFAULT '', `items_id` INT UNSIGNED NOT NULL DEFAULT 0, + `date_creation` TIMESTAMP NULL DEFAULT NULL, + `date_mod` TIMESTAMP NULL DEFAULT NULL, PRIMARY KEY (`id`), KEY `plugin_urbackup_servers_id` (`plugin_urbackup_servers_id`), KEY `item` (`itemtype`, `items_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; -CREATE TABLE IF NOT EXISTS `glpi_plugin_urbackup_profiles` ( - `id` INT UNSIGNED NOT NULL AUTO_INCREMENT, - `profiles_id` INT UNSIGNED NOT NULL DEFAULT 0, - `rightname` VARCHAR(255) NOT NULL DEFAULT '', - `rights` INT NOT NULL DEFAULT 0, - `date_creation` TIMESTAMP NULL DEFAULT NULL, - `date_mod` TIMESTAMP NULL DEFAULT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `profile_right` (`profiles_id`, `rightname`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; \ No newline at end of file +-- glpi_plugin_urbackup_profiles was dropped in 0.7.0 (replaced by Profile::registerRights()) \ No newline at end of file diff --git a/js/urbackup.js b/js/urbackup.js deleted file mode 100644 index e4e4b51..0000000 --- a/js/urbackup.js +++ /dev/null @@ -1,87 +0,0 @@ -/** - * UrBackup API Test JavaScript - */ -(function () { - 'use strict'; - - function testApi(serverId, resultBox) { - if (!serverId || !resultBox) return; - - var xhr = new XMLHttpRequest(); - xhr.open('POST', '/plugins/urbackup/ajax/server_test.php', true); - xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest'); - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); - xhr.timeout = 8000; - - xhr.onload = function () { - if (xhr.status === 200) { - try { - var data = JSON.parse(xhr.responseText); - if (data.success) { - resultBox.innerHTML = ' ' + 'API connection OK' + ''; - } else { - var message = data.message || 'Connection failed'; - var isNetwork = /timeout|could not resolve|couldn't connect|connection refused|connection timed out|network is unreachable|no route to host|returned HTTP status/i.test(message); - var statusClass = isNetwork ? 'text-warning' : 'text-danger'; - var icon = isNetwork ? 'ti-wifi-off' : 'ti-x'; - var label = isNetwork ? 'Server unreachable' : 'API connection failed'; - resultBox.innerHTML = ' ' + label + '| {{ __('UrBackup server selection', 'urbackup') }} | -|
|---|---|
| - {{ __('The asset is in a sub-location. The plugin will use the server assigned to the root location.', 'urbackup') }} - | -|
|
-
- {{ __('No UrBackup server available for the root location of this asset.', 'urbackup') }}
-
- |
- |
| {{ __('Available servers for root location', 'urbackup') }} | -- - | -
| - {{ __('A server is available, but you do not have permission to link this asset.', 'urbackup') }} - | -|
| {{ __('UrBackup status', 'urbackup') }} | -|||
|---|---|---|---|
| {{ __('Linked server', 'urbackup') }} | -{{ server_link }} | -{{ __('IP address', 'urbackup') }} | -{{ server_ip }} | -
| {{ __('UrBackup server version', 'urbackup') }} | -{{ server_version }} | -{{ __('Client name', 'urbackup') }} | -{{ client_name }} | -
| {{ __('UrBackup servers', 'urbackup') }} | -|||||
|---|---|---|---|---|---|
| {{ __('Name') }} | -{{ __('IP address', 'urbackup') }} | -{{ __('Port') }} | -{{ __('Version') }} | -{{ __('Status') }} | -{{ __('Actions') }} | -
| {{ server.name }} | -{{ server.ip_address }} | -{{ server.port }} | -{{ server.server_version }} | -- {% if server.last_api_status %} - {{ __('OK', 'urbackup') }} - {% else %} - {{ __('Failed', 'urbackup') }} - {% endif %} - | -- - {{ __('View') }} - - - | -
| {{ __('No records found', 'urbackup') }} | -|||||