diff --git a/admin_domains.php b/admin_domains.php
index 7b09a3ad..6f2cbe02 100644
--- a/admin_domains.php
+++ b/admin_domains.php
@@ -590,8 +590,6 @@ if ($page == 'domains' || $page == 'overview') {
$domain_edit_data = include_once dirname(__FILE__) . '/lib/formfields/admin/domains/formfield.domains_edit.php';
- $speciallogwarning = sprintf($lng['admin']['speciallogwarning'], $lng['admin']['delete_statistics']);
-
UI::twigBuffer('user/form.html.twig', [
'formaction' => $linker->getLink(array('section' => 'domains', 'id' => $id)),
'formdata' => $domain_edit_data['domain_edit'],
@@ -606,6 +604,23 @@ if ($page == 'domains' || $page == 'overview') {
$allowed_phpconfigs = \Froxlor\Customer\Customer::getCustomerDetail($customerid, 'allowed_phpconfigs');
echo !empty($allowed_phpconfigs) ? $allowed_phpconfigs : json_encode([]);
exit();
+ } elseif ($action == 'jqSpeciallogfileNote') {
+ $domainid = intval($_POST['id']);
+ $newval = intval($_POST['newval']);
+ try {
+ $json_result = Domains::getLocal($userinfo, array(
+ 'id' => $domainid
+ ))->get();
+ } catch (Exception $e) {
+ \Froxlor\UI\Response::dynamic_error($e->getMessage());
+ }
+ $result = json_decode($json_result, true)['data'];
+ if ($newval != $result['speciallogfile']) {
+ echo json_encode(['changed' => true, 'info' => $lng['admin']['speciallogwarning']]);
+ exit();
+ }
+ echo 0;
+ exit();
} elseif ($action == 'import') {
if (isset($_POST['send']) && $_POST['send'] == 'send') {
@@ -660,32 +675,3 @@ if ($page == 'domains' || $page == 'overview') {
require_once __DIR__ . '/logfiles_viewer.php';
}
-
-function formatDomainEntry(&$row, &$idna_convert)
-{
- $row['domain'] = $idna_convert->decode($row['domain']);
- $row['aliasdomain'] = $idna_convert->decode($row['aliasdomain']);
-
- $row['ipandport'] = '';
- foreach ($row['ipsandports'] as $rowip) {
- if (filter_var($rowip['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
- $row['ipandport'] .= '[' . $rowip['ip'] . ']:' . $rowip['port'] . "\n";
- } else {
- $row['ipandport'] .= $rowip['ip'] . ':' . $rowip['port'] . "\n";
- }
- }
- $row['ipandport'] = substr($row['ipandport'], 0, -1);
- $row['termination_date'] = str_replace("0000-00-00", "", $row['termination_date']);
-
- $row['termination_css'] = "";
- if ($row['termination_date'] != "") {
- $cdate = strtotime($row['termination_date'] . " 23:59:59");
- $today = time();
-
- if ($cdate < $today) {
- $row['termination_css'] = 'domain-expired';
- } else {
- $row['termination_css'] = 'domain-canceled';
- }
- }
-}
diff --git a/lib/formfields/admin/domains/formfield.domains_edit.php b/lib/formfields/admin/domains/formfield.domains_edit.php
index 6d63b7dd..b9698b93 100644
--- a/lib/formfields/admin/domains/formfield.domains_edit.php
+++ b/lib/formfields/admin/domains/formfield.domains_edit.php
@@ -127,6 +127,10 @@ return array(
'value' => '1',
'checked' => $result['speciallogfile']
),
+ 'speciallogverified' => array(
+ 'type' => 'hidden',
+ 'value' => '0'
+ ),
'specialsettings' => array(
'visible' => ($userinfo['change_serversettings'] == '1' ? true : false),
'label' => $lng['admin']['ownvhostsettings'],
diff --git a/lng/english.lng.php b/lng/english.lng.php
index 90586a46..e239efc3 100644
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -1555,7 +1555,7 @@ $lng['serversettings']['phpfpm_settings']['idle_timeout']['description'] = 'Time
// ADDED IN 0.9.27-svn2
$lng['panel']['cancel'] = 'Cancel';
$lng['admin']['delete_statistics'] = 'Delete Statistics';
-$lng['admin']['speciallogwarning'] = 'WARNING: By changing this setting you will lose all your old statistics for this domain. If you are sure you wish to change this type "%s" in the field below and click the "delete" button.
';
+$lng['admin']['speciallogwarning'] = '