From ae915f4c92061c41556353e69b75bec36436bfb8 Mon Sep 17 00:00:00 2001 From: Mitsuru Mutaguchi Date: Tue, 24 Feb 2026 13:59:31 +0900 Subject: [PATCH 1/5] =?UTF-8?q?bugfix:=20=E3=83=95=E3=82=A9=E3=83=BC?= =?UTF-8?q?=E3=83=A0,=20=E9=81=B8=E6=8A=9E=E8=82=A2=E3=81=AE=E6=9C=AB?= =?UTF-8?q?=E5=B0=BE=E3=81=AB=E5=85=A8=E5=AD=A6=E7=A9=BA=E7=99=BD=E3=81=8C?= =?UTF-8?q?=E3=81=82=E3=82=8B=E3=81=A8=E3=80=81=E5=85=A5=E5=8A=9B=E3=82=A8?= =?UTF-8?q?=E3=83=A9=E3=83=BC=E6=99=82=E3=81=AB=E9=81=B8=E6=8A=9E=E3=81=97?= =?UTF-8?q?=E3=81=9F=E3=82=82=E3=81=AE=E3=81=8C=E5=A4=96=E3=82=8C=E3=82=8B?= =?UTF-8?q?=E3=83=90=E3=82=B0=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/User/Forms/FormsColumns.php | 15 ++++++++++++++- app/Plugins/User/Forms/FormsPlugin.php | 5 +++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/Models/User/Forms/FormsColumns.php b/app/Models/User/Forms/FormsColumns.php index 7b27b806d..685c6228b 100644 --- a/app/Models/User/Forms/FormsColumns.php +++ b/app/Models/User/Forms/FormsColumns.php @@ -2,6 +2,7 @@ namespace App\Models\User\Forms; +use App\Enums\FormColumnType; use App\UserableNohistory; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; @@ -21,7 +22,19 @@ class FormsColumns extends Model public static function isFileColumnType($column_type) { // ファイルタイプ - if ($column_type == \FormColumnType::file) { + if ($column_type == FormColumnType::file) { + return true; + } + return false; + } + + /** + * 選択肢タイプのカラム型か + */ + public static function isChoicesColumnType($column_type) + { + // 選択肢タイプ + if ($column_type == FormColumnType::select || $column_type == FormColumnType::radio || $column_type == FormColumnType::checkbox) { return true; } return false; diff --git a/app/Plugins/User/Forms/FormsPlugin.php b/app/Plugins/User/Forms/FormsPlugin.php index fb273ad39..7cbe116b6 100644 --- a/app/Plugins/User/Forms/FormsPlugin.php +++ b/app/Plugins/User/Forms/FormsPlugin.php @@ -876,8 +876,9 @@ public function publicConfirm($request, $page_id, $frame_id, $id = null) // 入力値をトリム // bugfix: 【データベース】（Laravel6テスト）ファイル型項目にファイルをアップするとシステムエラーと同じ対応 https://github.com/opensource-workshop/connect-cms/issues/732 foreach ($forms_columns as $forms_column) { - // ファイルタイプ以外の入力値をトリム - if (! FormsColumns::isFileColumnType($forms_column->column_type)) { + // ファイルタイプ, 選択肢タイプ以外の入力値をトリム + if (FormsColumns::isFileColumnType($forms_column->column_type) || FormsColumns::isChoicesColumnType($forms_column->column_type)) { + } else { if (isset($request->forms_columns_value[$forms_column->id])) { // 一度配列にして、trim後、また文字列に戻す。 $tmp_columns_value = StringUtils::trimInput($request->forms_columns_value[$forms_column->id]); From 288f28660c12f2369a773d8d62c7dbf2923e089f Mon Sep 17 00:00:00 2001 From: Mitsuru Mutaguchi Date: Wed, 25 Feb 2026 17:42:45 +0900 Subject: [PATCH 2/5] =?UTF-8?q?refactor:=20=E3=83=95=E3=82=A9=E3=83=BC?= =?UTF-8?q?=E3=83=A0,=20=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=BF?= =?UTF-8?q?=E3=82=A4=E3=83=97,=20=E9=81=B8=E6=8A=9E=E8=82=A2=E3=82=BF?= =?UTF-8?q?=E3=82=A4=E3=83=97=E4=BB=A5=E5=A4=96=E3=81=AEif=E6=96=87?= =?UTF-8?q?=E3=82=92=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF=E3=82=BF=E3=83=AA?= =?UTF-8?q?=E3=83=B3=E3=82=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Plugins/User/Forms/FormsPlugin.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Plugins/User/Forms/FormsPlugin.php b/app/Plugins/User/Forms/FormsPlugin.php index 7cbe116b6..d607a6852 100644 --- a/app/Plugins/User/Forms/FormsPlugin.php +++ b/app/Plugins/User/Forms/FormsPlugin.php @@ -877,8 +877,7 @@ public function publicConfirm($request, $page_id, $frame_id, $id = null) // bugfix: 【データベース】（Laravel6テスト）ファイル型項目にファイルをアップするとシステムエラーと同じ対応 https://github.com/opensource-workshop/connect-cms/issues/732 foreach ($forms_columns as $forms_column) { // ファイルタイプ, 選択肢タイプ以外の入力値をトリム - if (FormsColumns::isFileColumnType($forms_column->column_type) || FormsColumns::isChoicesColumnType($forms_column->column_type)) { - } else { + if (!FormsColumns::isFileColumnType($forms_column->column_type) && !FormsColumns::isChoicesColumnType($forms_column->column_type)) { if (isset($request->forms_columns_value[$forms_column->id])) { // 一度配列にして、trim後、また文字列に戻す。 $tmp_columns_value = StringUtils::trimInput($request->forms_columns_value[$forms_column->id]); From 43ea0ade98b1e453615b45106572b00127bc5fde Mon Sep 17 00:00:00 2001 From: Mitsuru Mutaguchi Date: Wed, 25 Feb 2026 17:45:33 +0900 Subject: [PATCH 3/5] =?UTF-8?q?refactor:=20=E3=83=95=E3=82=A9=E3=83=BC?= =?UTF-8?q?=E3=83=A0,=20isChoicesColumnType()=E3=81=A7=E3=81=AF=E5=90=8C?= =?UTF-8?q?=E5=90=8D=E3=81=AE=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89=E3=81=8C?= =?UTF-8?q?UsersColumns=E3=83=A2=E3=83=87=E3=83=AB=E3=81=A7=E3=81=82?= =?UTF-8?q?=E3=82=8B=E3=81=9F=E3=82=81=E3=80=81isSelectColumnType()?= =?UTF-8?q?=E3=81=AB=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89=E5=90=8D=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/User/Forms/FormsColumns.php | 2 +- app/Plugins/User/Forms/FormsPlugin.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/User/Forms/FormsColumns.php b/app/Models/User/Forms/FormsColumns.php index 685c6228b..db3053945 100644 --- a/app/Models/User/Forms/FormsColumns.php +++ b/app/Models/User/Forms/FormsColumns.php @@ -31,7 +31,7 @@ public static function isFileColumnType($column_type) /** * 選択肢タイプのカラム型か */ - public static function isChoicesColumnType($column_type) + public static function isSelectColumnType($column_type) { // 選択肢タイプ if ($column_type == FormColumnType::select || $column_type == FormColumnType::radio || $column_type == FormColumnType::checkbox) { diff --git a/app/Plugins/User/Forms/FormsPlugin.php b/app/Plugins/User/Forms/FormsPlugin.php index d607a6852..3d3b5db3d 100644 --- a/app/Plugins/User/Forms/FormsPlugin.php +++ b/app/Plugins/User/Forms/FormsPlugin.php @@ -877,7 +877,7 @@ public function publicConfirm($request, $page_id, $frame_id, $id = null) // bugfix: 【データベース】（Laravel6テスト）ファイル型項目にファイルをアップするとシステムエラーと同じ対応 https://github.com/opensource-workshop/connect-cms/issues/732 foreach ($forms_columns as $forms_column) { // ファイルタイプ, 選択肢タイプ以外の入力値をトリム - if (!FormsColumns::isFileColumnType($forms_column->column_type) && !FormsColumns::isChoicesColumnType($forms_column->column_type)) { + if (!FormsColumns::isFileColumnType($forms_column->column_type) && !FormsColumns::isSelectColumnType($forms_column->column_type)) { if (isset($request->forms_columns_value[$forms_column->id])) { // 一度配列にして、trim後、また文字列に戻す。 $tmp_columns_value = StringUtils::trimInput($request->forms_columns_value[$forms_column->id]); From 9bb96384ebf637f18b62c9641ab6e50e1b88c1e8 Mon Sep 17 00:00:00 2001 From: Mitsuru Mutaguchi Date: Wed, 25 Feb 2026 17:49:05 +0900 Subject: [PATCH 4/5] =?UTF-8?q?refactor:=20=E3=83=95=E3=82=A9=E3=83=BC?= =?UTF-8?q?=E3=83=A0,=20FormsColumns=E3=83=A2=E3=83=87=E3=83=AB=E3=81=AE?= =?UTF-8?q?=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89=E3=81=AB=E6=88=BB=E3=82=8A?= =?UTF-8?q?=E5=80=A4=E5=9E=8B=E5=AE=A3=E8=A8=80=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/User/Forms/FormsColumns.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/User/Forms/FormsColumns.php b/app/Models/User/Forms/FormsColumns.php index db3053945..ceb6f53f5 100644 --- a/app/Models/User/Forms/FormsColumns.php +++ b/app/Models/User/Forms/FormsColumns.php @@ -19,7 +19,7 @@ class FormsColumns extends Model /** * ファイルタイプのカラム型か */ - public static function isFileColumnType($column_type) + public static function isFileColumnType($column_type): bool { // ファイルタイプ if ($column_type == FormColumnType::file) { @@ -31,7 +31,7 @@ public static function isFileColumnType($column_type) /** * 選択肢タイプのカラム型か */ - public static function isSelectColumnType($column_type) + public static function isSelectColumnType($column_type): bool { // 選択肢タイプ if ($column_type == FormColumnType::select || $column_type == FormColumnType::radio || $column_type == FormColumnType::checkbox) { From df8566bffdfcb1eb3ee20b8fffa408c50e1351a4 Mon Sep 17 00:00:00 2001 From: Mitsuru Mutaguchi Date: Wed, 25 Feb 2026 17:58:18 +0900 Subject: [PATCH 5/5] =?UTF-8?q?bugfix:=20=E3=83=87=E3=83=BC=E3=82=BF?= =?UTF-8?q?=E3=83=99=E3=83=BC=E3=82=B9,=20=E9=81=B8=E6=8A=9E=E8=82=A2?= =?UTF-8?q?=E3=81=AE=E6=9C=AB=E5=B0=BE=E3=81=AB=E5=85=A8=E5=AD=A6=E7=A9=BA?= =?UTF-8?q?=E7=99=BD=E3=81=8C=E3=81=82=E3=82=8B=E3=81=A8=E3=80=81=E5=85=A5?= =?UTF-8?q?=E5=8A=9B=E3=82=A8=E3=83=A9=E3=83=BC=E6=99=82=E3=81=AB=E9=81=B8?= =?UTF-8?q?=E6=8A=9E=E3=81=97=E3=81=9F=E3=82=82=E3=81=AE=E3=81=8C=E5=A4=96?= =?UTF-8?q?=E3=82=8C=E3=82=8B=E3=83=90=E3=82=B0=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/User/Databases/DatabasesColumns.php | 16 ++++++++++++++-- app/Plugins/User/Databases/DatabasesPlugin.php | 4 ++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/Models/User/Databases/DatabasesColumns.php b/app/Models/User/Databases/DatabasesColumns.php index a349727db..98afaec85 100644 --- a/app/Models/User/Databases/DatabasesColumns.php +++ b/app/Models/User/Databases/DatabasesColumns.php @@ -60,7 +60,7 @@ public function isNotInputColumnType() /** * ファイルタイプのカラム型か */ - public static function isFileColumnType($column_type) + public static function isFileColumnType($column_type): bool { // ファイルタイプ if ($column_type == DatabaseColumnType::file || @@ -71,10 +71,22 @@ public static function isFileColumnType($column_type) return false; } + /** + * 選択肢タイプのカラム型か + */ + public static function isSelectColumnType($column_type): bool + { + // 選択肢タイプ + if ($column_type == DatabaseColumnType::select || $column_type == DatabaseColumnType::radio || $column_type == DatabaseColumnType::checkbox) { + return true; + } + return false; + } + /** * 埋め込みタグから除外するカラム型か */ - public static function isNotEmbeddedTagsColumnType($column_type) + public static function isNotEmbeddedTagsColumnType($column_type): bool { // 登録日型・更新日型・公開日型・表示順型は入力しない if ($column_type == DatabaseColumnType::created || diff --git a/app/Plugins/User/Databases/DatabasesPlugin.php b/app/Plugins/User/Databases/DatabasesPlugin.php index 5cc4016fe..ee4b4b1b3 100644 --- a/app/Plugins/User/Databases/DatabasesPlugin.php +++ b/app/Plugins/User/Databases/DatabasesPlugin.php @@ -1426,8 +1426,8 @@ public function publicConfirm($request, $page_id, $frame_id, $id = null) //$request->merge(StringUtils::trimInput($request->all())); foreach ($databases_columns as $databases_column) { - // ファイルタイプ以外の入力値をトリム - if (! DatabasesColumns::isFileColumnType($databases_column->column_type)) { + // ファイルタイプ, 選択肢タイプ以外の入力値をトリム + if (!DatabasesColumns::isFileColumnType($databases_column->column_type) && !DatabasesColumns::isSelectColumnType($databases_column->column_type)) { if (isset($request->databases_columns_value[$databases_column->id])) { // 一度配列にして、trim後、また文字列に戻す。 $tmp_columns_value = StringUtils::trimInput($request->databases_columns_value[$databases_column->id]);