extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 17:42:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Import/Export - change signature of method that gets options to allow definition-specific values

Browse Source
This commit is contained in:
nathangray 2018-11-29 09:35:35 -07:00
parent edceca0295
commit 57821d6084
12 changed files with 49 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addressbook/inc/class.addressbook_import_contacts_csv.inc.php
View File

@ -286,6 +286,13 @@ class addressbook_import_contacts_csv extends importexport_basic_import_csv {
*/
protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 ) {
$_data = $record->get_record_array();
// Make sure picture is loaded/updated
if($_data['jpegphoto'])
{
$_data['photo_unchanged'] = false;
}
switch ($_action) {
case 'none' :
return true;
@ -439,7 +446,8 @@ class addressbook_import_contacts_csv extends importexport_basic_import_csv {
* preserv => array,
* )
*/
public function get_options_etpl() {
public function get_options_etpl(importexport_definition &$definition=null)
{
// lets do it!
}

10
addressbook/inc/class.addressbook_import_vcard.inc.php
View File

@ -19,7 +19,8 @@ class addressbook_import_vcard implements importexport_iface_import_plugin {
private static $plugin_options = array(
'contact_owner'
'contact_owner',
'charset'
);
/**
@ -342,12 +343,15 @@ class addressbook_import_vcard implements importexport_iface_import_plugin {
* preserv => array,
* )
*/
public function get_options_etpl() {
public function get_options_etpl(importexport_definition &$definition=null)
{
$charset = $definition->plugin_options['charset'];
if($charset == 'user') $charset = $GLOBALS['egw_info']['user']['preferences']['addressbook']['vcard_charset'];
return array(
'name' => 'addressbook.import_vcard',
'content' => array(
'file_type' => 'vcard,ical,vcf',
'charset' => $GLOBALS['egw_info']['user']['preferences']['addressbook']['vcard_charset']
'charset' => $charset
),
'sel_options' => array(
'charset' => Api\Translation::get_installed_charsets()

3
admin/inc/class.admin_import_groups_csv.inc.php
View File

@ -248,7 +248,8 @@ class admin_import_groups_csv implements importexport_iface_import_plugin {
* preserv => array,
* )
*/
public function get_options_etpl() {
public function get_options_etpl(importexport_definition &$definition=null)
{
// lets do it!
}

3
admin/inc/class.admin_import_users_csv.inc.php
View File

@ -260,7 +260,8 @@ class admin_import_users_csv implements importexport_iface_import_plugin {
* preserv => array,
* )
*/
public function get_options_etpl() {
public function get_options_etpl(importexport_definition &$definition=null)
{
// lets do it!
}

3
calendar/inc/class.calendar_import_ical.inc.php
View File

@ -278,7 +278,8 @@ class calendar_import_ical implements importexport_iface_import_plugin {
* preserv => array,
* )
*/
public function get_options_etpl() {
public function get_options_etpl(importexport_definition &$definition=null)
{
return array(
'name' => 'addressbook.import_vcard',
'content' => array(

3
importexport/inc/class.importexport_basic_import_csv.inc.php
View File

@ -624,7 +624,8 @@ error_log("Searching for $custom_field = $value");
* preserv => array,
* )
*/
public function get_options_etpl() {
public function get_options_etpl(importexport_definition &$definition=null)
{
// lets do it!
}

4
importexport/inc/class.importexport_iface_export_plugin.inc.php
View File

@ -77,6 +77,8 @@ interface importexport_iface_export_plugin {
* @abstract We can't deal with etemplate objects here, as an uietemplate
* objects itself are scipt orientated and not "dialog objects"
*
* @param $definition Specific definition
*
* @return array (
* name => string,
* content => array,
@ -85,7 +87,7 @@ interface importexport_iface_export_plugin {
* preserv => array,
* )
*/
public function get_options_etpl();
public function get_options_etpl(importexport_definition &$definition=null);
/**
* returns etemplate name for slectors of this plugin

3
importexport/inc/class.importexport_iface_import_plugin.inc.php
View File

@ -71,6 +71,7 @@ interface importexport_iface_import_plugin {
* @abstract We can't deal with etemplate objects here, as an uietemplate
* objects itself are scipt orientated and not "dialog objects"
*
* @param $definition Specific definition
* @return array (
* name => string,
* content => array,
@ -78,7 +79,7 @@ interface importexport_iface_import_plugin {
* preserv => array,
* )
*/
public function get_options_etpl();
public function get_options_etpl(importexport_definition &$definition=null);
/**
* returns etemplate name for slectors of this plugin

3
infolog/inc/class.infolog_import_ical.inc.php
View File

@ -147,7 +147,8 @@ class infolog_import_ical implements importexport_iface_import_plugin {
* preserv => array,
* )
*/
public function get_options_etpl() {
public function get_options_etpl(importexport_definition &$definition=null)
{
// lets do it!
}

3
infolog/inc/class.infolog_import_infologs_csv.inc.php
View File

@ -472,7 +472,8 @@ class infolog_import_infologs_csv implements importexport_iface_import_plugin
* preserv => array,
* )
*/
public function get_options_etpl() {
public function get_options_etpl(importexport_definition &$definition=null)
{
// lets do it!
}

3
resources/inc/class.resources_import_csv.inc.php
View File

@ -236,7 +236,8 @@ class resources_import_csv extends importexport_basic_import_csv {
* preserv => array,
* )
*/
public function get_options_etpl() {
public function get_options_etpl(importexport_definition &$definition=null)
{
// lets do it!
}

2
timesheet/inc/class.timesheet_import_csv.inc.php
View File

@ -515,7 +515,7 @@ class timesheet_import_csv implements importexport_iface_import_plugin
* preserv => array,
* )
*/
public function get_options_etpl()
public function get_options_etpl(importexport_definition &$definition=null)
{
// lets do it!
}