Merge branch 'main' into release

Author: jaapmarcus

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.4.1] - Bug fix
+
+- Fixed bug with 2FA enabled logins 
+
 ## [1.4.0] - Major Release (Feature / Quality Update)
 
 - **NOTE:** Ubuntu 16.04 (Xenial) is no longer supported as it has reached EOL (end-of-life) status. 

README.md

@@ -2,7 +2,7 @@
 
 [Hestia Control Panel](https://www.hestiacp.com/)
 ==================================================
-**Latest stable release:** Version 1.4.0 | [View Changelog](https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md)<br>
+**Latest stable release:** Version 1.4.1 | [View Changelog](https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md)<br>
 
 **Web:** [www.hestiacp.com](https://www.hestiacp.com/)<br>
 **Documentation:** [docs.hestiacp.com](https://docs.hestiacp.com/)<br>

install/hst-install-debian.sh

@@ -23,7 +23,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.4.0'
+HESTIA_INSTALL_VER='1.4.1'
 pma_v='5.1.0'
 rc_v="1.4.11"
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0")

install/hst-install-ubuntu.sh

@@ -23,7 +23,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.4.0'
+HESTIA_INSTALL_VER='1.4.1'
 pma_v='5.1.0'
 rc_v="1.4.11"
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0")

install/upgrade/versions/1.4.1.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Hestia Control Panel upgrade script for target version 1.4.1
+
+#######################################################################################
+#######                      Place additional commands below.                   #######
+#######################################################################################
+

src/deb/hestia/control

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

web/login/index.php

@@ -306,7 +306,7 @@ function authenticate_user($user, $password, $twofa = ''){
 
 require_once('../templates/header.html');
 if(!empty($_SESSION['login'])){
-    require_once('..templates/pages/login/login_2.html');
+    require_once('../templates/pages/login/login_2.html');
 }else if (empty($_POST['user'])) {
     if($_SESSION['LOGIN_STYLE'] == 'old'){
         require_once('../templates/pages/login/login_a.html');