Skip to content
Permalink
Browse files

Minor Fixes

  • Loading branch information...
protich committed Apr 23, 2019
1 parent ed1381e commit e6283739c670e2fc6817c440e4abf276f8e21b3e
@@ -1456,7 +1456,7 @@ function addTask($tid, $vars=array()) {
&& ($f=$iform->getField('duedate'))) {
$f->configure('max', Misc::db2gmtime($ticket->getEstDueDate()));
}
$vars = array_merge($_SESSION[':form-data'] ? : array(), $vars);
$vars = array_merge($_SESSION[':form-data'] ?: array(), $vars);
if ($_POST) {
Draft::deleteForNamespace(
@@ -961,7 +961,7 @@ function requireTopicToClose() {
}
function getDefaultTicketQueueId() {
return $this->get('default_ticket_queue');
return $this->get('default_ticket_queue', 1);
}
function hideStaffName() {
@@ -359,7 +359,9 @@ function getHeaderInfo($mid) {
}
}
}
$header['thread_entry_recipients']['to'] = array_unique($header['thread_entry_recipients']['to']);
if (isset($header['thread_entry_recipients']['to']))
$header['thread_entry_recipients']['to'] = array_unique($header['thread_entry_recipients']['to']);
//See if any of the recipients is a delivered to address
if ($tolist['delivered-to']) {
@@ -123,7 +123,7 @@ function checkCSRFToken($name=false) {
return true;
$msg=sprintf(__('Invalid CSRF token [%1$s] on %2$s'),
($_POST[$name].''.$_SERVER['HTTP_X_CSRFTOKEN']), THISPAGE);
(Format::htmlchars($_POST[$name]).''.$_SERVER['HTTP_X_CSRFTOKEN']), THISPAGE);
$this->logWarning(__('Invalid CSRF Token').' '.$name, $msg, false);
return false;
@@ -269,7 +269,8 @@ class="icon-group"></i> <?php echo __('Team'); ?></a>
<div class="clear tixTitle has_bottom_border">
<h3>
<?php $subject_field = TicketForm::getInstance()->getField('subject');
echo $subject_field->display($ticket->getSubject()); ?>
echo $subject_field ? $subject_field->display($ticket->getSubject())
: Format::htmlchars($ticket->getSubject()); ?>
</h3>
</div>
<table class="ticket_info" cellspacing="0" cellpadding="0" width="940" border="0">
@@ -746,9 +747,11 @@ class="icon-building icon-fixed-width"></i> <?php
<select id="from_email_id" name="from_email_id">
<?php
// Department email (default).
echo sprintf('<option value="%s" selected="selected">%s</option>',
$dept->getEmail()->getId(),
Format::htmlchars($dept->getEmail()->getAddress()));
if (($e=$dept->getEmail())) {
echo sprintf('<option value="%s" selected="selected">%s</option>',
$e->getId(),
Format::htmlchars($e->getAddress()));
}
// Optional SMTP addreses user can send email via
if (($emails = Email::getAddresses(array('smtp' =>
true), false)) && count($emails)) {

0 comments on commit e628373

Please sign in to comment.
You can’t perform that action at this time.