extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 09:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use addressbook vCard charset preference for exporting vcards using Import/Export

Browse Source
This commit is contained in:
Nathan Gray 2012-10-29 18:29:40 +00:00
parent a2744f82f0
commit 9f4118e947
3 changed files with 95 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
addressbook/inc/class.addressbook_wizard_export_vcard.inc.php Normal file
View File

@ -0,0 +1,80 @@
<?php
/**
* Wizard for exporting vCard with import/export
*
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @package addressbook
* @subpackage importexport
* @link http://www.egroupware.org
* @author Nathan Gray
*/
/**
* We need to allow choosing of charset, so we'll just use the standard one from CSV
*/
class addressbook_wizard_export_vcard
{
public function __construct()
{
$this->steps = array(
'wizard_step40' => ''
);
$this->step_templates = array(
'wizard_step40' => 'addressbook.importexport_wizard_vcard_charset'
);
}
/**
* choose charset
*
* @param array $content
* @param array $sel_options
* @param array $readonlys
* @param array $preserv
* @return string template name
*/
function wizard_step40(&$content, &$sel_options, &$readonlys, &$preserv)
{
if($this->debug) error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
// return from step40
if ($content['step'] == 'wizard_step40') {
switch (array_search('pressed', $content['button']))
{
case 'next':
return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
case 'previous' :
return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
case 'finish':
return 'wizard_finish';
default :
return $this->wizard_step40($content,$sel_options,$readonlys,$preserv);
}
}
// init step40
else
{
$content['msg'] = $this->steps['wizard_step40'];
$content['step'] = 'wizard_step40';
if(!$content['charset'] && $content['plugin_options']['charset']) {
$content['charset'] = $content['plugin_options']['charset'] ? $content['plugin_options']['charset'] : 'user';
}
$sel_options['charset'] = $GLOBALS['egw']->translation->get_installed_charsets()+
array(
'user' => lang('User preference'),
);
$preserv = $content;
// Add in extra allowed charsets
$config = config::read('importexport');
$extra_charsets = array_intersect(explode(',',$config['import_charsets']), mb_list_encodings());
if($extra_charsets)
{
$sel_options['charset'] += array(lang('Extra encodings') => array_combine($extra_charsets,$extra_charsets));
}
unset ($preserv['button']);
return $this->step_templates[$content['step']];
}
}
}

6
importexport/inc/class.importexport_definitions_ui.inc.php
View File

@ -544,7 +544,9 @@ class importexport_definitions_ui
$next_step = $this->plugin->$content['step']($content); $next_step = $this->plugin->$content['step']($content);
} }
else else
{
$next_step = $this->$content['step']($content); $next_step = $this->$content['step']($content);
}
} else { } else {
die('Cannot find next step'); die('Cannot find next step');
} }
@ -730,9 +732,9 @@ class importexport_definitions_ui
{ {
case 'next': case 'next':
// There's no real reason the plugin has to come from any of these, as long as it has a $steps variable // There's no real reason the plugin has to come from any of these, as long as it has a $steps variable
if($this->plugin instanceof importexport_iface_import_plugin || $this->plugin instanceof importexport_wizard_basic_import_csv) { if($this->plugin instanceof importexport_iface_import_plugin || $this->plugin instanceof importexport_wizard_basic_import_csv || strpos(get_class($this->plugin), 'import') !== false) {
$content['type'] = 'import'; $content['type'] = 'import';
} elseif($this->plugin instanceof importexport_iface_export_plugin || $this->plugin instanceof importexport_wizard_basic_export_csv) { } elseif($this->plugin instanceof importexport_iface_export_plugin || $this->plugin instanceof importexport_wizard_basic_export_csv || strpos(get_class($this->plugin),'export') !== false) {
$content['type'] = 'export'; $content['type'] = 'export';
} else { } else {
throw new egw_exception('Invalid plugin'); throw new egw_exception('Invalid plugin');

12
importexport/inc/class.importexport_export_ui.inc.php
View File

@ -275,7 +275,17 @@ class importexport_export_ui {
if (! $charset = $definition->plugin_options['charset']) { if (! $charset = $definition->plugin_options['charset']) {
$charset = $GLOBALS['egw']->translation->charset(); $charset = $GLOBALS['egw']->translation->charset();
} }
if($charset == 'user') $charset = $GLOBALS['egw_info']['user']['preferences']['common']['csv_charset']; if($charset == 'user')
{
switch($definition->plugin)
{
case 'addressbook_export_vcard':
$charset = $GLOBALS['egw_info']['user']['preferences']['addressbook']['vcard_charset'];
break;
default:
$charset = $GLOBALS['egw_info']['user']['preferences']['common']['csv_charset'];
}
}
$plugin_object = new $definition->plugin; $plugin_object = new $definition->plugin;
$result = $plugin_object->export( $file, $definition ); $result = $plugin_object->export( $file, $definition );