mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 02:06:32 +02:00
Code Issues Releases Wiki Activity

- fixed custom profile field get/store

Browse Source 
- changed tz lang array to hold more descriptive timezones (no more tz+-13, dst is a seperate option)
- fixed bugs after jabber queue processing (data being escaped differently)


git-svn-id: file:///svn/phpbb/trunk@5116 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2005-04-10 11:21:01 +00:00
parent a01705c7d0
commit c947835317
10 changed files with 280 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
phpBB/includes/functions_messenger.php
View File

@@ -370,7 +370,7 @@ class messenger
if (!$use_queue)
{
include_once($phpbb_root_path . 'includes/functions_jabber.'.$phpEx);
$this->jabber = new Jabber;
$this->jabber = new jabber;
$this->jabber->server = $config['jab_host'];
$this->jabber->port = ($config['jab_port']) ? $config['jab_port'] : 5222;
@@ -378,32 +378,32 @@ class messenger
$this->jabber->password = $config['jab_password'];
$this->jabber->resource = ($config['jab_resource']) ? $config['jab_resource'] : '';
if (!$this->jabber->Connect())
if (!$this->jabber->connect())
{
$this->error('JABBER', 'Could not connect to Jabber server');
return false;
}
if (!$this->jabber->SendAuth())
if (!$this->jabber->send_auth())
{
$this->error('JABBER', 'Could not authorise on Jabber server');
return false;
}
$this->jabber->SendPresence(NULL, NULL, 'online');
$this->jabber->send_presence(NULL, NULL, 'online');
foreach ($addresses as $address)
{
$this->jabber->SendMessage($address, 'normal', NULL, array('body' => $msg));
$this->jabber->send_message($address, 'normal', NULL, array('body' => $msg));
}
sleep(1);
$this->jabber->Disconnect();
$this->jabber->disconnect();
}
else
{
$this->queue->put('jabber', array(
'addresses' => $addresses,
'subject' => htmlentities($subject),
'subject' => htmlentities($this->subject),
'msg' => htmlentities($this->msg))
);
}
@@ -449,7 +449,7 @@ class queue
{
global $db, $config, $phpEx, $phpbb_root_path;
set_config('last_queue_run', time());
set_config('last_queue_run', time(), true);
// Delete stale lock file
if (file_exists($this->cache_file . '.lock') && !file_exists($this->cache_file))
@@ -494,7 +494,7 @@ class queue
}
include_once($phpbb_root_path . 'includes/functions_jabber.'.$phpEx);
$this->jabber = new Jabber;
$this->jabber = new jabber;
$this->jabber->server = $config['jab_host'];
$this->jabber->port = ($config['jab_port']) ? $config['jab_port'] : 5222;
@@ -502,18 +502,18 @@ class queue
$this->jabber->password = $config['jab_password'];
$this->jabber->resource = ($config['jab_resource']) ? $config['jab_resource'] : '';
if (!$this->jabber->Connect())
if (!$this->jabber->connect())
{
messenger::error('JABBER', 'Could not connect to Jabber server');
continue 2;
}
if (!$this->jabber->SendAuth())
if (!$this->jabber->send_auth())
{
messenger::error('JABBER', 'Could not authorise on Jabber server');
continue 2;
}
$this->jabber->SendPresence(NULL, NULL, 'online');
$this->jabber->send_presence(NULL, NULL, 'online');
break;
default:
@@ -545,7 +545,7 @@ class queue
case 'jabber':
foreach ($addresses as $address)
{
$this->jabber->SendMessage($address, 'normal', NULL, array('body' => $msg));
$this->jabber->send_message($address, 'normal', NULL, array('body' => $msg));
}
break;
}
@@ -564,7 +564,7 @@ class queue
// Hang about a couple of secs to ensure the messages are
// handled, then disconnect
sleep(1);
$this->jabber->Disconnect();
$this->jabber->disconnect();
break;
}
}