diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-04-15 14:48:36 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-04-15 14:48:36 +0000 |
| commit | 84738055a25081070f570b40a19e05db21908237 (patch) | |
| tree | 3bf59d91eba8d7b7b000ba5a5cd0e63e0e82b122 /phpBB/includes/functions_messenger.php | |
| parent | 0562395c27cd6cafcaacd3798f6a51d8cc703c7a (diff) | |
| download | forums-84738055a25081070f570b40a19e05db21908237.tar forums-84738055a25081070f570b40a19e05db21908237.tar.gz forums-84738055a25081070f570b40a19e05db21908237.tar.bz2 forums-84738055a25081070f570b40a19e05db21908237.tar.xz forums-84738055a25081070f570b40a19e05db21908237.zip | |
- fixed some bugs
- made sql schemas consistent
- added correct sequences and generators to sql schemas
- extended some rows to hold more data. This solves issues with multibyte characters and too short topic titles, names, etc.
- allow multibyte characters in usernames
git-svn-id: file:///svn/phpbb/trunk@5784 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 74c3037bf0..c106d4d717 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -145,7 +145,7 @@ class messenger // assign variables function assign_vars($vars) { - $this->vars = (empty($this->vars)) ? $vars : $this->vars . $vars; + $this->vars = (empty($this->vars)) ? $vars : $this->vars + $vars; } // Send the mail out to the recipients set previously in var $this->address @@ -209,14 +209,16 @@ class messenger { case NOTIFY_EMAIL: $result = $this->msg_email(); - break; + break; + case NOTIFY_IM: $result = $this->msg_jabber(); - break; + break; + case NOTIFY_BOTH: $result = $this->msg_email(); $this->msg_jabber(); - break; + break; } $this->reset(); @@ -394,7 +396,7 @@ class messenger foreach ($addresses as $address) { - $this->jabber->send_message($address, 'normal', NULL, array('body' => $this->msg)); + $this->jabber->send_message($address, 'normal', NULL, array('body' => htmlentities($this->msg))); } sleep(1); @@ -490,7 +492,7 @@ class queue unset($this->queue_data['email']); continue 2; } - break; + break; case 'jabber': if (!$config['jab_enable']) @@ -520,7 +522,8 @@ class queue continue 2; } $this->jabber->send_presence(NULL, NULL, 'online'); - break; + + break; default: return; @@ -547,14 +550,14 @@ class queue messenger::error('EMAIL', $message); continue 3; } - break; + break; case 'jabber': foreach ($addresses as $address) { $this->jabber->send_message($address, 'normal', NULL, array('body' => $msg)); } - break; + break; } } @@ -572,7 +575,7 @@ class queue // handled, then disconnect sleep(1); $this->jabber->disconnect(); - break; + break; } } |