maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

set version to 2.1.0 for upcoming stable release

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2023-12-08 11:48:32 +01:00
parent 3a8f48de35
commit 1467dab58f
5 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/froxlor.sql.php
View File

@@ -678,7 +678,7 @@ opcache.validate_timestamps'),
('system', 'distribution', ''),
('system', 'update_channel', 'stable'),
('system', 'updatecheck_data', ''),
('system', 'update_notify_last', '2.1.0-rc3'),
('system', 'update_notify_last', '2.1.0'),
('system', 'traffictool', 'goaccess'),
('system', 'req_limit_per_interval', 60),
('system', 'req_limit_interval', 60),

5
install/updates/froxlor/update_2.1.inc.php
View File

@@ -203,3 +203,8 @@ if (Froxlor::isDatabaseVersion('202311260')) {
}
Froxlor::updateToDbVersion('202312050');
}
if (Froxlor::isFroxlorVersion('2.1.0-rc3')) {
Update::showUpdateStep("Updating from 2.1.0-rc3 to 2.1.0 stable", false);
Froxlor::updateToVersion('2.1.0');
}

2
lib/Froxlor/Froxlor.php
View File

@@ -31,7 +31,7 @@ final class Froxlor
{
// Main version variable
const VERSION = '2.1.0-rc3';
const VERSION = '2.1.0';
// Database version (YYYYMMDDC where C is a daily counter)
const DBVERSION = '202312050';

9
lib/init.php
View File

@@ -115,14 +115,15 @@ if (!isset($sql) || !is_array($sql)) {
/**
* Show nice note if requested domain is "unknown" to froxlor and thus is being lead to its vhost
*/
if ($_SERVER['SERVER_NAME'] != Settings::Get('system.hostname') &&
$req_host = UI::getCookieHost();
if ($req_host != Settings::Get('system.hostname') &&
Settings::Get('panel.is_configured') == 1 &&
!filter_var($_SERVER['SERVER_NAME'], FILTER_VALIDATE_IP) && (
!filter_var($req_host, FILTER_VALIDATE_IP) && (
empty(Settings::Get('system.froxloraliases')) ||
(!empty(Settings::Get('system.froxloraliases')) && !in_array($_SERVER['SERVER_NAME'], array_map('trim', explode(',', Settings::Get('system.froxloraliases')))))
(!empty(Settings::Get('system.froxloraliases')) && !in_array($req_host, array_map('trim', explode(',', Settings::Get('system.froxloraliases')))))
)) {
// not the froxlor system-hostname, show info page for domains not configured in froxlor
$redirect_file = FileDir::getUnknownDomainTemplate($_SERVER['SERVER_NAME']);
$redirect_file = FileDir::getUnknownDomainTemplate($req_host);
header('Location: '.$redirect_file);
die();
}

30
templates/Froxlor/user/index.html.twig
View File

@@ -51,8 +51,16 @@
<div class="row">
{% if userinfo.adminsession == 1 %}
<div
class="col-12 col-lg-6">
<div class="col-12 col-lg-6">
{% if userinfo.custom_notes|markdown is not empty and userinfo.custom_notes_show == 1 %}
<div class="card mb-3">
<div class="card-body">
{{ userinfo.custom_notes|markdown|raw }}
</div>
</div>
{% endif %}
{# system infos #}
<div class="card mb-3">
<div class="card-header">
@@ -135,22 +143,9 @@
{% endif %}
</ul>
</div>
{% if userinfo.custom_notes|markdown is not empty and userinfo.custom_notes_show == 1 %}
<div class="card mb-3">
<ul class="list-group list-group-flush">
<li class="list-group-item list-group-item-info d-flex justify-content-between align-items-start">
<div class="ms-2 me-auto">
{{ userinfo.custom_notes|markdown|raw }}
</div>
</li>
</ul>
</div>
{% endif %}
</div>
{% else %}
<div
class="col-12 col-md-6 col-lg-4">
<div class="col-12 col-md-6 col-lg-4">
{# account info #}
<div class="card mb-3">
<div class="card-header">
@@ -212,8 +207,7 @@
</ul>
</div>
</div>
<div
class="col-12 col-md-6 col-lg-4">
<div class="col-12 col-md-6 col-lg-4">
{# customer details #}
<div class="card">
<div class="card-header">