A couple more 'Join Now' messages that need disabling when the site is closed or invite only
This commit is contained in:
parent
94271293ce
commit
b4c273113c
|
@ -390,11 +390,18 @@ class ShowgroupAction extends Action
|
||||||
|
|
||||||
function showAnonymousMessage()
|
function showAnonymousMessage()
|
||||||
{
|
{
|
||||||
|
if (!(common_config('site','closed') || common_config('site','inviteonly'))) {
|
||||||
$m = sprintf(_('**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
|
$m = sprintf(_('**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
|
||||||
'based on the Free Software [Laconica](http://laconi.ca/) tool. Its members share ' .
|
'based on the Free Software [Laconica](http://laconi.ca/) tool. Its members share ' .
|
||||||
'short messages about their life and interests. '.
|
'short messages about their life and interests. '.
|
||||||
'[Join now](%%%%action.register%%%%) to become part of this group and many more! ([Read more](%%%%doc.help%%%%))'),
|
'[Join now](%%%%action.register%%%%) to become part of this group and many more! ([Read more](%%%%doc.help%%%%))'),
|
||||||
$this->group->nickname);
|
$this->group->nickname);
|
||||||
|
} else {
|
||||||
|
$m = sprintf(_('**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
|
||||||
|
'based on the Free Software [Laconica](http://laconi.ca/) tool. Its members share ' .
|
||||||
|
'short messages about their life and interests. '),
|
||||||
|
$this->group->nickname);
|
||||||
|
}
|
||||||
$this->elementStart('div', array('id' => 'anon_notice'));
|
$this->elementStart('div', array('id' => 'anon_notice'));
|
||||||
$this->raw(common_markup_to_html($m));
|
$this->raw(common_markup_to_html($m));
|
||||||
$this->elementEnd('div');
|
$this->elementEnd('div');
|
||||||
|
|
|
@ -539,10 +539,16 @@ class ShowstreamAction extends Action
|
||||||
|
|
||||||
function showAnonymousMessage()
|
function showAnonymousMessage()
|
||||||
{
|
{
|
||||||
|
if (!(common_config('site','closed') || common_config('site','inviteonly'))) {
|
||||||
$m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
|
$m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
|
||||||
'based on the Free Software [Laconica](http://laconi.ca/) tool. ' .
|
'based on the Free Software [Laconica](http://laconi.ca/) tool. ' .
|
||||||
'[Join now](%%%%action.register%%%%) to follow **%s**\'s notices and many more! ([Read more](%%%%doc.help%%%%))'),
|
'[Join now](%%%%action.register%%%%) to follow **%s**\'s notices and many more! ([Read more](%%%%doc.help%%%%))'),
|
||||||
$this->user->nickname, $this->user->nickname);
|
$this->user->nickname, $this->user->nickname);
|
||||||
|
} else {
|
||||||
|
$m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
|
||||||
|
'based on the Free Software [Laconica](http://laconi.ca/) tool. '),
|
||||||
|
$this->user->nickname, $this->user->nickname);
|
||||||
|
}
|
||||||
$this->elementStart('div', array('id' => 'anon_notice'));
|
$this->elementStart('div', array('id' => 'anon_notice'));
|
||||||
$this->raw(common_markup_to_html($m));
|
$this->raw(common_markup_to_html($m));
|
||||||
$this->elementEnd('div');
|
$this->elementEnd('div');
|
||||||
|
|
Loading…
Reference in New Issue
Block a user