fix: restore OS template icons using correct VirtFusion path /img/logo/

The VirtFusion panel serves OS icons at /img/logo/{icon} not /storage/os/{icon}.
Restore image loading in both rebuild gallery (module.js) and checkout gallery
(hooks.php) with onerror fallback to letter badges. Also restore baseUrl
population in hooks.php for checkout page.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Prophet731
2026-03-19 14:07:12 -05:00
parent d3d75b4752
commit 6528c8a53a
3 changed files with 49 additions and 7 deletions

View File

@@ -85,8 +85,14 @@ add_hook('ClientAreaFooterOutput', 1, function ($vars) {
return null; return null;
} }
$vfServer = \WHMCS\Database\Capsule::table('tblservers')
->where('type', 'VirtFusionDirect')
->where('disabled', 0)
->first();
$baseUrl = $vfServer ? rtrim('https://' . $vfServer->hostname, '/') : '';
$galleryData = [ $galleryData = [
'baseUrl' => '', 'baseUrl' => $baseUrl,
'categories' => \WHMCS\Module\Server\VirtFusionDirect\Module::groupOsTemplates($templates_data['data'] ?? [], true), 'categories' => \WHMCS\Module\Server\VirtFusionDirect\Module::groupOsTemplates($templates_data['data'] ?? [], true),
]; ];
@@ -182,7 +188,15 @@ add_hook('ClientAreaFooterOutput', 1, function ($vars) {
var catIcon = document.createElement('span'); var catIcon = document.createElement('span');
catIcon.className = 'vf-os-category-icon'; catIcon.className = 'vf-os-category-icon';
catIcon.style.background = catColor; catIcon.style.background = catColor;
if (cat.icon && osGalleryData.baseUrl) {
var catImg = document.createElement('img');
catImg.src = osGalleryData.baseUrl + '/img/logo/' + encodeURIComponent(cat.icon);
catImg.alt = '';
catImg.onerror = function() { this.parentNode.textContent = (cat.name || '?')[0].toUpperCase(); };
catIcon.appendChild(catImg);
} else {
catIcon.textContent = (cat.name || '?')[0].toUpperCase(); catIcon.textContent = (cat.name || '?')[0].toUpperCase();
}
var catTitle = document.createElement('span'); var catTitle = document.createElement('span');
catTitle.textContent = cat.name + ' (' + cat.templates.length + ')'; catTitle.textContent = cat.name + ' (' + cat.templates.length + ')';
@@ -222,9 +236,17 @@ add_hook('ClientAreaFooterOutput', 1, function ($vars) {
var iconDiv = document.createElement('div'); var iconDiv = document.createElement('div');
iconDiv.className = 'vf-os-icon'; iconDiv.className = 'vf-os-icon';
iconDiv.style.background = catColor; iconDiv.style.background = catColor;
if (tpl.icon && osGalleryData.baseUrl) {
var tplImg = document.createElement('img');
tplImg.src = osGalleryData.baseUrl + '/img/logo/' + encodeURIComponent(tpl.icon);
tplImg.alt = '';
tplImg.onerror = function() { this.parentNode.textContent = ''; var s = document.createElement('span'); s.textContent = (tpl.name || '?')[0].toUpperCase(); this.parentNode.appendChild(s); };
iconDiv.appendChild(tplImg);
} else {
var sp = document.createElement('span'); var sp = document.createElement('span');
sp.textContent = (tpl.name || '?')[0].toUpperCase(); sp.textContent = (tpl.name || '?')[0].toUpperCase();
iconDiv.appendChild(sp); iconDiv.appendChild(sp);
}
card.appendChild(iconDiv); card.appendChild(iconDiv);
var labelDiv = document.createElement('div'); var labelDiv = document.createElement('div');

View File

@@ -278,6 +278,11 @@
font-size: 0.85rem; font-size: 0.85rem;
flex-shrink: 0; flex-shrink: 0;
} }
.vf-os-category-icon img {
width: 18px;
height: 18px;
object-fit: contain;
}
.vf-os-category-arrow { .vf-os-category-arrow {
margin-left: auto; margin-left: auto;
font-size: 0.7rem; font-size: 0.7rem;

View File

@@ -328,13 +328,22 @@ function vfRenderOsGallery(container, data, hiddenInput) {
return; return;
} }
var baseUrl = data.baseUrl || "";
$.each(data.categories, function (ci, category) { $.each(data.categories, function (ci, category) {
var section = $('<div class="vf-os-category"></div>').attr("data-category", ci); var section = $('<div class="vf-os-category"></div>').attr("data-category", ci);
var brandColor = vfGetBrandColor(category.name); var brandColor = vfGetBrandColor(category.name);
// Accordion header // Accordion header
var header = $('<div class="vf-os-category-header"></div>'); var header = $('<div class="vf-os-category-header"></div>');
var iconSpan = $('<span class="vf-os-category-icon"></span>').css("background", brandColor).text((category.name || "?")[0].toUpperCase()); var iconSpan = $('<span class="vf-os-category-icon"></span>').css("background", brandColor);
if (category.icon && baseUrl) {
var catImg = $('<img alt="">').attr("src", baseUrl + "/img/logo/" + encodeURIComponent(category.icon));
catImg.on("error", function () { $(this).replaceWith($('<span></span>').text((category.name || "?")[0].toUpperCase())); });
iconSpan.append(catImg);
} else {
iconSpan.text((category.name || "?")[0].toUpperCase());
}
var titleSpan = $('<span></span>').text(category.name + " (" + category.templates.length + ")"); var titleSpan = $('<span></span>').text(category.name + " (" + category.templates.length + ")");
var arrow = $('<span class="vf-os-category-arrow">' + (ci === 0 ? '&#9660;' : '&#9654;') + '</span>'); var arrow = $('<span class="vf-os-category-arrow">' + (ci === 0 ? '&#9660;' : '&#9654;') + '</span>');
header.append(iconSpan).append(titleSpan).append(arrow); header.append(iconSpan).append(titleSpan).append(arrow);
@@ -364,7 +373,13 @@ function vfRenderOsGallery(container, data, hiddenInput) {
if (tpl.eol) card.addClass("vf-os-card-eol"); if (tpl.eol) card.addClass("vf-os-card-eol");
var iconDiv = $('<div class="vf-os-icon"></div>').css("background", brandColor); var iconDiv = $('<div class="vf-os-icon"></div>').css("background", brandColor);
if (tpl.icon && baseUrl) {
var tplImg = $('<img alt="">').attr("src", baseUrl + "/img/logo/" + encodeURIComponent(tpl.icon));
tplImg.on("error", function () { $(this).replaceWith($('<span></span>').text((tpl.name || "?")[0].toUpperCase())); });
iconDiv.append(tplImg);
} else {
iconDiv.append($('<span></span>').text((tpl.name || "?")[0].toUpperCase())); iconDiv.append($('<span></span>').text((tpl.name || "?")[0].toUpperCase()));
}
card.append(iconDiv); card.append(iconDiv);
card.append($('<div class="vf-os-label"></div>').text(tpl.name)); card.append($('<div class="vf-os-label"></div>').text(tpl.name));