浏览代码

Change o_rules

Visman 3 年之前
父节点
当前提交
482bae2177

+ 1 - 1
app/Controllers/Routing.php

@@ -122,7 +122,7 @@ class Routing
             );
             // правила
             if (
-                '1' == $config->o_rules
+                1 == $config->b_rules
                 && (
                     ! $user->isGuest
                     || 1 == $config->b_regs_allow

+ 1 - 1
app/Models/Page.php

@@ -133,7 +133,7 @@ abstract class Page extends Model
         }
 
         if (
-            '1' == $this->c->config->o_rules
+            1 == $this->c->config->b_rules
             && '1' == $this->user->g_read_board
             && (
                 ! $this->user->isGuest

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

@@ -1247,7 +1247,7 @@ class Install extends Admin
             'b_regs_verify'           => 1,
             'b_announcement'          => 0,
             'o_announcement_message'  => __('Announcement '),
-            'o_rules'                 => 0,
+            'b_rules'                 => 0,
             'o_rules_message'         => __('Rules '),
             'o_maintenance'           => 0,
             'o_maintenance_message'   => __('Maintenance message '),

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

@@ -79,7 +79,7 @@ class Options extends Admin
                     'b_regs_allow'            => 'required|integer|in:0,1',
                     'b_regs_verify'           => 'required|integer|in:0,1',
                     'b_regs_report'           => 'required|integer|in:0,1',
-                    'o_rules'                 => 'required|integer|in:0,1|check_empty:o_rules_message',
+                    'b_rules'                 => 'required|integer|in:0,1|check_empty:o_rules_message',
                     'o_rules_message'         => 'string:trim|max:65000 bytes|html',
                     'i_default_email_setting' => 'required|integer|in:0,1,2',
                     'b_announcement'          => 'required|integer|in:0,1|check_empty:o_announcement_message',
@@ -644,9 +644,9 @@ class Options extends Admin
                     'caption' => 'Report new label',
                     'help'    => 'Report new help',
                 ],
-                'o_rules' => [
+                'b_rules' => [
                     'type'    => 'radio',
-                    'value'   => $config->o_rules,
+                    'value'   => $config->b_rules,
                     'values'  => $yn,
                     'caption' => 'Use rules label',
                     'help'    => 'Use rules help',

+ 2 - 0
app/Models/Pages/Admin/Update.php

@@ -520,7 +520,9 @@ class Update extends Admin
         $config->b_smtp_ssl            = '1' == $config->o_smtp_ssl ? 1 : 0;
         $config->b_regs_allow          = '1' == $config->o_regs_allow ? 1 : 0;
         $config->b_announcement        = '1' == $config->o_announcement ? 1 : 0;
+        $config->b_rules               = '1' == $config->o_rules ? 1 : 0;
 
+        unset($config->o_rules);
         unset($config->o_announcement);
         unset($config->o_regs_allow);
         unset($config->o_smtp_ssl);

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

@@ -53,7 +53,7 @@ class Rules extends Page
                 __('Register'),
             ]
         );
-        $this->rules      = '1' == $this->c->config->o_rules ? $this->c->config->o_rules_message : __('If no rules');
+        $this->rules      = 1 == $this->c->config->b_rules ? $this->c->config->o_rules_message : __('If no rules');
         $this->form       = $this->formAgree();
 
         return $this;