Add $field_blocks to contact_form hook

Add $field_blocks to contact_form hook, so plugins can change the order of the fields: https://github.com/roundcube/roundcubemail/pull/5281
pull/5323/head
Sandor Takacs 8 years ago committed by GitHub
parent 22241a5d82
commit e108902eff

@ -516,15 +516,26 @@ function rcmail_contact_form($form, $record, $attrib = null)
{ {
global $RCMAIL; global $RCMAIL;
// group fields
$field_blocks = array(
'names' => array('prefix','firstname','middlename','surname','suffix'),
'displayname' => array('name'),
'nickname' => array('nickname'),
'organization' => array('organization'),
'department' => array('department'),
'jobtitle' => array('jobtitle'),
);
// Allow plugins to modify contact form content // Allow plugins to modify contact form content
$plugin = $RCMAIL->plugins->exec_hook('contact_form', array( $plugin = $RCMAIL->plugins->exec_hook('contact_form', array(
'form' => $form, 'record' => $record)); 'form' => $form, 'record' => $record, 'field_blocks' => $field_blocks));
$form = $plugin['form']; $form = $plugin['form'];
$record = $plugin['record']; $record = $plugin['record'];
$edit_mode = $RCMAIL->action != 'show' && $RCMAIL->action != 'print'; $field_blocks = $plugin['field_blocks']
$del_button = $attrib['deleteicon'] ? html::img(array('src' => $RCMAIL->output->get_skin_file($attrib['deleteicon']), 'alt' => $RCMAIL->gettext('delete'))) : $RCMAIL->gettext('delete'); $edit_mode = $RCMAIL->action != 'show' && $RCMAIL->action != 'print';
$out = ''; $del_button = $attrib['deleteicon'] ? html::img(array('src' => $RCMAIL->output->get_skin_file($attrib['deleteicon']), 'alt' => $RCMAIL->gettext('delete'))) : $RCMAIL->gettext('delete');
$out = '';
unset($attrib['deleteicon']); unset($attrib['deleteicon']);
@ -563,16 +574,6 @@ function rcmail_contact_form($form, $record, $attrib = null)
unset($record['name']); unset($record['name']);
} }
// group fields
$field_blocks = array(
'names' => array('prefix','firstname','middlename','surname','suffix'),
'displayname' => array('name'),
'nickname' => array('nickname'),
'organization' => array('organization'),
'department' => array('department'),
'jobtitle' => array('jobtitle'),
);
foreach ($field_blocks as $blockname => $colnames) { foreach ($field_blocks as $blockname => $colnames) {
$fields = ''; $fields = '';
foreach ($colnames as $col) { foreach ($colnames as $col) {

Loading…
Cancel
Save