aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_messenger.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2013-04-25 03:59:34 -0700
committerNils Adermann <naderman@naderman.de>2013-04-25 03:59:34 -0700
commit6d0b183553a63156cbeb4f515bbc22c728c63008 (patch)
treef7fc99bc48b5cbf0c1b6097c991fa1ffee750061 /phpBB/includes/functions_messenger.php
parentf8ffe849690b2c9aa7ee446e404c52a880ad74d6 (diff)
parent0d2d72e8ee5cca9e6bc9048cfa1c3ad81ef51949 (diff)
downloadforums-6d0b183553a63156cbeb4f515bbc22c728c63008.tar
forums-6d0b183553a63156cbeb4f515bbc22c728c63008.tar.gz
forums-6d0b183553a63156cbeb4f515bbc22c728c63008.tar.bz2
forums-6d0b183553a63156cbeb4f515bbc22c728c63008.tar.xz
forums-6d0b183553a63156cbeb4f515bbc22c728c63008.zip
Merge pull request #1367 from EXreaction/ticket/11454
Ticket/11454 - Jabber notifications are not working at all
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
-rw-r--r--phpBB/includes/functions_messenger.php18
1 files changed, 18 insertions, 0 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index e580f6b675..a646f35fdd 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -55,6 +55,24 @@ class messenger
$this->vars = $this->msg = $this->replyto = $this->from = '';
$this->mail_priority = MAIL_NORMAL_PRIORITY;
}
+
+ /**
+ * Set addresses for to/im as available
+ *
+ * @param array $user User row
+ */
+ function set_addresses($user)
+ {
+ if (isset($user['user_email']) && $user['user_email'])
+ {
+ $this->to($user['user_email'], (isset($user['username']) ? $user['username'] : ''));
+ }
+
+ if (isset($user['user_jabber']) && $user['user_jabber'])
+ {
+ $this->im($user['user_jabber'], (isset($user['username']) ? $user['username'] : ''));
+ }
+ }
/**
* Sets an email address to send to