send_message -> sendMessage

diff --git a/lib/imchannel.php b/lib/imchannel.php
index 12354ce4b0c0c16d0fd642871a1fee117d73bb40..a0522999057d2df8153d315eb121df1ea25b2220 100644 (file)
--- 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 dafb8a416b23da46da4fb4a2c6ee8bab5ff80302..cbf10d391120d657da85eb1ef9a4ea023944eb7b 100644 (file)
--- 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 30da1dbc794dbc8ec9966541d0b12fd543692354..b90842c0a9500f8b9fcee5e341dfa9db02fb121d 100644 (file)
--- 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 d29a1da029843c9eb99708787a431522b83ef3cd..9d50b914ab661a072ebafff32df934ee620af3cd 100644 (file)
--- a/plugins/Irc/ChannelResponseChannel.php
+++ b/plugins/Irc/ChannelResponseChannel.php
@@ -56,6 +56,6 @@ class ChannelResponseChannel extends IMChannel {
     */\r
     public function output($user, $text) {\r
         $text = $user->nickname.': ['.common_config('site', 'name') . '] ' . $text;\r
-        $this->imPlugin->send_message($this->ircChannel, $text);\r
+        $this->imPlugin->sendMessage($this->ircChannel, $text);\r
     }\r
 }
\ No newline at end of file

diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index c555580c38f98994974b1e6b28cfee029e866f40..38c87f74dddd7b785c5ffcafd4470be6df4e82e6 100644 (file)
--- 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 f036ef3091bb6cc983a3cade39d9c240ac37eb07..292c98b2b0502a73a5828c4300d35d9fb59873ac 100644 (file)
--- 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 9db3f7763b76591473d80374436297976578da22..ca30153b25ae6be143977f52576aa0e62b3639b3 100644 (file)
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -161,7 +161,7 @@ class MsnPlugin extends ImPlugin {
      * @param string $body Text to send\r
      * @return boolean success value\r
      */\r
-    public function send_message($screenname, $body) {\r
+    public function sendMessage($screenname, $body) {\r
         $this->enqueue_outgoing_raw(array('to' => $screenname, 'message' => $body));\r
         return true;\r
     }\r

diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index 09efa32fae7b668015c354dda009a2679ecfe4ca..0827cb591d1c57f03673b0e76e82cdc262d4b0e8 100644 (file)
--- 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']);\r
         while ($wm != NULL) {\r
             if ($sessionFailed) {\r
-                $this->plugin->send_message($wm->screenname, $wm->message);\r
+                $this->plugin->sendMessage($wm->screenname, $wm->message);\r
                 $sessionFailed = true;\r
             } elseif (!$this->conn->sendMessage($wm->screenname, $wm->message, $ignore)) {\r
-                $this->plugin->send_message($wm->screenname, $wm->message);\r
+                $this->plugin->sendMessage($wm->screenname, $wm->message);\r
             }\r
 \r
             $wm->delete();\r
@@ -195,7 +195,7 @@ class MsnManager extends ImManager {
     protected function requeue_waiting_messages() {\r
         $wm = Msn_waiting_message::top();\r
         while ($wm != NULL) {\r
-            $this->plugin->send_message($wm->screenname, $wm->message);\r
+            $this->plugin->sendMessage($wm->screenname, $wm->message);\r
             $wm->delete();\r
             $wm = Msn_waiting_message::top();\r
         }\r

diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index 66468b5f259a817b3dfa5a467755ef283ab64a65..e62b92cb5312cddf0e0b3d540f69408ae81e6b70 100644 (file)
--- 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');
     }