mbirth/php-frs
Archived
1
0
Fork 0
Code Pull Requests Actions Activity

Reduce complexity.

Browse Source
This commit is contained in:
Markus Birth 2016-07-10 22:42:39 +02:00
parent 918026fca4
commit 02c6c15548
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/Frs/FieldDefinition.php
View File

@ -72,7 +72,7 @@ class FieldDefinition
} }
/** /**
* Adds useful default values for some $field['type']s. * Adds useful support values for some $field['type']s.
* *
* @param mixed[] &$field Field to enrich * @param mixed[] &$field Field to enrich
*/ */
@ -86,6 +86,23 @@ class FieldDefinition
} }
} }
/**
* Sets the value of empty fields to the default value (if given)
* or an empty string, if no value was set.
*
* @param mixed[] &$field Field to work on
*/
private function addDefaultOrEmpty(&$field)
{
if (!isset($field['value']) || empty($field['value'])) {
if (isset($field['default'])) {
$field['value'] = $field['default'];
} else {
$field['value'] = '';
}
}
}
private function prepareFields() private function prepareFields()
{ {
foreach ($this->fieldData['fields'] as $key=>$meta) { foreach ($this->fieldData['fields'] as $key=>$meta) {
@ -93,13 +110,7 @@ class FieldDefinition
$groupName = $this->fieldData['groups'][$meta['group']]; $groupName = $this->fieldData['groups'][$meta['group']];
$meta['group_name'] = $groupName; $meta['group_name'] = $groupName;
if (!isset($meta['value']) || empty($meta['value'])) { $this->addDefaultOrEmpty($meta);
if (isset($meta['default'])) {
$meta['value'] = $meta['default'];
} else {
$meta['value'] = '';
}
}
// Field type marker for Mustache // Field type marker for Mustache
$meta['fieldtype_' . $meta['type']] = true; $meta['fieldtype_' . $meta['type']] = true;