Browse Source

Change p_sig_all_caps

Visman 3 years ago
parent
commit
05c53d66cd

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

@@ -1257,7 +1257,7 @@ class Install extends Admin
             'b_message_bbcode'        => 1,
             'b_message_all_caps'      => 0,
             'b_subject_all_caps'      => 0,
-            'p_sig_all_caps'          => 1,
+            'b_sig_all_caps'          => 0,
             'p_sig_bbcode'            => 1,
             'p_force_guest_email'     => 1,
             'b_pm'                    => 0,

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

@@ -87,7 +87,7 @@ class Options extends Admin
                     'b_message_all_caps'      => 'required|integer|in:0,1',
                     'b_subject_all_caps'      => 'required|integer|in:0,1',
                     'p_force_guest_email'     => 'required|integer|in:0,1',
-                    'p_sig_all_caps'          => 'required|integer|in:0,1',
+                    'b_sig_all_caps'          => 'required|integer|in:0,1',
                     'b_poll_enabled'          => 'required|integer|in:0,1',
                     'i_poll_max_questions'    => 'required|integer|min:1|max:99',
                     'i_poll_max_fields'       => 'required|integer|min:2|max:99',
@@ -384,9 +384,9 @@ class Options extends Admin
                     'caption' => 'All caps subject label',
                     'help'    => 'All caps subject help',
                 ],
-                'p_sig_all_caps' => [
+                'b_sig_all_caps' => [
                     'type'    => 'radio',
-                    'value'   => $config->p_sig_all_caps,
+                    'value'   => $config->b_sig_all_caps,
                     'values'  => $yn,
                     'caption' => 'All caps sigs label',
                     'help'    => 'All caps sigs help',

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

@@ -526,7 +526,9 @@ class Update extends Admin
         $config->b_message_bbcode      = '1' == $config->p_message_bbcode ? 1 : 0;
         $config->b_message_all_caps    = '1' == $config->p_message_all_caps ? 1 : 0;
         $config->b_subject_all_caps    = '1' == $config->p_subject_all_caps ? 1 : 0;
+        $config->b_sig_all_caps        = '1' == $config->p_sig_all_caps ? 1 : 0;
 
+        unset($config->p_sig_all_caps);
         unset($config->p_subject_all_caps);
         unset($config->p_message_all_caps);
         unset($config->p_message_bbcode);

+ 1 - 1
app/Models/Pages/Profile/Edit.php

@@ -194,7 +194,7 @@ class Edit extends Profile
             if (
                 true === $prepare
                 && ! $this->user->isAdmin
-                && '0' == $this->c->config->p_sig_all_caps
+                && 1 != $this->c->config->b_sig_all_caps
             ) {
                 $text = $this->c->Parser->getText();