From 9b8aa67b4f3c661741e969c26c17524cd182c85e Mon Sep 17 00:00:00 2001 From: kanno Date: Thu, 16 Dec 2021 18:47:30 +0900 Subject: [PATCH 1/2] =?UTF-8?q?#278=20=E3=83=95=E3=82=A9=E3=83=BC=E3=83=A0?= =?UTF-8?q?=E5=85=A5=E5=8A=9B=E7=94=BB=E9=9D=A2=E3=81=AB=E3=81=A6=E5=A4=89?= =?UTF-8?q?=E6=9B=B4=E4=B8=8D=E5=8F=AF=E3=81=AE=E3=83=87=E3=83=95=E3=82=A9?= =?UTF-8?q?=E3=83=AB=E3=83=88=E5=80=A4=E3=81=8C=E5=A4=89=E6=9B=B4=E3=81=A7?= =?UTF-8?q?=E3=81=8D=E3=81=A6=E3=81=97=E3=81=BE=E3=81=86=E7=AE=87=E6=89=80?= =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/Webforms/capture.php | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/modules/Webforms/capture.php b/modules/Webforms/capture.php index 1057ce381..27eda1cb0 100644 --- a/modules/Webforms/capture.php +++ b/modules/Webforms/capture.php @@ -51,28 +51,29 @@ function captureNow($request) { $parameters = array(); $webformFields = $webform->getFields(); foreach ($webformFields as $webformField) { - if ($webformField->getDefaultValue() != null) { - $parameters[$webformField->getFieldName()] = decode_html($webformField->getDefaultValue()); + //If urlencode is enabled then skipping decoding field names + if ($isURLEncodeEnabled == 1) { + $webformNeutralizedField = $webformField->getNeutralizedField(); } else { - //If urlencode is enabled then skipping decoding field names - if ($isURLEncodeEnabled == 1) { - $webformNeutralizedField = $webformField->getNeutralizedField(); - } else { - $webformNeutralizedField = html_entity_decode($webformField->getNeutralizedField(), ENT_COMPAT, "UTF-8"); - } + $webformNeutralizedField = html_entity_decode($webformField->getNeutralizedField(), ENT_COMPAT, "UTF-8"); + } - if (isset($request[$webformField->getFieldName()])) { - $webformNeutralizedField = $webformField->getFieldName(); - } - if (is_array(vtlib_purify($request[$webformNeutralizedField]))) { - $fieldData = implode(" |##| ", vtlib_purify($request[$webformNeutralizedField])); - } else { - $fieldData = vtlib_purify($request[$webformNeutralizedField]); - $fieldData = decode_html($fieldData); - } + if (isset($request[$webformField->getFieldName()])) { + $webformNeutralizedField = $webformField->getFieldName(); + } + if (is_array(vtlib_purify($request[$webformNeutralizedField]))) { + $fieldData = implode(" |##| ", vtlib_purify($request[$webformNeutralizedField])); + } else { + $fieldData = vtlib_purify($request[$webformNeutralizedField]); + $fieldData = decode_html($fieldData); + } + if ($webformField->getDefaultValue() != null && $fieldData == null){ + $parameters[$webformField->getFieldName()] = decode_html($webformField->getDefaultValue()); + }else{ $parameters[$webformField->getFieldName()] = stripslashes($fieldData); } + if ($webformField->getRequired()) { if (!isset($parameters[$webformField->getFieldName()])) throw new Exception("Required fields not filled"); From fcd62a67542bb452f86058ad8041c3ce529e31c1 Mon Sep 17 00:00:00 2001 From: kanno Date: Thu, 16 Dec 2021 18:49:56 +0900 Subject: [PATCH 2/2] =?UTF-8?q?webform=E3=81=AE=E5=92=8C=E8=A8=B3=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E3=80=82=E4=B8=8A=E6=9B=B8=E3=81=8D=E5=80=A4=E2=86=92?= =?UTF-8?q?=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB=E3=83=88=E5=80=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- languages/ja_jp/Settings/Webforms.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/languages/ja_jp/Settings/Webforms.php b/languages/ja_jp/Settings/Webforms.php index 768739d37..935447760 100644 --- a/languages/ja_jp/Settings/Webforms.php +++ b/languages/ja_jp/Settings/Webforms.php @@ -27,7 +27,7 @@ 'LBL_WEBFORM_INFORMATION' => 'Webフォーム情報', 'LBL_FIELD_INFORMATION' => '項目情報', 'LBL_FIELD_NAME' => '項目名', - 'LBL_OVERRIDE_VALUE' => '上書き値', + 'LBL_OVERRIDE_VALUE' => 'デフォルト値', 'LBL_MANDATORY' => '必須', 'LBL_WEBFORM_REFERENCE_FIELD' => 'Webフォーム参照フィールド', 'LBL_SELECT_FIELDS_OF_TARGET_MODULE' => '項目を選択してください',