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

Change p_force_guest_email

Browse source
This commit is contained in:
Visman 2021-12-19 14:18:02 +07:00
parent 73c1c4dcf1
commit 968e7dbbac
5 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1259,7 +1259,7 @@ class Install extends Admin
'b_subject_all_caps' => 0,
'b_sig_all_caps' => 0,
'b_sig_bbcode' => 1,
'p_force_guest_email' => 1,
'b_force_guest_email' => 1,
'b_pm' => 0,
'b_poll_enabled' => 0,
'i_poll_max_questions' => 3,

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

@ -86,7 +86,7 @@ class Options extends Admin
'o_announcement_message' => 'string:trim|max:65000 bytes|html',
'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',
'b_force_guest_email' => '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',
@ -391,9 +391,9 @@ class Options extends Admin
'caption' => 'All caps sigs label',
'help' => 'All caps sigs help',
],
'p_force_guest_email' => [
'b_force_guest_email' => [
'type' => 'radio',
'value' => $config->p_force_guest_email,
'value' => $config->b_force_guest_email,
'values' => $yn,
'caption' => 'Require e-mail label',
'help' => 'Require e-mail help',

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

@ -528,7 +528,9 @@ class Update extends Admin
$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;
$config->b_sig_bbcode = '1' == $config->p_sig_bbcode ? 1 : 0;
$config->b_force_guest_email = '1' == $config->p_force_guest_email ? 1 : 0;
unset($config->p_force_guest_email);
unset($config->p_sig_bbcode);
unset($config->p_sig_all_caps);
unset($config->p_subject_all_caps);

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

@ -63,7 +63,7 @@ trait PostFormTrait
'type' => 'text',
'maxlength' => '80',
'caption' => 'Email',
'required' => '1' == $this->c->config->p_force_guest_email,
'required' => 1 == $this->c->config->b_force_guest_email,
'pattern' => '.+@.+',
'value' => $vars['email'] ?? null,
];

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

@ -106,7 +106,7 @@ trait PostValidatorTrait
$notPM = $this->fIndex !== self::FI_PM;
if ($this->user->isGuest) {
$ruleEmail = ('1' == $this->c->config->p_force_guest_email ? 'required|' : '') . 'string:trim|email:noban';
$ruleEmail = (1 == $this->c->config->b_force_guest_email ? 'required|' : '') . 'string:trim|email:noban';
$ruleUsername = 'required|string:trim|username';
} else {
$ruleEmail = 'absent';