diff options
| -rw-r--r-- | lib/immanager.php | 2 | ||||
| -rw-r--r-- | lib/implugin.php | 6 | ||||
| -rw-r--r-- | plugins/Aim/AimPlugin.php | 2 | ||||
| -rw-r--r-- | plugins/Irc/IrcPlugin.php | 4 | ||||
| -rw-r--r-- | plugins/Msn/MsnPlugin.php | 2 | ||||
| -rw-r--r-- | plugins/Xmpp/Queued_XMPP.php | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/lib/immanager.php b/lib/immanager.php index da80b74b7..9563a5326 100644 --- a/lib/immanager.php +++ b/lib/immanager.php @@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } * 2) override handleInput() with what to do when data is waiting on * one of the sockets * 3) override idle($timeout) to do keepalives (if necessary) - * 4) implement send_raw_message() to send raw data that ImPlugin::enqueue_outgoing_raw + * 4) implement send_raw_message() to send raw data that ImPlugin::enqueueOutgoingRaw * enqueued */ diff --git a/lib/implugin.php b/lib/implugin.php index 8a208221a..32aed28ed 100644 --- a/lib/implugin.php +++ b/lib/implugin.php @@ -79,7 +79,7 @@ abstract class ImPlugin extends Plugin /** * send a single notice to a given screenname * The implementation should put raw data, ready to send, into the outgoing - * queue using enqueue_outgoing_raw() + * queue using enqueueOutgoingRaw() * * @param string $screenname screenname to send to * @param Notice $notice notice to send @@ -94,7 +94,7 @@ abstract class ImPlugin extends Plugin /** * send a message (text) to a given screenname * The implementation should put raw data, ready to send, into the outgoing - * queue using enqueue_outgoing_raw() + * queue using enqueueOutgoingRaw() * * @param string $screenname screenname to send to * @param Notice $body text to send @@ -144,7 +144,7 @@ abstract class ImPlugin extends Plugin * * @param object $data */ - function enqueue_outgoing_raw($data) + function enqueueOutgoingRaw($data) { $qm = QueueManager::get(); $qm->enqueue($data, $this->transport . '-out'); diff --git a/plugins/Aim/AimPlugin.php b/plugins/Aim/AimPlugin.php index 231dc0b27..3f394a740 100644 --- a/plugins/Aim/AimPlugin.php +++ b/plugins/Aim/AimPlugin.php @@ -122,7 +122,7 @@ class AimPlugin extends ImPlugin function sendMessage($screenname, $body) { $this->fake_aim->sendIm($screenname, $body); - $this->enqueue_outgoing_raw($this->fake_aim->would_be_sent); + $this->enqueueOutgoingRaw($this->fake_aim->would_be_sent); return true; } diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php index bebd0eaf3..87cd8f72c 100644 --- a/plugins/Irc/IrcPlugin.php +++ b/plugins/Irc/IrcPlugin.php @@ -193,7 +193,7 @@ class IrcPlugin extends ImPlugin { $lines = explode("\n", $body); foreach ($lines as $line) { $this->fake_irc->doPrivmsg($screenname, $line); - $this->enqueue_outgoing_raw(array('type' => 'message', 'prioritise' => 0, 'data' => $this->fake_irc->would_be_sent)); + $this->enqueueOutgoingRaw(array('type' => 'message', 'prioritise' => 0, 'data' => $this->fake_irc->would_be_sent)); } return true; } @@ -316,7 +316,7 @@ class IrcPlugin extends ImPlugin { */ public function checked_send_confirmation_code($screenname, $code, $user) { $this->fake_irc->doPrivmsg('NickServ', 'INFO '.$screenname); - $this->enqueue_outgoing_raw( + $this->enqueueOutgoingRaw( array( 'type' => 'nickcheck', 'prioritise' => 1, diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php index 68e57fa09..9912021d7 100644 --- a/plugins/Msn/MsnPlugin.php +++ b/plugins/Msn/MsnPlugin.php @@ -162,7 +162,7 @@ class MsnPlugin extends ImPlugin { * @return boolean success value
*/
public function sendMessage($screenname, $body) {
- $this->enqueue_outgoing_raw(array('to' => $screenname, 'message' => $body));
+ $this->enqueueOutgoingRaw(array('to' => $screenname, 'message' => $body));
return true;
}
diff --git a/plugins/Xmpp/Queued_XMPP.php b/plugins/Xmpp/Queued_XMPP.php index 73eff2246..24f542805 100644 --- a/plugins/Xmpp/Queued_XMPP.php +++ b/plugins/Xmpp/Queued_XMPP.php @@ -79,7 +79,7 @@ class Queued_XMPP extends XMPPHP_XMPP */ public function send($msg, $timeout=NULL) { - $this->plugin->enqueue_outgoing_raw($msg); + $this->plugin->enqueueOutgoingRaw($msg); } //@{ |