Fix some spelling (#3504)

CHANGELOG.md

@@ -112,7 +112,7 @@ All notable changes to this project will be documented in this file.
 - Improve restart behaviour v-update-letsencrypt-ssl (#3231)
 - Fix order of applied patches on upgrade (#3239)
 - Improve upgrade behaviour for Roundcube and Filegator (#3237 #3236)
-- Allow ClientName@domain.com for login via Dovecot/Email (#3024)
+- Allow <ClientName@domain.com> for login via Dovecot/Email (#3024)
 - Return a proper error code when unable to connect via API (#3235 #3169)
 - Synchronise $BIN and $HESTIA/BIN (#2185 @Steveorevo)
 - Block usage of unlimited backups (#3181)
@@ -161,7 +161,7 @@ All notable changes to this project will be documented in this file.
 ## Bugfixes
 
 - Improve firewall rules cleanup #3135 @myrevery
-- Reverted changes to v-add-web-php as php8.2-imagick is now availble
+- Reverted changes to v-add-web-php as php8.2-imagick is now available
 - Fixed an issue with editing timezone in when editing a server (#3127)
 - Fixed an issue with hostname during install
 - Fixed an issue with WordPress installer not working properly (#3129)
@@ -174,7 +174,7 @@ All notable changes to this project will be documented in this file.
 
 ### Bugfixes
 
-- Fix issue with php8.2-imagick not availble
+- Fix issue with php8.2-imagick not available
 - Fixed an issue with Letsnecrypt and no mail features enabled (#2930 #2931)
 
 ## [1.6.12] - Service release
@@ -414,7 +414,7 @@ A bug in v-update-sys-hestia caused auto update to be not working. Please run: `
 ## [1.6.2] - Service release
 
 - Fixed an issue with rate limits in Exim4 and make it more bullet proof (#2703)
-- Fixed an issue with system-filter not propperly loaded in Exim4 for Exim 4.94 and Ugrades from 1.5.x
+- Fixed an issue with system-filter not properly loaded in Exim4 for Exim 4.94 and Ugrades from 1.5.x
 
 ## [1.6.1] - Service release
 
@@ -871,7 +871,7 @@ After that run apt update && apt upgrade
 - Add small wait for /usr/bin/iptables-restore [Forum](https://forum.hestiacp.com/t/clean-install-arm64-does-not-start-after-reboot-v-start-service-iptables/4395/7) + Fixed v-add-firewall / v-delete-firewall function (#2112) @myrevery
 - Fix bug in v-change-sys-api. When using v-change-sys-api remove and then v-change-sys-api enable + custom release branch the resetting of api failed + no "error" output was producted
 - Improve error reporting PMA Single sign on function function
-- Fixed an issue in v-change-web-domain-name where webserserver where not able to start because old config files where not propperly deleted #2104
+- Fixed an issue in v-change-web-domain-name where webserserver where not able to start because old config files where not properly deleted #2104
 - Fixed potential XSS vulnerability in /list/keys/ @wtwwer [Disclosure](https://huntr.dev/bounties/0fefa2f6-7024-44c8-87c7-4d01fb93403e/)
 - Removed /edit/file as it has been replaced by Filegator and part of the old Vesta Filemanager
 - Fixed potential External control / path vulnerability in /add/package @wtwwer [Disclosure](https://huntr.dev/bounties/e0a2c6ff-b4fe-45a2-9d79-1f4dc1b381ab/)
@@ -905,7 +905,7 @@ After that run apt update && apt upgrade
 - Fix an issue with sorting the update scripts when version goes higher then 1.x.10
 - Allow the use of multiple CAA records for domain. #2073
 - Add missing group (www-data) to migrate_phpmyadmin script #2077 @bet0x
-- Fix an issue where news@domain.com get forwarded to /var/spool/news
+- Fix an issue where <news@domain.com> get forwarded to /var/spool/news
 - Synced up translations with HestiaCP (IT, PL, RU, SK and ZN-CN updated)
 
 ## [1.4.10] - Service release
@@ -1143,7 +1143,7 @@ apt update && apt upgrade
 - Fixed an issue where the api was enabled after an update of HestiaCP
 - Fixed an issue when the default php version got deleted webmail didn't work any more. #1477
 - Limit access when "demo" mode is enabled.
-- Fixed an issue where limitations on aliases didn't work propperly
+- Fixed an issue where limitations on aliases didn't work properly
 - Fixed an issue where "Exit to control pannel" link got changed to "Logout" #1669
 - Allow packages to be deleted when in use. Current users are changed to "Default" package.
 - Fixed multiple bugs with in v-restore-users
@@ -1217,7 +1217,7 @@ apt update && apt upgrade
 ### Bugfixes
 
 - Fixed an issue where updates for `hestia-php` were incorrectly being marked as out-of-date in the UI due to a change in our servicing and package versioning scheme.
-- Fixed an issue that occured on the Updates page where the table row color of available updates would be difficult to read.
+- Fixed an issue that occurred on the Updates page where the table row color of available updates would be difficult to read.
 - Fixed an issue where an administrator would get stuck in a loop trying to navigate back after adding a SSH key.
 - Fixed an issue where long table entries which exceeded the table length would overlap other UI elements.
 - Fixed an issue where the total amount of items on a page would fail to display correctly.
@@ -1322,7 +1322,7 @@ apt update && apt upgrade
 
 ### Bugfixes
 
-- Create mailhelo.conf if it doesnt exist to prevent a error message during grep.
+- Create mailhelo.conf if it doesn't exist to prevent a error message during grep.
 - Corrected the display of DNS record types to appear in alphabetical order.
 - Fixed an issue where the DNS record type field would reset if an error occurred while adding a new DNS record. (#992)
 - Fixed an issue where the DNS domain hint would not appear correctly when editing a DNS record. (#993)
@@ -1420,7 +1420,7 @@ apt update && apt upgrade
 - Fixed an issue where the backup update counter was not updated properly when v-delete-user-backup was executed.
 - Fixed an issue with public\_(s)html file ownership.
 - Fixed an issue with phpPgAdmin access.
-- Fixed an issue where the wrong port was set for www.conf on certain configurations.
+- Fixed an issue where the wrong port was set for <www.conf> on certain configurations.
 - Fixed an issue where Composer would fail to install.
 - Fixed an issue where the selected theme was not immediately applied.
 - Fixed an issue where HTTP-to-HTTPS redirection and HTTP Strict Transport Security (HSTS) events were not shown in the user history log.

CONTRIBUTING.md

@@ -8,7 +8,7 @@
 - **Code review and bug fixes**:
   - Read over the code and if you notice errors (even spelling mistakes), submit a pull request with your changes.
 - **New features**:
-  - Is there an awesome feature that you'd love to see included? Submit a pull request with your changes, and if approved your PR will be reviewed and merged for inclusion in an upcoming release. While our development team tries to accomodate all reasonable requests please remember that it does take time to develop, implement and test new features and as such we may not be able to fulfill all requests or may have to put a feature on backlog for a later date.
+  - Is there an awesome feature that you'd love to see included? Submit a pull request with your changes, and if approved your PR will be reviewed and merged for inclusion in an upcoming release. While our development team tries to accommodate all reasonable requests please remember that it does take time to develop, implement and test new features and as such we may not be able to fulfill all requests or may have to put a feature on backlog for a later date.
 - **Translations**:
   - If you are a non-English speaker and would like to improve the quality of the translations used in Hestia Control Panel's web interface, please go to [Hestia Translate](https://translate.hestiacp.com/projects/hestiacp/) to review the translations database. For more information please read [How to contribute with Translations](https://forum.hestiacp.com/t/how-to-contribute-with-translations/1664) on our forum. You can also open an issue report [GitHub](https://www.github.com/hestiacp/hestiacp/issues) highlighting the issue with the current translation so that it can be corrected.
 - **Donations**:

bin/v-add-backup-host

@@ -263,7 +263,7 @@ if [ "$type" = 'b2' ]; then
 			chmod +x $b2cli > /dev/null 2>&1
 		fi
 		if [ ! -f "$b2cli" ]; then
-			echo "Error: Binary download failed, b2 doesnt work as expected."
+			echo "Error: Binary download failed, b2 doesn't work as expected."
 			exit 3
 		fi
 	fi
@@ -271,7 +271,7 @@ if [ "$type" = 'b2' ]; then
 	# Validate b2 binary
 	b2version="$(b2 version)"
 	if [[ ! "$b2version" =~ "b2 command line tool" ]]; then
-		echo "Error: Binary download failed, b2 doesnt work as expected."
+		echo "Error: Binary download failed, b2 doesn't work as expected."
 		exit 3
 	fi
 

bin/v-add-firewall-ipset

@@ -119,7 +119,7 @@ if [ ! -f "${IPSET_PATH}/${IPSET_FILE}.iplist" ] || [ "$refresh" = "yes" ]; then
 	elif [[ "$data_source" =~ ^file:/ ]]; then
 
 		# Use a external ip-list file managed by other apps
-		# ex: Using a ip list that is continously updated
+		# ex: Using a ip list that is continuously updated
 		[ -f "${data_source#file:}" ] && cp -f "${data_source#file:}" "$iplist_tempfile"
 
 	fi

bin/v-add-letsencrypt-domain

@@ -623,7 +623,7 @@ send_notice 'LETSENCRYPT' "$domain SSL has been installed successfully"
 # Logging
 log_event "$OK" "$ARGUMENTS"
 
-# Cleanup debug since the SSL was issues succesfully
+# Cleanup debug since the SSL was issues successfully
 rm -f "$log_file"
 
 exit

bin/v-add-sys-pma-sso

@@ -108,7 +108,7 @@ fi
 #----------------------------------------------------------#
 
 if [ "$MODE" != "quiet" ]; then
-	echo "PMA Hestia-SSO plugin has been succesfully installed"
+	echo "PMA Hestia-SSO plugin has been successfully installed"
 fi
 $BIN/v-log-action "system" "Info" "Plugins" "phpMyAdmin Single Sign-On has been enabled."
 log_event "$OK" "$ARGUMENTS"

bin/v-add-user-2fa

@@ -45,7 +45,7 @@ if [ -n "$TWOFA" ]; then
 	exit "$E_EXISTS"
 fi
 
-# Get secret and qr code from 2fa libary
+# Get secret and qr code from 2fa library
 data=$($HESTIA_PHP $HESTIA/web/inc/2fa/secret.php)
 
 # Split to secret and qrcode using delimiter

bin/v-change-database-owner

@@ -36,7 +36,7 @@ is_system_enabled "$DB_SYSTEM" 'DB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 
-# Check owner existance
+# Check owner existence
 owner=$(echo $database | cut -f 1 -d '_')
 if [ ! -d "$HESTIA/data/users/$owner" ]; then
 	echo "Error: database owner doesn't exist"
@@ -49,7 +49,7 @@ if [ "$owner" = "$user" ]; then
 	exit
 fi
 
-# Check db existance
+# Check db existence
 db_data=$(grep "DB='$database'" $HESTIA/data/users/$owner/db.conf)
 if [ -z "$db_data" ]; then
 	echo "Error: database $database doesn't exist"

bin/v-change-domain-owner

@@ -75,7 +75,7 @@ if [ -n "$web_data" ]; then
 	fi
 
 	if [ -z "$(echo $(get_user_ips) | grep $IP)" ]; then
-		echo "[*] IP dedicated to $owner select new ip adress..."
+		echo "[*] IP dedicated to $owner select new ip address..."
 		get_user_ip
 	fi
 	old_ip=$IP

bin/v-change-user-package

@@ -23,7 +23,7 @@ source $HESTIA/func/main.sh
 # load config file
 source_conf "$HESTIA/conf/hestia.conf"
 
-is_package_avalable() {
+is_package_available() {
 
 	source_conf "$USER_DATA/user.conf"
 
@@ -155,7 +155,7 @@ is_format_valid 'user' 'package'
 is_object_valid 'user' 'USER' "$user"
 is_package_valid
 if [ "$force" != 'yes' ]; then
-	is_package_avalable
+	is_package_available
 fi
 
 # Perform verification if read-only mode is enabled

bin/v-change-web-domain-sslhome

@@ -5,7 +5,7 @@
 # example: v-change-web-domain-sslhome admin acme.com single
 # example: v-change-web-domain-sslhome admin acme.com same
 #
-# This function changes SSL home directory. Single will seperate the both public_html / public_shtml. Same will always point to public_shtml
+# This function changes SSL home directory. Single will separate the both public_html / public_shtml. Same will always point to public_shtml
 
 #----------------------------------------------------------#
 #                Variables & Functions                     #

bin/v-delete-sys-pma-sso

@@ -68,7 +68,7 @@ $BIN/v-change-sys-config-value 'PHPMYADMIN_KEY' ""
 #----------------------------------------------------------#
 
 if [ "$MODE" != "quiet" ]; then
-	echo "PMA Hestia-SSO plugin has been succesfully removed/disabled"
+	echo "PMA Hestia-SSO plugin has been successfully removed/disabled"
 fi
 
 # Logging

bin/v-list-sys-php

@@ -1,5 +1,5 @@
 #!/bin/bash
-# info: listing availble PHP versions installed
+# info: listing available PHP versions installed
 # options: [FORMAT]
 #
 # example: v-list-sys-php

bin/v-restore-user

@@ -224,7 +224,7 @@ if [ "$web" != 'no' ] && [ -n "$WEB_SYSTEM" ]; then
 		# Cleanup previous domain keys
 		unset -v DOMAIN IP IP6 ALIAS TPL SSL SSL_HOME LETSENCRYPT FTP_USER FTP_MD5 BACKEND PROXY PROXY_EXT STATS STATS_USER STATS_CRYPT U_DISK CUSTOM_DOCROOT CUSTOM_PHPROOT
 
-		# Checking domain existance
+		# Checking domain existence
 		check_config=$(grep "DOMAIN='$domain'" $USER_DATA/web.conf)
 		if [ -z "$check_config" ]; then
 			check_new=$(is_domain_new 'web' $domain)
@@ -433,7 +433,7 @@ if [ "$dns" != 'no' ] && [ -n "$DNS_SYSTEM" ]; then
 		# Cleanup previous config keys
 		unset -v DOMAIN IP TPL TTL EXP SOA RECORDS DNSSEC KEY SLAVE MASTER
 
-		# Checking domain existance
+		# Checking domain existence
 		check_config=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf)
 		if [ -z "$check_config" ]; then
 			check_new=$(is_domain_new 'dns' $domain)
@@ -540,7 +540,7 @@ if [ "$mail" != 'no' ] && [ -n "$MAIL_SYSTEM" ]; then
 	for domain in $domains; do
 		echo -e "$(date "+%F %T") $domain" | tee -a $tmpdir/restore.log
 
-		# Checking domain existance
+		# Checking domain existence
 		check_config=$(grep "DOMAIN='$domain'" $USER_DATA/mail.conf)
 		if [ -z "$check_config" ]; then
 			check_new=$(is_domain_new 'mail' $domain)
@@ -740,7 +740,7 @@ if [ "$db" != 'no' ] && [ -n "$DB_SYSTEM" ]; then
 		# Cleanup previous config keys
 		unset -v DB DBUSER MD5 HOST TYPE CHARSET U_DISK
 
-		# Checking database existance
+		# Checking database existence
 		check_config=$(grep "DB='$database'" $USER_DATA/db.conf)
 
 		# Unpacking database container

docs/docs/reference/cli.md

@@ -857,7 +857,7 @@ v-add-web-domain admin wonderland.com 192.18.22.43 yes www.wonderland.com
 
 This function adds virtual host to a server. In cases when ip is
 undefined in the script, "default" template will be used. The alias of
-www.domain.tld type will be automatically assigned to the domain unless
+<www.domain.tld> type will be automatically assigned to the domain unless
 "none" is transmited as argument. If ip have associated dns name, this
 domain will also get the alias domain-tpl.$ipname. An alias with the ip
 name is useful during the site testing while dns isn't moved to server yet.
@@ -2025,7 +2025,7 @@ v-change-web-domain-sslhome admin acme.com single
 example: v-change-web-domain-sslhome admin acme.com same
 ```
 
-This function changes SSL home directory. Single will seperate the both public_html / public_shtml. Same will always point to public_shtml
+This function changes SSL home directory. Single will separate the both public_html / public_shtml. Same will always point to public_shtml
 
 ## v-change-web-domain-stats
 
@@ -4150,7 +4150,7 @@ This function for obtaining the list of postgresql config parameters.
 
 ## v-list-sys-php
 
-listing availble PHP versions installed
+listing available PHP versions installed
 
 **Options**: `[FORMAT]`
 

docs/docs/server-administration/configuration.md

@@ -71,7 +71,7 @@ When a server IP changes, you need to run the following command, which will rebu
 v-update-sys-ip
 ```
 
-## Unable to bind adress
+## Unable to bind address
 
 In rare cases the network service might be slower than Apache2 and or Nginx. In that case, Nginx or Apache2 will refuse to successfully start. You can verify that this is the case by looking at the service’s status:
 

docs/docs/server-administration/web-templates.md

@@ -6,7 +6,7 @@
 Modifying templates could cause errors on the server and may cause some services to not be able to reload or start.
 :::
 
-Everytime you rebuild the user or domain, the config files of the domain are overwritten by the new templates.
+Every time you rebuild the user or domain, the config files of the domain are overwritten by the new templates.
 
 This happens when:
 

docs/docs/user-guide/web-domains.md

@@ -32,7 +32,7 @@ Depending on the application you chose to install, this can take 30 seconds or l
 
 1. Hover over the domain whose logs you want to view.
 2. Click the <i class="fas fa-fw fa-binoculars"><span class="visually-hidden">logs</span></i> icon.
-3. At the top of the page, you have the possiblity to download the logs or view the error logs instead.
+3. At the top of the page, you have the possibility to download the logs or view the error logs instead.
 
 ## Suspending a web domain
 

func/domain.sh

@@ -664,7 +664,7 @@ is_mail_domain_new() {
 	done
 }
 
-# Checking mail account existance
+# Checking mail account existence
 is_mail_new() {
 	check_acc=$(grep "ACCOUNT='$1'" $USER_DATA/mail/$domain.conf)
 	if [ -n "$check_acc" ]; then
@@ -915,7 +915,7 @@ del_webmail_ssl_config() {
 #                        CMN                               #
 #----------------------------------------------------------#
 
-# Checking domain existance
+# Checking domain existence
 is_domain_new() {
 	type=$1
 	for object in ${2//,/ }; do

func/upgrade.sh

@@ -540,7 +540,7 @@ upgrade_b2_tool() {
 			wget -O $b2cli $b2lnk > /dev/null 2>&1
 			chmod +x $b2cli > /dev/null 2>&1
 			if [ ! -f "$b2cli" ]; then
-				echo "Error: Binary download failed, b2 doesnt work as expected."
+				echo "Error: Binary download failed, b2 doesn't work as expected."
 				exit 3
 			fi
 		fi

install/deb/pga/config.inc.php

@@ -53,12 +53,12 @@ $conf["servers"][0]["slony_sql"] = "/usr/share/pgsql";
 //$conf['servers'][1]['slony_sql'] = 'C:\\Program Files\\PostgreSQL\\8.0\\share';
 
 // Example of groups definition.
-// Groups allow administrators to logicaly group servers together under group nodes in the left browser tree
+// Groups allow administrators to logically group servers together under group nodes in the left browser tree
 //
 // The group '0' description
 //$conf['srv_groups'][0]['desc'] = 'group one';
 //
-// Add here servers indexes belonging to the group '0' seperated by comma
+// Add here server indexes belonging to the group '0' separated by comma
 //$conf['srv_groups'][0]['servers'] = '0,1,2';
 //
 // A server can belong to multi groups

install/rpm/pga/config.inc.php

@@ -53,12 +53,12 @@ $conf["servers"][0]["slony_sql"] = "/usr/share/pgsql";
 //$conf['servers'][1]['slony_sql'] = 'C:\\Program Files\\PostgreSQL\\8.0\\share';
 
 // Example of groups definition.
-// Groups allow administrators to logicaly group servers together under group nodes in the left browser tree
+// Groups allow administrators to logically group servers together under group nodes in the left browser tree
 //
 // The group '0' description
 //$conf['srv_groups'][0]['desc'] = 'group one';
 //
-// Add here servers indexes belonging to the group '0' seperated by comma
+// Add here server indexes belonging to the group '0' separated by comma
 //$conf['srv_groups'][0]['servers'] = '0,1,2';
 //
 // A server can belong to multi groups

install/upgrade/versions/1.4.0.sh

@@ -169,7 +169,7 @@ rm -rf $HESTIA/data/templates/web/nginx/php-fpm/drupal8.*tpl
 rm -rf $HESTIA/data/templates/web/nginx/php-fpm/codeigniter2.*tpl
 rm -rf $HESTIA/data/templates/web/nginx/php-fpm/codeigniter3.*tpl
 
-# Clean up old Hestia controled webapps
+# Clean up old Hestia controlled webapps
 if [ -d "$HESTIA/web/images/webapps/" ]; then
 	echo "[ * ] Clean up old web apps code..."
 	rm -rf $HESTIA/web/images/webapps/

src/lxd_build_all.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# Script for preparing lxd enviorment and building Hestia packages for all supported distros
+# Script for preparing lxd environment and building Hestia packages for all supported distros
 # - Run with sudo, not directly as root!
 #
 # Arguments:

web/add/webapp/index.php

@@ -88,7 +88,7 @@ if (!empty($_POST["ok"]) && !empty($app)) {
 				}
 			} else {
 				$_SESSION["ok_msg"] = sprintf(
-					_("%s App was installed succesfully!"),
+					_("%s App was installed successfully!"),
 					htmlspecialchars($app),
 				);
 				header("Location: /add/webapp/?domain=" . $v_domain);

web/edit/package/index.php

@@ -304,7 +304,7 @@ if (!empty($_POST["save"])) {
 	fclose($fp);
 	unlink($tmpfile);
 
-	// Propogate new package
+	// Propagate new package
 	exec(HESTIA_CMD . "v-update-user-package " . $v_package . " 'json'", $output, $return_var);
 	check_return_code($return_var, $output);
 	unset($output);

web/locale/hestiacp.pot

@@ -4331,7 +4331,7 @@ msgstr ""
 
 #: ../../web/add/webapp/index.php:91
 #, php-format
-msgid "%s App was installed succesfully!"
+msgid "%s App was installed successfully!"
 msgstr ""
 
 #: ../../web/add/dns/index.php:194