0ct0pu5/forkbb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change o_topic_subscriptions

Browse source
This commit is contained in:
Visman 2021-12-19 13:23:13 +07:00
parent a2f8b0c232
commit 55b708e9cd
9 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Models/Pages/Admin/Install.php
View file

@ -1237,7 +1237,7 @@ class Install extends Admin
'o_admin_email' => $v->email,
'o_webmaster_email' => $v->email,
'b_forum_subscriptions' => 1,
'o_topic_subscriptions' => 1,
'b_topic_subscriptions' => 1,
'i_email_max_recipients' => 1,
'o_smtp_host' => NULL,
'o_smtp_user' => NULL,

6
app/Models/Pages/Admin/Options.php
View file

@ -69,7 +69,7 @@ class Options extends Admin
'o_admin_email' => 'required|string:trim|email',
'o_webmaster_email' => 'required|string:trim|email',
'b_forum_subscriptions' => 'required|integer|in:0,1',
'o_topic_subscriptions' => 'required|integer|in:0,1',
'b_topic_subscriptions' => 'required|integer|in:0,1',
'i_email_max_recipients' => 'required|integer|min:1|max:99999',
'o_smtp_host' => 'string:trim|max:255',
'o_smtp_user' => 'string:trim|max:255',
@ -569,9 +569,9 @@ class Options extends Admin
'caption' => 'Forum subscriptions label',
'help' => 'Forum subscriptions help',
],
'o_topic_subscriptions' => [
'b_topic_subscriptions' => [
'type' => 'radio',
'value' => $config->o_topic_subscriptions,
'value' => $config->b_topic_subscriptions,
'values' => $yn,
'caption' => 'Topic subscriptions label',
'help' => 'Topic subscriptions help',

2
app/Models/Pages/Admin/Update.php
View file

@ -516,7 +516,9 @@ class Update extends Admin
$config->b_regs_report = '1' == $config->o_regs_report ? 1 : 0;
$config->b_avatars = '1' == $config->o_avatars ? 1 : 0;
$config->b_forum_subscriptions = '1' == $config->o_forum_subscriptions ? 1 : 0;
$config->b_topic_subscriptions = '1' == $config->o_topic_subscriptions ? 1 : 0;
unset($config->o_topic_subscriptions);
unset($config->o_forum_subscriptions);
unset($config->o_avatars);
unset($config->o_regs_report);

14
app/Models/Pages/Post.php
View file

@ -304,10 +304,16 @@ class Post extends Page
$this->user->last_post = $now;
$this->c->users->update($this->user);
if ('1' == $this->c->config->o_topic_subscriptions) { // ????
if ($v->subscribe && ! $topic->is_subscribed) {
if (1 == $this->c->config->b_topic_subscriptions) { // ????
if (
$v->subscribe
&& ! $topic->is_subscribed
) {
$this->c->subscriptions->subscribe($this->user, $topic);
} elseif (! $v->subscribe && $topic->is_subscribed) {
} elseif (
! $v->subscribe
&& $topic->is_subscribed
) {
$this->c->subscriptions->unsubscribe($this->user, $topic);
}
}
@ -322,7 +328,7 @@ class Post extends Page
$this->c->subscriptions->send($post, $topic);
}
} else {
if ('1' == $this->c->config->o_topic_subscriptions) { // ????
if (1 == $this->c->config->b_topic_subscriptions) { // ????
$this->c->subscriptions->send($post);
}
}

2
app/Models/Pages/PostFormTrait.php
View file

@ -137,7 +137,7 @@ trait PostFormTrait
if (
! $edit
&& '1' == $this->c->config->o_topic_subscriptions
&& 1 == $this->c->config->b_topic_subscriptions
&& $this->user->email_confirmed
) {
$subscribed = ! $first && $model->is_subscribed;

2
app/Models/Pages/PostValidatorTrait.php
View file

@ -162,7 +162,7 @@ trait PostValidatorTrait
if (
! $edit
&& $notPM
&& '1' == $this->c->config->o_topic_subscriptions
&& 1 == $this->c->config->b_topic_subscriptions
&& $this->user->email_confirmed
) {
$ruleSubscribe = 'checkbox';

2
app/Models/Rules/Profile.php
View file

@ -183,7 +183,7 @@ class Profile extends Rules
)
&& (
1 == $this->c->config->b_forum_subscriptions
|| '1' == $this->c->config->o_topic_subscriptions
|| 1 == $this->c->config->b_topic_subscriptions
);
}
}

2
app/Models/Subscription/Subscription.php
View file

@ -232,7 +232,7 @@ class Subscription extends Model
if (self::TOPICS_DATA & $type) {
if (
'1' != $this->c->config->o_topic_subscriptions
1 != $this->c->config->b_topic_subscriptions
|| $model->isGuest
) {
$result[self::TOPICS_DATA] = null;

2
app/Models/Topic/Topic.php
View file

@ -87,7 +87,7 @@ class Topic extends DataModel
*/
protected function getcanSubscription(): bool
{
return '1' == $this->c->config->o_topic_subscriptions
return 1 == $this->c->config->b_topic_subscriptions
&& $this->id > 0
&& ! $this->c->user->isGuest
&& ! $this->c->user->isUnverified;