From 94e9eec3608fb936830eff2aab4e1510a5ea0bf8 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Tue, 20 Jun 2023 09:36:19 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20avatar=E8=A1=A8=E7=A4=BA=E3=81=AE?=
 =?UTF-8?q?=E4=B8=8D=E5=85=B7=E5=90=88=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Config/routes.php              | 20 ++++++++++----------
 Controller/UsersController.php | 10 +++++-----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Config/routes.php b/Config/routes.php
index 79b7c06..d77a9fa 100644
--- a/Config/routes.php
+++ b/Config/routes.php
@@ -19,16 +19,16 @@
 	['user_id' => '[0-9]+', 'field_name' => 'avatar', 'size' => 'medium']
 );
 
-Router::connect(
-	'/users/users/download/:user_id/:field_name/:size',
-	['plugin' => 'users', 'controller' => 'users', 'action' => 'download'],
-	['user_id' => '[0-9]+', 'size' => 'big|medium|small|thumb']
-);
-Router::connect(
-	'/users/users/download/:user_id/:field_name',
-	['plugin' => 'users', 'controller' => 'users', 'action' => 'download', 'size' => 'medium'],
-	['user_id' => '[0-9]+', 'size' => 'medium']
-);
+//Router::connect(
+//	'/users/users/download/:user_id/:field_name/:size',
+//	['plugin' => 'users', 'controller' => 'users', 'action' => 'download'],
+//	['user_id' => '[0-9]+', 'size' => 'big|medium|small|thumb']
+//);
+//Router::connect(
+//	'/users/users/download/:user_id/:field_name',
+//	['plugin' => 'users', 'controller' => 'users', 'action' => 'download', 'size' => 'medium'],
+//	['user_id' => '[0-9]+', 'size' => 'medium']
+//);
 Router::connect(
 	'/users/users/download/*',
 	array(
diff --git a/Controller/UsersController.php b/Controller/UsersController.php
index 08cf082..e8e326d 100644
--- a/Controller/UsersController.php
+++ b/Controller/UsersController.php
@@ -361,7 +361,7 @@ public function delete_confirm() {
  */
 	public function download() {
 		if (! $this->__prepare()) {
-			return $this->downloadNoImage();
+			return $this->__downloadNoImage();
 		}
 
 		$user = $this->viewVars['user'];
@@ -374,14 +374,14 @@ public function download() {
 		);
 
 		if (! $fileSetting) {
-			return $this->downloadNoImage();
+			return $this->__downloadNoImage();
 		}
 		$userAttribute = Hash::get($this->viewVars['userAttributes'],
 			$fileSetting[0]['row'] . '.' . $fileSetting[0]['col'] . '.' . $fileSetting[0]['weight']
 		);
 
 		if (! Hash::get($user, 'UploadFile.' . $fieldName . '.field_name')) {
-			return $this->downloadNoImage();
+			return $this->__downloadNoImage();
 		}
 
 		//以下の場合、アバター表示
@@ -400,7 +400,7 @@ public function download() {
 					! Hash::get($user, 'User.' . sprintf(UserAttribute::PUBLIC_FIELD_FORMAT, $fieldName)) ||
 				! $userAttribute['UserAttributesRole']['other_readable'] ||
 				! $userAttribute['UserAttributeSetting']['display']) {
-			return $this->downloadNoImage();
+			return $this->__downloadNoImage();
 		} else {
 			return $this->Download->doDownload($user['User']['id'],
 				array('field' => $fieldName, 'size' => $fieldSize)
@@ -413,7 +413,7 @@ public function download() {
  *
  * @return void
  */
-	public function downloadNoImage() {
+	private function __downloadNoImage() {
 		$user = $this->viewVars['user'];
 		$fieldName = $this->params['field_name'];
 		$fieldSize = $this->params['size'];