diff --git a/baseTemplate/views.py b/baseTemplate/views.py index 1c7d05433..172e86731 100644 --- a/baseTemplate/views.py +++ b/baseTemplate/views.py @@ -129,6 +129,11 @@ def getAdminStatus(request): def getSystemStatus(request): + default_fallback = { + 'cpuUsage': 0, 'ramUsage': 0, 'diskUsage': 0, + 'cpuCores': 2, 'ramTotalMB': 4096, 'diskTotalGB': 100, + 'diskFreeGB': 100, 'uptime': 'N/A' + } try: val = request.session['userID'] currentACL = ACLManager.loadedACL(val) @@ -215,31 +220,13 @@ def getSystemStatus(request): except KeyError as e: logging.CyberCPLogFileWriter.writeToFile(f'[getSystemStatus] KeyError - No session userID: {str(e)}') - # Return default values on error - default_data = { - 'cpuUsage': 0, - 'ramUsage': 0, - 'diskUsage': 0, - 'cpuCores': 2, - 'ramTotalMB': 4096, - 'diskTotalGB': 100, - 'diskFreeGB': 100, - 'uptime': 'N/A' - } - return HttpResponse(json.dumps(default_data)) + return HttpResponse(json.dumps(default_fallback)) except Exception as e: - # Return default values on error - default_data = { - 'cpuUsage': 0, - 'ramUsage': 0, - 'diskUsage': 0, - 'cpuCores': 2, - 'ramTotalMB': 4096, - 'diskTotalGB': 100, - 'diskFreeGB': 100, - 'uptime': 'N/A' - } - return HttpResponse(json.dumps(default_data)) + logging.CyberCPLogFileWriter.writeToFile(f'[getSystemStatus] Exception: {str(e)}') + try: + return HttpResponse(json.dumps(default_fallback)) + except Exception: + return HttpResponse('{"cpuUsage":0,"ramUsage":0,"diskUsage":0,"cpuCores":2,"ramTotalMB":4096,"diskTotalGB":100,"diskFreeGB":100,"uptime":"N/A"}', content_type='application/json') def getLoadAverage(request): diff --git a/pluginHolder/templates/pluginHolder/help.html b/pluginHolder/templates/pluginHolder/help.html index 66bdcbdea..da5e53b13 100644 --- a/pluginHolder/templates/pluginHolder/help.html +++ b/pluginHolder/templates/pluginHolder/help.html @@ -323,6 +323,9 @@
  • {% trans "Creating Your First Plugin" %}
  • {% trans "Plugin Structure & Files" %}
  • {% trans "Version Numbering (Semantic Versioning)" %}
    • +
  • {% trans "Plugin Categories" %}
    • +
  • {% trans "Freshness Badges" %}
    • +
  • {% trans "Premium/Paid Plugin Creation" %}
  • {% trans "Core Components" %}
  • {% trans "Advanced Features" %}
  • {% trans "Best Practices" %}
    • @@ -402,7 +405,7 @@ mkdir -p migrations </cyberpanelPluginConfig>
    - {% trans "Required: Category (type)" %}: {% trans "The <type> field is required. Valid categories: Utility, Security, Backup, Performance. Plugins without a valid category will not appear in the Plugin Store." %} + {% trans "Required: Category (type)" %}: {% trans "The <type> field is required. See the Plugin Categories section below for valid options. Plugins without a valid category will not appear in the Plugin Store." %}

    {% trans "Step 3: Create urls.py" %}

    @@ -510,6 +513,93 @@ def main_view(request): 
    <version>1.0.0</version>

    {% trans "Never use formats like '1.0' or 'v1.0'. Always use the full semantic version: '1.0.0'" %}

    +

    {% trans "Plugin Categories" %}

    +

    {% trans "The <type> field in meta.xml determines how your plugin is grouped in the Plugin Store. Use exactly one of these values (case-sensitive):" %}

    + + + + + + + + + + + + + + + + + + +
    {% trans "Category" %}{% trans "Purpose" %}
    Utility{% trans "General-purpose tools, helpers, and utilities" %}
    Security{% trans "Security features: firewalls, fail2ban, SSL, etc." %}
    Backup{% trans "Backup, snapshot, and restore functionality" %}
    Performance{% trans "Caching, optimization, and performance tuning" %}
    Monitoring{% trans "Monitoring, alerts, and health checks" %}
    Integration{% trans "Third-party integrations: Discord, Slack, webhooks, APIs" %}
    Email{% trans "Email marketing, SMTP, mail management" %}
    Development{% trans "Developer tools: PM2, Node.js, deployment" %}
    Analytics{% trans "Analytics, tracking, and reporting" %}
    + +

    {% trans "Freshness Badges" %}

    +

    {% trans "The Plugin Store and Installed Plugins views display freshness badges based on the last update date (modify_date from GitHub commit or meta.xml file mtime). These help users quickly see how actively maintained a plugin is:" %}

    + + + + + + + + + + + + + + +
    {% trans "Badge" %}{% trans "Condition" %}{% trans "Meaning" %}
    NEW{% trans "Updated within last 90 days" %}{% trans "Recently released or actively maintained" %}
    Stable{% trans "Updated within last 365 days" %}{% trans "Updated within the past year" %}
    Unstable{% trans "1–2 years since last update" %}{% trans "May need maintenance; consider forking or updating" %}
    STALE{% trans "Over 2 years since last update" %}{% trans "Not updated recently; use with caution" %}
    +

    {% trans "Badges are calculated automatically from the plugin's modify_date. For plugins in the Plugin Store, this comes from the GitHub repository's last commit. For installed plugins, it uses the meta.xml file modification time." %}

    + +

    {% trans "Premium/Paid Plugin Creation" %}

    +

    {% trans "You can create premium (paid) plugins and implement your own verification system. This includes optional encryption between the plugin and your verification site to prevent unauthorized bypass." %}

    + +

    {% trans "1. Mark Your Plugin as Paid in meta.xml" %}

    + 
    <paid>true</paid>
+<patreon_tier>Your Tier Name</patreon_tier>
+<patreon_url>https://www.patreon.com/your-page</patreon_url>
    +

    {% trans "Set <paid>true</paid> to display the Premium badge and subscription prompts in the Plugin Store." %}

    + +

    {% trans "2. Build Your Own Verification System" %}

    +

    {% trans "Premium plugins typically verify access via a remote API. You can host this on your own site. Common verification methods:" %}

    + + +

    {% trans "3. Optional: Encrypt Plugin–API Communication" %}

    +

    {% trans "To protect against users modifying your plugin to bypass verification, you can encrypt the communication between the plugin and your verification API using AES-256-CBC. This ensures:" %}

    + +

    {% trans "Implementation outline:" %}

    +
      +
    1. {% trans "Generate a 32-byte secret key and store it in your API config (e.g. config.php)" %}
      2. +
    2. {% trans "In your plugin (Python), encrypt outgoing requests and decrypt responses using the same key" %}
      3. +
    3. {% trans "On your API (PHP/Python), decrypt incoming requests and encrypt responses" %}
      4. +
    4. {% trans "Use the X-Encrypted: 1 header to indicate encrypted payloads" %}
      5. +
    +

    {% trans "Both sides must use the same AES-256-CBC key. Keep the key secret and never commit it to public repositories. Store it in a protected config file outside the web root or in environment variables." %}

    + +

    {% trans "4. Typical Premium Plugin Flow" %}

    +
      +
    1. {% trans "User installs your premium plugin" %}
      2. +
    2. {% trans "Plugin shows an activation screen (Patreon/PayPal links, or activation key input)" %}
      3. +
    3. {% trans "Plugin calls your verification API with user identifier (email, domain, IP) or activation key" %}
      4. +
    4. {% trans "Your API checks: Plugin Grants, activation key, Patreon, or PayPal — in your preferred order" %}
      5. +
    5. {% trans "If access is granted, API returns success; plugin unlocks features and optionally stores the key locally" %}
      6. +
    +
    + {% trans "Tip" %}: {% trans "Provide multiple verification paths: Patreon for subscribers, PayPal for one-time purchasers, Plugin Grants for beta testers or sponsors, and activation keys for manual grants. Encryption is optional but recommended for paid plugins to deter bypass attempts." %} +
    +

    {% trans "Core Components" %}

    {% trans "1. Authentication & Security" %}

    {% trans "Always use the cyberpanel_login_required decorator:" %}

    @@ -672,7 +762,7 @@ zip -r myPlugin-v1.0.0.zip . \

    {% trans "Author" %}: master3395 | {% trans "Version" %}: 2.0.0 | - {% trans "Last Updated" %}: 2026-01-04 + {% trans "Last Updated" %}: 2026-02-02

    diff --git a/pluginHolder/templates/pluginHolder/plugins.html b/pluginHolder/templates/pluginHolder/plugins.html index 49d9c7dc4..389d4a685 100644 --- a/pluginHolder/templates/pluginHolder/plugins.html +++ b/pluginHolder/templates/pluginHolder/plugins.html @@ -200,6 +200,32 @@ border: 1px solid #c3e6cb; } + .freshness-badge-new, .freshness-badge-stable, .freshness-badge-stale { + display: inline-block; + padding: 3px 8px; + border-radius: 10px; + font-size: 11px; + font-weight: 600; + text-transform: uppercase; + margin-top: 4px; + } + .freshness-badge-new { + background: #fef08a; + color: #854d0e; + } + .freshness-badge-stable { + background: #bbf7d0; + color: #166534; + } + .freshness-badge-stale { + background: #fecaca; + color: #991b1b; + } + .freshness-badge-unstable { + background: #e5e7eb; + color: #4b5563; + } + .plugin-pricing-badge.paid { background: #fff3cd; color: #856404; @@ -443,11 +469,62 @@ margin: 0 auto; } - /* View Toggle */ + /* View Toggle and Bulk Actions */ + .view-toggle-wrapper { + display: flex; + flex-wrap: wrap; + align-items: center; + gap: 16px; + margin-bottom: 20px; + } .view-toggle { display: flex; gap: 10px; - margin-bottom: 20px; + } + .bulk-actions-header { + display: flex !important; + visibility: visible !important; + opacity: 1 !important; + } + .bulk-actions-header .btn-bulk { + margin: 0; + flex-shrink: 0; + } + .btn-bulk { + padding: 8px 14px; + border-radius: 8px; + font-size: 13px; + font-weight: 600; + cursor: pointer; + transition: all 0.2s ease; + border: 1px solid transparent; + display: inline-flex; + align-items: center; + gap: 6px; + } + .btn-activate-all { + background: #28a745; + color: white; + border-color: #218838; + } + .btn-activate-all:hover:not(:disabled) { + background: #218838; + } + .btn-activate-all:disabled { + opacity: 0.6; + cursor: not-allowed; + } + .btn-deactivate-all { + background: #ffc107; + color: #212529; + border-color: #e0a800; + } + .btn-deactivate-all:hover:not(:disabled) { + background: #e0a800; + } + .btn-deactivate-all:disabled { + opacity: 0.6; + cursor: not-allowed; } .view-btn { @@ -1076,7 +1153,7 @@
    -
    +

    @@ -1086,7 +1163,7 @@

    {% trans "List of installed plugins on your CyberPanel" %}

    -
    +
    @@ -1099,6 +1176,16 @@ {% trans "Active:" %} {{ active_count|default:0 }}
    + {% if plugins %} +
    + + +
    + {% endif %}
    @@ -1109,23 +1196,25 @@ {% if plugins %} -
    - - - - - - {% trans "Plugin Development Guide" %} - +
    +
    + + + + + + {% trans "Plugin Development Guide" %} + +
    @@ -1142,6 +1231,16 @@ {% elif plugin.type|lower == "backup" %} + {% elif plugin.type|lower == "monitoring" %} + + {% elif plugin.type|lower == "integration" %} + + {% elif plugin.type|lower == "email" %} + + {% elif plugin.type|lower == "development" %} + + {% elif plugin.type|lower == "analytics" %} + {% else %} {% endif %} @@ -1149,6 +1248,9 @@

    {{ plugin.name }}{% if plugin.is_paid|default:False|default_if_none:False %} {% endif %}

    + {% if plugin.freshness_badge %} + {{ plugin.freshness_badge.badge }} + {% endif %} {{ plugin.type }} v{{ plugin.version }} {% if plugin.is_paid|default:False|default_if_none:False %} @@ -1210,11 +1312,11 @@ {% endif %} {% if plugin.enabled %} - {% else %} - {% endif %} @@ -1264,6 +1366,9 @@ {{ plugin.name }} + {% if plugin.freshness_badge %} +
    {{ plugin.freshness_badge.badge }} + {% endif %} {{ plugin.version }} @@ -1294,11 +1399,11 @@ {% endif %} {% if plugin.enabled %} - {% else %} - {% endif %} @@ -1444,6 +1549,26 @@ {% trans "Performance" %} + + + + +
    @@ -1628,6 +1753,31 @@ function escapeHtml(text) { return div.innerHTML; } +function getFreshnessBadgeHtml(freshnessFromApi, modifyDate) { + // Use API data if available + if (freshnessFromApi && freshnessFromApi.badge && freshnessFromApi.class) { + return `
    ${escapeHtml(freshnessFromApi.badge)}`; + } + // Compute from modify_date (for cached data without freshness_badge) + if (!modifyDate || modifyDate === 'N/A') return ''; + try { + const m = modifyDate.match(/^(\d{4})-(\d{2})-(\d{2})\s+(\d{2}):(\d{2}):(\d{2})/); + if (!m) return ''; + const d = new Date(parseInt(m[1]), parseInt(m[2]) - 1, parseInt(m[3]), parseInt(m[4]), parseInt(m[5]), parseInt(m[6])); + const daysAgo = Math.floor((Date.now() - d.getTime()) / (24 * 60 * 60 * 1000)); + if (daysAgo <= 90) { + return '
    NEW'; + } else if (daysAgo <= 365) { + return '
    Stable'; + } else if (daysAgo < 730) { + return '
    Unstable'; + } else { + return '
    STALE'; + } + } catch (e) {} + return ''; +} + function displayStorePlugins() { // Version: 2026-01-27-v1 - Added category filtering support // CRITICAL: This function MUST create exactly 8 columns (Icon, Plugin Name, Version, Pricing, Modify Date, Action, Help, About) @@ -1692,6 +1842,16 @@ function displayStorePlugins() { iconClass = 'fas fa-tools'; } else if (pluginType.includes('backup')) { iconClass = 'fas fa-save'; + } else if (pluginType.includes('monitoring')) { + iconClass = 'fas fa-heartbeat'; + } else if (pluginType.includes('integration')) { + iconClass = 'fas fa-plug'; + } else if (pluginType.includes('email')) { + iconClass = 'fas fa-envelope'; + } else if (pluginType.includes('development')) { + iconClass = 'fas fa-code'; + } else if (pluginType.includes('analytics')) { + iconClass = 'fas fa-chart-bar'; } const iconHtml = `
    @@ -1733,6 +1893,9 @@ function displayStorePlugins() { // Modify Date column - show N/A for store plugins (they're from GitHub, not local) const modifyDateHtml = plugin.modify_date ? `${escapeHtml(plugin.modify_date)}` : 'N/A'; + // Freshness badge (NEW/Stable/STALE) - use API data or compute from modify_date + const freshnessBadgeHtml = getFreshnessBadgeHtml(plugin.freshness_badge || null, plugin.modify_date); + // Pricing badge - ALWAYS show a badge (default to Free if is_paid is missing/undefined/null) // Version: 2026-01-25-v4 - Normalize is_paid to handle all possible values let isPaid = false; @@ -1754,6 +1917,7 @@ function displayStorePlugins() { ${iconHtml} ${escapeHtml(plugin.name)} + ${freshnessBadgeHtml} ${categoryBadge} ${escapeHtml(plugin.version)} @@ -2400,6 +2564,91 @@ function deactivatePlugin(pluginName) { }); } +function activateAllPlugins() { + const btns = document.querySelectorAll('#gridView .btn-activate[data-plugin-dir], #tableView .btn-activate[data-plugin-dir]'); + const plugins = Array.from(btns).map(b => b.getAttribute('data-plugin-dir')).filter(Boolean); + if (plugins.length === 0) { + if (typeof PNotify !== 'undefined') { + new PNotify({ title: 'Info', text: 'No inactive plugins to activate.', type: 'info' }); + } else { + alert('No inactive plugins to activate.'); + } + return; + } + const activateAllBtn = document.querySelector('.btn-activate-all'); + if (activateAllBtn) activateAllBtn.disabled = true; + let done = 0; + const run = () => { + if (done >= plugins.length) { + if (typeof PNotify !== 'undefined') { + new PNotify({ title: 'Success!', text: `Activated ${plugins.length} plugin(s).`, type: 'success' }); + } else { + alert(`Activated ${plugins.length} plugin(s).`); + } + setTimeout(() => location.reload(), 800); + return; + } + const name = plugins[done]; + fetch(`/plugins/api/enable/${name}/`, { + method: 'POST', + headers: { 'X-CSRFToken': getCookie('csrftoken'), 'Content-Type': 'application/json' } + }) + .then(r => r.json()) + .then(data => { + if (!data.success && typeof PNotify !== 'undefined') { + new PNotify({ title: 'Warning', text: `${name}: ${data.error || 'failed'}`, type: 'error' }); + } + done++; + run(); + }) + .catch(() => { done++; run(); }); + }; + run(); +} + +function deactivateAllPlugins() { + const btns = document.querySelectorAll('#gridView .btn-deactivate[data-plugin-dir], #tableView .btn-deactivate[data-plugin-dir]'); + const plugins = Array.from(btns).map(b => b.getAttribute('data-plugin-dir')).filter(Boolean); + if (plugins.length === 0) { + if (typeof PNotify !== 'undefined') { + new PNotify({ title: 'Info', text: 'No active plugins to deactivate.', type: 'info' }); + } else { + alert('No active plugins to deactivate.'); + } + return; + } + if (!confirm(`Deactivate ${plugins.length} plugin(s)? They will be disabled but remain installed.`)) return; + const deactivateAllBtn = document.querySelector('.btn-deactivate-all'); + if (deactivateAllBtn) deactivateAllBtn.disabled = true; + let done = 0; + const run = () => { + if (done >= plugins.length) { + if (typeof PNotify !== 'undefined') { + new PNotify({ title: 'Success!', text: `Deactivated ${plugins.length} plugin(s).`, type: 'success' }); + } else { + alert(`Deactivated ${plugins.length} plugin(s).`); + } + setTimeout(() => location.reload(), 800); + return; + } + const name = plugins[done]; + fetch(`/plugins/api/disable/${name}/`, { + method: 'POST', + headers: { 'X-CSRFToken': getCookie('csrftoken'), 'Content-Type': 'application/json' } + }) + .then(r => r.json()) + .then(data => { + if (!data.success && typeof PNotify !== 'undefined') { + new PNotify({ title: 'Warning', text: `${name}: ${data.error || 'failed'}`, type: 'error' }); + } + done++; + run(); + }) + .catch(() => { done++; run(); }); + }; + run(); +} + function dismissNotice() { const notice = document.getElementById('pluginStoreNotice'); if (notice) { diff --git a/pluginHolder/views.py b/pluginHolder/views.py index c8525d11c..1dec3c48e 100644 --- a/pluginHolder/views.py +++ b/pluginHolder/views.py @@ -53,6 +53,33 @@ def _is_plugin_enabled(plugin_name): return True # Default to enabled if file read fails return True # Default to enabled if state file doesn't exist + +def _get_freshness_badge(modify_date): + """ + Return freshness badge (NEW/Stable/STALE) based on modify_date. + modify_date format: 'YYYY-MM-DD HH:MM:SS' or 'N/A' + - 0-90 days: NEW (yellow) + - 90-365 days: Stable (green) + - 730+ days: STALE (red) + - 365-730 days: no badge + """ + if not modify_date or modify_date == 'N/A' or not isinstance(modify_date, str): + return None + try: + dt = datetime.strptime(modify_date[:19], '%Y-%m-%d %H:%M:%S') + days_ago = (datetime.now() - dt).days + if days_ago <= 90: + return {'badge': 'NEW', 'class': 'freshness-badge-new', 'title': 'This plugin was released/updated within the last 3 months'} + elif days_ago <= 365: + return {'badge': 'Stable', 'class': 'freshness-badge-stable', 'title': 'This plugin was updated within the last year'} + elif days_ago < 730: + return {'badge': 'Unstable', 'class': 'freshness-badge-unstable', 'title': 'This plugin has not been updated in over 1 year'} + else: + return {'badge': 'STALE', 'class': 'freshness-badge-stale', 'title': 'This plugin has not been updated in over 2 years'} + except (ValueError, TypeError): + pass + return None + def _set_plugin_state(plugin_name, enabled): """Set plugin enabled/disabled state""" state_file = _get_plugin_state_file(plugin_name) @@ -129,7 +156,7 @@ def installed(request): continue # Valid categories only: Utility, Security, Backup, Performance (Plugin category removed) - if type_text.lower() not in ('utility', 'security', 'backup', 'performance'): + if type_text.lower() not in ('utility', 'security', 'backup', 'performance', 'monitoring', 'integration', 'email', 'development', 'analytics'): errorPlugins.append({'name': plugin, 'error': f'Invalid category "{type_text}". Use: Utility, Security, Backup, or Performance.'}) logging.writeToFile(f"Plugin {plugin}: Invalid category '{type_text}'") continue @@ -165,6 +192,7 @@ def installed(request): modify_date = 'N/A' data['modify_date'] = modify_date + data['freshness_badge'] = _get_freshness_badge(modify_date) # Extract settings URL or main URL for "Manage" button settings_url_elem = root.find('settings_url') @@ -275,7 +303,7 @@ def installed(request): continue # Valid categories only: Utility, Security, Backup, Performance (Plugin category removed) - if type_text.lower() not in ('utility', 'security', 'backup', 'performance'): + if type_text.lower() not in ('utility', 'security', 'backup', 'performance', 'monitoring', 'integration', 'email', 'development', 'analytics'): errorPlugins.append({'name': plugin, 'error': f'Invalid category "{type_text}". Use: Utility, Security, Backup, or Performance.'}) continue @@ -302,6 +330,7 @@ def installed(request): modify_date = 'N/A' data['modify_date'] = modify_date + data['freshness_badge'] = _get_freshness_badge(modify_date) # Extract settings URL or main URL settings_url_elem = root.find('settings_url') @@ -1072,10 +1101,11 @@ def _fetch_plugins_from_github(): logging.writeToFile(f"Plugin {plugin_name}: Missing required type/category in meta.xml, skipping") continue type_text = type_elem.text.strip().lower() - if type_text not in ('utility', 'security', 'backup', 'performance'): + if type_text not in ('utility', 'security', 'backup', 'performance', 'monitoring', 'integration', 'email', 'development', 'analytics'): logging.writeToFile(f"Plugin {plugin_name}: Invalid category '{type_elem.text}', skipping (use Utility, Security, Backup, or Performance)") continue + freshness = _get_freshness_badge(modify_date) plugin_data = { 'plugin_dir': plugin_name, 'name': root.find('name').text if root.find('name') is not None else plugin_name, @@ -1088,6 +1118,7 @@ def _fetch_plugins_from_github(): 'github_url': f'https://github.com/master3395/cyberpanel-plugins/tree/main/{plugin_name}', 'about_url': f'https://github.com/master3395/cyberpanel-plugins/tree/main/{plugin_name}', 'modify_date': modify_date, + 'freshness_badge': freshness, 'is_paid': is_paid, 'patreon_tier': patreon_tier, 'patreon_url': patreon_url