Переглянути джерело

Change o_topic_subscriptions

Visman 3 роки тому
батько
коміт
55b708e9cd

+ 1 - 1
app/Models/Pages/Admin/Install.php

@@ -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,

+ 3 - 3
app/Models/Pages/Admin/Options.php

@@ -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 - 0
app/Models/Pages/Admin/Update.php

@@ -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);

+ 10 - 4
app/Models/Pages/Post.php

@@ -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);
                 }
             }

+ 1 - 1
app/Models/Pages/PostFormTrait.php

@@ -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;

+ 1 - 1
app/Models/Pages/PostValidatorTrait.php

@@ -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';

+ 1 - 1
app/Models/Rules/Profile.php

@@ -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
             );
     }
 }

+ 1 - 1
app/Models/Subscription/Subscription.php

@@ -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;

+ 1 - 1
app/Models/Topic/Topic.php

@@ -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;