Index: branches/5.2.x/core/units/forms/form_submissions/form_submission_tp.php =================================================================== diff -u -N -r14244 -r14748 --- branches/5.2.x/core/units/forms/form_submissions/form_submission_tp.php (.../form_submission_tp.php) (revision 14244) +++ branches/5.2.x/core/units/forms/form_submissions/form_submission_tp.php (.../form_submission_tp.php) (revision 14748) @@ -1,46 +1,60 @@ Application->GetVar($params['name']); +class FormSubmissionTagProcessor extends kDBTagProcessor { - if (array_key_exists('default', $params) && !$phrase_name) { - $phrase_name = $params['default']; - } + /** + * Returns phrase translation by name + * + * @param Array $params + * @return string + * @access public + */ + function PhraseFromRequest($params) + { + $phrase_name = $this->Application->GetVar($params['name']); - return $this->Application->Phrase($phrase_name); + if (array_key_exists('default', $params) && !$phrase_name) { + $phrase_name = $params['default']; } - /** - * Allows to retrieve for submission field by it's name or role in email communications - * - * @param Array $params - * @return string - */ - function FormField($params) - { - $object =& $this->getObject($params); - /* @var $object kDBItem */ + return $this->Application->Phrase($phrase_name); + } - $form_submission_helper =& $this->Application->recallObject('FormSubmissionHelper'); - /* @var $form_submission_helper FormSubmissionHelper */ + /** + * Allows to retrieve for submission field by it's name or role in email communications + * + * @param Array $params + * @return string + */ + function FormField($params) + { + $object =& $this->getObject($params); + /* @var $object kDBItem */ - $formatted = !(array_key_exists('db', $params) && $params['db']); - $format = $formatted ? (array_key_exists('format', $params) ? $params['format'] : null) : null; + $form_submission_helper =& $this->Application->recallObject('FormSubmissionHelper'); + /* @var $form_submission_helper FormSubmissionHelper */ - if (array_key_exists('role', $params)) { - return $form_submission_helper->getFieldByRole($object, $params['role'], $formatted, $format); - } + $formatted = !(array_key_exists('db', $params) && $params['db']); + $format = $formatted ? (array_key_exists('format', $params) ? $params['format'] : null) : null; - return $form_submission_helper->getFieldByName($params['name'], $formatted, $format); + if (array_key_exists('role', $params)) { + return $form_submission_helper->getFieldByRole($object, $params['role'], $formatted, $format); } + + return $form_submission_helper->getFieldByName($params['name'], $formatted, $format); } +}