merge all

This commit is contained in:
mariano
2026-05-20 13:11:03 +02:00
+4
View File
@@ -27,7 +27,11 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
ServerAsset::connectAssetToServer($itemtype, $items_id, $server_id); ServerAsset::connectAssetToServer($itemtype, $items_id, $server_id);
} }
<<<<<<< HEAD
Html::redirect(PLUGIN_URBACKUP_WEB_DIR . '/front/server.form.php?id=' . $server_id); Html::redirect(PLUGIN_URBACKUP_WEB_DIR . '/front/server.form.php?id=' . $server_id);
=======
Html::redirect(PLUGIN_URBACKUP_WEB_DIR . '/front/server.php?id=' . $server_id);
>>>>>>> collegamento_e_verifica_host
} }
$id = $_POST['id'] ?? 0; $id = $_POST['id'] ?? 0;