Welcome to Darwin!

fix: owner field in adb is owner and _not_ contact_owner
fix: selector for cli exports
This commit is contained in:
Cornelius Weiß 2007-06-28 10:07:16 +00:00
parent 25197222bf
commit 6b5dc22ff1
2 changed files with 8 additions and 4 deletions

View File

@ -33,11 +33,15 @@ 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']);
} }

View File

@ -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 ) {