SubMirror now works properly as extended from FormAction
This commit is contained in:
parent
712a6d49d0
commit
d6d06c8cbb
@ -25,7 +25,7 @@
|
|||||||
* @link http://status.net/
|
* @link http://status.net/
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (!defined('GNUSOCIAL') && !defined('STATUSNET')) { exit(1); }
|
if (!defined('GNUSOCIAL')) { exit(1); }
|
||||||
|
|
||||||
class MirrorSettingsAction extends SettingsAction
|
class MirrorSettingsAction extends SettingsAction
|
||||||
{
|
{
|
||||||
@ -62,9 +62,8 @@ class MirrorSettingsAction extends SettingsAction
|
|||||||
*/
|
*/
|
||||||
function showContent()
|
function showContent()
|
||||||
{
|
{
|
||||||
$user = common_current_user();
|
|
||||||
$provider = $this->trimmed('provider');
|
$provider = $this->trimmed('provider');
|
||||||
if ($provider) {
|
if (!empty($provider) || GNUsocial::isAjax()) {
|
||||||
$this->showAddFeedForm($provider);
|
$this->showAddFeedForm($provider);
|
||||||
} else {
|
} else {
|
||||||
$this->elementStart('div', array('id' => 'add-mirror'));
|
$this->elementStart('div', array('id' => 'add-mirror'));
|
||||||
@ -72,7 +71,7 @@ class MirrorSettingsAction extends SettingsAction
|
|||||||
$this->elementEnd('div');
|
$this->elementEnd('div');
|
||||||
|
|
||||||
$mirror = new SubMirror();
|
$mirror = new SubMirror();
|
||||||
$mirror->subscriber = $user->id;
|
$mirror->subscriber = $this->scoped->getID();
|
||||||
if ($mirror->find()) {
|
if ($mirror->find()) {
|
||||||
while ($mirror->fetch()) {
|
while ($mirror->fetch()) {
|
||||||
$this->showFeedForm($mirror);
|
$this->showFeedForm($mirror);
|
||||||
@ -87,14 +86,12 @@ class MirrorSettingsAction extends SettingsAction
|
|||||||
$form->show();
|
$form->show();
|
||||||
}
|
}
|
||||||
|
|
||||||
function showFeedForm($mirror)
|
function showFeedForm(SubMirror $mirror)
|
||||||
{
|
{
|
||||||
$profile = Profile::getKV('id', $mirror->subscribed);
|
$profile = Profile::getByID($mirror->subscribed);
|
||||||
if ($profile) {
|
|
||||||
$form = new EditMirrorForm($this, $profile);
|
$form = new EditMirrorForm($this, $profile);
|
||||||
$form->show();
|
$form->show();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
function showAddFeedForm()
|
function showAddFeedForm()
|
||||||
{
|
{
|
||||||
@ -112,41 +109,6 @@ class MirrorSettingsAction extends SettingsAction
|
|||||||
$form->show();
|
$form->show();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @param array $args
|
|
||||||
*
|
|
||||||
* @todo move the ajax display handling to common code
|
|
||||||
*/
|
|
||||||
function handle($args)
|
|
||||||
{
|
|
||||||
if ($this->boolean('ajax')) {
|
|
||||||
$this->startHTML('text/xml;charset=utf-8');
|
|
||||||
$this->elementStart('head');
|
|
||||||
// TRANS: Title for page with form to add a mirror feed provider on.
|
|
||||||
$this->element('title', null, _m('Provider add'));
|
|
||||||
$this->elementEnd('head');
|
|
||||||
$this->elementStart('body');
|
|
||||||
|
|
||||||
$this->showAddFeedForm();
|
|
||||||
|
|
||||||
$this->elementEnd('body');
|
|
||||||
$this->endHTML();
|
|
||||||
} else {
|
|
||||||
return parent::handle($args);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* Handle a POST request
|
|
||||||
*
|
|
||||||
* Muxes to different sub-functions based on which button was pushed
|
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
function handlePost()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Show the local navigation menu
|
* Show the local navigation menu
|
||||||
*
|
*
|
||||||
|
Loading…
Reference in New Issue
Block a user