Index: ctools.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/ctools/ctools.info,v retrieving revision 1.4 diff -u -p -r1.4 ctools.info --- ctools.info 27 Sep 2009 03:41:00 -0000 1.4 +++ ctools.info 4 Oct 2009 16:57:25 -0000 @@ -2,4 +2,27 @@ name = Chaos tools description = A library of helpful tools by Merlin of Chaos. core = 7.x -package = Chaos tool suite \ No newline at end of file +package = Chaos tool suite +files[] = ctools.module +files[] = includes/ajax.inc +files[] = includes/collapsible.theme.inc +files[] = includes/content.inc +files[] = includes/content.menu.inc +files[] = includes/content.theme.inc +files[] = includes/context-access-admin.inc +files[] = includes/context-admin.inc +files[] = includes/context-task-handler.inc +files[] = includes/context.inc +files[] = includes/context.menu.inc +files[] = includes/context.theme.inc +files[] = includes/css.inc +files[] = includes/dependent.inc +files[] = includes/dropdown.theme.inc +files[] = includes/export.inc +files[] = includes/form.inc +files[] = includes/menu.inc +files[] = includes/modal.inc +files[] = includes/object-cache.inc +files[] = includes/plugins.inc +files[] = includes/wizard.inc +files[] = includes/wizard.theme.inc Index: ctools.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/ctools/ctools.install,v retrieving revision 1.12 diff -u -p -r1.12 ctools.install --- ctools.install 16 Aug 2009 21:59:42 -0000 1.12 +++ ctools.install 4 Oct 2009 17:02:39 -0000 @@ -13,22 +13,15 @@ function ctools_requirements($phase) { $requirements = array(); if ($phase == 'runtime') { - $path = file_create_path('ctools/css'); - if (!file_check_directory($path)) { - $path = file_directory_path() . '/ctools'; - file_check_directory($path, FILE_CREATE_DIRECTORY); - $path .= '/css'; - file_check_directory($path, FILE_CREATE_DIRECTORY); - } - $requirements['ctools_css_cache'] = array( 'title' => t('CTools CSS Cache'), 'severity' => REQUIREMENT_OK, 'value' => t('Exists'), ); - if (!file_check_directory($path)) { - $requirements['ctools_css_cache']['description'] = t('The CTools CSS cache directory, %path could not be created due to a misconfigured files directory. Please ensure that the files directory is correctly configured and that the webserver has permission to create directories.', array('%path' => $path)); + $path = 'public://ctools/css'; + if (!file_prepare_directory($path, FILE_CREATE_DIRECTORY)) { + $requirements['ctools_css_cache']['description'] = t('The CTools CSS cache directory, %path could not be created due to a misconfigured files directory. Please ensure that the files directory is correctly configured and that the webserver has permission to create directories.', array('%path' => file_uri_target($path))); $requirements['ctools_css_cache']['severity'] = REQUIREMENT_ERROR; $requirements['ctools_css_cache']['value'] = t('Unable to create'); } @@ -38,20 +31,6 @@ function ctools_requirements($phase) { } /** - * Implementation of hook_install() - */ -function ctools_install() { - drupal_install_schema('ctools'); -} - -/** - * Implementation of hook_uninstall() - */ -function ctools_uninstall() { - drupal_uninstall_schema('ctools'); -} - -/** * Implementation of hook_schemea */ function ctools_schema() { Index: ctools.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/ctools/ctools.module,v retrieving revision 1.28 diff -u -p -r1.28 ctools.module --- ctools.module 27 Sep 2009 03:41:00 -0000 1.28 +++ ctools.module 4 Oct 2009 17:10:44 -0000 @@ -226,13 +226,8 @@ function ctools_ctools_plugin_directory( function ctools_get_roles() { static $roles = NULL; if (!isset($roles)) { - $roles = array(); - $result = db_query("SELECT r.rid, r.name FROM {role} r ORDER BY r.name"); - while ($obj = db_fetch_object($result)) { - $roles[$obj->rid] = $obj->name; - } + $roles = db_query("SELECT r.rid, r.name FROM {role} r ORDER BY r.name")->fetchAllKeyed(); } - return $roles; } Index: bulk_export/bulk_export.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/ctools/bulk_export/bulk_export.info,v retrieving revision 1.2 diff -u -p -r1.2 bulk_export.info --- bulk_export/bulk_export.info 12 Jul 2009 18:11:58 -0000 1.2 +++ bulk_export/bulk_export.info 4 Oct 2009 17:15:08 -0000 @@ -1,6 +1,7 @@ ; $Id: bulk_export.info,v 1.2 2009/07/12 18:11:58 merlinofchaos Exp $ name = Bulk Export description = Performs bulk exporting of data objects known about by Chaos tools. -core = 6.x +core = 7.x dependencies[] = ctools -package = Chaos tool suite \ No newline at end of file +package = Chaos tool suite +files[] = bulk_export.module Index: bulk_export/bulk_export.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/ctools/bulk_export/bulk_export.module,v retrieving revision 1.3 diff -u -p -r1.3 bulk_export.module --- bulk_export/bulk_export.module 22 Jul 2009 21:12:07 -0000 1.3 +++ bulk_export/bulk_export.module 4 Oct 2009 17:18:31 -0000 @@ -9,15 +9,21 @@ /** * Implementation of hook_perm(). */ -function bulk_export_perm() { - return array('use bulk exporter'); +function bulk_export_permission() { + return array( + 'use bulk exporter' => array( + 'title' => t('Access Bulk Exporter'), + 'description' => t('Export various system objects into code.'), + ), + ); } /** * Implementation of hook_theme(). */ function bulk_export_theme() { - return array('bulk_export_export_form' => array( + return array( + 'bulk_export_export_form' => array( 'arguments' => array('form' => NULL), ), ); @@ -56,14 +62,13 @@ function bulk_export_export() { } } if ($exportables) { - ctools_include('form'); $form_state = array( 're_render' => FALSE, 'no_redirect' => TRUE, 'exportables' => $exportables, 'export_tables' => $export_tables, ); - $output = ctools_build_form('bulk_export_export_form', $form_state); + $output = drupal_build_form('bulk_export_export_form', $form_state); if (!$output) { drupal_set_title(t('Bulk export results')); $output = ''; @@ -138,8 +143,7 @@ function bulk_export_export() { * FAPI definition for the bulk exporter form. * */ -function bulk_export_export_form(&$form_state) { - $form = array(); +function bulk_export_export_form($form, &$form_state) { $form['tables'] = array( '#prefix' => '
', '#suffix' => '
', Index: delegator/delegator.admin.inc =================================================================== RCS file: delegator/delegator.admin.inc diff -N delegator/delegator.admin.inc Index: delegator/delegator.module =================================================================== RCS file: delegator/delegator.module diff -N delegator/delegator.module