Separating classes into files and stronger typing
This commit is contained in:
parent
da2f179ae9
commit
6d9f390ba8
@ -154,71 +154,3 @@ class SubscriptionsAction extends GalleryAction
|
|||||||
$this->target->getNickname())));
|
$this->target->getNickname())));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// XXX SubscriptionsList and SubscriptionList are dangerously close
|
|
||||||
|
|
||||||
class SubscriptionsList extends SubscriptionList
|
|
||||||
{
|
|
||||||
function newListItem($profile)
|
|
||||||
{
|
|
||||||
return new SubscriptionsListItem($profile, $this->owner, $this->action);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class SubscriptionsListItem extends SubscriptionListItem
|
|
||||||
{
|
|
||||||
function showOwnerControls()
|
|
||||||
{
|
|
||||||
$sub = Subscription::pkeyGet(array('subscriber' => $this->owner->id,
|
|
||||||
'subscribed' => $this->profile->id));
|
|
||||||
if (!$sub) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$transports = array();
|
|
||||||
Event::handle('GetImTransports', array(&$transports));
|
|
||||||
if (!$transports && !common_config('sms', 'enabled')) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->out->elementStart('form', array('id' => 'subedit-' . $this->profile->id,
|
|
||||||
'method' => 'post',
|
|
||||||
'class' => 'form_subscription_edit',
|
|
||||||
'action' => common_local_url('subedit')));
|
|
||||||
$this->out->hidden('token', common_session_token());
|
|
||||||
$this->out->hidden('profile', $this->profile->id);
|
|
||||||
if ($transports) {
|
|
||||||
$attrs = array('name' => 'jabber',
|
|
||||||
'type' => 'checkbox',
|
|
||||||
'class' => 'checkbox',
|
|
||||||
'id' => 'jabber-'.$this->profile->id);
|
|
||||||
if ($sub->jabber) {
|
|
||||||
$attrs['checked'] = 'checked';
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->out->element('input', $attrs);
|
|
||||||
// TRANS: Checkbox label for enabling IM messages for a profile in a subscriptions list.
|
|
||||||
$this->out->element('label', array('for' => 'jabber-'.$this->profile->id), _m('LABEL','IM'));
|
|
||||||
} else {
|
|
||||||
$this->out->hidden('jabber', $sub->jabber);
|
|
||||||
}
|
|
||||||
if (common_config('sms', 'enabled')) {
|
|
||||||
$attrs = array('name' => 'sms',
|
|
||||||
'type' => 'checkbox',
|
|
||||||
'class' => 'checkbox',
|
|
||||||
'id' => 'sms-'.$this->profile->id);
|
|
||||||
if ($sub->sms) {
|
|
||||||
$attrs['checked'] = 'checked';
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->out->element('input', $attrs);
|
|
||||||
// TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
|
|
||||||
$this->out->element('label', array('for' => 'sms-'.$this->profile->id), _('SMS'));
|
|
||||||
} else {
|
|
||||||
$this->out->hidden('sms', $sub->sms);
|
|
||||||
}
|
|
||||||
// TRANS: Save button for settings for a profile in a subscriptions list.
|
|
||||||
$this->out->submit('save', _m('BUTTON','Save'));
|
|
||||||
$this->out->elementEnd('form');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@ -56,44 +56,3 @@ class SubscriptionList extends ProfileList
|
|||||||
return new SubscriptionListItem($profile, $this->owner, $this->action);
|
return new SubscriptionListItem($profile, $this->owner, $this->action);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class SubscriptionListItem extends ProfileListItem
|
|
||||||
{
|
|
||||||
/** Owner of this list */
|
|
||||||
var $owner = null;
|
|
||||||
|
|
||||||
function __construct($profile, $owner, $action)
|
|
||||||
{
|
|
||||||
parent::__construct($profile, $action);
|
|
||||||
|
|
||||||
$this->owner = $owner;
|
|
||||||
}
|
|
||||||
|
|
||||||
function showProfile()
|
|
||||||
{
|
|
||||||
$this->startProfile();
|
|
||||||
$this->showAvatar($this->profile);
|
|
||||||
$this->showNickname();
|
|
||||||
$this->showFullName();
|
|
||||||
$this->showLocation();
|
|
||||||
$this->showHomepage();
|
|
||||||
$this->showBio();
|
|
||||||
// Relevant portion!
|
|
||||||
$this->showTags();
|
|
||||||
if ($this->isOwn()) {
|
|
||||||
$this->showOwnerControls();
|
|
||||||
}
|
|
||||||
$this->endProfile();
|
|
||||||
}
|
|
||||||
|
|
||||||
function showOwnerControls()
|
|
||||||
{
|
|
||||||
// pass
|
|
||||||
}
|
|
||||||
|
|
||||||
function isOwn()
|
|
||||||
{
|
|
||||||
$user = common_current_user();
|
|
||||||
return (!empty($user) && ($this->owner->id == $user->id));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
44
lib/subscriptionlistitem.php
Normal file
44
lib/subscriptionlistitem.php
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
if (!defined('GNUSOCIAL')) { exit(1); }
|
||||||
|
|
||||||
|
class SubscriptionListItem extends ProfileListItem
|
||||||
|
{
|
||||||
|
/** Owner of this list */
|
||||||
|
var $owner = null;
|
||||||
|
|
||||||
|
function __construct(Profile $profile, $owner, $action)
|
||||||
|
{
|
||||||
|
parent::__construct($profile, $action);
|
||||||
|
|
||||||
|
$this->owner = $owner;
|
||||||
|
}
|
||||||
|
|
||||||
|
function showProfile()
|
||||||
|
{
|
||||||
|
$this->startProfile();
|
||||||
|
$this->showAvatar($this->profile);
|
||||||
|
$this->showNickname();
|
||||||
|
$this->showFullName();
|
||||||
|
$this->showLocation();
|
||||||
|
$this->showHomepage();
|
||||||
|
$this->showBio();
|
||||||
|
// Relevant portion!
|
||||||
|
$this->showTags();
|
||||||
|
if ($this->isOwn()) {
|
||||||
|
$this->showOwnerControls();
|
||||||
|
}
|
||||||
|
$this->endProfile();
|
||||||
|
}
|
||||||
|
|
||||||
|
function showOwnerControls()
|
||||||
|
{
|
||||||
|
// pass
|
||||||
|
}
|
||||||
|
|
||||||
|
function isOwn()
|
||||||
|
{
|
||||||
|
$user = common_current_user();
|
||||||
|
return (!empty($user) && ($this->owner->id == $user->id));
|
||||||
|
}
|
||||||
|
}
|
13
lib/subscriptionslist.php
Normal file
13
lib/subscriptionslist.php
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
if (!defined('GNUSOCIAL')) { exit(1); }
|
||||||
|
|
||||||
|
// XXX SubscriptionsList and SubscriptionList are dangerously close
|
||||||
|
|
||||||
|
class SubscriptionsList extends SubscriptionList
|
||||||
|
{
|
||||||
|
function newListItem(Profile $profile)
|
||||||
|
{
|
||||||
|
return new SubscriptionsListItem($profile, $this->owner, $this->action);
|
||||||
|
}
|
||||||
|
}
|
61
lib/subscriptionslistitem.php
Normal file
61
lib/subscriptionslistitem.php
Normal file
@ -0,0 +1,61 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
if (!defined('GNUSOCIAL')) { exit(1); }
|
||||||
|
|
||||||
|
class SubscriptionsListItem extends SubscriptionListItem
|
||||||
|
{
|
||||||
|
function showOwnerControls()
|
||||||
|
{
|
||||||
|
$sub = Subscription::pkeyGet(array('subscriber' => $this->owner->id,
|
||||||
|
'subscribed' => $this->profile->id));
|
||||||
|
if (!$sub) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$transports = array();
|
||||||
|
Event::handle('GetImTransports', array(&$transports));
|
||||||
|
if (!$transports && !common_config('sms', 'enabled')) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->out->elementStart('form', array('id' => 'subedit-' . $this->profile->id,
|
||||||
|
'method' => 'post',
|
||||||
|
'class' => 'form_subscription_edit',
|
||||||
|
'action' => common_local_url('subedit')));
|
||||||
|
$this->out->hidden('token', common_session_token());
|
||||||
|
$this->out->hidden('profile', $this->profile->id);
|
||||||
|
if ($transports) {
|
||||||
|
$attrs = array('name' => 'jabber',
|
||||||
|
'type' => 'checkbox',
|
||||||
|
'class' => 'checkbox',
|
||||||
|
'id' => 'jabber-'.$this->profile->id);
|
||||||
|
if ($sub->jabber) {
|
||||||
|
$attrs['checked'] = 'checked';
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->out->element('input', $attrs);
|
||||||
|
// TRANS: Checkbox label for enabling IM messages for a profile in a subscriptions list.
|
||||||
|
$this->out->element('label', array('for' => 'jabber-'.$this->profile->id), _m('LABEL','IM'));
|
||||||
|
} else {
|
||||||
|
$this->out->hidden('jabber', $sub->jabber);
|
||||||
|
}
|
||||||
|
if (common_config('sms', 'enabled')) {
|
||||||
|
$attrs = array('name' => 'sms',
|
||||||
|
'type' => 'checkbox',
|
||||||
|
'class' => 'checkbox',
|
||||||
|
'id' => 'sms-'.$this->profile->id);
|
||||||
|
if ($sub->sms) {
|
||||||
|
$attrs['checked'] = 'checked';
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->out->element('input', $attrs);
|
||||||
|
// TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
|
||||||
|
$this->out->element('label', array('for' => 'sms-'.$this->profile->id), _('SMS'));
|
||||||
|
} else {
|
||||||
|
$this->out->hidden('sms', $sub->sms);
|
||||||
|
}
|
||||||
|
// TRANS: Save button for settings for a profile in a subscriptions list.
|
||||||
|
$this->out->submit('save', _m('BUTTON','Save'));
|
||||||
|
$this->out->elementEnd('form');
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user