send_message -> sendMessage

9 files changed, 16 insertions, 16 deletions

diff --git a/lib/imchannel.php b/lib/imchannel.php
index 12354ce4b..a05229990 100644
--- a/lib/imchannel.php
+++ b/lib/imchannel.php
@@ -47,7 +47,7 @@ class IMChannel extends Channel
     function output($user, $text)
     {
         $text = '['.common_config('site', 'name') . '] ' . $text;
-        $this->imPlugin->send_message($this->imPlugin->get_screenname($user), $text);
+        $this->imPlugin->sendMessage($this->imPlugin->get_screenname($user), $text);
     }
 
     function error($user, $text)
@@ -56,7 +56,7 @@ class IMChannel extends Channel
 
         $screenname = $this->imPlugin->get_screenname($user);
         if($screenname){
-            $this->imPlugin->send_message($screenname, $text);
+            $this->imPlugin->sendMessage($screenname, $text);
             return true;
         }else{
             common_log(LOG_ERR,
diff --git a/lib/implugin.php b/lib/implugin.php
index dafb8a416..cbf10d391 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -88,7 +88,7 @@ abstract class ImPlugin extends Plugin
      */
     function send_notice($screenname, $notice)
     {
-        return $this->send_message($screenname, $this->format_notice($notice));
+        return $this->sendMessage($screenname, $this->format_notice($notice));
     }
 
     /**
@@ -101,7 +101,7 @@ abstract class ImPlugin extends Plugin
      *
      * @return boolean success value
      */
-    abstract function send_message($screenname, $body);
+    abstract function sendMessage($screenname, $body);
 
     /**
      * receive a raw message
@@ -249,7 +249,7 @@ abstract class ImPlugin extends Plugin
     protected function send_from_site($screenname, $msg)
     {
         $text = '['.common_config('site', 'name') . '] ' . $msg;
-        $this->send_message($screenname, $text);
+        $this->sendMessage($screenname, $text);
     }
 
     /**
@@ -271,7 +271,7 @@ abstract class ImPlugin extends Plugin
           'or if you didn\'t request this confirmation, just ignore this message.'),
           $user->nickname, common_config('site', 'name'), $this->getDisplayName(), common_local_url('confirmaddress', array('code' => $code)));
 
-        return $this->send_message($screenname, $body);
+        return $this->sendMessage($screenname, $body);
     }
 
     /**
diff --git a/plugins/Aim/AimPlugin.php b/plugins/Aim/AimPlugin.php
index 30da1dbc7..b90842c0a 100644
--- a/plugins/Aim/AimPlugin.php
+++ b/plugins/Aim/AimPlugin.php
@@ -119,7 +119,7 @@ class AimPlugin extends ImPlugin
         return 'aim:' . $screenname;    
     }
 
-    function send_message($screenname, $body)
+    function sendMessage($screenname, $body)
     {
         $this->fake_aim->sendIm($screenname, $body);
 	    $this->enqueue_outgoing_raw($this->fake_aim->would_be_sent);
diff --git a/plugins/Irc/ChannelResponseChannel.php b/plugins/Irc/ChannelResponseChannel.php
index d29a1da02..9d50b914a 100644
--- a/plugins/Irc/ChannelResponseChannel.php
+++ b/plugins/Irc/ChannelResponseChannel.php
@@ -56,6 +56,6 @@ class ChannelResponseChannel extends IMChannel {
     */

     public function output($user, $text) {

         $text = $user->nickname.': ['.common_config('site', 'name') . '] ' . $text;

-        $this->imPlugin->send_message($this->ircChannel, $text);

+        $this->imPlugin->sendMessage($this->ircChannel, $text);

     }

 }
\ No newline at end of file
diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index c555580c3..38c87f74d 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -189,7 +189,7 @@ class IrcPlugin extends ImPlugin {
      * @param string $body Text to send
      * @return boolean true on success
      */
-    public function send_message($screenname, $body) {
+    public function sendMessage($screenname, $body) {
         $lines = explode("\n", $body);
         foreach ($lines as $line) {
             $this->fake_irc->doPrivmsg($screenname, $line);
@@ -301,7 +301,7 @@ class IrcPlugin extends ImPlugin {
         if ($this->regcheck && !$checked) {
             return $this->checked_send_confirmation_code($screenname, $code, $user);
         } else {
-            return $this->send_message($screenname, $body);
+            return $this->sendMessage($screenname, $body);
         }
     }
 
diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index f036ef309..292c98b2b 100644
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -231,7 +231,7 @@ class IrcManager extends ImManager {
                 // Send message
                 $this->plugin->send_confirmation_code($screenname, $nickdata['code'], $nickdata['user'], true);
             } else {
-                $this->plugin->send_message($screenname, _m('Your nickname is not registered so IRC connectivity cannot be enabled'));
+                $this->plugin->sendMessage($screenname, _m('Your nickname is not registered so IRC connectivity cannot be enabled'));
 
                 $confirm = new Confirm_address();
 
diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index 9db3f7763..ca30153b2 100644
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -161,7 +161,7 @@ class MsnPlugin extends ImPlugin {
      * @param string $body Text to send

      * @return boolean success value

      */

-    public function send_message($screenname, $body) {

+    public function sendMessage($screenname, $body) {

         $this->enqueue_outgoing_raw(array('to' => $screenname, 'message' => $body));

         return true;

     }

diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index 09efa32fa..0827cb591 100644
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -175,10 +175,10 @@ class MsnManager extends ImManager {
         $wm = Msn_waiting_message::top($data['to']);

         while ($wm != NULL) {

             if ($sessionFailed) {

-                $this->plugin->send_message($wm->screenname, $wm->message);

+                $this->plugin->sendMessage($wm->screenname, $wm->message);

                 $sessionFailed = true;

             } elseif (!$this->conn->sendMessage($wm->screenname, $wm->message, $ignore)) {

-                $this->plugin->send_message($wm->screenname, $wm->message);

+                $this->plugin->sendMessage($wm->screenname, $wm->message);

             }

 

             $wm->delete();

@@ -195,7 +195,7 @@ class MsnManager extends ImManager {
     protected function requeue_waiting_messages() {

         $wm = Msn_waiting_message::top();

         while ($wm != NULL) {

-            $this->plugin->send_message($wm->screenname, $wm->message);

+            $this->plugin->sendMessage($wm->screenname, $wm->message);

             $wm->delete();

             $wm = Msn_waiting_message::top();

         }

diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index 66468b5f2..e62b92cb5 100644
--- a/plugins/Xmpp/XmppPlugin.php
+++ b/plugins/Xmpp/XmppPlugin.php
@@ -311,7 +311,7 @@ class XmppPlugin extends ImPlugin
         return 'xmpp:' . $screenname;    
     }
 
-    function send_message($screenname, $body)
+    function sendMessage($screenname, $body)
     {
         $this->queuedConnection()->message($screenname, $body, 'chat');
     }