eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Make WebChannel and AjaxWebChannel work

Browse Source 
These command-output channels were using the old common_element_*
functions. They now take an $out constructor parameter, and use that
for output.

The WebChannel has pretty remedial output; it would be nice if it
output a real formatted page.
This commit is contained in:
Evan Prodromou 2009-02-04 07:59:30 -05:00
parent 15b96f78ab
commit 2d063650ef
2 changed files with 52 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actions/newnotice.php
View File

@ -141,9 +141,9 @@ class NewnoticeAction extends Action
if ($cmd) { if ($cmd) {
if ($this->boolean('ajax')) { if ($this->boolean('ajax')) {
$cmd->execute(new AjaxWebChannel()); $cmd->execute(new AjaxWebChannel($this));
} else { } else {
$cmd->execute(new WebChannel()); $cmd->execute(new WebChannel($this));
} }
return; return;
} }

53
classes/Channel.php
View File

@ -105,9 +105,14 @@ class XMPPChannel extends Channel
} }
} }
class WebChannel extends Channel class WebChannel extends Channel
{ {
var $out = null;
function __construct($out=null)
{
$this->out = $out;
}
function source() function source()
{ {
@ -129,9 +134,14 @@ class WebChannel extends Channel
# XXX: buffer all output and send it at the end # XXX: buffer all output and send it at the end
# XXX: even better, redirect to appropriate page # XXX: even better, redirect to appropriate page
# depending on what command was run # depending on what command was run
common_show_header(_('Command results')); $this->out->startHTML();
common_element('p', null, $text); $this->out->elementStart('head');
common_show_footer(); $this->out->element('title', null, _('Command results'));
$this->out->elementEnd('head');
$this->out->elementStart('body');
$this->out->element('p', array('id' => 'command_result'), $text);
$this->out->elementEnd('body');
$this->out->endHTML();
} }
function error($user, $text) function error($user, $text)
@ -140,36 +150,33 @@ class WebChannel extends Channel
} }
} }
class AjaxWebChannel extends WebChannel class AjaxWebChannel extends WebChannel
{ {
function output($user, $text) function output($user, $text)
{ {
common_start_html('text/xml;charset=utf-8', true); $this->out->startHTML('text/xml;charset=utf-8');
common_element_start('head'); $this->out->elementStart('head');
common_element('title', null, _('Command results')); $this->out->element('title', null, _('Command results'));
common_element_end('head'); $this->out->elementEnd('head');
common_element_start('body'); $this->out->elementStart('body');
common_element('p', array('id' => 'command_result'), $text); $this->out->element('p', array('id' => 'command_result'), $text);
common_element_end('body'); $this->out->elementEnd('body');
common_element_end('html'); $this->out->endHTML();
} }
function error($user, $text) function error($user, $text)
{ {
common_start_html('text/xml;charset=utf-8', true); $this->out->startHTML('text/xml;charset=utf-8');
common_element_start('head'); $this->out->elementStart('head');
common_element('title', null, _('Ajax Error')); $this->out->element('title', null, _('Ajax Error'));
common_element_end('head'); $this->out->elementEnd('head');
common_element_start('body'); $this->out->elementStart('body');
common_element('p', array('id' => 'error'), $text); $this->out->element('p', array('id' => 'error'), $text);
common_element_end('body'); $this->out->elementEnd('body');
common_element_end('html'); $this->out->endHTML();
} }
} }
class MailChannel extends Channel class MailChannel extends Channel
{ {