Convert high level config to low level config

min_password_length is a low level config item that should rarely need to be customized since it is a common security standard
wintercms · Sep 1, 2019 · 243ab40 · 243ab40
1 parent 0b6688e
commit 243ab40
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 18 deletions.
diff --git a/lang/de/lang.php b/lang/de/lang.php
@@ -98,8 +98,6 @@
  'notifications_tab' => 'Benachrichtigungen',
  'allow_registration' => 'Benutzerregistrierung erlauben',
  'allow_registration_comment' => 'Falls dies deaktivert ist, können Benutzer nur von Administratoren erstellt werden.',
- 'min_password_length' => 'Minimale Passwortlänge',
- 'min_password_length_comment' => 'Die minimale Passwortlänge für Benutzerpasswörter.',
  'activate_mode' => 'Aktivierungsmodus',
  'activate_mode_comment' => 'Wählen Sie aus, wie ein Benutzer aktiviert werden soll.',
  'activate_mode_auto' => 'Automatisch',

diff --git a/lang/en/lang.php b/lang/en/lang.php
@@ -75,8 +75,6 @@
  'notifications_tab' => 'Notifications',
  'allow_registration' => 'Allow user registration',
  'allow_registration_comment' => 'If this is disabled users can only be created by administrators.',
- 'min_password_length' => 'Minimum password length',
- 'min_password_length_comment' => 'The minimum length of characters required for user passwords.',
  'activate_mode' => 'Activation mode',
  'activate_mode_comment' => 'Select how a user account should be activated.',
  'activate_mode_auto' => 'Automatic',

diff --git a/lang/ru/lang.php b/lang/ru/lang.php
@@ -79,8 +79,6 @@
  'notifications_tab' => 'Оповещения',
  'allow_registration' => 'Разрешить регистрацию',
  'allow_registration_comment' => 'Если эта опция выключена, только администраторы смогут регистрировать пользователей.',
- 'min_password_length' => 'Минимальная длина пароля',
- 'min_password_length_comment' => 'Минимальное количество символов для пароля пользователя.',
  'activate_mode' => 'Активация',
  'activate_mode_comment' => 'Активация пользователя.',
  'activate_mode_auto' => 'Автоматическая',

diff --git a/models/Settings.php b/models/Settings.php
@@ -25,7 +25,6 @@ class Settings extends Model
  const REMEMBER_ALWAYS = 'always';
  const REMEMBER_NEVER = 'never';
  const REMEMBER_ASK = 'ask';
- const MIN_PASSWORD_LENGTH_DEFAULT = 8;
 
  public function initSettingsData()
  {
@@ -37,7 +36,6 @@ public function initSettingsData()
  $this->login_attribute = self::LOGIN_EMAIL;
  $this->update_requires_password = false;
  $this->remember_login = self::REMEMBER_ALWAYS;
- $this->min_password_length = self::MIN_PASSWORD_LENGTH_DEFAULT;
  $this->use_register_throttle = true;
  }
 

diff --git a/models/User.php b/models/User.php
@@ -4,6 +4,7 @@
 use Auth;
 use Mail;
 use Event;
+use Config;
 use Carbon\Carbon;
 use October\Rain\Auth\Models\User as UserBase;
 use RainLab\User\Models\Settings as UserSettings;
@@ -201,7 +202,7 @@ public function getLoginName()
  */
  public static function getMinPasswordLength()
  {
- return (int) UserSettings::get('min_password_length', UserSettings::MIN_PASSWORD_LENGTH_DEFAULT);
+ return Config::get('min_password_length', 8);
  }
 
  //

diff --git a/models/settings/fields.yaml b/models/settings/fields.yaml
@@ -52,15 +52,6 @@ tabs:
  type: switch
  tab: rainlab.user::lang.settings.registration_tab
 
- # Minimum password length
- min_password_length:
- span: left
- commentAbove: rainlab.user::lang.settings.min_password_length_comment
- label: rainlab.user::lang.settings.min_password_length
- type: number
- tab: rainlab.user::lang.settings.registration_tab
- min: 1
-
  # Require Activation
  require_activation:
  span: left