diff options
author | Craig Andrews <candrews@integralblue.com> | 2010-02-16 13:15:09 -0500 |
---|---|---|
committer | Craig Andrews <candrews@integralblue.com> | 2010-02-16 13:15:09 -0500 |
commit | 20d6a7caed6636c28cc7b95c584549691dff4388 (patch) | |
tree | bcf44f5f31a38ff08b363ab45ab486ace9ff1a99 /plugins/OStatus/actions/ostatusinit.php | |
parent | 32084e33a266797b306158df29e48f057651b410 (diff) | |
parent | d5cbfe8071d56438cfa168dc3db56a959317eae0 (diff) |
Merge branch '0.9.x' into 1.0.x
Conflicts:
lib/queuemanager.php
lib/xmppmanager.php
plugins/Xmpp/Fake_XMPP.php
scripts/imdaemon.php
Diffstat (limited to 'plugins/OStatus/actions/ostatusinit.php')
-rw-r--r-- | plugins/OStatus/actions/ostatusinit.php | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/plugins/OStatus/actions/ostatusinit.php b/plugins/OStatus/actions/ostatusinit.php index bac2c4d43..d21774420 100644 --- a/plugins/OStatus/actions/ostatusinit.php +++ b/plugins/OStatus/actions/ostatusinit.php @@ -67,9 +67,21 @@ class OStatusInitAction extends Action function showForm($err = null) { - $this->err = $err; - $this->showPage(); - + $this->err = $err; + if ($this->boolean('ajax')) { + header('Content-Type: text/xml;charset=utf-8'); + $this->xw->startDocument('1.0', 'UTF-8'); + $this->elementStart('html'); + $this->elementStart('head'); + $this->element('title', null, _('Subscribe to user')); + $this->elementEnd('head'); + $this->elementStart('body'); + $this->showContent(); + $this->elementEnd('body'); + $this->elementEnd('html'); + } else { + $this->showPage(); + } } function showContent() @@ -79,15 +91,15 @@ class OStatusInitAction extends Action 'class' => 'form_settings', 'action' => common_local_url('ostatusinit'))); $this->elementStart('fieldset'); - $this->element('legend', _('Subscribe to a remote user')); + $this->element('legend', null, sprintf(_('Subscribe to %s'), $this->nickname)); $this->hidden('token', common_session_token()); $this->elementStart('ul', 'form_data'); - $this->elementStart('li'); + $this->elementStart('li', array('id' => 'ostatus_nickname')); $this->input('nickname', _('User nickname'), $this->nickname, _('Nickname of the user you want to follow')); $this->elementEnd('li'); - $this->elementStart('li'); + $this->elementStart('li', array('id' => 'ostatus_profile')); $this->input('acct', _('Profile Account'), $this->acct, _('Your account id (i.e. user@identi.ca)')); $this->elementEnd('li'); @@ -95,7 +107,7 @@ class OStatusInitAction extends Action $this->submit('submit', _('Subscribe')); $this->elementEnd('fieldset'); $this->elementEnd('form'); - } + } function ostatusConnect() { @@ -125,4 +137,4 @@ class OStatusInitAction extends Action return _('OStatus Connect'); } -}
\ No newline at end of file +} |