Trim all whitespace (hestiacp#3038)

Author: AlecRust

.drone.yml

@@ -1,23 +1,23 @@
 ---
 kind: pipeline
 type: ssh
-name: Ubuntu | Nginx + Apache2  
+name: Ubuntu | Nginx + Apache2
 
 concurrency:
   limit: 1
 
 server:
   host:
     from_secret: server_address
-  user: 
+  user:
     from_secret: username
-  ssh_key: 
+  ssh_key:
     from_secret: ssh_key
 
 platform:
   os: linux
   arch: amd64
-   
+
 steps:
 - name: Download submodules
   image: alpine/git
@@ -32,7 +32,7 @@ steps:
 - name: Run restore tests
   commands:
   - bats ./test/restore.bats
-- name: Run config tests 
+- name: Run config tests
   commands:
   - bats ./test/config-tests.bats
 
@@ -48,23 +48,23 @@ trigger:
 ---
 kind: pipeline
 type: ssh
-name: Debian | Nginx  
+name: Debian | Nginx
 
 concurrency:
   limit: 1
 
 server:
   host:
     from_secret: server_address2
-  user: 
+  user:
     from_secret: username
-  ssh_key: 
+  ssh_key:
     from_secret: ssh_key
 
 platform:
   os: linux
   arch: amd64
-   
+
 steps:
 - name: Download submodules
   image: alpine/git
@@ -83,10 +83,10 @@ steps:
   commands:
   - cp /root/le-env.sh /tmp/hestia-le-env.sh
   - bats ./test/letsencrypt.bats
-- name: Run config tests 
+- name: Run config tests
   commands:
   - bats ./test/config-tests.bats
-  
+
 trigger:
   event: [ pull_request, push ]
   ref:
@@ -161,9 +161,9 @@ steps:
             - freight-add ./hestia/*.deb apt/bionic apt/focal apt/jammy apt/stretch apt/buster apt/bullseye
             - freight-cache
             - rm -fr ./hestia/
-  
+
 trigger:
-    event: [ promote] 
+    event: [ promote]
 
 ---
 kind: signature

CONTRIBUTING.md

@@ -9,7 +9,7 @@ Ways to contribute
 - **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 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.
 - **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**:
@@ -25,7 +25,7 @@ Development for this project takes place in branches to effectively develop, man
 
 We have three primary or "evergreen" branches, which exist throughout our product's lifetime. Please refer to the following table for a description:
 
-| Branch        | Description     
+| Branch        | Description
 |---------------|:---------------:|
 | `main`        | Contains a snapshot of the latest development code.<br>**Not intended for production use and contains code from a merge snapshot.**
 | `beta`        | Contains a snapshot of the next version which is currently in testing.<br>**Not intended for production use, however code from this branch should be stable.**
@@ -48,7 +48,7 @@ Branch name examples:
 * `test/mail-domain-ssl`
 
 ### Squashing commits for smaller changes
-To aid other developers and keep the project's commit history clean, please **squash your commits** when it's appropriate. For example with smaller commits related to the same piece of code, such as commits labelled "Fixed item 1", "Adjusted color of button XYZ", "Adjusted alignment of button XYZ" can be squashed into one commit with the title "Fixed button issues in item". 
+To aid other developers and keep the project's commit history clean, please **squash your commits** when it's appropriate. For example with smaller commits related to the same piece of code, such as commits labelled "Fixed item 1", "Adjusted color of button XYZ", "Adjusted alignment of button XYZ" can be squashed into one commit with the title "Fixed button issues in item".
 
 ### What happens when I submit a pull request?
 - Our internal development team will review your work and validate your request.

SECURITY.md

@@ -11,7 +11,7 @@ If you are unable to use [Huntr.dev](https://huntr.dev/bounties/disclose/?target
 
 We ask you to include a detailed description of the vulnerability, a list of services involved (e.g. exim, dovecot) and the versions which you've tested, full steps to reproduce the vulnerability, and include your findings and expected results.
 
-Please do not open any public issue on Github or any other social media before the report has been published and a fix has been released. 
+Please do not open any public issue on Github or any other social media before the report has been published and a fix has been released.
 
 With that, good luck hacking us ;)
 

bin/v-add-backup-host

@@ -5,7 +5,7 @@
 # example: v-add-backup-host sftp backup.acme.com admin p4$$w@Rd
 #          v-add-backup-host b2 bucketName keyID applicationKey
 #
-# Add a new remote backup location. Currently SFTP, FTP and Backblaze are supported 
+# Add a new remote backup location. Currently SFTP, FTP and Backblaze are supported
 
 #----------------------------------------------------------#
 #                Variables & Functions                     #
@@ -50,7 +50,7 @@ EOF
 
 # Defining sftp command function
 sftpc() {
-    if [ "$privatekey" != "yes" ]; then 
+    if [ "$privatekey" != "yes" ]; then
     expect -f "-" <<EOF "$@"
         set count 0
         spawn /usr/bin/sftp -o StrictHostKeyChecking=no -o Port=$port $user@$host
@@ -109,19 +109,19 @@ else
             set count 0
             spawn /usr/bin/sftp -o StrictHostKeyChecking=no -o Port=$port -i $raw_password $user@$host
             expect {
-    
+
                 -re "Couldn't|(.*)disconnect|(.*)stalled|(.*)not found" {
                     set count \$argc
                     set output "Disconnected."
                     set rc $E_FTP
                     exp_continue
                 }
-    
+
                 -re ".*denied.*(publickey|password)." {
                     set output "Permission denied, wrong publickey or password."
                     set rc $E_CONNECT
                 }
-    
+
                 "sftp>" {
                     if {\$count < \$argc} {
                         set arg [lindex \$argv \$count]
@@ -136,17 +136,17 @@ else
                     }
                     exp_continue
                 }
-    
+
                 timeout {
                     set output "Connection timeout."
                     set rc $E_CONNECT
                 }
             }
-    
+
             if {[info exists output] == 1} {
                 puts "\$output"
             }
-    
+
             exit \$rc
 EOF
     fi
@@ -167,13 +167,13 @@ if [ "$type" != 'local' ];then
             privatekey="yes"
             password="$raw_password"
         else
-            is_password_valid    
-        fi   
+            is_password_valid
+        fi
     else
         is_password_valid
     fi
     format_no_quotes "$password" "password"
-    
+
     if [ "$type" = 'sftp' ]; then
         which expect >/dev/null 2>&1
         check_result $? "expect command not found"  "$E_NOTEXIST"
@@ -273,11 +273,11 @@ if [ "$type" = 'b2' ]; then
         echo "Error: Binary download failed, b2 doesnt work as expected."
         exit 3
     fi
-    
+
     b2 clear-account > /dev/null 2>&1
     b2 authorize-account "$user" "$raw_password"> /dev/null 2>&1
     b2 ls --long "$host" "$user" > /dev/null 2>&1
-    
+
     if [ $? -ne 0 ]; then
         check_result "$E_CONNECT" "b2 failed to verify connection"
     fi
@@ -286,7 +286,7 @@ fi
 if [ "$type" = 'rclone' ]; then
     curl -s https://rclone.org/install.sh | bash /dev/null > /dev/null 2>&1
     # Verify account exists
-    if [ ! -z "$(cat /root/.config/rclone/rclone.conf | grep "\[$host\]")" ]; then 
+    if [ ! -z "$(cat /root/.config/rclone/rclone.conf | grep "\[$host\]")" ]; then
         echo "test" > /tmp/hestia-backup.txt
         # Try to upload a single file
         if [ -z "$path" ]; then

bin/v-add-database

@@ -38,7 +38,7 @@ source_conf "$HESTIA/conf/hestia.conf"
 
 if [ "$type" = "pgsql" ]; then
    database=$(echo "$user"_"$2" | tr '[:upper:]' '[:lower:]');
-   dbuser=$(echo "$user"_"$3" | tr '[:upper:]' '[:lower:]'); 
+   dbuser=$(echo "$user"_"$3" | tr '[:upper:]' '[:lower:]');
 fi
 
 #----------------------------------------------------------#
@@ -60,7 +60,7 @@ is_object_unsuspended "../../../conf/$type" 'DBHOST' "$host"
 is_package_full 'DATABASES'
 is_password_valid
 
-if [ "$type" = "pgsql" ]; then 
+if [ "$type" = "pgsql" ]; then
    exclude="-"
     if [[ "$dbuser" =~ $exclude ]]; then
         check_result "$E_INVALID" "invalid database user format"

bin/v-add-database-host

@@ -41,11 +41,11 @@ is_mysql_host_alive() {
     echo "user='$dbuser'" >> $mycnf
     echo "password='$password'" >> $mycnf
     echo "port='$port'" >> $mycnf
-    
+
     chmod 600 $mycnf
     mysql --defaults-file=$mycnf -e 'SELECT VERSION()' >/dev/null 2>&1
     rm $mycnf
-    
+
     if [ "$?" -ne '0' ]; then
         echo "Error: MySQL connection to $host failed"
         log_event "$E_CONNECT" "$ARGUMENTS"

bin/v-add-database-temp-user

@@ -4,8 +4,8 @@
 #
 # example: v-add-database-temp-user wordress wordpress_db mysql
 #
-# This function creates an temporary database user mysql_sso_db_XXXXXXXX and a random password 
-# The user has an limited validity and only granted access to the specific database 
+# This function creates an temporary database user mysql_sso_db_XXXXXXXX and a random password
+# The user has an limited validity and only granted access to the specific database
 # Returns json to be read SSO Script
 
 #----------------------------------------------------------#
@@ -57,7 +57,7 @@ check_hestia_demo_mode
 # Get database values
 get_database_values
 
-#generate password and unique user 
+#generate password and unique user
 dbpass=$(generate_password);
 dbuser="hestia_sso_$(generate_password)";
 

bin/v-add-dns-domain

@@ -65,11 +65,11 @@ else
     is_domain_new 'dns' "$domain"
 fi
 if [ -z "$(is_ip_format_valid $domain)" ]; then
-    echo "Error: Invalid domain format. IP address detected as input." 
+    echo "Error: Invalid domain format. IP address detected as input."
     exit 1
 fi
 
-if [ -n "$restart" ]; then 
+if [ -n "$restart" ]; then
     is_format_valid 'restart'
 fi
 

bin/v-add-dns-record

@@ -66,12 +66,12 @@ fi
 # - [SRV] will be  stripped of double quotes even when  containing spaces
 # - [DNSKEY] will be  stripped of double quotes even when  containing spaces
 # - Rest of record types will be striped of quotes and the final string
-#   will be enclosed in double quotes if containing spaces or semicolons 
+#   will be enclosed in double quotes if containing spaces or semicolons
 
 if [ "$rtype" != "CAA" ]; then
     dvalue=${dvalue//\"/}
     # Add support for DS key
-    if [ "$rtype" != "DNSKEY" ] && [ "$rtype" != "DS" ] ; then 
+    if [ "$rtype" != "DNSKEY" ] && [ "$rtype" != "DS" ] ; then
         if [ "$rtype" != 'SRV' ] && [[ "$dvalue" =~ [\;[:space:]] ]]; then
             dvalue='"'"$dvalue"'"'
         fi

bin/v-add-fastcgi-cache

@@ -80,8 +80,8 @@ EOF
 chown root:$user $fastcgi
 chmod 640 $fastcgi
 
-str="fastcgi_cache_path /var/cache/nginx/micro/$domain levels=1:2" 
-str="$str keys_zone=$domain:10m max_size=512m inactive=30m use_temp_path=off;" 
+str="fastcgi_cache_path /var/cache/nginx/micro/$domain levels=1:2"
+str="$str keys_zone=$domain:10m max_size=512m inactive=30m use_temp_path=off;"
 conf='/etc/nginx/conf.d/fastcgi_cache_pool.conf'
 if [ -f "$conf" ]; then
     if [ -z "$(grep "=${domain}:" $conf)" ]; then