From 60bc949ba1d5a6851e525868f69e997d4c8a2075 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 3 Oct 2019 23:05:02 +0200
Subject: [ticket/14465] Remove setting for maximum password length

PHPBB3-14465
---
 phpBB/phpbb/console/command/user/add.php           |  2 +-
 .../migration/data/v330/remove_max_pass_chars.php  | 43 ++++++++++++++++++++++
 phpBB/phpbb/ucp/controller/reset_password.php      |  4 +-
 3 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 phpBB/phpbb/db/migration/data/v330/remove_max_pass_chars.php

(limited to 'phpBB/phpbb')

diff --git a/phpBB/phpbb/console/command/user/add.php b/phpBB/phpbb/console/command/user/add.php
index c60a059251..303216a93d 100644
--- a/phpBB/phpbb/console/command/user/add.php
+++ b/phpBB/phpbb/console/command/user/add.php
@@ -239,7 +239,7 @@ class add extends command
 				array('string', false, $this->config['min_name_chars'], $this->config['max_name_chars']),
 				array('username', '')),
 			'new_password' => array(
-				array('string', false, $this->config['min_pass_chars'], $this->config['max_pass_chars']),
+				array('string', false, $this->config['min_pass_chars'], 0),
 				array('password')),
 			'email'        => array(
 				array('string', false, 6, 60),
diff --git a/phpBB/phpbb/db/migration/data/v330/remove_max_pass_chars.php b/phpBB/phpbb/db/migration/data/v330/remove_max_pass_chars.php
new file mode 100644
index 0000000000..10e5ee385d
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v330/remove_max_pass_chars.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v330;
+
+class remove_max_pass_chars extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return !$this->config->offsetExists('max_pass_chars');
+	}
+
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v330\dev',
+		];
+	}
+
+	public function update_data()
+	{
+		return [
+			['config.remove', ['max_pass_chars']],
+		];
+	}
+
+	public function revert_data()
+	{
+		return [
+			['config.add', ['max_pass_chars', 100]],
+		];
+	}
+}
diff --git a/phpBB/phpbb/ucp/controller/reset_password.php b/phpBB/phpbb/ucp/controller/reset_password.php
index 666957b0dc..7bd1b20cb3 100644
--- a/phpBB/phpbb/ucp/controller/reset_password.php
+++ b/phpBB/phpbb/ucp/controller/reset_password.php
@@ -393,10 +393,10 @@ class reset_password
 			];
 			$check_data = [
 				'new_password'		=> [
-					['string', false, $this->config['min_pass_chars'], $this->config['max_pass_chars']],
+					['string', false, $this->config['min_pass_chars'], 0],
 					['password'],
 				],
-				'password_confirm'	=> ['string', true, $this->config['min_pass_chars'], $this->config['max_pass_chars']],
+				'password_confirm'	=> ['string', true, $this->config['min_pass_chars'], 0],
 			];
 			$errors = array_merge($errors, validate_data($data, $check_data));
 			if (strcmp($data['new_password'], $data['password_confirm']) !== 0)
-- 
cgit v1.2.1