From 8b206e9f90730bcb387e509c17cd89a2a0e1554e Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Mon, 23 Mar 2015 10:29:43 -0500
Subject: [PATCH] oops: Allow the ticket lock feature to be disabled
This fixes a slight regression, where, if the locking mechanism were
disabled, then tickets could no longer be responded to.
---
scp/tickets.php | 46 +++++++++++++++++++++++++---------------------
1 file changed, 25 insertions(+), 21 deletions(-)
diff --git a/scp/tickets.php b/scp/tickets.php
index 620f8cfc4..9821e037c 100644
--- a/scp/tickets.php
+++ b/scp/tickets.php
@@ -69,18 +69,20 @@ if($_POST && !$errors):
if(!$_POST['response'])
$errors['response']=__('Response required');
- if (!$lock) {
- $errors['err'] = __('This action requires a lock. Please try again');
- }
- // Use locks to avoid double replies
- elseif ($lock->getStaffId()!=$thisstaff->getId()) {
- $errors['err'] = __('Action Denied. Ticket is locked by someone else!');
- }
- // Attempt to renew the lock if possible
- elseif (($lock->isExpired() && !$lock->renew())
- ||($lock->getCode() != $_POST['lockCode'])
- ) {
- $errors['err'] = __('Your lock has expired. Please try again');
+ if ($cfg->getLockTime()) {
+ if (!$lock) {
+ $errors['err'] = __('This action requires a lock. Please try again');
+ }
+ // Use locks to avoid double replies
+ elseif ($lock->getStaffId()!=$thisstaff->getId()) {
+ $errors['err'] = __('Action Denied. Ticket is locked by someone else!');
+ }
+ // Attempt to renew the lock if possible
+ elseif (($lock->isExpired() && !$lock->renew())
+ ||($lock->getCode() != $_POST['lockCode'])
+ ) {
+ $errors['err'] = __('Your lock has expired. Please try again');
+ }
}
//Make sure the email is not banned
@@ -200,15 +202,17 @@ if($_POST && !$errors):
$vars['cannedattachments'] = array_merge(
$vars['cannedattachments'] ?: array(), $attachments);
- if (!$lock) {
- $errors['err'] = __('This action requires a lock. Please try again');
- }
- // Use locks to avoid double replies
- elseif ($lock->getStaffId()!=$thisstaff->getId()) {
- $errors['err'] = __('Action Denied. Ticket is locked by someone else!');
- }
- elseif ($lock->getCode() != $_POST['lockCode']) {
- $errors['err'] = __('Your lock has expired. Please try again');
+ if ($cfg->getLockTime()) {
+ if (!$lock) {
+ $errors['err'] = __('This action requires a lock. Please try again');
+ }
+ // Use locks to avoid double replies
+ elseif ($lock->getStaffId()!=$thisstaff->getId()) {
+ $errors['err'] = __('Action Denied. Ticket is locked by someone else!');
+ }
+ elseif ($lock->getCode() != $_POST['lockCode']) {
+ $errors['err'] = __('Your lock has expired. Please try again');
+ }
}
$wasOpen = ($ticket->isOpen());
--
GitLab