mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 06:30:59 +01:00
Welcome to Darwin!
fix: owner field in adb is owner and _not_ contact_owner fix: selector for cli exports
This commit is contained in:
parent
25197222bf
commit
6b5dc22ff1
@ -32,12 +32,16 @@ class export_contacts_csv implements iface_export_plugin {
|
|||||||
|
|
||||||
$uicontacts = new uicontacts();
|
$uicontacts = new uicontacts();
|
||||||
$selection = array();
|
$selection = array();
|
||||||
if ($options['selection'] == 'use_all') {
|
if ($options['selection'] == '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
|
||||||
$uicontacts->get_rows($query,$selection,$readonlys,true); // true = only return the id's
|
$uicontacts->get_rows($query,$selection,$readonlys,true); // true = only return the id's
|
||||||
}
|
}
|
||||||
else {
|
elseif ( $options['selection'] == 'all_contacts' ) {
|
||||||
|
$selection = ExecMethod('addressbook.bocontacts.search',array());
|
||||||
|
//$uicontacts->get_rows($query,$selection,$readonlys,true);
|
||||||
|
} else {
|
||||||
$selection = explode(',',$options['selection']);
|
$selection = explode(',',$options['selection']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -125,8 +125,8 @@ class import_contacts_csv implements iface_import_plugin {
|
|||||||
if( count( array_unique( $record ) ) < 2 ) continue;
|
if( count( array_unique( $record ) ) < 2 ) continue;
|
||||||
|
|
||||||
if ( $_definition->plugin_options['contact_owner'] != -1 ) {
|
if ( $_definition->plugin_options['contact_owner'] != -1 ) {
|
||||||
$record['contact_owner'] = $_definition->plugin_options['contact_owner'];
|
$record['owner'] = $_definition->plugin_options['contact_owner'];
|
||||||
} else unset( $record['contact_owner'] );
|
} else unset( $record['owner'] );
|
||||||
|
|
||||||
if ( $_definition->plugin_options['conditions'] ) {
|
if ( $_definition->plugin_options['conditions'] ) {
|
||||||
foreach ( $_definition->plugin_options['conditions'] as $condition ) {
|
foreach ( $_definition->plugin_options['conditions'] as $condition ) {
|
||||||
|
Loading…
Reference in New Issue
Block a user