diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-04-10 11:21:01 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-04-10 11:21:01 +0000 |
| commit | c9478353171267a3ebc5d87b43d759d22684b21e (patch) | |
| tree | 0c2de101bd65d5c24e73344be53b2d9619ce037d /phpBB/includes/functions_messenger.php | |
| parent | a01705c7d04581871c3028d7369815ecd06fca75 (diff) | |
| download | forums-c9478353171267a3ebc5d87b43d759d22684b21e.tar forums-c9478353171267a3ebc5d87b43d759d22684b21e.tar.gz forums-c9478353171267a3ebc5d87b43d759d22684b21e.tar.bz2 forums-c9478353171267a3ebc5d87b43d759d22684b21e.tar.xz forums-c9478353171267a3ebc5d87b43d759d22684b21e.zip | |
- fixed custom profile field get/store
- 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
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 1e731fecff..fdcbf74ab5 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -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; } } |