Skip to content
Snippets Groups Projects
Commit e11db6f1 authored by Jared Hancock's avatar Jared Hancock
Browse files

lint: Fixup undefined variables and methods

parent 37afd411
Branches
Tags
No related merge requests found
......@@ -291,7 +291,7 @@ class UsersAjaxAPI extends AjaxController {
Http::response(400, 'Query argument is required');
$users = array();
foreach (AuthenticationBackend::searchDirectories() as $ab) {
foreach (AuthenticationBackend::getSearchDirectories() as $ab) {
foreach ($ab->search($_REQUEST['q']) as $u)
$users[] = $u;
}
......
......@@ -253,7 +253,7 @@ abstract class AuthenticationBackend {
static function searchUsers($query) {
$users = array();
foreach (static::getSearchDirectories() as $bk)
$users += $bk->search($query);
$users = array_merge($users, $bk->search($query));
return $users;
}
......
......@@ -1399,7 +1399,7 @@ class HtmlThreadBody extends ThreadBody {
}
function getClean() {
return trim($body, " <>br/\t\n\r") ? Format::sanitize($body) : '';
return trim($this->body, " <>br/\t\n\r") ? Format::sanitize($this->body) : '';
}
function display($output=false) {
......
......@@ -940,7 +940,7 @@ class Ticket {
// Account manager
if ($cfg->alertAcctManagerONNewMessage()
&& ($org = $this->getOwner()->getOrganization())
&& ($acct_manager = $org->getAcctManager())) {
&& ($acct_manager = $org->getAccountManager())) {
if ($acct_manager instanceof Team)
$recipients = array_merge($recipients, $acct_manager->getMembers());
else
......@@ -1633,7 +1633,7 @@ class Ticket {
// Account manager
if ($cfg->alertAcctManagerONNewMessage()
&& ($org = $this->getOwner()->getOrganization())
&& ($acct_manager = $org->getAcctManager())) {
&& ($acct_manager = $org->getAccountManager())) {
if ($acct_manager instanceof Team)
$recipients = array_merge($recipients, $acct_manager->getMembers());
else
......@@ -2306,7 +2306,8 @@ class Ticket {
if (!$user) {
// Reject emails if not from registered clients (if
// configured)
if ($source == 'email' && !$cfg->acceptUnregisteredEmail()) {
if (strcasecmp($origin, 'email') === 0
&& !$cfg->acceptUnregisteredEmail()) {
list($mailbox, $domain) = explode('@', $vars['email'], 2);
// Users not yet created but linked to an organization
// are still acceptable
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment