Fix addressbook CSV export - select options were non-standard

This commit is contained in:
Nathan Gray 2013-02-27 15:33:35 +00:00
parent ba06ed56a9
commit 50c63d6a9e

View File

@ -55,7 +55,7 @@ class addressbook_export_contacts_csv implements importexport_iface_export_plugi
$old_app = $GLOBALS['egw_info']['flags']['currentapp']; $old_app = $GLOBALS['egw_info']['flags']['currentapp'];
$GLOBALS['egw_info']['flags']['currentapp'] = 'addressbook'; $GLOBALS['egw_info']['flags']['currentapp'] = 'addressbook';
if ($options['selection'] == 'use_all' || $options['selection'] == 'all') { if ($options['selection'] == 'search') {
// uicontacts selection with checkbox 'use_all' // uicontacts selection with checkbox 'use_all'
$query = $GLOBALS['egw']->session->appsession('index','addressbook'); $query = $GLOBALS['egw']->session->appsession('index','addressbook');
$query['num_rows'] = -1; // all $query['num_rows'] = -1; // all
@ -63,7 +63,7 @@ class addressbook_export_contacts_csv implements importexport_iface_export_plugi
if(!array_key_exists('filter',$query)) $query['filter'] = $GLOBALS['egw_info']['user']['account_id']; if(!array_key_exists('filter',$query)) $query['filter'] = $GLOBALS['egw_info']['user']['account_id'];
$this->ui->get_rows($query,$selection,$readonlys, true); // only return the ids $this->ui->get_rows($query,$selection,$readonlys, true); // only return the ids
} }
elseif ( $options['selection'] == 'all_contacts' ) { elseif ( $options['selection'] == 'all' ) {
if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) { if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) {
$col_filter['account_id'] = null; $col_filter['account_id'] = null;
} }