GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

daemon_screenname -> daemonScreenname

This commit is contained in:
Craig Andrews 2010-08-31 00:04:16 -04:00
parent 764e0ab962
commit b05ab5fc85
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/imsettings.php
View File

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

4
lib/implugin.php
View File

@ -124,7 +124,7 @@ abstract class ImPlugin extends Plugin
* *
* @return string screenname of this plugin * @return string screenname of this plugin
*/ */
abstract function daemon_screenname(); abstract function daemonScreenname();
/** /**
* get the microid uri of a given screenname * get the microid uri of a given screenname
@ -599,7 +599,7 @@ abstract class ImPlugin extends Plugin
{ {
$transports[$this->transport] = array( $transports[$this->transport] = array(
'display' => $this->getDisplayName(), 'display' => $this->getDisplayName(),
'daemon_screenname' => $this->daemon_screenname()); 'daemonScreenname' => $this->daemonScreenname());
} }
function onSendImConfirmationCode($transport, $screenname, $code, $user) function onSendImConfirmationCode($transport, $screenname, $code, $user)

2
plugins/Aim/AimPlugin.php
View File

@ -66,7 +66,7 @@ class AimPlugin extends ImPlugin
return strtolower($screenname); return strtolower($screenname);
} }
function daemon_screenname() function daemonScreenname()
{ {
return $this->user; return $this->user;
} }

2
plugins/Irc/IrcPlugin.php
View File

@ -95,7 +95,7 @@ class IrcPlugin extends ImPlugin {
* *
* @return string Screenname * @return string Screenname
*/ */
public function daemon_screenname() { public function daemonScreenname() {
return $this->nick; return $this->nick;
} }

2
plugins/Msn/MsnPlugin.php
View File

@ -78,7 +78,7 @@ class MsnPlugin extends ImPlugin {
* *
* @return string Screenname * @return string Screenname
*/ */
public function daemon_screenname() { public function daemonScreenname() {
return $this->user; return $this->user;
} }

2
plugins/Xmpp/XmppPlugin.php
View File

@ -254,7 +254,7 @@ class XmppPlugin extends ImPlugin
return false; return false;
} }
function daemon_screenname() function daemonScreenname()
{ {
$ret = $this->user . '@' . $this->server; $ret = $this->user . '@' . $this->server;
if($this->resource) if($this->resource)

2
plugins/Xmpp/xmppmanager.php
View File

@ -184,7 +184,7 @@ class XmppManager extends ImManager
} }
common_log(LOG_DEBUG, "Sending ping #{$this->pingid}"); 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; $this->lastping = $now;
return true; return true;
} }