Save email without lower case

app/Models/Pages/Admin/Options.php

@@ -63,14 +63,14 @@ class Options extends Admin
                     'o_feed_type'             => 'required|integer|in:0,1,2',
                     'o_feed_ttl'              => 'required|integer|in:0,5,15,30,60',
                     'o_report_method'         => 'required|integer|in:0,1,2',
-                    'o_mailing_list'          => 'string:trim|max:65000 bytes',
+                    'o_mailing_list'          => 'string:trim|max:65000 bytes', // ???? проверка списка email
                     'o_avatars'               => 'required|integer|in:0,1',
                     'o_avatars_dir'           => 'required|string:trim|max:255|check_dir',
                     'o_avatars_width'         => 'required|integer|min:50|max:999',
                     'o_avatars_height'        => 'required|integer|min:50|max:999',
                     'o_avatars_size'          => 'required|integer|min:0|max:9999999',
-                    'o_admin_email'           => 'required|string:trim,lower|email',
-                    'o_webmaster_email'       => 'required|string:trim,lower|email',
+                    'o_admin_email'           => 'required|string:trim|email',
+                    'o_webmaster_email'       => 'required|string:trim|email',
                     'o_forum_subscriptions'   => 'required|integer|in:0,1',
                     'o_topic_subscriptions'   => 'required|integer|in:0,1',
                     'o_smtp_host'             => 'string:trim|max:255',
@@ -592,6 +592,7 @@ class Options extends Admin
                     'caption'   => \ForkBB\__('Admin e-mail label'),
                     'info'      => \ForkBB\__('Admin e-mail help'),
                     'required'  => true,
+                    'pattern'   => '.+@.+',
                 ],
                 'o_webmaster_email' => [
                     'type'      => 'text',
@@ -600,6 +601,7 @@ class Options extends Admin
                     'caption'   => \ForkBB\__('Webmaster e-mail label'),
                     'info'      => \ForkBB\__('Webmaster e-mail help'),
                     'required'  => true,
+                    'pattern'   => '.+@.+',
                 ],
                 'o_forum_subscriptions' => [
                     'type'    => 'radio',

app/Models/Pages/Auth.php

@@ -201,7 +201,7 @@ class Auth extends Page
                 ->addValidators([
                 ])->addRules([
                     'token' => 'token:Forget',
-                    'email' => 'required|string:trim,lower|email:noban,exists,flood',
+                    'email' => 'required|string:trim|email:noban,exists,flood',
                 ])->addAliases([
                 ])->addMessages([
                     'email.email' => 'Invalid email',

app/Models/Pages/Install.php

@@ -142,7 +142,7 @@ class Install extends Page
                     'dbprefix'     => 'string:trim|max:40|check_prefix',
                     'username'     => 'required|string:trim|min:2|max:25',
                     'password'     => 'required|string|min:16|password',
-                    'email'        => 'required|string:trim|max:80|email',
+                    'email'        => 'required|string:trim|email',
                     'title'        => 'required|string:trim|max:255',
                     'descr'        => 'string:trim|max:65000 bytes',
                     'baseurl'      => 'required|string:trim|rtrim_url',

app/Models/Pages/PostValidatorTrait.php

@@ -100,7 +100,7 @@ trait PostValidatorTrait
     protected function messageValidator(Model $model, $marker, array $args, $editPost = false, $editSubject = false)
     {
         if ($this->user->isGuest) {
-            $ruleEmail    = ('1' == $this->c->config->p_force_guest_email ? 'required|' : '') . 'string:trim,lower|email:noban';
+            $ruleEmail    = ('1' == $this->c->config->p_force_guest_email ? 'required|' : '') . 'string:trim|email:noban';
             $ruleUsername = 'required|string:trim,spaces|username';
         } else {
             $ruleEmail    = 'absent';

app/Models/Pages/Profile/Email.php

@@ -59,7 +59,7 @@ class Email extends Profile
                 ])->addRules([
                     'token'     => 'token:EditUserEmail',
                     'password'  => 'required|string:trim|check_password',
-                    'new_email' => 'required|string:trim,lower|email:noban,unique,flood',
+                    'new_email' => 'required|string:trim|email:noban,unique,flood',
                 ])->addAliases([
                     'new_email' => 'New email',
                     'password'  => 'Your passphrase',