Netsyms/Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some email sending, updat edit_post maxlengths

Browse Source
This commit is contained in:
Mike Koch 2017-11-21 12:58:04 -05:00
parent a7742614df
commit 8b263f66a3
No known key found for this signature in database
GPG Key ID: 9BA5D7F8391455ED
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/edit_post.php
View File

@ -368,7 +368,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
<label for="subject" class="col-sm-3 control-label"><?php echo $hesklang['subject'] . $required; ?></label>
<div class="col-sm-9">
<input class="form-control" type="text" name="subject" size="40" maxlength="40"
<input class="form-control" type="text" name="subject" size="40" maxlength="70"
value="<?php echo $ticket['subject']; ?>"
placeholder="<?php echo htmlspecialchars($hesklang['subject']); ?>"/>
</div>
@ -380,7 +380,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
</label>
<div class="col-sm-9">
<input class="form-control" type="text" name="name" size="40" maxlength="30"
<input class="form-control" type="text" name="name" size="40" maxlength="50"
value="<?php echo $ticket['name']; ?>"
placeholder="<?php echo htmlspecialchars($hesklang['name']); ?>"
data-error="<?php echo $hesklang['this_field_is_required']; ?>"

7
api/BusinessLogic/Emails/EmailTemplateParser.php
View File

@ -252,12 +252,7 @@ class EmailTemplateParser extends \BaseClass {
$lastReplyBy = '';
// Get the last reply by
if (!empty($ticket->lastReplier)) {
if (!empty($ticket->lastReplier)) {
$lastReplyBy = $hesklang['staff'];
} else {
$lastReplyUser = $this->userGateway->getUserById($ticket->lastReplier, $heskSettings);
$lastReplyBy = $lastReplyUser !== null ? $lastReplyUser->name : $hesklang['unas'];
}
$lastReplyBy = $ticket->lastReplier;
} else {
$lastReplyBy = $ticket->name;
}

4
api/Controllers/Tickets/ResendTicketEmailToCustomerController.php
View File

@ -41,6 +41,10 @@ class ResendTicketEmailToCustomerController extends InternalApiController {
$reply = null;
$emailTemplate = EmailTemplateRetriever::NEW_TICKET;
// Use 0 for new tickets
$ticket->lastReplier = 0;
if (isset($_GET['replyId'])) {
$replyId = $_GET['replyId'];
$emailTemplate = EmailTemplateRetriever::NEW_REPLY_BY_STAFF;