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' => '項目を選択してください', 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");