summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2010-08-31 00:04:16 -0400
committerCraig Andrews <candrews@integralblue.com>2010-09-03 17:50:28 -0400
commitb05ab5fc85b320430be9cfe10bf76701c75fc903 (patch)
tree6d4f0444623555d96cee24a6ef38aa0f62a2ecbe /plugins
parent764e0ab962018f41db6549393e98a64a7fe12a04 (diff)
daemon_screenname -> daemonScreenname
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Aim/AimPlugin.php2
-rw-r--r--plugins/Irc/IrcPlugin.php2
-rw-r--r--plugins/Msn/MsnPlugin.php2
-rw-r--r--plugins/Xmpp/XmppPlugin.php2
-rw-r--r--plugins/Xmpp/xmppmanager.php2
5 files changed, 5 insertions, 5 deletions
diff --git a/plugins/Aim/AimPlugin.php b/plugins/Aim/AimPlugin.php
index 1d06a8bda..231dc0b27 100644
--- 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 5434c4e7d..bebd0eaf3 100644
--- 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 a112a2070..68e57fa09 100644
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -78,7 +78,7 @@ class MsnPlugin extends ImPlugin {
*
* @return string Screenname
*/
- public function daemon_screenname() {
+ public function daemonScreenname() {
return $this->user;
}
diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index 2cdc3272d..321496e7d 100644
--- 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 87d818668..c9cb49dd1 100644
--- 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;
}