HESK v3.2.5

This commit is contained in:
Luke Tainton
2022-04-23 17:18:38 +01:00
parent f7cfa565b1
commit 177f99d0ef
136 changed files with 463 additions and 345 deletions

View File

@@ -307,6 +307,9 @@ else
break;
}
// Update "Closed at"
$sql_status .= " , `closedat`=NOW(), `closedby`=".intval($_SESSION['id'])." ";
// Lock the ticket if customers are not allowed to reopen tickets
if ($hesk_settings['custopen'] != 1)
{
@@ -363,6 +366,12 @@ if ( ! empty($_POST['assign_self']) && hesk_checkPermission('can_assign_self',0)
$sql .= " , `owner`=".intval($_SESSION['id']).", `history`=CONCAT(`history`,'".hesk_dbEscape($revision)."') ";
}
// If ticket is re-opened, clear "closed at" and "closed by"
if ($ticket['status'] == 3 && $new_status != 3)
{
$sql .= ' , `closedat`=NULL, `closedby`=NULL ';
}
$sql .= " $priority_sql ";
$sql .= " $sql_status ";

View File

@@ -165,6 +165,11 @@ function ban_email()
$email = ($index = strpos($email, ',')) ? substr($email, 0, $index) : $email;
$email = ($index = strpos($email, ';')) ? substr($email, 0, $index) : $email;
// We don't need *@ to ban domains, remove the star if present
if (strpos($email, '*@') === 0) {
$email = ltrim($email, '*');
}
// Validate email address
$hesk_settings['multi_eml'] = 0;

View File

@@ -249,7 +249,7 @@ foreach ($status as $k => $v)
$tmp = count($status);
// Do we need to search by status?
if ( $tmp < 6 )
if ( $tmp < count($hesk_settings['statuses']) )
{
// If no statuses selected, show all
if ($tmp == 0)