diff --git a/resources/inc/class.resources_hooks.inc.php b/resources/inc/class.resources_hooks.inc.php index 3951b80f7a..ceac6f92d4 100644 --- a/resources/inc/class.resources_hooks.inc.php +++ b/resources/inc/class.resources_hooks.inc.php @@ -169,58 +169,6 @@ class resources_hooks } } - /** - * populates $settings for the preferences - * - * @param array|string $hook_data - * @return array - */ - static function settings($hook_data) - { - $settings = array(); - - if ($GLOBALS['egw_info']['user']['apps']['importexport']) - { - $definitions = new importexport_definitions_bo(array( - 'type' => 'export', - 'application' => 'resources' - )); - $options = array( - '~nextmatch~' => lang('Old fixed definition') - ); - $default_def = 'export-resources'; - foreach ((array)$definitions->get_definitions() as $identifier) - { - try - { - $definition = new importexport_definition($identifier); - } - catch (Exception $e) - { - // permission error - continue; - } - if ($title = $definition->get_title()) - { - $options[$title] = $title; - } - unset($definition); - } - $settings['nextmatch-export-definition'] = array( - 'type' => 'select', - 'values' => $options, - 'label' => 'Export definition to use for nextmatch export', - 'name' => 'nextmatch-export-definition', - 'help' => lang('If you specify an export definition, it will be used when you export'), - 'run_lang' => false, - 'xmlrpc' => True, - 'admin' => False, - 'default'=> isset($options[$default_def]) ? $default_def : false, - ); - } - return $settings; - } - /** * Hook to tell framework we use only global Api\Categories (return link data in that case and false otherwise) * diff --git a/resources/setup/setup.inc.php b/resources/setup/setup.inc.php index 8fffd913db..40bee0f718 100755 --- a/resources/setup/setup.inc.php +++ b/resources/setup/setup.inc.php @@ -33,7 +33,6 @@ $setup_info['resources']['hooks']['sidebox_menu'] = 'resources.resources_hooks.a $setup_info['resources']['hooks']['search_link'] = 'resources.resources_hooks.search_link'; $setup_info['resources']['hooks']['calendar_resources'] = 'resources.resources_hooks.calendar_resources'; $setup_info['resources']['hooks']['delete_category'] = 'resources.resources_hooks.delete_category'; -$setup_info['resources']['hooks']['settings'] = 'resources_hooks::settings'; $setup_info['resources']['depends'][] = array( 'appname' => 'api',