Merge branch 'staging/fixes' into main

Author: Kristan Kenney

CHANGELOG.md

@@ -6,8 +6,16 @@ All notable changes to this project will be documented in this file.
 
 ### Bugfixes
 - Create mailhelo.conf if it doesnt exist to prevent a error message during grep.
- 
-## [1.2.1] - Service Release 1 (beta)
+- 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)
+- Fixed an issue where a DNS record would become malformed if changed from A to CNAME. (#988)
+- Fixed an issue with the back button on the DNS records page. (#989)
+- Fixed an issue where phpMyAdmin/phpPgAdmin would not load correctly due to an incorrect vhost configuration. (#970)
+- Fixed an issue where malformed JSON output was returned when custom theme files are present. (#967)
+- Fixed an error that would occur when running `v-change-user-php-cli` for the first time if .bash_aliases did not exist. (#960)
+
+## [1.2.1] - Service Release 1
 ### Features
 - Consolidated First and Last Name fields to a singular name field to simply input.
     - v-change-user-name will now accept both "First Last" (single argument) and First Last (two arguments) for backward compatibility.

bin/v-add-sys-filemanager

@@ -58,13 +58,17 @@ check_hestia_demo_mode
 line=$(grep "ID='$id'" $USER_DATA/dns/$domain.conf)
 parse_object_kv_list "$line"
 
+if [ -z $type ]; then
+    type=$TYPE
+fi
+
 # Null priority for none MX/SRV records
-if [ "$TYPE" != 'MX' ] && [ "$TYPE" != 'SRV' ]; then
+if [ "$type" != 'MX' ] && [ "$TYPE" != 'SRV' ]; then
     priority=''
 fi
 
 # Add trailing dot at the end of NS/CNAME/MX/PTR/SRV record
-if [[ $TYPE =~ NS|CNAME|MX|PTR|SRV ]]; then
+if [[ $type =~ NS|CNAME|MX|PTR|SRV ]]; then
     trailing_dot=$(echo $dvalue | grep "\.$")
     if [ -z $trailing_dot ]; then
         dvalue="$dvalue."

bin/v-change-dns-record

@@ -68,7 +68,7 @@ else
     $BIN/v-delete-mail-domain-ssl $user $domain $restart >/dev/null 2>&1
 fi
 cmdstatus="$?"
-if [ "$cmdstatus" -ne E_NOTEXIST ]; then
+if [ "$cmdstatus" -ne "$E_NOTEXIST" ]; then
     check_result "$cmdstatus" "SSL delete" >/dev/null
 fi
 

bin/v-change-sys-db-alias

@@ -109,7 +109,7 @@ else
 fi
 
 if [ ! -z "$2" ]; then
-    branch_check=$(curl -s --head -w %{http_code} https://raw.githubusercontent.com/hestiacp/hestiacp/$branch/src/deb/hestia/control -o /dev/null)
+    branch_check=$(curl -s --head -w %{http_code} https://raw.githubusercontent.com/$fork/hestiacp/$branch/src/deb/hestia/control -o /dev/null)
     if [ $branch_check -ne "200" ]; then
         echo "ERROR: invalid branch name specified."
         exit 1

bin/v-delete-letsencrypt-domain

@@ -528,13 +528,13 @@ rebuild_mail_domain_conf() {
         if [ ! -z "$local_ip" ]; then
             IP_RDNS=$(is_ip_rdns_valid "$local_ip")
             if [ ! -z "$IP_RDNS" ]; then
-                if [ $(grep -s "^${domain}:" /etc/exim4/mailhelo.conf) ]; then
+                if [ -f /etc/exim4/mailhelo.conf ] && [ $(grep -s "^${domain}:" /etc/exim4/mailhelo.conf) ]; then
                     sed -i "/^${domain}:/c\\${domain}:${IP_RDNS}" /etc/exim4/mailhelo.conf
                 else
                     echo ${domain}:${IP_RDNS} >> /etc/exim4/mailhelo.conf
                 fi
             else
-                sed -i "/^${domain}:/d" /etc/exim4/mailhelo.conf
+                sed -i "/^${domain}:/d" /etc/exim4/mailhelo.conf >/dev/null 2>&1
             fi
         fi
 

bin/v-delete-sys-filemanager

@@ -149,7 +149,13 @@ upgrade_init_backup() {
         fi
     fi
     if [ ! -z "$FTP_SYSTEM" ]; then
-        cp -f /etc/$FTP_SYSTEM.conf $HESTIA_BACKUP/conf/$FTP_SYSTEM/
+        if [ "$FTP_SYSTEM" = "vsftpd" ]; then
+            cp -f /etc/$FTP_SYSTEM.conf $HESTIA_BACKUP/conf/$FTP_SYSTEM/
+        fi
+
+        if [ "$FTP_SYSTEM" = "proftpd" ]; then
+            cp -f /etc/proftpd/proftpd.conf $HESTIA_BACKUP/conf/$FTP_SYSTEM/
+        fi
     fi
     if [ ! -z "$FIREWALL_EXTENSION" ]; then
         cp -f /etc/$FIREWALL_EXTENSION/*.conf $HESTIA_BACKUP/conf/$FIREWALL_EXTENSION/