diff --git a/modules/addons/pvewhmcs/img/forbidden.png b/modules/addons/pvewhmcs/img/forbidden.png new file mode 100644 index 0000000..d678400 Binary files /dev/null and b/modules/addons/pvewhmcs/img/forbidden.png differ diff --git a/modules/addons/pvewhmcs/pvewhmcs.php b/modules/addons/pvewhmcs/pvewhmcs.php index fcd5873..2a4e022 100644 --- a/modules/addons/pvewhmcs/pvewhmcs.php +++ b/modules/addons/pvewhmcs/pvewhmcs.php @@ -347,7 +347,7 @@ function pvewhmcs_output($vars) { // Login + get cluster/resources $proxmox = new PVE2_API($serverip, $serverusername, "pam", $serverpassword['password']); if (!$proxmox->login()) { - echo '
Unable to log in to PVE API on ' . htmlspecialchars($serverip) . '. Check credentials / connectivity.
'; + echo '
Unable to log in to PVE API on ' . htmlspecialchars($serverip) . '. Check credentials, connectivity & configurations.

'; continue; } @@ -415,8 +415,8 @@ function pvewhmcs_output($vars) { // Node Header Row echo '
'; echo '
'; - echo '

' . htmlspecialchars($n_name) . '

'; - echo 'PVE ' . htmlspecialchars($n_version) . ' • Uptime: ' . htmlspecialchars($n_uptime) . ''; + echo '

' . htmlspecialchars($n_name) . ' (v' . htmlspecialchars($n_version) . ')

'; + echo 'Last Boot: ' . htmlspecialchars($n_uptime) . ''; echo '
'; echo '
'; echo '' . htmlspecialchars($n_status) . ''; @@ -427,11 +427,11 @@ function pvewhmcs_output($vars) { echo '
'; echo '
'; echo '
' . $n_cpu_pct . '%
'; - echo '
CPU (' . $n_maxcpu . ' cores)
'; + echo '
CPU (' . $n_maxcpu . ' Cores)
'; echo '
'; echo '
'; echo '
' . $n_mem_pct . '%
'; - echo '
RAM (' . $n_mem_used . '/' . $n_mem_max . ' GB)
'; + echo '
RAM (' . $n_mem_used . ' of ' . $n_mem_max . 'GB)
'; echo '
'; echo '
'; @@ -444,7 +444,7 @@ function pvewhmcs_output($vars) { if ($rrd_cpu || $rrd_mem || $rrd_net || $rrd_io) { echo '
'; - echo '
Performance Graphs (Last Hour)
'; + echo '
Performance Graphs (Last Hour)
'; // Row 1: CPU and Memory echo '
'; if ($rrd_cpu) { @@ -501,7 +501,7 @@ function pvewhmcs_output($vars) { $proxmox = new PVE2_API($serverip, $serverusername, "pam", $serverpassword['password']); if (!$proxmox->login()) { - echo '
Unable to log in to PVE API on ' . htmlspecialchars($serverip) . '. Check credentials / connectivity.
'; + echo '
Unable to log in to PVE API on ' . htmlspecialchars($serverip) . '. Check credentials, connectivity & configurations.

'; continue; } @@ -743,11 +743,11 @@ function pvewhmcs_output($vars) {

⚙ System Environment

- - - - - + + + + +
Module Versionv' . pvewhmcs_version() . '
Latest Availablev' . get_pvewhmcs_latest_version() . '
Web Server' . htmlspecialchars($_SERVER['SERVER_SOFTWARE']) . '
PHP Versionv' . phpversion() . '
Server Name' . htmlspecialchars($_SERVER['SERVER_NAME']) . '
Module Versionv' . pvewhmcs_version() . '
Latest Versionv' . get_pvewhmcs_latest_version() . '
Web Server' . htmlspecialchars($_SERVER['SERVER_SOFTWARE']) . '
PHP Versionv' . phpversion() . '
Server Name' . htmlspecialchars($_SERVER['SERVER_NAME']) . '
@@ -779,6 +779,7 @@ function pvewhmcs_output($vars) {

⚠ Help is not guaranteed (FOSS). We will need your assistance to troubleshoot.

+
'; echo '
'; @@ -788,11 +789,11 @@ function pvewhmcs_output($vars) { echo '
-

⚙ Module Configuration

+

⚙ Module Configuration

- @@ -1279,13 +1281,13 @@ function qemu_plan_add() { @@ -1304,7 +1306,7 @@ function qemu_plan_add() { @@ -1318,25 +1320,26 @@ function qemu_plan_add() { - + @@ -1348,6 +1351,7 @@ function qemu_plan_add() { + SLAAC & DHCPv6 working. Prefix in future. @@ -1358,6 +1362,7 @@ function qemu_plan_add() { + Bridge, NAT or disconnect (no link) the Guest. @@ -1418,9 +1423,6 @@ function qemu_plan_edit($id) { echo 'Plan Not found' ; return false ; } - echo '
' ;
-		//print_r($plan) ;
-	echo '
' ; echo '
+ @@ -828,6 +829,7 @@ function pvewhmcs_output($vars) { + '; echo ''; @@ -856,7 +858,7 @@ function pvewhmcs_output($vars) { $proxmox = new PVE2_API($pve->ipaddress, $pve->username, "pam", $serverpassword); if (!$proxmox->login()) { - throw new Exception('Unable to log in to PVE API on ' . htmlspecialchars($pve->ipaddress) . '. Check credentials / connectivity.'); + throw new Exception('Unable to log in to PVE API on ' . htmlspecialchars($pve->ipaddress) . '. Check credentials, connectivity & configurations.'); } } @@ -1121,9 +1123,9 @@ function qemu_plan_add() { - + - + @@ -1212,21 +1214,21 @@ function qemu_plan_add() { - Learn more in the Proxmox VE Admin Guide. + Host is best. Read the Docs.
CPU - Sockets - The number of CPU Sockets (typically 1-4). + The number of CPU Sockets (typically 1-4). Governed by your physical Server.
CPU - Cores - The number of CPU Cores per Socket (1-N). + The number of CPU Cores per Socket (1-N). Guest Compute = allocated Sockets * Cores.
Disk - Cache + Read & understand the Docs before overriding default.
Disk - I/O Cap - Limit of Disk I/O in KiB/s. 0 for unrestricted storage access. + Limit of Disk I/O in KiB/s. 0 for unrestricted storage access for Guests.
Network - NIC Type + Recommend VirtIO, unless you need others.
Network - Rate - Network Rate Limit in Megabit/Second. Zero for unlimited. + Network Rate Limit in Megabits/Second. Zero for unlimited.
Network - BW LimitNetwork - Cap - Monthly Bandwidth Limit in Gigabytes. Blank for unlimited. + Monthly Data Transfer Cap in Gigabytes. Blank for unlimited.
@@ -1437,9 +1439,9 @@ function qemu_plan_edit($id) { - + - + @@ -1528,7 +1530,7 @@ function qemu_plan_edit($id) { - Learn more in the Proxmox VE Admin Guide. + Host is best. Read the Docs. @@ -1536,14 +1538,14 @@ function qemu_plan_edit($id) { @@ -1596,13 +1598,13 @@ function qemu_plan_edit($id) { @@ -1621,7 +1623,7 @@ function qemu_plan_edit($id) { @@ -1635,25 +1637,26 @@ function qemu_plan_edit($id) { - + @@ -1665,6 +1668,7 @@ function qemu_plan_edit($id) { + SLAAC & DHCPv6 working. Prefix in future. @@ -1675,6 +1679,7 @@ function qemu_plan_edit($id) { + Bridge, NAT or disconnect (no link) the Guest. @@ -1778,7 +1783,7 @@ function lxc_plan_add() { @@ -1813,14 +1818,14 @@ function lxc_plan_add() { - + @@ -1832,6 +1837,7 @@ function lxc_plan_add() { + SLAAC & DHCPv6 working. Prefix in future. @@ -1850,7 +1856,7 @@ function lxc_plan_add() { @@ -1871,10 +1877,6 @@ function lxc_plan_edit($id) { echo 'Plan Not found' ; return false ; } - echo '
' ;
-		//print_r($plan) ;
-	echo '
' ; - echo '
CPU - Sockets - The number of CPU Sockets (typically 1-4). + The number of CPU Sockets (typically 1-4). Governed by your physical Server.
CPU - Cores - The number of CPU Cores per Socket (1-N). + The number of CPU Cores per Socket (1-N). Guest Compute = allocated Sockets * Cores.
Disk - Cache + Read & understand the Docs before overriding default.
Disk - I/O Cap - Limit of Disk I/O in KiB/s. 0 for unrestricted storage access. + Limit of Disk I/O in KiB/s. 0 for unrestricted storage access for Guests.
Network - NIC Type + Recommend VirtIO, unless you need others.
Network - Rate - Network Rate Limit in Megabit. Zero for unlimited. + Network Rate Limit in Megabits/Second. Zero for unlimited.
Network - BW LimitNetwork - Cap - Monthly Bandwidth Limit in Gigabyte. Blank for unlimited. + Monthly Data Transfer Cap in Gigabytes. Blank for unlimited.
Disk - I/O Cap - Limit of Disk I/O in KiB/s. 0 for unrestricted storage access. + Limit of Disk I/O in KiB/s. 0 for unrestricted storage access for Guests.
Network - Rate - Network Rate Limit in Megabit/Second. Zero for unlimited. + Network Rate Limit in Megabits/Second. Zero for unlimited.
Data - MonthlyNetwork - Cap - Monthly Bandwidth Limit in Gigabytes. Blank for unlimited. + Monthly Data Transfer Cap in Gigabytes. Blank for unlimited.
@@ -1923,7 +1925,7 @@ function lxc_plan_edit($id) { @@ -1958,14 +1960,14 @@ function lxc_plan_edit($id) { - + @@ -1977,6 +1979,7 @@ function lxc_plan_edit($id) { + SLAAC & DHCPv6 working. Prefix in future. @@ -1995,7 +1998,7 @@ function lxc_plan_edit($id) {
Disk - I/O Cap - Limit of Disk I/O in KiB/s. 0 for unrestricted storage access. + Limit of Disk I/O in KiB/s. 0 for unrestricted storage access for Guests.
Network - Rate - Network Rate Limit in Megabit/Second. Zero for unlimited. + Network Rate Limit in Megabits/Second. Zero for unlimited.
Network - BW LimitNetwork - Cap - Monthly Bandwidth Limit in Gigabytes. Blank for unlimited. + Monthly Data Transfer Cap in Gigabytes. Blank for unlimited.