mirror of
https://github.com/hestiacp/hestiacp.git
synced 2025-02-06 09:45:30 +00:00
Fix/4734 Webmail / PHPmydmin not working after update (#4735)
* Fix #4734 Webmail / phpmyadmin unavailble * Update versions in installers / changelog readme
This commit is contained in:
Jaap Marcus
GitHub
parent
1708dd971f
commit
2ea428057d
@ -2,6 +2,10 @@
|
||||
|
||||
All notable changes to this project will be documented in this file.
|
||||
|
||||
## [1.9.1] - Service release
|
||||
|
||||
- Fixed an issue with webmail / phpmydmin unavailble
|
||||
|
||||
## [1.9.0] - Feature / Major release
|
||||
|
||||
### Notes
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
<h2 align="center">Lightweight and powerful control panel for the modern web</h2>
|
||||
|
||||
<p align="center"><strong>Latest stable release:</strong> Version 1.8.12 | <a href="https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md">View Changelog</a></p>
|
||||
<p align="center"><strong>Latest stable release:</strong> Version 1.9.1 | <a href="https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md">View Changelog</a></p>
|
||||
|
||||
<p align="center">
|
||||
<a href="https://www.hestiacp.com/">HestiaCP.com</a> |
|
||||
|
||||
58
func/main.sh
58
func/main.sh
@ -791,51 +791,51 @@ is_alias_format_valid() {
|
||||
|
||||
# IP format validator
|
||||
is_ip_format_valid() {
|
||||
object_name=${2-ip}
|
||||
valid=$($HESTIA_PHP -r '$ip="$argv[1]"; echo (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) ? 0 : 1);' $1);
|
||||
if [ "$valid" -ne 0 ]; then
|
||||
check_result "$E_INVALID" "invalid $object_name :: $1"
|
||||
fi
|
||||
object_name=${2-ip}
|
||||
valid=$($HESTIA_PHP -r '$ip="$argv[1]"; echo (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) ? 0 : 1);' $1)
|
||||
if [ "$valid" -ne 0 ]; then
|
||||
check_result "$E_INVALID" "invalid $object_name :: $1"
|
||||
fi
|
||||
}
|
||||
|
||||
# IPv6 format validator
|
||||
is_ipv6_format_valid() {
|
||||
object_name=${2-ipv6}
|
||||
valid=$($HESTIA_PHP -r '$ip="$argv[1]"; echo (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) ? 0 : 1);' $1);
|
||||
if [ "$valid" -ne 0 ]; then
|
||||
check_result "$E_INVALID" "invalid $object_name :: $1"
|
||||
fi
|
||||
object_name=${2-ipv6}
|
||||
valid=$($HESTIA_PHP -r '$ip="$argv[1]"; echo (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) ? 0 : 1);' $1)
|
||||
if [ "$valid" -ne 0 ]; then
|
||||
check_result "$E_INVALID" "invalid $object_name :: $1"
|
||||
fi
|
||||
}
|
||||
|
||||
is_ip46_format_valid() {
|
||||
valid=$($HESTIA_PHP -r '$ip="$argv[1]"; echo (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6) ? 0 : 1);' $1);
|
||||
if [ "$valid" -ne 0 ]; then
|
||||
check_result "$E_INVALID" "invalid IP format :: $1"
|
||||
fi
|
||||
valid=$($HESTIA_PHP -r '$ip="$argv[1]"; echo (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6) ? 0 : 1);' $1)
|
||||
if [ "$valid" -ne 0 ]; then
|
||||
check_result "$E_INVALID" "invalid IP format :: $1"
|
||||
fi
|
||||
}
|
||||
|
||||
is_ipv4_cidr_format_valid() {
|
||||
object_name=${2-ip}
|
||||
valid=$($HESTIA_PHP -r '$cidr="$argv[1]"; list($ip, $netmask) = [...explode("/", $cidr), 32]; echo ((filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) && $netmask <= 32) ? 0 : 1);' $1);
|
||||
if [ "$valid" -ne 0 ]; then
|
||||
check_result "$E_INVALID" "invalid $object_name :: $1"
|
||||
fi
|
||||
object_name=${2-ip}
|
||||
valid=$($HESTIA_PHP -r '$cidr="$argv[1]"; list($ip, $netmask) = [...explode("/", $cidr), 32]; echo ((filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) && $netmask <= 32) ? 0 : 1);' $1)
|
||||
if [ "$valid" -ne 0 ]; then
|
||||
check_result "$E_INVALID" "invalid $object_name :: $1"
|
||||
fi
|
||||
}
|
||||
|
||||
is_ipv6_cidr_format_valid() {
|
||||
object_name=${2-ipv6}
|
||||
valid=$($HESTIA_PHP -r '$cidr="$argv[1]"; list($ip, $netmask) = [...explode("/", $cidr), 128]; echo ((filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) && $netmask <= 128) ? 0 : 1);' $1);
|
||||
if [ "$valid" -ne 0 ]; then
|
||||
check_result "$E_INVALID" "invalid $object_name :: $1"
|
||||
fi
|
||||
object_name=${2-ipv6}
|
||||
valid=$($HESTIA_PHP -r '$cidr="$argv[1]"; list($ip, $netmask) = [...explode("/", $cidr), 128]; echo ((filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) && $netmask <= 128) ? 0 : 1);' $1)
|
||||
if [ "$valid" -ne 0 ]; then
|
||||
check_result "$E_INVALID" "invalid $object_name :: $1"
|
||||
fi
|
||||
}
|
||||
|
||||
is_netmask_format_valid() {
|
||||
object_name=${2-netmask}
|
||||
valid=$($HESTIA_PHP -r '$netmask="$argv[1]"; echo (preg_match("/^(128|192|224|240|248|252|254|255)\.(0|128|192|224|240|248|252|254|255)\.(0|128|192|224|240|248|252|254|255)\.(0|128|192|224|240|248|252|254|255)/", $netmask) ? 0 : 1);' $1);
|
||||
if [ "$valid" -ne 0 ]; then
|
||||
check_result "$E_INVALID" "invalid $object_name :: $1"
|
||||
fi
|
||||
object_name=${2-netmask}
|
||||
valid=$($HESTIA_PHP -r '$netmask="$argv[1]"; echo (preg_match("/^(128|192|224|240|248|252|254|255)\.(0|128|192|224|240|248|252|254|255)\.(0|128|192|224|240|248|252|254|255)\.(0|128|192|224|240|248|252|254|255)/", $netmask) ? 0 : 1);' $1)
|
||||
if [ "$valid" -ne 0 ]; then
|
||||
check_result "$E_INVALID" "invalid $object_name :: $1"
|
||||
fi
|
||||
}
|
||||
|
||||
# Proxy extention format validator
|
||||
|
||||
@ -31,7 +31,7 @@ HESTIA_COMMON_DIR="$HESTIA/install/common"
|
||||
VERBOSE='no'
|
||||
|
||||
# Define software versions
|
||||
HESTIA_INSTALL_VER='1.9.0~beta1'
|
||||
HESTIA_INSTALL_VER='1.9.1'
|
||||
# Supported PHP versions
|
||||
multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0" "8.1" "8.2" "8.3" "8.4")
|
||||
# One of the following PHP versions is required for Roundcube / phpmyadmin
|
||||
|
||||
@ -31,7 +31,7 @@ HESTIA_COMMON_DIR="$HESTIA/install/common"
|
||||
VERBOSE='no'
|
||||
|
||||
# Define software versions
|
||||
HESTIA_INSTALL_VER='1.9.0~beta1'
|
||||
HESTIA_INSTALL_VER='1.9.1'
|
||||
# Supported PHP versions
|
||||
multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0" "8.1" "8.2" "8.3" "8.4")
|
||||
# One of the following PHP versions is required for Roundcube / phpmyadmin
|
||||
|
||||
30
install/upgrade/versions/1.9.1.sh
Normal file
30
install/upgrade/versions/1.9.1.sh
Normal file
@ -0,0 +1,30 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Hestia Control Panel upgrade script for target version 1.9.0
|
||||
|
||||
#######################################################################################
|
||||
####### Place additional commands below. #######
|
||||
#######################################################################################
|
||||
####### upgrade_config_set_value only accepts true or false. #######
|
||||
####### #######
|
||||
####### Pass through information to the end user in case of a issue or problem #######
|
||||
####### #######
|
||||
####### Use add_upgrade_message "My message here" to include a message #######
|
||||
####### in the upgrade notification email. Example: #######
|
||||
####### #######
|
||||
####### add_upgrade_message "My message here" #######
|
||||
####### #######
|
||||
####### You can use \n within the string to create new lines. #######
|
||||
#######################################################################################
|
||||
|
||||
upgrade_config_set_value 'UPGRADE_UPDATE_WEB_TEMPLATES' 'false'
|
||||
upgrade_config_set_value 'UPGRADE_UPDATE_DNS_TEMPLATES' 'false'
|
||||
upgrade_config_set_value 'UPGRADE_UPDATE_MAIL_TEMPLATES' 'false'
|
||||
upgrade_config_set_value 'UPGRADE_REBUILD_USERS' 'no'
|
||||
upgrade_config_set_value 'UPGRADE_UPDATE_FILEMANAGER_CONFIG' 'false'
|
||||
|
||||
# Update hestia-event.conf
|
||||
if [ -f "/etc/apache2/conf.d/hestia-event.conf" ]; then
|
||||
rm -f /etc/apache2/conf.d/hestia-event.conf
|
||||
cp $HESTIA/data/templates/web/apache2/hestia-event.conf /etc/apache2/conf.d/
|
||||
fi
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "hestia",
|
||||
"private": true,
|
||||
"version": "1.9.0",
|
||||
"version": "1.9.1",
|
||||
"description": "An open-source Linux web server control panel.",
|
||||
"repository": "https://github.com/hestiacp/hestiacp",
|
||||
"license": "GPL-3.0-or-later",
|
||||
|
||||
@ -116,8 +116,13 @@ function authenticate_user($user, $password, $twofa = "") {
|
||||
$ip = $_SERVER["REMOTE_ADDR"];
|
||||
$user_agent = $_SERVER["HTTP_USER_AGENT"];
|
||||
|
||||
if (!empty($_SERVER["HTTP_CF_CONNECTING_IP"]) &&
|
||||
filter_var($_SERVER["HTTP_CF_CONNECTING_IP"], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6)
|
||||
if (
|
||||
!empty($_SERVER["HTTP_CF_CONNECTING_IP"]) &&
|
||||
filter_var(
|
||||
$_SERVER["HTTP_CF_CONNECTING_IP"],
|
||||
FILTER_VALIDATE_IP,
|
||||
FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6,
|
||||
)
|
||||
) {
|
||||
$ip = $_SERVER["HTTP_CF_CONNECTING_IP"];
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user