From f6aa6903fff7aa71208ac03aed6e94f86337a6b8 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Wed, 26 Aug 2020 20:15:46 +0900
Subject: [PATCH 1/2] change: Version number to 3.3.2

---
 VERSION.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 VERSION.txt

diff --git a/VERSION.txt b/VERSION.txt
new file mode 100644
index 0000000..4772543
--- /dev/null
+++ b/VERSION.txt
@@ -0,0 +1 @@
+3.3.2

From 62c528eabeeb634342543efefc7b5fe93bf8ddd4 Mon Sep 17 00:00:00 2001
From: ryu818 <masukawa@nii.ac.jp>
Date: Wed, 28 Oct 2020 06:52:41 +0900
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E3=83=91=E3=82=B9=E3=83=AF=E3=83=BC?=
 =?UTF-8?q?=E3=83=89=E5=86=8D=E7=99=BA=E8=A1=8C=E3=81=AF=E3=80=81=E7=8A=B6?=
 =?UTF-8?q?=E6=85=8B=E3=81=8C=E5=88=A9=E7=94=A8=E4=B8=8D=E5=8F=AF=E3=80=81?=
 =?UTF-8?q?=E6=89=BF=E8=AA=8D=E5=BE=85=E3=81=A1=E3=81=AE=E5=A0=B4=E5=90=88?=
 =?UTF-8?q?=E3=80=81=E5=AF=BE=E8=B1=A1=E5=A4=96=E3=81=AB=E3=80=82=E6=89=BF?=
 =?UTF-8?q?=E8=AA=8D=E6=B8=88=E3=81=AE=E5=A0=B4=E5=90=88=E3=81=AF=E3=80=81?=
 =?UTF-8?q?=E5=88=A9=E7=94=A8=E5=8F=AF=E3=81=AB=E6=9B=B4=E6=96=B0=E3=81=97?=
 =?UTF-8?q?=E3=81=A6=E5=86=8D=E7=99=BA=E8=A1=8C=E3=82=92=E8=A1=8C=E3=81=86?=
 =?UTF-8?q?=E3=80=82=20https://github.com/researchmap/RmNetCommons3/issues?=
 =?UTF-8?q?/2287?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Controller/ForgotPassController.php | 13 +++++++++++++
 Model/ForgotPass.php                |  6 +++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/Controller/ForgotPassController.php b/Controller/ForgotPassController.php
index 430f549..a4611bb 100644
--- a/Controller/ForgotPassController.php
+++ b/Controller/ForgotPassController.php
@@ -12,6 +12,7 @@
 App::uses('AuthAppController', 'Auth.Controller');
 App::uses('NetCommonsMail', 'Mails.Utility');
 App::uses('SiteSettingUtil', 'SiteManager.Utility');
+App::uses('UserAttributeChoice', 'UserAttributes.Model');
 
 /**
  * パスワード再発行Controller
@@ -234,6 +235,18 @@ public function update() {
 		}
 
 		if ($this->request->is('put')) {
+			// 承認済ならば、利用可へ
+			$userId = $this->request->data[$this->User->alias]['id'] ?? null;
+			$user = $this->User->find('first', array(
+				'recursive' => -1,
+				'conditions' => array('id' => $userId)
+			));
+
+			if ($user && $user[$this->User->alias]['status'] === UserAttributeChoice::STATUS_CODE_APPROVED) {
+				$this->request->data[$this->User->alias]['status']
+					= UserAttributeChoice::STATUS_CODE_ACTIVE;
+			}
+
 			if ($this->ForgotPass->savePassowrd($this->request->data)) {
 				$this->NetCommons->setFlashNotification(
 					__d('net_commons', 'Successfully saved.'), array('class' => 'success')
diff --git a/Model/ForgotPass.php b/Model/ForgotPass.php
index 9d5e20c..48bc54b 100644
--- a/Model/ForgotPass.php
+++ b/Model/ForgotPass.php
@@ -10,6 +10,7 @@
  */
 
 App::uses('AppModel', 'Model');
+App::uses('UserAttributeChoice', 'UserAttributes.Model');
 
 /**
  * パスワード再発行Model
@@ -113,9 +114,12 @@ public function validateRequest($data) {
 
 		//メールアドレスのチェック
 		$email = trim($data['ForgotPass']['email']);
+		// 削除済 or 承認待ち or 利用不可ならメール送信しない
 		$conditions = array(
-			'is_deleted' => false
+			'is_deleted' => false,
+			'status' => [UserAttributeChoice::STATUS_CODE_ACTIVE, UserAttributeChoice::STATUS_CODE_APPROVED]
 		);
+
 		$fields = $this->User->getEmailFields();
 		foreach ($fields as $field) {
 			$conditions['OR'][$field] = $email;