Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix regression where some (most) of the fields were missing in contact form

Browse source
This commit is contained in:
Aleksander Machniak 2014-11-28 07:10:16 -05:00
parent de012552e7
commit cf0ae1aac7
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plugins/kolab_addressbook/kolab_addressbook.php
View file

@ -466,8 +466,8 @@ class kolab_addressbook extends rcube_plugin
$p['form']['personal']['content']['pkcs7publickey'] = array('size' => 70); $p['form']['personal']['content']['pkcs7publickey'] = array('size' => 70);
// re-order fields according to the coltypes list // re-order fields according to the coltypes list
$p['form']['contact']['content'] = $this->_sort_form_fields($p['form']['contact']['content']); $p['form']['contact']['content'] = $this->_sort_form_fields($p['form']['contact']['content'], $GLOBALS['CONTACTS']);
$p['form']['personal']['content'] = $this->_sort_form_fields($p['form']['personal']['content']); $p['form']['personal']['content'] = $this->_sort_form_fields($p['form']['personal']['content'], $GLOBALS['CONTACTS']);
/* define a separate section 'settings' /* define a separate section 'settings'
$p['form']['settings'] = array( $p['form']['settings'] = array(
@ -485,12 +485,11 @@ class kolab_addressbook extends rcube_plugin
} }
private function _sort_form_fields($contents) private function _sort_form_fields($contents, $source)
{ {
$block = array(); $block = array();
$contacts = reset($this->sources);
foreach (array_keys($contacts->coltypes) as $col) { foreach (array_keys($source->coltypes) as $col) {
if (isset($contents[$col])) if (isset($contents[$col]))
$block[$col] = $contents[$col]; $block[$col] = $contents[$col];
} }