mirror of
https://github.com/mailcow/mailcow-dockerized.git
synced 2026-05-25 00:42:00 +00:00
Update domain modified timestamp on tag changes
Co-authored-by: DerLinkman <62480600+DerLinkman@users.noreply.github.com>
This commit is contained in:
@@ -2769,6 +2769,8 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|||||||
':tag_name' => $tag,
|
':tag_name' => $tag,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
$stmt = $pdo->prepare("UPDATE `domain` SET `modified` = NOW() WHERE `domain` = :domain");
|
||||||
|
$stmt->execute(array(':domain' => $domain));
|
||||||
|
|
||||||
$_SESSION['return'][] = array(
|
$_SESSION['return'][] = array(
|
||||||
'type' => 'success',
|
'type' => 'success',
|
||||||
@@ -2937,6 +2939,8 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|||||||
':tag_name' => $tag,
|
':tag_name' => $tag,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
$stmt = $pdo->prepare("UPDATE `domain` SET `modified` = NOW() WHERE `domain` = :domain");
|
||||||
|
$stmt->execute(array(':domain' => $domain));
|
||||||
|
|
||||||
$_SESSION['return'][] = array(
|
$_SESSION['return'][] = array(
|
||||||
'type' => 'success',
|
'type' => 'success',
|
||||||
@@ -6111,7 +6115,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|||||||
$tags = $_data['tags'];
|
$tags = $_data['tags'];
|
||||||
if (!is_array($tags)) $tags = array();
|
if (!is_array($tags)) $tags = array();
|
||||||
|
|
||||||
|
$modifiedDomains = array();
|
||||||
$wasModified = false;
|
$wasModified = false;
|
||||||
foreach ($domains as $domain) {
|
foreach ($domains as $domain) {
|
||||||
if (!is_valid_domain_name($domain)) {
|
if (!is_valid_domain_name($domain)) {
|
||||||
@@ -6131,8 +6135,10 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$domainModified = false;
|
||||||
foreach($tags as $tag){
|
foreach($tags as $tag){
|
||||||
// delete tag
|
// delete tag
|
||||||
|
$domainModified = true;
|
||||||
$wasModified = true;
|
$wasModified = true;
|
||||||
$stmt = $pdo->prepare("DELETE FROM `tags_domain` WHERE `domain` = :domain AND `tag_name` = :tag_name");
|
$stmt = $pdo->prepare("DELETE FROM `tags_domain` WHERE `domain` = :domain AND `tag_name` = :tag_name");
|
||||||
$stmt->execute(array(
|
$stmt->execute(array(
|
||||||
@@ -6140,13 +6146,28 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|||||||
':tag_name' => $tag,
|
':tag_name' => $tag,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
if ($domainModified) {
|
||||||
|
$modifiedDomains[] = $domain;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$wasModified) return false;
|
if (!$wasModified) return false;
|
||||||
|
if (!empty($modifiedDomains)) {
|
||||||
|
$placeholders = array();
|
||||||
|
$params = array();
|
||||||
|
foreach ($modifiedDomains as $idx => $modifiedDomain) {
|
||||||
|
$placeholders[] = ":domain".$idx;
|
||||||
|
$params[":domain".$idx] = $modifiedDomain;
|
||||||
|
}
|
||||||
|
$stmt = $pdo->prepare("UPDATE `domain` SET `modified` = NOW() WHERE `domain` IN (".implode(',', $placeholders).")");
|
||||||
|
$stmt->execute($params);
|
||||||
|
$modifiedDomains = array_map('htmlspecialchars', $modifiedDomains);
|
||||||
|
}
|
||||||
|
$modifiedDomains = (empty($modifiedDomains)) ? array('-') : $modifiedDomains;
|
||||||
$_SESSION['return'][] = array(
|
$_SESSION['return'][] = array(
|
||||||
'type' => 'success',
|
'type' => 'success',
|
||||||
'log' => array(__FUNCTION__, $_action, $_type, $_data_log, $_attr),
|
'log' => array(__FUNCTION__, $_action, $_type, $_data_log, $_attr),
|
||||||
'msg' => array('domain_modified', $domain)
|
'msg' => array('domain_modified', implode(', ', $modifiedDomains))
|
||||||
);
|
);
|
||||||
break;
|
break;
|
||||||
case 'tags_mailbox':
|
case 'tags_mailbox':
|
||||||
|
|||||||
Reference in New Issue
Block a user