Visman 3 роки тому
батько
коміт
6b98c30aeb

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

@@ -1226,7 +1226,7 @@ class Install extends Admin
             'b_topic_views'           => 1,
             'b_topic_views'           => 1,
             'o_additional_navlinks'   => '',
             'o_additional_navlinks'   => '',
             'i_report_method'         => 0,
             'i_report_method'         => 0,
-            'o_regs_report'           => 0,
+            'b_regs_report'           => 0,
             'i_default_email_setting' => 2,
             'i_default_email_setting' => 2,
             'o_mailing_list'          => $v->email,
             'o_mailing_list'          => $v->email,
             'o_avatars'               => \in_array(\strtolower(@\ini_get('file_uploads')), ['on', 'true', '1'], true) ? 1 : 0,
             'o_avatars'               => \in_array(\strtolower(@\ini_get('file_uploads')), ['on', 'true', '1'], true) ? 1 : 0,

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

@@ -79,7 +79,7 @@ class Options extends Admin
                     'o_smtp_ssl'              => 'required|integer|in:0,1',
                     'o_smtp_ssl'              => 'required|integer|in:0,1',
                     'o_regs_allow'            => 'required|integer|in:0,1',
                     'o_regs_allow'            => 'required|integer|in:0,1',
                     'o_regs_verify'           => 'required|integer|in:0,1',
                     'o_regs_verify'           => 'required|integer|in:0,1',
-                    'o_regs_report'           => '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',
                     'o_rules'                 => 'required|integer|in:0,1|check_empty:o_rules_message',
                     'o_rules_message'         => 'string:trim|max:65000 bytes|html',
                     'o_rules_message'         => 'string:trim|max:65000 bytes|html',
                     'i_default_email_setting' => 'required|integer|in:0,1,2',
                     'i_default_email_setting' => 'required|integer|in:0,1,2',
@@ -645,9 +645,9 @@ class Options extends Admin
                     'caption' => 'Verify label',
                     'caption' => 'Verify label',
                     'help'    => 'Verify help',
                     'help'    => 'Verify help',
                 ],
                 ],
-                'o_regs_report' => [
+                'b_regs_report' => [
                     'type'    => 'radio',
                     'type'    => 'radio',
-                    'value'   => $config->o_regs_report,
+                    'value'   => $config->b_regs_report,
                     'values'  => $yn,
                     'values'  => $yn,
                     'caption' => 'Report new label',
                     'caption' => 'Report new label',
                     'help'    => 'Report new help',
                     'help'    => 'Report new help',

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

@@ -513,7 +513,9 @@ class Update extends Admin
         $config->b_censoring       = '1' == $config->o_censoring ? 1 : 0;
         $config->b_censoring       = '1' == $config->o_censoring ? 1 : 0;
         $config->b_show_dot        = '1' == $config->o_show_dot ? 1 : 0;
         $config->b_show_dot        = '1' == $config->o_show_dot ? 1 : 0;
         $config->b_topic_views     = '1' == $config->o_topic_views ? 1 : 0;
         $config->b_topic_views     = '1' == $config->o_topic_views ? 1 : 0;
+        $config->b_regs_report     = '1' == $config->o_regs_report ? 1 : 0;
 
 
+        unset($config->o_regs_report);
         unset($config->o_topic_views);
         unset($config->o_topic_views);
         unset($config->o_show_dot);
         unset($config->o_show_dot);
         unset($config->o_timeout_visit);
         unset($config->o_timeout_visit);

+ 2 - 2
app/Models/Pages/Register.php

@@ -185,7 +185,7 @@ class Register extends Page
 
 
         // уведомление о регистрации
         // уведомление о регистрации
         if (
         if (
-            '1' == $this->c->config->o_regs_report
+            1 == $this->c->config->b_regs_report
             && '' != $this->c->config->o_mailing_list
             && '' != $this->c->config->o_mailing_list
         ) {
         ) {
             $this->c->Lang->load('common', $this->c->config->o_default_lang);
             $this->c->Lang->load('common', $this->c->config->o_default_lang);
@@ -293,7 +293,7 @@ class Register extends Page
 
 
         // уведомление о дубликате email
         // уведомление о дубликате email
         if (
         if (
-            '1' == $this->c->config->o_regs_report
+            1 == $this->c->config->b_regs_report
             && '' != $this->c->config->o_mailing_list
             && '' != $this->c->config->o_mailing_list
         ) {
         ) {
             $this->c->Lang->load('common', $this->c->config->o_default_lang);
             $this->c->Lang->load('common', $this->c->config->o_default_lang);