tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-10-22 15:05:42 +00:00
Code Issues Projects Releases Wiki Activity

BUG: open ticket 7314 fixing some bugs that have been found

Browse Source
This commit is contained in:
Kirk Mayo 2012-07-17 15:58:24 +12:00
parent 4335d8d910
commit eba5edd60b
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
code/model/UserDefinedForm.php
View File

@ -756,7 +756,7 @@ JS
// check to see if they are a dynamic sender. eg based on a email field a user selected // check to see if they are a dynamic sender. eg based on a email field a user selected
if($recipient->SendEmailFromField()) { if($recipient->SendEmailFromField()) {
$submittedFormField = $submittedFields->find('Name', $recipient->SendEmailFromField()->Name); $submittedFormField = $submittedFields->find('Name', $recipient->SendEmailFromField()->Name);
if($submittedFormField) { if($submittedFormField && is_string($submittedFormField->Value)) {
$email->setFrom($submittedFormField->Value); $email->setFrom($submittedFormField->Value);
} }
} }
@ -764,7 +764,7 @@ JS
if($recipient->SendEmailToField()) { if($recipient->SendEmailToField()) {
$submittedFormField = $submittedFields->find('Name', $recipient->SendEmailToField()->Name); $submittedFormField = $submittedFields->find('Name', $recipient->SendEmailToField()->Name);
if($submittedFormField) { if($submittedFormField && is_string($submittedFormField->Value)) {
$email->setTo($submittedFormField->Value); $email->setTo($submittedFormField->Value);
} }
} }
@ -859,7 +859,8 @@ class UserDefinedForm_EmailRecipient extends DataObject {
// if they have email fields then we could send from it // if they have email fields then we could send from it
if($validEmailFields) { if($validEmailFields) {
$fields->insertAfter(new DropdownField('SendEmailFromFieldID', _t('UserDefinedForm.ORSELECTAFIELDTOUSEASFROM', '.. or Select a Form Field to use as the From Address'), $validEmailFields->map('ID', 'Title'), '', null,""), 'EmailFrom'); $fields->insertAfter(new DropdownField('SendEmailFromFieldID', _t('UserDefinedForm.ORSELECTAFIELDTOUSEASFROM', '.. or Select a Form Field to use as the From Address'),
$validEmailFields->map('ID', 'Title'), '', null,""), 'EmailFrom');
} }
// if they have multiple options // if they have multiple options
@ -875,7 +876,8 @@ class UserDefinedForm_EmailRecipient extends DataObject {
} }
$multiOptionFields = $multiOptionFields->map('ID', 'Title'); $multiOptionFields = $multiOptionFields->map('ID', 'Title');
$fields->insertAfter(new DropdownField('SendEmailToFieldID', _t('UserDefinedForm.ORSELECTAFIELDTOUSEASTO', '.. or Select a Field to use as the To Address'), $multiOptionFields, '', null, ""), 'EmailAddress'); $fields->insertAfter(new DropdownField('SendEmailToFieldID', _t('UserDefinedForm.ORSELECTAFIELDTOUSEASTO', '.. or Select a Field to use as the To Address'),
$multiOptionFields, '', null, ""), 'EmailAddress');
} }
} }
@ -904,7 +906,7 @@ class UserDefinedForm_SubmittedFormEmail extends Email {
protected $ss_template = "SubmittedFormEmail"; protected $ss_template = "SubmittedFormEmail";
protected $data; protected $data;
public function __construct() { public function __construct($submittedFields = null) {
parent::__construct(); parent::__construct($submittedFields = null);
} }
} }

6
code/model/formfields/EditableLiteralField.php
View File

@ -14,10 +14,12 @@ class EditableLiteralField extends EditableFormField {
static $plural_name = 'HTML Blocks'; static $plural_name = 'HTML Blocks';
public function getFieldConfiguration() { public function getFieldConfiguration() {
$customSettings = unserialize($this->CustomSettings);
$content = (isset($customSettings['Content'])) ? $customSettings['Content'] : '';
$textAreaField = new TextareaField( $textAreaField = new TextareaField(
$this->getSettingName('Content'), $this->getSettingName('Content'),
"HTML" "HTML",
$content
); );
$textAreaField->setRows(4); $textAreaField->setRows(4);
$textAreaField->setColumns(20); $textAreaField->setColumns(20);