diff --git a/CHANGELOG b/CHANGELOG index 426d3c957..b7f16896c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Added addressbook advanced search - Add popup with basic fields selection for addressbook search - Case-insensitive matching in autocompletion (#1487933) - Added option to force spellchecking before sending a message (#1485458) diff --git a/program/include/rcube_contacts.php b/program/include/rcube_contacts.php index 7c142f545..5e7165edd 100644 --- a/program/include/rcube_contacts.php +++ b/program/include/rcube_contacts.php @@ -232,12 +232,13 @@ class rcube_contacts extends rcube_addressbook /** * Search contacts * - * @param array List of fields to search in - * @param string Search value - * @param boolean True for strict (=), False for partial (LIKE) matching - * @param boolean True if results are requested, False if count only - * @param boolean True to skip the count query (select only) - * @param array List of fields that cannot be empty + * @param mixed $fields The field name of array of field names to search in + * @param mixed $value Search value (or array of values when $fields is array) + * @param boolean $strict True for strict (=), False for partial (LIKE) matching + * @param boolean $select True if results are requested, False if count only + * @param boolean $nocount True to skip the count query (select only) + * @param array $required List of fields that cannot be empty + * * @return object rcube_result_set Contact records and 'count' value */ function search($fields, $value, $strict=false, $select=true, $nocount=false, $required=array()) @@ -249,23 +250,42 @@ class rcube_contacts extends rcube_addressbook $where = $and_where = array(); - foreach ($fields as $col) { + foreach ($fields as $idx => $col) { + // direct ID search if ($col == 'ID' || $col == $this->primary_key) { $ids = !is_array($value) ? explode(',', $value) : $value; $ids = $this->db->array2list($ids, 'integer'); $where[] = 'c.' . $this->primary_key.' IN ('.$ids.')'; + continue; } + // fulltext search in all fields else if ($col == '*') { $words = array(); - foreach(explode(" ", self::normalize_string($value)) as $word) + foreach (explode(" ", self::normalize_string($value)) as $word) $words[] = $this->db->ilike('words', '%'.$word.'%'); $where[] = '(' . join(' AND ', $words) . ')'; } - else if ($strict) { - $where[] = $this->db->quoteIdentifier($col).' = '.$this->db->quote($value); - } - else if (in_array($col, $this->table_cols)) { - $where[] = $this->db->ilike($col, '%'.$value.'%'); + else { + $val = is_array($value) ? $value[$idx] : $value; + // table column + if (in_array($col, $this->table_cols)) { + if ($strict) { + $where[] = $this->db->quoteIdentifier($col).' = '.$this->db->quote($val); + } + else { + $where[] = $this->db->ilike($col, '%'.$val.'%'); + } + } + // vCard field + else { + if (in_array($col, $this->fulltext_cols)) { + foreach (explode(" ", self::normalize_string($val)) as $word) + $words[] = $this->db->ilike('words', '%'.$word.'%'); + $where[] = '(' . join(' AND ', $words) . ')'; + } + if (is_array($value)) + $post_search[$col] = $strict ? $val : mb_strtolower($val); + } } } @@ -273,12 +293,65 @@ class rcube_contacts extends rcube_addressbook $and_where[] = $this->db->quoteIdentifier($col).' <> '.$this->db->quote(''); } - if (!empty($where)) - $where = join(' OR ', $where); + if (!empty($where)) { + // use AND operator for advanced searches + $where = join(is_array($value) ? ' AND ' : ' OR ', $where); + } if (!empty($and_where)) $where = ($where ? "($where) AND " : '') . join(' AND ', $and_where); + // Post-searching in vCard data fields + // we will search in all records and then build a where clause for their IDs + if (!empty($post_search)) { + $ids = array(0); + // build key name regexp + $regexp = '/^(' . implode(array_keys($post_search), '|') . ')(:.*?)$/'; + // use initial WHERE clause, to limit records number if possible + if (!empty($where)) + $this->set_search_set($where); + + // count result pages + $cnt = $this->count(); + $pages = ceil($cnt / $this->page_size); + $scnt = count($post_search); + + // get (paged) result + for ($i=0; $i<$pages; $i++) { + $this->list_records(null, $i, true); + while ($row = $this->result->next()) { + $id = $row[$this->primary_key]; + $found = 0; + foreach (preg_grep($regexp, array_keys($row)) as $col) { + $pos = strpos($col, ':'); + $colname = $pos ? substr($col, 0, $pos) : $col; + $search = $post_search[$colname]; + foreach ((array)$row[$col] as $value) { + // composite field, e.g. address + if (is_array($value)) { + $value = implode($value); + } + if (($strict && $value == $search) + || (!$strict && strpos(mb_strtolower($value), $search) !== false) + ) { + $found++; + break; + } + } + } + // all fields match + if ($found == $scnt) { + $ids[] = $id; + } + } + } + + // build WHERE clause + $ids = $this->db->array2list($ids, 'integer'); + $where = 'c.' . $this->primary_key.' IN ('.$ids.')'; + unset($this->cache['count']); + } + if (!empty($where)) { $this->set_search_set($where); if ($select) @@ -287,7 +360,7 @@ class rcube_contacts extends rcube_addressbook $this->result = $this->count(); } - return $this->result; + return $this->result; } diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php index 7f0ea84fa..0c865a9c7 100644 --- a/program/include/rcube_ldap.php +++ b/program/include/rcube_ldap.php @@ -451,12 +451,13 @@ class rcube_ldap extends rcube_addressbook /** * Search contacts * - * @param array List of fields to search in - * @param string Search value - * @param boolean True for strict, False for partial (fuzzy) matching - * @param boolean True if results are requested, False if count only - * @param boolean (Not used) - * @param array List of fields that cannot be empty + * @param mixed $fields The field name of array of field names to search in + * @param mixed $value Search value (or array of values when $fields is array) + * @param boolean $strict True for strict, False for partial (fuzzy) matching + * @param boolean $select True if results are requested, False if count only + * @param boolean $nocount (Not used) + * @param array $required List of fields that cannot be empty + * * @return array Indexed list of contact records and 'count' value */ function search($fields, $value, $strict=false, $select=true, $nocount=false, $required=array()) @@ -477,8 +478,10 @@ class rcube_ldap extends rcube_addressbook return $result; } - $filter = '(|'; - $wc = !$strict && $this->prop['fuzzy_search'] ? '*' : ''; + // use AND operator for advanced searches + $filter = is_array($value) ? '(&' : '(|'; + $wc = !$strict && $this->prop['fuzzy_search'] ? '*' : ''; + if ($fields == '*') { // search_fields are required for fulltext search @@ -490,15 +493,19 @@ class rcube_ldap extends rcube_addressbook } if (is_array($this->prop['search_fields'])) { - foreach ($this->prop['search_fields'] as $k => $field) + foreach ($this->prop['search_fields'] as $field) { $filter .= "($field=$wc" . $this->_quote_string($value) . "$wc)"; + } } } else { - foreach ((array)$fields as $field) - if ($f = $this->_map_field($field)) - $filter .= "($f=$wc" . $this->_quote_string($value) . "$wc)"; + foreach ((array)$fields as $idx => $field) { + $val = is_array($value) ? $value[$idx] : $value; + if ($f = $this->_map_field($field)) { + $filter .= "($f=$wc" . $this->_quote_string($val) . "$wc)"; + } + } } $filter .= ')'; diff --git a/program/include/rcube_result_set.php b/program/include/rcube_result_set.php index 1739cacff..10361609f 100644 --- a/program/include/rcube_result_set.php +++ b/program/include/rcube_result_set.php @@ -44,27 +44,27 @@ class rcube_result_set { $this->records[] = $rec; } - + function iterate() { return $this->records[$this->current++]; } - + function first() { $this->current = 0; return $this->records[$this->current++]; } - + // alias for iterate() function next() { return $this->iterate(); } - + function seek($i) { $this->current = $i; } - + } diff --git a/program/js/app.js b/program/js/app.js index 405a12fc8..48f058eaf 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -326,11 +326,12 @@ function rcube_webmail() } } - if ((this.env.action == 'add' || this.env.action == 'edit') && this.gui_objects.editform) { + if (this.gui_objects.editform) { this.enable_command('save', true); - this.init_contact_form(); + if (this.env.action == 'add' || this.env.action == 'edit') + this.init_contact_form(); } - else if (this.gui_objects.qsearchbox) { + if (this.gui_objects.qsearchbox) { this.enable_command('search', 'reset-search', 'moveto', true); $(this.gui_objects.qsearchbox).select(); } @@ -338,7 +339,7 @@ function rcube_webmail() if (this.contact_list && this.contact_list.rowcount > 0) this.enable_command('export', true); - this.enable_command('list', 'listgroup', true); + this.enable_command('list', 'listgroup', 'advanced-search', true); break; @@ -587,7 +588,7 @@ function rcube_webmail() // common commands used in multiple tasks case 'show': - if (this.task=='mail') { + if (this.task == 'mail') { var uid = this.get_single_uid(); if (uid && (!this.env.uid || uid != this.env.uid)) { if (this.env.mailbox == this.env.drafts_mailbox) @@ -596,17 +597,17 @@ function rcube_webmail() this.show_message(uid); } } - else if (this.task=='addressbook') { + else if (this.task == 'addressbook') { var cid = props ? props : this.get_single_cid(); - if (cid && !(this.env.action=='show' && cid==this.env.cid)) + if (cid && !(this.env.action == 'show' && cid == this.env.cid)) this.load_contact(cid, 'show'); } break; case 'add': - if (this.task=='addressbook') + if (this.task == 'addressbook') this.load_contact(0, 'add'); - else if (this.task=='settings') { + else if (this.task == 'settings') { this.identity_list.clear_selection(); this.load_identity(0, 'add-identity'); } @@ -625,27 +626,29 @@ function rcube_webmail() break; case 'save': - if (this.gui_objects.editform) { - var input_pagesize = $("input[name='_pagesize']"); - var input_name = $("input[name='_name']"); - var input_email = $("input[name='_email']"); - + var input, form = this.gui_objects.editform; + if (form) { + // adv. search + if (this.env.action == 'search') { + } // user prefs - if (input_pagesize.length && isNaN(parseInt(input_pagesize.val()))) { + else if ((input = $("input[name='_pagesize']", form)) && input.length && isNaN(parseInt(input.val()))) { alert(this.get_label('nopagesizewarning')); - input_pagesize.focus(); + input.focus(); break; } // contacts/identities else { - if (input_name.length && input_name.val() == '') { + if ((input = $("input[name='_name']", form)) &&input.length && input.val() == '') { alert(this.get_label('nonamewarning')); - input_name.focus(); + input.focus(); break; } - else if (this.task == 'settings' && input_email.length && (this.env.identities_level % 2) == 0 && !rcube_check_email(input_email.val())) { + else if (this.task == 'settings' && (this.env.identities_level % 2) == 0 && + (input = $("input[name='_email']", form)) && input.length&& !rcube_check_email(input.val()) + ) { alert(this.get_label('noemailwarning')); - input_email.focus(); + input.focus(); break; } @@ -653,7 +656,7 @@ function rcube_webmail() $('input.placeholder').each(function(){ if (this.value == this._placeholder) this.value = ''; }); } - this.gui_objects.editform.submit(); + form.submit(); } break; @@ -3348,8 +3351,7 @@ function rcube_webmail() if (mods) mods = mods[mbox] ? mods[mbox] : mods['*']; } else if (this.contact_list) { - this.contact_list.clear(true); - this.show_contentframe(false); + this.list_contacts_clear(); } if (mods) { @@ -3715,9 +3717,7 @@ function rcube_webmail() this.list_contacts_remote = function(src, group, page) { // clear message list first - this.contact_list.clear(true); - this.show_contentframe(false); - this.enable_command('delete', 'compose', false); + this.list_contacts_clear(); // send request to server var url = (src ? '_source='+urlencode(src) : '') + (page ? (src?'&':'') + '_page='+page : ''), @@ -3736,6 +3736,13 @@ function rcube_webmail() this.http_request('list', url, lock); }; + this.list_contacts_clear = function() + { + this.contact_list.clear(true); + this.show_contentframe(false); + this.enable_command('delete', 'compose', false); + }; + // load contact record this.load_contact = function(cid, action, framed) { @@ -4077,7 +4084,7 @@ function rcube_webmail() else { var lastelem = $('.ff_'+col), appendcontainer = $('#contactsection'+section+' .contactcontroller'+col); - + if (!appendcontainer.length) appendcontainer = $('
').addClass('contactfieldgroup contactcontroller'+col).insertAfter($('#contactsection'+section+' .contactfieldgroup').last()); @@ -4086,7 +4093,7 @@ function rcube_webmail() row = $('
').addClass('row'), cell = $('
').addClass('contactfieldcontent data'), label = $('
').addClass('contactfieldlabel label'); - + if (colprop.subtypes_select) label.html(colprop.subtypes_select); else @@ -4120,7 +4127,7 @@ function rcube_webmail() .addClass('ff_'+col) .attr('name', '_'+col+name_suffix) .appendTo(cell); - + var options = input.attr('options'); options[options.length] = new Option('---', ''); if (colprop.options) @@ -4134,10 +4141,10 @@ function rcube_webmail() .html(this.env.delbutton) .click(function(){ ref.delete_edit_field(this); return false }) .appendTo(cell); - + row.append(label).append(cell).appendTo(appendcontainer.show()); input.first().focus(); - + // disable option if limit reached if (!colprop.count) colprop.count = 0; if (++colprop.count == colprop.limit && colprop.limit) @@ -4153,7 +4160,7 @@ function rcube_webmail() colprop = this.env.coltypes[col], fieldset = $(elem).parents('fieldset.contactfieldgroup'), addmenu = fieldset.parent().find('select.addfieldmenu'); - + // just clear input but don't hide the last field if (--colprop.count <= 0 && colprop.visible) $(elem).parent().children('input').val('').blur(); @@ -4163,7 +4170,7 @@ function rcube_webmail() if (!fieldset.children('div.row').length) fieldset.hide(); } - + // enable option in add-field selector or insert it if necessary if (addmenu.length) { var option = addmenu.children('option[value="'+col+'"]'); @@ -4213,6 +4220,26 @@ function rcube_webmail() this.enable_command('delete-photo', this.env.coltypes.photo && id != '-del-'); }; + // load advanced search page + this.advanced_search = function() + { + var add_url = '&_form=1', target = window; + + if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) { + add_url += '&_framed=1'; + target = window.frames[this.env.contentframe]; + this.contact_list.clear_selection(); + } + else if (framed) + return false; + + this.location_href(this.env.comm_path+'&_action=search'+add_url + +'&_source='+urlencode(this.env.source) + +(this.env.group ? '&_gid='+urlencode(this.env.group) : ''), target); + + return true; + }; + /*********************************************************/ /********* user settings methods *********/ diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index c04531cf5..fa0fab581 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -272,6 +272,9 @@ $labels['manager'] = 'Manager'; $labels['assistant'] = 'Assistant'; $labels['spouse'] = 'Spouse'; $labels['allfields'] = 'All fields'; +$labels['search'] = 'Search'; +$labels['advsearch'] = 'Advanced Search'; +$labels['other'] = 'Other'; $labels['typehome'] = 'Home'; $labels['typework'] = 'Work'; @@ -284,6 +287,7 @@ $labels['typecar'] = 'Car'; $labels['typepager'] = 'Pager'; $labels['typevideo'] = 'Video'; $labels['typeassistant'] = 'Assistant'; +$labels['typehomepage'] = 'Home page'; $labels['addfield'] = 'Add field...'; $labels['addcontact'] = 'Add new contact'; diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc index 8c4e910cd..cb89440a5 100644 --- a/program/localization/pl_PL/labels.inc +++ b/program/localization/pl_PL/labels.inc @@ -398,6 +398,7 @@ $labels['typecar'] = 'Samochód'; $labels['typepager'] = 'Pager'; $labels['typevideo'] = 'Wideo'; $labels['typeassistant'] = 'Asystent'; +$labels['typehomepage'] = 'Strona domowa'; $labels['addfield'] = 'Dodaj pole...'; $labels['personalinfo'] = 'Informacje osobiste'; $labels['addphoto'] = 'Dodaj'; @@ -409,5 +410,8 @@ $labels['sharedfolder'] = 'Folder współdzielony'; $labels['defaultaddressbook'] = 'Nowe kontakty dodawaj do wybranej książki adresowej'; $labels['spellcheckbeforesend'] = 'Przed wysłaniem wiadomości sprawdzaj pisownię'; $labels['allfields'] = 'Wszystkie pola'; +$labels['search'] = 'Szukaj'; +$labels['advsearch'] = 'Zaawansowane wyszukiwanie'; +$labels['other'] = 'Inne'; ?> diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc index 545f140bf..df86fced2 100644 --- a/program/steps/addressbook/func.inc +++ b/program/steps/addressbook/func.inc @@ -62,36 +62,36 @@ if (!$OUTPUT->ajax_call) { // general definition of contact coltypes $CONTACT_COLTYPES = array( - 'name' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('name')), - 'firstname' => array('type' => 'text', 'size' => 19, 'limit' => 1, 'label' => rcube_label('firstname')), - 'surname' => array('type' => 'text', 'size' => 19, 'limit' => 1, 'label' => rcube_label('surname')), - 'middlename' => array('type' => 'text', 'size' => 19, 'limit' => 1, 'label' => rcube_label('middlename')), - 'prefix' => array('type' => 'text', 'size' => 8, 'limit' => 1, 'label' => rcube_label('nameprefix')), - 'suffix' => array('type' => 'text', 'size' => 8, 'limit' => 1, 'label' => rcube_label('namesuffix')), - 'nickname' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('nickname')), - 'jobtitle' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('jobtitle')), - 'organization' => array('type' => 'text', 'size' => 19, 'limit' => 1, 'label' => rcube_label('organization')), - 'department' => array('type' => 'text', 'size' => 19, 'limit' => 1, 'label' => rcube_label('department')), - 'gender' => array('type' => 'select', 'limit' => 1, 'label' => rcube_label('gender'), 'options' => array('male' => rcube_label('male'), 'female' => rcube_label('female'))), - 'maidenname' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('maidenname')), - 'email' => array('type' => 'text', 'size' => 40, 'label' => rcube_label('email'), 'subtypes' => array('home','work','other')), - 'phone' => array('type' => 'text', 'size' => 40, 'label' => rcube_label('phone'), 'subtypes' => array('home','home2','work','work2','mobile','main','homefax','workfax','car','pager','video','assistant','other')), + 'name' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('name'), 'category' => 'main'), + 'firstname' => array('type' => 'text', 'size' => 19, 'limit' => 1, 'label' => rcube_label('firstname'), 'category' => 'main'), + 'surname' => array('type' => 'text', 'size' => 19, 'limit' => 1, 'label' => rcube_label('surname'), 'category' => 'main'), + 'email' => array('type' => 'text', 'size' => 40, 'label' => rcube_label('email'), 'subtypes' => array('home','work','other'), 'category' => 'main'), + 'middlename' => array('type' => 'text', 'size' => 19, 'limit' => 1, 'label' => rcube_label('middlename'), 'category' => 'main'), + 'prefix' => array('type' => 'text', 'size' => 8, 'limit' => 1, 'label' => rcube_label('nameprefix'), 'category' => 'main'), + 'suffix' => array('type' => 'text', 'size' => 8, 'limit' => 1, 'label' => rcube_label('namesuffix'), 'category' => 'main'), + 'nickname' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('nickname'), 'category' => 'main'), + 'jobtitle' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('jobtitle'), 'category' => 'main'), + 'organization' => array('type' => 'text', 'size' => 19, 'limit' => 1, 'label' => rcube_label('organization'), 'category' => 'main'), + 'department' => array('type' => 'text', 'size' => 19, 'limit' => 1, 'label' => rcube_label('department'), 'category' => 'main'), + 'gender' => array('type' => 'select', 'limit' => 1, 'label' => rcube_label('gender'), 'options' => array('male' => rcube_label('male'), 'female' => rcube_label('female')), 'category' => 'personal'), + 'maidenname' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('maidenname'), 'category' => 'personal'), + 'phone' => array('type' => 'text', 'size' => 40, 'label' => rcube_label('phone'), 'subtypes' => array('home','home2','work','work2','mobile','main','homefax','workfax','car','pager','video','assistant','other'), 'category' => 'main'), 'address' => array('type' => 'composite', 'label' => rcube_label('address'), 'subtypes' => array('home','work','other'), 'childs' => array( - 'street' => array('type' => 'text', 'size' => 40, 'label' => rcube_label('street')), - 'locality' => array('type' => 'text', 'size' => 28, 'label' => rcube_label('locality')), - 'zipcode' => array('type' => 'text', 'size' => 8, 'label' => rcube_label('zipcode')), - 'region' => array('type' => 'text', 'size' => 12, 'label' => rcube_label('region')), - 'country' => array('type' => 'text', 'size' => 40, 'label' => rcube_label('country')), - )), - 'birthday' => array('type' => 'date', 'size' => 12, 'label' => rcube_label('birthday'), 'limit' => 1, 'render_func' => 'rcmail_format_date_col'), - 'anniversary' => array('type' => 'date', 'size' => 12, 'label' => rcube_label('anniversary'), 'limit' => 1, 'render_func' => 'rcmail_format_date_col'), - 'website' => array('type' => 'text', 'size' => 40, 'label' => rcube_label('website'), 'subtypes' => array('homepage','work','blog','other')), - 'im' => array('type' => 'text', 'size' => 40, 'label' => rcube_label('instantmessenger'), 'subtypes' => array('aim','icq','msn','yahoo','jabber','skype','other')), + 'street' => array('type' => 'text', 'size' => 40, 'label' => rcube_label('street'), 'category' => 'main'), + 'locality' => array('type' => 'text', 'size' => 28, 'label' => rcube_label('locality'), 'category' => 'main'), + 'zipcode' => array('type' => 'text', 'size' => 8, 'label' => rcube_label('zipcode'), 'category' => 'main'), + 'region' => array('type' => 'text', 'size' => 12, 'label' => rcube_label('region'), 'category' => 'main'), + 'country' => array('type' => 'text', 'size' => 40, 'label' => rcube_label('country'), 'category' => 'main'), + ), 'category' => 'main'), + 'birthday' => array('type' => 'date', 'size' => 12, 'label' => rcube_label('birthday'), 'limit' => 1, 'render_func' => 'rcmail_format_date_col', 'category' => 'personal'), + 'anniversary' => array('type' => 'date', 'size' => 12, 'label' => rcube_label('anniversary'), 'limit' => 1, 'render_func' => 'rcmail_format_date_col', 'category' => 'personal'), + 'website' => array('type' => 'text', 'size' => 40, 'label' => rcube_label('website'), 'subtypes' => array('homepage','work','blog','other'), 'category' => 'main'), + 'im' => array('type' => 'text', 'size' => 40, 'label' => rcube_label('instantmessenger'), 'subtypes' => array('aim','icq','msn','yahoo','jabber','skype','other'), 'category' => 'main'), 'notes' => array('type' => 'textarea', 'size' => 40, 'rows' => 15, 'label' => rcube_label('notes'), 'limit' => 1), - 'photo' => array('type' => 'image', 'limit' => 1), - 'assistant' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('assistant')), - 'manager' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('manager')), - 'spouse' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('spouse')), + 'photo' => array('type' => 'image', 'limit' => 1, 'category' => 'main'), + 'assistant' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('assistant'), 'category' => 'personal'), + 'manager' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('manager'), 'category' => 'personal'), + 'spouse' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('spouse'), 'category' => 'personal'), // TODO: define fields for vcards like GEO, KEY ); @@ -225,10 +225,10 @@ function rcmail_js_contacts_list($result, $prefix='') // define list of cols to be displayed $a_show_cols = array('name'); - + while ($row = $result->next()) { $a_row_cols = array(); - + // format each col foreach ($a_show_cols as $col) $a_row_cols[$col] = Q($row[$col]); @@ -324,7 +324,7 @@ function rcmail_contact_form($form, $record, $attrib = null) // get default coltypes $coltypes = $GLOBALS['CONTACT_COLTYPES']; - $coltype_lables = array(); + $coltype_labels = array(); foreach ($coltypes as $col => $prop) { if ($prop['subtypes']) { @@ -335,7 +335,7 @@ function rcmail_contact_form($form, $record, $attrib = null) } if ($prop['childs']) { foreach ($prop['childs'] as $childcol => $cp) - $coltype_lables[$childcol] = array('label' => $cp['label']); + $coltype_labels[$childcol] = array('label' => $cp['label']); } } @@ -548,7 +548,7 @@ function rcmail_contact_form($form, $record, $attrib = null) } if ($edit_mode) { - $RCMAIL->output->set_env('coltypes', $coltypes + $coltype_lables); + $RCMAIL->output->set_env('coltypes', $coltypes + $coltype_labels); $RCMAIL->output->set_env('delbutton', $del_button); $RCMAIL->output->add_label('delete'); } diff --git a/program/steps/addressbook/list.inc b/program/steps/addressbook/list.inc index 234e1a633..0eb4b806a 100644 --- a/program/steps/addressbook/list.inc +++ b/program/steps/addressbook/list.inc @@ -28,7 +28,7 @@ $OUTPUT->command('set_rowcount', rcmail_get_rowcount_text($rowcount)); // create javascript list rcmail_js_contacts_list($result); - + // send response $OUTPUT->send(); diff --git a/program/steps/addressbook/search.inc b/program/steps/addressbook/search.inc index fe7099fac..fff6bd66c 100644 --- a/program/steps/addressbook/search.inc +++ b/program/steps/addressbook/search.inc @@ -6,58 +6,171 @@ | | | This file is part of the Roundcube Webmail client | | Copyright (C) 2005-2011, The Roundcube Dev Team | + | Copyright (C) 2011, Kolab Systems AG | | Licensed under the GNU GPL | | | | PURPOSE: | - | Search step for address book contacts | + | Search action (and form) for address book contacts | | | +-----------------------------------------------------------------------+ | Author: Thomas Bruederli | + | Author: Aleksander Machniak | +-----------------------------------------------------------------------+ $Id: search.inc 456 2007-01-10 12:34:33Z thomasb $ */ -$CONTACTS->set_page(1); -$_SESSION['page'] = 1; +if (!isset($_GET['_form'])) { + rcmail_contact_search(); +} -// get input -$search = trim(get_input_value('_q', RCUBE_INPUT_GET, true)); -$fields = explode(',', get_input_value('_headers', RCUBE_INPUT_GET)); +$OUTPUT->add_handler('searchform', 'rcmail_contact_search_form'); +$OUTPUT->send('contactsearch'); -if (empty($fields)) { - $fields = $SEARCH_MODS_DEFAULT; -} -$search_request = md5('addr'.$search.implode($fields, ',')); +function rcmail_contact_search() +{ + global $RCMAIL, $OUTPUT, $CONTACTS, $CONTACT_COLTYPES, $SEARCH_MODS_DEFAULT; -// update search_mods setting -$search_mods = array_fill_keys($fields, 1); -$RCMAIL->user->save_prefs(array('addressbook_search_mods' => $search_mods)); + $adv = isset($_POST['_adv']); -if ($fields['all'] || count($fields) == count($SEARCH_MODS_DEFAULT)) { - $fields = '*'; -} + // get fields/values from advanced search form + if ($adv) { + foreach ($CONTACT_COLTYPES as $col => $colprop) { + $s = trim(get_input_value('_'.$col, RCUBE_INPUT_POST, true)); + if (strlen($s)) { + $search[] = $s; + $fields[] = $col; + } + } -// get contacts for this user -$result = $CONTACTS->search($fields, $search); + if (empty($fields)) { + // do nothing, show the form again + return; + } + } + // quick-search + else { + $search = trim(get_input_value('_q', RCUBE_INPUT_GET, true)); + $fields = explode(',', get_input_value('_headers', RCUBE_INPUT_GET)); -// save search settings in session -$_SESSION['search'][$search_request] = $CONTACTS->get_search_set(); + if (empty($fields)) { + $fields = $SEARCH_MODS_DEFAULT; + } -if ($result->count > 0) { - // create javascript list - rcmail_js_contacts_list($result); -} -else { - $OUTPUT->show_message('nocontactsfound', 'notice'); + // update search_mods setting + $old_mods = $RCMAIL->config->get('addressbook_search_mods'); + $search_mods = array_fill_keys($fields, 1); + if ($old_mods != $search_mods) { + $RCMAIL->user->save_prefs(array('addressbook_search_mods' => $search_mods)); + } + + if ($fields['*'] || count($fields) == count($SEARCH_MODS_DEFAULT)) { + $fields = '*'; + } + } + + // search request ID + $search_request = md5('addr'.implode($fields, ',') + .(is_array($search) ? implode($search, ',') : $search)); + + // reset page + $CONTACTS->set_page(1); + $_SESSION['page'] = 1; + + // get contacts for this user + $result = $CONTACTS->search($fields, $search); + + // save search settings in session + $_SESSION['search'][$search_request] = $CONTACTS->get_search_set(); + + if ($adv) + $OUTPUT->command('list_contacts_clear'); + + if ($result->count > 0) { + // create javascript list + rcmail_js_contacts_list($result); + } + else { + $OUTPUT->show_message('nocontactsfound', 'notice'); + } + + // update message count display + $OUTPUT->command('set_env', 'search_request', $search_request); + $OUTPUT->command('set_env', 'pagecount', ceil($result->count / $CONTACTS->page_size)); + $OUTPUT->command('set_rowcount', rcmail_get_rowcount_text()); + + // send response + $OUTPUT->send($adv ? 'iframe' : null); } -// update message count display -$OUTPUT->set_env('search_request', $search_request); -$OUTPUT->set_env('pagecount', ceil($result->count / $CONTACTS->page_size)); -$OUTPUT->command('set_rowcount', rcmail_get_rowcount_text()); +function rcmail_contact_search_form($attrib) +{ + global $RCMAIL, $CONTACTS, $CONTACT_COLTYPES; -// send response -$OUTPUT->send(); + $i_size = !empty($attrib['size']) ? $attrib['size'] : 30; + + $form = array( + 'main' => array( + 'name' => rcube_label('contactproperties'), + 'content' => array( + ), + ), + 'personal' => array( + 'name' => rcube_label('personalinfo'), + 'content' => array( + ), + ), + 'other' => array( + 'name' => rcube_label('other'), + 'content' => array( + ), + ), + ); + + foreach ($CONTACT_COLTYPES as $col => $colprop) + { + if ($colprop['type'] != 'image' && !$colprop['nosearch']) + { + $ftype = $colprop['type'] == 'select' ? 'select' : 'text'; + $label = isset($colprop['label']) ? $colprop['label'] : rcube_label($col); + $category = $colprop['category'] ? $colprop['category'] : 'other'; + + if ($ftype == 'text') + $colprop['size'] = $i_size; + + $content = html::div('row', html::div('contactfieldlabel label', Q($label)) + . html::div('contactfieldcontent', rcmail_get_edit_field($col, '', $colprop, $ftype))); + + $form[$category]['content'][] = $content; + } + } + + $hiddenfields = new html_hiddenfield(array( + 'name' => '_source', 'value' => get_input_value('_source', RCUBE_INPUT_GPC))); + $hiddenfields->add(array('name' => '_gid', 'value' => $CONTACTS->group_id)); + $hiddenfields->add(array('name' => '_adv', 'value' => 1)); + + $out = $RCMAIL->output->request_form(array( + 'name' => 'form', 'method' => 'post', + 'task' => $RCMAIL->task, 'action' => 'search', + 'noclose' => true) + $attrib, $hiddenfields->show()); + + $RCMAIL->output->add_gui_object('editform', $attrib['id']); + + unset($attrib['name']); + unset($attrib['id']); + + foreach ($form as $f) { + if (!empty($f['content'])) { + $content = html::div('contactfieldgroup', join("\n", $f['content'])); + + $out .= html::tag('fieldset', $attrib, + html::tag('legend', null, Q($f['name'])) + . $content) . "\n"; + } + } + + return $out . ''; +} diff --git a/skins/default/addressbook.css b/skins/default/addressbook.css index 06808cd76..18939b9fe 100644 --- a/skins/default/addressbook.css +++ b/skins/default/addressbook.css @@ -72,6 +72,14 @@ background-position: -162px 0; } +#abooktoolbar a.search { + background-position: -170px 0; +} + +#abooktoolbar a.searchSel { + background-position: -170px -32px; +} + #abookcountbar { margin-top: 4px; @@ -208,12 +216,6 @@ body.iframe, border: none; } -#contact-details table td.title -{ - font-weight: bold; - text-align: right; -} - #contacttabs { position: relative; @@ -335,7 +337,7 @@ fieldset.contactfieldgroup legend position: absolute; top: 0; left: 2px; - width: 90px; + width: 110px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -355,7 +357,7 @@ fieldset.contactfieldgroup legend .contactfieldgroup .contactfieldcontent { - padding-left: 100px; + padding-left: 120px; min-height: 1em; line-height: 1.3em; } diff --git a/skins/default/images/abook_toolbar.gif b/skins/default/images/abook_toolbar.gif index 1de95da76..2e8f4e259 100644 Binary files a/skins/default/images/abook_toolbar.gif and b/skins/default/images/abook_toolbar.gif differ diff --git a/skins/default/images/abook_toolbar.png b/skins/default/images/abook_toolbar.png index c761fbc9d..feb95c026 100644 Binary files a/skins/default/images/abook_toolbar.png and b/skins/default/images/abook_toolbar.png differ diff --git a/skins/default/templates/addressbook.html b/skins/default/templates/addressbook.html index 97cd13c2f..f9675ad74 100644 --- a/skins/default/templates/addressbook.html +++ b/skins/default/templates/addressbook.html @@ -25,6 +25,7 @@   +
@@ -41,10 +42,6 @@
    • -
    diff --git a/skins/default/templates/contactadd.html b/skins/default/templates/contactadd.html index b5fd05609..6e0737020 100644 --- a/skins/default/templates/contactadd.html +++ b/skins/default/templates/contactadd.html @@ -19,7 +19,6 @@
    -
    diff --git a/skins/default/templates/contactsearch.html b/skins/default/templates/contactsearch.html new file mode 100644 index 000000000..23cbec4cb --- /dev/null +++ b/skins/default/templates/contactsearch.html @@ -0,0 +1,18 @@ + + + +<roundcube:object name="pagetitle" /> + + + + + +
    +
    + +

    +
    + + + +