diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-10-12 15:29:18 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-10-12 15:29:18 +0000 |
| commit | 9da094fec24666b80349cc73978c26ba76105153 (patch) | |
| tree | a636b1626bd2bbc0e19b3bbf3b774105a7aeac9f /phpBB/includes/functions_messenger.php | |
| parent | 90ad130d48893a63aea1db7e61ea9d39c6018cb1 (diff) | |
| download | forums-9da094fec24666b80349cc73978c26ba76105153.tar forums-9da094fec24666b80349cc73978c26ba76105153.tar.gz forums-9da094fec24666b80349cc73978c26ba76105153.tar.bz2 forums-9da094fec24666b80349cc73978c26ba76105153.tar.xz forums-9da094fec24666b80349cc73978c26ba76105153.zip | |
Updated the various "users of emailer", fixed issue(!) of jabber using the email address as the uid, blah fixes, blah, blah di blah yakety smackety
git-svn-id: file:///svn/phpbb/trunk@4583 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 79fc1bdd14..28cd796507 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -19,6 +19,18 @@ class messenger var $tpl_msg = array(); + function messenger() + { + global $config; + + if (preg_match('#^[c-z]:\\\#i', getenv('PATH')) && !$config['smtp_delivery'] && phpversion() < '4.3') + { + // We are running on windows, force delivery to use our smtp functions since php's are broken by default + $config['smtp_delivery'] = 1; + $config['smtp_host'] = @ini_get('SMTP'); + } + } + // Resets all the data (address, template file, etc etc to default function reset() { @@ -47,6 +59,13 @@ class messenger // $this->addresses['bcc'][$pos]['name'] = trim($realname); } + function im($address, $realname = '') + { + $pos = sizeof($this->addresses['im']); + $this->addresses['im'][$pos]['uid'] = trim($address); + $this->addresses['im'][$pos]['name'] = trim($realname); + } + function replyto($address) { $this->replyto = trim($address); @@ -305,17 +324,12 @@ class messenger } $addresses = array(); - foreach ($this->addresses as $type => $address_ary) + foreach ($this->addresses['im'] as $type => $uid_ary) { - foreach ($address_ary as $which_ary) - { - $addresses[] = $which_ary['email']; - } + $addresses[] = $uid_ary['uid']; } $addresses = array_unique($addresses); - $subject = sprintf($user->lang['IM_JABBER_SUBJECT'], $user->data['username'], $config['server_name']); - if (!$use_queue) { include_once($phpbb_root_path . 'includes/functions_jabber.'.$phpEx); |