Merge remote-tracking branch 'upstream/main' into ipv6

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-## [Development] - Service release
+## [1.7.0] - Feature / Major release
 
 ### Note
 

README.md

@@ -1,10 +1,10 @@
 <h1 align="center"><a href="https://www.hestiacp.com/">Hestia Control Panel</a></h1>
 
-![Hestia screenshot](https://hestiacp.com/img/screen_HestiaServer-dark.png)
+![Hestia screenshot](https://storage.hestiacp.com/hestiascreen.png)
 
 <h2 align="center">Lightweight and powerful control panel for the modern web</h2>
 
-<p align="center"><strong>Latest stable release:</strong> Version 1.6.14 | <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.7.0 | <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> |
@@ -47,7 +47,7 @@ Smart Chain: 0xfF3Dd2c889bd0Ff73d8085B84A314FC7c88e5D51<br>
 - **NOTE:** Hestia Control Panel does not support 32 bit operating systems!
 
 - **Debian:** 11 or 10
-- **Ubuntu:** 22.04LTS, 20.04 LTS or 18.04 LTS
+- **Ubuntu:** 22.04LTS, 20.04 LTS
 
 - **NOTE:** Hestia Control Panel in combination with OpenVZ 7 or lower might have issue Bind9 server not starting or issues with Firewall. If you use a Virtual Private Server we strongly advice you to use something based on KVM or LXC!
 

bin/v-restore-user

@@ -350,11 +350,11 @@ if [ "$web" != 'no' ] && [ -n "$WEB_SYSTEM" ]; then
 			if [[ "$file" == *.ca ]] || [[ "$file" == *.crt ]] || [[ "$file" == *.key ]] || [[ "$file" == *.pem ]] || [[ "$file" == *.conf ]]; then
 				continue
 			fi
-			if grep "fastcgi_pass" file; then
+			if grep "fastcgi_pass" "$file"; then
 				# Do not allow to run php under a different user
 				continue
 			fi
-			filename=$(basename $file)
+			filename=$(basename "$file")
 			cp -f "$file" "$HOMEDIR/$user/conf/web/$domain/$filename"
 		done
 

docs/docs/introduction/getting-started.md

@@ -12,12 +12,12 @@ The installer needs to be run as **root**, either directly from the terminal or
 Hestia must be installed on top of a fresh operating system installation to ensure proper functionality.
 :::
 
-|                      | Minimum                                           | Recommended                          |
-| -------------------- | ------------------------------------------------- | ------------------------------------ |
-| **CPU**              | 1 core, 64-bit                                    | 4 cores                              |
-| **Memory**           | 1 GB (no SpamAssassin and ClamAV)                 | 4 GB                                 |
-| **Disk**             | 10 GB HDD                                         | 40 GB SSD                            |
-| **Operating System** | Debian 10, 11 <br> Ubuntu 18.04, 20.04, 22.04 LTS | Latest Debian <br> Latest Ubuntu LTS |
+|                      | Minimum                             | Recommended                          |
+| -------------------- | ----------------------------------- | ------------------------------------ |
+| **CPU**              | 1 core, 64-bit                      | 4 cores                              |
+| **Memory**           | 1 GB (no SpamAssassin and ClamAV)   | 4 GB                                 |
+| **Disk**             | 10 GB HDD                           | 40 GB SSD                            |
+| **Operating System** | Debian 10, 11 <br> 20.04, 22.04 LTS | Latest Debian <br> Latest Ubuntu LTS |
 
 ::: warning
 Hestia only runs on AMD64 / x86_64 and ARM64 / AArch64 processors. It also requires a 64bit operating system!
@@ -27,7 +27,7 @@ We currently do not support i386 or ARM7-based processors.
 ### Supported operating systems
 
 - Debian 10 or 11
-- Ubuntu 18.04, 20.04 or 22.04
+- Ubuntu 20.04 or 22.04
 
 ::: warning
 Hestia does not support non-LTS Operating systems. If you install it on, for example, Ubuntu 21.10, you will not receive support from us.

func/upgrade.sh

@@ -551,7 +551,7 @@ upgrade_b2_tool() {
 }
 
 upgrade_cloudflare_ip() {
-	echo "[ * ] Update Cloudflare IP"
+	echo "[ * ] Update Cloudflare IP..."
 	# https://github.com/ergin/nginx-cloudflare-real-ip/
 	CLOUDFLARE_FILE_PATH='/etc/nginx/conf.d/cloudflare.inc'
 	echo "#Cloudflare" > $CLOUDFLARE_FILE_PATH
@@ -601,7 +601,7 @@ upgrade_phpmyadmin() {
 	if [ -n "$(echo $DB_SYSTEM | grep -w 'mysql')" ]; then
 		pma_version=$(jq -r .version /usr/share/phpmyadmin/package.json)
 		if version_ge "$pma_version" "$pma_v"; then
-			echo "[ * ] phpMyAdmin is up to date (${pma_release_file##*-})..."
+			echo "[ * ] phpMyAdmin is up to date (${pma_version})..."
 			# Update permissions
 			if [ -e /var/lib/phpmyadmin/blowfish_secret.inc.php ]; then
 				chown root:www-data /var/lib/phpmyadmin/blowfish_secret.inc.php
@@ -706,7 +706,7 @@ upgrade_rainloop() {
 }
 
 upgrade_dependencies() {
-	echo "[ ! ] Update Hesita PHP dependencies"
+	echo "[ ! ] Update Hestia PHP dependencies..."
 	$BIN/v-add-sys-dependencies
 }
 
@@ -734,7 +734,7 @@ upgrade_rebuild_dns_templates() {
 upgrade_rebuild_users() {
 	if [ "$UPGRADE_REBUILD_USERS" = "true" ]; then
 		if [ "$DEBUG_MODE" = "true" ]; then
-			echo "[ * ] Rebuilding user accounts and domains:"
+			echo "[ * ] Rebuilding user accounts and domains:..."
 		else
 			echo "[ * ] Rebuilding user accounts and domains, this may take a few minutes..."
 		fi

install/deb/nginx/nginx.conf

@@ -78,9 +78,11 @@ http {
 	  application/xml+rss application/x-font-ttf image/svg+xml font/opentype;
 	gzip_proxied                    any;
 	gzip_disable                    "MSIE [1-6]\.";
+    
 	# Cloudflare ips
 	include                         /etc/nginx/conf.d/cloudflare.inc;
-	# SSL PCI compliance
+	
+    # SSL PCI compliance
 	ssl_session_cache               shared:SSL:20m;
 	ssl_session_timeout             60m;
 	ssl_buffer_size                 1400;

install/upgrade/versions/1.7.0.sh

@@ -69,18 +69,18 @@ fi
 # rename /var/run/xx to /run/
 for file in /etc/dovecot/dovecot.conf /etc/clamav/clamd.conf /etc/exim/exim.conf.template /etc/logrotate.d/apache2 /etc/logrotate.d/nginx /etc/mysql/my.cnf /etc/nginx/nginx.conf; do
 	if [ -f "$file" ]; then
-		echo "[ * ] Update $file legacy /var/run/ to /run/"
+		echo "[ * ] Update $file legacy /var/run/ to /run/..."
 		sed -i 's|/var/run/|/run/|g' $file
 	fi
 done
 # Update any custom php templates
 for file in $HESTIA/data/templates/web/php-fpm/*; do
-	echo "[ * ] Update $file legacy /var/run/ to /run/"
+	echo "[ * ] Update $file legacy /var/run/ to /run/..."
 	sed -i 's|/var/run/|/run/|g' $file
 done
 
 for file in /etc/php/*/fpm/pool.d/www.conf; do
-	echo "[ * ] Update $file legacy /var/run/ to /run/"
+	echo "[ * ] Update $file legacy /var/run/ to /run/..."
 	sed -i 's|/var/run/|/run/|g' $file
 done
 
@@ -101,7 +101,7 @@ if echo "$BACKUP_SYSTEM" | grep "google" > /dev/null; then
 fi
 
 if [ -f /etc/logrotate.d/httpd-prerotate/awstats ]; then
-	echo "[ * ] Update Awstats prerotate to Hestia update method"
+	echo "[ * ] Update Awstats prerotate to Hestia update method..."
 	# Replace awstatst function
 	cp -f $HESTIA_INSTALL_DIR/logrotate/httpd-prerotate/awstats /etc/logrotate.d/httpd-prerotate/
 fi
@@ -113,7 +113,7 @@ if [ "$PHPMYADMIN_KEY" != "" ]; then
 fi
 
 if [ -f /etc/nginx/nginx.conf ] && [ ! -f /etc/nginx/conf.d/cloudflare.inc ]; then
-	echo "[ * ] Enable support for updating Cloudflare Ips"
+	echo "[ * ] Enable support for updating Cloudflare Ips..."
 	sed -i '/set_real_ip_from/d' /etc/nginx/nginx.conf
 	sed -i '/real_ip_header/d' /etc/nginx/nginx.conf
 	sed -i 's|# Cloudflare https://www.cloudflare.com/ips|# Cloudflare https://www.cloudflare.com/ips\n    include /etc/nginx/conf.d/cloudflare.inc;|g' /etc/nginx/nginx.conf

src/deb/nginx/control

@@ -1,7 +1,7 @@
 Source: hestia-nginx
 Package: hestia-nginx
 Priority: optional
-Version: 1.23.3-1
+Version: 1.23.3-3
 Section: admin
 Maintainer: HestiaCP <info@hestiacp.com>
 Homepage: https://www.hestiacp.com

web/delete/log/index.php

@@ -16,7 +16,6 @@ if ($_SESSION["userContext"] === "admin" && !empty($_GET["user"])) {
 exec(HESTIA_CMD . "v-delete-user-log " . $user, $output, $return_var);
 check_return_code($return_var, $output);
 unset($output);
-unset($token);
 
 if ($return_var > 0) {
 	header("Location: /list/log/");

web/edit/web/index.php

@@ -70,8 +70,8 @@ $v_letsencrypt = $data[$v_domain]["LETSENCRYPT"];
 if (empty($v_letsencrypt)) {
 	$v_letsencrypt = "no";
 }
-$v_ssl_home = $data[$v_domain]["SSL_HOME"];
-$v_backend_template = $data[$v_domain]["BACKEND"];
+$v_ssl_home = $data[$v_domain]["SSL_HOME"] ?? "";
+$v_backend_template = $data[$v_domain]["BACKEND"] ?? "";
 $v_nginx_cache = $data[$v_domain]["FASTCGI_CACHE"] ?? "";
 $v_nginx_cache_duration = $data[$v_domain]["FASTCGI_DURATION"] ?? "";
 $v_nginx_cache_check = "";
@@ -926,10 +926,7 @@ if (!empty($_POST["save"])) {
 		if (empty($_POST["v_ssl_key"])) {
 			$errors[] = "ssl key";
 		}
-		if (empty($_POST["v_ssl_home"])) {
-			$errors[] = "ssl home";
-		}
-		$v_ssl_home = quoteshellarg($_POST["v_ssl_home"]);
+
 		if (!empty($errors[0])) {
 			foreach ($errors as $i => $error) {
 				if ($i == 0) {
@@ -963,6 +960,7 @@ if (!empty($_POST["save"])) {
 				fwrite($fp, str_replace("\r\n", "\n", $_POST["v_ssl_ca"]));
 				fclose($fp);
 			}
+			//keep using the original value for v_ssl_home
 			exec(
 				HESTIA_CMD .
 					"v-add-web-domain-ssl " .
@@ -972,7 +970,7 @@ if (!empty($_POST["save"])) {
 					" " .
 					$tmpdir .
 					" " .
-					$v_ssl_home .
+					quoteshellarg($v_ssl_home) .
 					" 'no'",
 				$output,
 				$return_var,

web/locale/hestiacp.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-08 22:29+0100\n"
+"POT-Creation-Date: 2023-03-21 08:43+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -280,8 +280,8 @@ msgstr ""
 #: ../../web/templates/pages/list_db.php:167
 #: ../../web/templates/pages/list_firewall.php:28
 #: ../../web/templates/pages/list_firewall.php:107
-#: ../../web/templates/pages/edit_web.php:395
-#: ../../web/templates/pages/edit_web.php:449
+#: ../../web/templates/pages/edit_web.php:401
+#: ../../web/templates/pages/edit_web.php:455
 #: ../../web/templates/pages/list_key.php:40
 #: ../../web/templates/pages/list_packages.php:25
 #: ../../web/templates/pages/list_dns_rec.php:35
@@ -724,19 +724,19 @@ msgstr ""
 
 #: ../../web/templates/pages/add_package.php:90
 #: ../../web/templates/pages/edit_package.php:93
-#: ../../web/templates/pages/edit_web.php:258
+#: ../../web/templates/pages/edit_web.php:264
 msgid "Web Template"
 msgstr ""
 
 #: ../../web/templates/pages/add_package.php:107
 #: ../../web/templates/pages/edit_package.php:110
-#: ../../web/templates/pages/edit_web.php:295
+#: ../../web/templates/pages/edit_web.php:301
 msgid "Backend Template"
 msgstr ""
 
 #: ../../web/templates/pages/add_package.php:126
 #: ../../web/templates/pages/edit_package.php:128
-#: ../../web/templates/pages/edit_web.php:325
+#: ../../web/templates/pages/edit_web.php:331
 msgid "Proxy Template"
 msgstr ""
 
@@ -811,7 +811,7 @@ msgstr ""
 #: ../../web/templates/pages/add_package.php:259
 #: ../../web/templates/pages/add_mail_acc.php:106
 #: ../../web/templates/pages/edit_mail.php:64
-#: ../../web/templates/pages/edit_mail_acc.php:119
+#: ../../web/templates/pages/edit_mail_acc.php:120
 #: ../../web/templates/pages/edit_package.php:264
 msgid "Rate limit"
 msgstr ""
@@ -908,7 +908,7 @@ msgstr ""
 #: ../../web/templates/pages/add_dns_rec.php:74
 #: ../../web/templates/pages/add_dns_rec.php:80
 #: ../../web/templates/pages/edit_web.php:204
-#: ../../web/templates/pages/edit_web.php:370
+#: ../../web/templates/pages/edit_web.php:376
 #: ../../web/templates/pages/generate_ssl.php:28
 msgid "optional"
 msgstr ""
@@ -943,8 +943,8 @@ msgid "WEB"
 msgstr ""
 
 #: ../../web/templates/pages/add_firewall_banlist.php:38
-#: ../../web/templates/pages/edit_web.php:394
-#: ../../web/templates/pages/edit_web.php:448
+#: ../../web/templates/pages/edit_web.php:400
+#: ../../web/templates/pages/edit_web.php:454
 msgid "FTP"
 msgstr ""
 
@@ -1083,7 +1083,7 @@ msgstr ""
 
 #: ../../web/templates/pages/edit_server_php.php:57
 #: ../../web/templates/pages/add_mail_acc.php:65
-#: ../../web/templates/pages/edit_web.php:251
+#: ../../web/templates/pages/edit_web.php:257
 #: ../../web/templates/pages/add_db.php:101
 #: ../../web/templates/pages/edit_server_nginx.php:72
 #: ../../web/templates/pages/add_dns.php:87
@@ -1177,11 +1177,11 @@ msgstr ""
 #: ../../web/templates/pages/edit_mail.php:192
 #: ../../web/templates/pages/add_user.php:48
 #: ../../web/templates/pages/edit_mail_acc.php:45
-#: ../../web/templates/pages/edit_mail_acc.php:133
+#: ../../web/templates/pages/edit_mail_acc.php:134
 #: ../../web/templates/pages/add_mail.php:115
 #: ../../web/templates/pages/edit_web.php:113
-#: ../../web/templates/pages/edit_web.php:411
-#: ../../web/templates/pages/edit_web.php:463
+#: ../../web/templates/pages/edit_web.php:417
+#: ../../web/templates/pages/edit_web.php:469
 #: ../../web/templates/pages/add_db.php:77
 #: ../../web/templates/pages/edit_server.php:481
 #: ../../web/templates/pages/edit_server.php:577
@@ -1205,8 +1205,8 @@ msgstr ""
 #: ../../web/templates/pages/add_user.php:49
 #: ../../web/templates/pages/edit_mail_acc.php:46
 #: ../../web/templates/pages/edit_web.php:113
-#: ../../web/templates/pages/edit_web.php:411
-#: ../../web/templates/pages/edit_web.php:463
+#: ../../web/templates/pages/edit_web.php:417
+#: ../../web/templates/pages/edit_web.php:469
 #: ../../web/templates/pages/edit_cron.php:82
 #: ../../web/templates/pages/edit_cron.php:113
 #: ../../web/templates/pages/edit_cron.php:183
@@ -1272,12 +1272,12 @@ msgid "use local-part"
 msgstr ""
 
 #: ../../web/templates/pages/add_mail_acc.php:86
-#: ../../web/templates/pages/edit_mail_acc.php:112
+#: ../../web/templates/pages/edit_mail_acc.php:101
 msgid "Forward to"
 msgstr ""
 
 #: ../../web/templates/pages/add_mail_acc.php:86
-#: ../../web/templates/pages/edit_mail_acc.php:112
+#: ../../web/templates/pages/edit_mail_acc.php:101
 msgid "one or more email addresses"
 msgstr ""
 
@@ -1292,7 +1292,7 @@ msgid "Do not store forwarded mail"
 msgstr ""
 
 #: ../../web/templates/pages/add_mail_acc.php:106
-#: ../../web/templates/pages/edit_mail_acc.php:119
+#: ../../web/templates/pages/edit_mail_acc.php:120
 msgid "Email / hour"
 msgstr ""
 
@@ -1304,20 +1304,20 @@ msgid "Send login credentials to email address"
 msgstr ""
 
 #: ../../web/templates/pages/add_mail_acc.php:121
-#: ../../web/templates/pages/edit_mail_acc.php:126
+#: ../../web/templates/pages/edit_mail_acc.php:127
 msgid "Common account settings"
 msgstr ""
 
 #: ../../web/templates/pages/add_mail_acc.php:124
 #: ../../web/templates/pages/edit_mail.php:188
 #: ../../web/templates/pages/add_user.php:35
-#: ../../web/templates/pages/edit_mail_acc.php:129
+#: ../../web/templates/pages/edit_mail_acc.php:130
 #: ../../web/templates/pages/add_mail.php:111
 #: ../../web/templates/pages/list_db.php:54
 #: ../../web/templates/pages/list_db.php:98
 #: ../../web/templates/pages/edit_web.php:108
-#: ../../web/templates/pages/edit_web.php:401
-#: ../../web/templates/pages/edit_web.php:455
+#: ../../web/templates/pages/edit_web.php:407
+#: ../../web/templates/pages/edit_web.php:461
 #: ../../web/templates/pages/add_db.php:69
 #: ../../web/templates/pages/edit_server.php:469
 #: ../../web/templates/pages/edit_server.php:818
@@ -1335,46 +1335,46 @@ msgid "Username"
 msgstr ""
 
 #: ../../web/templates/pages/add_mail_acc.php:133
-#: ../../web/templates/pages/edit_mail_acc.php:138
+#: ../../web/templates/pages/edit_mail_acc.php:139
 msgid "Webmail"
 msgstr ""
 
 #: ../../web/templates/pages/add_mail_acc.php:138
-#: ../../web/templates/pages/edit_mail_acc.php:143
+#: ../../web/templates/pages/edit_mail_acc.php:144
 #: ../../web/templates/pages/list_db.php:99
 #: ../../web/templates/pages/edit_server.php:69
 msgid "Hostname"
 msgstr ""
 
 #: ../../web/templates/pages/add_mail_acc.php:142
-#: ../../web/templates/pages/edit_mail_acc.php:147
+#: ../../web/templates/pages/edit_mail_acc.php:148
 msgid "IMAP settings"
 msgstr ""
 
 #: ../../web/templates/pages/add_mail_acc.php:145
 #: ../../web/templates/pages/add_mail_acc.php:164
 #: ../../web/templates/pages/add_mail_acc.php:183
-#: ../../web/templates/pages/edit_mail_acc.php:150
-#: ../../web/templates/pages/edit_mail_acc.php:169
-#: ../../web/templates/pages/edit_mail_acc.php:188
+#: ../../web/templates/pages/edit_mail_acc.php:151
+#: ../../web/templates/pages/edit_mail_acc.php:170
+#: ../../web/templates/pages/edit_mail_acc.php:189
 msgid "Authentication"
 msgstr ""
 
 #: ../../web/templates/pages/add_mail_acc.php:146
 #: ../../web/templates/pages/add_mail_acc.php:165
 #: ../../web/templates/pages/add_mail_acc.php:184
-#: ../../web/templates/pages/edit_mail_acc.php:151
-#: ../../web/templates/pages/edit_mail_acc.php:170
-#: ../../web/templates/pages/edit_mail_acc.php:189
+#: ../../web/templates/pages/edit_mail_acc.php:152
+#: ../../web/templates/pages/edit_mail_acc.php:171
+#: ../../web/templates/pages/edit_mail_acc.php:190
 msgid "Normal password"
 msgstr ""
 
 #: ../../web/templates/pages/add_mail_acc.php:149
 #: ../../web/templates/pages/add_mail_acc.php:168
 #: ../../web/templates/pages/add_mail_acc.php:187
-#: ../../web/templates/pages/edit_mail_acc.php:154
-#: ../../web/templates/pages/edit_mail_acc.php:173
-#: ../../web/templates/pages/edit_mail_acc.php:192
+#: ../../web/templates/pages/edit_mail_acc.php:155
+#: ../../web/templates/pages/edit_mail_acc.php:174
+#: ../../web/templates/pages/edit_mail_acc.php:193
 msgid "SSL/TLS"
 msgstr ""
 
@@ -1389,15 +1389,15 @@ msgstr ""
 #: ../../web/templates/pages/add_mail_acc.php:196
 #: ../../web/templates/pages/edit_mail.php:184
 #: ../../web/templates/pages/add_firewall.php:44
-#: ../../web/templates/pages/edit_mail_acc.php:155
-#: ../../web/templates/pages/edit_mail_acc.php:159
-#: ../../web/templates/pages/edit_mail_acc.php:163
-#: ../../web/templates/pages/edit_mail_acc.php:174
-#: ../../web/templates/pages/edit_mail_acc.php:178
-#: ../../web/templates/pages/edit_mail_acc.php:182
-#: ../../web/templates/pages/edit_mail_acc.php:193
-#: ../../web/templates/pages/edit_mail_acc.php:197
-#: ../../web/templates/pages/edit_mail_acc.php:201
+#: ../../web/templates/pages/edit_mail_acc.php:156
+#: ../../web/templates/pages/edit_mail_acc.php:160
+#: ../../web/templates/pages/edit_mail_acc.php:164
+#: ../../web/templates/pages/edit_mail_acc.php:175
+#: ../../web/templates/pages/edit_mail_acc.php:179
+#: ../../web/templates/pages/edit_mail_acc.php:183
+#: ../../web/templates/pages/edit_mail_acc.php:194
+#: ../../web/templates/pages/edit_mail_acc.php:198
+#: ../../web/templates/pages/edit_mail_acc.php:202
 #: ../../web/templates/pages/add_mail.php:107
 #: ../../web/templates/pages/edit_firewall.php:44
 #: ../../web/templates/pages/list_firewall.php:20
@@ -1410,28 +1410,28 @@ msgstr ""
 #: ../../web/templates/pages/add_mail_acc.php:153
 #: ../../web/templates/pages/add_mail_acc.php:172
 #: ../../web/templates/pages/add_mail_acc.php:191
-#: ../../web/templates/pages/edit_mail_acc.php:158
-#: ../../web/templates/pages/edit_mail_acc.php:177
-#: ../../web/templates/pages/edit_mail_acc.php:196
+#: ../../web/templates/pages/edit_mail_acc.php:159
+#: ../../web/templates/pages/edit_mail_acc.php:178
+#: ../../web/templates/pages/edit_mail_acc.php:197
 msgid "STARTTLS"
 msgstr ""
 
 #: ../../web/templates/pages/add_mail_acc.php:157
 #: ../../web/templates/pages/add_mail_acc.php:176
 #: ../../web/templates/pages/add_mail_acc.php:195
-#: ../../web/templates/pages/edit_mail_acc.php:162
-#: ../../web/templates/pages/edit_mail_acc.php:181
-#: ../../web/templates/pages/edit_mail_acc.php:200
+#: ../../web/templates/pages/edit_mail_acc.php:163
+#: ../../web/templates/pages/edit_mail_acc.php:182
+#: ../../web/templates/pages/edit_mail_acc.php:201
 msgid "No encryption"
 msgstr ""
 
 #: ../../web/templates/pages/add_mail_acc.php:161
-#: ../../web/templates/pages/edit_mail_acc.php:166
+#: ../../web/templates/pages/edit_mail_acc.php:167
 msgid "POP3 settings"
 msgstr ""
 
 #: ../../web/templates/pages/add_mail_acc.php:180
-#: ../../web/templates/pages/edit_mail_acc.php:185
+#: ../../web/templates/pages/edit_mail_acc.php:186
 msgid "SMTP settings"
 msgstr ""
 
@@ -1530,7 +1530,7 @@ msgid "Category"
 msgstr ""
 
 #: ../../web/templates/pages/list_log.php:65
-#: ../../web/templates/pages/edit_mail_acc.php:105
+#: ../../web/templates/pages/edit_mail_acc.php:114
 msgid "Message"
 msgstr ""
 
@@ -1822,7 +1822,7 @@ msgid "Forwarding"
 msgstr ""
 
 #: ../../web/templates/pages/list_mail_acc.php:75
-#: ../../web/templates/pages/edit_mail_acc.php:100
+#: ../../web/templates/pages/edit_mail_acc.php:109
 msgid "Autoreply"
 msgstr ""
 
@@ -2048,7 +2048,7 @@ msgstr ""
 msgid "View Public DNSSEC key"
 msgstr ""
 
-#: ../../web/templates/pages/list_dns.php:162
+#: ../../web/templates/pages/list_dns.php:166
 #, php-format
 msgid "%d DNS zone"
 msgid_plural "%d DNS zones"
@@ -2979,66 +2979,70 @@ msgstr ""
 msgid "ALIASES"
 msgstr ""
 
-#: ../../web/templates/pages/edit_web.php:243
+#: ../../web/templates/pages/edit_web.php:244
+msgid "Hide Certificate"
+msgstr ""
+
+#: ../../web/templates/pages/edit_web.php:247
 msgid "Show Certificate"
 msgstr ""
 
-#: ../../web/templates/pages/edit_web.php:277
+#: ../../web/templates/pages/edit_web.php:283
 msgid "Enable FastCGI Cache"
 msgstr ""
 
-#: ../../web/templates/pages/edit_web.php:286
+#: ../../web/templates/pages/edit_web.php:292
 msgid "Cache Duration"
 msgstr ""
 
-#: ../../web/templates/pages/edit_web.php:286
+#: ../../web/templates/pages/edit_web.php:292
 msgid "For example: 30s, 10m or 1d"
 msgstr ""
 
-#: ../../web/templates/pages/edit_web.php:319
+#: ../../web/templates/pages/edit_web.php:325
 msgid "Proxy Support"
 msgstr ""
 
-#: ../../web/templates/pages/edit_web.php:343
+#: ../../web/templates/pages/edit_web.php:349
 msgid "Proxy Extensions"
 msgstr ""
 
-#: ../../web/templates/pages/edit_web.php:352
+#: ../../web/templates/pages/edit_web.php:358
 msgid "Custom document root"
 msgstr ""
 
-#: ../../web/templates/pages/edit_web.php:357
+#: ../../web/templates/pages/edit_web.php:363
 msgid "Point to"
 msgstr ""
 
-#: ../../web/templates/pages/edit_web.php:370
+#: ../../web/templates/pages/edit_web.php:376
 #: ../../web/templates/pages/edit_server.php:729
 #: ../../web/templates/pages/edit_server.php:844
 #: ../../web/templates/pages/edit_server.php:908
 msgid "Directory"
 msgstr ""
 
-#: ../../web/templates/pages/edit_web.php:380
+#: ../../web/templates/pages/edit_web.php:386
 msgid "Additional FTP Account"
 msgstr ""
 
-#: ../../web/templates/pages/edit_web.php:402
-#: ../../web/templates/pages/edit_web.php:456
+#: ../../web/templates/pages/edit_web.php:408
+#: ../../web/templates/pages/edit_web.php:462
 #, php-format
 msgid "Prefix %s will be added to username automatically"
 msgstr ""
 
-#: ../../web/templates/pages/edit_web.php:416
-#: ../../web/templates/pages/edit_web.php:468
+#: ../../web/templates/pages/edit_web.php:422
+#: ../../web/templates/pages/edit_web.php:474
 msgid "Path"
 msgstr ""
 
-#: ../../web/templates/pages/edit_web.php:424
-#: ../../web/templates/pages/edit_web.php:474
+#: ../../web/templates/pages/edit_web.php:430
+#: ../../web/templates/pages/edit_web.php:480
 msgid "Send FTP credentials to email"
 msgstr ""
 
-#: ../../web/templates/pages/edit_web.php:434
+#: ../../web/templates/pages/edit_web.php:440
 msgid "Add one more FTP Account"
 msgstr ""
 
@@ -4424,8 +4428,8 @@ msgstr ""
 msgid "City"
 msgstr ""
 
-#: ../../web/generate/ssl/index.php:121 ../../web/inc/main.php:158
-#: ../../web/inc/main.php:167
+#: ../../web/generate/ssl/index.php:121 ../../web/inc/main.php:162
+#: ../../web/inc/main.php:171
 #, php-format
 msgid "Error code:"
 msgstr ""
@@ -4434,25 +4438,25 @@ msgstr ""
 msgid "SSL_GENERATED_OK"
 msgstr ""
 
-#: ../../web/inc/main.php:258 ../../web/inc/main.php:269
+#: ../../web/inc/main.php:262 ../../web/inc/main.php:273
 msgid "You have been logged out. Please log in again."
 msgstr ""
 
-#: ../../web/inc/main.php:331
+#: ../../web/inc/main.php:335
 #, php-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../web/inc/main.php:334
+#: ../../web/inc/main.php:338
 #, php-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../web/inc/main.php:338
+#: ../../web/inc/main.php:342
 #, php-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4463,7 +4467,7 @@ msgstr[1] ""
 msgid "Unable to add database! Limit reached!"
 msgstr ""
 
-#: ../../web/src/app/System/HestiaApp.php:216
+#: ../../web/src/app/System/HestiaApp.php:218
 msgid "Unable to add database!"
 msgstr ""
 

web/templates/pages/edit_mail.php

@@ -121,17 +121,17 @@
 							<?= _("SSL Certificate") ?>
 							<span x-cloak x-show="!letsEncryptEnabled" id="generate-csr" > / <a class="form-link" target="_blank" href="/generate/ssl/?domain=<?= htmlentities($v_domain) ?>"><?= _("Generate CSR") ?></a></span>
 						</label>
-						<textarea x-bind:disabled="!letsEncryptEnabled" class="form-control u-min-height100 u-console" name="v_ssl_crt" id="v_ssl_crt"><?= htmlentities(trim($v_ssl_crt, "'")) ?></textarea>
+						<textarea x-bind:disabled="letsEncryptEnabled" class="form-control u-min-height100 u-console" name="v_ssl_crt" id="v_ssl_crt"><?= htmlentities(trim($v_ssl_crt, "'")) ?></textarea>
 					</div>
 					<div class="u-mb10">
 						<label for="v_ssl_key" class="form-label"><?= _("SSL Key") ?></label>
-						<textarea x-bind:disabled="!letsEncryptEnabled" class="form-control u-min-height100 u-console" name="v_ssl_key" id="v_ssl_key"><?= htmlentities(trim($v_ssl_key, "'")) ?></textarea>
+						<textarea x-bind:disabled="letsEncryptEnabled" class="form-control u-min-height100 u-console" name="v_ssl_key" id="v_ssl_key"><?= htmlentities(trim($v_ssl_key, "'")) ?></textarea>
 					</div>
 					<div class="u-mb20">
 						<label for="v_ssl_ca" class="form-label">
 							<?= _("SSL Certificate Authority / Intermediate") ?> <span class="optional">(<?= _("optional") ?>)</span>
 						</label>
-						<textarea x-bind:disabled="!letsEncryptEnabled" class="form-control u-min-height100 u-console" name="v_ssl_ca" id="v_ssl_ca"><?= htmlentities(trim($v_ssl_ca, "'")) ?></textarea>
+						<textarea x-bind:disabled="letsEncryptEnabled" class="form-control u-min-height100 u-console" name="v_ssl_ca" id="v_ssl_ca"><?= htmlentities(trim($v_ssl_ca, "'")) ?></textarea>
 					</div>
 				</div>
 				<?php if ($v_ssl != "no") { ?>

web/templates/pages/edit_web.php

@@ -257,7 +257,11 @@
 							<span class="values-list-value"><?= $v_ssl_issuer ?></span>
 						</li>
 						<p x-cloak x-show="letsEncryptEnabled" id="letsinfo">
-							<button x-on:click="showCertificates = !showCertificates" type="button" class="form-link">
+							<button
+								type="button"
+								class="form-link"
+								x-on:click="showCertificates = !showCertificates"
+								x-text="showCertificates ? '<?= _("Hide Certificate") ?>' : '<?= _("Show Certificate") ?>'">
 								<?= _("Show Certificate") ?>
 							</button>
 						</p>

web/templates/pages/list_rrd.php

@@ -6,10 +6,10 @@
 			<a href="/list/server/?cpu" class="button button-secondary"><i class="fas fa-chart-pie icon-green"></i><?= _("show: CPU / MEM / NET / DISK") ?></a>
 		</div>
 		<div class="toolbar-right">
-			<a class="toolbar-link<?php if ((empty($period)) || ($period == 'day')) echo " selected" ?>" href="?period=day"><?= _("Daily") ?></a>
-			<a class="toolbar-link<?php if ((!empty($period)) && ($period == 'week')) echo " selected" ?>" href="?period=week"><?= _("Weekly") ?></a>
-			<a class="toolbar-link<?php if ((!empty($period)) && ($period == 'month')) echo " selected" ?>" href="?period=month"><?= _("Monthly") ?></a>
-			<a class="toolbar-link<?php if ((!empty($period)) && ($period == 'year')) echo " selected" ?>" href="?period=year"><?= _("Yearly") ?></a>
+			<a class="toolbar-link<?php if ((empty($period)) || ($period == 'day')) echo " selected" ?>" href="?period=daily"><?= _("Daily") ?></a>
+			<a class="toolbar-link<?php if ((!empty($period)) && ($period == 'week')) echo " selected" ?>" href="?period=weekly"><?= _("Weekly") ?></a>
+			<a class="toolbar-link<?php if ((!empty($period)) && ($period == 'month')) echo " selected" ?>" href="?period=monthly"><?= _("Monthly") ?></a>
+			<a class="toolbar-link<?php if ((!empty($period)) && ($period == 'year')) echo " selected" ?>" href="?period=yearly"><?= _("Yearly") ?></a>
 		</div>
 	</div>
 </div>