diff --git a/CHANGELOG.md b/CHANGELOG.md index 6aa3b6d..d0203bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to Proxmox VE for WHMCS will be documented in this file. ### 💅 Polish - SQL Expansion: Prepare for Nodes/ISOs/TPLs/Logs/SSH Keys/etc +- Client Area: Improved layout and formatting of guest details (#155) + +### 🐛 Bug Fix +- Client Area, Swap %: "NaN%" replaced with "0%" for QEMU cases (#154) https://github.com/The-Network-Crew/Proxmox-VE-for-WHMCS/milestones diff --git a/README.md b/README.md index 3bd852d..66332b0 100644 --- a/README.md +++ b/README.md @@ -97,6 +97,10 @@ Configured in the _Module_ as detailed below, once you've added/restricted it in Pane/tab where you need to SAVE the module Plan & Pool against the WHMCS Service +#### Admin GUI: WHMCS Servers > Links direct to PVE GUI + +WHMCS Admin > Configuration > Servers interface, showing link button to Proxmox GUI, labelled with the PVE hostname + ## 🥽 2. noVNC: Console Tunnel (Client Area) After forking the module, we considered how to improve security of Console Tunneling via WHMCS. We decided to implement a routing method which uses a secondary user in Proxmox VE with very restrictive permissions. @@ -130,6 +134,8 @@ After forking the module, we considered how to improve security of Console Tunne > > **Note**: Custom WHMCS install folders like /clients/ are not yet VNC-supported. #114 +Client Area GUI showing the reply which links off to the VNC Console/Client + ### Important info about Console Access **noVNC has been overhauled. It isn't guaranteed, nor the project at all. :-)** diff --git a/_images/zConsoleReady.png b/_images/zConsoleReady.png new file mode 100644 index 0000000..ff9bc29 Binary files /dev/null and b/_images/zConsoleReady.png differ diff --git a/_images/zServerListLink.png b/_images/zServerListLink.png new file mode 100644 index 0000000..0c3dab3 Binary files /dev/null and b/_images/zServerListLink.png differ diff --git a/_images/zVMclientGUI.png b/_images/zVMclientGUI.png index 61c45d4..d0c17c1 100644 Binary files a/_images/zVMclientGUI.png and b/_images/zVMclientGUI.png differ diff --git a/modules/servers/pvewhmcs/clientarea.tpl b/modules/servers/pvewhmcs/clientarea.tpl index 44a4b42..c7dc6a9 100644 --- a/modules/servers/pvewhmcs/clientarea.tpl +++ b/modules/servers/pvewhmcs/clientarea.tpl @@ -19,7 +19,6 @@
{$vm_status['status']}
Up: {$vm_status['uptime']} -
@@ -57,28 +56,13 @@ - - - - - + + - - - - - - - - - - - - - + @@ -91,6 +75,21 @@ {($vm_config['virtio0']|replace:',':'
')} + + + + + + + + + + + + + + +
IP (Addressing){$vm_config['ipv4']}
Subnet Mask: {$vm_config['netmask4']}
Gateway: {$vm_config['gateway4']}
OS/etc (System)Kernel: {$vm_config['ostype']}Memory (RAM){$vm_config['memory']}MB
Compute (CPU){$vm_config['sockets']} socket/s, {$vm_config['cores']} core/s
- Emulation: {$vm_config['cpu']}
Memory (RAM){$vm_config['memory']}MB
NIC (Interface #1){($vm_config['net0']|replace:',':'
')}
NIC (Interface #2){$vm_config['net1']}{$vm_config['cpu']} {$vm_config['cores']} core/s on {$vm_config['sockets']} socket/s +
Storage (SSD/HDD)
OS/etc (System)Kernel: {$vm_config['ostype']}
IP (Addressing){$vm_config['ipv4']}
Mask: {$vm_config['netmask4']}
Gateway: {$vm_config['gateway4']}
NIC (Interface #1){($vm_config['net0']|replace:',':'
')}
NIC (Interface #2){$vm_config['net1']}
{if ($smarty.get.a eq 'vmStat')}

VM Statistics

diff --git a/modules/servers/pvewhmcs/img/running.png b/modules/servers/pvewhmcs/img/running.png index 4378234..7034f2b 100644 Binary files a/modules/servers/pvewhmcs/img/running.png and b/modules/servers/pvewhmcs/img/running.png differ diff --git a/modules/servers/pvewhmcs/img/stopped.png b/modules/servers/pvewhmcs/img/stopped.png index 3295692..8271acd 100644 Binary files a/modules/servers/pvewhmcs/img/stopped.png and b/modules/servers/pvewhmcs/img/stopped.png differ diff --git a/modules/servers/pvewhmcs/img/suspended.png b/modules/servers/pvewhmcs/img/suspended.png index ee2c0a7..1a596ad 100644 Binary files a/modules/servers/pvewhmcs/img/suspended.png and b/modules/servers/pvewhmcs/img/suspended.png differ diff --git a/modules/servers/pvewhmcs/pvewhmcs.php b/modules/servers/pvewhmcs/pvewhmcs.php index 796ae74..115ff2c 100644 --- a/modules/servers/pvewhmcs/pvewhmcs.php +++ b/modules/servers/pvewhmcs/pvewhmcs.php @@ -961,10 +961,10 @@ function pvewhmcs_ClientArea($params) { $ct_specific = $proxmox->get('/nodes/'.$first_node.'/lxc/'.$guest->vmid.'/status/current'); if ($ct_specific['maxswap'] != 0) { $vm_status['swapusepercent'] = intval($ct_specific['swap'] * 100 / $ct_specific['maxswap']); - } else { - // Fall back to 0% usage to satisfy chart requirement - $vm_status['swapusepercent'] = 0; - } + } + } else { + // Fall back to 0% usage to satisfy chart requirement + $vm_status['swapusepercent'] = 0; } } else { // Handle the VM not found in the cluster resources (Optional)