Skip to content

Commit 5c60732

Browse files
committed
Merged branch 'hotfix-uploadallowed'.
2 parents e997683 + c8198ab commit 5c60732

File tree

1 file changed

+4
-17
lines changed

1 file changed

+4
-17
lines changed

sefv2/modsimpleemailform.php

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,8 @@ protected function createXMLConfig(array $paramsArray)
858858

859859
if (!empty($this->uploadAllowedFilesArray)) {
860860
array_walk($this->uploadAllowedFilesArray, function (&$item, &$key) {
861-
$item = '.' . strtolower($item);
861+
$item = strtolower(trim($item));
862+
$item = (strpos($item, '.') === 0) ? '.' . trim(substr($item, 1)) : '.' . $item;
862863
});
863864

864865
$this->uploadAllowedFiles = implode(", ", $this->uploadAllowedFilesArray);
@@ -965,14 +966,7 @@ public function decorateInput($input, $label = null)
965966

966967
preg_match($pattern, $input, $fieldNumberArray);
967968

968-
$ckRfmt =
969-
!empty($fieldNumberArray) &&
970-
isset($this->paramsArray[
971-
$this->formPrefixName
972-
. $this->fieldPrefixName
973-
. $fieldNumberArray[0]
974-
. $this->fieldCkrfmtName
975-
])
969+
$ckRfmt = (!empty($fieldNumberArray))
976970
? $this->paramsArray[
977971
$this->formPrefixName
978972
. $this->fieldPrefixName
@@ -981,14 +975,7 @@ public function decorateInput($input, $label = null)
981975
]
982976
: 'H';
983977

984-
$ckRpos =
985-
!empty($fieldNumberArray) &&
986-
isset($this->paramsArray[
987-
$this->formPrefixName
988-
. $this->fieldPrefixName
989-
. $fieldNumberArray[0]
990-
. $this->fieldCkrposName
991-
])
978+
$ckRpos = (!empty($fieldNumberArray))
992979
? $this->paramsArray[
993980
$this->formPrefixName
994981
. $this->fieldPrefixName

0 commit comments

Comments
 (0)