Merge branch 'servicing' into release

hestiacp · Jul 24, 2023 · 9ebaebb · 9ebaebb
2 parents 42ff8f0 + 749589d
commit 9ebaebb
Show file tree

Hide file tree

Showing 94 changed files with 204 additions and 144 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -41,9 +41,9 @@ steps:
 trigger:
   event: [pull_request, push]
   ref:
-    - refs/heads/staging/*
-    - refs/heads/beta
     - refs/heads/release
+    - refs/heads/prerelease
+    - refs/heads/servicing
     - refs/heads/main
     - refs/pull/*/head
 
@@ -94,9 +94,9 @@ steps:
 trigger:
   event: [pull_request, push]
   ref:
-    - refs/heads/staging/*
-    - refs/heads/beta
     - refs/heads/release
+    - refs/heads/prerelease
+    - refs/heads/servicing
     - refs/heads/main
     - refs/pull/*/head
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.8.3] - Service release
+
+- [UI] Fixed an issue where the wrong user type icon was displayed the top menu bar (#3810)
+- [UI] Fixed back button links on SSH, API, Logs, and White Label pages (#3811)
+- [UI] Fixed "No IPset lists defined" even when lists are defined (#3812)
+- [UI] Removed animation effect from login screen (#3822)
+- [UI] Fixed an issue where search results were not being returned for all users when logged in as `admin` (#3833)
+- [UI] Removed animations from all page loads to improve performance (#3836)
+- [UI] Moved debug mode enablement switch to a more logical place (#3838)
+- [DNS] Ensure domain is formatted properly with DNSSEC (#3814)
+- [API] Added update-dns-record permission to the API (#3819)
+
 ## [1.8.2] - Service release
 
 - Added more files to default proxy extensions (#3768)

diff --git a/README.md b/README.md
@@ -2,9 +2,9 @@
 
 ![HestiaCP Web Interface screenshot](https://storage.hestiacp.com/hestiascreen.png)
 
-<h2 align="center">Lightweight and powerful control panel for the modern web</h2>
+<h2 align="center">A lightweight and powerful control panel for the modern web</h2>
 
-<p align="center"><strong>Latest stable release:</strong> Version 1.8.2 | <a href="https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md">View Changelog</a></p>
+<p align="center"><strong>Latest stable release:</strong> Version 1.8.3 | <a href="https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md">View Changelog</a></p>
 
 <p align="center">
 	<a href="https://www.hestiacp.com/">HestiaCP.com</a> |

diff --git a/bin/v-backup-user b/bin/v-backup-user
@@ -425,7 +425,7 @@ if [ -n "$DNS_SYSTEM" ] && [ "$DNS" != '*' ]; then
 	for domain in $dns_list; do
 		((i++))
 		echo -e "$(date "+%F %T") $domain" | tee -a $BACKUP/$user.log
-
+		domain_idn="$domain"
 		# Building directory tree
 		mkdir -p $tmpdir/dns/$domain/conf
 		mkdir -p $tmpdir/dns/$domain/conf/keys

diff --git a/bin/v-restore-user b/bin/v-restore-user
@@ -429,7 +429,7 @@ if [ "$dns" != 'no' ] && [ -n "$DNS_SYSTEM" ]; then
 	# Restoring DNS domain
 	for domain in $domains; do
 		echo -e "$(date "+%F %T") $domain" | tee -a $tmpdir/restore.log
-
+		domain_idn="$domain"
 		# Cleanup previous config keys
 		unset -v DOMAIN IP TPL TTL EXP SOA RECORDS DNSSEC KEY SLAVE MASTER
 

diff --git a/install/common/api/update-dns-records b/install/common/api/update-dns-records
@@ -0,0 +1,2 @@
+ROLE='user'
+COMMANDS='v-list-dns-records,v-change-dns-record'
diff --git a/install/hst-install-debian.sh b/install/hst-install-debian.sh
@@ -31,7 +31,7 @@ HESTIA_COMMON_DIR="$HESTIA/install/common"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.8.2'
+HESTIA_INSTALL_VER='1.8.3'
 # Dependencies
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0" "8.1" "8.2")
 fpm_v="8.1"

diff --git a/install/hst-install-ubuntu.sh b/install/hst-install-ubuntu.sh
@@ -31,7 +31,7 @@ HESTIA_COMMON_DIR="$HESTIA/install/common"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.8.2'
+HESTIA_INSTALL_VER='1.8.3'
 # Dependencies
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0" "8.1" "8.2")
 fpm_v="8.1"

diff --git a/install/upgrade/versions/1.8.3.sh b/install/upgrade/versions/1.8.3.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Hestia Control Panel upgrade script for target version 1.8.3
+
+#######################################################################################
+#######                      Place additional commands below.                   #######
+#######################################################################################
+####### upgrade_config_set_value only accepts true or false.                    #######
+#######                                                                         #######
+####### Pass through information to the end user in case of a issue or problem  #######
+#######                                                                         #######
+####### Use add_upgrade_message "My message here" to include a message          #######
+####### in the upgrade notification email. Example:                             #######
+#######                                                                         #######
+####### add_upgrade_message "My message here"                                   #######
+#######                                                                         #######
+####### You can use \n within the string to create new lines.                   #######
+#######################################################################################
+
+upgrade_config_set_value 'UPGRADE_UPDATE_WEB_TEMPLATES' 'false'
+upgrade_config_set_value 'UPGRADE_UPDATE_DNS_TEMPLATES' 'false'
+upgrade_config_set_value 'UPGRADE_UPDATE_MAIL_TEMPLATES' 'false'
+upgrade_config_set_value 'UPGRADE_REBUILD_USERS' 'false'
+upgrade_config_set_value 'UPGRADE_UPDATE_FILEMANAGER_CONFIG' 'false'
+
+# Add new API key permission
+if [ -f "$HESTIA/data/api/update-dns-records" ]; then
+	rm $HESTIA/data/api/update-dns-records
+fi
+cp $HESTIA/install/common/api/update-dns-records $HESTIA/data/api/update-dns-records
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "hestia",
 	"private": true,
-	"version": "1.8.2",
+	"version": "1.8.3",
 	"description": "An open-source Linux web server control panel.",
 	"repository": "https://github.com/hestiacp/hestiacp",
 	"license": "GPL-3.0-or-later",

diff --git a/src/deb/hestia/control b/src/deb/hestia/control
@@ -1,7 +1,7 @@
 Source: hestia
 Package: hestia
 Priority: optional
-Version: 1.8.2
+Version: 1.8.3
 Section: admin
 Maintainer: HestiaCP <info@hestiacp.com>
 Homepage: https://www.hestiacp.com

diff --git a/src/rpm/hestia/hestia.spec b/src/rpm/hestia/hestia.spec
@@ -2,7 +2,7 @@
 %global _hardened_build 1
 
 Name:           hestia
-Version:        1.8.2
+Version:        1.8.3
 Release:        1%{dist}
 Summary:        Hestia Control Panel
 Group:          System Environment/Base

diff --git a/web/search/index.php b/web/search/index.php
@@ -21,7 +21,7 @@
 $q = quoteshellarg($_GET["q"]);
 $u = quoteshellarg($_GET["u"]);
 
-if ($_SESSION["userContext"] === "admin" && !isset($_SESSION["look"])) {
+if ($_SESSION["userContext"] === "admin" && $_SESSION["look"] == "") {
 	if (!empty($_GET["u"])) {
 		$user = $u;
 		exec(

diff --git a/web/templates/includes/panel.php b/web/templates/includes/panel.php
@@ -16,7 +16,7 @@
 				<!-- Usage Statistics -->
 				<div class="top-bar-usage">
 					<?php
-						if (isset($_SESSION['look'])) {
+						if ($_SESSION['look'] !== '') {
 							$user_icon = 'fa-binoculars';
 						} else if ($_SESSION['userContext'] === 'admin') {
 							$user_icon = 'fa-user-tie';

diff --git a/web/templates/pages/add_access_key.php b/web/templates/pages/add_access_key.php
@@ -15,7 +15,7 @@
 </div>
 <!-- End toolbar -->
 
-<div class="container animate__animated animate__fadeIn">
+<div class="container">
 	<form id="main-form" name="v_add_access_key" method="post">
 		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
 		<input type="hidden" name="ok" value="Add">

diff --git a/web/templates/pages/add_cron.php b/web/templates/pages/add_cron.php
@@ -15,7 +15,7 @@
 </div>
 <!-- End toolbar -->
 
-<div class="container animate__animated animate__fadeIn">
+<div class="container">
 
 	<form id="main-form" name="v_add_cron" method="post">
 		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">

diff --git a/web/templates/pages/add_db.php b/web/templates/pages/add_db.php
@@ -17,7 +17,7 @@
 </div>
 <!-- End toolbar -->
 
-<div class="container animate__animated animate__fadeIn">
+<div class="container">
 
 	<form
 		x-data="{

diff --git a/web/templates/pages/add_dns.php b/web/templates/pages/add_dns.php
@@ -17,7 +17,7 @@
 </div>
 <!-- End toolbar -->
 
-<div class="container animate__animated animate__fadeIn">
+<div class="container">
 
 	<form
 		x-data="{

diff --git a/web/templates/pages/add_dns_rec.php b/web/templates/pages/add_dns_rec.php
@@ -15,7 +15,7 @@
 </div>
 <!-- End toolbar -->
 
-<div class="container animate__animated animate__fadeIn">
+<div class="container">
 
 	<form id="main-form" name="v_add_dns_rec" method="post">
 		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">

diff --git a/web/templates/pages/add_firewall.php b/web/templates/pages/add_firewall.php
@@ -15,7 +15,7 @@
 </div>
 <!-- End toolbar -->
 
-<div class="container animate__animated animate__fadeIn">
+<div class="container">
 
 	<form id="main-form" name="v_add_ip" method="post">
 		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">

diff --git a/web/templates/pages/add_firewall_banlist.php b/web/templates/pages/add_firewall_banlist.php
@@ -15,7 +15,7 @@
 </div>
 <!-- End toolbar -->
 
-<div class="container animate__animated animate__fadeIn">
+<div class="container">
 
 	<form id="main-form" name="v_add_ip" method="post">
 		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">

diff --git a/web/templates/pages/add_firewall_ipset.php b/web/templates/pages/add_firewall_ipset.php
@@ -15,7 +15,7 @@
 </div>
 <!-- End toolbar -->
 
-<div class="container animate__animated animate__fadeIn">
+<div class="container">
 
 	<form id="main-form" name="v_add_ipset" method="post">
 		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">

diff --git a/web/templates/pages/add_ip.php b/web/templates/pages/add_ip.php
@@ -15,7 +15,7 @@
 </div>
 <!-- End toolbar -->
 
-<div class="container animate__animated animate__fadeIn">
+<div class="container">
 
 	<form
 		x-data="{

diff --git a/web/templates/pages/add_key.php b/web/templates/pages/add_key.php
@@ -21,7 +21,7 @@
 </div>
 <!-- End toolbar -->
 
-<div class="container animate__animated animate__fadeIn">
+<div class="container">
 
 	<form id="main-form" name="v_add_key" method="post">
 		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">

diff --git a/web/templates/pages/add_mail.php b/web/templates/pages/add_mail.php
@@ -17,7 +17,7 @@
 </div>
 <!-- End toolbar -->
 
-<div class="container animate__animated animate__fadeIn">
+<div class="container">
 
 	<form
 		x-data="{

diff --git a/web/templates/pages/add_mail_acc.php b/web/templates/pages/add_mail_acc.php
@@ -15,7 +15,7 @@
 </div>
 <!-- End toolbar -->
 
-<div class="container animate__animated animate__fadeIn">
+<div class="container">
 
 	<form
 		x-data="{

diff --git a/web/templates/pages/add_package.php b/web/templates/pages/add_package.php
@@ -15,7 +15,7 @@
 </div>
 <!-- End toolbar -->
 
-<div class="container animate__animated animate__fadeIn">
+<div class="container">
 
 	<form
 		x-data="{

diff --git a/web/templates/pages/add_user.php b/web/templates/pages/add_user.php
@@ -15,7 +15,7 @@
 </div>
 <!-- End toolbar -->
 
-<div class="container animate__animated animate__fadeIn">
+<div class="container">
 
 	<form
 		x-data="{

diff --git a/web/templates/pages/add_web.php b/web/templates/pages/add_web.php
@@ -17,7 +17,7 @@
 </div>
 <!-- End toolbar -->
 
-<div class="container animate__animated animate__fadeIn">
+<div class="container">
 
 	<form id="main-form" name="v_add_web" method="post" class="js-enable-inputs-on-submit">
 		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">

diff --git a/web/templates/pages/debug_panel.php b/web/templates/pages/debug_panel.php
@@ -11,7 +11,7 @@ class="debug-panel-toggle"
 		x-text="open ? '<?= _("Close debug panel") ?>' : '<?= _("Open debug panel") ?>'">
 		<?= _("Open debug panel") ?>
 	</button>
-	<div x-cloak x-show="open" class="debug-panel-content animate__animated animate__fadeIn">
+	<div x-cloak x-show="open" class="debug-panel-content">
 		<?php
 			echo "<h3 class=\"u-mb10\">Server Variables</h3>";
 			foreach ($_SERVER as $key => $val) {

diff --git a/web/templates/pages/edit_backup_exclusions.php b/web/templates/pages/edit_backup_exclusions.php
@@ -15,7 +15,7 @@
 </div>
 <!-- End toolbar -->
 
-<div class="container animate__animated animate__fadeIn">
+<div class="container">
 
 	<form id="main-form" name="v_edit_backup_exclusions" method="post">
 		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">

diff --git a/web/templates/pages/edit_cron.php b/web/templates/pages/edit_cron.php
@@ -15,7 +15,7 @@
 </div>
 <!-- End toolbar -->
 
-<div class="container animate__animated animate__fadeIn">
+<div class="container">
 
 	<form id="main-form" name="v_edit_cron" method="post" class="<?= $v_status ?>">
 		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">

diff --git a/web/templates/pages/edit_db.php b/web/templates/pages/edit_db.php
@@ -15,7 +15,7 @@
 </div>
 <!-- End toolbar -->
 
-<div class="container animate__animated animate__fadeIn">
+<div class="container">
 
 	<form id="main-form" name="v_edit_db" method="post" class="<?= $v_status ?>">
 		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">

diff --git a/web/templates/pages/edit_dns.php b/web/templates/pages/edit_dns.php
@@ -15,7 +15,7 @@
 </div>
 <!-- End toolbar -->
 
-<div class="container animate__animated animate__fadeIn">
+<div class="container">
 
 	<form id="main-form" name="v_edit_dns" method="post" class="<?= $v_status ?>">
 		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">

diff --git a/web/templates/pages/edit_dns_rec.php b/web/templates/pages/edit_dns_rec.php
@@ -15,7 +15,7 @@
 </div>
 <!-- End toolbar -->
 
-<div class="container animate__animated animate__fadeIn">
+<div class="container">
 
 	<form id="main-form" name="v_edit_dns_rec" method="post" class="<?= $v_status ?>">
 		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">

diff --git a/web/templates/pages/edit_firewall.php b/web/templates/pages/edit_firewall.php
@@ -15,7 +15,7 @@
 </div>
 <!-- End toolbar -->
 
-<div class="container animate__animated animate__fadeIn">
+<div class="container">
 
 	<form id="main-form" name="v_edit_firewall" method="post" class="<?= $v_status ?>">
 		<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">

diff --git a/web/templates/pages/edit_ip.php b/web/templates/pages/edit_ip.php
@@ -15,7 +15,7 @@
 </div>
 <!-- End toolbar -->
 
-<div class="container animate__animated animate__fadeIn">
+<div class="container">
 
 	<form
 		x-data="{