summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2010-08-31 00:11:57 -0400
committerCraig Andrews <candrews@integralblue.com>2010-09-03 17:50:29 -0400
commita3725de47b63da2e8b8cbc7e47b4b6e9d3fa142f (patch)
tree02e21685a0994ab385e9c8a51b9d89a3690ed820
parent463e9c10d1c41b324ada5d6d14c079a11460f581 (diff)
handle_incoming -> handleIncoming
-rw-r--r--lib/implugin.php4
-rw-r--r--plugins/Aim/AimPlugin.php2
-rw-r--r--plugins/Irc/IrcPlugin.php4
-rw-r--r--plugins/Msn/MsnPlugin.php2
-rw-r--r--plugins/Xmpp/XmppPlugin.php2
5 files changed, 7 insertions, 7 deletions
diff --git a/lib/implugin.php b/lib/implugin.php
index 25c3e96f9..67b93047f 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -106,7 +106,7 @@ abstract class ImPlugin extends Plugin
/**
* receive a raw message
* Raw IM data is taken from the incoming queue, and passed to this function.
- * It should parse the raw message and call handle_incoming()
+ * It should parse the raw message and call handleIncoming()
*
* Returning false may CAUSE REPROCESSING OF THE QUEUE ITEM, and should
* be used for temporary failures only. For permanent failures such as
@@ -436,7 +436,7 @@ abstract class ImPlugin extends Plugin
*
* @param boolean success
*/
- protected function handle_incoming($from, $notice_text)
+ protected function handleIncoming($from, $notice_text)
{
$user = $this->get_user($from);
// For common_current_user to work
diff --git a/plugins/Aim/AimPlugin.php b/plugins/Aim/AimPlugin.php
index 3f394a740..225d92ad6 100644
--- a/plugins/Aim/AimPlugin.php
+++ b/plugins/Aim/AimPlugin.php
@@ -138,7 +138,7 @@ class AimPlugin extends ImPlugin
$user = $this->get_user($from);
$notice_text = $info['message'];
- $this->handle_incoming($from, $notice_text);
+ $this->handleIncoming($from, $notice_text);
return true;
}
diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index a5a343e02..3e73c198c 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -211,10 +211,10 @@ class IrcPlugin extends ImPlugin {
if (in_array($command, $this->whiteList)) {
$this->handle_channel_incoming($data['sender'], $data['source'], $message);
} else {
- $this->handle_incoming($data['sender'], $message);
+ $this->handleIncoming($data['sender'], $message);
}
} else {
- $this->handle_incoming($data['sender'], $data['message']);
+ $this->handleIncoming($data['sender'], $data['message']);
}
return true;
}
diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index 9912021d7..187486eed 100644
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -173,7 +173,7 @@ class MsnPlugin extends ImPlugin {
* @return true if processing completed, false if message should be reprocessed
*/
public function receiveRawMessage($data) {
- $this->handle_incoming($data['sender'], $data['message']);
+ $this->handleIncoming($data['sender'], $data['message']);
return true;
}
diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index 10141b08d..200254178 100644
--- a/plugins/Xmpp/XmppPlugin.php
+++ b/plugins/Xmpp/XmppPlugin.php
@@ -378,7 +378,7 @@ class XmppPlugin extends ImPlugin
return;
}
- $this->handle_incoming($from, $pl['body']);
+ $this->handleIncoming($from, $pl['body']);
return true;
}