From d2a47d4703ce5c6e11fb94828489076ca2c1403a Mon Sep 17 00:00:00 2001
From: Q-Feeds <support@qfeeds.com>
Date: Sat, 22 Nov 2025 16:00:28 +0100
Subject: [PATCH] security/q-feeds-connector - Add license expiry date + name
 to widget (#5040)

---
 .../OPNsense/QFeeds/Api/SettingsController.php   |  7 +++++++
 .../src/opnsense/www/js/widgets/QFeeds.js        | 16 +++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/security/q-feeds-connector/src/opnsense/mvc/app/controllers/OPNsense/QFeeds/Api/SettingsController.php b/security/q-feeds-connector/src/opnsense/mvc/app/controllers/OPNsense/QFeeds/Api/SettingsController.php
index b65b7b1a6..2a1b9ab52 100644
--- a/security/q-feeds-connector/src/opnsense/mvc/app/controllers/OPNsense/QFeeds/Api/SettingsController.php
+++ b/security/q-feeds-connector/src/opnsense/mvc/app/controllers/OPNsense/QFeeds/Api/SettingsController.php
@@ -110,6 +110,13 @@ class SettingsController extends ApiMutableModelControllerBase
                     }
                 }
             }
+            // Add license information from company_info if available
+            if (!empty($info['company_info'])) {
+                $stats['license'] = [
+                    'name' => $info['company_info']['license_name'] ?? null,
+                    'expiry_date' => $info['company_info']['license_expiry_date'] ?? null
+                ];
+            }
         }
         return $stats;
     }
diff --git a/security/q-feeds-connector/src/opnsense/www/js/widgets/QFeeds.js b/security/q-feeds-connector/src/opnsense/www/js/widgets/QFeeds.js
index bf5acbcb1..aa13fb5e8 100644
--- a/security/q-feeds-connector/src/opnsense/www/js/widgets/QFeeds.js
+++ b/security/q-feeds-connector/src/opnsense/www/js/widgets/QFeeds.js
@@ -71,6 +71,8 @@ export default class QFeeds extends BaseTableWidget {
         }
         let rows = [];
         let feeds = [];
+        let licenseInfoShown = false;
+        
         for (let feed of data.feeds) {
             feeds.push(
                 `<b><i class="fa fa-fw fa-angle-right" aria-hidden="true"></i> ${feed.name}</b>`,
@@ -78,7 +80,19 @@ export default class QFeeds extends BaseTableWidget {
                 `<div><i class="fa fa-fw fa-circle-o" aria-hidden="true"></i> &nbsp;&nbsp;${this.translations.next_update}: ${feed.next_update}</div>`
             );
             if (feed.licensed) {
-                feeds.push(`<div><i class="fa fa-fw fa-check" aria-hidden="true"></i> &nbsp;&nbsp;${this.translations.licensed}</div>`);
+                let licenseText = this.translations.licensed;
+                if (data.license && data.license.name) {
+                    licenseText += ` (${data.license.name})`;
+                }
+                feeds.push(`<div><i class="fa fa-fw fa-check" aria-hidden="true"></i> &nbsp;&nbsp;${licenseText}</div>`);
+                if (!licenseInfoShown && data.license && data.license.expiry_date) {
+                    const expiryDate = new Date(data.license.expiry_date);
+                    if (!isNaN(expiryDate.getTime())) {
+                        const formattedDate = expiryDate.toLocaleDateString();
+                        feeds.push(`<div><i class="fa fa-fw fa-calendar" aria-hidden="true"></i> &nbsp;&nbsp;Expires: ${formattedDate}</div>`);
+                    }
+                    licenseInfoShown = true;
+                }
             } else {
                 feeds.push(`<div><i class="fa fa-fw fa-close" aria-hidden="true"></i> &nbsp;&nbsp;${this.translations.unlicensed}</div>`);
             }