Merge branch 'staging/fixes' into main

Author: ScIT-Raphael

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: ["https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ST87LQH2CHGLA"]

CHANGELOG.md

@@ -2,6 +2,31 @@
 All notable changes to this project will be documented in this file.
 
 ## [CURRENT] - Development
+### Features
+
+### Bugfixes
+- Create mailhelo.conf if it doesnt exist to prevent a error message during grep.
+ 
+## [1.2.1] - Service Release 1 (beta)
+### 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.
+- Removed ntpdate from new installations and enable systemd timesync daemon instead (thanks **@braewoods**)
+
+### Bugfixes
+- Fixed an issue where Composer would fail to install due to missing default directory.
+- Corrected an issue where two-factor authentication validation was causing high CPU load during the login process. The login screen has been re-designed as a multi-step process (Username > Password > OTP PIN).
+- Corrected an issue where text entry fields on the login screen were not automatically focused by default.
+- Fixed an issue where RDNS value was incorrectly set if dig failed to resolve the server name.
+- Fixed an issue where icons were pushed down in the header when using Bulgarian as the display language. (#932)
+- Fixed an issue where new backups were not created when running v-schedule-user-backup-download. (#918)
+- Fixed an issue where default configuration files and templates were not backed up correctly.
+- Improved quality of default web domain templates for Drupal. (#916)
+- Added missing strings to translation files (translations to follow).
+- Corrected an issue where toolbars were out of place on the Mail and Firewall pages when using Bulgarian or Greek languages due to string length.
+- Improved Spanish translations (thanks **@Wibol**)
+- Improved German translations (thanks **@ronald-at**)
+- Improved Russian translations (thanks **@Pleskan**)
 
 ## [1.2.0] - Major Release (Feature / Quality Update)
 ### Features

CONTRIBUTING.md

@@ -1,47 +1,106 @@
-Code Contributions & Pull Requests - Guidelines
+Hestia Control Panel - Contribution Guidelines
 -----------------------
 
-All pull requests must include a brief but descriptive title, and a description of the changes that you've made with as much detail as possible. **Only include commits that are related to your feature, bug fix, or patch in your pull request.**
-
-## Code formatting and comments:
+Ways to contribute
+-----------------------
+- **Beta testing**:
+    - Download and install builds from the `beta` branch. Provide feedback to our developers and file any issues that you come across on [GitHub](https://www.github.com/hestiacp/hestiacp/issues).<br>
+    `v-update-sys-hestia-git hestiacp beta install` will install the latest beta build from our GitHub repository.
+- **Code review and bug fixes**:
+    - Read over the code and if you notice errors (even spelling mistakes), submit a pull request with your fixes.
+- **New features**:
+    - Is there an awesome feature that you'd love to see included? While our development team tries to fulfill all reasonable requests, it can take time to implement new features depending on the amount of work involved. Submit a pull request with your code and if your idea is approved, we'll review and test it for inclusion with an upcoming release.
+- **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 review the `.php` files found under `hestiacp/web/inc/i18n` and submit a pull request or 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**:
+    - If you're not a developer but you still want to make a contribution, you can make a donation to the Hestia Control Panel project to further its development (or if you'd just like to buy our developers a lunch, we'd appreciate that too). We currently accept dontations through [PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ST87LQH2CHGLA).
+
+Development Guidelines
+-----------------------
+### Code formatting and comments
 We ask that you follow existing naming schemes and coding conventions where possible, and that you add comments in your source code where appropriate to aid other developers in debugging and understanding your code in the future.
 
-## Squashing commits for smaller changes:
-When submitting a pull request with multiple smaller commits which are related to the same issue (or file), we ask that you please **squash your commits** in order to keep the project's commit history clean and easy to follow for other developers.
-
-## Working with branches:
-Development for this project takes place in branches to effectively develop, manage, and test new features and code changes, helping to ensure that each release meets high quality standards. Our primary branches are as follows:
+### Workflow and process
+Development for this project takes place in branches to effectively develop, manage, and test new features and code changes. Our tiered approach allows us to closely control the quality of code as it is checked in for inclusion.
 
-### Primary branches:
+We have three primary or "evergreen" branches, which exist throughout our product's lifetime. Please refer to the following table for a description:
 
-* `develop`: Active development code for the the next version of Hestia Control Panel, considered to be unstable.
-* `beta`: Feature locked code for the next release, which receives fixes only and goes through feedback and testing.
-* `release`: Code in this branch aligns with the latest packages available on our APT repositories.
+| Branch        | Description     | Cycle           |
+|---------------|:---------------:|:---------------:|
+| `main`        | Contains a snapshot of the latest development code.<br>**Not intended for production use and may be unstable.** | Daily  |
+| `beta`        | Contains a snapshot of the next version which is currently in testing.<br>**Not intended for production but should be highly stable.**  | Weekly |
+| `release`     | Contains a snapshot of the latest stable release.<br>**Intended for production use. Same code as packages in repository.** | Monthly |
 
-### I want to contribute some code to Hestia Control Panel, where do I start?
+### Creating a new branch and submitting pull requests
+The first step is to create a fork of the `hestiacp/hestiacp` repository under your account so that you may submit pull requests and patches via GitHub. 
 
-First, create a new branch for your work based on the `develop` branch to ensure that you have the latest commits in your local repository, which will help make sure that your pull requests only contain the commits that are necessary. 
+Once you've created your fork, clone the repository to your computer and make sure that you've checked out the `main` branch. **Always** create a new topic branch for you work. When submitting pull requests it is important that you target the correct branch to ensure that your changes are properly integrated and tested based on our release schedule. When creating a new branch, we ask that you please adhere to the following naming conventions as much as possible:
 
-When creating your branches, **please adhere to the following naming conventions:**
-
-- **Prefix:** `bugfix/` or `feature/` based on the type of submission.
+### Branch naming convention:
+- **Prefix:** `topic/` (such as **bugfix**, **feature**, **refactor**, etc.)
 - **ID**: `888` (GitHub Issue ID if an issue exists) -or- `2020-07` (Year-Month if an issue does not already exist)
 - **Separator:** `_` (underscore)
 - **Title:** `my-awesome-patch`
 
 Branch name examples:
 * `feature/777_my-awesome-new-feature` or `feature/2020-07_my-other-new-feature`
-* `bugfix/000_some-bug-fix` or `bugfix/2020-07_this-feature-is-broken`
+* `fix/000_some-bug-fix` or `fix/2020-07_this-feature-is-broken`
+* `refactor/2020-07_v-change-domain-owner`
+* `test/2020-07_mail-domain-ssl`
 
-Once your code is complete and you have reviewed it for errors, submit a pull request to the correct integration branch:
+### Squashing commits for smaller changes
+When submitting a pull request with multiple smaller commits which are related to the same file or issue, we ask that you please **squash your commits** whenever appropriate in order to keep the project's commit history clean and easy to follow for other developers.
 
-* `staging/fixes`: bugfix/ branches will merge to this branch when they have been tested/verified.
-* `staging/features`: feature/ branches will merge to this branch when they have been tested/verified.
+### What happens when I submit a pull request?
+- Our internal development team will review your work and validate your request.
+- Your changes will be tested to ensure that there are no issues.
+- If changes need to be made, you will be notified via GitHub.
+- Once approved, your code will be merged to the appropriate `staging/*` branch based on the chart below:
 
-All `staging` branches will integrate to `develop` to form the next release of Hestia Control Panel. Once all features and fixes planned for the release are merged, the code will then be pushed to the `beta` branch where it is feature locked, assigned a version number, and will receive thorough testing before being pushed to the `release` branch with new packages being pushed to APT.
+All pull requests must include a brief but descriptive title, and a description of the changes that you've made with as much detail as possible. **Only include commits that are related to your feature, bug fix, or patch in your pull request.**
 
-**Please ensure that all pull requests meet the guidelines listed above; those that do not will be rejected and sent back for review.**
+| Topic branches:              | Primary Target:             | Final destination:                    | 
+| -----------------------------|:---------------------------:|:-------------------------------------:|
+| **`feature/*`**              | `staging/features`          | `main`                                |
+| **`fix/*`**                  | `staging/fixes`             | `main` **and** `beta` *or* `release`  |
+| **`refactor/*`**             | `staging/refactoring`       | `main`                                |
+| **`test/*`**                 | `staging/tests`             | `main`                                |
+| **`doc/*`**                  | `staging/docs`              | `main`, `beta`, *or* `release`        |
 
-Donations
+Our development and release cycles
 -----------------------
-If you would like to make a donation to the Hestia Control Panel project to further its development (or if you'd like to buy our developers a lunch), please feel free to do so via [PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ST87LQH2CHGLA).
+### During the development cycle:
+- `topic/*` branches are submitted to our team via a pull request. Your changes will be reviewed and tested, and if all appropriate quality assurance checks pass the branch will be merged to the corresponding `staging/*` branch.
+
+- `staging/*` branches merge into `main` at various intervals throughout the development process.
+
+- When all planned features and fixes have been merged to `main`, the code is tested for regressions and bugs.
+
+- A snapshot of `main` is pushed to a temporary branch called `staging/refactoring`, and final code review, refactoring, and optimization takes place. Once complete, `staging/refactoring` merges back to `main` bringing the codebase up-to-date. All other `staging/*` branches synchronize with `main` at this time.
+
+- After final validation checks pass, our development team signs off on the release and the code is pushed from `main` to `beta`.
+
+### During the release cycle:
+- **What happens when code moves from `main` to `beta`**:<br>
+    - **No new feature requests will be approved**.
+    - `main` will receive an increment in it's version number signaling the start of a new development cycle.
+    - `fix/*` topic branches/commits will be cherry picked to `beta` as necessary.
+    - `staging/docs` will merge into `beta` prior to the code being pushed to `release` to bring documentation and supporting files up-to-date.
+
+- If all quality assurance checks pass, our development team will then:
+    - Sign off on the code in `beta`.
+    - Push the code to the `release` branch and create a corresponding version tag.
+    - Compile new packages and publish them to our APT repository. 
+    - **Notes:**
+        - `release` always contains the highest released version of Hestia Control Panel.
+        - For major releases, a `release/vX.x` branch will be created for maintenance and servicing purposes.
+
+
+
+
+Thank you!
+-----------------------
+We appreciate **all** contributions no matter what size; your feedback and input directly shapes the future of Hestia Control Panel and we could not do it without your support.
+
+Thank you for your time and we look forward to seeing your pull requests,<br>
+The Hestia Control Panel development team

README.md

@@ -3,6 +3,8 @@
 [Hestia Control Panel](https://www.hestiacp.com/)
 ==================================================
 **Latest stable release:** Version 1.2.0 | [View Changelog](https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md)<br>
+**Latest beta release:** Version 1.2.1 | [View Changelog](https://github.com/hestiacp/hestiacp/blob/beta/CHANGELOG.md)<br>
+**Latest unstable development snapshot:** Version 1.2.2 | [View Changelog](https://github.com/hestiacp/hestiacp/blob/main/CHANGELOG.md)<br>
 
 **Web:** [www.hestiacp.com](https://www.hestiacp.com/)<br>
 **Documentation:** [docs.hestiacp.com](https://docs.hestiacp.com/)<br>

bin/v-add-cron-hestia-autoupdate

@@ -44,9 +44,6 @@ time_n_date=$(date +'%T %F')
 time=$(echo "$time_n_date" |cut -f 1 -d \ )
 date=$(echo "$time_n_date" |cut -f 2 -d \ )
 
-# Remove existing cron job
-$BIN/v-delete-cron-hestia-autoupdate
-
 # Define time somewhere at night
 if [ -z "$mode" ] || [ "$mode" = "apt" ]; then
     min=$(generate_password '012345' '2')
@@ -82,9 +79,6 @@ sort_cron_jobs
 # Sync cronjobs with system crond
 sync_cron_jobs
 
-# Perform verification if read-only mode is enabled
-check_hestia_demo_mode
-
 #----------------------------------------------------------#
 #                       Hestia                             #
 #----------------------------------------------------------#
@@ -97,7 +91,7 @@ $BIN/v-restart-cron
 check_result $? "Cron restart failed" >/dev/null
 
 # Logging
-log_history "added cron job $job"
+log_history "enabled automatic updates"
 log_event "$OK" "$ARGUMENTS"
 
 exit

bin/v-add-database-host

@@ -18,9 +18,10 @@ type=$1
 host=$2
 dbuser=$3
 password=$4; HIDE=4
-max_db=${6-500}
-charsets=${7-UTF8,LATIN1,WIN1250,WIN1251,WIN1252,WIN1256,WIN1258,KOI8}
-template=${8-template1}
+max_db=${5-500}
+charsets=${6}
+template=${7}
+port=${8}
 
 # Includes
 source $HESTIA/func/main.sh
@@ -33,6 +34,8 @@ is_mysql_host_alive() {
     echo "host='$HOST'" >> $mycnf
     echo "user='$USER'" >> $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
@@ -45,7 +48,7 @@ is_mysql_host_alive() {
 
 is_pgsql_host_alive() {
     export PGPASSWORD="$dbpass"
-    psql -h $host -U $dbuser -c "SELECT VERSION()" > /dev/null 2>&1
+    psql -h $host -U $dbuser -p $port -c "SELECT VERSION()" > /dev/null 2>&1
     if [ '0' -ne "$?" ]; then
         echo "Error: PostgreSQL connection to $host failed"
         log_event "$E_CONNECT" "$ARGUMENTS"
@@ -58,14 +61,21 @@ is_pgsql_host_alive() {
 #                    Verifications                         #
 #----------------------------------------------------------#
 
-args_usage='TYPE HOST DBUSER DBPASS [MAX_DB] [CHARSETS] [TPL]'
+args_usage='TYPE HOST DBUSER DBPASS [MAX_DB] [CHARSETS] [TPL] [PORT]'
 check_args '4' "$#" "$args_usage"
-is_format_valid 'host' 'dbuser' 'max_db' 'charsets' 'template'
+
+if [ -z $charsets ]; then charsets="UTF8,LATIN1,WIN1250,WIN1251,WIN1252,WIN1256,WIN1258,KOI8"; fi
+if [ -z $template ]; then template="template1"; fi
+
+database_set_default_ports
+
+is_format_valid 'host' 'dbuser' 'max_db' 'charsets' 'template' 'port'
 #is_system_enabled "$DB_SYSTEM" 'DB_SYSTEM'
 #is_type_valid "$DB_SYSTEM" "$type"
 is_dbhost_new
 is_password_valid
 dbpass="$password"
+
 case $type in
     mysql) is_mysql_host_alive ;;
     pgsql) is_pgsql_host_alive ;;
@@ -85,11 +95,11 @@ date=$(echo "$time_n_date" |cut -f 2 -d \ )
 case $type in
     mysql) str="HOST='$host' USER='$dbuser' PASSWORD='$dbpass'";
            str="$str CHARSETS='$charsets' MAX_DB='$max_db' U_SYS_USERS=''";
-           str="$str U_DB_BASES='0' SUSPENDED='no' TIME='$time' DATE='$date'";;
+           str="$str U_DB_BASES='0' SUSPENDED='no' TIME='$time' DATE='$date' PORT='$port'";;
     pgsql) str="HOST='$host' USER='$dbuser' PASSWORD='$dbpass'";
            str="$str CHARSETS='$charsets' TPL='$template' MAX_DB='$max_db'";
            str="$str U_SYS_USERS='' U_DB_BASES='0' SUSPENDED='no'";
-           str="$str TIME='$time' DATE='$date'";;
+           str="$str TIME='$time' DATE='$date' PORT='$port'";;
 esac
 
 

bin/v-add-mail-domain

@@ -101,6 +101,11 @@ if [[ "$MAIL_SYSTEM" =~ exim ]]; then
         echo "$local_ip" > $HOMEDIR/$user/conf/mail/$domain/ip
     fi
 
+    # Touch mailhelo.conf if it doesnt exist
+    if [ ! -f "/etc/exim4/mailhelo.conf" ]; then
+        touch /etc/exim4/mailhelo.conf
+    fi
+
     # Setting HELO for mail domain
     if [ ! -z "$local_ip" ]; then
         IP_RDNS=$(is_ip_rdns_valid "$local_ip")

bin/v-add-sys-webmail

@@ -1,7 +1,9 @@
 #!/bin/bash
 # info: add webmail support for a domain
-# options: USER DOMAIN [RESTART]
+# options: USER DOMAIN [RESTART] [QUIET]
 #
+# this function adds support for webmail services
+# to a mail domain.
 
 #----------------------------------------------------------#
 #                    Variable&Function                     #
@@ -11,6 +13,7 @@
 user=$1
 domain=$2
 restart="$3"
+quiet=$4
 
 # Additional argument formatting
 if [[ "$domain" =~ [[:upper:]] ]]; then
@@ -123,7 +126,9 @@ if [ "$3" = 'yes' ]; then
 fi
 
 # Logging
-log_history "enabled webmail support for $domain"
+if [ "$quiet" != 'yes' ]; then
+    log_history "enabled webmail support for $domain"
+fi
 log_event "$OK" "$ARGUMENTS"
 
 exit

bin/v-add-user

@@ -1,6 +1,6 @@
 #!/bin/bash
 # info: add system user
-# options: USER PASSWORD EMAIL [PACKAGE] [FNAME] [LNAME]
+# options: USER PASSWORD EMAIL [PACKAGE] [NAME]
 #
 # The function creates new user account.
 
@@ -14,8 +14,7 @@ user=$1
 password=$2; HIDE=2
 email=$3
 package=${4-default}
-fname=$5
-lname=$6
+name=$5
 
 # Includes
 source $HESTIA/func/main.sh
@@ -32,11 +31,12 @@ is_user_free() {
 #                    Verifications                         #
 #----------------------------------------------------------#
 
-check_args '3' "$#" 'USER PASSWORD EMAIL [PACKAGE] [FNAME] [LNAME]'
+check_args '3' "$#" 'USER PASSWORD EMAIL [PACKAGE] [NAME] '
 is_format_valid 'user' 'email' 'package'
-if [ ! -z "$fname" ]; then
-    is_format_valid 'fname' 'lname'
+if [ ! -z "$name" ]; then
+    is_format_valid 'name' 
 fi
+
 is_user_free "$user"
 is_password_valid
 is_package_valid
@@ -176,8 +176,7 @@ else
     u_users=1
 fi
 
-echo "FNAME='$fname'
-LNAME='$lname'
+echo "NAME='$name'
 PACKAGE='$package'
 $pkg_data
 CONTACT='$email'
@@ -230,7 +229,7 @@ fi
 
 # Run template trigger
 if [ -x "$HESTIA/data/packages/$package.sh" ]; then
-    $HESTIA/data/packages/$package.sh "$user" "$email" "$fname" "$lname"
+    $HESTIA/data/packages/$package.sh "$user" "$email" "$name"
 fi
 
 # Adding jailed sftp env