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

addressbook/inc/class.addressbook_import_contacts_csv.inc.php

@@ -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!
 	}
 

addressbook/inc/class.addressbook_import_vcard.inc.php

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

admin/inc/class.admin_import_groups_csv.inc.php

@@ -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!
 	}
 

admin/inc/class.admin_import_users_csv.inc.php

@@ -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!
 	}
 

calendar/inc/class.calendar_import_ical.inc.php

@@ -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(

importexport/inc/class.importexport_basic_import_csv.inc.php

@@ -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!
 	}
 

importexport/inc/class.importexport_iface_export_plugin.inc.php

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

importexport/inc/class.importexport_iface_import_plugin.inc.php

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

infolog/inc/class.infolog_import_ical.inc.php

@@ -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!
 	}
 

infolog/inc/class.infolog_import_infologs_csv.inc.php

@@ -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!
 	}
 

resources/inc/class.resources_import_csv.inc.php

@@ -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!
 	}
 

timesheet/inc/class.timesheet_import_csv.inc.php

@@ -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!
 	}