- Export plugins now specify the export record class

- Projectmanager now has filters

addressbook/inc/class.addressbook_export_contacts_csv.inc.php

@@ -422,6 +422,15 @@ class addressbook_export_contacts_csv implements importexport_iface_export_plugi
 			$this->selects['tid'][$tid] = $data['name'];
 		}
 	}
+	/**
+	 * Get the class name for the egw_record to use while exporting
+	 *
+	 * @return string;
+	 */
+	public static function get_egw_record_class()
+	{
+		return 'addressbook_egw_record';
+	}
 
 	/**
 	 * Adjust automatically generated filter fields

addressbook/inc/class.addressbook_export_vcard.inc.php

@@ -142,4 +142,13 @@ class addressbook_export_vcard implements importexport_iface_export_plugin {
 			'content'	=> 'all',
 		);
 	}
+	/**
+	 * Get the class name for the egw_record to use while exporting
+	 *
+	 * @return string;
+	 */
+	public static function get_egw_record_class()
+	{
+		return 'addressbook_egw_record';
+	}
 }

admin/inc/class.admin_export_groups_csv.inc.php

@@ -103,4 +103,14 @@ class admin_export_groups_csv implements importexport_iface_export_plugin
 			'preserv' => array('no_error_for_no_selection'),
 		);
 	}
+
+	/**
+	 * Get the class name for the egw_record to use while exporting
+	 *
+	 * @return string;
+	 */
+	public static function get_egw_record_class()
+	{
+		return 'admin_egw_group_record';
+	}
 }

admin/inc/class.admin_export_users_csv.inc.php

@@ -109,4 +109,13 @@ class admin_export_users_csv implements importexport_iface_export_plugin
 			'preserv' => array('no_error_for_all'),
 		);
 	}
+	/**
+	 * Get the class name for the egw_record to use while exporting
+	 *
+	 * @return string;
+	 */
+	public static function get_egw_record_class()
+	{
+		return 'admin_egw_user_record';
+	}
 }

calendar/inc/class.calendar_export_csv.inc.php

@@ -423,4 +423,14 @@ class calendar_export_csv implements importexport_iface_export_plugin {
 		}
 
 	}
-}
+	/**
+	 * Get the class name for the egw_record to use while exporting
+	 *
+	 * @return string;
+	 */
+	public static function get_egw_record_class()
+	{
+		return 'calendar_egw_record';
+	}
+
+ }

calendar/inc/class.calendar_export_ical.inc.php

@@ -170,4 +170,13 @@ class calendar_export_ical extends calendar_export_csv {
 		$data = parent::get_selectors_etpl($definition);
 		return $data;
 	}
+	/**
+	 * Get the class name for the egw_record to use while exporting
+	 *
+	 * @return string;
+	 */
+	public static function get_egw_record_class()
+	{
+		return 'calendar_egw_record';
+	}
 }

importexport/inc/class.importexport_export_ui.inc.php

@@ -68,7 +68,7 @@ class importexport_export_ui {
 		$content['appname'] = $_appname;
 		$preserv['appname'] = $_appname;
 		if(empty($_appname)) {
-			$et.setElementAttribute('select_definition','disabled',true);
+			$et->setElementAttribute('select_definition','disabled',true);
 		}
 
 		// Check for preferred definition

importexport/inc/class.importexport_helper_functions.inc.php

@@ -596,12 +596,12 @@ class importexport_helper_functions {
 	{
 		$fields = array();
 		try {
-			if($record_classname == null) $record_classname = $app_name . '_egw_record';
-			if(!class_exists($record_classname)) throw new Exception('Bad class name ' . $record_classname);
-
 			$plugin = is_object($plugin_name) ? $plugin_name : new $plugin_name();
 			$plugin_name = get_class($plugin);
 
+			if($record_classname == null) $record_classname = $plugin::get_egw_record_class();
+			if(!class_exists($record_classname)) throw new Exception('Bad class name ' . $record_classname);
+
 			if(!$wizard_plugin)
 			{
 				$wizard_name = $app_name . '_wizard_' . str_replace($app_name . '_', '', $plugin_name);

importexport/inc/class.importexport_iface_export_plugin.inc.php

@@ -13,26 +13,26 @@
 /**
  * class importexport_iface_export_plugin
  * This a the abstract interface for an export plugin of importexport
- * 
+ *
- * You need to implement this class in 
+ * You need to implement this class in
  * EGW_INCLUDE_ROOT/appname/inc/importexport/class.export_<type>.inc.php
  * to attend the importexport framwork with your export.
- * 
+ *
- * NOTE: This is an easy interface, cause plugins live in theire own 
+ * NOTE: This is an easy interface, cause plugins live in theire own
- * space. Means that they are responsible for generating a defintion AND 
+ * space. Means that they are responsible for generating a defintion AND
  * working on that definition.
  * So this interface just garanties the interaction with userinterfaces. It
  * has nothing to do with datatypes.
- * 
+ *
  * JS:
  * required function in opener:
- * 
+ *
- * 
+ *
  * // returns array of identifiers
  * // NOTE: identifiers need to b
- * get_selection(); 
+ * get_selection();
  *
- * get_selector();  //returns array 
+ * get_selector();  //returns array
  */
 interface importexport_iface_export_plugin {
 	
@@ -76,7 +76,7 @@ interface importexport_iface_export_plugin {
 	 * return etemplate components for options.
 	 * @abstract We can't deal with etemplate objects here, as an uietemplate
 	 * objects itself are scipt orientated and not "dialog objects"
-	 * 
+	 *
 	 * @return array (
 	 * 		name 		=> string,
 	 * 		content		=> array,
@@ -100,5 +100,15 @@ interface importexport_iface_export_plugin {
 	 */
 	public function get_selectors_etpl();
 
+	/**
+	 * Get the class name for the egw_record to use while exporting
+	 *
+	 * importexport_iface_egw_record classes are used for a lot of field detection
+	 * and automatic conversions.  In most cases they are named <appname>_egw_record,
+	 * but projectmanager is an exception to this.
+	 *
+	 * @return string;
+	 */
+	public static function get_egw_record_class();
 } // end of iface_export_plugin
 ?>

infolog/inc/class.infolog_export_csv.inc.php

@@ -266,4 +266,14 @@ class infolog_export_csv implements importexport_iface_export_plugin {
 	public static function convert(infolog_egw_record &$record) {
 		// Stub, for now
 	}
+
+	/**
+	 * Get the class name for the egw_record to use while exporting
+	 *
+	 * @return string;
+	 */
+	public static function get_egw_record_class()
+	{
+		return 'infolog_egw_record';
+	}
 }

resources/inc/class.resources_export_csv.inc.php

@@ -174,8 +174,8 @@ class resources_export_csv implements importexport_iface_export_plugin {
 	/**
 	 * Customize automatically generated filter fields
 	 */
-        public function get_filter_fields(Array &$filters)
+	public function get_filter_fields(Array &$filters)
-        {
+	{
 		// In resources, not all categories are used
 		$filters['cat_id']['type'] = 'select';
 		$filters['cat_id']['name'] = 'filter';
@@ -189,9 +189,20 @@ class resources_export_csv implements importexport_iface_export_plugin {
 			'rows' => 5,
 			'values' => resources_bo::$filter_options
 		);
-                foreach($filters as $field_name => &$settings)
+		foreach($filters as $field_name => &$settings)
-                {
+		{
-                        if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
-                }
+		}
-        }
+	}
+
+
+	/**
+	 * Get the class name for the egw_record to use while exporting
+	 *
+	 * @return string;
+	 */
+	public static function get_egw_record_class()
+	{
+		return 'resources_egw_record';
+	}
 }

timesheet/inc/class.timesheet_export_csv.inc.php

@@ -169,4 +169,13 @@ class timesheet_export_csv implements importexport_iface_export_plugin {
 		}
 	}
 
+	/**
+	 * Get the class name for the egw_record to use while exporting
+	 *
+	 * @return string;
+	 */
+	public static function get_egw_record_class()
+	{
+		return 'timesheet_egw_record';
+	}
 }