daemon_screenname -> daemonScreenname

diff --git a/actions/imsettings.php b/actions/imsettings.php
index 662b1063e72b5cd7578a74ea727441ed829f1a02..1b1bc0dc0dba1b651d27503dcade3ab5791d91cd 100644 (file)
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -133,7 +133,7 @@ class ImsettingsAction extends ConnectSettingsAction
                                              'message with further instructions. '.
                                              '(Did you add %s to your buddy list?)'),
                                              $transport_info['display'],
-                                             $transport_info['daemon_screenname']));
+                                             $transport_info['daemonScreenname']));
                     $this->hidden('screenname', $confirm->address);
                     // TRANS: Button label to cancel an IM address confirmation procedure.
                     $this->submit('cancel', _m('BUTTON','Cancel'));

diff --git a/lib/implugin.php b/lib/implugin.php
index 8cbf7d33ed59e2cbacba4e95a1f90591f79d4295..8a208221af342c997a153e3d300e76a6ad855657 100644 (file)
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -124,7 +124,7 @@ abstract class ImPlugin extends Plugin
      *
      * @return string screenname of this plugin
      */
-    abstract function daemon_screenname();
+    abstract function daemonScreenname();
 
     /**
      * get the microid uri of a given screenname
@@ -599,7 +599,7 @@ abstract class ImPlugin extends Plugin
     {
         $transports[$this->transport] = array(
             'display' => $this->getDisplayName(),
-            'daemon_screenname' => $this->daemon_screenname());
+            'daemonScreenname' => $this->daemonScreenname());
     }
 
     function onSendImConfirmationCode($transport, $screenname, $code, $user)

diff --git a/plugins/Aim/AimPlugin.php b/plugins/Aim/AimPlugin.php
index 1d06a8bda616393188816af4e0638493b9209231..231dc0b271db5bd29ac8bad1936803882f363c09 100644 (file)
--- a/plugins/Aim/AimPlugin.php
+++ b/plugins/Aim/AimPlugin.php
@@ -66,7 +66,7 @@ class AimPlugin extends ImPlugin
         return strtolower($screenname);
     }
 
-    function daemon_screenname()
+    function daemonScreenname()
     {
         return $this->user;
     }

diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index 5434c4e7d0ba140a9f35f0c7ee0cb2412523d6b4..bebd0eaf3ab9c905ee6dabef9f57ed01ab086e13 100644 (file)
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -95,7 +95,7 @@ class IrcPlugin extends ImPlugin {
      *
      * @return string Screenname
      */
-    public function daemon_screenname() {
+    public function daemonScreenname() {
         return $this->nick;
     }
 

diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index a112a2070c7808ed0dbd2fedcc461b7fe076e83b..68e57fa09eda86e4131fa987629a6922d8b3a531 100644 (file)
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -78,7 +78,7 @@ class MsnPlugin extends ImPlugin {
      *\r
      * @return string Screenname\r
      */\r
-    public function daemon_screenname() {\r
+    public function daemonScreenname() {\r
         return $this->user;\r
     }\r
 \r

diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index 2cdc3272df93c05fa612c9c6817e2cd4e74fb7d4..321496e7dee8427879157f0e9a78fece4aa55bde 100644 (file)
--- a/plugins/Xmpp/XmppPlugin.php
+++ b/plugins/Xmpp/XmppPlugin.php
@@ -254,7 +254,7 @@ class XmppPlugin extends ImPlugin
         return false;
     }
 
-    function daemon_screenname()
+    function daemonScreenname()
     {
         $ret = $this->user . '@' . $this->server;
         if($this->resource)

diff --git a/plugins/Xmpp/xmppmanager.php b/plugins/Xmpp/xmppmanager.php
index 87d8186684d28a3f6119feba76c24b7f1e53ce05..c9cb49dd195f8b585ada2eea7ea2dfee8a52bb1c 100644 (file)
--- a/plugins/Xmpp/xmppmanager.php
+++ b/plugins/Xmpp/xmppmanager.php
@@ -184,7 +184,7 @@ class XmppManager extends ImManager
         }
 
         common_log(LOG_DEBUG, "Sending ping #{$this->pingid}");
-               $this->conn->send("<iq from='{" . $this->plugin->daemon_screenname() . "}' to='{$this->plugin->server}' id='ping_{$this->pingid}' type='get'><ping xmlns='urn:xmpp:ping'/></iq>");
+               $this->conn->send("<iq from='{" . $this->plugin->daemonScreenname() . "}' to='{$this->plugin->server}' id='ping_{$this->pingid}' type='get'><ping xmlns='urn:xmpp:ping'/></iq>");
         $this->lastping = $now;
         return true;
     }